Merge branch 'master' into 985

Conflicts:
	lib/linguist/languages.yml
This commit is contained in:
Arfon Smith
2014-05-04 09:04:28 -05:00
14 changed files with 1468 additions and 82 deletions

View File

@@ -9,7 +9,7 @@
# includes name.downcase)
# ace_mode - A String name of Ace Mode (if available)
# wrap - Boolean wrap to enable line wrapping (default: false)
# extension - An Array of associated extensions (the first one is
# extensions - An Array of associated extensions (the first one is
# considered the primary extension)
# interpreters - An Array of associated interpreters
# searchable - Boolean flag to enable searching (defaults to true)
@@ -91,7 +91,8 @@ Alloy:
type: programming # 'modeling' would be more appropiate
lexer: Text only
color: "#cc5c24"
primary_extension: .als
extensions:
- .als
ApacheConf:
type: markup
@@ -144,7 +145,8 @@ AspectJ:
type: programming
lexer: AspectJ
color: "#1957b0"
primary_extension: .aj
extensions:
- .aj
Assembly:
type: programming
@@ -167,7 +169,7 @@ AutoHotkey:
color: "#6594b9"
aliases:
- ahk
extension:
extensions:
- .ahk
AutoIt:
@@ -490,13 +492,13 @@ DM:
type: programming
color: "#075ff1"
lexer: C++
extension:
extensions:
- .dm
aliases:
- byond
DOT:
type: programming
type: data
lexer: Text only
extensions:
- .dot
@@ -533,7 +535,8 @@ Dogescript:
type: programming
lexer: Text only
color: "#cca760"
primary_extension: .djs
extensions:
- .djs
Dylan:
type: programming
@@ -547,7 +550,8 @@ E:
type: programming
color: "#ccce35"
lexer: Text only
primary_extension: .E
extensions:
- .E
Ecere Projects:
type: data
@@ -568,8 +572,8 @@ Eagle:
type: markup
color: "#3994bc"
lexer: XML
primary_extension: .sch
extensions:
- .sch
- .brd
Eiffel:
@@ -690,17 +694,19 @@ Frege:
type: programming
color: "#00cafe"
lexer: Haskell
primary_extension: .fr
extensions:
- .fr
Game Maker Language:
type: programming
color: "#8ad353"
lexer: JavaScript
primary_extension: .gml
extensions:
- .gml
GAP:
type: programming
lexer: Text only
primary_extension: .g
extensions:
- .g
- .gap
@@ -765,8 +771,8 @@ Gnuplot:
type: programming
color: "#f0a9f0"
lexer: Gnuplot
primary_extension: .gp
extensions:
- .gp
- .gnu
- .gnuplot
- .plot
@@ -790,7 +796,8 @@ Grammatical Framework:
aliases:
- gf
wrap: false
primary_extension: .gf
extensions:
- .gf
searchable: true
color: "#ff0000"
@@ -927,7 +934,8 @@ INI:
- .properties
Inno Setup:
primary_extension: .iss
extensions:
- .iss
lexer: Text only
Idris:
@@ -941,8 +949,8 @@ Inform 7:
type: programming
lexer: Text only
wrap: true
primary_extension: .ni
extensions:
- .ni
- .i7x
Inno Setup:
@@ -1013,7 +1021,8 @@ JSONiq:
type: programming
ace_mode: jsoniq
lexer: XQuery
primary_extension: .jq
extensions:
- .jq
Jade:
group: HTML
@@ -1080,7 +1089,8 @@ Kit:
type: markup
lexer: HTML
ace_mode: html
primary_extension: .kit
extensions:
- .kit
Kotlin:
type: programming
@@ -1113,7 +1123,8 @@ Latte:
color: "#A8FF97"
group: HTML
lexer: Smarty
primary_extension: .latte
extensions:
- .latte
Less:
type: markup
@@ -1131,7 +1142,8 @@ LilyPond:
Liquid:
type: markup
lexer: Text only
primary_extension: .liquid
extensions:
- .liquid
Literate Agda:
type: programming
@@ -1207,7 +1219,8 @@ MTML:
type: markup
lexer: HTML
color: "#0095d9"
primary_extension: .mtml
extensions:
- .mtml
Makefile:
aliases:
@@ -1249,7 +1262,8 @@ Mask:
Mathematica:
type: programming
primary_extension: .mathematica
extensions:
- .mathematica
lexer: Text only
Matlab:
@@ -1283,11 +1297,7 @@ MediaWiki:
Mercury:
type: programming
# This is the background colour on the web page.
color: "#abcdef"
# The primary extension is .m, but lingist won't accept duplicates
primary_extension: .mercury
# Mercury's syntax is not prolog syntax, but they do share the lexer
lexer: Prolog
ace_mode: prolog
extensions:
@@ -1477,7 +1487,7 @@ PAWN:
PHP:
type: programming
ace_mode: php
color: "#6e03c1"
color: "#4F5D95"
extensions:
- .php
- .aw
@@ -1633,7 +1643,8 @@ PureScript:
type: programming
color: "#bcdc53"
lexer: Haskell
primary_extension: .purs
extensions:
- .purs
Python:
type: programming
@@ -1674,6 +1685,7 @@ R:
lexer: S
aliases:
- R
- Rscript
extensions:
- .r
- .R
@@ -1751,6 +1763,14 @@ Rebol:
- .r3
- .rebol
Red:
type: programming
lexer: Text only
color: "#ee0000"
extensions:
- .red
- .reds
Redcode:
extensions:
- .cw
@@ -1907,7 +1927,8 @@ Shell:
ShellSession:
type: programming
lexer: Bash Session
primary_extension: .sh-session
extensions:
- .sh-session
Shen:
type: programming
@@ -1937,7 +1958,8 @@ SourcePawn:
color: "#f69e1d"
aliases:
- sourcemod
primary_extension: .sp
extensions:
- .sp
Squirrel:
type: programming
@@ -1958,14 +1980,13 @@ Stata:
type: programming
lexer: Text only
extensions:
- .ado
- .do
- .ado
- .doh
- .ihlp
- .mata
- .matah
- .sthlp
primary_extension: .do
Stylus:
type: markup
@@ -1985,8 +2006,8 @@ SystemVerilog:
type: programming
color: "#343761"
lexer: systemverilog
primary_extension: .sv
extensions:
- .sv
- .svh
- .vh
@@ -2266,7 +2287,8 @@ Zephir:
type: programming
lexer: PHP
color: "#118f9e"
primary_extension: .zep
extensions:
- .zep
eC:
type: programming

