KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-12-08 12:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1515-local

Browse Source
This commit is contained in:
Arfon Smith
2014-09-17 09:54:45 -05:00
parent c49ce55714 82285df54b
commit 4cc679c1e5
16 changed files with 56860 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/linguist/heuristics.rb
View File

@@ -23,7 +23,7 @@ module Linguist
end
end
# .h extensions are ambigious between C, C++, and Objective-C.
# .h extensions are ambiguous between C, C++, and Objective-C.
# We want to shortcut look for Objective-C _and_ now C++ too!
#
# Returns an array of Languages or []

2
lib/linguist/language.rb
View File

@@ -135,7 +135,7 @@ module Linguist
# No shebang. Still more work to do. Try to find it with our heuristics.
elsif (determined = Heuristics.find_by_heuristics(data, possible_language_names)) && !determined.empty?
determined.first
# Lastly, fall back to the probablistic classifier.
# Lastly, fall back to the probabilistic classifier.
elsif classified = Classifier.classify(Samples::DATA, data, possible_language_names).first
# Return the actual Language object based of the string language name (i.e., first element of `#classify`)
Language[classified[0]]

19
lib/linguist/languages.yml
View File

@@ -119,7 +119,7 @@ ApacheConf:
Apex:
type: programming
lexer: Text only
lexer: Java
extensions:
- .cls
@@ -283,7 +283,7 @@ C#:
type: programming
ace_mode: csharp
search_term: csharp
color: "#5a25a2"
color: "#178600"
aliases:
- csharp
extensions:
@@ -756,6 +756,14 @@ Frege:
extensions:
- .fr
G-code:
type: data
lexer: Text only
extensions:
- .g
- .gco
- .gcode
Game Maker Language:
type: programming
color: "#8ad353"
@@ -785,6 +793,12 @@ GAS:
- .s
- .S
GDScript:
type: programming
lexer: Text only
extensions:
- .gd
GLSL:
group: C
type: programming
@@ -1792,6 +1806,7 @@ Processing:
Prolog:
type: programming
lexer: Logtalk
color: "#74283c"
extensions:
- .pl

464
lib/linguist/samples.json
View File

