Bumping Linguist to v4.8.3 (#2950)

* Add GraphQL to languages.yml

* Add graphql submodule

* Add graphql to grammars.yml

* Add GraphQL samples

* Updating licensed information

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "vendor/grammars/sublime-cirru"]
 	path = vendor/grammars/sublime-cirru
 	url = https://github.com/Cirru/sublime-cirru
-[submodule "vendor/grammars/Sublime-Logos"]
-	path = vendor/grammars/Sublime-Logos
-	url = https://github.com/Cykey/Sublime-Logos
 [submodule "vendor/grammars/SublimeBrainfuck"]
 	path = vendor/grammars/SublimeBrainfuck
 	url = https://github.com/Drako/SublimeBrainfuck
@@ -25,15 +22,9 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/autoitv3-tmbundle"]
-	path = vendor/grammars/autoitv3-tmbundle
-	url = https://github.com/Red-Nova-Technologies/autoitv3-tmbundle
 [submodule "vendor/grammars/Sublime-VimL"]
 	path = vendor/grammars/Sublime-VimL
 	url = https://github.com/SalGnt/Sublime-VimL
-[submodule "vendor/grammars/boo-sublime"]
-	path = vendor/grammars/boo-sublime
-	url = https://github.com/Shammah/boo-sublime
 [submodule "vendor/grammars/ColdFusion"]
 	path = vendor/grammars/ColdFusion
 	url = https://github.com/SublimeText/ColdFusion
@@ -88,9 +79,6 @@
 [submodule "vendor/grammars/language-yaml"]
 	path = vendor/grammars/language-yaml
 	url = https://github.com/atom/language-yaml
-[submodule "vendor/grammars/sublime-sourcepawn"]
-	path = vendor/grammars/sublime-sourcepawn
-	url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/Sublime-Lasso"]
 	path = vendor/grammars/Sublime-Lasso
 	url = https://github.com/bfad/Sublime-Lasso
@@ -109,9 +97,6 @@
 [submodule "vendor/grammars/sublime-MuPAD"]
 	path = vendor/grammars/sublime-MuPAD
 	url = https://github.com/ccreutzig/sublime-MuPAD
-[submodule "vendor/grammars/nesC.tmbundle"]
-	path = vendor/grammars/nesC.tmbundle
-	url = https://github.com/cdwilson/nesC.tmbundle
 [submodule "vendor/grammars/haxe-sublime-bundle"]
 	path = vendor/grammars/haxe-sublime-bundle
 	url = https://github.com/clemos/haxe-sublime-bundle
@@ -133,9 +118,6 @@
 [submodule "vendor/grammars/fancy-tmbundle"]
 	path = vendor/grammars/fancy-tmbundle
 	url = https://github.com/fancy-lang/fancy-tmbundle
-[submodule "vendor/grammars/monkey.tmbundle"]
-	path = vendor/grammars/monkey.tmbundle
-	url = https://github.com/gingerbeardman/monkey.tmbundle
 [submodule "vendor/grammars/dart-sublime-bundle"]
 	path = vendor/grammars/dart-sublime-bundle
 	url = https://github.com/guillermooo/dart-sublime-bundle
@@ -166,18 +148,12 @@
 [submodule "vendor/grammars/fish-tmbundle"]
 	path = vendor/grammars/fish-tmbundle
 	url = https://github.com/l15n/fish-tmbundle
-[submodule "vendor/grammars/sublime-idris"]
-	path = vendor/grammars/sublime-idris
-	url = https://github.com/laughedelic/sublime-idris
 [submodule "vendor/grammars/moonscript-tmbundle"]
 	path = vendor/grammars/moonscript-tmbundle
 	url = https://github.com/leafo/moonscript-tmbundle
 [submodule "vendor/grammars/Isabelle.tmbundle"]
 	path = vendor/grammars/Isabelle.tmbundle
 	url = https://github.com/lsf37/Isabelle.tmbundle
-[submodule "vendor/grammars/x86-assembly-textmate-bundle"]
-	path = vendor/grammars/x86-assembly-textmate-bundle
-	url = https://github.com/lunixbochs/x86-assembly-textmate-bundle
 [submodule "vendor/grammars/Alloy.tmbundle"]
 	path = vendor/grammars/Alloy.tmbundle
 	url = https://github.com/macekond/Alloy.tmbundle
@@ -208,9 +184,6 @@
 [submodule "vendor/grammars/Julia.tmbundle"]
 	path = vendor/grammars/Julia.tmbundle
 	url = https://github.com/nanoant/Julia.tmbundle
-[submodule "vendor/grammars/assembly.tmbundle"]
-	path = vendor/grammars/assembly.tmbundle
-	url = https://github.com/nanoant/assembly.tmbundle
 [submodule "vendor/grammars/ooc.tmbundle"]
 	path = vendor/grammars/ooc.tmbundle
 	url = https://github.com/nilium/ooc.tmbundle
@@ -220,9 +193,6 @@
 [submodule "vendor/grammars/sublime-tea"]
 	path = vendor/grammars/sublime-tea
 	url = https://github.com/pferruggiaro/sublime-tea
-[submodule "vendor/grammars/puppet-textmate-bundle"]
-	path = vendor/grammars/puppet-textmate-bundle
-	url = https://github.com/puppet-textmate-bundle/puppet-textmate-bundle
 [submodule "vendor/grammars/abap.tmbundle"]
 	path = vendor/grammars/abap.tmbundle
 	url = https://github.com/pvl/abap.tmbundle
@@ -448,9 +418,6 @@
 [submodule "vendor/grammars/llvm.tmbundle"]
 	path = vendor/grammars/llvm.tmbundle
 	url = https://github.com/whitequark/llvm.tmbundle
-[submodule "vendor/grammars/sublime-nix"]
-	path = vendor/grammars/sublime-nix
-	url = https://github.com/wmertens/sublime-nix
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
@@ -509,24 +476,9 @@
 [submodule "vendor/grammars/liquid.tmbundle"]
 	path = vendor/grammars/liquid.tmbundle
 	url = https://github.com/bastilian/validcode-textmate-bundles
-[submodule "vendor/grammars/ats.sublime"]
-	path = vendor/grammars/ats.sublime
-	url = https://github.com/steinwaywhw/ats-mode-sublimetext
 [submodule "vendor/grammars/Modelica"]
 	path = vendor/grammars/Modelica
 	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
-[submodule "vendor/grammars/sublime-apl"]
-	path = vendor/grammars/sublime-apl
-	url = https://github.com/StoneCypher/sublime-apl
-[submodule "vendor/grammars/CLIPS-sublime"]
-	path = vendor/grammars/CLIPS-sublime
-	url = https://github.com/psicomante/CLIPS-sublime
-[submodule "vendor/grammars/Creole"]
-	path = vendor/grammars/Creole
-	url = https://github.com/Siddley/Creole
-[submodule "vendor/grammars/GDScript-sublime"]
-	path = vendor/grammars/GDScript-sublime
-	url = https://github.com/beefsack/GDScript-sublime
 [submodule "vendor/grammars/sublime-golo"]
 	path = vendor/grammars/sublime-golo
 	url = https://github.com/TypeUnsafe/sublime-golo
@@ -539,9 +491,6 @@
 [submodule "vendor/grammars/G-Code"]
 	path = vendor/grammars/G-Code
 	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
-[submodule "vendor/grammars/grace-tmbundle"]
-	path = vendor/grammars/grace-tmbundle
-	url = https://github.com/zmthy/grace-tmbundle
 [submodule "vendor/grammars/sublime-text-ox"]
 	path = vendor/grammars/sublime-text-ox
 	url = https://github.com/andreashetland/sublime-text-ox
@@ -551,9 +500,6 @@
 [submodule "vendor/grammars/ec.tmbundle"]
 	path = vendor/grammars/ec.tmbundle
 	url = https://github.com/ecere/ec.tmbundle
-[submodule "vendor/grammars/InnoSetup"]
-	path = vendor/grammars/InnoSetup
-	url = https://github.com/idleberg/InnoSetup-Sublime-Text
 [submodule "vendor/grammars/gap-tmbundle"]
 	path = vendor/grammars/gap-tmbundle
 	url = https://github.com/dhowden/gap-tmbundle
@@ -575,9 +521,6 @@
 [submodule "vendor/grammars/SublimeClarion"]
 	path = vendor/grammars/SublimeClarion
 	url = https://github.com/fushnisoft/SublimeClarion
-[submodule "vendor/grammars/oracle.tmbundle"]
-	path = vendor/grammars/oracle.tmbundle
-	url = https://github.com/mulander/oracle.tmbundle.git
 [submodule "vendor/grammars/BrightScript.tmbundle"]
 	path = vendor/grammars/BrightScript.tmbundle
 	url = https://github.com/cmink/BrightScript.tmbundle
@@ -587,18 +530,12 @@
 [submodule "vendor/grammars/asciidoc.tmbundle"]
 	path = vendor/grammars/asciidoc.tmbundle
 	url = https://github.com/zuckschwerdt/asciidoc.tmbundle
-[submodule "vendor/grammars/sublime-text-pig-latin"]
-	path = vendor/grammars/sublime-text-pig-latin
-	url = https://github.com/goblindegook/sublime-text-pig-latin
 [submodule "vendor/grammars/Lean.tmbundle"]
 	path = vendor/grammars/Lean.tmbundle
 	url = https://github.com/leanprover/Lean.tmbundle
 [submodule "vendor/grammars/ampl"]
 	path = vendor/grammars/ampl
 	url = https://github.com/ampl/sublime-ampl
