Merge branch 'master' into sqlllll

2025-10-29 17:50:22 +00:00 · 2015-02-27 13:32:09 -06:00
parent 5e9bb67d10 d6d232ec37
commit a338228b57
79 changed files with 8567 additions and 99 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -249,7 +249,7 @@
 	url = https://github.com/shellderp/sublime-robot-plugin
 [submodule "vendor/grammars/actionscript3-tmbundle"]
 	path = vendor/grammars/actionscript3-tmbundle
-	url = https://github.com/simongregory/actionscript3-tmbundle
+	url = https://github.com/honzabrecka/actionscript3-tmbundle
 [submodule "vendor/grammars/Sublime-QML"]
 	path = vendor/grammars/Sublime-QML
 	url = https://github.com/skozlovf/Sublime-QML
@@ -597,9 +597,45 @@
 [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
+[submodule "vendor/grammars/SublimePapyrus"]
+	path = vendor/grammars/SublimePapyrus
+	url = https://github.com/Kapiainen/SublimePapyrus
+[submodule "vendor/grammars/sublime-spintools"]
+	path = vendor/grammars/sublime-spintools
+	url = https://github.com/bitbased/sublime-spintools
+[submodule "vendor/grammars/PogoScript.tmbundle"]
+	path = vendor/grammars/PogoScript.tmbundle
+	url = https://github.com/featurist/PogoScript.tmbundle
+[submodule "vendor/grammars/sublime-opal"]
+	path = vendor/grammars/sublime-opal
+	url = https://github.com/artifactz/sublime-opal
 [submodule "vendor/grammars/mediawiki.tmbundle"]
 	path = vendor/grammars/mediawiki.tmbundle
 	url = https://github.com/textmate/mediawiki.tmbundle
 [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
+[submodule "vendor/grammars/Stylus"]
+	path = vendor/grammars/Stylus
+	url = https://github.com/billymoon/Stylus
+[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/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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,9 +33,9 @@ Misclassifications can often be solved by either adding a new filename or extens

 Syntax highlighting in GitHub is performed using TextMate-compatible grammars. These are the same grammars that TextMate, Sublime Text and Atom use. Every language in [languages.yml][languages] is mapped to its corresponding TM `scope`. This scope will be used when picking up a grammar for highlighting.

-Assuming your code is being detected as the right language (see [Language Detection](#language-detection) above), in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
+Assuming your code is being detected as the right language, in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.

-You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](http://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://lightshow.githubapp.com).
+You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](http://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://github-lightshow.herokuapp.com).

 Once the bug has been fixed upstream, please let us know and we'll pick it up for GitHub.

--- a/README.md
+++ b/README.md
@@ -26,14 +26,14 @@ Linguist supports a number of different custom overrides strategies for language

 ### Using gitattributes

-Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-language` and `linguist-vendored`.
+Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, and `linguist-vendored`. `.gitattributes` will be used to determine language statistics, but will not be used to syntax highlight files. To manually set syntax highlighting, use [Vim or Emacs modelines](#using-emacs-and-vim-modelines).

 ```
 $ cat .gitattributes
 *.rb linguist-language=Java
 ```

-Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository.
+Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository. Vendored files are also hidden by default in diffs on github.com.

 Use the `linguist-vendored` attribute to vendor or un-vendor paths.

@@ -43,6 +43,16 @@ special-vendored-path/* linguist-vendored
 jquery.js linguist-vendored=false
 ```

+Similar to vendored files, Linguist excludes documentation files from your project's language stats. (Unlike vendored files, documentation files are displayed in diffs on github.com.) [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.
+
+Use the `linguist-documentation` attribute to mark or unmark paths as documentation.
+
+```
+$ cat .gitattributes
+project-docs/* linguist-documentation
+docs/formatter.rb linguist-documentation=false
+```
+
 ### Using Emacs and Vim modelines

 Alternatively, you can use Vim and Emacs style modelines to set the language for a single file. Modelines can be placed anywhere within a file and are respected when determining how to syntax-highlight a file on GitHub.com
--- a/grammars.yml
+++ b/grammars.yml
@@ -26,6 +26,9 @@ vendor/grammars/Alloy.tmbundle:
 - source.alloy
 vendor/grammars/AutoHotkey/:
 - source.ahk
+vendor/grammars/BrightScript.tmbundle/:
+- source.brightauthorproject
+- source.brightscript
 vendor/grammars/CLIPS-sublime:
 - source.clips
 vendor/grammars/ColdFusion:
@@ -60,6 +63,8 @@ vendor/grammars/JSyntax/:
 - source.j
 vendor/grammars/Julia.tmbundle:
 - source.julia
+vendor/grammars/Lean.tmbundle:
+- source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
 vendor/grammars/Modelica/:
@@ -72,6 +77,8 @@ vendor/grammars/NimLime:
 - source.nimcfg
 vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
+vendor/grammars/PogoScript.tmbundle/:
+- source.pogoscript
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
 vendor/grammars/Racket:
@@ -86,6 +93,8 @@ vendor/grammars/Slash.tmbundle:
 vendor/grammars/Stata.tmbundle:
 - source.mata
 - source.stata
+vendor/grammars/Stylus/:
+- source.stylus
 vendor/grammars/Sublime-Coq:
 - source.coq
 vendor/grammars/Sublime-HTTP:
@@ -112,6 +121,10 @@ vendor/grammars/Sublime-VimL:
 - source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
+vendor/grammars/SublimePapyrus/:
+- source.compiled-papyrus
+- source.papyrus
+- source.papyrus-assembly
 vendor/grammars/SublimeXtend:
 - source.xtend
 vendor/grammars/TXL/:
@@ -139,6 +152,8 @@ vendor/grammars/apache.tmbundle:
 - source.apache-config.mod_perl
 vendor/grammars/applescript.tmbundle:
 - source.applescript
+vendor/grammars/asciidoc.tmbundle/:
+- text.html.asciidoc
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
@@ -225,6 +240,8 @@ vendor/grammars/fortran.tmbundle:
 - source.fortran.modern
 vendor/grammars/fsharpbinding:
 - source.fsharp
+vendor/grammars/gap-tmbundle/:
+- source.gap
 vendor/grammars/gettext.tmbundle:
 - source.po
 vendor/grammars/gnuplot-tmbundle:
@@ -368,6 +385,8 @@ vendor/grammars/opa.tmbundle:
 - source.opa
 vendor/grammars/oracle.tmbundle:
 - source.plsql.oracle
+vendor/grammars/openscad.tmbundle/:
+- source.scad
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
@@ -457,16 +476,26 @@ vendor/grammars/sublime-nginx:
 - source.nginx
 vendor/grammars/sublime-nix:
 - source.nix
+vendor/grammars/sublime-opal/:
+- source.opal
+- source.opalsysdefs
 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-text-ox/:
 - source.ox
+vendor/grammars/sublime-text-pig-latin/:
+- source.pig_latin
+vendor/grammars/sublime-varnish:
+- source.varnish.vcl
 vendor/grammars/sublime_cobol:
 - source.acucobol
 - source.cobol
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -236,6 +236,21 @@ module Linguist
      name =~ VendoredRegexp ? true : false
    end

+    documentation_paths = YAML.load_file(File.expand_path("../documentation.yml", __FILE__))
+    DocumentationRegexp = Regexp.new(documentation_paths.join('|'))
+
+    # Public: Is the blob in a documentation directory?
+    #
+    # Documentation files are ignored by language statistics.
+    #
+    # See "documentation.yml" for a list of documentation conventions that match
+    # this pattern.
+    #
+    # Return true or false
+    def documentation?
+      name =~ DocumentationRegexp ? true : false
+    end
+
    # Public: Get each line of data
    #
    # Requires Blob#data
@@ -317,5 +332,15 @@ module Linguist
    def tm_scope
      language && language.tm_scope
    end
+
+    DETECTABLE_TYPES = [:programming, :markup].freeze
+
+    # Internal: Should this blob be included in repository language statistics?
+    def include_in_language_stats?
+      !vendored? &&
+      !documentation? &&
+      !generated? &&
+      language && DETECTABLE_TYPES.include?(language.type)
+    end
  end
 end
--- a/lib/linguist/documentation.yml
+++ b/lib/linguist/documentation.yml
@@ -0,0 +1,23 @@
+# Documentation files and directories are excluded from language
+# statistics.
+#
+# Lines in this file are Regexps that are matched against the file
+# pathname.
+#
+# Please add additional test coverage to
+# `test/test_blob.rb#test_documentation` if you make any changes.
+
+## Documentation directories ##
+
+- ^docs?/
+- (^|/)[Dd]ocumentation/
+- (^|/)javadoc/
+- ^man/
+
+## Documentation files ##
+
+- (^|/)CONTRIBUTING(\.|$)
+- (^|/)COPYING(\.|$)
+- (^|/)INSTALL(\.|$)
+- (^|/)LICEN[CS]E(\.|$)
+- (^|/)README(\.|$)
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -62,6 +62,7 @@ module Linguist
      generated_parser? ||
      generated_net_docfile? ||
      generated_postscript? ||
+      generated_protocol_buffer_go? ||
      generated_protocol_buffer? ||
      generated_jni_header? ||
      vcr_cassette?
@@ -202,6 +203,13 @@ module Linguist
        creator.include?("ImageMagick")
    end

+    def generated_protocol_buffer_go?
+      return false unless extname == '.go'
+      return false unless lines.count > 1
+
+      return lines[0].include?("Code generated by protoc-gen-go")
+    end
+
    # Internal: Is the blob a C++, Java or Python source file generated by the
    # Protocol Buffer compiler?
    #
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -92,7 +92,7 @@ module Linguist
    disambiguate "Perl", "Perl6", "Prolog" do |data|
      if data.include?("use v6")
        Language["Perl6"]
-      elsif data.include?("use strict")
+      elsif data.match(/use strict|use\s+v?5\./)
        Language["Perl"]
      elsif data.include?(":-")
        Language["Prolog"]
@@ -107,10 +107,14 @@ module Linguist
      end
    end

-    disambiguate "IDL", "Prolog" do |data|
+    disambiguate "IDL", "Prolog", "INI", "QMake" do |data|
      if data.include?(":-")
        Language["Prolog"]
-      else
+      elsif data.include?("last_client=")
+        Language["INI"]
+      elsif data.include?("HEADERS") && data.include?("SOURCES")
+        Language["QMake"]
+      elsif /^\s*function[ \w,]+$/.match(data)
        Language["IDL"]
      end
    end
@@ -150,14 +154,20 @@ module Linguist
      end
    end

-    disambiguate "AsciiDoc", "AGS Script" do |data|
-      Language["AsciiDoc"] if /^=+(\s|\n)/.match(data)
+    disambiguate "AsciiDoc", "AGS Script", "Public Key" do |data|
+      if /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data)
+        Language["AsciiDoc"]
+      elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
+        Language["AGS Script"]
+      elsif /^-----BEGIN/.match(data)
+        Language["Public Key"]
+      end
    end

    disambiguate "FORTRAN", "Forth" do |data|
      if /^: /.match(data)
        Language["Forth"]
-      elsif /^([c*][^a-z]|      (subroutine|program)\s|!)/i.match(data)
+      elsif /^([c*][^a-z]|      (subroutine|program)\s|\s*!)/i.match(data)
        Language["FORTRAN"]
      end
    end
@@ -172,11 +182,13 @@ module Linguist
      end
    end

-    disambiguate "M", "Mathematica", "Matlab", "Mercury", "Objective-C" do |data|
+    disambiguate "M", "MUF", "Mathematica", "Matlab", "Mercury", "Objective-C" do |data|
      if ObjectiveCRegex.match(data)
        Language["Objective-C"]
      elsif data.include?(":- module")
        Language["Mercury"]
+      elsif /^: /.match(data)
+        Language["MUF"]
      elsif /^\s*;/.match(data)
        Language["M"]
      elsif /^\s*\(\*/.match(data)
@@ -223,23 +235,33 @@ module Linguist
        Language["Text"]
      end
    end
+
    disambiguate "PLSQL", "SQLPL", "PLpgSQL", "SQL" do |data|
      #only return value if a definite positive

      if /^\\i\b|AS \$\$|LANGUAGE '+plpgsql'+/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
          #postgres
-          Language["PLpgSQL"] 
+          Language["PLpgSQL"]
      elsif /(alter module)|(language sql)|(begin( NOT)+ atomic)/i.match(data)  || /signal SQLSTATE '[0-9]+'/i.match(data)
          #ibm db2
-          Language["SQLPL"] 
+          Language["SQLPL"]
      elsif /pragma|\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)/i.match(data) || /constructor\W+function/i.match(data)
          #oraclestuff
-          Language["PLSQL"] 
-      elsif ! /begin|boolean|package|exception/i.match(data) 
+          Language["PLSQL"]
+      elsif ! /begin|boolean|package|exception/i.match(data)
          #generic sql
-          Language["SQL"] 
+          Language["SQL"]
      end
+    end

+    disambiguate "D", "DTrace", "Makefile" do |data|
+      if /^module /.match(data)
+        Language["D"]
+      elsif /^((dtrace:::)?BEGIN|provider |#pragma (D (option|attributes)|ident)\s)/.match(data)
+        Language["DTrace"]
+      elsif /(\/.*:( .* \\)$| : \\$|^ : |: \\$)/.match(data)
+        Language["Makefile"]
+      end
    end
  end
 end
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -32,13 +32,6 @@ module Linguist
    # Valid Languages types
    TYPES = [:data, :markup, :programming, :prose]

-    # Names of non-programming languages that we will still detect
-    #
-    # Returns an array
-    def self.detectable_markup
-      ["CSS", "Less", "Sass", "SCSS", "Stylus", "TeX"]
-    end
-
    # Detect languages by a specific type
    #
    # type - A symbol that exists within TYPES
@@ -96,8 +89,8 @@ module Linguist

    STRATEGIES = [
      Linguist::Strategy::Modeline,
-      Linguist::Strategy::Filename,
      Linguist::Shebang,
+      Linguist::Strategy::Filename,
      Linguist::Heuristics,
      Linguist::Classifier
    ]
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -186,7 +186,7 @@ AsciiDoc:
  - .asciidoc
  - .adoc
  - .asc
-  tm_scope: none
+  tm_scope: text.html.asciidoc

 AspectJ:
  type: programming
@@ -198,7 +198,7 @@ AspectJ:

 Assembly:
  type: programming
-  color: "#a67219"
+  color: "#6E4C13"
  search_term: nasm
  aliases:
  - nasm
@@ -206,6 +206,7 @@ Assembly:
  - .asm
  - .ASM
  - .a51
+  - .nasm
  tm_scope: source.asm.x86
  ace_mode: assembly_x86

@@ -270,6 +271,7 @@ Batchfile:
  ace_mode: batchfile

 Befunge:
+  type: programming
  extensions:
  - .befunge
  ace_mode: text
@@ -325,6 +327,7 @@ Boo:
  ace_mode: text

 Brainfuck:
+  type: programming
  extensions:
  - .b
  - .bf
@@ -335,7 +338,7 @@ Brightscript:
  type: programming
  extensions:
  - .brs
-  tm_scope: none
+  tm_scope: source.brightscript
  ace_mode: text

 Bro:
@@ -355,6 +358,8 @@ C:
  - .h
  - .idc
  - .w
+  interpreters:
+  - tcc
  ace_mode: c_cpp

 C#:
@@ -418,6 +423,7 @@ CLIPS:
  ace_mode: text

 CMake:
+  type: programming
  extensions:
  - .cmake
  - .cmake.in
@@ -438,6 +444,8 @@ COBOL:
  ace_mode: cobol

 CSS:
+  type: markup
+  tm_scope: source.css
  ace_mode: css
  color: "#563d7c"
  extensions:
@@ -475,6 +483,7 @@ Chapel:
  ace_mode: text

 ChucK:
+  type: programming
  extensions:
  - .ck
  tm_scope: source.java
@@ -636,6 +645,7 @@ Crystal:
  - crystal

 Cucumber:
+  type: programming
  extensions:
  - .feature
  tm_scope: text.gherkin.feature
@@ -694,7 +704,17 @@ DM:
  tm_scope: source.c++
  ace_mode: c_cpp

+DTrace:
+  type: programming
+  extensions:
+  - .d
+  interpreters:
+  - dtrace
+  tm_scope: source.c
+  ace_mode: c_cpp
+
 Darcs Patch:
+  type: programming
  search_term: dpatch
  aliases:
  - dpatch
@@ -712,6 +732,7 @@ Dart:
  ace_mode: dart

 Diff:
+  type: programming
  extensions:
  - .diff
  - .patch
@@ -961,7 +982,7 @@ GAP:
  - .gd
  - .gi
  - .tst
-  tm_scope: none
+  tm_scope: source.gap
  ace_mode: text

 GAS:
@@ -1009,6 +1030,7 @@ Game Maker Language:
  ace_mode: c_cpp

 Genshi:
+  type: programming
  extensions:
  - .kid
  tm_scope: text.xml.genshi
@@ -1018,6 +1040,7 @@ Genshi:
  ace_mode: xml

 Gentoo Ebuild:
+  type: programming
  group: Shell
  extensions:
  - .ebuild
@@ -1025,6 +1048,7 @@ Gentoo Ebuild:
  ace_mode: sh

 Gentoo Eclass:
+  type: programming
  group: Shell
  extensions:
  - .eclass
@@ -1032,6 +1056,7 @@ Gentoo Eclass:
  ace_mode: sh

 Gettext Catalog:
+  type: programming
  search_term: pot
  searchable: false
  aliases:
@@ -1132,6 +1157,7 @@ Graphviz (DOT):
  ace_mode: text

 Groff:
+  type: programming
  extensions:
  - .man
  - '.1'
@@ -1159,6 +1185,7 @@ Groovy:
  - groovy

 Groovy Server Pages:
+  type: programming
  group: Groovy
  aliases:
  - gsp
@@ -1172,6 +1199,7 @@ HTML:
  type: markup
  tm_scope: text.html.basic
  ace_mode: html
+  color: "#e44b23"
  aliases:
  - xhtml
  extensions:
@@ -1307,6 +1335,7 @@ INI:
  - .ini
  - .cfg
  - .prefs
+  - .pro
  - .properties
  tm_scope: source.ini
  aliases:
@@ -1314,6 +1343,7 @@ INI:
  ace_mode: ini

 IRC log:
+  type: data
  search_term: irc
  aliases:
  - irc
@@ -1344,6 +1374,7 @@ Inform 7:
  ace_mode: text

 Inno Setup:
+  type: programming
  extensions:
  - .iss
  tm_scope: source.inno
@@ -1375,6 +1406,7 @@ Isabelle:

 J:
  type: programming
+  color: "#2d8abd"
  extensions:
  - .ijs
  tm_scope: source.j
@@ -1438,6 +1470,7 @@ Java:
  - .java

 Java Server Pages:
+  type: programming
  group: Java
  search_term: jsp
  aliases:
@@ -1533,6 +1566,7 @@ LFE:
  ace_mode: lisp

 LLVM:
+  type: programming
  extensions:
  - .ll
  ace_mode: text
@@ -1584,6 +1618,13 @@ Latte:
  tm_scope: source.smarty
  ace_mode: smarty

+Lean:
+  type: programming
+  extensions:
+  - .lean
+  - .hlean
+  ace_mode: lean
+
 Less:
  type: markup
  group: CSS
@@ -1593,6 +1634,7 @@ Less:
  ace_mode: less

 LilyPond:
+  type: programming
  extensions:
  - .ly
  - .ily
@@ -1713,6 +1755,15 @@ MTML:
  tm_scope: text.html.basic
  ace_mode: html

+MUF:
+  type: programming
+  group: Forth
+  extensions:
+  - .muf
+  - .m
+  tm_scope: none
+  ace_mode: forth
+
 Makefile:
  type: programming
  aliases:
@@ -1721,6 +1772,7 @@ Makefile:
  - mf
  extensions:
  - .mak
+  - .d
  - .mk
  filenames:
  - GNUmakefile
@@ -1731,6 +1783,7 @@ Makefile:
  ace_mode: makefile

 Mako:
+  type: programming
  extensions:
  - .mako
  - .mao
@@ -1767,6 +1820,8 @@ Mathematica:
  - .ma
  - .nb
  - .nbp
+  - .wl
+  - .wlt
  aliases:
  - mma
  ace_mode: text
@@ -1823,6 +1878,7 @@ Mercury:
  ace_mode: prolog

 MiniD: # Legacy
+  type: programming
  searchable: false
  extensions:
  - .minid # Dummy extension
@@ -1870,12 +1926,14 @@ MoonScript:
  ace_mode: text

 Myghty:
+  type: programming
  extensions:
  - .myt
  tm_scope: none
  ace_mode: text

 NSIS:
+  type: programming
  extensions:
  - .nsi
  - .nsh
@@ -1967,6 +2025,7 @@ Nu:
  - nush

 NumPy:
+  type: programming
  group: Python
  extensions:
  - .numpy
@@ -2052,7 +2111,7 @@ Opal:
  color: "#f7ede0"
  extensions:
  - .opal
-  tm_scope: none
+  tm_scope: source.opal
  ace_mode: text

 OpenCL:
@@ -2080,7 +2139,7 @@ OpenSCAD:
  type: programming
  extensions:
  - .scad
-  tm_scope: none
+  tm_scope: source.scad
  ace_mode: scad

 Org:
@@ -2178,7 +2237,7 @@ Papyrus:
  color: "#6600cc"
  extensions:
  - .psc
-  tm_scope: none
+  tm_scope: source.papyrus
  ace_mode: text

 Parrot:
@@ -2270,7 +2329,7 @@ PigLatin:
  color: "#fcd7de"
  extensions:
  - .pig
-  tm_scope: none
+  tm_scope: source.pig_latin
  ace_mode: text

 Pike:
@@ -2296,7 +2355,7 @@ PogoScript:
  color: "#d80074"
  extensions:
  - .pogo
-  tm_scope: none
+  tm_scope: source.pogoscript
  ace_mode: text

 PostScript:
@@ -2343,7 +2402,7 @@ Propeller Spin:
  color: "#2b446d"
  extensions:
  - .spin
-  tm_scope: none
+  tm_scope: source.spin
  ace_mode: text

 Protocol Buffer:
@@ -2446,6 +2505,7 @@ QML:
  ace_mode: text

 QMake:
+  type: programming
  extensions:
  - .pro
  - .pri
@@ -2542,6 +2602,7 @@ Ragel in Ruby Host:
  ace_mode: text

 Raw token data:
+  type: data
  search_term: raw
  aliases:
  - raw
@@ -2573,6 +2634,7 @@ Red:
  ace_mode: text

 Redcode:
+  type: programming
  extensions:
  - .cw
  tm_scope: none
@@ -2712,6 +2774,13 @@ STON:
  tm_scope: source.smalltalk
  ace_mode: text

+SVG:
+  type: data
+  extensions:
+  - .svg
+  tm_scope: text.xml
+  ace_mode: xml
+
 Sage:
  type: programming
  group: Python
@@ -2861,6 +2930,7 @@ Smalltalk:
  ace_mode: text

 Smarty:
+  type: programming
  extensions:
  - .tpl
  ace_mode: smarty
@@ -2912,7 +2982,7 @@ Stylus:
  group: CSS
  extensions:
  - .styl
-  tm_scope: none
+  tm_scope: source.stylus
  ace_mode: stylus

 SuperCollider:
@@ -3083,11 +3153,11 @@ UnrealScript:

 VCL:
  type: programming
-  ace_mode: perl
  color: "#0298c3"
  extensions:
  - .vcl
-  tm_scope: source.perl
+  tm_scope: source.varnish.vcl
+  ace_mode: text

 VHDL:
  type: programming
@@ -3183,7 +3253,7 @@ XC:
  ace_mode: c_cpp

 XML:
-  type: markup
+  type: data
  ace_mode: xml
  aliases:
  - rss
@@ -3227,7 +3297,6 @@ XML:
  - .srdf
  - .stTheme
  - .sublime-snippet
-  - .svg
  - .targets
  - .tmCommand
  - .tmLanguage
@@ -3285,6 +3354,7 @@ XQuery:
  ace_mode: xquery

 XS:
+  type: programming
  extensions:
  - .xs
  tm_scope: source.c
@@ -3381,6 +3451,7 @@ fish:
  ace_mode: text

 mupad:
+  type: programming
  extensions:
  - .mu
  ace_mode: text
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -4,7 +4,7 @@ require 'rugged'

 module Linguist
  class LazyBlob
-    GIT_ATTR = ['linguist-language', 'linguist-vendored']
+    GIT_ATTR = ['linguist-documentation', 'linguist-language', 'linguist-vendored']
    GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
    GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)

@@ -37,11 +37,19 @@ module Linguist
      end
    end

+    def documentation?
+      if attr = git_attributes['linguist-documentation']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
    def language
      return @language if defined?(@language)

      @language = if lang = git_attributes['linguist-language']
-        Language.find_by_name(lang)
+        Language.find_by_alias(lang)
      else
        super
      end
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -156,13 +156,8 @@ module Linguist

          blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))

-          # Skip vendored or generated blobs
-          next if blob.vendored? || blob.generated? || blob.language.nil?
-
-          # Only include programming languages and acceptable markup languages
-          if blob.language.type == :programming || Language.detectable_markup.include?(blob.language.name)
-            file_map[new] = [blob.language.group.name, blob.size]
-          end
+          next unless blob.include_in_language_stats?
+          file_map[new] = [blob.language.group.name, blob.size]
        end
      end

--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -251,3 +251,6 @@
 # ProGuard
 - proguard.pro
 - proguard-rules.pro
+
+# Android Google APIs
+- (^|/)\.google_apis/
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.3.1"
+  VERSION = "4.4.2"
 end
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "repository": "https://github.com/github/linguist",
  "dependencies": {
-    "season": "~>3.0"
+    "season": "~>5.0"
  }
 }
--- a/samples/Assembly/forth.nasm
+++ b/samples/Assembly/forth.nasm
--- a/samples/Brainfuck/fib100.bf
+++ b/samples/Brainfuck/fib100.bf
@@ -0,0 +1,13 @@
+# Calculate and output all fibonacci numbers under 100
+
+++++++++++
+>+>>>>++++++++++++++++++++++++++++++++++++++++++++
+>++++++++++++++++++++++++++++++++<<<<<<[>[>>>>>>+>
+<<<<<<<-]>>>>>>>[<<<<<<<+>>>>>>>-]<[>++++++++++[-
+<-[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]>[<<[>>>+<<<
+-]>>[-]]<<]>>>[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]
+>[<<+>>[-]]<<<<<<<]>>>>>[+++++++++++++++++++++++++
+++++++++++++++++++++++.[-]]++++++++++<[->-<]>++++
++++++++++++++++++++++++++++++++++++++++++++.[-]<<
+<<<<<<<<<<[>>>+>+<<<<-]>>>>[<<<<+>>>>-]<-[>>.>.<<<
+[-]]<<[>>+>+<<<-]>>>[<<<+>>>-]<<[<+>-]>[<+>-]<<<-]
--- a/samples/Brainfuck/hello.bf
+++ b/samples/Brainfuck/hello.bf
@@ -0,0 +1,4 @@
+// More complex version of hello world
+
+>++++++++[<+++++++++>-]<.>>+>+>++>[-]+<[>[->+<<++++>]<<]>.+++++++..+++.>
+>+++++++.<<<[[-]<[-]>]<+++++++++++++++.>>.+++.------.--------.>>+.>++++.
--- a/samples/Brainfuck/helloworld.bf
+++ b/samples/Brainfuck/helloworld.bf
@@ -0,0 +1,3 @@
+// Hello World
+
++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.
--- a/samples/Brainfuck/rot13.bf
+++ b/samples/Brainfuck/rot13.bf
@@ -0,0 +1,30 @@
+# ROT13 cipher
+
+-,+[                         Read first character and start outer character reading loop
+    -[                       Skip forward if character is 0
+        >>++++[>++++++++<-]  Set up divisor (32) for division loop
+                               (MEMORY LAYOUT: dividend copy remainder divisor quotient zero zero)
+        <+<-[                Set up dividend (x minus 1) and enter division loop
+            >+>+>-[>>>]      Increase copy and remainder / reduce divisor / Normal case: skip forward
+            <[[>+<-]>>+>]    Special case: move remainder back to divisor and increase quotient
+            <<<<<-           Decrement dividend
+        ]                    End division loop
+    ]>>>[-]+                 End skip loop; zero former divisor and reuse space for a flag
+    >--[-[<->+++[-]]]<[         Zero that flag unless quotient was 2 or 3; zero quotient; check flag
+        ++++++++++++<[       If flag then set up divisor (13) for second division loop
+                               (MEMORY LAYOUT: zero copy dividend divisor remainder quotient zero zero)
+            >-[>+>>]         Reduce divisor; Normal case: increase remainder
+            >[+[<+>-]>+>>]   Special case: increase remainder / move it back to divisor / increase quotient
+            <<<<<-           Decrease dividend
+        ]                    End division loop
+        >>[<+>-]             Add remainder back to divisor to get a useful 13
+        >[                   Skip forward if quotient was 0
+            -[               Decrement quotient and skip forward if quotient was 1
+                -<<[-]>>     Zero quotient and divisor if quotient was 2
+            ]<<[<<->>-]>>    Zero divisor and subtract 13 from copy if quotient was 1
+        ]<<[<<+>>-]          Zero divisor and add 13 to copy if quotient was 0
+    ]                        End outer skip loop (jump to here if ((character minus 1)/32) was not 2 or 3)
+    <[-]                     Clear remainder from first division if second division was skipped
+    <.[-]                    Output ROT13ed character from copy and clear it
+    <-,+                     Read next character
+]                            End character reading loop
--- a/samples/C/filenames/script
+++ b/samples/C/filenames/script
--- a/samples/C/pqiv.h
+++ b/samples/C/pqiv.h
@@ -0,0 +1,166 @@
+/**
+ * pqiv
+ *
+ * Copyright (c) 2013-2014, Phillip Berndt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// This file contains the definition of files, image types and
+// the plugin infrastructure. It should be included in file type
+// handlers.
+
+#ifndef _PQIV_H_INCLUDED
+#define _PQIV_H_INCLUDED
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include "lib/bostree.h"
+
+#ifndef PQIV_VERSION
+#define PQIV_VERSION "2.3"
+#endif
+
+#define FILE_FLAGS_ANIMATION      (guint)(1)
+#define FILE_FLAGS_MEMORY_IMAGE   (guint)(1<<1)
+
+// The structure for images {{{
+typedef struct file_type_handler_struct_t file_type_handler_t;
+typedef struct {
+	// File type
+	const file_type_handler_t *file_type;
+
+	// Special flags
+	// FILE_FLAGS_ANIMATION        -> Animation functions are invoked
+	//                                Set by file type handlers
+	// FILE_FLAGS_MEMORY_IMAGE     -> File lives in memory
+	guint file_flags;
+
+	// The file name to display and to sort by
+	gchar *display_name;
+
+	// The URI or file name of the file
+	gchar *file_name;
+
+	// If the file is a memory image, the actual image data
+	GBytes *file_data;
+
+	// The file monitor structure is used for inotify-watching of
+	// the files
+	GFileMonitor *file_monitor;
+
+	// This flag stores whether this image is currently loaded
+	// and valid. i.e. if it is set, you can assume that
+	// private_data contains a representation of the image;
+	// if not, you can NOT assume that it does not.
+	gboolean is_loaded;
+
+	// Cached image size
+	guint width;
+	guint height;
+
+	// File-type specific data, allocated and freed by the file type handlers
+	void *private;
+} file_t;
+// }}}
+// Definition of the built-in file types {{{
+
+// If you want to implement your own file type, you'll have to implement the
+// following functions and a non-static initialization function named
+// file_type_NAME_initializer that fills a file_type_handler_t with pointers to
+// the functions. Store the file in backends/NAME.c and adjust the Makefile to
+// add the required libraries if your backend is listed in the $(BACKENDS)
+// variable.
+
+typedef enum { PARAMETER, RECURSION, INOTIFY, BROWSE_ORIGINAL_PARAMETER, FILTER_OUTPUT } load_images_state_t;
+// Allocation function: Allocate the ->private structure within a file and add the
+// image(s) to the list of available images via load_images_handle_parameter_add_file()
+// If an image is not to be loaded for any reason, the file structure should be
+// deallocated using file_free()
+// Returns a pointer to the first added image
+// Optional, you can also set the pointer to this function to NULL.
+typedef BOSNode *(*file_type_alloc_fn_t)(load_images_state_t state, file_t *file);
+
+// Deallocation, if a file is removed from the images list. Free the ->private structure.
+// Only called if ->private is non-NULL.
+typedef void (*file_type_free_fn_t)(file_t *file);
+
+// Actually load a file into memory
+typedef void (*file_type_load_fn_t)(file_t *file, GInputStream *data, GError **error_pointer);
+
+// Unload a file
+typedef void (*file_type_unload_fn_t)(file_t *file);
+
+// Animation support: Initialize memory for animations, return ms until first frame
+// Optional, you can also set the pointer to this function to NULL.
+typedef double (*file_type_animation_initialize_fn_t)(file_t *file);
+
+// Animation support: Advance to the next frame, return ms until next frame
+// Optional, you can also set the pointer to this function to NULL.
+typedef double (*file_type_animation_next_frame_fn_t)(file_t *file);
+
+// Draw the current view to a cairo context
+typedef void (*file_type_draw_fn_t)(file_t *file, cairo_t *cr);
+
+struct file_type_handler_struct_t {
+	// All files will be filtered with this filter. If it lets it pass,
+	// a handler is assigned to a file. If none do, the file is
+	// discarded if it was found during directory traversal or
+	// loaded using the first image backend if it was an explicit
+	// parameter.
+	GtkFileFilter *file_types_handled;
+
+	// Pointers to the functions defined above
+	file_type_alloc_fn_t alloc_fn;
+	file_type_free_fn_t free_fn;
+	file_type_load_fn_t load_fn;
+	file_type_unload_fn_t unload_fn;
+	file_type_animation_initialize_fn_t animation_initialize_fn;
+	file_type_animation_next_frame_fn_t animation_next_frame_fn;
+	file_type_draw_fn_t draw_fn;
+};
+
+// Initialization function: Tell pqiv about a backend
+typedef void (*file_type_initializer_fn_t)(file_type_handler_t *info);
+
+// pqiv symbols available to plugins {{{
+
+// Global cancellable that should be used for every i/o operation
+extern GCancellable *image_loader_cancellable;
+
+// Current scale level. For backends that don't support cairo natively.
+extern gdouble current_scale_level;
+
+// Load a file from disc/memory/network
+GInputStream *image_loader_stream_file(file_t *file, GError **error_pointer);
+
+// Add a file to the list of loaded files
+// Should be called at least once in a file_type_alloc_fn_t, with the state being
+// forwarded unaltered.
+BOSNode *load_images_handle_parameter_add_file(load_images_state_t state, file_t *file);
+
+// Load all data from an input stream into memory, conveinience function
+GBytes *g_input_stream_read_completely(GInputStream *input_stream, GCancellable *cancellable, GError **error_pointer);
+
+// Free a file
+void file_free(file_t *file);
+
+// }}}
+
+// File type handlers, used in the initializer and file type guessing
+extern file_type_handler_t file_type_handlers[];
+
+/* }}} */
+
+#endif
--- a/samples/D/mpq.d
+++ b/samples/D/mpq.d
@@ -0,0 +1,318 @@
+/*
+ *  mpq.d -- D programming language module for libmpq
+ *
+ *  Copyright (c) 2008 Georg Lukas <georg@op-co.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  This module is written to support Phobos. Patches to allow binding to
+ *  Tango are welcome.
+ */
+
+module mpq;
+
+/* the following pragma does not work on DMD/Linux, generates a warning on
+ * GDC/Linux and has not been tested on Windows. Commented out for now. */
+// pragma(lib, "libmpq");
+
+import std.string; // for format() and toStringz()
+import std.traits; // for ParameterTypeTuple!()
+
+/* XXX: this assumes that libmpq is compiled with Large File Support on */
+alias long off_t;
+
+/* libmpq error return values */
+const LIBMPQ_ERROR_OPEN			= -1;	/* open error on file. */
+const LIBMPQ_ERROR_CLOSE		= -2;	/* close error on file. */
+const LIBMPQ_ERROR_SEEK			= -3;	/* lseek error on file. */
+const LIBMPQ_ERROR_READ			= -4;	/* read error on file. */
+const LIBMPQ_ERROR_WRITE		= -5;	/* write error on file. */
+const LIBMPQ_ERROR_MALLOC		= -6;	/* memory allocation error. */
+const LIBMPQ_ERROR_FORMAT		= -7;	/* format errror. */
+const LIBMPQ_ERROR_NOT_INITIALIZED	= -8;	/* init() wasn't called. */
+const LIBMPQ_ERROR_SIZE			= -9;	/* buffer size is to small. */
+const LIBMPQ_ERROR_EXIST		= -10;	/* file or block does not exist in archive. */
+const LIBMPQ_ERROR_DECRYPT		= -11;	/* we don't know the decryption seed. */
+const LIBMPQ_ERROR_UNPACK		= -12;	/* error on unpacking file. */
+
+/** libmpq internal meta-data for an archive */
+extern struct mpq_archive_s;
+
+extern(C) {
+
+/* libmpq__generic information about library. */
+char *libmpq__version();
+
+/* libmpq__generic mpq archive information. */
+int libmpq__archive_open(mpq_archive_s **mpq_archive, char *mpq_filename, off_t archive_offset);
+int libmpq__archive_close(mpq_archive_s *mpq_archive);
+int libmpq__archive_packed_size(mpq_archive_s *mpq_archive, off_t *packed_size);
+int libmpq__archive_unpacked_size(mpq_archive_s *mpq_archive, off_t *unpacked_size);
+int libmpq__archive_offset(mpq_archive_s *mpq_archive, off_t *offset);
+int libmpq__archive_version(mpq_archive_s *mpq_archive, uint *version_);
+int libmpq__archive_files(mpq_archive_s *mpq_archive, uint *files);
+
+/* libmpq__generic file processing functions. */
+int libmpq__file_packed_size(mpq_archive_s *mpq_archive, uint file_number, off_t *packed_size);
+int libmpq__file_unpacked_size(mpq_archive_s *mpq_archive, uint file_number, off_t *unpacked_size);
+int libmpq__file_offset(mpq_archive_s *mpq_archive, uint file_number, off_t *offset);
+int libmpq__file_blocks(mpq_archive_s *mpq_archive, uint file_number, uint *blocks);
+int libmpq__file_encrypted(mpq_archive_s *mpq_archive, uint file_number, uint *encrypted);
+int libmpq__file_compressed(mpq_archive_s *mpq_archive, uint file_number, uint *compressed);
+int libmpq__file_imploded(mpq_archive_s *mpq_archive, uint file_number, uint *imploded);
+int libmpq__file_number(mpq_archive_s *mpq_archive, char *filename, uint *number);
+int libmpq__file_read(mpq_archive_s *mpq_archive, uint file_number, ubyte *out_buf, off_t out_size, off_t *transferred);
+
+/* libmpq__generic block processing functions. */
+int libmpq__block_open_offset(mpq_archive_s *mpq_archive, uint file_number);
+int libmpq__block_close_offset(mpq_archive_s *mpq_archive, uint file_number);
+int libmpq__block_unpacked_size(mpq_archive_s *mpq_archive, uint file_number, uint block_number, off_t *unpacked_size);
+int libmpq__block_read(mpq_archive_s *mpq_archive, uint file_number, uint block_number, ubyte *out_buf, off_t out_size, off_t *transferred);
+
+}
+
+
+/** exception class for failed libmpq calls */
+class MPQException : Exception {
+	const string[] Errors = [
+		"unknown error",
+		"open error on file",
+		"close error on file",
+		"lseek error on file",
+		"read error on file",
+		"write error on file",
+		"memory allocation error",
+		"format errror",
+		"init() wasn't called",
+		"buffer size is to small",
+		"file or block does not exist in archive",
+		"we don't know the decryption seed",
+		"error on unpacking file"];
+
+	public int errno;
+	this(char[] fnname = "unknown_function", int errno = 0) {
+
+		this.errno = errno;
+		if (-errno >= Errors.length)
+			errno = 0;
+		super(std.string.format("Error in %s(): %s (%d)",
+					fnname, Errors[-errno], errno));
+	}
+}
+
+
+/** template to wrap function calls and throw exceptions in case of error
+ *
+ * thanks for the idea to while(nan) blog,
+ * http://while-nan.blogspot.com/2007/06/wrapping-functions-for-fun-and-profit.html
+ *
+ * use: MPQ_CHECKERR(libmpq__archive_open)(&m, "foo.mpq", -1);
+ *   returns the retval of archive_open on success;
+ *   throws an MPQException on failure.
+ *
+ * @param Fn libmpq__function reference
+ * @param args libmpq__function parameters
+ * @return return value of libmpq__function on success
+ * @throw MPQException on error
+ */
+int MPQ_CHECKERR(alias Fn)(ParameterTypeTuple!(Fn) args)
+{
+	int result = Fn(args);
+	if (result < 0) {
+		/* XXX: relying on non-specified stringof() behaviour */
+		throw new MPQException((&Fn).stringof[2..$], result);
+	}
+        return result;
+}
+
+
+/** mixin alias to wrap library functions into MPQ_CHECKERR.
+ *
+ * alias mpq.func_name(...) to MPQ_CHECKERR(libmpq__func_name)(...)
+ * @param func_name name of the function to be wrapped
+ */
+template MPQ_FUNC(char[] func_name) {
+	const char[] MPQ_FUNC = "alias MPQ_CHECKERR!(libmpq__" ~ func_name ~ ") " ~ func_name ~ ";";
+}
+
+alias libmpq__version libversion; /* must be direct alias because it returns char*, not error int */
+mixin(MPQ_FUNC!("archive_open"));
+mixin(MPQ_FUNC!("archive_close"));
+mixin(MPQ_FUNC!("archive_packed_size"));
+mixin(MPQ_FUNC!("archive_unpacked_size"));
+mixin(MPQ_FUNC!("archive_offset"));
+mixin(MPQ_FUNC!("archive_version"));
+mixin(MPQ_FUNC!("archive_files"));
+mixin(MPQ_FUNC!("file_packed_size"));
+mixin(MPQ_FUNC!("file_unpacked_size"));
+mixin(MPQ_FUNC!("file_offset"));
+mixin(MPQ_FUNC!("file_blocks"));
+mixin(MPQ_FUNC!("file_encrypted"));
+mixin(MPQ_FUNC!("file_compressed"));
+mixin(MPQ_FUNC!("file_imploded"));
+mixin(MPQ_FUNC!("file_number"));
+mixin(MPQ_FUNC!("file_read"));
+mixin(MPQ_FUNC!("block_open_offset"));
+mixin(MPQ_FUNC!("block_close_offset"));
+mixin(MPQ_FUNC!("block_unpacked_size"));
+mixin(MPQ_FUNC!("block_read"));
+
+/** getter function named name for returning archive_* single values:
+ *
+ *   <type> Archive.<name>() { return libmpq__archive_<name>() }
+ *
+ * @param type return type for the original function reference
+ * @param name name of the original function
+ * @param name2 name for the prototype (defaults to name, used for "version")
+ * @return getter function mixin
+ */
+template MPQ_A_GET(char[] type, char[] name, char[] name2 = name) {
+	const char[] MPQ_A_GET = type ~ " " ~ name2 ~ "() { " ~
+			type ~ " ret; " ~
+			"archive_" ~ name ~ "(m, &ret); return ret;" ~
+		"}";
+}
+
+/** wrapper class for an MPQ Archive
+ *
+ * syntax: auto a = new mpq.Archive("somefile.mpq");
+ */
+class Archive {
+	mpq_archive_s *m;
+	File listfile;
+	char[][] listfiledata;
+
+	this(char[] archivename, off_t offset = -1) {
+		archive_open(&m, toStringz(archivename), offset);
+	}
+
+	mixin(MPQ_A_GET!("off_t", "packed_size"));
+	mixin(MPQ_A_GET!("off_t", "unpacked_size"));
+	mixin(MPQ_A_GET!("off_t", "offset"));
+	mixin(MPQ_A_GET!("uint", "version", "version_"));
+	mixin(MPQ_A_GET!("uint", "files"));
+
+	~this() {
+		archive_close(m);
+	}
+
+	mpq_archive_s* archive() {
+		return m;
+	}
+
+	File opIndex(char[] fname) {
+		return new File(this, fname);
+	}
+	File opIndex(int fno) {
+		return new File(this, fno);
+	}
+
+	char[][] filelist() {
+		try {
+			if (!listfile) {
+				listfile = this["(listfile)"];
+				listfiledata = (cast(char[])listfile.read()).splitlines();
+			}
+			return listfiledata;
+		} catch (MPQException e) {
+			return [];
+		}
+	}
+
+	/+uint filenumber(char[] filename) {
+		try {
+			if (!listfile) {
+				listfile = this["(listfile)"];
+				listfiledata = (cast(char[])listfile.read()).splitlines();
+			}
+			return listfiledata;
+		} catch (MPQException e) {
+			return [];
+		}
+	}+/
+
+}
+
+
+/** getter function named name for returning file_* single values:
+ *
+ *   <type> File.<name>() { return libmpq__file_<name>() }
+ *
+ * @param type return type for the original function reference
+ * @param name name of the original function
+ * @param name2 name for the prototype (defaults to name, used for "version")
+ * @return getter function mixin
+ */
+template MPQ_F_GET(char[] type, char[] name, char[] name2 = name) {
+	const char[] MPQ_F_GET = type ~ " " ~ name2 ~ "() { " ~
+			type ~ " ret; " ~
+			"file_" ~ name ~ "(am, fileno, &ret); " ~
+			"return ret;" ~
+		"}";
+}
+
+/** wrapper class for a single file in an MPQ Archive
+ *
+ * syntax:
+ *    auto a = new mpq.Archive("somefile.mpq");
+ *    auto f = a["(listfile)"];
+ *    auto f2 = a[0];
+ *    auto f3 = new File(a, "(listfile)");
+ */
+class File {
+	Archive a;
+	mpq_archive_s* am;
+	char[] filename;
+	uint fileno;
+
+	this(Archive a, int fileno) {
+		this.a = a;
+		this.am = a.archive();
+		if (fileno >= a.files) {
+			throw new MPQException(format("File(%d)", fileno),
+				LIBMPQ_ERROR_EXIST);
+		}
+		this.filename = format("file%04d.xxx", fileno);
+		this.fileno = fileno;
+	}
+
+	this(Archive a, char[] filename) {
+		this.a = a;
+		this.am = a.archive();
+		this.filename = filename;
+		/* this line will throw an exception when the file is not there */
+		mpq.file_number(am, toStringz(filename), &this.fileno);
+	}
+
+	mixin(MPQ_F_GET!("off_t", "packed_size"));
+	mixin(MPQ_F_GET!("off_t", "unpacked_size"));
+	mixin(MPQ_F_GET!("off_t", "offset"));
+	mixin(MPQ_F_GET!("uint", "blocks"));
+	mixin(MPQ_F_GET!("uint", "encrypted"));
+	mixin(MPQ_F_GET!("uint", "compressed"));
+	mixin(MPQ_F_GET!("uint", "imploded"));
+
+	uint no() {	return fileno; }
+	char[] name() {	return filename; }
+
+	ubyte[] read() {
+		ubyte[] content;
+		content.length = this.unpacked_size();
+		off_t trans;
+		mpq.file_read(am, fileno, content.ptr, content.length, &trans);
+		content.length = trans;
+		return content;
+	}
+}
--- a/samples/DTrace/counts.d
+++ b/samples/DTrace/counts.d
@@ -0,0 +1,23 @@
+/*
+ * This software is in the public domain.
+ *
+ * $Id: counts.d 10510 2005-08-15 01:46:19Z kateturner $
+ */
+
+#pragma D option quiet
+
+self int tottime;
+BEGIN {
+	tottime = timestamp;
+}
+
+php$target:::function-entry
+	@counts[copyinstr(arg0)] = count();
+}
+
+END {
+	printf("Total time: %dus\n", (timestamp - tottime) / 1000);
+	printf("# calls by function:\n");
+	printa("%-40s %@d\n", @counts);
+}
+
--- a/samples/DTrace/javascript-trace.d
+++ b/samples/DTrace/javascript-trace.d
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Copyright (C) 2007  Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * javascript provider probes
+ *
+ * function-entry       (filename, classname, funcname)
+ * function-info        (filename, classname, funcname, lineno,
+ *                      runfilename, runlineno)
+ * function-args        (filename, classname, funcname, argc, argv, argv0,
+ *                      argv1, argv2, argv3, argv4)
+ * function-rval        (filename, classname, funcname, lineno, rval, rval0)
+ * function-return      (filename, classname, funcname)
+ * object-create-start  (filename, classname)
+ * object-create        (filename, classname, *object, rlineno)
+ * object-create-done   (filename, classname)
+ * object-finalize      (NULL, classname, *object)
+ * execute-start        (filename, lineno)
+ * execute-done         (filename, lineno)
+ */
+
+provider javascript {
+ probe function__entry(char *, char *, char *);
+ probe function__info(char *, char *, char *, int, char *, int);
+ probe function__args(char *, char *, char *, int, void *, void *, void *,
+     void *, void *, void *);
+ probe function__rval(char *, char *, char *, int, void *, void *);
+ probe function__return(char *, char *, char *);
+ probe object__create__start(char *, char *);
+ probe object__create__done(char *, char *);
+ /* XXX must use unsigned longs here instead of uintptr_t for OS X 
+    (Apple radar: 5194316 & 5565198) */
+ probe object__create(char *, char *, unsigned long, int);
+ probe object__finalize(char *, char *, unsigned long);
+ probe execute__start(char *, int);
+ probe execute__done(char *, int);
+};
+
+/*
+#pragma D attributes Unstable/Unstable/Common provider mozilla provider
+#pragma D attributes Private/Private/Unknown provider mozilla module
+#pragma D attributes Private/Private/Unknown provider mozilla function
+#pragma D attributes Unstable/Unstable/Common provider mozilla name
+#pragma D attributes Unstable/Unstable/Common provider mozilla args
+*/
+
--- a/samples/DTrace/probes.d
+++ b/samples/DTrace/probes.d
@@ -0,0 +1,93 @@
+/* ----------
+ *	DTrace probes for PostgreSQL backend
+ *
+ *	Copyright (c) 2006-2009, PostgreSQL Global Development Group
+ *
+ *	$PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.11 2009/04/02 20:59:10 momjian Exp $
+ * ----------
+ */
+
+
+/*
+ * Typedefs used in PostgreSQL.
+ *
+ * NOTE: Do not use system-provided typedefs (e.g. uintptr_t, uint32_t, etc)
+ * in probe definitions, as they cause compilation errors on Mac OS X 10.5.
+ */
+#define LocalTransactionId unsigned int
+#define LWLockId int
+#define LWLockMode int
+#define LOCKMODE int
+#define BlockNumber unsigned int
+#define Oid unsigned int
+#define ForkNumber int
+#define bool char
+
+provider postgresql {
+
+	probe transaction__start(LocalTransactionId);
+	probe transaction__commit(LocalTransactionId);
+	probe transaction__abort(LocalTransactionId);
+
+	probe lwlock__acquire(LWLockId, LWLockMode);
+	probe lwlock__release(LWLockId);
+	probe lwlock__wait__start(LWLockId, LWLockMode);
+	probe lwlock__wait__done(LWLockId, LWLockMode);
+	probe lwlock__condacquire(LWLockId, LWLockMode);
+	probe lwlock__condacquire__fail(LWLockId, LWLockMode);
+
+	probe lock__wait__start(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, LOCKMODE);
+	probe lock__wait__done(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, LOCKMODE);
+
+	probe query__parse__start(const char *);
+	probe query__parse__done(const char *);
+	probe query__rewrite__start(const char *);
+	probe query__rewrite__done(const char *);
+	probe query__plan__start();
+	probe query__plan__done();
+	probe query__execute__start();
+	probe query__execute__done();
+	probe query__start(const char *);
+	probe query__done(const char *);
+	probe statement__status(const char *);
+
+	probe sort__start(int, bool, int, int, bool);
+	probe sort__done(bool, long);
+
+	probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, bool, bool);
+	probe buffer__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, bool, bool, bool);
+	probe buffer__flush__start(ForkNumber, BlockNumber, Oid, Oid, Oid);
+	probe buffer__flush__done(ForkNumber, BlockNumber, Oid, Oid, Oid);
+
+	probe buffer__checkpoint__start(int);
+	probe buffer__checkpoint__sync__start();
+	probe buffer__checkpoint__done();
+	probe buffer__sync__start(int, int);
+	probe buffer__sync__written(int);
+	probe buffer__sync__done(int, int, int);
+	probe buffer__write__dirty__start(ForkNumber, BlockNumber, Oid, Oid, Oid);
+	probe buffer__write__dirty__done(ForkNumber, BlockNumber, Oid, Oid, Oid);
+
+	probe deadlock__found();
+
+	probe checkpoint__start(int);
+	probe checkpoint__done(int, int, int, int, int);
+	probe clog__checkpoint__start(bool);
+	probe clog__checkpoint__done(bool);
+	probe subtrans__checkpoint__start(bool);
+	probe subtrans__checkpoint__done(bool);
+	probe multixact__checkpoint__start(bool);
+	probe multixact__checkpoint__done(bool);
+	probe twophase__checkpoint__start();
+	probe twophase__checkpoint__done();
+
+	probe smgr__md__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid);
+	probe smgr__md__read__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, int);
+	probe smgr__md__write__start(ForkNumber, BlockNumber, Oid, Oid, Oid);
+	probe smgr__md__write__done(ForkNumber, BlockNumber, Oid, Oid, Oid, int, int);
+
+	probe xlog__insert(unsigned char, unsigned char);
+	probe xlog__switch();
+	probe wal__buffer__write__dirty__start();
+	probe wal__buffer__write__dirty__done();
+};
--- a/samples/Go/api.pb.go
+++ b/samples/Go/api.pb.go
--- a/samples/INI/MouseKeyboard.pro
+++ b/samples/INI/MouseKeyboard.pro
@@ -0,0 +1,71 @@
+update=Sun 15 Feb 2015 01:10:10 PM EST
+last_client=eeschema
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.6
+PadDrillOvalY=0.6
+PadSizeH=1.5
+PadSizeV=1.5
+PcbTextSizeV=1.5
+PcbTextSizeH=1.5
+PcbTextThickness=0.3
+ModuleTextSizeV=1
+ModuleTextSizeH=1
+ModuleTextSizeThickness=0.15
+SolderMaskClearance=0
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.2
+BoardOutlineThickness=0.09999999999999999
+ModuleOutlineThickness=0.15
+[pcbnew/libraries]
+LibDir=
+[general]
+version=1
+[eeschema]
+version=1
+PageLayoutDescrFile=
+SubpartIdSeparator=0
+SubpartFirstId=65
+LibDir=/home/hschmale/KiCad/LibMods-3rdParty
+NetFmtName=
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=special
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
+LibName31=arduino_shieldsNCL
+LibName32=con-usb-2
+LibName33=2axispotwselect
--- a/samples/Lean/binary.lean
+++ b/samples/Lean/binary.lean
@@ -0,0 +1,75 @@
+/-
+Copyright (c) 2014 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+
+Module: algebra.binary
+Authors: Leonardo de Moura, Jeremy Avigad
+
+General properties of binary operations.
+-/
+
+import logic.eq
+open eq.ops
+
+namespace binary
+  section
+    variable {A : Type}
+    variables (op₁ : A → A → A) (inv : A → A) (one : A)
+
+    local notation a * b := op₁ a b
+    local notation a ⁻¹  := inv a
+    local notation 1     := one
+
+    definition commutative := ∀a b, a * b = b * a
+    definition associative := ∀a b c, (a * b) * c = a * (b * c)
+    definition left_identity := ∀a, 1 * a = a
+    definition right_identity := ∀a, a * 1 = a
+    definition left_inverse := ∀a, a⁻¹ * a = 1
+    definition right_inverse := ∀a, a * a⁻¹ = 1
+    definition left_cancelative := ∀a b c, a * b = a * c → b = c
+    definition right_cancelative := ∀a b c, a * b = c * b → a = c
+
+    definition inv_op_cancel_left := ∀a b, a⁻¹ * (a * b) = b
+    definition op_inv_cancel_left := ∀a b, a * (a⁻¹ * b) = b
+    definition inv_op_cancel_right := ∀a b, a * b⁻¹ * b =  a
+    definition op_inv_cancel_right := ∀a b, a * b * b⁻¹ = a
+
+    variable (op₂ : A → A → A)
+
+    local notation a + b := op₂ a b
+
+    definition left_distributive := ∀a b c, a * (b + c) = a * b + a * c
+    definition right_distributive := ∀a b c, (a + b) * c = a * c + b * c
+  end
+
+  context
+    variable {A : Type}
+    variable {f : A → A → A}
+    variable H_comm : commutative f
+    variable H_assoc : associative f
+    infixl `*` := f
+    theorem left_comm : ∀a b c, a*(b*c) = b*(a*c) :=
+    take a b c, calc
+      a*(b*c) = (a*b)*c  : H_assoc
+        ...   = (b*a)*c  : H_comm
+        ...   = b*(a*c)  : H_assoc
+
+    theorem right_comm : ∀a b c, (a*b)*c = (a*c)*b :=
+    take a b c, calc
+      (a*b)*c = a*(b*c) : H_assoc
+        ...   = a*(c*b) : H_comm
+        ...   = (a*c)*b : H_assoc
+  end
+
+  context
+    variable {A : Type}
+    variable {f : A → A → A}
+    variable H_assoc : associative f
+    infixl `*` := f
+    theorem assoc4helper (a b c d) : (a*b)*(c*d) = a*((b*c)*d) :=
+    calc
+      (a*b)*(c*d) = a*(b*(c*d)) : H_assoc
+              ... = a*((b*c)*d) : H_assoc
+  end
+
+end binary
--- a/samples/Lean/set.hlean
+++ b/samples/Lean/set.hlean
@@ -0,0 +1,70 @@
+-- Copyright (c) 2015 Jakob von Raumer. All rights reserved.
+-- Released under Apache 2.0 license as described in the file LICENSE.
+-- Authors: Jakob von Raumer
+-- Category of sets
+
+import .basic types.pi trunc
+
+open truncation sigma sigma.ops pi function eq morphism precategory
+open equiv
+
+namespace precategory
+
+  universe variable l
+
+  definition set_precategory : precategory.{l+1 l} (Σ (A : Type.{l}), is_hset A) :=
+  begin
+    fapply precategory.mk.{l+1 l},
+                  intros, apply (a.1 → a_1.1),
+                intros, apply trunc_pi, intros, apply b.2,
+              intros, intro x, exact (a_1 (a_2 x)),
+            intros, exact (λ (x : a.1), x),
+          intros, apply funext.path_pi, intro x, apply idp,
+        intros, apply funext.path_pi, intro x, apply idp,
+      intros, apply funext.path_pi, intro x, apply idp,
+  end
+
+end precategory
+
+namespace category
+
+  universe variable l
+  local attribute precategory.set_precategory.{l+1 l} [instance]
+
+  definition set_category_equiv_iso (a b : (Σ (A : Type.{l}), is_hset A))
+    : (a ≅ b) = (a.1 ≃ b.1) :=
+  /-begin
+    apply ua, fapply equiv.mk,
+      intro H,
+        apply (isomorphic.rec_on H), intros (H1, H2),
+        apply (is_iso.rec_on H2), intros (H3, H4, H5),
+        fapply equiv.mk,
+        apply (isomorphic.rec_on H), intros (H1, H2),
+        exact H1,
+      fapply is_equiv.adjointify, exact H3,
+          exact sorry,
+        exact sorry,
+  end-/ sorry
+
+  definition set_category : category.{l+1 l} (Σ (A : Type.{l}), is_hset A) :=
+  /-begin
+    assert (C : precategory.{l+1 l} (Σ (A : Type.{l}), is_hset A)),
+      apply precategory.set_precategory,
+    apply category.mk,
+    assert (p : (λ A B p, (set_category_equiv_iso A B) ▹ iso_of_path p) = (λ A B p, @equiv_path A.1 B.1 p)),
+    apply is_equiv.adjointify,
+        intros,
+        apply (isomorphic.rec_on a_1), intros (iso', is_iso'),
+        apply (is_iso.rec_on is_iso'), intros (f', f'sect, f'retr),
+        fapply sigma.path,
+          apply ua, fapply equiv.mk, exact iso',
+          fapply is_equiv.adjointify,
+              exact f',
+            intros, apply (f'retr ▹ _),
+          intros, apply (f'sect ▹ _),
+        apply (@is_hprop.elim),
+        apply is_trunc_is_hprop,
+      intros,
+  end -/ sorry
+
+end category
--- a/samples/MUF/39.m
+++ b/samples/MUF/39.m
@@ -0,0 +1,278 @@
+$include $lib/strings
+$include $lib/match
+lvar check-obj-addr
+   
+: check-next-loop (d -- )
+   dup not if pop exit then
+   dup exit? over thing? or
+   me @ 3 pick .controls and if
+      dup check-obj-addr @ execute
+   then
+   next check-next-loop
+;
+   
+: check-contents (d -- )
+   contents check-next-loop
+;
+   
+: check-exits (d -- )
+   exits check-next-loop
+;
+   
+: exec-err (d mtypestr warnstr -- )
+   "On " 4 rotate unparseobj strcat
+   ", in it's " strcat rot strcat
+   ", " strcat swap strcat .tell
+;
+   
+: can-linkto? (player object -- i)
+   dup "link_ok" flag? if pop pop 1 exit then
+   .controls
+;
+   
+: check-exec (d mtype execstr -- )
+   dup "@" 1 strncmp if pop pop pop exit then
+   1 strcut swap pop
+   " " .split pop
+   dup "$" 1 strncmp not if
+      dup match ok? not if
+         " is not a known registered program." strcat
+         exec-err exit
+      then
+      dup match program? not if
+         " is not a program." strcat
+         exec-err exit
+      then
+      3 pick owner over match can-linkto? not if
+         " is not Link_OK." strcat
+         exec-err exit
+      then
+   else
+      dup number? not if
+         " is not a program dbref." strcat
+         "@" swap strcat exec-err exit
+      then
+      dup atoi dbref ok? not if
+         " is not a valid program reference." strcat
+         "@" swap strcat exec-err exit
+      then
+      dup atoi dbref program? not if
+         " is not a valid program reference." strcat
+         "@" swap strcat exec-err exit
+      then
+      3 pick owner over atoi dbref can-linkto? not if
+         " is not Link_OK." strcat
+         "@" swap strcat exec-err exit
+      then
+   then
+   pop pop pop
+;
+   
+   
+: missing-err ( d s -- )
+   swap unparseobj
+   " is missing an "
+   strcat swap strcat
+   " message." strcat .tell
+;
+   
+: colon-err ( d s -- )
+   swap unparseobj
+   " has an unnecesary ':' at the start of its "
+   strcat swap strcat
+   " message." strcat .tell
+;
+   
+: check-desc (d -- )
+   dup desc not if
+      "@description" missing-err
+   else
+      "@description" over
+      desc check-exec
+   then
+;
+   
+: check-succ (d -- )
+   dup succ not if
+      "@success" missing-err
+   else
+      "@success" over
+      succ check-exec
+   then
+;
+   
+: check-fail (d -- )
+   dup fail not if
+      "@fail" missing-err
+   else
+      "@fail" over
+      fail check-exec
+   then
+;
+   
+: check-drop (d -- )
+   dup drop not if
+      "@drop" missing-err
+   else
+      "@drop" over
+      drop check-exec
+   then
+;
+   
+: check-osucc (d -- )
+   dup osucc not if
+      "@osuccess" missing-err
+   else
+      dup osucc ":" 1 strncmp not if
+         "@osuccess" colon-err
+      else pop
+      then
+   then
+;
+   
+: check-ofail (d -- )
+   dup ofail not if
+      "@ofail" missing-err
+   else
+      dup ofail ":" 1 strncmp not if
+         "@ofail" colon-err
+      else pop
+      then
+   then
+;
+   
+: check-odrop (d -- )
+   dup odrop not if
+      "@odrop" missing-err
+   else
+      dup odrop ":" 1 strncmp not if
+         "@odrop" colon-err
+      else pop
+      then
+   then
+;
+   
+   
+$define islocked? (d -- i) getlockstr "*UNLOCKED*" stringcmp $enddef
+   
+: islocked_always? (d -- i)
+   getlockstr dup "#0" stringcmp not if pop 1 exit then
+   dup "#" STRsplit swap pop atoi
+   "#" swap intostr strcat
+   (lockstr "#dbref")
+   dup "&!" over strcat strcat
+   3 pick stringcmp not if pop pop 1 exit then
+   "&" over strcat strcat "!" swap strcat
+   stringcmp not if 1 exit then
+   0
+;
+   
+: check-link ( d -- )
+   dup getlink not if
+      dup unparseobj " is unlinked." strcat .tell
+   else
+      dup getlink over location dbcmp if
+         dup islocked? not if
+            dup unparseobj
+            " is linked to it's location, but is unlocked."
+            strcat .tell
+         then
+      else (is not linked to it's location)
+         dup getlink program? if
+            dup dup owner swap getlink can-linkto? not if
+               dup unparseobj
+               " is linked to a program which is not Link_OK."
+               strcat .tell
+            then
+         then
+      then
+   then
+   pop
+;
+         
+: check-room (d -- )
+   dup check-desc
+   dup islocked? if
+      dup islocked_always? not if
+         dup check-succ
+      then
+      dup check-fail
+   then
+   dup getlink if
+      dup check-drop
+      dup check-odrop
+   then
+   dup check-contents
+   check-exits
+;
+   
+: check-exit ( d -- )
+   dup check-link
+   dup check-desc
+   dup getlink dup ok? if
+      program? not if
+         dup islocked_always? not if
+            dup check-succ
+            dup check-osucc
+            dup check-odrop
+         then
+         dup islocked? if
+            dup check-fail
+            dup check-ofail
+         then
+      then
+   else pop
+   then
+   pop
+;
+   
+: check-thing ( d -- )
+   dup check-desc
+   dup islocked_always? not if
+      dup check-succ
+      dup check-osucc
+   then
+   dup islocked? if
+      dup check-fail
+      dup check-ofail
+   then
+   dup check-drop
+   dup check-odrop
+   check-exits
+;
+   
+: check-player ( d -- )
+   dup check-desc
+   dup islocked_always? not if
+      dup check-succ
+      dup check-osucc
+   then
+   dup islocked? if
+      dup check-fail
+      dup check-ofail
+   then
+   dup check-contents
+   check-exits
+;
+   
+: check-program ( d -- )
+   check-desc
+;
+   
+: check-obj (d -- )
+   dup room?   if check-room   exit then
+   dup exit?   if check-exit   exit then
+   dup thing?  if check-thing  exit then
+   dup player? if check-player exit then
+   check-program
+;
+   
+: main
+   'check-obj check-obj-addr !
+   .strip dup not if pop "here" then
+   .match_controlled
+   dup #-3 dbcmp if pop me @ getlink then
+   dup ok? not if pop exit then
+   check-obj
+   me @ "Check done." notify
+;
--- a/samples/MUF/cmd-say.muf
+++ b/samples/MUF/cmd-say.muf
@@ -0,0 +1,275 @@
+@program cmd-say.muf
+1 1000 d
+i
+( cmd-say.muf by Natasha@HLM
+
+  Copyright 2002-2004 Natasha Snunkmeox. Copyright 2002-2004 Here Lie Monsters.
+  "@view $box/mit" for license information.
+)
+$author Natasha Snunkmeox <natmeox@neologasm.org>
+$note Say for Fuzzball 6.
+$version 1.0
+
+$include $lib/ignore
+$include $lib/strings
+$include $lib/match
+
+$def str_program "saypose"
+$def prop_third "_prefs/say/third"
+$def prop_quotes "_say/def/quotes"
+$def prop_overb "_say/def/osay"
+$def prop_verb "_say/def/say"
+$def prop_split "_prefs/say/split"
+$def prop_color "_prefs/say/color"
+$def prop_meow "_prefs/say/meow"
+
+lvar randomWord
+
+lvar verb
+lvar overb
+lvar lquo
+lvar rquo
+lvar splitsay
+
+: rtn-getThirdVerb[ var:overb -- ]
+    ( Get the third-person verb. )
+    me @ prop_overb getpropstr dup if  ( str strOverb )
+        strip dup dup "," instr not and if "," strcat then
+    else pop "says," then  ( str strOverb )
+    me @ "%D %s" fmtstring overb @ !  ( str )
+;
+
+: rtn-getFirstVerb[ var:verb var:overb -- ]
+    me @ prop_third getpropstr .yes? not if  ( str )
+        ( Get the first-person verb. )
+        me @ prop_verb getpropstr dup if  ( str strVerb )
+            strip dup dup "," instr not and if "," strcat then
+        else pop "say," then  ( str strVerb )
+        splitsay @ if "you %s" else "You %s" then fmtstring  ( str strVerb )
+    else overb @ @ then verb @ !  ( str )
+;
+
+: rtn-getQuotes[ var:lquo var:rquo -- ]
+    me @ prop_quotes getpropstr dup "%m" instr if  ( strQuotes )
+        "%m" split  ( strLquo strRquo )
+    else pop "\"" dup then  ( strLquo strRquo )
+    rquo @ ! lquo @ !  (  )
+;
+
+: do-say  ( str -- )
+    "" randomWord !
+
+    var who
+    var exclude
+
+    ( Ignoring? Get 'em outta here. )
+    loc @ contents_array  ( str arrHere )
+    dup me @ str_program array_get_ignorers  ( str arrHere arrIgnorers )
+    dup exclude !
+    swap array_diff who !
+
+
+    ( Anyone #meowing this player? Go ahead and notify before special formatting. )
+    who @ prop_meow me @ owner "*{%d}*" fmtstring array_filter_prop  ( str arrMeow )
+    dup if  ( str arrMeow )
+        dup who @ array_diff who !  ( str arrMeow )
+        dup exclude @ array_union exclude !  ( str arrMeow )
+
+        over ansi_strip  ( str arrMeow str )
+        "\\b[A-Z0-9_]+\\b" "MEOW" REG_ALL regsub  ( str arrMeow str' )
+        "\\b[A-Z0-9_][A-Za-z0-9_]*[a-z][A-Za-z0-9_]*\\b" "Meow" REG_ALL regsub  ( str arrMeow str' )
+        "\\b[a-z_][A-Za-z0-9_]*\\b" "meow" REG_ALL regsub  ( str arrMeow str' )
+        me @ "%D meows, \"%s\"" fmtstring  ( str arrMeow str" )
+        1 array_make swap array_notify  ( str )
+    else pop then  ( str )
+
+
+    var msg
+
+    dup ",," instr  ( str boolCommas )
+    me @ prop_split getpropstr .no? not  ( str boolCommas boolSplitOK )
+    and if  ( str )
+        ",," split  ( str- -str )
+
+        ( User-supplied verb? )
+        dup ",," instr if
+            ",," split  ( str- strVerb -str )
+            swap dup if  ( str- -str strVerb )
+                strip  ( str- -str strVerb )
+                dup me @ name instr over tolower "%n" instr or if  ( str- -str strVerb )
+                    "%n" "%N" subst me @ name "%n" subst  ( str- -str strVerb )
+                else
+                    me @ swap "%s %D," fmtstring  ( str- -str -str- )
+                then  ( str- -str -str- )
+                dup "*[-!.,:;]" smatch not if "," strcat then  ( str- -str -str- )
+                dup verb ! overb !  ( str- -str )
+            else pop then  ( str- -str )
+        then  ( str- -str )
+
+        2 array_make  ( arrMsg )
+        1
+    else 0 then splitsay ! msg !
+
+
+    verb @ string? not if
+        overb rtn-getThirdVerb
+        verb overb rtn-getFirstVerb
+    then
+    lquo rquo rtn-getQuotes  ( str )
+
+
+    ( Say. )
+    msg @ string? if
+        rquo @ msg @ lquo @  ( strRquo strMsg strLquo )
+        "%s %s%s%s"  ( strRquo strMsg strLquo strFormat )
+
+        4 dupn
+        verb  @ swap fmtstring .tell  ( strRquo strMsg strLquo strFormat )
+        overb @ swap fmtstring  ( strOsay )
+    else
+        rquo @ msg @ array_vals pop  ( strRquo strMsg strMsg2 )
+        swap dup "*[-!.,:;]" smatch not if "," strcat then swap  ( strRquo strMsg strMsg2 )
+        ( Only handle strMsg if there's no strMsg2. )
+        dup if  ( strRquo strMsg strMsg2 )
+            swap  ( strRquo strMsg2 strMsg )
+            lquo @ swap rquo @ swap lquo @  ( strRquo strMsg2 strLquo strRquo strMsg' strLquo )
+            "%s%s%s %s %s%s%s"  ( strRquo strMsg2 strLquo strRquo strMsg' strLquo strFormat )
+
+            7
+        else  ( strRquo strMsg strMsg2 )
+            pop lquo @  ( strRquo strMsg' strLquo )
+            "%s%s%s %s"  ( strRquo strMsg' strLquo strFormat )
+
+            verb @ ",$" "." 0 regsub verb !
+            overb @ ",$" "." 0 regsub overb !
+
+            4
+        then  ( ... strRquo strMsg strLquo strFormat intDepth )
+
+        dupn
+        verb  @ -5 rotate fmtstring .tell  ( ... strRquo strMsg strLquo strFormat )
+        overb @ -5 rotate fmtstring  ( strOsay )
+    then  ( strOsay )
+
+
+    ( Is there color to avoid? )
+    dup "\[[" instr if
+        who @ prop_color "{n*|0}" array_filter_prop  ( strOsay arrGreyed )
+        dup if  ( strOsay arrGreyed )
+            over ansi_strip 1 array_make  ( strOsay arrGreyed arrMsg )
+            over array_notify  ( strOsay arrGreyed )
+
+            exclude @ array_union exclude !  ( strOsay )
+        else pop then  ( strOsay )
+    then  ( strOsay )
+
+    loc @  ( strOsay db )
+    exclude @ array_vals  ( strOsay db dbExcludeN..dbExclude1 intN )
+    me @ swap ++  ( strOsay db dbGreyedN..dbGreyed1' intN' )
+    dup 3 + rotate  ( db dbGreyedN..dbGreyed1 intN strOsay )
+    notify_exclude  (  )
+;
+
+: do-help pop pop .showhelp ;
+: do-ignore pop str_program cmd-ignore-add ;
+: do-unignore pop str_program cmd-ignore-del ;
+
+: do-third  ( strY strZ -- )
+    pop pop  (  )
+    me @ prop_third "yes" setprop
+    me @ "You will see your own says in the third person (\"%D says\")." fmtstring .tellgood
+;
+: do-unthird  ( strY strZ -- )
+    pop pop  (  )
+    me @ prop_third remove_prop
+    "You will see your own says in the second person (\"You say\")." .tellgood
+;
+
+: do-grey  ( strY strZ -- )
+    pop pop  (  )
+    me @ prop_color "no" setprop
+    me @ "You will not see color in any says. Note you will see color in your own says." fmtstring .tellgood
+;
+: do-ungrey  ( strY strZ -- )
+    pop pop  (  )
+    me @ prop_color remove_prop
+    "You will see color in says." .tellgood
+;
+
+: do-meow  ( strY strZ -- )
+    pop  ( strY )
+    dup if
+        .noisy_pmatch dup ok? not if pop exit then  ( db )
+        me @ prop_meow 3 pick reflist_find if  ( db )
+            "%D is already in your #meow list." fmtstring .tellbad exit  (  )
+        then  ( db )
+        me @ prop_meow 3 pick reflist_add  ( db )
+        "%D added." fmtstring .tellgood
+    else
+        me @ prop_meow array_get_reflist  ( arr )
+        "" swap foreach swap pop "%D %s" fmtstring repeat
+        "Your meowlist: " swap strcat .tellgood
+    then
+;
+: do-unmeow  ( strY strZ -- )
+    pop  ( strY )
+    .noisy_pmatch dup ok? not if pop exit then  ( db )
+    me @ prop_meow 3 pick reflist_find not if  ( db )
+        "%D is not in your #meow list." fmtstring .tellbad exit  (  )
+    then  ( db )
+    me @ prop_meow 3 pick reflist_del  ( db )
+    "%D removed." fmtstring .tellgood
+;
+
+$define dict_commands {
+    "help"    'do-help
+    "ignore"  'do-ignore
+    "!ignore" 'do-unignore
+    "meow"    'do-meow
+    "!meow"   'do-unmeow
+    "third"   'do-third
+    "!third"  'do-unthird
+    "grey"    'do-grey
+    "gray"    'do-grey
+    "!grey"   'do-ungrey
+    "!gray"   'do-ungrey
+}dict $enddef
+
+: main  ( str -- )
+    dup STRparse  ( str strX strY strZ )
+    3 pick string? if 3 pick "#" stringpfx if  ( str strX strY strZ )
+        pop pop pop  ( str )
+        "#" split strcat  ( str' )
+        do-say exit  (  )
+    then then
+    3 pick int? if pop pop pop do-say exit then
+    4 rotate pop  ( strX strY strZ )
+
+    rot dict_commands over array_getitem  ( strY strZ strX ? )
+    dup address? if  ( strY strZ strX adr )
+        swap pop  ( strY strZ adr )
+        execute  (  )
+    else pop  ( strY strZ strX )
+        "I don't recognize the command '#%s'. Try 'say #help' for help, or using '##' to say something starting with '#'." fmtstring .tellbad  ( strY strZ )
+        pop pop  (  )
+    then  (  )
+;
+.
+c
+q
+
+lsedit #257=_help
+.del 1 $
+say <message>
+."<message>
+say #[!]ignore <names>
+say #[!]third
+say #[!]grey
+say #[!]meow <names>
+
+Speaks <message> to the room. Use #ignore <name> to not see <name>'s says, poses, and spoofs; use #meow <name> to see <name>'s says with all the words replaced with "meow." Use #third to see your own says in the third person (that is, "Puck says" instead of the normal "You say"). Use #grey to turn off color in others' says and poses.
+
+Say supports a "split" say if you put two consecutive commas in your message. For example, if CobaltBlue typed '"Hello,,how are you?' everyone would see '"Hello," says CobaltBlue, "how are you?"' You can also specify an "ad-hoc" verb by putting a message with your name or '%N' between pairs of commas: '"Hello,,%N welcomes Weiran,,how are you?' would display '"Hello," CobaltBlue welcomes Weiran, "how are you?"'
+.format 10=78
+.format 8=78
+.end
--- a/samples/Makefile/foo.o.d
+++ b/samples/Makefile/foo.o.d
@@ -0,0 +1,5 @@
+bar/foo.o: \
+ bar/foo.c \
+ bar/baz.h
+
+bar/baz.h:
--- a/samples/Mathematica/Predicates.wl
+++ b/samples/Mathematica/Predicates.wl
@@ -0,0 +1,150 @@
+(* ::Package:: *)
+
+BeginPackage["Predicates`"];
+
+
+(* ::Title:: *)
+(*Predicates*)
+
+
+(* ::Section::Closed:: *)
+(*Fuzzy Logic*)
+
+
+(* ::Subsection:: *)
+(*Documentation*)
+
+
+PossiblyTrueQ::usage="Returns True if the argument is not definitely False.";
+PossiblyFalseQ::usage="Returns True if the argument is not definitely True.";
+PossiblyNonzeroQ::usage="Returns True if and only if its argument is not definitely zero.";
+
+
+(* ::Subsection:: *)
+(*Implimentation*)
+
+
+Begin["`Private`"];
+
+
+PossiblyTrueQ[expr_]:=\[Not]TrueQ[\[Not]expr]
+
+
+PossiblyFalseQ[expr_]:=\[Not]TrueQ[expr]
+
+
+End[];
+
+
+(* ::Section::Closed:: *)
+(*Numbers and Lists*)
+
+
+(* ::Subsection:: *)
+(*Documentation*)
+
+
+AnyQ::usage="Given a predicate and a list, retuns True if and only if that predicate is True for at least one element of the list.";
+AnyElementQ::usage="Returns True if cond matches any element of L.";
+AllQ::usage="Given a predicate and a list, retuns True if and only if that predicate is True for all elements of the list.";
+AllElementQ::usage="Returns True if cond matches any element of L.";
+
+
+AnyNonzeroQ::usage="Returns True if L is a list such that at least one element is definitely not zero.";
+AnyPossiblyNonzeroQ::usage="Returns True if expr is a list such that at least one element is not definitely zero.";
+
+
+RealQ::usage="Returns True if and only if the argument is a real number";
+PositiveQ::usage="Returns True if and only if the argument is a positive real number";
+NonnegativeQ::usage="Returns True if and only if the argument is a non-negative real number";
+PositiveIntegerQ::usage="Returns True if and only if the argument is a positive integer";
+NonnegativeIntegerQ::usage="Returns True if and only if the argument is a non-negative integer";
+
+
+IntegerListQ::usage="Returns True if and only if the input is a list of integers.";
+PositiveIntegerListQ::usage="Returns True if and only if the input is a list of positive integers.";
+NonnegativeIntegerListQ::usage="Returns True if and only if the input is a list of non-negative integers.";
+IntegerOrListQ::usage="Returns True if and only if the input is a list of integers or an integer.";
+PositiveIntegerOrListQ::usage="Returns True if and only if the input is a list of positive integers or a positive integer.";
+NonnegativeIntegerOrListQ::usage="Returns True if and only if the input is a list of positive integers or a positive integer.";
+
+
+SymbolQ::usage="Returns True if argument is an unassigned symbol.";
+SymbolOrNumberQ::usage="Returns True if argument is a number of has head 'Symbol'";
+
+
+(* ::Subsection:: *)
+(*Implimentation*)
+
+
+Begin["`Private`"];
+
+
+AnyQ[cond_, L_] := Fold[Or, False, cond /@ L]
+
+
+AnyElementQ[cond_,L_]:=AnyQ[cond,Flatten[L]]
+
+
+AllQ[cond_, L_] := Fold[And, True, cond /@ L]
+
+
+AllElementQ[cond_, L_] := Fold[And, True, cond /@ L]
+
+
+AnyNonzeroQ[L_]:=AnyElementQ[#!=0&,L]
+
+
+PossiblyNonzeroQ[expr_]:=PossiblyTrueQ[expr!=0]
+
+
+AnyPossiblyNonzeroQ[expr_]:=AnyElementQ[PossiblyNonzeroQ,expr]
+
+
+RealQ[n_]:=TrueQ[Im[n]==0];
+
+
+PositiveQ[n_]:=Positive[n];
+
+
+PositiveIntegerQ[n_]:=PositiveQ[n]\[And]IntegerQ[n];
+
+
+NonnegativeQ[n_]:=TrueQ[RealQ[n]&&n>=0];
+
+
+NonnegativeIntegerQ[n_]:=NonnegativeQ[n]\[And]IntegerQ[n];
+
+
+IntegerListQ[input_]:=ListQ[input]&&Not[MemberQ[IntegerQ/@input,False]];
+
+
+IntegerOrListQ[input_]:=IntegerListQ[input]||IntegerQ[input];
+
+
+PositiveIntegerListQ[input_]:=IntegerListQ[input]&&Not[MemberQ[Positive[input],False]];
+
+
+PositiveIntegerOrListQ[input_]:=PositiveIntegerListQ[input]||PositiveIntegerQ[input];
+
+
+NonnegativeIntegerListQ[input_]:=IntegerListQ[input]&&Not[MemberQ[NonnegativeIntegerQ[input],False]];
+
+
+NonnegativeIntegerOrListQ[input_]:=NonnegativeIntegerListQ[input]||NonnegativeIntegerQ[input];
+
+
+SymbolQ[a_]:=Head[a]===Symbol;
+
+
+SymbolOrNumberQ[a_]:=NumericQ[a]||Head[a]===Symbol;
+
+
+End[];
+
+
+(* ::Section:: *)
+(*Epilogue*)
+
+
+EndPackage[];
--- a/samples/Mathematica/UnitTest.wlt
+++ b/samples/Mathematica/UnitTest.wlt
@@ -0,0 +1,17 @@
+BeginTestSection["Untitled-5"]
+
+VerificationTest[(* 1 *)
+	RotationMatrix[phi]
+	,
+	List[List[Cos[phi], Times[-1, Sin[phi]]], List[Sin[phi], Cos[phi]]]	
+]
+
+VerificationTest[(* 2 *)
+	Times[1, Power[Plus[a, Times[-1, a]], -1]]
+	,
+	ComplexInfinity
+	,
+	{Power::infy}
+]
+
+EndTestSection[]
--- a/samples/Perl/use5.pl
+++ b/samples/Perl/use5.pl
@@ -0,0 +1,3 @@
+use Mojolicious::Lite;
+use 5.20.0;
+use experimental 'signatures';
--- a/test/fixtures/Shell/crossbuild_liblua5.1
+++ b/test/fixtures/Shell/crossbuild_liblua5.1
@@ -0,0 +1,57 @@
+#! /bin/sh
+#
+# Builds and installs liblua5.1 for the cross toolchain.
+# Executed by build-uqm-dependencies.chroot
+
+# Include our common functions
+. /usr/lib/crossbuild/crossbuild.subr
+
+# envvar LIBLUA51_URL
+#
+# Specifies the URL of the liblua5.1 source tarball you want to use.
+export LIBLUA51_URL="http://www.lua.org/ftp/lua-5.1.5.tar.gz"
+
+# envvar INSTALL_TOP
+#
+# This determines where lua's makefiles install everything (we don't want to use
+# /usr/local!).
+export INSTALL_TOP="/usr/${HOST_TRIPLET}"
+
+# envvar TO_BIN
+#
+# Names of the binary files to install (that's right, lua's makefiles don't
+# determine this automatically, and since we end up with files named according
+# to Windows conventions the install chokes without these)
+export TO_BIN="lua.exe luac.exe"
+
+# envvar TO_LIB
+#
+# Names of the libraries to install, see TO_BIN
+export TO_LIB="liblua.a lua51.dll"
+
+
+# liblua5.1 uses custom makefiles and does not natively support cross-building.
+# However, with our cross toolchain in its PATH it successfully builds the mingw
+# target.
+export PATH=/usr/${HOST_TRIPLET}/bin:${PATH}
+
+echo "*************************************************************************"
+echo "--- BEGIN: crossbuild_liblua5.1 ---"
+
+get_tarball "liblua5.1" "${LIBLUA51_URL}" gz
+
+cd ${SRC_ROOT_DIR}/liblua5.1/*
+
+if [ -f Makefile ]; then
+  make clean
+  make --environment-overrides mingw install
+
+
+else
+  echo "crossbuild_liblua5.1 failed: Could not find Makefile"
+  echo "(is the liblua5.1 source tarball sane?)"
+  exit 1
+fi
+
+echo "--- END: crossbuild_liblua5.1 ---"
+echo "*************************************************************************"
--- a/test/fixtures/Shell/graylog2-server.init.d
+++ b/test/fixtures/Shell/graylog2-server.init.d
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:        graylog2-server
+# Required-Start:  $network
+# Required-Stop:   $network
+# Default-Start:   2 3 4 5
+# Default-Stop:    1
+# Short-Description: Start Graylog2 server
+### END INIT INFO
+
+# Written by Lital Natan <litaln@gmail.com>
+
+PREFIX=/usr
+SHAREDIR=$PREFIX/share/graylog2-server
+SERVER_JAR=$SHAREDIR/graylog2-server.jar
+SYSLOG4J_JAR=$SHAREDIR/syslog4j-0.9.46-bin.jar
+SVCNAME="graylog2-server"
+
+CONFIG="/etc/graylog2.conf"
+LOGFILE="/var/log/graylog2.log"
+PIDFILE="/var/run/graylog2.pid"
+
+start() {
+    if [ ! -e $CONFIG ]; then
+        echo "Config file $CONFIG does not exist"
+        return 1
+    fi
+
+    echo "Starting ${SVCNAME}"
+        nohup `which java` -cp $SERVER_JAR:$SYSLOG4J_JAR org.graylog2.Main \
+      -p ${PIDFILE} -f ${CONFIG} > $LOGFILE 2>&1 &
+
+    # Sleep before testing the service
+    sleep 2
+
+    graylog2_test || return 1
+}
+
+stop() {
+    pid=`< $PIDFILE`
+    kill $pid
+    rm -f ${PIDFILE} # just in case
+}
+
+graylog2_test() {
+    # Graylog2 only deletes its PID file if it hits a config error
+    if [ ! -e ${PIDFILE} ]; then
+        echo "Configuration error, check ${CONFIG}"
+        return 1
+    fi
+
+    local pid=`cat ${PIDFILE}`
+
+    # Graylog2 isn't running, so that means there was a problem
+    if [ ! -e /proc/$pid ]; then
+        echo "Something went wrong, check ${LOGFILE}"
+        rm -f ${PIDFILE}
+        return 1
+    else
+        return 0
+    fi
+}
+
+
+status() {
+    graylog2_test > /dev/null 2>&1
+    if [ "$?" == "0" ]; then
+       echo "Graylog2 server is up"
+       return 0
+    else
+       echo "Graylog2 server is down"
+       return 1
+    fi
+}
+
+
+restart() {
+    stop
+    start
+}
+
+case "$1" in
+    start)
+  start
+  ;;
+    stop)
+  stop
+  ;;
+    status)
+        status
+        ;;
+    restart)
+  restart
+  ;;
+    *)
+  echo "Usage $0 {start|stop|restart|status}"
+  RETVAL=1
+esac
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -216,6 +216,7 @@ class TestBlob < Minitest::Test
    assert sample_blob("C++/protocol-buffer.pb.cc").generated?
    assert sample_blob("Java/ProtocolBuffer.java").generated?
    assert sample_blob("Python/protocol_buffer_pb2.py").generated?
+    assert sample_blob("Go/api.pb.go").generated?

    # Generated JNI
    assert sample_blob("C/jni_layer.h").generated?
@@ -439,6 +440,54 @@ class TestBlob < Minitest::Test
    assert sample_blob("activator.bat").vendored?
    assert sample_blob("subproject/activator").vendored?
    assert sample_blob("subproject/activator.bat").vendored?
+
+    assert_predicate fixture_blob(".google_apis/bar.jar"), :vendored?
+    assert_predicate fixture_blob("foo/.google_apis/bar.jar"), :vendored?
+  end
+
+  def test_documentation
+    assert_predicate fixture_blob("doc/foo.html"), :documentation?
+    assert_predicate fixture_blob("docs/foo.html"), :documentation?
+    refute_predicate fixture_blob("project/doc/foo.html"), :documentation?
+    refute_predicate fixture_blob("project/docs/foo.html"), :documentation?
+
+    assert_predicate fixture_blob("Documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("project/Documentation/foo.md"), :documentation?
+    assert_predicate fixture_blob("project/documentation/foo.md"), :documentation?
+
+    assert_predicate fixture_blob("javadoc/foo.html"), :documentation?
+    assert_predicate fixture_blob("project/javadoc/foo.html"), :documentation?
+
+    assert_predicate fixture_blob("man/foo.html"), :documentation?
+    refute_predicate fixture_blob("project/man/foo.html"), :documentation?
+
+    assert_predicate fixture_blob("README"), :documentation?
+    assert_predicate fixture_blob("README.md"), :documentation?
+    assert_predicate fixture_blob("README.txt"), :documentation?
+    assert_predicate fixture_blob("foo/README"), :documentation?
+
+    assert_predicate fixture_blob("CONTRIBUTING"), :documentation?
+    assert_predicate fixture_blob("CONTRIBUTING.md"), :documentation?
+    assert_predicate fixture_blob("CONTRIBUTING.txt"), :documentation?
+    assert_predicate fixture_blob("foo/CONTRIBUTING"), :documentation?
+
+    assert_predicate fixture_blob("LICENSE"), :documentation?
+    assert_predicate fixture_blob("LICENCE.md"), :documentation?
+    assert_predicate fixture_blob("LICENSE.txt"), :documentation?
+    assert_predicate fixture_blob("foo/LICENSE"), :documentation?
+
+    assert_predicate fixture_blob("COPYING"), :documentation?
+    assert_predicate fixture_blob("COPYING.md"), :documentation?
+    assert_predicate fixture_blob("COPYING.txt"), :documentation?
+    assert_predicate fixture_blob("foo/COPYING"), :documentation?
+
+    assert_predicate fixture_blob("INSTALL"), :documentation?
+    assert_predicate fixture_blob("INSTALL.md"), :documentation?
+    assert_predicate fixture_blob("INSTALL.txt"), :documentation?
+    assert_predicate fixture_blob("foo/INSTALL"), :documentation?
+
+    refute_predicate fixture_blob("foo.md"), :documentation?
  end

  def test_language
@@ -485,4 +534,29 @@ class TestBlob < Minitest::Test
    refute blob.new(" ").empty?
    refute blob.new("nope").empty?
  end
+
+  def test_include_in_language_stats
+    vendored = sample_blob("bower_components/custom/custom.js")
+    assert_predicate vendored, :vendored?
+    refute_predicate vendored, :include_in_language_stats?
+
+    documentation = fixture_blob("README")
+    assert_predicate documentation, :documentation?
+    refute_predicate documentation, :include_in_language_stats?
+
+    generated = sample_blob("CSS/bootstrap.min.css")
+    assert_predicate generated, :generated?
+    refute_predicate generated, :include_in_language_stats?
+
+    data = sample_blob("Ant Build System/filenames/ant.xml")
+    assert_equal :data, data.language.type
+    refute_predicate data, :include_in_language_stats?
+
+    prose = sample_blob("Markdown/tender.md")
+    assert_equal :prose, prose.language.type
+    refute_predicate prose, :include_in_language_stats?
+
+    included = sample_blob("HTML/pages.html")
+    assert_predicate included, :include_in_language_stats?
+  end
 end
--- a/test/test_grammars.rb
+++ b/test/test_grammars.rb
@@ -3,13 +3,19 @@ require_relative "./helper"
 class TestGrammars < Minitest::Test
  ROOT = File.expand_path("../..", __FILE__)

-  # These grammars have no license but have been grandfathered in. New grammars
-  # must have a license that allows redistribution.
-  UNLICENSED_GRAMMARS_WHITELIST = %w[
-    vendor/grammars/Sublime-Lasso
-    vendor/grammars/Sublime-REBOL
-    vendor/grammars/x86-assembly-textmate-bundle
-    vendor/grammars/oracle.tmbundle
+  LICENSE_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/Sublime-REBOL",
+    "vendor/grammars/x86-assembly-textmate-bundle",
+    "vendor/grammars/oracle.tmbundle"
  ].freeze

  def setup
@@ -78,9 +84,9 @@ class TestGrammars < Minitest::Test

    unlicensed = categories[:unlicensed] || []
    unrecognized = categories[:unrecognized] || []
-    disallowed_unlicensed = unlicensed - UNLICENSED_GRAMMARS_WHITELIST
-    disallowed_unrecognized = unrecognized - UNLICENSED_GRAMMARS_WHITELIST
-    extra_whitelist_entries = UNLICENSED_GRAMMARS_WHITELIST - (unlicensed | unrecognized)
+    disallowed_unlicensed = unlicensed - LICENSE_WHITELIST
+    disallowed_unrecognized = unrecognized - LICENSE_WHITELIST
+    extra_whitelist_entries = LICENSE_WHITELIST - (unlicensed | unrecognized)

    message = ""
    if disallowed_unlicensed.any?
@@ -94,7 +100,7 @@ class TestGrammars < Minitest::Test
    end
    if extra_whitelist_entries.any?
      message << "\n\n" unless message.empty?
-      message << "The following grammar submodules are listed in UNLICENSED_GRAMMARS_WHITELIST but either have a license (yay!)\n"
+      message << "The following grammar submodules are listed in LICENSE_WHITELIST but either have a license (yay!)\n"
      message << "or have been removed from the repository. Please remove them from the whitelist.\n"
      message << extra_whitelist_entries.sort.join("\n")
    end
@@ -132,6 +138,8 @@ class TestGrammars < Minitest::Test
      "unlicense"
    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")
+      "zlib"
    end
  end
 end
--- a/test/test_heuristics.rb
+++ b/test/test_heuristics.rb
@@ -48,7 +48,7 @@ class TestHeuristcs < Minitest::Test
  def test_pl_prolog_perl_by_heuristics
    assert_heuristics({
      "Prolog" => "Prolog/turing.pl",
-      "Perl" => "Perl/perl-test.t",
+      "Perl" => ["Perl/perl-test.t", "Perl/use5.pl"]
    })
  end

@@ -60,19 +60,22 @@ class TestHeuristcs < Minitest::Test
    })
  end

-  # Candidate languages = ["IDL", "Prolog"]
-  def test_pro_prolog_idl_by_heuristics
+  # Candidate languages = ["IDL", "Prolog", "QMake", "INI"]
+  def test_pro_by_heuristics
    assert_heuristics({
-      "Prolog" => "Prolog/logic-problem.pro",
-      "IDL" => "IDL/mg_acosh.pro"
+      "Prolog" => all_fixtures("Prolog", "*.pro"),
+      "IDL" => all_fixtures("IDL", "*.pro"),
+      "INI" => all_fixtures("INI", "*.pro"),
+      "QMake" => all_fixtures("QMake", "*.pro")
    })
  end

-  # Candidate languages = ["AGS Script", "AsciiDoc"]
-  def test_asc_asciidoc_by_heuristics
+  # Candidate languages = ["AGS Script", "AsciiDoc", "Public Key"]
+  def test_asc_by_heuristics
    assert_heuristics({
      "AsciiDoc" => "AsciiDoc/list.asc",
-      "AGS Script" => nil
+      "AGS Script" => "AGS Script/GlobalScript.asc",
+      "Public Key" => "Public Key/sunCert.asc"
    })
  end

--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -155,10 +155,6 @@ class TestLanguage < Minitest::Test
    assert_equal :prose, Language['Org'].type
  end

-  def test_other
-    assert_nil Language['Brainfuck'].type
-  end
-
  def test_searchable
    assert Language['Ruby'].searchable?
    assert !Language['Gettext Catalog'].searchable?
@@ -192,7 +188,7 @@ class TestLanguage < Minitest::Test
    assert_equal [], Language.find_by_extension('foo.rb')
    assert_equal [Language['Ruby']], Language.find_by_extension('rb')
    assert_equal [Language['Ruby']], Language.find_by_extension('.rb')
-    assert_equal [Language['M'], Language['Mathematica'], Language['Matlab'], Language['Mercury'], Language['Objective-C']], Language.find_by_extension('.m')
+    assert_equal [Language['M'], Language['MUF'], Language['Mathematica'], Language['Matlab'], Language['Mercury'], Language['Objective-C']], Language.find_by_extension('.m')
  end

  def test_find_all_by_extension
@@ -358,6 +354,15 @@ class TestLanguage < Minitest::Test
    assert missing.empty?, message
  end

+  def test_all_languages_have_type
+    missing = Language.all.select { |language| language.type.nil? }
+    message = "The following languages do not have a type listed in grammars.yml. Please add types for all new languages.\n"
+
+    width = missing.map { |language| language.name.length }.max
+    message << missing.map { |language| sprintf("%-#{width}s", language.name) }.sort.join("\n")
+    assert missing.empty?, message
+  end
+
  def test_all_languages_have_a_valid_ace_mode
    ace_fixture_path = File.join('test', 'fixtures', 'ace_modes.json')
    skip("No ace_modes.json file") unless File.exist?(ace_fixture_path)
--- a/test/test_repository.rb
+++ b/test/test_repository.rb
@@ -99,4 +99,16 @@ class TestRepository < Minitest::Test
    # overridden .gitattributes
    assert !override_unvendored.vendored?
  end
+
+  def test_linguist_override_documentation?
+    attr_commit = "d4c8fb8a28e91f97a7e53428a365c0abbac36d3d"
+    repo = 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")
+
+    # overridden by .gitattributes
+    refute_predicate readme, :documentation?
+    assert_predicate arduino, :documentation?
+  end
 end
--- a/vendor/grammars/BrightScript.tmbundle
+++ b/vendor/grammars/BrightScript.tmbundle
--- a/vendor/grammars/GDScript-sublime
+++ b/vendor/grammars/GDScript-sublime
--- a/vendor/grammars/Lean.tmbundle
+++ b/vendor/grammars/Lean.tmbundle
--- a/vendor/grammars/Modelica
+++ b/vendor/grammars/Modelica
--- a/vendor/grammars/NimLime
+++ b/vendor/grammars/NimLime
--- a/vendor/grammars/PogoScript.tmbundle
+++ b/vendor/grammars/PogoScript.tmbundle
--- a/vendor/grammars/Stylus
+++ b/vendor/grammars/Stylus
--- a/vendor/grammars/Sublime-SQF-Language
+++ b/vendor/grammars/Sublime-SQF-Language
--- a/vendor/grammars/SublimePapyrus
+++ b/vendor/grammars/SublimePapyrus
--- a/vendor/grammars/actionscript3-tmbundle
+++ b/vendor/grammars/actionscript3-tmbundle
--- a/vendor/grammars/asciidoc.tmbundle
+++ b/vendor/grammars/asciidoc.tmbundle
--- a/vendor/grammars/ats.sublime
+++ b/vendor/grammars/ats.sublime
--- a/vendor/grammars/c.tmbundle
+++ b/vendor/grammars/c.tmbundle
--- a/vendor/grammars/dart-sublime-bundle
+++ b/vendor/grammars/dart-sublime-bundle
--- a/vendor/grammars/elixir-tmbundle
+++ b/vendor/grammars/elixir-tmbundle
--- a/vendor/grammars/factor
+++ b/vendor/grammars/factor
--- a/vendor/grammars/fsharpbinding
+++ b/vendor/grammars/fsharpbinding
--- a/vendor/grammars/gap-tmbundle
+++ b/vendor/grammars/gap-tmbundle
--- a/vendor/grammars/grace-tmbundle
+++ b/vendor/grammars/grace-tmbundle
--- a/vendor/grammars/java.tmbundle
+++ b/vendor/grammars/java.tmbundle
--- a/vendor/grammars/javadoc.tmbundle
+++ b/vendor/grammars/javadoc.tmbundle
--- a/vendor/grammars/language-csharp
+++ b/vendor/grammars/language-csharp
--- a/vendor/grammars/language-gfm
+++ b/vendor/grammars/language-gfm
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
--- a/vendor/grammars/language-python
+++ b/vendor/grammars/language-python
--- a/vendor/grammars/latex.tmbundle
+++ b/vendor/grammars/latex.tmbundle
--- a/vendor/grammars/mako-tmbundle
+++ b/vendor/grammars/mako-tmbundle
--- a/vendor/grammars/objective-c.tmbundle
+++ b/vendor/grammars/objective-c.tmbundle
--- a/vendor/grammars/openscad.tmbundle
+++ b/vendor/grammars/openscad.tmbundle
--- a/vendor/grammars/php.tmbundle
+++ b/vendor/grammars/php.tmbundle
--- a/vendor/grammars/sublime-nix
+++ b/vendor/grammars/sublime-nix
--- a/vendor/grammars/sublime-opal
+++ b/vendor/grammars/sublime-opal
--- a/vendor/grammars/sublime-spintools
+++ b/vendor/grammars/sublime-spintools
--- a/vendor/grammars/sublime-text-ox
+++ b/vendor/grammars/sublime-text-ox
--- a/vendor/grammars/sublime-text-pig-latin
+++ b/vendor/grammars/sublime-text-pig-latin
--- a/vendor/grammars/sublime-varnish
+++ b/vendor/grammars/sublime-varnish