@@ -181,6 +181,9 @@
"Frege": [
".fr"
],
"G-code": [
".g"
],
"GAMS": [
".gms"
],
@@ -192,6 +195,9 @@
"GAS": [
".s"
],
"GDScript": [
".gd"
],
"GLSL": [
".fp",
".frag",
@@ -854,8 +860,8 @@
"exception.zep.php"
]
},
"tokens_total": 659559,
"languages_total": 908,
"tokens_total": 661949,
"languages_total": 916,
"tokens": {
"ABAP": {
"*/**": 1,
@@ -22836,6 +22842,69 @@
"newContentPane.setOpaque": 1,
"frame.setContentPane": 1
},
"G-code": {
";": 8,
"RepRapPro": 1,
"Ormerod": 1,
"Board": 1,
"test": 1,
"GCodes": 1,
"M111": 1,
"S1": 1,
"Debug": 1,
"on": 1,
"G21": 1,
"mm": 1,
"G90": 1,
"Absolute": 1,
"positioning": 1,
"M83": 1,
"Extrusion": 1,
"relative": 1,
"M906": 1,
"X800": 1,
"Y800": 1,
"Z800": 1,
"E800": 1,
"Motor": 1,
"currents": 1,
"(": 1,
"mA": 1,
")": 1,
"T0": 2,
"Extruder": 1,
"G1": 17,
"X50": 1,
"F500": 2,
"X0": 2,
"G4": 18,
"P500": 6,
"Y50": 1,
"Y0": 2,
"Z20": 1,
"F200": 2,
"Z0": 1,
"E20": 1,
"E": 1,
"-": 146,
"M106": 2,
"S255": 1,
"S0": 1,
"M105": 13,
"G10": 1,
"P0": 1,
"S100": 2,
"M140": 1,
"P5000": 12,
"M0": 2,
"e": 145,
"G28": 1,
"X55": 3,
"Y5": 3,
"F2000": 1,
"Y180": 2,
"X180": 2
},
"GAMS": {
"*Basic": 1,
"example": 2,
@@ -24207,6 +24276,391 @@
"xd": 1,
".subsections_via_symbols": 1
},
"GDScript": {
"extends": 4,
"BaseClass": 1,
"var": 86,
"a": 6,
"s": 4,
"arr": 1,
"[": 22,
"]": 22,
"dict": 1,
"{": 2,
"}": 2,
"const": 11,
"answer": 1,
"thename": 1,
"v2": 1,
"Vector2": 61,
"(": 314,
")": 313,
"v3": 1,
"Vector3": 9,
"func": 19,
"some_function": 1,
"param1": 4,
"param2": 5,
"local_var": 2,
"if": 56,
"<": 14,
"print": 6,
"elif": 4,
"else": 11,
"for": 9,
"i": 7,
"in": 12,
"range": 6,
"while": 1,
"-": 31,
"local_var2": 2,
"+": 24,
"return": 14,
"class": 1,
"Something": 1,
"_init": 1,
"lv": 10,
"Something.new": 1,
"lv.a": 1,
"Control": 1,
"score": 4,
"score_label": 2,
"null": 1,
"MAX_SHAPES": 2,
"block": 3,
"preload": 2,
"block_colors": 3,
"Color": 7,
"block_shapes": 4,
"#": 18,
"I": 1,
"O": 1,
"S": 1,
"Z": 1,
"L": 1,
"J": 1,
"T": 1,
"block_rotations": 2,
"Matrix32": 4,
"width": 5,
"height": 6,
"cells": 8,
"piece_active": 7,
"false": 16,
"piece_shape": 8,
"piece_pos": 3,
"piece_rot": 5,
"piece_cell_xform": 4,
"p": 2,
"er": 4,
"r": 2,
"%": 3,
".xform": 1,
"_draw": 1,
"sb": 2,
"get_stylebox": 1,
"use": 1,
"line": 1,
"edit": 1,
"bg": 1,
"draw_style_box": 1,
"Rect2": 5,
"get_size": 1,
".grow": 1,
"bs": 3,
"block.get_size": 1,
"y": 12,
"x": 12,
"draw_texture_rect": 2,
"*bs": 2,
"c": 6,
"piece_check_fit": 6,
"ofs": 2,
"pos": 4,
"pos.x": 2,
"pos.y": 2,
"true": 11,
"new_piece": 3,
"randi": 1,
"width/2": 1,
"piece_pos.y": 2,
"not": 5,
"#game": 1,
"over": 1,
"#print": 1,
"game_over": 2,
"update": 7,
"test_collapse_rows": 2,
"accum_down": 6,
"collapse": 3,
"cells.erase": 1,
"accum_down*100": 1,
"score_label.set_text": 2,
"str": 1,
"get_node": 24,
".set_text": 2,
"restart_pressed": 1,
"cells.clear": 1,
"piece_move_down": 2,
"piece_rotate": 2,
"adv": 2,
"_input": 1,
"ie": 1,
"ie.is_pressed": 1,
"ie.is_action": 4,
"piece_pos.x": 2,
"setup": 2,
"w": 3,
"h": 3,
"set_size": 1,
"*block.get_size": 1,
".start": 1,
"_ready": 3,
"Initalization": 2,
"here": 2,
"set_process_input": 1,
"RigidBody": 1,
"#var": 1,
"dir": 8,
"ANIM_FLOOR": 2,
"ANIM_AIR_UP": 2,
"ANIM_AIR_DOWN": 2,
"SHOOT_TIME": 2,
"SHOOT_SCALE": 2,
"CHAR_SCALE": 2,
"facing_dir": 2,
"movement_dir": 3,
"jumping": 5,
"turn_speed": 2,
"keep_jump_inertia": 2,
"air_idle_deaccel": 2,
"accel": 2,
"deaccel": 2,
"sharp_turn_threshhold": 2,
"max_speed": 5,
"on_floor": 3,
"prev_shoot": 3,
"last_floor_velocity": 5,
"shoot_blend": 7,
"adjust_facing": 3,
"p_facing": 4,
"p_target": 2,
"p_step": 2,
"p_adjust_rate": 2,
"current_gn": 2,
"n": 2,
"normal": 1,
"t": 2,
"n.cross": 1,
".normalized": 2,
"n.dot": 1,
"t.dot": 1,
"ang": 12,
"atan2": 1,
"abs": 1,
"too": 1,
"small": 1,
"sign": 1,
"*": 15,
"turn": 3,
"cos": 2,
"sin": 1,
"p_facing.length": 1,
"_integrate_forces": 1,
"state": 5,
"state.get_linear_velocity": 1,
"linear": 1,
"velocity": 3,
"g": 3,
"state.get_total_gravity": 1,
"delta": 8,
"state.get_step": 1,
"d": 2,
"delta*state.get_total_density": 1,
"<0):>": 2,
"d=": 1,
"apply": 1,
"gravity": 2,
"anim": 4,
"up": 12,
"normalized": 6,
"is": 1,
"against": 1,
"vv": 5,
"dot": 3,
"vertical": 1,
"hv": 8,
"horizontal": 3,
"hdir": 7,
"direction": 6,
"hspeed": 14,
"length": 1,
"speed": 2,
"floor_velocity": 5,
"onfloor": 6,
"get_contact_count": 2,
"0": 6,
"get_contact_local_shape": 1,
"1": 2,
"continue": 1,
"get_contact_collider_velocity_at_pos": 1,
"break": 1,
"where": 1,
"does": 1,
"the": 1,
"player": 1,
"intend": 1,
"to": 3,
"walk": 1,
"cam_xform": 5,
"target": 1,
"camera": 1,
"get_global_transform": 1,
"Input": 6,
"is_action_pressed": 6,
"move_forward": 1,
"basis": 5,
"2": 2,
"move_backwards": 1,
"move_left": 1,
"move_right": 1,
"jump_attempt": 2,
"jump": 2,
"shoot_attempt": 3,
"shoot": 1,
"target_dir": 5,
"sharp_turn": 2,
"and": 16,
"rad2deg": 1,
"acos": 1,
"target_dir.dot": 1,
"dir.length": 2,
"#linear_dir": 1,
"linear_h_velocity/linear_vel": 1,
"#if": 2,
"linear_vel": 1,
"brake_velocity_limit": 1,
"linear_dir.dot": 1,
"ctarget_dir": 1,
"Math": 1,
"deg2rad": 1,
"brake_angular_limit": 1,
"brake": 1,
"#else": 1,
"/hspeed*turn_speed": 1,
"accel*delta": 1,
"deaccel*delta": 1,
"hspeed=": 1,
"mesh_xform": 2,
"Armature": 2,
"get_transform": 1,
"facing_mesh=": 1,
"facing_mesh": 7,
"m3": 2,
"Matrix3": 1,
"cross": 1,
"scaled": 1,
"set_transform": 1,
"Transform": 1,
"origin": 1,
"7": 1,
"sfx": 1,
"play": 1,
"hs": 1,
"hv.length": 1,
"hv.normalized": 1,
"hdir*hspeed": 1,
"up*vv": 1,
"#lv": 1,
"pass": 2,
"state.set_linear_velocity": 1,
"bullet": 3,
".instance": 1,
"bullet.set_transform": 1,
".get_global_transform": 2,
".orthonormalized": 1,
"get_parent": 1,
".add_child": 1,
"bullet.set_linear_velocity": 1,
".basis": 1,
"PS.body_add_collision_exception": 1,
"bullet.get_rid": 1,
"get_rid": 1,
"#add": 1,
"it": 1,
".play": 1,
".blend2_node_set_amount": 2,
"/": 1,
".transition_node_set_current": 1,
"min": 1,
"state.set_angular_velocity": 1,
".set_active": 1,
"Node2D": 1,
"INITIAL_BALL_SPEED": 3,
"ball_speed": 2,
"screen_size": 2,
"#default": 1,
"ball": 3,
"pad_size": 4,
"PAD_SPEED": 1,
"_process": 1,
"get": 2,
"positio": 1,
"pad": 3,
"rectangles": 1,
"ball_pos": 8,
".get_pos": 5,
"left_rect": 1,
"pad_size*0.5": 2,
"right_rect": 1,
"#integrate": 1,
"new": 1,
"postion": 1,
"direction*ball_speed*delta": 1,
"#flip": 2,
"when": 2,
"touching": 2,
"roof": 1,
"or": 4,
"floor": 1,
"ball_pos.y": 1,
"direction.y": 5,
"<0)>": 1,
"screen_size.y": 3,
"change": 1,
"increase": 1,
"pads": 1,
"left_rect.has_point": 1,
"direction.x": 4,
"right_rect.has_point": 1,
"ball_speed*": 1,
"randf": 1,
"*2.0": 1,
"direction.normalized": 1,
"#check": 1,
"gameover": 1,
"ball_pos.x": 1,
"<0>": 1,
"screen_size.x": 1,
"screen_size*0.5": 1,
".set_pos": 3,
"#move": 2,
"left": 1,
"left_pos": 2,
"left_pos.y": 4,
"Input.is_action_pressed": 4,
"PAD_SPEED*delta": 4,
"right": 1,
"right_pos": 2,
"right_pos.y": 4,
"get_viewport_rect": 1,
".size": 1,
"actual": 1,
"size": 1,
".get_texture": 1,
".get_size": 1,
"set_process": 1
},
"GLSL": {
"////": 4,
"High": 1,
@@ -73160,9 +73614,11 @@
"Erlang": 2928,
"Forth": 1516,
"Frege": 5564,
"G-code": 432,
"GAMS": 363,
"GAP": 9944,
"GAS": 133,
"GDScript": 1958,
"GLSL": 4076,
"Game Maker Language": 13310,
"Gnuplot": 1023,
@@ -73375,9 +73831,11 @@
"Erlang": 5,
"Forth": 7,
"Frege": 4,
"G-code": 4,
"GAMS": 1,
"GAP": 7,
"GAS": 1,
"GDScript": 4,
"GLSL": 7,
"Game Maker Language": 13,
"Gnuplot": 6,
@@ -73538,5 +73996,5 @@
"fish": 3,
"wisp": 1
},
"md5": "1a8591982ec28c592a742122734c142c"
"md5": "c4591bd0be052bcbb2ab31e06fe4c730"
}