-[submodule "vendor/grammars/openscad.tmbundle"]
-	path = vendor/grammars/openscad.tmbundle
-	url = https://github.com/tbuser/openscad.tmbundle
 [submodule "vendor/grammars/sublime-varnish"]
 	path = vendor/grammars/sublime-varnish
 	url = https://github.com/brandonwamboldt/sublime-varnish
@@ -650,6 +587,9 @@
 [submodule "vendor/grammars/language-ncl"]
 	path = vendor/grammars/language-ncl
 	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/pawn-sublime-language"]
+	path = vendor/grammars/pawn-sublime-language
+	url = https://github.com/Southclaw/pawn-sublime-language.git
 [submodule "vendor/grammars/atom-language-purescript"]
 	path = vendor/grammars/atom-language-purescript
 	url = https://github.com/purescript-contrib/atom-language-purescript
@@ -716,3 +656,57 @@
 [submodule "vendor/grammars/language-povray"]
 	path = vendor/grammars/language-povray
 	url = https://github.com/c-lipka/language-povray
+[submodule "vendor/grammars/sublime-terra"]
+	path = vendor/grammars/sublime-terra
+	url = https://github.com/pyk/sublime-terra
+[submodule "vendor/grammars/SublimePuppet"]
+	path = vendor/grammars/SublimePuppet
+	url = https://github.com/russCloak/SublimePuppet
+[submodule "vendor/grammars/sublimeassembly"]
+	path = vendor/grammars/sublimeassembly
+	url = https://github.com/Nessphoro/sublimeassembly
+[submodule "vendor/grammars/monkey"]
+	path = vendor/grammars/monkey
+	url = https://github.com/gingerbeardman/monkey.tmbundle
+[submodule "vendor/grammars/assembly"]
+	path = vendor/grammars/assembly
+	url = https://github.com/nanoant/assembly.tmbundle
+[submodule "vendor/grammars/boo"]
+	path = vendor/grammars/boo
+	url = https://github.com/Shammah/boo-sublime
+[submodule "vendor/grammars/logos"]
+	path = vendor/grammars/logos
+	url = https://github.com/Cykey/Sublime-Logos
+[submodule "vendor/grammars/pig-latin"]
+	path = vendor/grammars/pig-latin
+	url = https://github.com/goblindegook/sublime-text-pig-latin
+[submodule "vendor/grammars/sourcepawn"]
+	path = vendor/grammars/sourcepawn
+	url = https://github.com/austinwagner/sublime-sourcepawn
+[submodule "vendor/grammars/gdscript"]
+	path = vendor/grammars/gdscript
+	url = https://github.com/beefsack/GDScript-sublime
+[submodule "vendor/grammars/nesC"]
+	path = vendor/grammars/nesC
+	url = https://github.com/cdwilson/nesC.tmbundle
+[submodule "vendor/grammars/ats"]
+	path = vendor/grammars/ats
+	url = https://github.com/steinwaywhw/ats-mode-sublimetext
+[submodule "vendor/grammars/grace"]
+	path = vendor/grammars/grace
+	url = https://github.com/zmthy/grace-tmbundle
+[submodule "vendor/grammars/nix"]
+	path = vendor/grammars/nix
+	url = https://github.com/wmertens/sublime-nix
+[submodule "vendor/grammars/idris"]
+	path = vendor/grammars/idris
+	url = https://github.com/idris-hackers/idris-sublime.git
+[submodule "vendor/grammars/atomic-dreams"]
+	path = vendor/grammars/atomic-dreams
+	url = https://github.com/PJB3005/atomic-dreams
+[submodule "vendor/grammars/language-apl"]
+	path = vendor/grammars/language-apl
+	url = https://github.com/Alhadis/language-apl.git
+[submodule "vendor/grammars/language-graphql"]
+	path = vendor/grammars/language-graphql
+	url = https://github.com/rmosolgo/language-graphql

github-linguist.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yajl-ruby'
   s.add_development_dependency 'color-proximity', '~> 0.2.1'
-  s.add_development_dependency 'licensee', '6.0.0b1'
+  s.add_development_dependency 'licensed'
 
 end

grammars.yml

@@ -29,15 +29,11 @@ vendor/grammars/AutoHotkey/:
 vendor/grammars/BrightScript.tmbundle/:
 - source.brightauthorproject
 - source.brightscript
-vendor/grammars/CLIPS-sublime:
-- source.clips
 vendor/grammars/ColdFusion:
 - source.cfscript
 - source.cfscript.cfc
 - text.cfml.basic
 - text.html.cfm
-vendor/grammars/Creole:
-- text.html.creole
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
 vendor/grammars/Elm.tmLanguage:
@@ -50,14 +46,10 @@ vendor/grammars/G-Code/:
 - source.MOD
 - source.apt
 - source.gcode
-vendor/grammars/GDScript-sublime/:
-- source.gdscript
 vendor/grammars/Handlebars:
 - text.html.handlebars
 vendor/grammars/IDL-Syntax:
 - source.webidl
-vendor/grammars/InnoSetup/:
-- source.inno
 vendor/grammars/Isabelle.tmbundle:
 - source.isabelle.root
 - source.isabelle.theory
@@ -108,8 +100,6 @@ vendor/grammars/Sublime-HTTP:
 - source.httpspec
 vendor/grammars/Sublime-Lasso:
 - file.lasso
-vendor/grammars/Sublime-Logos:
-- source.logos
 vendor/grammars/Sublime-Loom:
 - source.loomscript
 vendor/grammars/Sublime-Modula-2/:
@@ -134,9 +124,9 @@ vendor/grammars/SublimeBrainfuck:
 vendor/grammars/SublimeClarion/:
 - source.clarion
 vendor/grammars/SublimePapyrus/:
-- source.compiled-papyrus
-- source.papyrus
-- source.papyrus-assembly
+- source.papyrus.skyrim
+vendor/grammars/SublimePuppet/:
+- source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
 vendor/grammars/TXL/:
@@ -178,7 +168,7 @@ vendor/grammars/asciidoc.tmbundle/:
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly.tmbundle:
+vendor/grammars/assembly/:
 - objdump.x86asm
 - source.x86asm
 vendor/grammars/atom-fsharp/:
@@ -193,15 +183,16 @@ vendor/grammars/atom-language-stan/:
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
-vendor/grammars/ats.sublime:
+vendor/grammars/atomic-dreams/:
+- source.dm
+- source.dmf
+vendor/grammars/ats:
 - source.ats
-vendor/grammars/autoitv3-tmbundle:
-- source.autoit.3
 vendor/grammars/awk-sublime:
 - source.awk
 vendor/grammars/bison.tmbundle:
 - source.bison
-vendor/grammars/boo-sublime:
+vendor/grammars/boo/:
 - source.boo
 vendor/grammars/bro-sublime:
 - source.bro
@@ -271,13 +262,15 @@ vendor/grammars/fortran.tmbundle:
 - source.fortran.modern
 vendor/grammars/gap-tmbundle/:
 - source.gap
+vendor/grammars/gdscript/:
+- source.gdscript
 vendor/grammars/gettext.tmbundle:
 - source.po
 vendor/grammars/gnuplot-tmbundle:
 - source.gnuplot
 vendor/grammars/go-tmbundle:
 - source.go
-vendor/grammars/grace-tmbundle/:
+vendor/grammars/grace:
 - source.grace
 vendor/grammars/gradle.tmbundle:
 - source.groovy.gradle
@@ -300,6 +293,8 @@ vendor/grammars/idl.tmbundle:
 - source.idl
 - source.idl-dlm
 - text.idl-idldoc
+vendor/grammars/idris/:
+- source.idris
 vendor/grammars/ini.tmbundle:
 - source.ini
 vendor/grammars/io.tmbundle:
@@ -324,6 +319,8 @@ vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-apl:
+- source.apl
 vendor/grammars/language-babel/:
 - source.js.jsx
 - source.regexp.babel
@@ -343,6 +340,8 @@ vendor/grammars/language-csharp:
 - source.nant-build
 vendor/grammars/language-gfm:
 - source.gfm
+vendor/grammars/language-graphql:
+- source.graphql
 vendor/grammars/language-hy:
 - source.hy
 vendor/grammars/language-inform7:
@@ -393,6 +392,8 @@ vendor/grammars/lisp.tmbundle:
 - source.lisp
 vendor/grammars/llvm.tmbundle:
 - source.llvm
+vendor/grammars/logos:
+- source.logos
 vendor/grammars/logtalk.tmbundle:
 - source.logtalk
 vendor/grammars/lua.tmbundle:
@@ -412,16 +413,18 @@ vendor/grammars/mediawiki.tmbundle/:
 - text.html.mediawiki
 vendor/grammars/mercury-tmlanguage:
 - source.mercury
-vendor/grammars/monkey.tmbundle:
+vendor/grammars/monkey/:
 - source.monkey
 vendor/grammars/moonscript-tmbundle:
 - source.moonscript
 vendor/grammars/nemerle.tmbundle:
 - source.nemerle
-vendor/grammars/nesC.tmbundle:
+vendor/grammars/nesC:
 - source.nesc
 vendor/grammars/ninja.tmbundle:
 - source.ninja
+vendor/grammars/nix:
+- source.nix
 vendor/grammars/objective-c.tmbundle:
 - source.objc
 - source.objc++
@@ -436,14 +439,12 @@ vendor/grammars/ooc.tmbundle:
 - source.ooc
 vendor/grammars/opa.tmbundle:
 - source.opa
-vendor/grammars/openscad.tmbundle/:
-- source.scad
-vendor/grammars/oracle.tmbundle:
-- source.plsql.oracle
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
 - source.pascal
+vendor/grammars/pawn-sublime-language/:
+- source.pawn
 vendor/grammars/perl.tmbundle/:
 - source.perl
 - source.perl.6
@@ -455,6 +456,8 @@ vendor/grammars/php-smarty.tmbundle:
 - text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
