Merge branch 'master' into 817-updated

Conflicts:
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-04-21 11:23:48 -05:00
6 changed files with 1627 additions and 4 deletions

View File

@@ -135,6 +135,9 @@
".forth",
".fth"
],
"Frege": [
".fr"
],
"Game Maker Language": [
".gml"
],
@@ -584,8 +587,8 @@
".gemrc"
]
},
"tokens_total": 471163,
"languages_total": 585,
"tokens_total": 476727,
"languages_total": 589,
"tokens": {
"ABAP": {
"*/**": 1,
@@ -18164,6 +18167,787 @@
"/cell": 2,
"cell": 2
},
"Frege": {
"module": 2,
"examples.CommandLineClock": 1,
"where": 39,
"data": 3,
"Date": 5,
"native": 4,
"java.util.Date": 1,
"new": 9,
"(": 339,
")": 345,
"-": 730,
"IO": 13,
"MutableIO": 1,
"toString": 2,
"Mutable": 1,
"s": 21,
"ST": 1,
"String": 9,
"d.toString": 1,
"action": 2,
"to": 13,
"give": 2,
"us": 1,
"the": 20,
"current": 4,
"time": 1,
"as": 33,
"do": 38,
"d": 3,
"<->": 35,
"java": 5,
"lang": 2,
"Thread": 2,
"sleep": 4,
"takes": 1,
"a": 99,
"long": 4,
"and": 14,
"returns": 2,
"nothing": 2,
"but": 2,
"may": 1,
"throw": 1,
"an": 6,
"InterruptedException": 4,
"This": 2,
"is": 24,
"without": 1,
"doubt": 1,
"public": 1,
"static": 1,
"void": 2,
"millis": 1,
"throws": 4,
"Encoded": 1,
"in": 22,
"Frege": 1,
"argument": 1,
"type": 8,
"Long": 3,
"result": 11,
"does": 2,
"defined": 1,
"frege": 1,
"Lang": 1,
"main": 11,
"args": 2,
"forever": 1,
"print": 25,
"stdout.flush": 1,
"Thread.sleep": 4,
"examples.Concurrent": 1,
"import": 7,
"System.Random": 1,
"Java.Net": 1,
"URL": 2,
"Control.Concurrent": 1,
"C": 6,
"main2": 1,
"m": 2,
"<": 84,
"newEmptyMVar": 1,
"forkIO": 11,
"m.put": 3,
"replicateM_": 3,
"c": 33,
"m.take": 1,
"println": 25,
"example1": 1,
"putChar": 2,
"example2": 2,
"getLine": 2,
"case": 6,
"of": 32,
"Right": 6,
"n": 38,
"setReminder": 3,
"Left": 5,
"_": 60,
"+": 200,
"show": 24,
"L*n": 1,
"table": 1,
"mainPhil": 2,
"[": 120,
"fork1": 3,
"fork2": 3,
"fork3": 3,
"fork4": 3,
"fork5": 3,
"]": 116,
"mapM": 3,
"MVar": 3,
"1": 2,
"5": 1,
"philosopher": 7,
"Kant": 1,
"Locke": 1,
"Wittgenstein": 1,
"Nozick": 1,
"Mises": 1,
"return": 17,
"Int": 6,
"me": 13,
"left": 4,
"right": 4,
"g": 4,
"Random.newStdGen": 1,
"let": 8,
"phil": 4,
"tT": 2,
"g1": 2,
"Random.randomR": 2,
"L": 6,
"eT": 2,
"g2": 3,
"thinkTime": 3,
"*": 5,
"eatTime": 3,
"fl": 4,
"left.take": 1,
"rFork": 2,
"poll": 1,
"Just": 2,
"fr": 3,
"right.put": 1,
"left.put": 2,
"table.notifyAll": 2,
"Nothing": 2,
"table.wait": 1,
"inter": 3,
"catch": 2,
"getURL": 4,
"xx": 2,
"url": 1,
"URL.new": 1,
"con": 3,
"url.openConnection": 1,
"con.connect": 1,
"con.getInputStream": 1,
"typ": 5,
"con.getContentType": 1,
"stderr.println": 3,
"ir": 2,
"InputStreamReader.new": 2,
"fromMaybe": 1,
"charset": 2,
"unsupportedEncoding": 3,
"br": 4,
"BufferedReader": 1,
"getLines": 1,
"InputStream": 1,
"UnsupportedEncodingException": 1,
"InputStreamReader": 1,
"x": 45,
"x.catched": 1,
"ctyp": 2,
"charset=": 1,
"m.group": 1,
"SomeException": 2,
"Throwable": 1,
"m1": 1,
"MVar.newEmpty": 3,
"m2": 1,
"m3": 2,
"r": 7,
"catchAll": 3,
".": 41,
"m1.put": 1,
"m2.put": 1,
"m3.put": 1,
"r1": 2,
"m1.take": 1,
"r2": 3,
"m2.take": 1,
"r3": 3,
"take": 13,
"ss": 8,
"mapM_": 5,
"putStrLn": 2,
"|": 62,
"x.getClass.getName": 1,
"y": 15,
"sum": 2,
"map": 49,
"length": 20,
"package": 2,
"examples.Sudoku": 1,
"Data.TreeMap": 1,
"Tree": 4,
"keys": 2,
"Data.List": 1,
"DL": 1,
"hiding": 1,
"find": 20,
"union": 10,
"Element": 6,
"Zelle": 8,
"set": 4,
"candidates": 18,
"Position": 22,
"Feld": 3,
"Brett": 13,
"for": 25,
"assumptions": 10,
"conclusions": 2,
"Assumption": 21,
"ISNOT": 14,
"IS": 16,
"derive": 2,
"Eq": 1,
"Ord": 1,
"instance": 1,
"Show": 1,
"p": 72,
"e": 15,
"pname": 10,
"e.show": 2,
"showcs": 5,
"cs": 27,
"joined": 4,
"Assumption.show": 1,
"elements": 12,
"all": 22,
"possible": 2,
"..": 1,
"positions": 16,
"rowstarts": 4,
"row": 20,
"starting": 3,
"colstarts": 3,
"column": 2,
"boxstarts": 3,
"box": 15,
"boxmuster": 3,
"pattern": 1,
"by": 3,
"adding": 1,
"upper": 2,
"position": 9,
"results": 1,
"real": 1,
"extract": 2,
"field": 9,
"getf": 16,
"f": 19,
"fs": 22,
"fst": 9,
"otherwise": 8,
"cell": 24,
"getc": 12,
"b": 113,
"snd": 20,
"compute": 5,
"list": 7,
"that": 18,
"belong": 3,
"same": 8,
"given": 3,
"z..": 1,
"z": 12,
"quot": 1,
"col": 17,
"mod": 3,
"ri": 2,
"div": 3,
"or": 15,
"depending": 1,
"on": 4,
"ci": 3,
"index": 3,
"middle": 2,
"check": 2,
"if": 5,
"candidate": 10,
"has": 2,
"exactly": 2,
"one": 2,
"member": 1,
"i.e.": 1,
"been": 1,
"solved": 1,
"single": 9,
"Bool": 2,
"true": 16,
"false": 13,
"unsolved": 10,
"rows": 4,
"cols": 6,
"boxes": 1,
"allrows": 8,
"allcols": 5,
"allboxs": 5,
"allrcb": 5,
"zip": 7,
"repeat": 3,
"containers": 6,
"PRINTING": 1,
"printable": 1,
"coordinate": 1,
"a1": 3,
"lower": 1,
"i9": 1,
"packed": 1,
"chr": 2,
"ord": 6,
"board": 41,
"printb": 4,
"p1line": 2,
"pfld": 4,
"line": 2,
"brief": 1,
"no": 4,
"some": 2,
"zs": 1,
"initial/final": 1,
"msg": 6,
"res012": 2,
"concatMap": 1,
"a*100": 1,
"b*10": 1,
"BOARD": 1,
"ALTERATION": 1,
"ACTIONS": 1,
"message": 1,
"about": 1,
"what": 1,
"done": 1,
"turnoff1": 3,
"i": 16,
"off": 11,
"nc": 7,
"head": 19,
"newb": 7,
"filter": 26,
"notElem": 7,
"turnoff": 11,
"turnoffh": 1,
"ps": 8,
"foldM": 2,
"toh": 2,
"setto": 3,
"cname": 4,
"nf": 2,
"SOLVING": 1,
"STRATEGIES": 1,
"reduce": 3,
"sets": 2,
"contains": 1,
"numbers": 1,
"already": 1,
"finds": 1,
"logs": 1,
"NAKED": 5,
"SINGLEs": 1,
"passing.": 1,
"sss": 3,
"each": 2,
"with": 15,
"more": 2,
"than": 2,
"fields": 6,
"are": 6,
"rcb": 16,
"elem": 16,
"collect": 1,
"remove": 3,
"from": 7,
"look": 10,
"number": 4,
"appears": 1,
"container": 9,
"this": 2,
"can": 9,
"go": 1,
"other": 2,
"place": 1,
"HIDDEN": 6,
"SINGLE": 1,
"hiddenSingle": 2,
"select": 1,
"containername": 1,
"FOR": 11,
"IN": 9,
"occurs": 5,
"PAIRS": 8,
"TRIPLES": 8,
"QUADS": 2,
"nakedPair": 4,
"t": 14,
"nm": 6,
"SELECT": 3,
"pos": 5,
"tuple": 2,
"name": 2,
"//": 8,
"u": 6,
"fold": 7,
"non": 2,
"outof": 6,
"tuples": 2,
"hit": 7,
"subset": 3,
"any": 3,
"hiddenPair": 4,
"minus": 2,
"uniq": 4,
"sort": 4,
"common": 4,
"bs": 7,
"undefined": 1,
"cannot": 1,
"happen": 1,
"because": 1,
"either": 1,
"empty": 4,
"not": 5,
"intersectionlist": 2,
"intersections": 2,
"reason": 8,
"reson": 1,
"cpos": 7,
"WHERE": 2,
"tail": 2,
"intersection": 1,
"we": 5,
"occurences": 1,
"XY": 2,
"Wing": 2,
"there": 6,
"exists": 6,
"A": 7,
"X": 5,
"Y": 4,
"B": 5,
"Z": 6,
"shares": 2,
"reasoning": 1,
"will": 4,
"be": 9,
"since": 1,
"indeed": 1,
"thus": 1,
"see": 1,
"xyWing": 2,
"rcba": 4,
"share": 1,
"b1": 11,
"b2": 10,
"&&": 9,
"||": 2,
"then": 1,
"else": 1,
"c1": 4,
"c2": 3,
"N": 5,
"Fish": 1,
"Swordfish": 1,
"Jellyfish": 1,
"When": 2,
"particular": 1,
"digit": 1,
"located": 2,
"only": 1,
"columns": 2,
"eliminate": 1,
"those": 2,
"which": 2,
"fish": 7,
"fishname": 5,
"rset": 4,
"certain": 1,
"rflds": 2,
"rowset": 1,
"colss": 3,
"must": 4,
"appear": 1,
"at": 3,
"least": 3,
"cstart": 2,
"immediate": 1,
"consequences": 6,
"assumption": 8,
"form": 1,
"conseq": 3,
"cp": 3,
"two": 1,
"contradict": 2,
"contradicts": 7,
"get": 3,
"aPos": 5,
"List": 1,
"turned": 1,
"when": 2,
"true/false": 1,
"toClear": 7,
"whose": 1,
"implications": 5,
"themself": 1,
"chain": 2,
"paths": 12,
"solution": 6,
"reverse": 4,
"css": 7,
"yields": 1,
"contradictory": 1,
"chainContra": 2,
"pro": 7,
"contra": 4,
"ALL": 2,
"conlusions": 1,
"uniqBy": 2,
"using": 2,
"sortBy": 2,
"comparing": 2,
"conslusion": 1,
"chains": 4,
"LET": 1,
"BE": 1,
"final": 2,
"conclusion": 4,
"THE": 1,
"FIRST": 1,
"implication": 2,
"ai": 2,
"so": 1,
"a0": 1,
"OR": 7,
"a2": 2,
"...": 2,
"IMPLIES": 1,
"For": 2,
"cells": 1,
"pi": 2,
"have": 1,
"construct": 2,
"p0": 1,
"p1": 1,
"c0": 1,
"cellRegionChain": 2,
"os": 3,
"cellas": 2,
"regionas": 2,
"iss": 3,
"ass": 2,
"first": 2,
"candidates@": 1,
"region": 2,
"oss": 2,
"Liste": 1,
"aller": 1,
"Annahmen": 1,
"ein": 1,
"bestimmtes": 1,
"acstree": 3,
"Tree.fromList": 1,
"bypass": 1,
"maybe": 1,
"tree": 1,
"lookup": 2,
"error": 1,
"performance": 1,
"resons": 1,
"confine": 1,
"ourselves": 1,
"20": 1,
"per": 1,
"mkPaths": 3,
"acst": 3,
"impl": 2,
"{": 1,
"a3": 1,
"ordered": 1,
"impls": 2,
"ns": 2,
"concat": 1,
"takeUntil": 1,
"null": 1,
"iterate": 1,
"expandchain": 3,
"avoid": 1,
"loops": 1,
"uni": 3,
"SOLVE": 1,
"SUDOKU": 1,
"Apply": 1,
"available": 1,
"strategies": 1,
"until": 1,
"changes": 1,
"anymore": 1,
"Strategy": 1,
"functions": 2,
"supposed": 1,
"applied": 1,
"changed": 1,
"board.": 1,
"strategy": 2,
"anything": 1,
"alter": 1,
"it": 2,
"next": 1,
"tried.": 1,
"solve": 19,
"res@": 16,
"apply": 17,
"res": 16,
"smallest": 1,
"comment": 16,
"SINGLES": 1,
"locked": 1,
"2": 3,
"QUADRUPELS": 6,
"3": 3,
"4": 3,
"WINGS": 1,
"FISH": 3,
"pcomment": 2,
"9": 5,
"forcing": 1,
"allow": 1,
"infer": 1,
"both": 1,
"brd": 2,
"com": 5,
"stderr": 3,
"<<": 4,
"log": 1,
"turn": 1,
"string": 3,
"into": 1,
"mkrow": 2,
"mkrow1": 2,
"xs": 4,
"make": 1,
"sure": 1,
"unpacked": 2,
"<=>": 1,
"0": 2,
"ignored": 1,
"h": 1,
"help": 1,
"usage": 1,
"Sudoku": 2,
"file": 4,
"81": 3,
"char": 1,
"consisting": 1,
"digits": 2,
"One": 1,
"such": 1,
"going": 1,
"http": 3,
"www": 1,
"sudokuoftheday": 1,
"pages": 1,
"o": 1,
"php": 1,
"click": 1,
"puzzle": 1,
"open": 1,
"tab": 1,
"Copy": 1,
"address": 1,
"your": 1,
"browser": 1,
"There": 1,
"also": 1,
"hard": 1,
"sudokus": 1,
"examples": 1,
"top95": 1,
"txt": 1,
"W": 1,
"felder": 2,
"decode": 4,
"files": 2,
"forM_": 1,
"sudoku": 2,
"openReader": 1,
"lines": 2,
"BufferedReader.getLines": 1,
"process": 5,
"candi": 2,
"consider": 3,
"acht": 4,
"neun": 2,
"examples.SwingExamples": 1,
"Java.Awt": 1,
"ActionListener": 2,
"Java.Swing": 1,
"rs": 2,
"Runnable.new": 1,
"helloWorldGUI": 2,
"buttonDemoGUI": 2,
"celsiusConverterGUI": 2,
"invokeLater": 1,
"tempTextField": 2,
"JTextField.new": 1,
"celsiusLabel": 1,
"JLabel.new": 3,
"convertButton": 1,
"JButton.new": 3,
"fahrenheitLabel": 1,
"frame": 3,
"JFrame.new": 3,
"frame.setDefaultCloseOperation": 3,
"JFrame.dispose_on_close": 3,
"frame.setTitle": 1,
"celsiusLabel.setText": 1,
"convertButton.setText": 1,
"convertButtonActionPerformed": 2,
"celsius": 3,
"getText": 1,
"double": 1,
"fahrenheitLabel.setText": 3,
"c*1.8": 1,
".long": 1,
"ActionListener.new": 2,
"convertButton.addActionListener": 1,
"contentPane": 2,
"frame.getContentPane": 2,
"layout": 2,
"GroupLayout.new": 1,
"contentPane.setLayout": 1,
"TODO": 1,
"continue": 1,
"//docs.oracle.com/javase/tutorial/displayCode.html": 1,
"code": 1,
"//docs.oracle.com/javase/tutorial/uiswing/examples/learn/CelsiusConverterProject/src/learn/CelsiusConverterGUI.java": 1,
"frame.pack": 3,
"frame.setVisible": 3,
"label": 2,
"cp.add": 1,
"newContentPane": 2,
"JPanel.new": 1,
"JButton": 4,
"b1.setVerticalTextPosition": 1,
"SwingConstants.center": 2,
"b1.setHorizontalTextPosition": 1,
"SwingConstants.leading": 2,
"b2.setVerticalTextPosition": 1,
"b2.setHorizontalTextPosition": 1,
"b3": 7,
"Enable": 1,
"button": 1,
"setVerticalTextPosition": 1,
"SwingConstants": 2,
"center": 1,
"setHorizontalTextPosition": 1,
"leading": 1,
"setEnabled": 7,
"action1": 2,
"action3": 2,
"b1.addActionListener": 1,
"b3.addActionListener": 1,
"newContentPane.add": 3,
"newContentPane.setOpaque": 1,
"frame.setContentPane": 1
},
"Game Maker Language": {
"//draws": 1,
"the": 62,
@@ -51296,6 +52080,7 @@
"Erlang": 2928,
"fish": 636,
"Forth": 1516,
"Frege": 5564,
"Game Maker Language": 13310,
"GAS": 133,
"GLSL": 3766,
@@ -51450,6 +52235,7 @@
"Erlang": 5,
"fish": 3,
"Forth": 7,
"Frege": 4,
"Game Maker Language": 13,
"GAS": 1,
"GLSL": 3,
@@ -51565,5 +52351,5 @@
"Xtend": 2,
"YAML": 2
},
"md5": "54de8af8a3aae92fbbc0f1f71d1d7598"
"md5": "51294029c815b3d94cfcd55545a37a0c"
}