View File

@@ -195,6 +195,9 @@
".handlebars",
".hbs"
],
"Haskell": [
".hs"
],
"HTML": [
".html",
".st"
@@ -458,6 +461,10 @@
".reb",
".rebol"
],
"Red": [
".red",
".reds"
],
"RMarkdown": [
".rmd"
],
@@ -642,6 +649,9 @@
"Perl": [
"ack"
],
"R": [
"expr-dist"
],
"Ruby": [
"Appraisals",
"Capfile",
@@ -681,8 +691,8 @@
".gemrc"
]
},
"tokens_total": 589756,
"languages_total": 713,
"tokens_total": 592149,
"languages_total": 720,
"tokens": {
"ABAP": {
"*/**": 1,
@@ -24917,6 +24927,85 @@
"</h2>": 1,
"/each": 1
},
"Haskell": {
"import": 6,
"Data.Char": 1,
"main": 4,
"IO": 2,
"(": 8,
")": 8,
"do": 3,
"let": 2,
"hello": 2,
"putStrLn": 3,
"map": 13,
"toUpper": 1,
"module": 2,
"Main": 1,
"where": 4,
"Sudoku": 9,
"Data.Maybe": 2,
"sudoku": 36,
"[": 4,
"]": 3,
"pPrint": 5,
"+": 2,
"fromMaybe": 1,
"solve": 5,
"isSolved": 4,
"Data.List": 1,
"Data.List.Split": 1,
"type": 1,
"Int": 1,
"-": 3,
"Maybe": 1,
"|": 8,
"Just": 1,
"otherwise": 2,
"index": 27,
"<": 1,
"elemIndex": 1,
"sudokus": 2,
"nextTest": 5,
"i": 7,
"<->": 1,
"1": 2,
"9": 7,
"checkRow": 2,
"checkColumn": 2,
"checkBox": 2,
"listToMaybe": 1,
"mapMaybe": 1,
"take": 1,
"drop": 1,
"length": 12,
"getRow": 3,
"nub": 6,
"getColumn": 3,
"getBox": 3,
"filter": 3,
"0": 3,
"chunksOf": 10,
"quot": 3,
"transpose": 4,
"mod": 2,
"concat": 2,
"concatMap": 2,
"3": 4,
"27": 1,
"Bool": 1,
"product": 1,
"False": 4,
".": 4,
"sudokuRows": 4,
"/": 3,
"sudokuColumns": 3,
"sudokuBoxes": 3,
"True": 1,
"String": 1,
"intercalate": 2,
"show": 1
},
"HTML": {
"<!DOCTYPE>": 2,
"HTML": 2,
@@ -52212,43 +52301,43 @@
},
"R": {
"df.residual.mira": 1,
"<": 24,
"-": 27,
"function": 7,
"(": 60,
"object": 9,
"<": 46,
"-": 51,
"function": 18,
"(": 219,
"object": 12,
"...": 4,
")": 60,
"{": 7,
")": 220,
"{": 46,
"fit": 2,
"analyses": 1,
"[": 10,
"]": 10,
"return": 7,
"[": 23,
"]": 24,
"return": 8,
"df.residual": 2,
"}": 7,
"}": 46,
"df.residual.lme": 1,
"fixDF": 1,
"df.residual.mer": 1,
"sum": 1,
"object@dims": 1,
"*": 2,
"c": 5,
"+": 3,
"c": 11,
"+": 4,
"df.residual.default": 1,
"q": 2,
"q": 3,
"df": 3,
"if": 3,
"is.null": 1,
"if": 19,
"is.null": 8,
"mk": 2,
"try": 2,
"try": 3,
"coef": 1,
"silent": 2,
"TRUE": 5,
"silent": 3,
"TRUE": 14,
"mn": 2,
"f": 5,
"f": 9,
"fitted": 1,
"inherits": 2,
"inherits": 6,
"|": 3,
"NULL": 2,
"n": 3,
@@ -52256,18 +52345,78 @@
"is.data.frame": 1,
"is.matrix": 1,
"nrow": 1,
"length": 2,
"length": 3,
"k": 3,
"max": 1,
"SHEBANG#!Rscript": 1,
"SHEBANG#!Rscript": 2,
"#": 45,
"MedianNorm": 2,
"data": 11,
"geomeans": 3,
"<->": 1,
"exp": 1,
"rowMeans": 1,
"log": 5,
"apply": 2,
"2": 1,
"cnts": 2,
"median": 1,
"library": 1,
"print_usage": 2,
"file": 4,
"stderr": 1,
"cat": 1,
"spec": 2,
"matrix": 3,
"byrow": 3,
"ncol": 3,
"opt": 23,
"getopt": 1,
"help": 1,
"stdout": 1,
"status": 1,
"height": 7,
"out": 4,
"res": 6,
"width": 7,
"ylim": 7,
"read.table": 1,
"header": 1,
"sep": 4,
"quote": 1,
"nsamp": 8,
"dim": 1,
"outfile": 4,
"sprintf": 2,
"png": 2,
"h": 12,
"hist": 4,
"plot": 7,
"FALSE": 9,
"mids": 4,
"density": 4,
"type": 3,
"col": 4,
"rainbow": 4,
"main": 2,
"xlab": 2,
"ylab": 2,
"for": 3,
"i": 6,
"in": 8,
"lines": 6,
"devnum": 2,
"dev.off": 2,
"size.factors": 2,
"data.matrix": 1,
"data.norm": 3,
"t": 1,
"x": 3,
"/": 1,
"ParseDates": 2,
"lines": 4,
"dates": 3,
"matrix": 2,
"unlist": 2,
"strsplit": 2,
"ncol": 2,
"byrow": 2,
"strsplit": 3,
"days": 2,
"times": 2,
"hours": 2,
@@ -52288,7 +52437,6 @@
"ggplot": 1,
"aes": 2,
"y": 1,
"x": 1,
"geom_point": 1,
"size": 1,
"Freq": 1,
@@ -52296,11 +52444,214 @@
"range": 1,
"ggsave": 1,
"filename": 1,
"plot": 1,
"width": 1,
"height": 1,
"hello": 2,
"print": 1,
"module": 25,
"code": 19,
"available": 1,
"via": 1,
"the": 16,
"environment": 4,
"like": 1,
"it": 3,
"returns.": 1,
"@param": 2,
"an": 1,
"identifier": 1,
"specifying": 1,
"full": 1,
"path": 9,
"search": 5,
"see": 1,
"Details": 1,
"even": 1,
"attach": 11,
"is": 7,
"optionally": 1,
"attached": 2,
"to": 8,
"of": 1,
"current": 2,
"scope": 1,
"defaults": 1,
".": 5,
"However": 1,
"interactive": 2,
"invoked": 1,
"directly": 1,
"from": 3,
"terminal": 1,
"only": 1,
"i.e.": 1,
"not": 4,
"within": 1,
"modules": 4,
"import.attach": 1,
"can": 2,
"be": 7,
"set": 1,
"or": 1,
"depending": 1,
"on": 1,
"user": 1,
"s": 2,
"preference.": 1,
"attach_operators": 3,
"causes": 1,
"emph": 3,
"operators": 3,
"by": 1,
"default": 1,
"path.": 1,
"Not": 1,
"attaching": 1,
"them": 1,
"therefore": 1,
"drastically": 1,
"limits": 1,
"a": 5,
"usefulness.": 1,
"Modules": 1,
"are": 1,
"searched": 1,
"options": 1,
"priority.": 1,
"The": 2,
"directory": 1,
"always": 1,
"considered": 1,
"first.": 1,
"That": 1,
"local": 3,
"./a.r": 1,
"will": 2,
"loaded.": 1,
"Module": 1,
"names": 2,
"fully": 1,
"qualified": 1,
"refer": 1,
"nested": 1,
"paths.": 1,
"See": 1,
"import": 5,
"executed": 1,
"global": 1,
"effect": 1,
"same.": 1,
"When": 1,
"used": 2,
"globally": 1,
"inside": 1,
"newly": 2,
"outside": 1,
"nor": 1,
"other": 2,
"which": 3,
"might": 1,
"loaded": 4,
"@examples": 1,
"@seealso": 3,
"reload": 3,
"@export": 2,
"substitute": 2,
"stopifnot": 3,
"missing": 1,
"&&": 2,
"module_name": 7,
"getOption": 1,
"else": 4,
"class": 4,
"module_path": 15,
"find_module": 1,
"stop": 1,
"attr": 2,
"message": 1,
"containing_modules": 3,
"module_init_files": 1,
"mapply": 1,
"do_import": 4,
"mod_ns": 5,
"as.character": 3,
"module_parent": 8,
"parent.frame": 2,
"mod_env": 7,
"exhibit_namespace": 3,
"identical": 2,
".GlobalEnv": 2,
"name": 9,
"environmentName": 2,
"parent.env": 4,
"export_operators": 2,
"invisible": 1,
"is_module_loaded": 1,
"get_loaded_module": 1,
"namespace": 13,
"structure": 3,
"new.env": 1,
"parent": 9,
".BaseNamespaceEnv": 1,
"paste": 3,
"source": 2,
"chdir": 1,
"envir": 5,
"cache_module": 1,
"exported_functions": 2,
"lsf.str": 2,
"list2env": 2,
"sapply": 2,
"get": 2,
"ops": 2,
"is_predefined": 2,
"%": 2,
"is_op": 2,
"prefix": 3,
"||": 1,
"grepl": 1,
"Filter": 1,
"op_env": 4,
"cache.": 1,
"@note": 1,
"Any": 1,
"references": 1,
"remain": 1,
"unchanged": 1,
"and": 2,
"files": 1,
"would": 1,
"have": 1,
"happened": 1,
"without": 1,
"unload": 2,
"should": 2,
"production": 1,
"code.": 1,
"does": 1,
"currently": 1,
"detach": 1,
"environments.": 1,
"Reload": 1,
"given": 1,
"Remove": 1,
"cache": 1,
"forcing": 1,
"reload.": 1,
"reloaded": 1,
"reference": 1,
"unloaded": 1,
"still": 1,
"work.": 1,
"Reloading": 1,
"primarily": 1,
"useful": 1,
"testing": 1,
"during": 1,
"module_ref": 3,
"rm": 1,
"list": 1,
".loaded_modules": 1,
"whatnot.": 1,
"assign": 1,
"##polyg": 1,
"vector": 2,
"##numpoints": 1,
@@ -52314,8 +52665,7 @@
"pts": 1,
"spsample": 1,
"polyg": 1,
"numpoints": 1,
"type": 1
"numpoints": 1
},
"Racket": {
";": 3,
@@ -52884,6 +53234,249 @@
"print": 4,
"author": 1
},
"Red": {
"Red": 3,
"[": 111,
"Title": 2,
"Author": 1,
"]": 114,
"File": 1,
"%": 2,
"console.red": 1,
"Tabs": 1,
"Rights": 1,
"License": 2,
"{": 11,
"Distributed": 1,
"under": 1,
"the": 3,
"Boost": 1,
"Software": 1,
"Version": 1,
"See": 1,
"https": 1,
"//github.com/dockimbel/Red/blob/master/BSL": 1,
"-": 74,
"License.txt": 1,
"}": 11,
"Purpose": 2,
"Language": 2,
"http": 2,
"//www.red": 2,
"lang.org/": 2,
"#system": 1,
"global": 1,
"#either": 3,
"OS": 3,
"MacOSX": 2,
"History": 1,
"library": 1,
"cdecl": 3,
"add": 2,
"history": 2,
";": 31,
"Add": 1,
"line": 9,
"to": 2,
"history.": 1,
"c": 7,
"string": 10,
"rl": 4,
"insert": 3,
"wrapper": 2,
"func": 1,
"count": 3,
"integer": 16,
"key": 3,
"return": 10,
"Windows": 2,
"system/platform": 1,
"ret": 5,
"AttachConsole": 1,
"if": 2,
"zero": 3,
"print": 5,
"halt": 2,
"SetConsoleTitle": 1,
"as": 4,
"string/rs": 1,
"head": 1,
"str": 4,
"bind": 1,
"tab": 3,
"input": 2,
"routine": 1,
"prompt": 3,
"/local": 1,
"len": 1,
"buffer": 4,
"string/load": 1,
"+": 1,
"length": 1,
"free": 1,
"byte": 3,
"ptr": 14,
"SET_RETURN": 1,
"(": 6,
")": 4,
"delimiters": 1,
"function": 6,
"block": 3,
"list": 1,
"copy": 2,
"none": 1,
"foreach": 1,
"case": 2,
"escaped": 2,
"no": 2,
"in": 2,
"comment": 2,
"switch": 3,
"#": 8,
"mono": 3,
"mode": 3,
"cnt/1": 1,
"red": 1,
"eval": 1,
"code": 3,
"load/all": 1,
"unless": 1,
"tail": 1,
"set/any": 1,
"not": 1,
"script/2": 1,
"do": 2,
"skip": 1,
"script": 1,
"quit": 2,
"init": 1,
"console": 2,
"Console": 1,
"alpha": 1,
"version": 3,
"only": 1,
"ASCII": 1,
"supported": 1,
"Red/System": 1,
"#include": 1,
"../common/FPU": 1,
"configuration.reds": 1,
"C": 1,
"types": 1,
"#define": 2,
"time": 2,
"long": 2,
"clock": 1,
"date": 1,
"alias": 2,
"struct": 5,
"second": 1,
"minute": 1,
"hour": 1,
"day": 1,
"month": 1,
"year": 1,
"Since": 1,
"weekday": 1,
"since": 1,
"Sunday": 1,
"yearday": 1,
"daylight": 1,
"saving": 1,
"Negative": 1,
"unknown": 1,
"#import": 1,
"LIBC": 1,
"file": 1,
"Error": 1,
"handling": 1,
"form": 1,
"error": 5,
"Return": 1,
"description.": 1,
"Print": 1,
"standard": 1,
"output.": 1,
"Memory": 1,
"management": 1,
"make": 1,
"Allocate": 1,
"filled": 1,
"memory.": 1,
"chunks": 1,
"size": 5,
"binary": 4,
"resize": 1,
"Resize": 1,
"memory": 2,
"allocation.": 1,
"JVM": 6,
"reserved0": 1,
"int": 6,
"reserved1": 1,
"reserved2": 1,
"DestroyJavaVM": 1,
"JNICALL": 5,
"vm": 5,
"jint": 5,
"AttachCurrentThread": 1,
"penv": 3,
"p": 3,
"args": 2,
"DetachCurrentThread": 1,
"GetEnv": 1,
"AttachCurrentThreadAsDaemon": 1,
"just": 2,
"some": 2,
"datatypes": 1,
"for": 1,
"testing": 1,
"#some": 1,
"hash": 1,
"FF0000": 3,
"FF000000": 2,
"with": 4,
"instead": 1,
"of": 1,
"space": 2,
"/wAAAA": 1,
"/wAAA": 2,
"A": 2,
"inside": 2,
"char": 1,
"bla": 2,
"ff": 1,
"foo": 3,
"numbers": 1,
"which": 1,
"interpreter": 1,
"path": 1,
"h": 1,
"#if": 1,
"type": 1,
"exe": 1,
"push": 3,
"system/stack/frame": 2,
"save": 1,
"previous": 1,
"frame": 2,
"pointer": 2,
"system/stack/top": 1,
"@@": 1,
"reposition": 1,
"after": 1,
"catch": 1,
"flag": 1,
"CATCH_ALL": 1,
"exceptions": 1,
"root": 1,
"barrier": 1,
"keep": 1,
"stack": 1,
"aligned": 1,
"on": 1,
"bit": 1
},
"RMarkdown": {
"Some": 1,
"text.": 1,
@@ -62441,6 +63034,7 @@
"Groovy Server Pages": 91,
"Haml": 4,
"Handlebars": 69,
"Haskell": 302,
"HTML": 413,
"Hy": 155,
"IDL": 418,
@@ -62514,11 +63108,12 @@
"Protocol Buffer": 63,
"PureScript": 1652,
"Python": 5715,
"R": 392,
"R": 1667,
"Racket": 331,
"Ragel in Ruby Host": 593,
"RDoc": 279,
"Rebol": 533,
"Red": 816,
"RMarkdown": 19,
"RobotFramework": 483,
"Ruby": 3862,
@@ -62619,6 +63214,7 @@
"Groovy Server Pages": 4,
"Haml": 1,
"Handlebars": 2,
"Haskell": 3,
"HTML": 2,
"Hy": 2,
"IDL": 4,
@@ -62692,11 +63288,12 @@
"Protocol Buffer": 1,
"PureScript": 4,
"Python": 7,
"R": 4,
"R": 6,
"Racket": 2,
"Ragel in Ruby Host": 3,
"RDoc": 1,
"Rebol": 6,
"Red": 2,
"RMarkdown": 1,
"RobotFramework": 3,
"Ruby": 17,
@@ -62742,5 +63339,5 @@
"YAML": 2,
"Zephir": 2
},
"md5": "0ab9fe87b3d811ca32ad705d2653b98f"
"md5": "fa38e2b617caaf230146a7adab264419"
}

View File

@@ -98,6 +98,9 @@
# AngularJS
- (^|/)angular([^.]*)(\.min)?\.js$
# D3.js
- (^|\/)d3(\.v\d+)?([^.]*)(\.min)?\.js$
# React
- (^|/)react(-[^.]*)?(\.min)?\.js$