+vendor/grammars/pig-latin/:
+- source.pig_latin
 vendor/grammars/pike-textmate:
 - source.pike
 vendor/grammars/postscript.tmbundle:
@@ -465,8 +468,6 @@ vendor/grammars/processing.tmbundle:
 - source.processing
 vendor/grammars/protobuf-tmbundle:
 - source.protobuf
-vendor/grammars/puppet-textmate-bundle:
-- source.puppet
 vendor/grammars/python-django.tmbundle:
 - source.python.django
 - text.html.django
@@ -498,6 +499,8 @@ vendor/grammars/smali-sublime/smali.tmLanguage:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
+vendor/grammars/sourcepawn/:
+- source.sp
 vendor/grammars/sql.tmbundle:
 - source.sql
 vendor/grammars/st2-zonefile:
@@ -507,8 +510,6 @@ vendor/grammars/standard-ml.tmbundle:
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
-vendor/grammars/sublime-apl/:
-- source.apl
 vendor/grammars/sublime-aspectj/:
 - source.aspectj
 vendor/grammars/sublime-befunge:
@@ -522,8 +523,6 @@ vendor/grammars/sublime-glsl:
 - source.glsl
 vendor/grammars/sublime-golo/:
 - source.golo
-vendor/grammars/sublime-idris:
-- source.idris
 vendor/grammars/sublime-mask:
 - source.mask
 vendor/grammars/sublime-netlinx:
@@ -531,8 +530,6 @@ vendor/grammars/sublime-netlinx:
 - source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
-vendor/grammars/sublime-nix:
-- source.nix
 vendor/grammars/sublime-opal/:
 - source.opal
 - source.opalsysdefs
@@ -542,17 +539,15 @@ vendor/grammars/sublime-robot-plugin:
 - text.robot
 vendor/grammars/sublime-rust:
 - source.rust
-vendor/grammars/sublime-sourcepawn:
-- source.sp
 vendor/grammars/sublime-spintools/:
 - source.regexp.spin
 - source.spin
 vendor/grammars/sublime-tea:
 - source.tea
+vendor/grammars/sublime-terra:
+- source.terra
 vendor/grammars/sublime-text-ox/:
 - source.ox
-vendor/grammars/sublime-text-pig-latin/:
-- source.pig_latin
 vendor/grammars/sublime-typescript/:
 - source.ts
 - source.tsx
@@ -566,6 +561,8 @@ vendor/grammars/sublime_cobol:
 vendor/grammars/sublime_man_page_support:
 - source.man
 - text.groff
+vendor/grammars/sublimeassembly/:
+- source.assembly
 vendor/grammars/sublimeprolog/:
 - source.prolog
 - source.prolog.eclipse
@@ -587,8 +584,6 @@ vendor/grammars/verilog.tmbundle:
 - source.verilog
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
-vendor/grammars/x86-assembly-textmate-bundle:
-- source.asm.x86
 vendor/grammars/xc.tmbundle/:
 - source.xc
 vendor/grammars/xml.tmbundle:

lib/linguist/blob.rb

@@ -63,7 +63,7 @@ module Linguist
     #
     # Returns an Array
     def extensions
-      basename, *segments = name.downcase.split(".")
+      _, *segments = name.downcase.split(".")
 
       segments.map.with_index do |segment, index|
         "." + segments[index..-1].join(".")

lib/linguist/heuristics.rb

@@ -127,6 +127,14 @@ module Linguist
         Language["ECL"]
       end
     end
+    
+    disambiguate ".es" do |data|
+      if /^\s*(?:%%|main\s*\(.*?\)\s*->)/.match(data)
+        Language["Erlang"]
+      elsif /(?:\/\/|("|')use strict\1|export\s+default\s|\/\*.*?\*\/)/m.match(data)
+        Language["JavaScript"]
+      end
+    end
 
     disambiguate ".for", ".f" do |data|
       if /^: /.match(data)
@@ -330,7 +338,7 @@ module Linguist
     end
 
     disambiguate ".rpy" do |data|
-      if /(^(import|from|class|def)[\s\S])/m.match(data)
+      if /(^(import|from|class|def)\s)/m.match(data)
         Language["Python"]
       else
         Language["Ren'Py"]

lib/linguist/languages.yml

@@ -230,7 +230,7 @@ Assembly:
   - .a51
   - .inc
   - .nasm
-  tm_scope: source.asm.x86
+  tm_scope: source.assembly
   ace_mode: assembly_x86
 
 Augeas:
@@ -260,7 +260,7 @@ AutoIt:
   - AutoItScript
   extensions:
   - .au3
-  tm_scope: source.autoit.3
+  tm_scope: none
   ace_mode: autohotkey
 
 Awk:
@@ -350,6 +350,7 @@ Boo:
   extensions:
   - .boo
   ace_mode: text
+  tm_scope: source.boo
 
 Brainfuck:
   type: programming
@@ -445,7 +446,7 @@ CLIPS:
   type: programming
   extensions:
   - .clp
-  tm_scope: source.clips
+  tm_scope: none
   ace_mode: text
 
 CMake:
@@ -690,7 +691,7 @@ Creole:
   wrap: true
   extensions:
   - .creole
-  tm_scope: text.html.creole
+  tm_scope: none
   ace_mode: text
 
 Crystal:
@@ -771,7 +772,7 @@ DM:
   - .dm
   aliases:
   - byond
-  tm_scope: source.c++
+  tm_scope: source.dm
   ace_mode: c_cpp
 
 DNS Zone:
@@ -1106,7 +1107,7 @@ GAS:
   extensions:
   - .s
   - .ms
-  tm_scope: source.asm.x86
+  tm_scope: none
   ace_mode: assembly_x86
 
 GDScript:
@@ -1261,6 +1262,14 @@ Graph Modeling Language:
   tm_scope: none
   ace_mode: text
 
+GraphQL:
+  type: data
+  extensions:
+    - .graphql
+  color: "#E535AB"
+  tm_scope: source.graphql
+  ace_mode: text
+
 Graphviz (DOT):
   type: data
   tm_scope: source.dot
@@ -1531,6 +1540,7 @@ Idris:
   - .idr
   - .lidr
   ace_mode: text
+  tm_scope: source.idris
 
 Inform 7:
   type: programming
@@ -1548,7 +1558,7 @@ Inno Setup:
   type: programming
   extensions:
   - .iss
-  tm_scope: source.inno
+  tm_scope: none
   ace_mode: text
 
 Io:
@@ -1692,6 +1702,7 @@ JavaScript:
   - .js
   - ._js
   - .bones
+  - .es
   - .es6
   - .frag
   - .gs
@@ -1961,6 +1972,7 @@ Logos:
   - .x
   - .xi
   ace_mode: text
+  tm_scope: source.logos
 
 Logtalk:
   type: programming
@@ -2064,6 +2076,7 @@ Makefile:
   - .mak
   - .d
   - .mk
+  - .mkfile
   filenames:
   - GNUmakefile
   - Kbuild
@@ -2072,6 +2085,7 @@ Makefile:
   - Makefile.in
   - Makefile.inc
   - makefile
+  - mkfile
   interpreters:
   - make
   ace_mode: makefile
@@ -2234,6 +2248,7 @@ Monkey:
   extensions:
   - .monkey
   ace_mode: text
+  tm_scope: source.monkey
 
 Moocode:
   type: programming
@@ -2506,7 +2521,7 @@ OpenSCAD:
   type: programming
   extensions:
   - .scad
-  tm_scope: source.scad
+  tm_scope: none
   ace_mode: scad
 
 Org:
@@ -2547,8 +2562,9 @@ PAWN:
   color: "#dbb284"
   extensions:
   - .pwn
-  tm_scope: source.c++
-  ace_mode: c_cpp
+  - .inc
+  tm_scope: source.pawn
+  ace_mode: text
 
 PHP:
   type: programming
@@ -2577,7 +2593,7 @@ PHP:
 PLSQL:
   type: programming
   ace_mode: sql
-  tm_scope: source.plsql.oracle
+  tm_scope: none
   color: "#dad8d8"
   extensions:
   - .pls
@@ -2619,7 +2635,7 @@ Papyrus:
   color: "#6600cc"
   extensions:
   - .psc
-  tm_scope: source.papyrus
+  tm_scope: source.papyrus.skyrim
   ace_mode: text
 
 Parrot:
@@ -2841,6 +2857,7 @@ Puppet:
   filenames:
   - Modulefile
   ace_mode: text
+  tm_scope: source.puppet
 
 Pure Data:
   type: programming
@@ -3565,6 +3582,16 @@ Tea:
   tm_scope: source.tea
   ace_mode: text
 
+Terra:
+  type: programming
+  extensions:
+  - .t
+  color: "#00004c"
+  ace_mode: lua
+  group: Lua
+  interpreters:
+  - lua
+
 Text:
   type: prose
   wrap: true
@@ -3831,6 +3858,7 @@ XML:
   - .ditamap
   - .ditaval
   - .dll.config
+  - .dotsettings
   - .filters
   - .fsproj
   - .fxml
@@ -3878,6 +3906,7 @@ XML:
   - .ux
   - .vbproj
   - .vcxproj
+  - .vssettings
   - .vxml
   - .wsdl
   - .wsf
@@ -3899,6 +3928,8 @@ XML:
   filenames:
   - .classpath
   - .project
+  - App.config
+  - NuGet.config
   - Settings.StyleCop
   - Web.Debug.config
   - Web.Release.config
@@ -3982,6 +4013,8 @@ YAML:
   - .syntax
   - .yaml
   - .yaml-tmlanguage
+  filenames:
+  - .clang-format
   ace_mode: yaml
 
 YANG:
@@ -4063,6 +4096,7 @@ nesC:
   extensions:
   - .nc
   ace_mode: text
+  tm_scope: source.nesc
 
 ooc:
   type: programming

lib/linguist/lazy_blob.rb

@@ -28,6 +28,7 @@ module Linguist
       @oid = oid
       @path = path
       @mode = mode
+      @data = nil
     end
 
     def git_attributes

lib/linguist/repository.rb

@@ -30,6 +30,9 @@ module Linguist
       @repository = repo
       @commit_oid = commit_oid
 
+      @old_commit_oid = nil
+      @old_stats = nil
+
       raise TypeError, 'commit_oid must be a commit SHA1' unless commit_oid.is_a?(String)
     end
 

lib/linguist/shebang.rb

@@ -42,10 +42,10 @@ module Linguist
       return unless script
 
       # "python2.6" -> "python2"
-      script.sub! /(\.\d+)$/, ''
+      script.sub!(/(\.\d+)$/, '')
 
       # #! perl -> perl
-      script.sub! /^#!\s*/, ''
+      script.sub!(/^#!\s*/, '')
 
       # Check for multiline shebang hacks that call `exec`
       if script == 'sh' &&

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.8.0"
+  VERSION = "4.8.3"
 end

package.json

@@ -2,5 +2,6 @@
   "repository": "https://github.com/github/linguist",
   "dependencies": {
     "season": "~>5.0"
-  }
+  },
+  "license": "MIT"
 }

samples/Erlang/170-os-daemons.es

@@ -0,0 +1,26 @@
+#! /usr/bin/env escript
+
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+loop() ->
+	loop(io:read("")).
+
+loop({ok, _}) ->
+	loop(io:read(""));
+loop(eof) ->
+	stop;
+loop({error, Reason}) ->
+	throw({error, Reason}).
+
+main([]) ->
+	loop().

samples/Erlang/release

@@ -119,4 +119,3 @@ execute_overlay([{copy, In, Out} | Rest], Vars, BaseDir, TargetDir) ->
 
 exit_code(ExitCode) ->
     erlang:halt(ExitCode, [{flush, true}]).
-

samples/Erlang/single-context.es

@@ -0,0 +1,104 @@
+#! /usr/bin/env escript
+% This file is part of Emonk released under the MIT license. 
+% See the LICENSE file for more information.
+
+main([]) ->
+	start(64, 1000);
+main([N]) ->
+	start(list_to_integer(N), 1000);
+main([N, M]) ->
+	start(list_to_integer(N), list_to_integer(M)).
+
+
+start(N, M) ->
+	code:add_pathz("test"),
+	code:add_pathz("ebin"),
+	{ok, Ctx} = emonk:create_ctx(),
+	{ok, undefined} = emonk:eval(Ctx, js()),
+	run(Ctx, N, M),
+	wait(N).
+
+run(_, 0, _) ->
+	ok;
+run(Ctx, N, M) ->
+	Self = self(),
+	Pid = spawn(fun() -> do_js(Self, Ctx, M) end),
+	io:format("Spawned: ~p~n", [Pid]),
+	run(Ctx, N-1, M).
+
+wait(0) ->
+	ok;
+wait(N) ->
+	receive
+		{finished, Pid} -> ok
+	end,
+	io:format("Finished: ~p~n", [Pid]),
+	wait(N-1).
+
+do_js(Parent, _, 0) ->
+	Parent ! {finished, self()};
+do_js(Parent, Ctx, M) ->
+	io:format("Running: ~p~n", [M]),
+	Test = random_test(),
+	{ok, [Resp]} = emonk:call(Ctx, <<"f">>, [Test]),
+	Sorted = sort(Resp),
+	true = Test == Sorted,
+	do_js(Parent, Ctx, M-1).
+
+js() -> 
+	<<"var f = function(x) {return [x];};">>.
+
+random_test() ->
+	Tests = [
+		null,
+		true,
+		false,
+		1,
+		-1,
+		3.1416,
+		-3.1416,
+		12.0e10,
+		1.234E+10,
+		-1.234E-10,
+		10.0,
+		123.456,
+		10.0,
+		<<"foo">>,
+		<<"foo", 5, "bar">>,
+		<<"">>,
+		<<"\n\n\n">>,
+		<<"\" \b\f\r\n\t\"">>,
+		{[]},
+		{[{<<"foo">>, <<"bar">>}]},
+		{[{<<"foo">>, <<"bar">>}, {<<"baz">>, 123}]},
+		[],
+		[[]],
+		[1, <<"foo">>],
+		{[{<<"foo">>, [123]}]},
+		{[{<<"foo">>, [1, 2, 3]}]},
+		{[{<<"foo">>, {[{<<"bar">>, true}]}}]},
+		{[
+			{<<"foo">>, []},
+			{<<"bar">>, {[{<<"baz">>, true}]}}, {<<"alice">>, <<"bob">>}
+		]},
+		[-123, <<"foo">>, {[{<<"bar">>, []}]}, null]
+	],
+	{_, [Test | _]} = lists:split(random:uniform(length(Tests)) - 1, Tests),
+	sort(Test).
+
+sort({Props}) ->
+	objsort(Props, []);
+sort(List) when is_list(List) ->
+	lstsort(List, []);
+sort(Other) ->
+	Other.
+
+objsort([], Acc) ->
+	{lists:sort(Acc)};
+objsort([{K,V} | Rest], Acc) ->
+	objsort(Rest, [{K, sort(V)} | Acc]).
+
+lstsort([], Acc) ->
+	lists:reverse(Acc);
+lstsort([Val | Rest], Acc) ->
+	lstsort(Rest, [sort(Val) | Acc]).

samples/GraphQL/kitchen-sink.graphql

@@ -0,0 +1,57 @@
+# Copyright (c) 2015, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+query queryName($foo: ComplexType, $site: Site = MOBILE) {
+  whoever123is: node(id: [123, 456]) {
+    id ,
+    ... on User @defer {
+      field2 {
+        id ,
+        alias: field1(first:10, after:$foo,) @include(if: $foo) {
+          id,
+          ...frag
+        }
+      }
+    }
+    ... @skip(unless: $foo) {
+      id
+    }
+    ... {
+      id
+    }
+  }
+}
+
+mutation likeStory {
+  like(story: 123) @defer {
+    story {
+      id
+    }
+  }
+}
+
+subscription StoryLikeSubscription($input: StoryLikeSubscribeInput) {
+  storyLikeSubscribe(input: $input) {
+    story {
+      likers {
+        count
+      }
+      likeSentence {
+        text
+      }
+    }
+  }
+}
+
+fragment frag on Friend {
+  foo(size: $size, bar: $b, obj: {key: "value"})
+}
+
+{
+  unnamed(truthy: true, falsey: false),
+  query
+}

samples/GraphQL/schema-kitchen-sink.graphql

@@ -0,0 +1,50 @@
+# Copyright (c) 2015, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+schema {
+  query: QueryType
+  mutation: MutationType
+}
+
+type Foo implements Bar {
+  one: Type
+  two(argument: InputType!): Type
+  three(argument: InputType, other: String): Int
+  four(argument: String = "string"): String
+  five(argument: [String] = ["string", "string"]): String
+  six(argument: InputType = {key: "value"}): Type
+}
+
+interface Bar {
+  one: Type
+  four(argument: String = "string"): String
+}
+
+union Feed = Story | Article | Advert
+
+scalar CustomScalar
+
+enum Site {
+  DESKTOP
+  MOBILE
+}
+
+input InputType {
+  key: String!
+  answer: Int = 42
+}
+
+extend type Foo {
+  seven(argument: [String]): Type
+}
+
+directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+directive @include(if: Boolean!)
+  on FIELD
+   | FRAGMENT_SPREAD
+   | INLINE_FRAGMENT

samples/JavaScript/axios.es

@@ -0,0 +1,13 @@
+import axios from "axios";
+
+export default {
+	async getIndex(prefix) {
+		const {data} = await axios.get((prefix || "") + "/index.json");
+		return data;
+	},
+	
+	async getContent(path, prefix) {
+		const {data} = await axios.get((prefix || "") + "/" + path + ".json");
+		return data;
+	}
+}

samples/JavaScript/index.es

@@ -0,0 +1,35 @@
+import config from "../webpack.config";
+import webpackDevMiddleware from "webpack-dev-middleware";
+import webpackHot from "webpack-hot-middleware";
+import webpack from "webpack";
+import express from "express";
+
+app.use(webpackDevMiddleware(compiler, {
+	noInfo: false,
+	quiet: false,
+	publicPath: config.output.publicPath,
+	hot: true,
+	historyApiFallback: true
+}));
+	
+app.get("/(:root).json", (req, resp) => {
+	resp.send(indexer.index(req.params.root));
+});
+
+export default function(){
+	const server = http.createServer(app);
+	
+	server.listen(3000);
+	
+	const wss = new WebSocketServer({server});
+	
+	let id = 1;
+	wss.on("connection", (ws) => {
+		console.log("Hello", " world");
+		let wsId = id++;
+		sessions[wsId] = ws;
+		ws.on("close", () => {
+			delete sessions[wsId]
+		});
+	});
+};

samples/Makefile/filenames/mkfile

@@ -0,0 +1,9 @@
+GREETINGS=hello gday bonjour hola ola kaixo tag hoi konnichiwa nihao dobredan namaste salaam
+
+all:V:
+	mk greet.^($GREETINGS)
+	for(i in $GREETINGS)
+		mk $i
+
+greet.%: text-folder
+	/n/$printer $stem >[2=1]

samples/PAWN/grandlarc.pwn

@@ -1,520 +0,0 @@
-//----------------------------------------------------------
-//
-// GRAND LARCENY 1.0
-// A freeroam gamemode for SA-MP 0.3
-//
-//----------------------------------------------------------
-
-#include <a_samp>
-#include <core>
-#include <float>
-#include "../include/gl_common.inc"
-#include "../include/gl_spawns.inc"
-
-#pragma tabsize 0
-
-//----------------------------------------------------------
-
-#define COLOR_WHITE                 0xFFFFFFFF
-#define COLOR_NORMAL_PLAYER 0xFFBB7777
-
-#define CITY_LOS_SANTOS         0
-#define CITY_SAN_FIERRO         1
-#define CITY_LAS_VENTURAS         2
-
-new total_vehicles_from_files=0;
-
-// Class selection globals
-new gPlayerCitySelection[MAX_PLAYERS];
-new gPlayerHasCitySelected[MAX_PLAYERS];
-new gPlayerLastCitySelectionTick[MAX_PLAYERS];
-
-new Text:txtClassSelHelper;
-new Text:txtLosSantos;
-new Text:txtSanFierro;
-new Text:txtLasVenturas;
-
-new thisanimid=0;
-new lastanimid=0;
-
-//----------------------------------------------------------
-
-main()
-{
-        print("\n---------------------------------------");
-        print("Running Grand Larceny - by the SA-MP team\n");
-        print("---------------------------------------\n");
-}
-
-//----------------------------------------------------------
-
-public OnPlayerConnect(playerid)
-{
-        GameTextForPlayer(playerid,"~w~Grand Larceny",3000,4);
-          SendClientMessage(playerid,COLOR_WHITE,"Welcome to {88AA88}G{FFFFFF}rand {88AA88}L{FFFFFF}arceny");
-          
-          // class selection init vars
-          gPlayerCitySelection[playerid] = -1;
-        gPlayerHasCitySelected[playerid] = 0;
-        gPlayerLastCitySelectionTick[playerid] = GetTickCount();
-
-        //SetPlayerColor(playerid,COLOR_NORMAL_PLAYER);
-
-        //Kick(playerid);
-        
-        /*
-        Removes vending machines
-        RemoveBuildingForPlayer(playerid, 1302, 0.0, 0.0, 0.0, 6000.0);
-        RemoveBuildingForPlayer(playerid, 1209, 0.0, 0.0, 0.0, 6000.0);
-        RemoveBuildingForPlayer(playerid, 955, 0.0, 0.0, 0.0, 6000.0);
-        RemoveBuildingForPlayer(playerid, 1775, 0.0, 0.0, 0.0, 6000.0);
-        RemoveBuildingForPlayer(playerid, 1776, 0.0, 0.0, 0.0, 6000.0);
-        */
-        
-        /*
-        new ClientVersion[32];
-        GetPlayerVersion(playerid, ClientVersion, 32);
-        printf("Player %d reports client version: %s", playerid, ClientVersion);*/
-
-         return 1;
-}
-
-//----------------------------------------------------------
-
-public OnPlayerSpawn(playerid)
-{
-        if(IsPlayerNPC(playerid)) return 1;
-        
-        new randSpawn = 0;
-        
-        SetPlayerInterior(playerid,0);
-        TogglePlayerClock(playerid,0);
-         ResetPlayerMoney(playerid);
-        GivePlayerMoney(playerid, 30000);
-
-        if(CITY_LOS_SANTOS == gPlayerCitySelection[playerid]) {
-          randSpawn = random(sizeof(gRandomSpawns_LosSantos));
-          SetPlayerPos(playerid,
-                 gRandomSpawns_LosSantos[randSpawn][0],
-                 gRandomSpawns_LosSantos[randSpawn][1],
-                 gRandomSpawns_LosSantos[randSpawn][2]);
-                SetPlayerFacingAngle(playerid,gRandomSpawns_LosSantos[randSpawn][3]);
-        }
-        else if(CITY_SAN_FIERRO == gPlayerCitySelection[playerid]) {
-          randSpawn = random(sizeof(gRandomSpawns_SanFierro));
-          SetPlayerPos(playerid,
-                 gRandomSpawns_SanFierro[randSpawn][0],
-                 gRandomSpawns_SanFierro[randSpawn][1],
-                 gRandomSpawns_SanFierro[randSpawn][2]);
-                SetPlayerFacingAngle(playerid,gRandomSpawns_SanFierro[randSpawn][3]);
-        }
-        else if(CITY_LAS_VENTURAS == gPlayerCitySelection[playerid]) {
-          randSpawn = random(sizeof(gRandomSpawns_LasVenturas));
-          SetPlayerPos(playerid,
-                 gRandomSpawns_LasVenturas[randSpawn][0],
-                 gRandomSpawns_LasVenturas[randSpawn][1],
-                 gRandomSpawns_LasVenturas[randSpawn][2]);
-                SetPlayerFacingAngle(playerid,gRandomSpawns_LasVenturas[randSpawn][3]);
-        }
-
-        //SetPlayerColor(playerid,COLOR_NORMAL_PLAYER);
-        
-        SetPlayerSkillLevel(playerid,WEAPONSKILL_PISTOL,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_PISTOL_SILENCED,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_DESERT_EAGLE,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_SHOTGUN,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_SAWNOFF_SHOTGUN,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_SPAS12_SHOTGUN,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_MICRO_UZI,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_MP5,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_AK47,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_M4,200);
-    SetPlayerSkillLevel(playerid,WEAPONSKILL_SNIPERRIFLE,200);
-    
-    GivePlayerWeapon(playerid,WEAPON_COLT45,100);
-        //GivePlayerWeapon(playerid,WEAPON_MP5,100);
-        TogglePlayerClock(playerid, 0);
-
-        return 1;
-}
-
-//----------------------------------------------------------
-
-public OnPlayerDeath(playerid, killerid, reason)
-{
-    new playercash;
-    
-    // if they ever return to class selection make them city
-        // select again first
-        gPlayerHasCitySelected[playerid] = 0;
-    
-        if(killerid == INVALID_PLAYER_ID) {
-        ResetPlayerMoney(playerid);
-        } else {
-                playercash = GetPlayerMoney(playerid);
-                if(playercash > 0) {
-                        GivePlayerMoney(killerid, playercash);
-                        ResetPlayerMoney(playerid);
-                }
-        }
-           return 1;
-}
-
-//----------------------------------------------------------
-
-ClassSel_SetupCharSelection(playerid)
-{
-           if(gPlayerCitySelection[playerid] == CITY_LOS_SANTOS) {
-                SetPlayerInterior(playerid,11);
-                SetPlayerPos(playerid,508.7362,-87.4335,998.9609);
-                SetPlayerFacingAngle(playerid,0.0);
-            SetPlayerCameraPos(playerid,508.7362,-83.4335,998.9609);
-                SetPlayerCameraLookAt(playerid,508.7362,-87.4335,998.9609);
-        }
-        else if(gPlayerCitySelection[playerid] == CITY_SAN_FIERRO) {
-                SetPlayerInterior(playerid,3);
-                SetPlayerPos(playerid,-2673.8381,1399.7424,918.3516);
-                SetPlayerFacingAngle(playerid,181.0);
-            SetPlayerCameraPos(playerid,-2673.2776,1394.3859,918.3516);
-                SetPlayerCameraLookAt(playerid,-2673.8381,1399.7424,918.3516);
-        }
-        else if(gPlayerCitySelection[playerid] == CITY_LAS_VENTURAS) {
-                SetPlayerInterior(playerid,3);
-                SetPlayerPos(playerid,349.0453,193.2271,1014.1797);
-                SetPlayerFacingAngle(playerid,286.25);
-            SetPlayerCameraPos(playerid,352.9164,194.5702,1014.1875);
-                SetPlayerCameraLookAt(playerid,349.0453,193.2271,1014.1797);
-        }
-        
-}
-
-//----------------------------------------------------------
-// Used to init textdraws of city names
-
-ClassSel_InitCityNameText(Text:txtInit)
-{
-          TextDrawUseBox(txtInit, 0);
-        TextDrawLetterSize(txtInit,1.25,3.0);
-        TextDrawFont(txtInit, 0);
-        TextDrawSetShadow(txtInit,0);
-    TextDrawSetOutline(txtInit,1);
-    TextDrawColor(txtInit,0xEEEEEEFF);
-    TextDrawBackgroundColor(txtClassSelHelper,0x000000FF);
-}
-
-//----------------------------------------------------------
-
-ClassSel_InitTextDraws()
-{
-    // Init our observer helper text display
-        txtLosSantos = TextDrawCreate(10.0, 380.0, "Los Santos");
-        ClassSel_InitCityNameText(txtLosSantos);
-        txtSanFierro = TextDrawCreate(10.0, 380.0, "San Fierro");
-        ClassSel_InitCityNameText(txtSanFierro);
-        txtLasVenturas = TextDrawCreate(10.0, 380.0, "Las Venturas");
-        ClassSel_InitCityNameText(txtLasVenturas);
-
-    // Init our observer helper text display
-        txtClassSelHelper = TextDrawCreate(10.0, 415.0,
-         " Press ~b~~k~~GO_LEFT~ ~w~or ~b~~k~~GO_RIGHT~ ~w~to switch cities.~n~ Press ~r~~k~~PED_FIREWEAPON~ ~w~to select.");
-        TextDrawUseBox(txtClassSelHelper, 1);
-        TextDrawBoxColor(txtClassSelHelper,0x222222BB);
-        TextDrawLetterSize(txtClassSelHelper,0.3,1.0);
-        TextDrawTextSize(txtClassSelHelper,400.0,40.0);
-        TextDrawFont(txtClassSelHelper, 2);
-        TextDrawSetShadow(txtClassSelHelper,0);
-    TextDrawSetOutline(txtClassSelHelper,1);
-    TextDrawBackgroundColor(txtClassSelHelper,0x000000FF);
-    TextDrawColor(txtClassSelHelper,0xFFFFFFFF);
-}
-
-//----------------------------------------------------------
-
-ClassSel_SetupSelectedCity(playerid)
-{
-        if(gPlayerCitySelection[playerid] == -1) {
-                gPlayerCitySelection[playerid] = CITY_LOS_SANTOS;
-        }
-        
-        if(gPlayerCitySelection[playerid] == CITY_LOS_SANTOS) {
-                SetPlayerInterior(playerid,0);
-                   SetPlayerCameraPos(playerid,1630.6136,-2286.0298,110.0);
-                SetPlayerCameraLookAt(playerid,1887.6034,-1682.1442,47.6167);
-                
-                TextDrawShowForPlayer(playerid,txtLosSantos);
-                TextDrawHideForPlayer(playerid,txtSanFierro);
-                TextDrawHideForPlayer(playerid,txtLasVenturas);
-        }
-        else if(gPlayerCitySelection[playerid] == CITY_SAN_FIERRO) {
-                SetPlayerInterior(playerid,0);
-                   SetPlayerCameraPos(playerid,-1300.8754,68.0546,129.4823);
-                SetPlayerCameraLookAt(playerid,-1817.9412,769.3878,132.6589);
-                
-                TextDrawHideForPlayer(playerid,txtLosSantos);
-                TextDrawShowForPlayer(playerid,txtSanFierro);
-                TextDrawHideForPlayer(playerid,txtLasVenturas);
-        }
-        else if(gPlayerCitySelection[playerid] == CITY_LAS_VENTURAS) {
-                SetPlayerInterior(playerid,0);
-                   SetPlayerCameraPos(playerid,1310.6155,1675.9182,110.7390);
-                SetPlayerCameraLookAt(playerid,2285.2944,1919.3756,68.2275);
-                
-                TextDrawHideForPlayer(playerid,txtLosSantos);
-                TextDrawHideForPlayer(playerid,txtSanFierro);
-                TextDrawShowForPlayer(playerid,txtLasVenturas);
-        }
-}
-
-//----------------------------------------------------------
-
-ClassSel_SwitchToNextCity(playerid)
-{
-    gPlayerCitySelection[playerid]++;
-        if(gPlayerCitySelection[playerid] > CITY_LAS_VENTURAS) {
-         gPlayerCitySelection[playerid] = CITY_LOS_SANTOS;
-        }
-        PlayerPlaySound(playerid,1052,0.0,0.0,0.0);
-        gPlayerLastCitySelectionTick[playerid] = GetTickCount();
-        ClassSel_SetupSelectedCity(playerid);
-}
-
-//----------------------------------------------------------
-
-ClassSel_SwitchToPreviousCity(playerid)
-{
-    gPlayerCitySelection[playerid]--;
-        if(gPlayerCitySelection[playerid] < CITY_LOS_SANTOS) {
-         gPlayerCitySelection[playerid] = CITY_LAS_VENTURAS;
-        }
-        PlayerPlaySound(playerid,1053,0.0,0.0,0.0);
-        gPlayerLastCitySelectionTick[playerid] = GetTickCount();
-        ClassSel_SetupSelectedCity(playerid);
-}
-
-//----------------------------------------------------------
-
-ClassSel_HandleCitySelection(playerid)
-{
-        new Keys,ud,lr;
-    GetPlayerKeys(playerid,Keys,ud,lr);
-    
-    if(gPlayerCitySelection[playerid] == -1) {
-                ClassSel_SwitchToNextCity(playerid);
-                return;
-        }
-
-        // only allow new selection every ~500 ms
-        if( (GetTickCount() - gPlayerLastCitySelectionTick[playerid]) < 500 ) return;
-        
-        if(Keys & KEY_FIRE) {
-         gPlayerHasCitySelected[playerid] = 1;
-         TextDrawHideForPlayer(playerid,txtClassSelHelper);
-                TextDrawHideForPlayer(playerid,txtLosSantos);
-                TextDrawHideForPlayer(playerid,txtSanFierro);
-                TextDrawHideForPlayer(playerid,txtLasVenturas);
-         TogglePlayerSpectating(playerid,0);
-         return;
-        }
-        
-        if(lr > 0) {
-         ClassSel_SwitchToNextCity(playerid);
-        }
-        else if(lr < 0) {
-         ClassSel_SwitchToPreviousCity(playerid);
-        }
-}
-
-//----------------------------------------------------------
-
-public OnPlayerRequestClass(playerid, classid)
-{
-        if(IsPlayerNPC(playerid)) return 1;
-
-        if(gPlayerHasCitySelected[playerid]) {
-                ClassSel_SetupCharSelection(playerid);
-                return 1;
-        } else {
-                if(GetPlayerState(playerid) != PLAYER_STATE_SPECTATING) {
-                        TogglePlayerSpectating(playerid,1);
-                    TextDrawShowForPlayer(playerid, txtClassSelHelper);
-                    gPlayerCitySelection[playerid] = -1;
-                }
-          }
-    
-        return 0;
-}
-
-//----------------------------------------------------------
-
-public OnGameModeInit()
-{
-        SetGameModeText("Grand Larceny");
-        ShowPlayerMarkers(PLAYER_MARKERS_MODE_GLOBAL);
-        ShowNameTags(1);
-        SetNameTagDrawDistance(40.0);
-        EnableStuntBonusForAll(0);
-        DisableInteriorEnterExits();
-        SetWeather(2);
-        SetWorldTime(11);
-
-        //UsePlayerPedAnims();
-        //ManualVehicleEngineAndLights();
-        //LimitGlobalChatRadius(300.0);
-        
-        ClassSel_InitTextDraws();
-
-        // Player Class
-        AddPlayerClass(281,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(282,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(283,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(284,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(285,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(286,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(287,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(288,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(289,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(265,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(266,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(267,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(268,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(269,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(270,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(1,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(2,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(3,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(4,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(5,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(6,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(8,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(42,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(65,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        //AddPlayerClass(74,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(86,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(119,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-         AddPlayerClass(149,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(208,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(273,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(289,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        
-        AddPlayerClass(47,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(48,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(49,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(50,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(51,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(52,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(53,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(54,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(55,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(56,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(57,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(58,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-           AddPlayerClass(68,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(69,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(70,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(71,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(72,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(73,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(75,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(76,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(78,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(79,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(80,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(81,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(82,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(83,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(84,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(85,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(87,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(88,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(89,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(91,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(92,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(93,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(95,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(96,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(97,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(98,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-        AddPlayerClass(99,1759.0189,-1898.1260,13.5622,266.4503,-1,-1,-1,-1,-1,-1);
-
-        // SPECIAL
-        total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/trains.txt");
-        total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/pilots.txt");
-
-           // LAS VENTURAS
-     total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/lv_law.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/lv_airport.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/lv_gen.txt");
-    
-    // SAN FIERRO
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/sf_law.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/sf_airport.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/sf_gen.txt");
-    
-    // LOS SANTOS
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/ls_law.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/ls_airport.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/ls_gen_inner.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/ls_gen_outer.txt");
-    
-    // OTHER AREAS
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/whetstone.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/bone.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/flint.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/tierra.txt");
-    total_vehicles_from_files += LoadStaticVehiclesFromFile("vehicles/red_county.txt");
-
-    printf("Total vehicles from files: %d",total_vehicles_from_files);
-
-        return 1;
-}
-
-//----------------------------------------------------------
-
-public OnPlayerUpdate(playerid)
-{
-        if(!IsPlayerConnected(playerid)) return 0;
-        if(IsPlayerNPC(playerid)) return 1;
-
-        // changing cities by inputs
-        if( !gPlayerHasCitySelected[playerid] &&
-         GetPlayerState(playerid) == PLAYER_STATE_SPECTATING ) {
-         ClassSel_HandleCitySelection(playerid);
-         return 1;
-        }
-        
-        // No weapons in interiors
-        if(GetPlayerInterior(playerid) != 0 && GetPlayerWeapon(playerid) != 0) {
-         SetPlayerArmedWeapon(playerid,0); // fists
-         return 0; // no syncing until they change their weapon
-        }
-        
-        // Don't allow minigun
-        if(GetPlayerWeapon(playerid) == WEAPON_MINIGUN) {
-         Kick(playerid);
-         return 0;
-        }
-        
-        /* No jetpacks allowed
-        if(GetPlayerSpecialAction(playerid) == SPECIAL_ACTION_USEJETPACK) {
-         Kick(playerid);
-         return 0;
-        }*/
-
-        /* For testing animations
-    new msg[128+1];
-        new animlib[32+1];
-        new animname[32+1];
-
-        thisanimid = GetPlayerAnimationIndex(playerid);
-        if(lastanimid != thisanimid)
-        {
-                GetAnimationName(thisanimid,animlib,32,animname,32);
-                format(msg, 128, "anim(%d,%d): %s %s", lastanimid, thisanimid, animlib, animname);
-                lastanimid = thisanimid;
-                SendClientMessage(playerid, 0xFFFFFFFF, msg);
-        }*/
-
-        return 1;
-}
-
-//----------------------------------------------------------

samples/PAWN/timertest.pwn

@@ -0,0 +1,36 @@
+#include <a_samp>
+
+forward OneSecTimer();
+
+new lasttick = 0;
+
+main()
+{
+	print("\n----------------------------------");
+	print("  This is a blank GameModeScript");
+	print("----------------------------------\n");
+}
+
+public OnGameModeInit()
+{
+	// Set timer of 1 second.
+	SetTimer("OneSecTimer", 1000, 1);
+	print("GameModeInit()");
+	SetGameModeText("Timer Test");
+	AddPlayerClass(0, 1958.3783, 1343.1572, 15.3746, 269.1425, 0, 0, 0, 0, 0, 0);
+	return 1;
+}
+
+public OneSecTimer() {
+
+	if(lasttick == 0) {
+     	lasttick = GetTickCount();
+		return;
+	}
+	new sText[256];
+	format(sText,sizeof(sText),"GetTickCountOffset = %d",GetTickCount() - lasttick);
+	print(sText);
+	SendClientMessageToAll(0xFF0000, sText);
+	lasttick = GetTickCount();
+}
+

samples/Terra/arith.t

@@ -0,0 +1,114 @@
+--[[
+
+-
++
+
+*
+/
+%
+
+^
+and
+or
+~= == < > >= <=
+<< >>
+
+]]
+
+
+
+
+terra test0()
+    var a = 1 + 3
+    var b = 1LL + 2LL
+    var c = 1ULL + 2ULL
+    var d = 1.f + 2.f
+    var e = 1.0 + 2.0
+    return a + b + c + d + e
+end
+terra test1()
+    var a = 1 - 3
+    var b = 1LL - 2LL
+    var c = 1ULL - 2ULL
+    var d = 1.f - 2.f
+    var e = 1.0 - 2.0
+    return a - b - c - d - e
+end
+terra test2()
+    var a = 2 * 3
+    var b = 3LL * 2LL
+    var c = 3ULL * 2ULL
+    var d = 1.f * 2.f
+    var e = 3.0 * 2.0
+    return a * b * c * d * e
+end
+
+terra test3()
+    var a = 2 / 3 + 1
+    var b = 3LL / 2LL + 1
+    var c = 3ULL / 2ULL
+    var d = 1.f / 2.f
+    var e = 3.0 / 2.0
+    return a * b * c * d * e
+end
+
+terra test4()
+    var a = 2 % 3
+    var b = 3LL % 4LL
+    var c = 3ULL % 2ULL
+    var d = 1.f % 2.f
+    var e = 3.75 % 2.0
+    return (a == 2) and (b == 3LL) and (d == 1.f) and (e == 1.75)
+end
+
+terra test5()
+    var a = 2 ^ 3
+    var b = 3LL ^ 4LL
+    var c = 3ULL ^ 2ULL
+    return (a == 1) and (b == 7LL) and (c == 1ULL)
+end
+
+terra test6()
+    var a = 2 and 3
+    var b = 3LL and 4LL
+    var c = 3ULL and 2ULL
+    return (a == 2) and (b == 0LL) and (c == 2ULL)
+end
+
+terra test7()
+    var a = 2 or 3
+    var b = 3LL or 4LL
+    var c = 3ULL or 2ULL
+    return (a == 3) and (b == 7LL) and (c == 3ULL)
+end
+
+
+terra test8()
+    var a0,a1 = 2 ~= 3, 2 == 3
+    var b0,b1 = 2 < 3, 2 >= 3
+    var c0,c1 = 2 > 3, 2 <= 3
+    
+    return a0 and not a1 and b0 and not b1 and not c0 and c1
+end
+
+terra test9()
+    var a0, a1 = 8 >> 1, 8 << 1
+    var b0, b1 = -8 >> 1, -8 << 1
+    return a0 == 4 and a1 == 16 and b0 == -4 and b1 == -16
+end
+
+
+local test = require("test")
+
+test.eq(test0(),16)
+test.eq(test1(),2)
+test.eq(test2(),2592)
+test.eq(test3(),1.5)
+
+test.eq(test4(),true)
+
+test.eq(test5(),true)
+test.eq(test6(),true)
+test.eq(test7(),true)
+test.eq(test8(),true)
+test.eq(test9(),true)

samples/Terra/arrayt.t

@@ -0,0 +1,75 @@
+C = terralib.includecstring [[
+	#include <stdio.h>
+	#include <stdlib.h>
+]]
+local arraytypes = {}
+function Array(T)
+	local struct ArrayImpl {
+		data : &T;
+		N : int;
+	}
+	function ArrayImpl.metamethods.__typename(self)
+	    return "Array("..tostring(T)..")"
+	end
+	arraytypes[ArrayImpl] = true
+	terra ArrayImpl:init(N : int)
+		self.data = [&T](C.malloc(N*sizeof(T)))
+		self.N = N
+	end
+	terra ArrayImpl:free()
+		C.free(self.data)
+	end
+	ArrayImpl.metamethods.__apply = macro(function(self,idx)
+		return `self.data[idx]
+	end)
+	ArrayImpl.metamethods.__methodmissing = macro(function(methodname,selfexp,...)
+		local args = terralib.newlist {...}
+		local i = symbol(int)
+		local promotedargs = args:map(function(a)
+			if arraytypes[a:gettype()] then
+				return `a(i)
+			else
+				return a
+			end
+		end)
+		return quote
+			var self = selfexp
+			var r : ArrayImpl
+			r:init(self.N)
+			for [i] = 0,r.N do
+				r.data[i] = self.data[i]:[methodname](promotedargs)
+			end
+		in
+			r
+		end
+	end)
+	return ArrayImpl
+end
+
+struct Complex {
+	real : float;
+	imag : float;
+}
+
+terra Complex:add(c : Complex) 
+	return Complex { self.real + c.real, self.imag + c.imag }
+end
+
+ComplexArray = Array(Complex)
+N = 10
+terra testit()
+	var ca : ComplexArray
+	ca:init(N)
+	for i = 0,N do
+		ca(i) = Complex { i, i + 1 }
+	end
+	var ra = ca:add(ca)
+	return ra
+end
+local r = testit()
+assert(r.N == N)
+for i = 0,N-1 do
+	assert(r.data[i].real == 2*i)
+	assert(r.data[i].imag == 2*(i+1))
+end
+assert(tostring(Array(int)) == "Array(int32)")

samples/Terra/benchmark_nbody.t

@@ -0,0 +1,150 @@
+local C = terralib.includecstring[[
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+]]
+
+pi = 3.141592653589793
+solar_mass = (4 * pi * pi)
+days_per_year = 365.24
+
+struct planet {
+  x : double;
+  y : double;
+  z : double;
+  vx : double;
+  vy : double;
+  vz : double;
+  mass : double;
+}
+
+terra advance(nbodies : int, bodies : &planet, dt : double)
+  
+  for i = 0, nbodies do
+    var b = &bodies[i]
+    for j = i + 1, nbodies do
+      var b2 = &bodies[j]
+      
+      var dx = b.x - b2.x;
+      var dy = b.y - b2.y;
+      var dz = b.z - b2.z;
+      var distance = C.sqrt(dx * dx + dy * dy + dz * dz);
+      var mag = dt / (distance * distance * distance);
+      --C.printf("%f %f %f %f %f\n",dx,dy,dz,distance,mag);
+      b.vx = b.vx - dx * b2.mass * mag;
+      b.vy = b.vy - dy * b2.mass * mag;
+      b.vz = b.vz - dz * b2.mass * mag;
+      b2.vx = b2.vx + dx * b.mass * mag;
+      b2.vy = b2.vy + dy * b.mass * mag;
+      b2.vz = b2.vz + dz * b.mass * mag;
+      --C.printf("%f %f %f %f %f %f\n",b.vx,b.vy,b.vz,b2.vx,b2.vy,b2.vz)
+    end
+  end
+  for i = 0,nbodies do
+    var b = &bodies[i]
+    b.x = b.x + dt * b.vx;
+    b.y = b.y + dt * b.vy;
+    b.z = b.z + dt * b.vz;
+  end
+end
+
+terra energy(nbodies : int, bodies : &planet)
+  var e = 0.0
+  for i = 0, nbodies do
+    var b = &bodies[i]
+    e = e + 0.5 * b.mass * (b.vx * b.vx + b.vy * b.vy + b.vz * b.vz);
+    for j = i + 1, nbodies do
+      var b2 = &bodies[j]
+      var dx = b.x - b2.x
+      var dy = b.y - b2.y
+      var dz = b.z - b2.z
+      var distance = C.sqrt(dx * dx + dy * dy + dz * dz)
+      e = e - (b.mass * b2.mass) / distance
+    end
+  end
+  return e
+end
+
+terra offset_momentum(nbodies : int, bodies : &planet)
+  var px,py,pz = 0.0,0.0,0.0
+  
+  for i = 0,nbodies do
+    px = px + bodies[i].vx * bodies[i].mass
+    py = py + bodies[i].vy * bodies[i].mass
+    pz = pz + bodies[i].vz * bodies[i].mass
+  end
+  bodies[0].vx = - px / solar_mass
+  bodies[0].vy = - py / solar_mass
+  bodies[0].vz = - pz / solar_mass
+end
+
+NBODIES = 5
+
+terra main(argc : int, argv : &&int8)
+    var bodies = array(
+      planet {                               -- sun */
+        0, 0, 0, 0, 0, 0, solar_mass
+      },
+      planet {                               -- jupiter */
+        4.84143144246472090e+00,
+        -1.16032004402742839e+00,
+        -1.03622044471123109e-01,
+        1.66007664274403694e-03 * days_per_year,
+        7.69901118419740425e-03 * days_per_year,
+        -6.90460016972063023e-05 * days_per_year,
+        9.54791938424326609e-04 * solar_mass
+      },
+      planet {                               -- saturn */
+        8.34336671824457987e+00,
+        4.12479856412430479e+00,
+        -4.03523417114321381e-01,
+        -2.76742510726862411e-03 * days_per_year,
+        4.99852801234917238e-03 * days_per_year,
+        2.30417297573763929e-05 * days_per_year,
+        2.85885980666130812e-04 * solar_mass
+      },
+      planet {                               -- uranus */
+        1.28943695621391310e+01,
+        -1.51111514016986312e+01,
+        -2.23307578892655734e-01,
+        2.96460137564761618e-03 * days_per_year,
+        2.37847173959480950e-03 * days_per_year,
+        -2.96589568540237556e-05 * days_per_year,
+        4.36624404335156298e-05 * solar_mass
+      },
+      planet {                               -- neptune */
+        1.53796971148509165e+01,
+        -2.59193146099879641e+01,
+        1.79258772950371181e-01,
+        2.68067772490389322e-03 * days_per_year,
+        1.62824170038242295e-03 * days_per_year,
+        -9.51592254519715870e-05 * days_per_year,
+        5.15138902046611451e-05 * solar_mass
+      }
+    )
+    var n = C.atoi(argv[1])    
+    offset_momentum(NBODIES, bodies)
+    C.printf ("%.9f\n", energy(NBODIES, bodies))
+    for i = 0,n do
+        advance(NBODIES, bodies, 0.01)
+    end
+    C.printf ("%.9f\n", energy(NBODIES, bodies));
+  return 0
+end
+
+terra run()
+    main(2,array("what","1000000"))
+end
+
+--run:compile()
+
+
+--local test = require("test")
+
+--print(test.time(run))
+
+terralib.saveobj("benchmark_nbody",{ main = main } )
+energy:disas()
+energy:printpretty()

samples/YAML/filenames/.clang-format

@@ -0,0 +1,18 @@
+---
+# We'll use defaults from the LLVM style, but with 4 columns indentation.
+BasedOnStyle: LLVM
+IndentWidth: 4
+---
+Language: Cpp
+# Force pointers to the type for C++.
+DerivePointerAlignment: false
+PointerAlignment: Left
+---
+Language: JavaScript
+# Use 100 columns for JS.
+ColumnLimit: 100
+---
+Language: Proto
+# Don't format .proto files.
+DisableFormat: true
+...

script/licensed

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+# TODO: push these changes to licensor gem
+
+require "bundler/setup"
+require "licensed/cli"
+
+module Licensed
+  module Source
+    class Filesystem
+      attr_reader :type
+
+      def initialize(glob, type: "directory")
+        @glob = glob
+        @type = type
+      end
+
+      def enabled?
+        !Dir.glob(@glob).empty?
+      end
+
+      def dependencies
+        Dir.glob(@glob).map do |directory|
+          puts "caching #{directory}"
+          Licensed::Dependency.new(directory, {
+            "type" => type,
+            "name" => File.basename(directory)
+          })
+        end
+      end
+    end
+  end
+end
+
+source = Licensed::Source::Filesystem.new("vendor/grammars/*/", type: "grammar")
+config = Licensed::Configuration.new
+config.sources << source
+
+if ARGV[0] == "verify"
+  Licensed::Command::Verify.new(config).run
+else
+  Licensed::Command::Cache.new(config).run(force: true)
+end

test/fixtures/Data/app.config

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+  </startup>
+</configuration>

test/test_blob.rb

@@ -132,7 +132,7 @@ class TestBlob < Minitest::Test
   end
 
   def test_csv
-    assert fixture_blob_memory("Data/cars.csv").csv?
+    assert sample_blob_memory("CSV/cars.csv").csv?
   end
 
   def test_pdf

test/test_file_blob.rb

@@ -1,6 +1,6 @@
 require_relative "./helper"
 
-class TestBlob < Minitest::Test
+class TestFileBlob < Minitest::Test
   include Linguist
 
   def setup

test/test_grammars.rb

@@ -3,17 +3,11 @@ require_relative "./helper"
 class TestGrammars < Minitest::Test
   ROOT = File.expand_path("../..", __FILE__)
 
+  # List of projects that are allowed without licenses
   PROJECT_WHITELIST = [
-    # This grammar's MIT license is inside a subdirectory.
-    "vendor/grammars/SublimePapyrus",
-
-    # This grammar has a nonstandard but acceptable license.
-    "vendor/grammars/gap-tmbundle",
-
-    # These grammars have no license but have been grandfathered in. New grammars
-    # must have a license that allows redistribution.
-    "vendor/grammars/Sublime-Lasso",
-    "vendor/grammars/x86-assembly-textmate-bundle"
+    # Dual MIT and GPL license
+    "vendor/grammars/language-csharp",
+    "vendor/grammars/sublimeassembly"
   ].freeze
 
   # List of allowed SPDX license names
@@ -21,12 +15,10 @@ class TestGrammars < Minitest::Test
     apache-2.0
     bsd-2-clause
     bsd-3-clause
-    cc-by-sa-3.0
-    gpl-2.0
-    gpl-3.0
-    lgpl-3.0
+    isc
     mit
     mpl-2.0
+    public
     textmate
     unlicense
     wtfpl
@@ -102,8 +94,9 @@ class TestGrammars < Minitest::Test
   end
 
   def test_submodules_whitelist_has_no_extra_entries
+    skip("Need to work out how to handle dual-licensed entities")
     extra_whitelist_entries = PROJECT_WHITELIST - submodule_licenses.select { |k,v| v.nil? }.keys
-    not_present = extra_whitelist_entries.reject { |k,v| Dir.exists?(k) }
+    not_present = extra_whitelist_entries.reject { |k,v| Dir.exist?(k) }
     licensed = extra_whitelist_entries.select { |k,v| submodule_licenses[k] }
 
     msg = "The following whitelisted submodules don't appear to be part of the project:\n* #{not_present.join("\n* ")}"
@@ -178,10 +171,12 @@ class TestGrammars < Minitest::Test
       "gpl-3.0"
     elsif content.include?("Creative Commons Attribution-Share Alike 3.0")
       "cc-by-sa-3.0"
-    elsif content.include?("tidy-license.txt") || content.include?("If not otherwise specified (see below)")
+    elsif content.include?("tidy-license.txt") || content.include?("If not otherwise specified (see below)") || content.include?("Permission to copy, use, modify, sell and distribute this")
       "textmate"
     elsif content.include?("Permission is hereby granted") || content =~ /\bMIT\b/
       "mit"
+    elsif content.include?("This package is provided as-is and is placed in the Public Domain")
+      "public"
     elsif content.include?("http://www.wtfpl.net/txt/copying/")
       "wtfpl"
     elsif content.include?("zlib") && content.include?("license") && content.include?("2. Altered source versions must be plainly marked as such")

test/test_heuristics.rb

@@ -83,6 +83,13 @@ class TestHeuristcs < Minitest::Test
       "ECLiPSe" => all_fixtures("ECLiPSe", "*.ecl")
     })
   end
+  
+  def test_es_by_heuristics
+    assert_heuristics({
+      "Erlang" => all_fixtures("Erlang", "*.es"),
+      "JavaScript" => all_fixtures("JavaScript", "*.es")
+    })
+  end
 
   def test_f_by_heuristics
     assert_heuristics({

test/test_repository.rb

@@ -81,7 +81,7 @@ class TestRepository < Minitest::Test
 
   def test_linguist_override_vendored?
     attr_commit = '351c1cc8fd57340839bdb400d7812332af80e9bd'
-    repo = linguist_repo(attr_commit).read_index
+    linguist_repo(attr_commit).read_index
 
     override_vendored = Linguist::LazyBlob.new(rugged_repository, attr_commit, 'Gemfile')
 
@@ -91,7 +91,7 @@ class TestRepository < Minitest::Test
 
   def test_linguist_override_unvendored?
     attr_commit = '351c1cc8fd57340839bdb400d7812332af80e9bd'
-    repo = linguist_repo(attr_commit).read_index
+    linguist_repo(attr_commit).read_index
 
     # lib/linguist/vendor.yml defines this as vendored.
     override_unvendored = Linguist::LazyBlob.new(rugged_repository, attr_commit, 'test/fixtures/foo.rb')
@@ -102,7 +102,7 @@ class TestRepository < Minitest::Test
 
   def test_linguist_override_documentation?
     attr_commit = "d4c8fb8a28e91f97a7e53428a365c0abbac36d3d"
-    repo = linguist_repo(attr_commit).read_index
+    linguist_repo(attr_commit).read_index
 
     readme = Linguist::LazyBlob.new(rugged_repository, attr_commit, "README.md")
     arduino = Linguist::LazyBlob.new(rugged_repository, attr_commit, "samples/Arduino/hello.ino")
@@ -114,7 +114,7 @@ class TestRepository < Minitest::Test
 
   def test_linguist_override_generated?
     attr_commit = "351c1cc8fd57340839bdb400d7812332af80e9bd"
-    repo = linguist_repo(attr_commit).read_index
+    linguist_repo(attr_commit).read_index
 
     rakefile = Linguist::LazyBlob.new(rugged_repository, attr_commit, "Rakefile")
 

test/test_samples.rb

@@ -83,7 +83,7 @@ class TestSamples < Minitest::Test
         # Check for samples if more than one language matches the given filename
         if Language.find_by_filename(filename).size > 1
           sample = "samples/#{language.name}/filenames/#{filename}"
-          assert File.exists?(sample),
+          assert File.exist?(sample),
             "Missing sample in #{sample.inspect}. See https://github.com/github/linguist/blob/master/CONTRIBUTING.md"
         end
       end

vendor/licenses/config.yml

@@ -0,0 +1,27 @@
+whitelist:
+  - apache-2.0
+  - bsd-2-clause
+  - bsd-3-clause
+  - permissive
+  - mit
+  - isc
+  - mpl-2.0
+  - unlicense
+  - wtfpl
+  - zlib
+
+# These dependencies are explicitly ignored
+ignored:
+  rubygem:
+    - bundler
+
+# These dependencies have been reviewed and approved.
+reviewed:
+  rubygem:
+    - mime-types
+  grammar:
+    - Sublime-Lasso
+
+sources:
+  npm: false
+  rubygem: true