Merge pull request #2836 from github/cut-release-v4.7.5

Cut release v4.7.5
Bumping version
2025-10-29 17:50:22 +00:00 · 2016-02-12 16:58:11 -07:00 · 2016-02-12 16:27:29 -07:00 · 2016-02-12 16:25:05 -07:00 · 2016-02-04 20:28:47 -07:00 · 2016-02-04 20:28:12 -07:00
532 changed files with 103580 additions and 56881 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,6 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/Sublime-Inform"]
-	path = vendor/grammars/Sublime-Inform
-	url = https://github.com/PogiNate/Sublime-Inform
 [submodule "vendor/grammars/autoitv3-tmbundle"]
 	path = vendor/grammars/autoitv3-tmbundle
 	url = https://github.com/Red-Nova-Technologies/autoitv3-tmbundle
@@ -85,6 +82,9 @@
 [submodule "vendor/grammars/language-shellscript"]
 	path = vendor/grammars/language-shellscript
 	url = https://github.com/atom/language-shellscript
+[submodule "vendor/grammars/language-supercollider"]
+	path = vendor/grammars/language-supercollider
+	url = https://github.com/supercollider/language-supercollider
 [submodule "vendor/grammars/language-yaml"]
 	path = vendor/grammars/language-yaml
 	url = https://github.com/atom/language-yaml
@@ -96,7 +96,7 @@
 	url = https://github.com/bfad/Sublime-Lasso
 [submodule "vendor/grammars/chapel-tmbundle"]
 	path = vendor/grammars/chapel-tmbundle
-	url = https://github.com/bholt/chapel-tmbundle
+	url = https://github.com/chapel-lang/chapel-tmbundle
 [submodule "vendor/grammars/sublime-nginx"]
 	path = vendor/grammars/sublime-nginx
 	url = https://github.com/brandonwamboldt/sublime-nginx
@@ -118,9 +118,6 @@
 [submodule "vendor/grammars/cucumber-tmbundle"]
 	path = vendor/grammars/cucumber-tmbundle
 	url = https://github.com/cucumber/cucumber-tmbundle
-[submodule "vendor/grammars/Handlebars"]
-	path = vendor/grammars/Handlebars
-	url = https://github.com/daaain/Handlebars
 [submodule "vendor/grammars/powershell"]
 	path = vendor/grammars/powershell
 	url = https://github.com/SublimeText/PowerShell
@@ -136,9 +133,6 @@
 [submodule "vendor/grammars/fancy-tmbundle"]
 	path = vendor/grammars/fancy-tmbundle
 	url = https://github.com/fancy-lang/fancy-tmbundle
-[submodule "vendor/grammars/fsharpbinding"]
-	path = vendor/grammars/fsharpbinding
-	url = https://github.com/fsharp/fsharpbinding
 [submodule "vendor/grammars/monkey.tmbundle"]
 	path = vendor/grammars/monkey.tmbundle
 	url = https://github.com/gingerbeardman/monkey.tmbundle
@@ -169,18 +163,12 @@
 [submodule "vendor/grammars/Textmate-Gosu-Bundle"]
 	path = vendor/grammars/Textmate-Gosu-Bundle
 	url = https://github.com/jpcamara/Textmate-Gosu-Bundle
-[submodule "vendor/grammars/jquery-tmbundle"]
-	path = vendor/grammars/jquery-tmbundle
-	url = https://github.com/kswedberg/jquery-tmbundle
 [submodule "vendor/grammars/fish-tmbundle"]
 	path = vendor/grammars/fish-tmbundle
 	url = https://github.com/l15n/fish-tmbundle
 [submodule "vendor/grammars/sublime-idris"]
 	path = vendor/grammars/sublime-idris
 	url = https://github.com/laughedelic/sublime-idris
-[submodule "vendor/grammars/sublime-better-typescript"]
-	path = vendor/grammars/sublime-better-typescript
-	url = https://github.com/lavrton/sublime-better-typescript
 [submodule "vendor/grammars/moonscript-tmbundle"]
 	path = vendor/grammars/moonscript-tmbundle
 	url = https://github.com/leafo/moonscript-tmbundle
@@ -265,9 +253,6 @@
 [submodule "vendor/grammars/SublimeXtend"]
 	path = vendor/grammars/SublimeXtend
 	url = https://github.com/staltz/SublimeXtend
-[submodule "vendor/grammars/Stata.tmbundle"]
-	path = vendor/grammars/Stata.tmbundle
-	url = https://github.com/statatmbundle/Stata.tmbundle
 [submodule "vendor/grammars/Vala-TMBundle"]
 	path = vendor/grammars/Vala-TMBundle
 	url = https://github.com/technosophos/Vala-TMBundle
@@ -346,9 +331,6 @@
 [submodule "vendor/grammars/java.tmbundle"]
 	path = vendor/grammars/java.tmbundle
 	url = https://github.com/textmate/java.tmbundle
-[submodule "vendor/grammars/javadoc.tmbundle"]
-	path = vendor/grammars/javadoc.tmbundle
-	url = https://github.com/textmate/javadoc.tmbundle
 [submodule "vendor/grammars/javascript-objective-j.tmbundle"]
 	path = vendor/grammars/javascript-objective-j.tmbundle
 	url = https://github.com/textmate/javascript-objective-j.tmbundle
@@ -358,9 +340,6 @@
 [submodule "vendor/grammars/latex.tmbundle"]
 	path = vendor/grammars/latex.tmbundle
 	url = https://github.com/textmate/latex.tmbundle
-[submodule "vendor/grammars/less.tmbundle"]
-	path = vendor/grammars/less.tmbundle
-	url = https://github.com/textmate/less.tmbundle
 [submodule "vendor/grammars/lilypond.tmbundle"]
 	path = vendor/grammars/lilypond.tmbundle
 	url = https://github.com/textmate/lilypond.tmbundle
@@ -409,9 +388,6 @@
 [submodule "vendor/grammars/processing.tmbundle"]
 	path = vendor/grammars/processing.tmbundle
 	url = https://github.com/textmate/processing.tmbundle
-[submodule "vendor/grammars/prolog.tmbundle"]
-	path = vendor/grammars/prolog.tmbundle
-	url = https://github.com/textmate/prolog.tmbundle
 [submodule "vendor/grammars/python-django.tmbundle"]
 	path = vendor/grammars/python-django.tmbundle
 	url = https://github.com/textmate/python-django.tmbundle
@@ -424,9 +400,6 @@
 [submodule "vendor/grammars/ruby-haml.tmbundle"]
 	path = vendor/grammars/ruby-haml.tmbundle
 	url = https://github.com/textmate/ruby-haml.tmbundle
-[submodule "vendor/grammars/ruby-on-rails-tmbundle"]
-	path = vendor/grammars/ruby-on-rails-tmbundle
-	url = https://github.com/textmate/ruby-on-rails-tmbundle
 [submodule "vendor/grammars/scheme.tmbundle"]
 	path = vendor/grammars/scheme.tmbundle
 	url = https://github.com/textmate/scheme.tmbundle
@@ -445,15 +418,6 @@
 [submodule "vendor/grammars/tcl.tmbundle"]
 	path = vendor/grammars/tcl.tmbundle
 	url = https://github.com/textmate/tcl.tmbundle
-[submodule "vendor/grammars/text.tmbundle"]
-	path = vendor/grammars/text.tmbundle
-	url = https://github.com/textmate/text.tmbundle
-[submodule "vendor/grammars/textile.tmbundle"]
-	path = vendor/grammars/textile.tmbundle
-	url = https://github.com/textmate/textile.tmbundle
-[submodule "vendor/grammars/textmate.tmbundle"]
-	path = vendor/grammars/textmate.tmbundle
-	url = https://github.com/textmate/textmate.tmbundle
 [submodule "vendor/grammars/thrift.tmbundle"]
 	path = vendor/grammars/thrift.tmbundle
 	url = https://github.com/textmate/thrift.tmbundle
@@ -487,10 +451,6 @@
 [submodule "vendor/grammars/sublime-nix"]
 	path = vendor/grammars/sublime-nix
 	url = https://github.com/wmertens/sublime-nix
-[submodule "vendor/grammars/ada.tmbundle"]
-	path = vendor/grammars/ada.tmbundle
-	url = https://github.com/aroben/ada.tmbundle
-	branch = better-with-highlighting
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
@@ -612,6 +572,9 @@
 [submodule "vendor/grammars/mediawiki.tmbundle"]
 	path = vendor/grammars/mediawiki.tmbundle
 	url = https://github.com/textmate/mediawiki.tmbundle
+[submodule "vendor/grammars/SublimeClarion"]
+	path = vendor/grammars/SublimeClarion
+	url = https://github.com/fushnisoft/SublimeClarion
 [submodule "vendor/grammars/oracle.tmbundle"]
 	path = vendor/grammars/oracle.tmbundle
 	url = https://github.com/mulander/oracle.tmbundle.git
@@ -645,3 +608,108 @@
 [submodule "vendor/grammars/perl.tmbundle"]
 	path = vendor/grammars/perl.tmbundle
 	url = https://github.com/textmate/perl.tmbundle
+[submodule "vendor/grammars/sublime-netlinx"]
+	path = vendor/grammars/sublime-netlinx
+	url = https://github.com/amclain/sublime-netlinx
+[submodule "vendor/grammars/Sublime-Red"]
+	path = vendor/grammars/Sublime-Red
+	url = https://github.com/Oldes/Sublime-Red
+[submodule "vendor/grammars/jflex.tmbundle"]
+	path = vendor/grammars/jflex.tmbundle
+	url = https://github.com/jflex-de/jflex.tmbundle.git
+[submodule "vendor/grammars/Sublime-Modula-2"]
+	path = vendor/grammars/Sublime-Modula-2
+	url = https://github.com/harogaston/Sublime-Modula-2
+[submodule "vendor/grammars/ada.tmbundle"]
+	path = vendor/grammars/ada.tmbundle
+	url = https://github.com/textmate/ada.tmbundle
+[submodule "vendor/grammars/api-blueprint-sublime-plugin"]
+	path = vendor/grammars/api-blueprint-sublime-plugin
+	url = https://github.com/apiaryio/api-blueprint-sublime-plugin
+[submodule "vendor/grammars/Handlebars"]
+	path = vendor/grammars/Handlebars
+	url = https://github.com/daaain/Handlebars
+[submodule "vendor/grammars/smali-sublime"]
+	path = vendor/grammars/smali-sublime
+	url = https://github.com/ShaneWilton/sublime-smali
+[submodule "vendor/grammars/language-jsoniq"]
+	path = vendor/grammars/language-jsoniq
+	url = http://github.com/wcandillon/language-jsoniq
+[submodule "vendor/grammars/atom-fsharp"]
+	path = vendor/grammars/atom-fsharp
+	url = https://github.com/fsprojects/atom-fsharp
+[submodule "vendor/grammars/SMT.tmbundle"]
+	path = vendor/grammars/SMT.tmbundle
+	url = https://github.com/SRI-CSL/SMT.tmbundle.git
+[submodule "vendor/grammars/language-crystal"]
+	path = vendor/grammars/language-crystal
+	url = https://github.com/atom-crystal/language-crystal
+[submodule "vendor/grammars/language-xbase"]
+	path = vendor/grammars/language-xbase
+	url = https://github.com/hernad/atom-language-harbour
+[submodule "vendor/grammars/language-ncl"]
+	path = vendor/grammars/language-ncl
+	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/atom-language-purescript"]
+	path = vendor/grammars/atom-language-purescript
+	url = https://github.com/purescript-contrib/atom-language-purescript
+[submodule "vendor/grammars/vue-syntax-highlight"]
+	path = vendor/grammars/vue-syntax-highlight
+	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile
+[submodule "vendor/grammars/sublimeprolog"]
+	path = vendor/grammars/sublimeprolog
+	url = https://github.com/alnkpa/sublimeprolog
+[submodule "vendor/grammars/sublime-aspectj"]
+	path = vendor/grammars/sublime-aspectj
+	url = https://github.com/pchaigno/sublime-aspectj
+[submodule "vendor/grammars/sublime-typescript"]
+	path = vendor/grammars/sublime-typescript
+	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
+[submodule "vendor/grammars/sublime-pony"]
+	path = vendor/grammars/sublime-pony
+	url = https://github.com/CausalityLtd/sublime-pony
+[submodule "vendor/grammars/X10"]
+	path = vendor/grammars/X10
+	url = https://github.com/x10-lang/x10-highlighting
+[submodule "vendor/grammars/language-babel"]
+	path = vendor/grammars/language-babel
+	url = https://github.com/gandm/language-babel
+[submodule "vendor/grammars/UrWeb-Language-Definition"]
+	path = vendor/grammars/UrWeb-Language-Definition
+	url = https://github.com/gwalborn/UrWeb-Language-Definition.git
+[submodule "vendor/grammars/Stata.tmbundle"]
+	path = vendor/grammars/Stata.tmbundle
+	url = https://github.com/pschumm/Stata.tmbundle
+[submodule "vendor/grammars/FreeMarker.tmbundle"]
+	path = vendor/grammars/FreeMarker.tmbundle
+	url = https://github.com/freemarker/FreeMarker.tmbundle
+[submodule "vendor/grammars/MagicPython"]
+	path = vendor/grammars/MagicPython
+	url = https://github.com/MagicStack/MagicPython
+[submodule "vendor/grammars/language-click"]
+	path = vendor/grammars/language-click
+	url = https://github.com/stenverbois/language-click.git
+[submodule "vendor/grammars/language-maxscript"]
+	path = vendor/grammars/language-maxscript
+	url = https://github.com/Alhadis/language-maxscript
+[submodule "vendor/grammars/language-renpy"]
+	path = vendor/grammars/language-renpy
+	url = https://github.com/williamd1k0/language-renpy.git
+[submodule "vendor/grammars/language-inform7"]
+	path = vendor/grammars/language-inform7
+	url = https://github.com/erkyrath/language-inform7
+[submodule "vendor/grammars/atom-language-stan"]
+	path = vendor/grammars/atom-language-stan
+	url = https://github.com/jrnold/atom-language-stan
+[submodule "vendor/grammars/language-yang"]
+	path = vendor/grammars/language-yang
+	url = https://github.com/DzonyKalafut/language-yang.git
+[submodule "vendor/grammars/perl6fe"]
+	path = vendor/grammars/perl6fe
+	url = https://github.com/MadcapJake/language-perl6fe.git
+[submodule "vendor/grammars/language-less"]
+	path = vendor/grammars/language-less
+	url = https://github.com/atom/language-less.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,12 @@
+language: ruby
+sudo: false
+addons:
+  apt:
+    packages:
+    - libicu-dev
+    - libicu48
 before_install: script/travis/before_install
 rvm:
-  - 1.9.3
  - 2.0.0
  - 2.1
  - 2.2
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,31 @@
 # Contributing

-Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. The majority of contributions won't need to touch any Ruby code at all.
+[code-of-conduct]: http://todogroup.org/opencodeofconduct/#Linguist/opensource@github.com
+
+Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
+
+The majority of contributions won't need to touch any Ruby code at all.
+
+## Adding an extension to a language
+
+We try only to add new extensions once they have some usage on GitHub. In most cases we prefer that extensions be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new extension:
+
+0. Add your extension to the language entry in [`languages.yml`][languages], keeping the extensions in alphabetical order.
+0. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
+0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
+
+In addition, if this extension is already listed in [`languages.yml`][languages] then sometimes a few more steps will need to be taken:
+
+0. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+

 ## Adding a language

-We try only to add languages once they have some usage on GitHub. In most cases we prefer that languages be in use in hundreds of repositories before supporting them in Linguist.
+We try only to add languages once they have some usage on GitHub. In most cases we prefer that each new file extension be in use in hundreds of repositories before supporting them in Linguist.

 To add support for a new language:

@@ -23,21 +44,23 @@ In addition, if your new language defines an extension that's already listed in

 Remember, the goal here is to try and avoid false positives!

+
 ## Fixing a misclassified language

 Most languages are detected by their file extension defined in [languages.yml][languages].  For disambiguating between files with common extensions, linguist applies some [heuristics](/lib/linguist/heuristics.rb) and a [statistical classifier](lib/linguist/classifier.rb). This process can help differentiate between, for example, `.h` files which could be either C, C++, or Obj-C.

 Misclassifications can often be solved by either adding a new filename or extension for the language or adding more [samples][samples] to make the classifier smarter.

+
 ## Fixing syntax highlighting

 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, 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://github-lightshow.herokuapp.com).
+You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](https://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.
+Once the bug has been fixed upstream, we'll pick it up for GitHub in the next release of Linguist.

 ## Testing

@@ -51,9 +74,10 @@ To run the tests:

    bundle exec rake test

-Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](http://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
+Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](https://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
+
+Here's our current build status: [![Build Status](https://api.travis-ci.org/github/linguist.svg?branch=master)](https://travis-ci.org/github/linguist)

-Here's our current build status: [![Build Status](https://secure.travis-ci.org/github/linguist.png?branch=master)](http://travis-ci.org/github/linguist)

 ## Releasing

--- a/HACKING.rst.txt
+++ b/HACKING.rst.txt
@@ -0,0 +1,329 @@
+Contributing to SciPy
+=====================
+
+This document aims to give an overview of how to contribute to SciPy.  It
+tries to answer commonly asked questions, and provide some insight into how the
+community process works in practice.  Readers who are familiar with the SciPy
+community and are experienced Python coders may want to jump straight to the
+`git workflow`_ documentation.
+
+
+Contributing new code
+---------------------
+
+If you have been working with the scientific Python toolstack for a while, you
+probably have some code lying around of which you think "this could be useful
+for others too".  Perhaps it's a good idea then to contribute it to SciPy or
+another open source project.  The first question to ask is then, where does
+this code belong?  That question is hard to answer here, so we start with a
+more specific one: *what code is suitable for putting into SciPy?*
+Almost all of the new code added to scipy has in common that it's potentially
+useful in multiple scientific domains and it fits in the scope of existing
+scipy submodules.  In principle new submodules can be added too, but this is
+far less common.  For code that is specific to a single application, there may
+be an existing project that can use the code.  Some scikits (`scikit-learn`_,
+`scikits-image`_, `statsmodels`_, etc.) are good examples here; they have a
+narrower focus and because of that more domain-specific code than SciPy.
+
+Now if you have code that you would like to see included in SciPy, how do you
+go about it?  After checking that your code can be distributed in SciPy under a
+compatible license (see FAQ for details), the first step is to discuss on the
+scipy-dev mailing list.  All new features, as well as changes to existing code,
+are discussed and decided on there.  You can, and probably should, already
+start this discussion before your code is finished.
+
+Assuming the outcome of the discussion on the mailing list is positive and you
+have a function or piece of code that does what you need it to do, what next?
+Before code is added to SciPy, it at least has to have good documentation, unit
+tests and correct code style.  
+
+1. Unit tests
+    In principle you should aim to create unit tests that exercise all the code
+    that you are adding.  This gives some degree of confidence that your code
+    runs correctly, also on Python versions and hardware or OSes that you don't
+    have available yourself.  An extensive description of how to write unit
+    tests is given in the NumPy `testing guidelines`_.
+
+2. Documentation
+    Clear and complete documentation is essential in order for users to be able
+    to find and understand the code.  Documentation for individual functions
+    and classes -- which includes at least a basic description, type and
+    meaning of all parameters and returns values, and usage examples in
+    `doctest`_ format -- is put in docstrings.  Those docstrings can be read
+    within the interpreter, and are compiled into a reference guide in html and
+    pdf format.  Higher-level documentation for key (areas of) functionality is
+    provided in tutorial format and/or in module docstrings.  A guide on how to
+    write documentation is given in `how to document`_.
+
+3. Code style
+    Uniformity of style in which code is written is important to others trying
+    to understand the code.  SciPy follows the standard Python guidelines for
+    code style, `PEP8`_.  In order to check that your code conforms to PEP8,
+    you can use the `pep8 package`_ style checker.  Most IDEs and text editors
+    have settings that can help you follow PEP8, for example by translating
+    tabs by four spaces.  Using `pyflakes`_ to check your code is also a good
+    idea.
+
+At the end of this document a checklist is given that may help to check if your
+code fulfills all requirements for inclusion in SciPy. 
+
+Another question you may have is: *where exactly do I put my code*?  To answer
+this, it is useful to understand how the SciPy public API (application
+programming interface) is defined.  For most modules the API is two levels
+deep, which means your new function should appear as
+``scipy.submodule.my_new_func``.  ``my_new_func`` can be put in an existing or
+new file under ``/scipy/<submodule>/``, its name is added to the ``__all__``
+dict in that file (which lists all public functions in the file), and those
+public functions are then imported in  ``/scipy/<submodule>/__init__.py``.  Any
+private functions/classes should have a leading underscore (``_``) in their
+name.  A more detailed description of what the public API of SciPy is, is given
+in `SciPy API`_.
+
+Once you think your code is ready for inclusion in SciPy, you can send a pull
+request (PR) on Github.  We won't go into the details of how to work with git
+here, this is described well in the `git workflow`_ section of the NumPy
+documentation and in the Github help pages.  When you send the PR for a new
+feature, be sure to also mention this on the scipy-dev mailing list.  This can
+prompt interested people to help review your PR.  Assuming that you already got
+positive feedback before on the general idea of your code/feature, the purpose
+of the code review is to ensure that the code is correct, efficient and meets
+the requirements outlined above.  In many cases the code review happens
+relatively quickly, but it's possible that it stalls.  If you have addressed
+all feedback already given, it's perfectly fine to ask on the mailing list
+again for review (after a reasonable amount of time, say a couple of weeks, has
+passed).  Once the review is completed, the PR is merged into the "master"
+branch of SciPy.
+
+The above describes the requirements and process for adding code to SciPy.  It
+doesn't yet answer the question though how decisions are made exactly.  The
+basic answer is: decisions are made by consensus, by everyone who chooses to
+participate in the discussion on the mailing list.  This includes developers,
+other users and yourself.  Aiming for consensus in the discussion is important
+-- SciPy is a project by and for the scientific Python community.  In those
+rare cases that agreement cannot be reached, the `maintainers`_ of the module
+in question can decide the issue.
+
+
+Contributing by helping maintain existing code
+----------------------------------------------
+
+The previous section talked specifically about adding new functionality to
+SciPy.  A large part of that discussion also applies to maintenance of existing
+code.  Maintenance means fixing bugs, improving code quality or style,
+documenting existing functionality better, adding missing unit tests, keeping
+build scripts up-to-date, etc.  The SciPy `Trac`_ bug tracker contains all
+reported bugs, build/documentation issues, etc.  Fixing issues described in
+Trac tickets helps improve the overall quality of SciPy, and is also a good way
+of getting familiar with the project.  You may also want to fix a bug because
+you ran into it and need the function in question to work correctly.
+
+The discussion on code style and unit testing above applies equally to bug
+fixes.  It is usually best to start by writing a unit test that shows the
+problem, i.e. it should pass but doesn't.  Once you have that, you can fix the
+code so that the test does pass.  That should be enough to send a PR for this
+issue.  Unlike when adding new code, discussing this on the mailing list may
+not be necessary - if the old behavior of the code is clearly incorrect, no one
+will object to having it fixed.  It may be necessary to add some warning or
+deprecation message for the changed behavior.  This should be part of the
+review process.
+
+
+Other ways to contribute
+------------------------
+
+There are many ways to contribute other than contributing code.  Participating
+in discussions on the scipy-user and scipy-dev *mailing lists* is a contribution
+in itself.  The `scipy.org`_ *website* contains a lot of information on the
+SciPy community and can always use a new pair of hands.  A redesign of this
+website is ongoing, see `scipy.github.com`_.  The redesigned website is a
+static site based on Sphinx, the sources for it are
+also on Github at `scipy.org-new`_.
+
+The SciPy *documentation* is constantly being improved by many developers and
+users.  You can contribute by sending a PR on Github that improves the
+documentation, but there's also a `documentation wiki`_ that is very convenient
+for making edits to docstrings (and doesn't require git knowledge).  Anyone can
+register a username on that wiki, ask on the scipy-dev mailing list for edit
+rights and make edits.  The documentation there is updated every day with the
+latest changes in the SciPy master branch, and wiki edits are regularly
+reviewed and merged into master.  Another advantage of the documentation wiki
+is that you can immediately see how the reStructuredText (reST) of docstrings
+and other docs is rendered as html, so you can easily catch formatting errors.
+
+Code that doesn't belong in SciPy itself or in another package but helps users
+accomplish a certain task is valuable.  `SciPy Central`_ is the place to share
+this type of code (snippets, examples, plotting code, etc.).
+
+
+Useful links, FAQ, checklist
+----------------------------
+
+Checklist before submitting a PR
+````````````````````````````````
+
+  - Are there unit tests with good code coverage?
+  - Do all public function have docstrings including examples?
+  - Is the code style correct (PEP8, pyflakes)
+  - Is the new functionality tagged with ``.. versionadded:: X.Y.Z`` (with
+    X.Y.Z the version number of the next release - can be found in setup.py)?
+  - Is the new functionality mentioned in the release notes of the next
+    release?
+  - Is the new functionality added to the reference guide?
+  - In case of larger additions, is there a tutorial or more extensive
+    module-level description?
+  - In case compiled code is added, is it integrated correctly via setup.py
+    (and preferably also Bento/Numscons configuration files)?
+  - If you are a first-time contributor, did you add yourself to THANKS.txt?
+    Please note that this is perfectly normal and desirable - the aim is to
+    give every single contributor credit, and if you don't add yourself it's
+    simply extra work for the reviewer (or worse, the reviewer may forget).
+  - Did you check that the code can be distributed under a BSD license?
+
+
+Useful SciPy documents
+``````````````````````
+
+  - The `how to document`_ guidelines
+  - NumPy/SciPy `testing guidelines`_
+  - `SciPy API`_
+  - SciPy `maintainers`_
+  - NumPy/SciPy `git workflow`_
+
+
+FAQ
+```
+
+*I based my code on existing Matlab/R/... code I found online, is this OK?*
+
+It depends.  SciPy is distributed under a BSD license, so if the code that you
+based your code on is also BSD licensed or has a BSD-compatible license (MIT,
+Apache, ...) then it's OK.  Code which is GPL-licensed, has no clear license,
+requires citation or is free for academic use only can't be included in SciPy.
+Therefore if you copied existing code with such a license or made a direct
+translation to Python of it, your code can't be included.  See also `license
+compatibility`_.
+
+
+*How do I set up SciPy so I can edit files, run the tests and make commits?*
+
+The simplest method is setting up an in-place build.  To create your local git
+repo and do the in-place build::
+
+  $ git clone https://github.com/scipy/scipy.git scipy
+  $ cd scipy
+  $ python setup.py build_ext -i
+
+Then you need to either set up a symlink in your site-packages or add this
+directory to your PYTHONPATH environment variable, so Python can find it.  Some
+IDEs (Spyder for example) have utilities to manage PYTHONPATH.  On Linux and OS
+X, you can for example edit your .bash_login file to automatically add this dir
+on startup of your terminal.  Add the line::
+
+  export PYTHONPATH="$HOME/scipy:${PYTHONPATH}"
+
+Alternatively, to set up the symlink, use (prefix only necessary if you want to
+use your local instead of global site-packages dir)::
+
+  $ python setupegg.py develop --prefix=${HOME}
+ 
+To test that everything works, start the interpreter (not inside the scipy/
+source dir) and run the tests::
+
+  $ python
+  >>> import scipy as sp
+  >>> sp.test()
+
+Now editing a Python source file in SciPy allows you to immediately test and
+use your changes, by simply restarting the interpreter.
+
+Note that while the above procedure is the most straightforward way to get
+started, you may want to look into using Bento or numscons for faster and more
+flexible building, or virtualenv to maintain development environments for
+multiple Python versions.
+
+
+*How do I set up a development version of SciPy in parallel to a released
+version that I use to do my job/research?*
+
+One simple way to achieve this is to install the released version in
+site-packages, by using a binary installer or pip for example, and set up the
+development version with an in-place build in a virtualenv.  First install
+`virtualenv`_ and `virtualenvwrapper`_, then create your virtualenv (named
+scipy-dev here) with::
+
+  $ mkvirtualenv scipy-dev
+
+Now, whenever you want to switch to the virtual environment, you can use the
+command ``workon scipy-dev``, while the command ``deactivate`` exits from the
+virtual environment and brings back your previous shell.  With scipy-dev
+activated, follow the in-place build with the symlink install above to actually
+install your development version of SciPy.
+
+
+*Can I use a programming language other than Python to speed up my code?*
+
+Yes.  The languages used in SciPy are Python, Cython, C, C++ and Fortran.  All
+of these have their pros and cons.  If Python really doesn't offer enough
+performance, one of those languages can be used.  Important concerns when
+using compiled languages are maintainability and portability.  For
+maintainability, Cython is clearly preferred over C/C++/Fortran.  Cython and C
+are more portable than C++/Fortran.  A lot of the existing C and Fortran code
+in SciPy is older, battle-tested code that was only wrapped in (but not
+specifically written for) Python/SciPy.  Therefore the basic advice is: use
+Cython.  If there's specific reasons why C/C++/Fortran should be preferred,
+please discuss those reasons first.
+
+
+*There's overlap between Trac and Github, which do I use for what?*
+
+Trac_ is the bug tracker, Github_ the code repository.  Before the SciPy code
+repository moved to Github, the preferred way to contribute code was to create
+a patch and attach it to a Trac ticket.  The overhead of this approach is much
+larger than sending a PR on Github, so please don't do this anymore.  Use Trac
+for bug reports, Github for patches.
+
+
+.. _scikit-learn: http://scikit-learn.org
+
+.. _scikits-image: http://scikits-image.org/
+
+.. _statsmodels: http://statsmodels.sourceforge.net/
+
+.. _testing guidelines: https://github.com/numpy/numpy/blob/master/doc/TESTS.rst.txt
+
+.. _how to document: https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
+
+.. _PEP8: http://www.python.org/dev/peps/pep-0008/
+
+.. _pep8 package: http://pypi.python.org/pypi/pep8
+
+.. _pyflakes: http://pypi.python.org/pypi/pyflakes
+
+.. _SciPy API: http://docs.scipy.org/doc/scipy/reference/api.html
+
+.. _git workflow: http://docs.scipy.org/doc/numpy/dev/gitwash/index.html
+
+.. _maintainers: https://github.com/scipy/scipy/blob/master/doc/MAINTAINERS.rst.txt
+
+.. _Trac: http://projects.scipy.org/scipy/timeline
+
+.. _Github: https://github.com/scipy/scipy
+
+.. _scipy.org: http://scipy.org/
+
+.. _scipy.github.com: http://scipy.github.com/
+
+.. _scipy.org-new: https://github.com/scipy/scipy.org-new
+
+.. _documentation wiki: http://docs.scipy.org/scipy/Front%20Page/
+
+.. _SciPy Central: http://scipy-central.org/
+
+.. _license compatibility: http://www.scipy.org/License_Compatibility
+
+.. _doctest: http://www.doughellmann.com/PyMOTW/doctest/
+
+.. _virtualenv: http://www.virtualenv.org/
+
+.. _virtualenvwrapper: http://www.doughellmann.com/projects/virtualenvwrapper/
+
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 GitHub, Inc.
+Copyright (c) 2011-2016 GitHub, Inc.

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ See [Troubleshooting](#troubleshooting) and [`CONTRIBUTING.md`](/CONTRIBUTING.md

 ![language stats bar](https://cloud.githubusercontent.com/assets/173/5562290/48e24654-8ddf-11e4-8fe7-735b0ce3a0d3.png)

-The Language stats bar is built by aggregating the languages of each file in that repository. If it is reporting a language that you don't expect:
+The Language stats bar displays languages percentages for the files in the repository. The percentages are calculated based on the bytes of code for each language as reported by the [List Languages](https://developer.github.com/v3/repos/#list-languages) API. If the bar is reporting a language that you don't expect:

 0. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
-0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
-0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you an add, especially links to public repositories, is helpful.
+0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
+0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you can add, especially links to public repositories, is helpful.
 0. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.

 ## Overrides
@@ -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-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).
+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-or-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. Vendored files are also hidden by default in diffs on github.com.
+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.

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

@@ -53,16 +53,21 @@ project-docs/* linguist-documentation
 docs/formatter.rb linguist-documentation=false
 ```

-### Using Emacs and Vim modelines
+### Using Emacs or 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
+Alternatively, you can use Vim or 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

+##### Vim
 ```
-Vim
+# Some examples of various styles:
+vim: syntax=java
+vim: set syntax=ruby:
 vim: set filetype=prolog:
 vim: set ft=cpp:
+```

-Emacs
+##### Emacs
+```
 -*- mode: php;-*-
 ```

--- a/2
+++ b/2
@@ -62,7 +62,7 @@ namespace :benchmark do

    corpus = File.expand_path(ENV["CORPUS"] || "samples")

-    require 'linguist/language'
+    require 'linguist'

    results = Hash.new
    Dir.glob("#{corpus}/**/*").each do |file|
--- a/bin/git-linguist
+++ b/bin/git-linguist
@@ -0,0 +1,138 @@
+#!/usr/bin/env ruby
+
+require 'linguist'
+require 'rugged'
+require 'optparse'
+require 'json'
+require 'tmpdir'
+require 'zlib'
+
+class GitLinguist
+  def initialize(path, commit_oid, incremental = true)
+    @repo_path = path
+    @commit_oid = commit_oid
+    @incremental = incremental
+  end
+
+  def linguist
+    if @commit_oid.nil?
+      raise "git-linguist must be called with a specific commit OID to perform language computation"
+    end
+    repo = Linguist::Repository.new(rugged, @commit_oid)
+
+    if @incremental && stats = load_language_stats
+      old_commit_oid, old_stats = stats
+
+      # A cache with NULL oid means that we want to froze
+      # these language stats in place and stop computing
+      # them (for performance reasons)
+      return old_stats if old_commit_oid == NULL_OID
+      repo.load_existing_stats(old_commit_oid, old_stats)
+    end
+
+    result = yield repo
+
+    save_language_stats(@commit_oid, repo.cache)
+    result
+  end
+
+  def load_language_stats
+    version, oid, stats = load_cache
+    if version == LANGUAGE_STATS_CACHE_VERSION && oid && stats
+      [oid, stats]
+    end
+  end
+
+  def save_language_stats(oid, stats)
+    cache = [LANGUAGE_STATS_CACHE_VERSION, oid, stats]
+    write_cache(cache)
+  end
+
+  def clear_language_stats
+    File.unlink(cache_file)
+  rescue Errno::ENOENT
+  end
+
+  def disable_language_stats
+    save_language_stats(NULL_OID, {})
+  end
+
+  protected
+  NULL_OID = ("0" * 40).freeze
+
+  LANGUAGE_STATS_CACHE = 'language-stats.cache'
+  LANGUAGE_STATS_CACHE_VERSION = "v3:#{Linguist::VERSION}"
+
+  def rugged
+    @rugged ||= Rugged::Repository.bare(@repo_path)
+  end
+
+  def cache_file
+    File.join(@repo_path, LANGUAGE_STATS_CACHE)
+  end
+
+  def write_cache(object)
+    return unless File.directory? @repo_path
+
+    begin
+      tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
+      File.open(tmp_path, "wb") do |f|
+        marshal = Marshal.dump(object)
+        f.write(Zlib::Deflate.deflate(marshal))
+      end
+
+      File.rename(tmp_path, cache_file)
+    rescue => e
+      (File.unlink(tmp_path) rescue nil)
+      raise e
+    end
+  end
+
+  def load_cache
+    marshal = File.open(cache_file, "rb") { |f| Zlib::Inflate.inflate(f.read) }
+    Marshal.load(marshal)
+  rescue SystemCallError, ::Zlib::DataError, ::Zlib::BufError, TypeError
+    nil
+  end
+end
+
+
+def git_linguist(args)
+  incremental = true
+  commit = nil
+
+  parser = OptionParser.new do |opts|
+    opts.banner = "Usage: git-linguist [OPTIONS] stats|breakdown|dump-cache|clear|disable"
+
+    opts.on("-f", "--force", "Force a full rescan") { incremental = false }
+    opts.on("--commit=COMMIT", "Commit to index") { |v| commit = v}
+  end
+
+  parser.parse!(args)
+
+  git_dir = `git rev-parse --git-dir`.strip
+  raise "git-linguist must be ran in a Git repository" unless $?.success?
+  wrapper = GitLinguist.new(git_dir, commit, incremental)
+
+  case args.pop
+  when "stats"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.languages)
+    end
+  when "breakdown"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.breakdown_by_file)
+    end
+  when "dump-cache"
+    puts JSON.dump(wrapper.load_language_stats)
+  when "clear"
+    wrapper.clear_language_stats
+  when "disable"
+    wrapper.disable_language_stats
+  else
+    $stderr.print(parser.help)
+    exit 1
+  end
+end
+
+git_linguist(ARGV)
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -10,17 +10,20 @@ Gem::Specification.new do |s|
  s.homepage = "https://github.com/github/linguist"
  s.license  = "MIT"

-  s.files = Dir['lib/**/*'] - ['lib/linguist/grammars.rb']
-  s.executables << 'linguist'
+  s.files = Dir['lib/**/*'] - ['lib/linguist/grammars.rb'] + ['LICENSE']
+  s.executables = ['linguist', 'git-linguist']

  s.add_dependency 'charlock_holmes', '~> 0.7.3'
-  s.add_dependency 'escape_utils',    '~> 1.0.1'
+  s.add_dependency 'escape_utils',    '~> 1.1.0'
  s.add_dependency 'mime-types',      '>= 1.19'
-  s.add_dependency 'rugged',          '~> 0.22.0b4'
+  s.add_dependency 'rugged',          '>= 0.23.0b'

  s.add_development_dependency 'minitest', '>= 5.0'
  s.add_development_dependency 'mocha'
  s.add_development_dependency 'pry'
  s.add_development_dependency 'rake'
  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'color-proximity', '~> 0.2.1'
+  s.add_development_dependency 'licensee', '6.0.0b1'
+
 end
--- a/grammars.yml
+++ b/grammars.yml
@@ -42,6 +42,8 @@ vendor/grammars/Docker.tmbundle:
 - source.dockerfile
 vendor/grammars/Elm.tmLanguage:
 - source.elm
+vendor/grammars/FreeMarker.tmbundle:
+- text.html.ftl
 vendor/grammars/G-Code/:
 - source.LS
 - source.MCPOST
@@ -67,6 +69,9 @@ vendor/grammars/Lean.tmbundle:
 - source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
+vendor/grammars/MagicPython:
+- source.python
+- source.regexp.python
 vendor/grammars/Modelica/:
 - source.modelica
 vendor/grammars/NSIS:
@@ -85,12 +90,14 @@ vendor/grammars/Racket:
 - source.racket
 vendor/grammars/SCSS.tmbundle:
 - source.scss
+vendor/grammars/SMT.tmbundle:
+- source.smt
 vendor/grammars/Scalate.tmbundle:
 - source.scaml
 - text.html.ssp
 vendor/grammars/Slash.tmbundle:
 - text.html.slash
-vendor/grammars/Stata.tmbundle:
+vendor/grammars/Stata.tmbundle/:
 - source.mata
 - source.stata
 vendor/grammars/Stylus/:
@@ -99,28 +106,33 @@ vendor/grammars/Sublime-Coq:
 - source.coq
 vendor/grammars/Sublime-HTTP:
 - source.httpspec
-vendor/grammars/Sublime-Inform:
- source.Inform7
 vendor/grammars/Sublime-Lasso:
 - file.lasso
 vendor/grammars/Sublime-Logos:
 - source.logos
 vendor/grammars/Sublime-Loom:
 - source.loomscript
+vendor/grammars/Sublime-Modula-2/:
+- source.modula2
 vendor/grammars/Sublime-Nit:
 - source.nit
 vendor/grammars/Sublime-QML:
 - source.qml
 vendor/grammars/Sublime-REBOL:
 - source.rebol
+vendor/grammars/Sublime-Red:
+- source.red
 vendor/grammars/Sublime-SQF-Language:
 - source.sqf
 vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
 - source.abl
+- text.html.abl
 vendor/grammars/Sublime-VimL:
 - source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
+vendor/grammars/SublimeClarion/:
+- source.clarion
 vendor/grammars/SublimePapyrus/:
 - source.compiled-papyrus
 - source.papyrus
@@ -131,10 +143,14 @@ vendor/grammars/TXL/:
 - source.txl
 vendor/grammars/Textmate-Gosu-Bundle:
 - source.gosu.2
+vendor/grammars/UrWeb-Language-Definition:
+- source.ur
 vendor/grammars/VBDotNetSyntax:
 - source.vbnet
 vendor/grammars/Vala-TMBundle:
 - source.vala
+vendor/grammars/X10:
+- source.x10
 vendor/grammars/abap.tmbundle:
 - source.abap
 vendor/grammars/actionscript3-tmbundle:
@@ -152,6 +168,9 @@ vendor/grammars/antlr.tmbundle:
 vendor/grammars/apache.tmbundle:
 - source.apache-config
 - source.apache-config.mod_perl
+vendor/grammars/api-blueprint-sublime-plugin/:
+- text.html.markdown.source.gfm.apib
+- text.html.markdown.source.gfm.mson
 vendor/grammars/applescript.tmbundle:
 - source.applescript
 vendor/grammars/asciidoc.tmbundle/:
@@ -162,6 +181,15 @@ vendor/grammars/asp.tmbundle:
 vendor/grammars/assembly.tmbundle:
 - objdump.x86asm
 - source.x86asm
+vendor/grammars/atom-fsharp/:
+- source.fsharp
+- source.fsharp.fsi
+- source.fsharp.fsl
+- source.fsharp.fsx
+vendor/grammars/atom-language-purescript/:
+- source.purescript
+vendor/grammars/atom-language-stan/:
+- source.stan
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
@@ -208,6 +236,7 @@ vendor/grammars/d.tmbundle:
 vendor/grammars/dart-sublime-bundle:
 - source.dart
 - source.pubspec
+- text.dart-analysis-output
 - text.dart-doccomments
 vendor/grammars/desktop.tmbundle:
 - source.desktop
@@ -240,8 +269,6 @@ vendor/grammars/fish-tmbundle:
 vendor/grammars/fortran.tmbundle:
 - source.fortran
 - source.fortran.modern
-vendor/grammars/fsharpbinding:
- source.fsharp
 vendor/grammars/gap-tmbundle/:
 - source.gap
 vendor/grammars/gettext.tmbundle:
@@ -280,8 +307,8 @@ vendor/grammars/io.tmbundle:
 vendor/grammars/ioke-outdated:
 - source.ioke
 vendor/grammars/jade-tmbundle:
- source.jade
 - source.pyjade
+- text.jade
 vendor/grammars/jasmin-sublime:
 - source.jasmin
 vendor/grammars/java.tmbundle:
@@ -289,22 +316,28 @@ vendor/grammars/java.tmbundle:
 - source.java-properties
 - text.html.jsp
 - text.junit-test-report
-vendor/grammars/javadoc.tmbundle:
- text.html.javadoc
 vendor/grammars/javascript-objective-j.tmbundle:
 - source.js.objj
-vendor/grammars/jquery-tmbundle:
- source.js.jquery
+vendor/grammars/jflex.tmbundle:
+- source.jflex
 vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-babel/:
+- source.js.jsx
+- source.regexp.babel
+vendor/grammars/language-click/:
+- source.click
 vendor/grammars/language-clojure:
 - source.clojure
 vendor/grammars/language-coffee-script:
 - source.coffee
 - source.litcoffee
+vendor/grammars/language-crystal:
+- source.crystal
 vendor/grammars/language-csharp:
+- source.cake
 - source.cs
 - source.csx
 - source.nant-build
@@ -312,19 +345,37 @@ vendor/grammars/language-gfm:
 - source.gfm
 vendor/grammars/language-hy:
 - source.hy
+vendor/grammars/language-inform7:
+- source.inform7
 vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
+- source.js.regexp.replacement
+vendor/grammars/language-jsoniq/:
+- source.jq
+- source.xq
+vendor/grammars/language-less/:
+- source.css.less
+vendor/grammars/language-maxscript:
+- source.maxscript
+vendor/grammars/language-ncl:
+- source.ncl
 vendor/grammars/language-python:
- source.python
- source.regexp.python
 - text.python.console
 - text.python.traceback
+vendor/grammars/language-renpy:
+- source.renpy
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
+vendor/grammars/language-supercollider:
+- source.supercollider
+vendor/grammars/language-xbase:
+- source.harbour
 vendor/grammars/language-yaml:
 - source.yaml
+vendor/grammars/language-yang/:
+- source.yang
 vendor/grammars/latex.tmbundle:
 - text.bibtex
 - text.log.latex
@@ -332,8 +383,6 @@ vendor/grammars/latex.tmbundle:
 - text.tex.latex
 - text.tex.latex.beamer
 - text.tex.latex.memoir
-vendor/grammars/less.tmbundle:
- source.css.less
 vendor/grammars/lilypond.tmbundle:
 - source.lilypond
 vendor/grammars/liquid.tmbundle:
@@ -396,8 +445,12 @@ vendor/grammars/pascal.tmbundle:
 vendor/grammars/perl.tmbundle/:
 - source.perl
 - source.perl.6
+vendor/grammars/perl6fe:
+- source.meta-info
+- source.perl6fe
+- source.regexp.perl6fe
 vendor/grammars/php-smarty.tmbundle:
- source.smarty
+- text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
 vendor/grammars/pike-textmate:
@@ -408,8 +461,6 @@ vendor/grammars/powershell:
 - source.powershell
 vendor/grammars/processing.tmbundle:
 - source.processing
-vendor/grammars/prolog.tmbundle:
- source.prolog
 vendor/grammars/protobuf-tmbundle:
 - source.protobuf
 vendor/grammars/puppet-textmate-bundle:
@@ -424,20 +475,14 @@ vendor/grammars/restructuredtext.tmbundle:
 - text.restructuredtext
 vendor/grammars/ruby-haml.tmbundle:
 - text.haml
-vendor/grammars/ruby-on-rails-tmbundle:
- source.js.erb.rails
- source.ruby.rails
- source.ruby.rails.rjs
- source.sql.ruby
- text.html.erb.rails
 vendor/grammars/ruby-slim.tmbundle:
 - text.slim
 vendor/grammars/ruby.tmbundle:
 - source.ruby
 - text.html.erb
 vendor/grammars/sas.tmbundle:
- source.SASLog
 - source.sas
+- source.sas_log
 vendor/grammars/sass-textmate-bundle:
 - source.sass
 vendor/grammars/scala.tmbundle:
@@ -447,10 +492,14 @@ vendor/grammars/scheme.tmbundle:
 - source.scheme
 vendor/grammars/scilab.tmbundle:
 - source.scilab
+vendor/grammars/smali-sublime/smali.tmLanguage:
+- source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
 vendor/grammars/sql.tmbundle:
 - source.sql
+vendor/grammars/st2-zonefile:
+- text.zone_file
 vendor/grammars/standard-ml.tmbundle:
 - source.cm
 - source.ml
@@ -458,10 +507,10 @@ vendor/grammars/sublime-MuPAD:
 - source.mupad
 vendor/grammars/sublime-apl/:
 - source.apl
+vendor/grammars/sublime-aspectj/:
+- source.aspectj
 vendor/grammars/sublime-befunge:
 - source.befunge
-vendor/grammars/sublime-better-typescript:
- source.ts
 vendor/grammars/sublime-bsv:
 - source.bsv
 vendor/grammars/sublime-cirru:
@@ -475,6 +524,9 @@ vendor/grammars/sublime-idris:
 - source.idris
 vendor/grammars/sublime-mask:
 - source.mask
+vendor/grammars/sublime-netlinx:
+- source.netlinx
+- source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
 vendor/grammars/sublime-nix:
@@ -482,6 +534,8 @@ vendor/grammars/sublime-nix:
 vendor/grammars/sublime-opal/:
 - source.opal
 - source.opalsysdefs
+vendor/grammars/sublime-pony:
+- source.pony
 vendor/grammars/sublime-robot-plugin:
 - text.robot
 vendor/grammars/sublime-rust:
@@ -497,6 +551,9 @@ vendor/grammars/sublime-text-ox/:
 - source.ox
 vendor/grammars/sublime-text-pig-latin/:
 - source.pig_latin
+vendor/grammars/sublime-typescript/:
+- source.ts
+- source.tsx
 vendor/grammars/sublime-varnish:
 - source.varnish.vcl
 vendor/grammars/sublime_cobol:
@@ -507,6 +564,9 @@ vendor/grammars/sublime_cobol:
 vendor/grammars/sublime_man_page_support:
 - source.man
 - text.groff
+vendor/grammars/sublimeprolog/:
+- source.prolog
+- source.prolog.eclipse
 vendor/grammars/sublimetext-cuda-cpp:
 - source.cuda-c++
 vendor/grammars/swift.tmbundle:
@@ -514,13 +574,6 @@ vendor/grammars/swift.tmbundle:
 vendor/grammars/tcl.tmbundle:
 - source.tcl
 - text.html.tcl
-vendor/grammars/text.tmbundle:
- text.plain
-vendor/grammars/textile.tmbundle:
- text.html.textile
-vendor/grammars/textmate.tmbundle:
- source.regexp.oniguruma
- source.tm-properties
 vendor/grammars/thrift.tmbundle:
 - source.thrift
 vendor/grammars/toml.tmbundle:
@@ -530,6 +583,8 @@ vendor/grammars/turtle.tmbundle:
 - source.turtle
 vendor/grammars/verilog.tmbundle:
 - source.verilog
+vendor/grammars/vue-syntax-highlight:
+- text.html.vue
 vendor/grammars/x86-assembly-textmate-bundle:
 - source.asm.x86
 vendor/grammars/xc.tmbundle/:
--- a/lib/linguist.rb
+++ b/lib/linguist.rb
@@ -13,8 +13,8 @@ class << Linguist
  def instrument(*args, &bk)
    if instrumenter
      instrumenter.instrument(*args, &bk)
-    else
-      yield if block_given?
+    elsif block_given?
+      yield
    end
  end
 end
--- a/lib/linguist/blob.rb
+++ b/lib/linguist/blob.rb
@@ -0,0 +1,73 @@
+require 'linguist/blob_helper'
+
+module Linguist
+  # A Blob is a wrapper around the content of a file to make it quack
+  # like a Grit::Blob. It provides the basic interface: `name`,
+  # `data`, `path` and `size`.
+  class Blob
+    include BlobHelper
+
+    # Public: Initialize a new Blob.
+    #
+    # path    - A path String (does not necessarily exists on the file system).
+    # content - Content of the file.
+    #
+    # Returns a Blob.
+    def initialize(path, content)
+      @path = path
+      @content = content
+    end
+
+    # Public: Filename
+    #
+    # Examples
+    #
+    #   Blob.new("/path/to/linguist/lib/linguist.rb", "").path
+    #   # =>  "/path/to/linguist/lib/linguist.rb"
+    #
+    # Returns a String
+    attr_reader :path
+
+    # Public: File name
+    #
+    # Returns a String
+    def name
+      File.basename(@path)
+    end
+
+    # Public: File contents.
+    #
+    # Returns a String.
+    def data
+      @content
+    end
+
+    # Public: Get byte size
+    #
+    # Returns an Integer.
+    def size
+      @content.bytesize
+    end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      extensions.last || ""
+    end
+
+    # Public: Return an array of the file extensions
+    #
+    #     >> Linguist::Blob.new("app/views/things/index.html.erb").extensions
+    #     => [".html.erb", ".erb"]
+    #
+    # Returns an Array
+    def extensions
+      basename, *segments = name.downcase.split(".")
+
+      segments.map.with_index do |segment, index|
+        "." + segments[index..-1].join(".")
+      end
+    end
+  end
+end
--- a/lib/linguist/documentation.yml
+++ b/lib/linguist/documentation.yml
@@ -13,11 +13,18 @@
 - (^|/)[Dd]ocumentation/
 - (^|/)javadoc/
 - ^man/
+- ^[Ee]xamples/

 ## Documentation files ##

+- (^|/)CHANGE(S|LOG)?(\.|$)
 - (^|/)CONTRIBUTING(\.|$)
 - (^|/)COPYING(\.|$)
 - (^|/)INSTALL(\.|$)
 - (^|/)LICEN[CS]E(\.|$)
+- (^|/)[Ll]icen[cs]e(\.|$)
 - (^|/)README(\.|$)
+- (^|/)[Rr]eadme(\.|$)
+
+# Samples folders
+- ^[Ss]amples/
--- a/lib/linguist/file_blob.rb
+++ b/lib/linguist/file_blob.rb
@@ -1,10 +1,11 @@
 require 'linguist/blob_helper'
+require 'linguist/blob'

 module Linguist
  # A FileBlob is a wrapper around a File object to make it quack
  # like a Grit::Blob. It provides the basic interface: `name`,
  # `data`, `path` and `size`.
-  class FileBlob
+  class FileBlob < Blob
    include BlobHelper

    # Public: Initialize a new FileBlob from a path
@@ -18,20 +19,6 @@ module Linguist
      @path = base_path ? path.sub("#{base_path}/", '') : path
    end

-    # Public: Filename
-    #
-    # Examples
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").path
-    #   # =>  "/path/to/linguist/lib/linguist.rb"
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb",
-    #                "/path/to/linguist").path
-    #   # =>  "lib/linguist.rb"
-    #
-    # Returns a String
-    attr_reader :path
-
    # Public: Read file permissions
    #
    # Returns a String like '100644'
@@ -39,13 +26,6 @@ module Linguist
      File.stat(@fullpath).mode.to_s(8)
    end

-    # Public: File name
-    #
-    # Returns a String
-    def name
-      File.basename(@fullpath)
-    end
-
    # Public: Read file contents.
    #
    # Returns a String.
@@ -59,26 +39,5 @@ module Linguist
    def size
      File.size(@fullpath)
    end
-
-    # Public: Get file extension.
-    #
-    # Returns a String.
-    def extension
-      extensions.last || ""
-    end
-
-    # Public: Return an array of the file extensions
-    #
-    #     >> Linguist::FileBlob.new("app/views/things/index.html.erb").extensions
-    #     => [".html.erb", ".erb"]
-    #
-    # Returns an Array
-    def extensions
-      basename, *segments = name.downcase.split(".")
-
-      segments.map.with_index do |segment, index|
-        "." + segments[index..-1].join(".")
-      end
-    end
  end
 end
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -53,20 +53,28 @@ module Linguist
    def generated?
      xcode_file? ||
      generated_net_designer_file? ||
+      generated_net_specflow_feature_file? ||
      composer_lock? ||
      node_modules? ||
      godeps? ||
      generated_by_zephir? ||
      minified_files? ||
+      source_map? ||
      compiled_coffeescript? ||
      generated_parser? ||
      generated_net_docfile? ||
      generated_postscript? ||
      compiled_cython_file? ||
-      generated_protocol_buffer_go? ||
+      generated_go? ||
      generated_protocol_buffer? ||
+      generated_apache_thrift? ||
      generated_jni_header? ||
-      vcr_cassette?
+      vcr_cassette? ||
+      generated_module? ||
+      generated_unity3d_meta? ||
+      generated_racc? ||
+      generated_jflex? ||
+      generated_grammarkit?
    end

    # Internal: Is the blob an Xcode file?
@@ -96,6 +104,20 @@ module Linguist
      end
    end

+    # Internal: Is the blob a generated source map?
+    #
+    # Source Maps usually have .css.map or .js.map extensions. In case they
+    # are not following the name convention, detect them based on the content.
+    #
+    # Returns true or false.
+    def source_map?
+      return false unless extname.downcase == '.map'
+
+      name =~ /(\.css|\.js)\.map$/i ||                 # Name convention
+      lines[0] =~ /^{"version":\d+,/ ||                # Revision 2 and later begin with the version number
+      lines[0] =~ /^\/\*\* Begin line maps\. \*\*\/{/  # Revision 1 begins with a magic comment
+    end
+
    # Internal: Is the blob of JS generated by CoffeeScript?
    #
    # CoffeeScript is meant to output JS that would be difficult to
@@ -164,6 +186,17 @@ module Linguist
      name.downcase =~ /\.designer\.cs$/
    end

+    # Internal: Is this a codegen file for Specflow feature file?
+    #
+    # Visual Studio's SpecFlow extension generates *.feature.cs files
+    # from *.feature files, they are not meant to be consumed by humans.
+    # Let's hide them.
+    #
+    # Returns true or false
+    def generated_net_specflow_feature_file?
+      name.downcase =~ /\.feature\.cs$/
+    end
+
    # Internal: Is the blob of JS a parser generated by PEG.js?
    #
    # PEG.js-generated parsers are not meant to be consumed by humans.
@@ -204,24 +237,38 @@ module Linguist
        creator.include?("ImageMagick")
    end

-    def generated_protocol_buffer_go?
+    def generated_go?
      return false unless extname == '.go'
      return false unless lines.count > 1

-      return lines[0].include?("Code generated by protoc-gen-go")
+      return lines[0].include?("Code generated by")
    end

+    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp']
+
    # Internal: Is the blob a C++, Java or Python source file generated by the
    # Protocol Buffer compiler?
    #
    # Returns true of false.
    def generated_protocol_buffer?
-      return false unless ['.py', '.java', '.h', '.cc', '.cpp'].include?(extname)
+      return false unless PROTOBUF_EXTENSIONS.include?(extname)
      return false unless lines.count > 1

      return lines[0].include?("Generated by the protocol buffer compiler.  DO NOT EDIT!")
    end

+    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp']
+
+    # Internal: Is the blob generated by Apache Thrift compiler?
+    #
+    # Returns true or false
+    def generated_apache_thrift?
+      return false unless APACHE_THRIFT_EXTENSIONS.include?(extname)
+      return false unless lines.count > 1
+
+      return lines[0].include?("Autogenerated by Thrift Compiler") || lines[1].include?("Autogenerated by Thrift Compiler")
+    end
+
    # Internal: Is the blob a C/C++ header generated by the Java JNI tool javah?
    #
    # Returns true of false.
@@ -284,5 +331,76 @@ module Linguist
      return false unless lines.count > 1
      return lines[0].include?("Generated by Cython")
    end
+
+    # Internal: Is it a KiCAD or GFortran module file?
+    #
+    # KiCAD module files contain:
+    # PCBNEW-LibModule-V1  yyyy-mm-dd h:mm:ss XM
+    # on the first line.
+    #
+    # GFortran module files contain:
+    # GFORTRAN module version 'x' created from 
+    # on the first line.
+    #
+    # Return true of false
+    def generated_module?
+      return false unless extname == '.mod'
+      return false unless lines.count > 1
+      return lines[0].include?("PCBNEW-LibModule-V") || 
+              lines[0].include?("GFORTRAN module version '")
+    end
+
+    # Internal: Is this a metadata file from Unity3D?
+    #
+    # Unity3D Meta files start with:
+    #   fileFormatVersion: X
+    #   guid: XXXXXXXXXXXXXXX
+    #
+    # Return true or false
+    def generated_unity3d_meta?
+      return false unless extname == '.meta'
+      return false unless lines.count > 1
+      return lines[0].include?("fileFormatVersion: ")
+    end
+
+    # Internal: Is this a Racc-generated file?
+    #
+    # A Racc-generated file contains:
+    # # This file is automatically generated by Racc x.y.z
+    # on the third line.
+    #
+    # Return true or false
+    def generated_racc?
+      return false unless extname == '.rb'
+      return false unless lines.count > 2
+      return lines[2].start_with?("# This file is automatically generated by Racc")
+    end
+
+    # Internal: Is this a JFlex-generated file?
+    #
+    # A JFlex-generated file contains:
+    # /* The following code was generated by JFlex x.y.z on d/at/e ti:me */
+    # on the first line.
+    #
+    # Return true or false
+    def generated_jflex?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("/* The following code was generated by JFlex ")
+    end
+
+    # Internal: Is this a GrammarKit-generated file?
+    #
+    # A GrammarKit-generated file typically contain:
+    # // This is a generated file. Not intended for manual editing.
+    # on the first line. This is not always the case, as it's possible to
+    # customize the class header.
+    #
+    # Return true or false
+    def generated_grammarkit?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("// This is a generated file. Not intended for manual editing.")
+    end
  end
 end
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -13,11 +13,14 @@ module Linguist
    #   ])
    #
    # Returns an Array of languages, or empty if none matched or were inconclusive.
-    def self.call(blob, languages)
+    def self.call(blob, candidates)
      data = blob.data

      @heuristics.each do |heuristic|
-        return Array(heuristic.call(data)) if heuristic.matches?(languages)
+        if heuristic.matches?(blob.name)
+          languages = Array(heuristic.call(data))
+          return languages if languages.any? || languages.all? { |l| candidates.include?(l) }
+        end
      end

      [] # No heuristics matched
@@ -30,7 +33,7 @@ module Linguist
    #
    # Examples
    #
-    #     disambiguate "Perl", "Prolog" do |data|
+    #     disambiguate ".pm" do |data|
    #       if data.include?("use strict")
    #         Language["Perl"]
    #       elsif /^[^#]+:-/.match(data)
@@ -38,22 +41,23 @@ module Linguist
    #       end
    #     end
    #
-    def self.disambiguate(*languages, &heuristic)
-      @heuristics << new(languages, &heuristic)
+    def self.disambiguate(*extensions, &heuristic)
+      @heuristics << new(extensions, &heuristic)
    end

    # Internal: Array of defined heuristics
    @heuristics = []

    # Internal
-    def initialize(languages, &heuristic)
-      @languages = languages
+    def initialize(extensions, &heuristic)
+      @extensions = extensions
      @heuristic = heuristic
    end

    # Internal: Check if this heuristic matches the candidate languages.
-    def matches?(candidates)
-      candidates.any? && candidates.all? { |l| @languages.include?(l.name) }
+    def matches?(filename)
+      filename = filename.downcase
+      @extensions.any? { |ext| filename.end_with?(ext) }
    end

    # Internal: Perform the heuristic
@@ -62,9 +66,19 @@ module Linguist
    end

    # Common heuristics
-    ObjectiveCRegex = /^[ \t]*@(interface|class|protocol|property|end|synchronised|selector|implementation)\b/
+    ObjectiveCRegex = /^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])/

-    disambiguate "BitBake", "BlitzBasic" do |data|
+    disambiguate ".asc" do |data|
+      if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data)
+        Language["Public Key"]
+      elsif /^[=-]+(\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"]
+      end
+    end
+
+    disambiguate ".bb" do |data|
      if /^\s*; /.match(data) || data.include?("End Function")
        Language["BlitzBasic"]
      elsif /^\s*(# |include|require)\b/.match(data)
@@ -72,64 +86,14 @@ module Linguist
      end
    end

-    disambiguate "C#", "Smalltalk" do |data|
-      if /![\w\s]+methodsFor: /.match(data)
-        Language["Smalltalk"]
-      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
-        Language["C#"]
+    disambiguate ".ch" do |data|
+      if /^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b/i.match(data)
+        Language["xBase"]
      end
    end

-    disambiguate "Objective-C", "C++", "C" do |data|
-      if ObjectiveCRegex.match(data)
-        Language["Objective-C"]
-      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
-        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
-        Language["C++"]
-      end
-    end
-
-    disambiguate "Perl", "Perl6", "Prolog" do |data|
-      if data.include?("use v6")
-        Language["Perl6"]
-      elsif data.match(/use strict|use\s+v?5\./)
-        Language["Perl"]
-      elsif /^[^#]+:-/.match(data)
-        Language["Prolog"]
-      end
-    end
-
-    disambiguate "ECL", "Prolog" do |data|
-      if /^[^#]+:-/.match(data)
-        Language["Prolog"]
-      elsif data.include?(":=")
-        Language["ECL"]
-      end
-    end
-
-    disambiguate "IDL", "Prolog", "INI", "QMake" do |data|
-      if /^[^#]+:-/.match(data)
-        Language["Prolog"]
-      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
-
-    disambiguate "GAP", "Scilab" do |data|
-      if (data.include?("gap> "))
-        Language["GAP"]
-      # Heads up - we don't usually write heuristics like this (with no regex match)
-      else
-        Language["Scilab"]
-      end
-    end
-
-    disambiguate "Common Lisp", "OpenCL", "Cool" do |data|
-      if data.include?("(defun ")
+    disambiguate ".cl" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
        Language["Common Lisp"]
      elsif /^class/x.match(data)
        Language["Cool"]
@@ -138,51 +102,104 @@ module Linguist
      end
    end

-    disambiguate "Hack", "PHP" do |data|
-      if data.include?("<?hh")
-        Language["Hack"]
-      elsif /<?[^h]/.match(data)
-        Language["PHP"]
+    disambiguate ".cs" do |data|
+      if /![\w\s]+methodsFor: /.match(data)
+        Language["Smalltalk"]
+      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
+        Language["C#"]
      end
    end

-    disambiguate "Scala", "SuperCollider" do |data|
-      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
-        Language["SuperCollider"]
-      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
-        Language["Scala"]
+    disambiguate ".d" 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

-    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"]
+    disambiguate ".ecl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["ECLiPSe"]
+      elsif data.include?(":=")
+        Language["ECL"]
      end
    end

-    disambiguate "FORTRAN", "Forth" do |data|
+    disambiguate ".for", ".f" do |data|
      if /^: /.match(data)
        Language["Forth"]
-      elsif /^([c*][^a-z]|      (subroutine|program)\s|\s*!)/i.match(data)
+      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
        Language["FORTRAN"]
      end
    end

-    disambiguate "F#", "Forth", "GLSL" do |data|
+    disambiguate ".fr" do |data|
+      if /^(: |also |new-device|previous )/.match(data)
+        Language["Forth"]
+      elsif /^\s*(import|module|package|data|type) /.match(data)
+        Language["Frege"]
+      else
+        Language["Text"]
+      end
+    end
+
+    disambiguate ".fs" do |data|
      if /^(: |new-device)/.match(data)
        Language["Forth"]
      elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
        Language["F#"]
-      elsif /^\s*(#include|#pragma|precision|uniform|varying|void)/.match(data)
+      elsif /^\s*(#version|precision|uniform|varying|vec[234])/.match(data)
        Language["GLSL"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["Filterscript"]
      end
    end

-    disambiguate "M", "MUF", "Mathematica", "Matlab", "Mercury", "Objective-C" do |data|
+    disambiguate ".gs" do |data|
+      Language["Gosu"] if /^uses java\./.match(data)
+    end
+
+    disambiguate ".h" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
+        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
+        Language["C++"]
+      end
+    end
+
+    disambiguate ".l" do |data|
+      if /\(def(un|macro)\s/.match(data)
+        Language["Common Lisp"]
+      elsif /^(%[%{}]xs|<.*>)/.match(data)
+        Language["Lex"]
+      elsif /^\.[a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /^\((de|class|rel|code|data|must)\s/.match(data)
+        Language["PicoLisp"]
+      end
+    end
+
+    disambiguate ".ls" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
+    disambiguate ".lsp", ".lisp" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".m" do |data|
      if ObjectiveCRegex.match(data)
        Language["Objective-C"]
      elsif data.include?(":- module")
@@ -195,48 +212,132 @@ module Linguist
        Language["Mathematica"]
      elsif /^\s*%/.match(data)
        Language["Matlab"]
+      elsif /^\w+\s*:\s*module\s*{/.match(data)
+        Language["Limbo"]
      end
    end

-    disambiguate "Gosu", "JavaScript" do |data|
-      Language["Gosu"] if /^uses java\./.match(data)
-    end
-
-    disambiguate "LoomScript", "LiveScript" do |data|
-      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
-        Language["LoomScript"]
-      else
-        Language["LiveScript"]
+    disambiguate ".ml" do |data|
+      if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
+        Language["OCaml"]
+      elsif /=> |case\s+(\S+\s)+of/.match(data)
+        Language["Standard ML"]
      end
    end

-    disambiguate "Common Lisp", "NewLisp" do |data|
-      if /^\s*\((defun|in-package|defpackage) /.match(data)
-        Language["Common Lisp"]
-      elsif /^\s*\(define /.match(data)
-        Language["NewLisp"]
-      end
-    end
-
-    disambiguate "TypeScript", "XML" do |data|
-      if data.include?("<TS ")
+    disambiguate ".mod" do |data|
+      if data.include?('<!ENTITY ')
        Language["XML"]
+      elsif /MODULE\s\w+\s*;/i.match(data) || /^\s*END \w+;$/i.match(data)
+        Language["Modula-2"]
      else
-        Language["TypeScript"]
+        [Language["Linux Kernel Module"], Language["AMPL"]]
      end
    end

-    disambiguate "Frege", "Forth", "Text" do |data|
-      if /^(: |also |new-device|previous )/.match(data)
-        Language["Forth"]
-      elsif /^\s*(import|module|package|data|type) /.match(data)
-        Language["Frege"]
+    disambiguate ".ms" do |data|
+      if /^[.'][a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z]/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, ""))
+        Language["GAS"]
      else
+        Language["MAXScript"]
+      end
+    end
+
+    disambiguate ".n" do |data|
+      if /^[.']/.match(data)
+        Language["Groff"]
+      elsif /^(module|namespace|using)\s/.match(data)
+        Language["Nemerle"]
+      end
+    end
+
+    disambiguate ".ncl" do |data|
+      if data.include?("THE_TITLE")
        Language["Text"]
      end
    end

-    disambiguate "PLSQL", "SQLPL", "PLpgSQL", "SQL" do |data|
+    disambiguate ".nl" do |data|
+      if /^(b|g)[0-9]+ /.match(data)
+        Language["NL"]
+      else
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".php" do |data|
+      if data.include?("<?hh")
+        Language["Hack"]
+      elsif /<?[^h]/.match(data)
+        Language["PHP"]
+      end
+    end
+
+    disambiguate ".pl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pm", ".t" do |data|
+      if /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pod" do |data|
+      if /^=\w+$/.match(data)
+        Language["Pod"]
+      else
+        Language["Perl"]
+      end
+    end
+
+    disambiguate ".pro" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      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
+
+    disambiguate ".r" do |data|
+      if /\bRebol\b/i.match(data)
+        Language["Rebol"]
+      elsif data.include?("<-")
+        Language["R"]
+      end
+    end
+
+    disambiguate ".rs" do |data|
+      if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
+        Language["Rust"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["RenderScript"]
+      end
+    end
+
+    disambiguate ".sc" do |data|
+      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
+        Language["SuperCollider"]
+      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
+        Language["Scala"]
+      end
+    end
+
+    disambiguate ".sql" do |data|
      if /^\\i\b|AS \$\$|LANGUAGE '+plpgsql'+/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
        #Postgres
        Language["PLpgSQL"]
@@ -252,13 +353,20 @@ module Linguist
      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"]
+    disambiguate ".ts" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
+    disambiguate ".tst" do |data|
+      if (data.include?("gap> "))
+        Language["GAP"]
+      # Heads up - we don't usually write heuristics like this (with no regex match)
+      else
+        Language["Scilab"]
      end
    end
  end
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -150,7 +150,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.find_by_name(name)
-      name && @name_index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
    end

    # Public: Look up Language by one of its aliases.
@@ -164,7 +165,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.find_by_alias(name)
-      name && @alias_index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
    end

    # Public: Look up Languages by filename.
@@ -240,7 +242,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.[](name)
-      name && @index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@index[name.downcase] || @index[name.split(',').first.downcase])
    end

    # Public: A List of popular languages
@@ -541,7 +544,7 @@ module Linguist
    if extnames = extensions[name]
      extnames.each do |extname|
        if !options['extensions'].index { |x| x.downcase.end_with? extname.downcase }
-          warn "#{name} has a sample with extension (#{extname.downcase}) that isn't explicitly defined in languages.yml" unless extname == '.script!'
+          warn "#{name} has a sample with extension (#{extname.downcase}) that isn't explicitly defined in languages.yml"
          options['extensions'] << extname
        end
      end
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -4,7 +4,11 @@ require 'rugged'

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

@@ -31,14 +35,6 @@ module Linguist
        name, GIT_ATTR, GIT_ATTR_FLAGS)
    end

-    def vendored?
-      if attr = git_attributes['linguist-vendored']
-        return boolean_attribute(attr)
-      else
-        return super
-      end
-    end
-
    def documentation?
      if attr = git_attributes['linguist-documentation']
        boolean_attribute(attr)
@@ -47,6 +43,22 @@ module Linguist
      end
    end

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

@@ -67,11 +79,15 @@ module Linguist
      @size
    end

+    def cleanup!
+      @data.clear if @data
+    end
+
    protected

    # Returns true if the attribute is present and not the string "false".
-    def boolean_attribute(attr)
-      attr != "false"
+    def boolean_attribute(attribute)
+      attribute != "false"
    end

    def load_blob!
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -126,12 +126,13 @@ module Linguist
    end

    protected
+    MAX_TREE_SIZE = 100_000

    def compute_stats(old_commit_oid, cache = nil)
+      return {} if current_tree.count_recursive(MAX_TREE_SIZE) >= MAX_TREE_SIZE
+
      old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
-
      read_index
-
      diff = Rugged::Tree.diff(repository, old_tree, current_tree)

      # Clear file map and fetch full diff if any .gitattributes files are changed
@@ -150,14 +151,18 @@ module Linguist
        next if delta.binary

        if [:added, :modified].include? delta.status
-          # Skip submodules
+          # Skip submodules and symlinks
          mode = delta.new_file[:mode]
-          next if (mode & 040000) != 0
+          mode_format = (mode & 0170000)
+          next if mode_format == 0120000 || mode_format == 040000 || mode_format == 0160000

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

-          next unless blob.include_in_language_stats?
-          file_map[new] = [blob.language.group.name, blob.size]
+          if blob.include_in_language_stats?
+            file_map[new] = [blob.language.group.name, blob.size]
+          end
+
+          blob.cleanup!
        end
      end

--- a/lib/linguist/samples.rb
+++ b/lib/linguist/samples.rb
@@ -50,16 +50,13 @@ module Linguist
            end
          else
            path = File.join(dirname, filename)
-
-            if File.extname(filename) == ""
-              raise "#{path} is missing an extension, maybe it belongs in filenames/ subdir"
-            end
+            extname = File.extname(filename)

            yield({
              :path     => path,
              :language => category,
              :interpreter => Shebang.interpreter(File.read(path)),
-              :extname  => File.extname(filename)
+              :extname  => extname.empty? ? nil : extname
            })
          end
        end
--- a/lib/linguist/shebang.rb
+++ b/lib/linguist/shebang.rb
@@ -23,17 +23,20 @@ module Linguist
      # First line must start with #!
      return unless shebang && shebang.start_with?("#!")

-      # Get the parts of the shebang without the #!
-      tokens = shebang.sub(/^#!\s*/, '').strip.split(' ')
+      s = StringScanner.new(shebang)

      # There was nothing after the #!
-      return if tokens.empty?
+      return unless path = s.scan(/^#!\s*\S+/)

-      # Get the name of the interpreter
-      script = File.basename(tokens.first)
+      # Keep going
+      script = path.split('/').last

-      # Get next argument if interpreter was /usr/bin/env
-      script = tokens[1] if script == 'env'
+      # if /usr/bin/env type shebang then walk the string
+      if script == 'env'
+        s.scan(/\s+/)
+        s.scan(/.*=[^\s]+\s+/) # skip over variable arguments e.g. foo=bar
+        script = s.scan(/\S+/)
+      end

      # Interpreter was /usr/bin/env with no arguments
      return unless script
@@ -41,6 +44,9 @@ module Linguist
      # "python2.6" -> "python2"
      script.sub! /(\.\d+)$/, ''

+      # #! perl -> perl
+      script.sub! /^#!\s*/, ''
+
      # Check for multiline shebang hacks that call `exec`
      if script == 'sh' &&
        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
--- a/lib/linguist/strategy/filename.rb
+++ b/lib/linguist/strategy/filename.rb
@@ -3,17 +3,7 @@ module Linguist
    # Detects language based on filename and/or extension
    class Filename
      def self.call(blob, _)
-        name = blob.name.to_s
-
-        # A bit of an elegant hack. If the file is executable but extensionless,
-        # append a "magic" extension so it can be classified with other
-        # languages that have shebang scripts.
-        extensions = FileBlob.new(name).extensions
-        if extensions.empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
-          name += ".script!"
-        end
-
-        Language.find_by_filename(name)
+        Language.find_by_filename(blob.name.to_s)
      end
    end
  end
--- a/lib/linguist/strategy/modeline.rb
+++ b/lib/linguist/strategy/modeline.rb
@@ -1,8 +1,19 @@
 module Linguist
  module Strategy
    class Modeline
-      EmacsModeline = /-\*-\s*mode:\s*(\w+);?\s*-\*-/i
-      VimModeline = /\/\*\s*vim:\s*set\s*(?:ft|filetype)=(\w+):\s*\*\//i
+      EMACS_MODELINE = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
+
+      # First form vim modeline
+      # [text]{white}{vi:|vim:|ex:}[white]{options}
+      # ex: 'vim: syntax=perl'
+      VIM_MODELINE_1 = /(?:vim|vi|ex):\s*(?:ft|filetype|syntax)=(\w+)\s?/i
+
+      # Second form vim modeline (compatible with some versions of Vi)
+      # [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
+      # ex: 'vim set syntax=perl:'
+      VIM_MODELINE_2 = /(?:vim|vi|Vim|ex):\s*se(?:t)?.*\s(?:ft|filetype|syntax)=(\w+)\s?.*:/i
+
+      MODELINES = [EMACS_MODELINE, VIM_MODELINE_1, VIM_MODELINE_2]

      # Public: Detects language based on Vim and Emacs modelines
      #
@@ -22,7 +33,7 @@ module Linguist
      #
      # Returns a String or nil
      def self.modeline(data)
-        match = data.match(EmacsModeline) || data.match(VimModeline)
+        match = MODELINES.map { |regex| data.match(regex) }.reject(&:nil?).first
        match[1] if match
      end
    end
--- a/lib/linguist/tokenizer.rb
+++ b/lib/linguist/tokenizer.rb
@@ -22,8 +22,10 @@ module Linguist
    # Start state on token, ignore anything till the next newline
    SINGLE_LINE_COMMENTS = [
      '//', # C
+      '--', # Ada, Haskell, AppleScript
      '#',  # Ruby
      '%',  # Tex
+      '"',  # Vim
    ]

    # Start state on opening token, ignore anything until the closing
@@ -84,17 +86,17 @@ module Linguist
          if s.peek(1) == "\""
            s.getch
          else
-            s.skip_until(/[^\\]"/)
+            s.skip_until(/(?<!\\)"/)
          end
        elsif s.scan(/'/)
          if s.peek(1) == "'"
            s.getch
          else
-            s.skip_until(/[^\\]'/)
+            s.skip_until(/(?<!\\)'/)
          end

        # Skip number literals
-        elsif s.scan(/(0x)?\d(\d|\.)*/)
+        elsif s.scan(/(0x\h(\h|\.)*|\d(\d|\.)*)([uU][lL]{0,2}|([eE][-+]\d*)?[fFlL]*)/)

        # SGML style brackets
        elsif token = s.scan(/<[^\s<>][^<>]*>/)
@@ -130,6 +132,9 @@ module Linguist
    #   extract_shebang("#!/usr/bin/env node")
    #   # => "node"
    #
+    #   extract_shebang("#!/usr/bin/env A=B foo=bar awk -f")
+    #   # => "awk"
+    #
    # Returns String token or nil it couldn't be parsed.
    def extract_shebang(data)
      s = StringScanner.new(data)
@@ -138,6 +143,7 @@ module Linguist
        script = path.split('/').last
        if script == 'env'
          s.scan(/\s+/)
+          s.scan(/.*=[^\s]+\s+/)
          script = s.scan(/\S+/)
        end
        script = script[/[^\d]+/, 0] if script
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -24,6 +24,9 @@
 - (^|/)config.guess$
 - (^|/)config.sub$

+# Linters
+- cpplint.py
+
 # Node dependencies
 - node_modules/

@@ -67,6 +70,7 @@
 - 3rd[-_]?party/
 - vendors?/
 - extern(al)?/
+- (^|/)[Vv]+endor/

 # Debian packaging
 - ^debian/
@@ -74,6 +78,9 @@
 # Haxelib projects often contain a neko bytecode file named run.n
 - run.n$

+# Bootstrap Datepicker
+- bootstrap-datepicker/
+
 ## Commonly Bundled JavaScript frameworks ##

 # jQuery
@@ -84,6 +91,34 @@
 - (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$
 - (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$

+# jQuery Gantt
+- jquery.fn.gantt.js
+
+# jQuery fancyBox
+- jquery.fancybox.(js|css)
+
+# Fuel UX
+- fuelux.js
+
+# jQuery File Upload
+- (^|/)jquery\.fileupload(-\w+)?\.js$
+
+# Slick
+- (^|/)slick\.\w+.js$
+
+# Leaflet plugins
+- (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$
+- leaflet.draw-src.js
+- leaflet.draw.css
+- Control.FullScreen.css
+- Control.FullScreen.js
+- leaflet.spin.js
+- wicket-leaflet.js
+
+# Sublime Text workspace files
+- .sublime-project
+- .sublime-workspace
+
 # Prototype
 - (^|/)prototype(.*)\.js$
 - (^|/)effects\.js$
@@ -118,7 +153,7 @@
 - (^|/)Chart\.js$

 # Codemirror
- (^|/)[Cc]ode[Mm]irror/(lib|mode|theme|addon|keymap)
+- (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)

 # SyntaxHighlighter - http://alexgorbatchev.com/
 - (^|/)shBrush([^.]*)\.js$
@@ -143,6 +178,9 @@

 ## Python ##

+# Sphinx
+- (^|/)docs?/_?(build|themes?|templates?|static)/
+
 # django
 - (^|/)admin_media/

@@ -157,12 +195,31 @@

 ## Obj-C ##

+# Xcode
+
+- \.xctemplate/
+- \.imageset/
+
+# Carthage
+- ^Carthage/
+
 # Cocoapods
 - ^Pods/

 # Sparkle
 - (^|/)Sparkle/

+# Crashlytics
+- Crashlytics.framework/
+
+# Fabric
+- Fabric.framework/
+
+# git config files
+- gitattributes$
+- gitignore$
+- gitmodules$
+
 ## Groovy ##

 # Gradle
@@ -207,21 +264,9 @@
 # Html5shiv
 - (^|/)html5shiv\.js$

-# Samples folders
- ^[Ss]amples/
-
-# LICENSE, README, git config files
- ^COPYING$
- LICENSE$
- License$
- gitattributes$
- gitignore$
- gitmodules$
- ^README$
- ^readme$
-
 # Test fixtures
- ^[Tt]est/fixtures/
+- ^[Tt]ests?/fixtures/
+- ^[Ss]pecs?/fixtures/

 # PhoneGap/Cordova
 - (^|/)cordova([^.]*)\.js$
@@ -233,7 +278,7 @@
 # Vagrant
 - ^Vagrantfile$

-# .DS_Store's
+# .DS_Stores
 - .[Dd][Ss]_[Ss]tore$

 # R packages
@@ -252,5 +297,8 @@
 - proguard.pro
 - proguard-rules.pro

+# PuPHPet
+- ^puphpet/
+
 # Android Google APIs
 - (^|/)\.google_apis/
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.5.1"
+  VERSION = "4.7.5"
 end
--- a/samples/AMPL/CT2.mod
+++ b/samples/AMPL/CT2.mod
@@ -0,0 +1,58 @@
+param num_beams;                  # number of beams
+
+param num_rows >= 1, integer;     # number of rows
+param num_cols >= 1, integer;     # number of columns 
+
+set BEAMS   := 1 .. num_beams;    # set of beams
+
+set ROWS    := 1 .. num_rows;	  # set of rows
+set COLUMNS := 1 .. num_cols;	  # set of columns
+
+# values for entries of each beam
+param beam_values {BEAMS, ROWS, COLUMNS} >= 0; 
+
+# values of tumor
+param tumor_values {ROWS, COLUMNS} >= 0; 
+
+# values of critical area
+param critical_values {ROWS, COLUMNS} >= 0; 
+
+# critical maximum dosage requirement
+param critical_max;
+
+# tumor minimum dosage requirement
+param tumor_min;
+
+# dosage scalar of each beam
+var X {i in BEAMS} >= 0;
+
+
+# define the tumor area which includes the locations where tumor exists
+set tumor_area := {k in ROWS, h in COLUMNS: tumor_values[k,h] > 0};
+
+# define critical area 
+set critical_area := {k in ROWS, h in COLUMNS: critical_values[k,h] > 0};
+
+var S {(k,h) in tumor_area} >= 0;
+var T {(k,h) in critical_area} >= 0;
+
+# maximize total dosage in tumor area
+maximize total_tumor_dosage: sum {i in BEAMS} sum {(k,h) in tumor_area} X[i] * beam_values[i,k,h];
+
+# minimize total dosage in critical area
+minimize total_critical_dosage: sum {i in BEAMS} sum {(k,h) in critical_area} X[i] * beam_values[i,k,h];
+
+# minimize total tumor slack
+minimize total_tumor_slack: sum {(k,h) in tumor_area} S[k,h];
+
+# minimize total critical area slack
+minimize total_critical_slack: sum {(k,h) in critical_area} T[k,h];
+
+# total dosage at each tumor location [k,h] should be >= min tumor dosage with slack variable
+subject to tumor_limit {(k,h) in tumor_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == tumor_min - S[k,h];
+
+# total dosage at each critical location [k,h] should be = max critical dosage with slack variable
+subject to critical_limit {(k,h) in critical_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == critical_max + T[k,h];
+
+
+
--- a/Blueprint/actions.apib
+++ b/Blueprint/actions.apib
@@ -0,0 +1,55 @@
+FORMAT: 1A
+
+# Advanced Action API
+A resource action is – in fact – a state transition. This API example demonstrates an action - state transition - to another resource.
+
+## API Blueprint
+ [Previous: Resource Model](11.%20Resource%20Model.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/11.%20Advanced%20Action.md)
+
+# Tasks [/tasks/tasks{?status,priority}]
+
+ Parameters
+    + status (string)
+    + priority (number)
+
+## List All Tasks [GET]
+
+ Response 200 (application/json)
+
+        [
+            {
+                "id": 123,
+                "name": "Exercise in gym",
+                "done": false,
+                "type": "task"
+            },
+            {
+                "id": 124,
+                "name": "Shop for groceries",
+                "done": true,
+                "type": "task"
+            }
+        ]
+
+## Retrieve Task [GET /task/{id}]
+This is a state transition to another resource
+
+ Parameters
+    + id (string)
+
+ Response 200 (application/json)
+
+        {
+            "id": 123,
+            "name": "Go to gym",
+            "done": false,
+            "type": "task"
+        }
+
+## Delete Task [DELETE /task/{id}]
+
+ Parameters
+    + id (string)
+
+ Response 204
--- a/Blueprint/attributes.apib
+++ b/Blueprint/attributes.apib
@@ -0,0 +1,39 @@
+FORMAT: 1A
+
+# Attributes API
+This API example demonstrates how to describe body attributes of a request or response message.
+
+In this case, the description is complementary (and duplicate!) to the provided JSON example in the body section. The [Advanced Attributes](09.%20Advanced%20Attributes.md) API example will demonstrate how to avoid duplicates and how to reuse attributes descriptions.
+
+## API Blueprint
+ [Previous: Parameters](07.%20Parameters.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/08.%20Attributes.md)
+ [Next: Advanced Attributes](09.%20Advanced%20Attributes.md)
+
+# Group Coupons
+
+## Coupon [/coupons/{id}]
+A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
+
+### Retrieve a Coupon [GET]
+Retrieves the coupon with the given ID.
+
+ Response 200 (application/json)
+
+    + Attributes (object)
+        + id: 250FF (string)
+        + created: 1415203908 (number) - Time stamp
+        + percent_off: 25 (number)
+
+            A positive integer between 1 and 100 that represents the discount the coupon will apply.
+
+        + redeem_by (number) - Date after which the coupon can no longer be redeemed
+
+    + Body
+
+            {
+                "id": "250FF",
+                "created": 1415203908,
+                "percent_off": 25,
+                "redeem_by:" null
+            }
--- a/Blueprint/simple.apib
+++ b/Blueprint/simple.apib
@@ -0,0 +1,18 @@
+FORMAT: 1A
+
+# The Simplest API
+This is one of the simplest APIs written in the **API Blueprint**.
+One plain resource combined with a method and that's it! We will explain what is going on in the next installment - [Resource and Actions](02.%20Resource%20and%20Actions.md).
+
+**Note:** As we progress through the examples, do not also forget to view the [Raw](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md) code to see what is really going on in the API Blueprint, as opposed to just seeing the output of the Github Markdown parser.
+
+Also please keep in mind that every single example in this course is a **real API Blueprint** and as such you can **parse** it with the [API Blueprint parser](https://github.com/apiaryio/drafter) or one of its [bindings](https://github.com/apiaryio/drafter#bindings).
+
+## API Blueprint
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md)
+ [Next: Resource and Actions](02.%20Resource%20and%20Actions.md)
+
+# GET /message
+ Response 200 (text/plain)
+
+        Hello World!
--- a/samples/ApacheConf/apache.vhost
+++ b/samples/ApacheConf/apache.vhost
@@ -0,0 +1,17 @@
+#######################
+# HOSTNAME
+######################
+
+<VirtualHost 127.0.0.1:PORT>
+    ServerAdmin patrick@heysparkbox.com
+    DocumentRoot "/var/www/HOSTNAME"
+    ServerName HOSTNAME
+
+    <Directory "/var/www/HOSTNAME">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride All
+       Order allow,deny
+       Allow from all
+       DirectoryIndex index.php
+   </Directory>
+</VirtualHost>
--- a/samples/AsciiDoc/list.asc
+++ b/samples/AsciiDoc/list.asc
@@ -1,6 +1,9 @@
 AsciiDoc Home Page
 ==================

+Title
+-----
+
 Example Articles
 ~~~~~~~~~~~~~~~~
 - Item 1
--- a/samples/Assembly/fp_sqr32_160_comba.inc
+++ b/samples/Assembly/fp_sqr32_160_comba.inc
@@ -0,0 +1,245 @@
+
+    push r2
+    dint
+    nop
+    bis #MPYDLYWRTEN,&MPY32CTL0
+    bic #MPYDLY32,&MPY32CTL0
+    mov #SUMEXT,r13
+    clr r12
+
+    mov @r15+,r4
+    mov @r15+,r5
+
+    mov @r15+,r6
+    mov @r15+,r7
+
+    mov @r15+,r8
+    mov @r15+,r9
+
+    mov @r15+,r10
+    mov @r15+,r11
+
+    sub #2*8,r15
+
+    /* SELF_STEP_FIRST */
+    mov r4,&MPY32L
+    mov r5,&MPY32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*0(r14)
+    mov &RES1,2*(0+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r6,&OP2L
+    mov r7,&OP2H
+    add &SUMEXT,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*2(r14)
+    add @r13,r12
+    mov &RES1,2*(2+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* SELF_STEP */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*4(r14)
+    add @r13,r12
+    mov &RES1,2*(4+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*6(r14)
+    add @r13,r12
+    mov &RES1,2*(6+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+    add &SUMEXT,r12
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* SELF_STEP */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*8(r14)
+    add @r13,r12
+    mov &RES1,2*(8+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    mov 2*8(r15),r4
+    mov 2*(8+1)(r15),r5
+
+    /* STEP_1 */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* STEP_2MORE */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*10(r14)
+    add @r13,r12
+    mov &RES1,2*(10+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* SELF_STEP */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*12(r14)
+    add @r13,r12
+    mov &RES1,2*(12+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*14(r14)
+    add @r13,r12
+    mov &RES1,2*(14+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* SELF_STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*16(r14)
+    add @r13,r12
+    mov &RES1,2*(16+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* END */
+    mov &RES0,2*18(r14)
+    mov &RES1,2*(18+1)(r14)
+    pop r2
+    eint
--- a/samples/Assembly/lib.inc
+++ b/samples/Assembly/lib.inc
@@ -0,0 +1,170 @@
+
+; ------------------------------------------------------------------------
+; 显示 AL 中的数字
+; ------------------------------------------------------------------------
+DispAL:
+	push	ecx
+	push	edx
+	push	edi
+
+	mov	edi, [dwDispPos]
+
+	mov	ah, 0Fh			; 0000b: 黑底    1111b: 白字
+	mov	dl, al
+	shr	al, 4
+	mov	ecx, 2
+.begin:
+	and	al, 01111b
+	cmp	al, 9
+	ja	.1
+	add	al, '0'
+	jmp	.2
+.1:
+	sub	al, 0Ah
+	add	al, 'A'
+.2:
+	mov	[gs:edi], ax
+	add	edi, 2
+
+	mov	al, dl
+	loop	.begin
+	;add	edi, 2
+
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	edx
+	pop	ecx
+
+	ret
+; DispAL 结束-------------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 显示一个整形数
+; ------------------------------------------------------------------------
+DispInt:
+	mov	eax, [esp + 4]
+	shr	eax, 24
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 16
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 8
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	call	DispAL
+
+	mov	ah, 07h			; 0000b: 黑底    0111b: 灰字
+	mov	al, 'h'
+	push	edi
+	mov	edi, [dwDispPos]
+	mov	[gs:edi], ax
+	add	edi, 4
+	mov	[dwDispPos], edi
+	pop	edi
+
+	ret
+; DispInt 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 显示一个字符串
+; ------------------------------------------------------------------------
+DispStr:
+	push	ebp
+	mov	ebp, esp
+	push	ebx
+	push	esi
+	push	edi
+
+	mov	esi, [ebp + 8]	; pszInfo
+	mov	edi, [dwDispPos]
+	mov	ah, 0Fh
+.1:
+	lodsb
+	test	al, al
+	jz	.2
+	cmp	al, 0Ah	; 是回车吗?
+	jnz	.3
+	push	eax
+	mov	eax, edi
+	mov	bl, 160
+	div	bl
+	and	eax, 0FFh
+	inc	eax
+	mov	bl, 160
+	mul	bl
+	mov	edi, eax
+	pop	eax
+	jmp	.1
+.3:
+	mov	[gs:edi], ax
+	add	edi, 2
+	jmp	.1
+
+.2:
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	esi
+	pop	ebx
+	pop	ebp
+	ret
+; DispStr 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 换行
+; ------------------------------------------------------------------------
+DispReturn:
+	push	szReturn
+	call	DispStr			;printf("\n");
+	add	esp, 4
+
+	ret
+; DispReturn 结束---------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 内存拷贝，仿 memcpy
+; ------------------------------------------------------------------------
+; void* MemCpy(void* es:pDest, void* ds:pSrc, int iSize);
+; ------------------------------------------------------------------------
+MemCpy:
+	push	ebp
+	mov	ebp, esp
+
+	push	esi
+	push	edi
+	push	ecx
+
+	mov	edi, [ebp + 8]	; Destination
+	mov	esi, [ebp + 12]	; Source
+	mov	ecx, [ebp + 16]	; Counter
+.1:
+	cmp	ecx, 0		; 判断计数器
+	jz	.2		; 计数器为零时跳出
+
+	mov	al, [ds:esi]		; ┓
+	inc	esi			; ┃
+					; ┣ 逐字节移动
+	mov	byte [es:edi], al	; ┃
+	inc	edi			; ┛
+
+	dec	ecx		; 计数器减一
+	jmp	.1		; 循环
+.2:
+	mov	eax, [ebp + 8]	; 返回值
+
+	pop	ecx
+	pop	edi
+	pop	esi
+	mov	esp, ebp
+	pop	ebp
+
+	ret			; 函数结束，返回
+; MemCpy 结束-------------------------------------------------------------
+
--- a/samples/Assembly/macros.inc
+++ b/samples/Assembly/macros.inc
@@ -0,0 +1,321 @@
+BLARGG_MACROS_INCLUDED = 1
+
+; Allows extra error checking with modified version
+; of ca65. Otherwise acts like a constant of 0.
+ADDR = 0
+
+; Switches to Segment and places Line there.
+; Line can be an .align directive, .res, .byte, etc.
+; Examples:
+; seg_data BSS, .align 256
+; seg_data RODATA, {message: .byte "Test",0}
+.macro seg_data Segment, Line
+	.pushseg
+	.segment .string(Segment)
+		Line
+	.popseg
+.endmacro
+
+; Reserves Size bytes in Segment for Name.
+; If Size is omitted, reserves one byte.
+.macro seg_res Segment, Name, Size
+	.ifblank Size
+		seg_data Segment, Name: .res 1
+	.else
+		seg_data Segment, Name: .res Size
+	.endif
+.endmacro
+
+; Shortcuts for zeropage, bss, and stack
+.define zp_res  seg_res ZEROPAGE,
+.define nv_res  seg_res NVRAM,
+.define bss_res seg_res BSS,
+.define sp_res  seg_res STACK,
+.define zp_byte zp_res
+
+; Copies byte from Src to Addr. If Src begins with #,
+; it sets Addr to the immediate value.
+; Out: A = byte copied
+; Preserved: X, Y
+.macro mov Addr, Src
+	lda Src
+	sta Addr
+.endmacro
+
+; Copies word from Src to Addr. If Src begins with #,
+; it sets Addr the immediate value.
+; Out: A = high byte of word
+; Preserved: X, Y
+.macro movw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		lda #<(.right( .tcount( {Src} )-1, {Src} ))
+		sta Addr
+		lda #>(.right( .tcount( {Src} )-1, {Src} ))
+		sta 1+(Addr)
+	.else
+		lda Src
+		sta Addr
+		lda 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+
+; Increments 16-bit value at Addr.
+; Out: EQ/NE based on resulting 16-bit value
+; Preserved: A, X, Y
+.macro incw Addr
+	.local @Skip
+	inc Addr
+	bne @Skip
+	inc 1+(Addr)
+@Skip:
+.endmacro
+
+; Adds Src to word at Addr.
+; Out: A = high byte of result, carry set appropriately
+; Preserved: X, Y
+.macro addw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		addw_ Addr,(.right( .tcount( {Src} )-1, {Src} ))
+	.else
+		lda Addr
+		clc
+		adc Src
+		sta Addr
+		
+		lda 1+(Addr)
+		adc 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+.macro addw_ Addr, Imm
+	lda Addr
+	clc
+	adc #<Imm
+	sta Addr
+	
+	;.if (Imm >> 8) <> 0
+		lda 1+(Addr)
+		adc #>Imm
+		sta 1+(Addr)
+	;.else
+	;   .local @Skip
+	;   bcc @Skip
+	;   inc 1+(Addr)
+	;@Skip:
+	;.endif
+.endmacro
+
+; Splits list of words into tables of low and high bytes
+; Example: split_words foo, {$1234, $5678}
+; expands to:
+; foo_l: $34, $78
+; foo_h: $12, $56
+; foo_count = 2
+.macro split_words Label, Words
+	.ident (.concat (.string(Label), "_l")): .lobytes Words
+	.ident (.concat (.string(Label), "_h")): .hibytes Words
+	.ident (.concat (.string(Label), "_count")) = * - .ident (.concat (.string(Label), "_h"))
+.endmacro
+
+.macro SELECT Bool, True, False, Extra
+	.ifndef Bool
+		False Extra
+	.elseif Bool <> 0
+		True Extra
+	.else
+		False Extra
+	.endif
+.endmacro
+
+.macro DEFAULT Name, Value
+	.ifndef Name
+		Name = Value
+	.endif
+.endmacro
+
+.ifp02
+	; 6502 doesn't define these alternate names
+	.define blt bcc
+	.define bge bcs
+.endif
+.define jlt jcc
+.define jge jcs
+
+; Jxx Target = Bxx Target, except it can go farther than
+; 128 bytes. Implemented via branch around a JMP.
+
+; Don't use ca65's longbranch, because they fail for @labels
+;.macpack longbranch
+
+.macro jeq Target
+	bne *+5
+	jmp Target
+.endmacro
+
+.macro jne Target
+	beq *+5
+	jmp Target
+.endmacro
+
+.macro jmi Target
+	bpl *+5
+	jmp Target
+.endmacro
+
+.macro jpl Target
+	bmi *+5
+	jmp Target
+.endmacro
+
+.macro jcs Target
+	bcc *+5
+	jmp Target
+.endmacro
+
+.macro jcc Target
+	bcs *+5
+	jmp Target
+.endmacro
+
+.macro jvs Target
+	bvc *+5
+	jmp Target
+.endmacro
+
+.macro jvc Target
+	bvs *+5
+	jmp Target
+.endmacro
+
+
+; Passes constant data to routine in addr
+; Preserved: A, X, Y
+.macro jsr_with_addr routine,data
+	.local Addr
+	pha
+	lda #<Addr
+	sta addr
+	lda #>Addr
+	sta addr+1
+	pla
+	jsr routine
+	seg_data RODATA,{Addr: data}
+.endmacro
+
+; Calls routine multiple times, with A having the
+; value 'start' the first time, 'start+step' the
+; second time, up to 'end' for the last time.
+.macro for_loop routine,start,end,step
+	.local @for_loop
+	lda #start
+@for_loop:
+	pha
+	jsr routine
+	pla
+	clc
+	adc #step
+	cmp #<((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Calls routine n times. The value of A in the routine
+; counts from 0 to n-1.
+.macro loop_n_times routine,n
+	for_loop routine,0,n-1,+1
+.endmacro
+
+; Same as for_loop, except uses 16-bit value in YX.
+; -256 <= step <= 255
+.macro for_loop16 routine,start,end,step
+.if (step) < -256 || (step) > 255
+	.error "Step must be within -256 to 255"
+.endif
+	.local @for_loop_skip
+	.local @for_loop
+	ldy #>(start)
+	lda #<(start)
+@for_loop:
+	tax
+	pha
+	tya
+	pha
+	jsr routine
+	pla
+	tay
+	pla
+	clc
+	adc #step
+.if (step) > 0
+	bcc @for_loop_skip
+	iny
+.else
+	bcs @for_loop_skip
+	dey
+.endif
+@for_loop_skip:
+	cmp #<((end)+(step))
+	bne @for_loop
+	cpy #>((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Stores byte at addr
+; Preserved: X, Y
+.macro setb addr, byte
+	lda #byte
+	sta addr
+.endmacro
+
+; Stores word at addr
+; Preserved: X, Y
+.macro setw addr, word
+	lda #<(word)
+	sta addr
+	lda #>(word)
+	sta addr+1
+.endmacro
+
+; Loads XY with 16-bit immediate or value at address
+.macro ldxy Arg
+	.if .match( .left( 1, {Arg} ), # )
+		ldy #<(.right( .tcount( {Arg} )-1, {Arg} ))
+		ldx #>(.right( .tcount( {Arg} )-1, {Arg} ))
+	.else
+		ldy (Arg)
+		ldx (Arg)+1
+	.endif
+.endmacro
+
+; Increments XY as 16-bit register, in CONSTANT time.
+; Z flag set based on entire result.
+; Preserved: A
+; Time: 7 clocks
+.macro inxy
+	iny ; 2
+	beq *+4 ; 3
+		; -1
+	bne *+3 ; 3
+		; -1
+	inx ; 2
+.endmacro
+
+; Negates A and adds it to operand
+.macro subaf Operand
+	eor #$FF
+	sec
+	adc Operand
+.endmacro
+
+; Initializes CPU registers to reasonable values
+; Preserved: A, Y
+.macro init_cpu_regs
+	sei
+	cld     ; unnecessary on NES, but might help on clone
+	ldx #$FF
+	txs
+	.ifndef BUILD_NSF
+		inx
+		stx PPUCTRL
+	.endif
+.endmacro
--- a/samples/Brainfuck/factor.b
+++ b/samples/Brainfuck/factor.b
@@ -0,0 +1,195 @@
+* factor an arbitrarily large positive integer
+*
+* Copyright (C) 1999 by Brian Raiter
+* under the GNU General Public License
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>-
+
+*
+* read in the number
+*
+
+<<<<<<<<<+
+[-[>>>>>>>>>>][-]<<<<<<<<<<[[->>>>>>>>>>+<<<<<<<<<<]<<<<<<<<<<]
+  >>>>>>>>>>,----------]
+>>>>>>>>>>[------------------------------------->>>>>>>>>->]
+<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+
+*
+* display the number and initialize the loop variable to two
+*
+
+[>++++++++++++++++++++++++++++++++++++++++++++++++.
+  ------------------------------------------------<<<<<<<<<<<]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+--------------------------.[-]
+>>>>>>>>>>>>++<<<<+
+
+*
+* the main loop
+*
+
+[ [-]>>
+
+  *
+  * make copies of the number and the loop variable
+  *
+
+  [>>>>[-]>[-]>[-]>[-]
+    >[-]>[-]
+    <<<<<<<[->>>+>+<<<<]>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<+>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+  [>[->>>+>>+<<<<<]>>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+
+  *
+  * divide the number by the loop variable
+  *
+
+  [>>>[-]>>>[-]>[-]>>>]                                  initialize
+  <<<<<<<<<<[<<<<<<<<<<]
+  >>>>>>>>>[-]>>>>>>>+<<<<<<<<[+]+
+  [ ->>                               double divisor until above dividend
+    [>>>>>>[->++<]>>>>]<<<<<<<<<<
+    [>>>>>>>>[-]>[-]
+       <<<<[->>>++<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [->--------->>>>>>>>>+<<<<<<<<<<[->+<]]]]]]]]]]]>>]
+    <<<<<<<<<<[>>>>>>>>>[-<+<<<+>>>>]<<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>
+            [-<--------->>>>>>>>>>>+<<<<<<<<<<[-<+>]]]]]]]]]]]>>>]
+    <<<<<<<<<<
+    [>>>>[->>>+>>+<<<<<]<<<<<<<<<<<<<<]
+    >>>>>>>>>>[>>>>>>>[-<<<+>>>]>>>]<<<<<<<<<<
+    [>>>>>>>>[->-<]>
+      [<<<<<<<<<[<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<<]
+        >>>>>>>>>>>>>>>>>>>]
+      <<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>[+[+[+[+[+[+[+[+[+[+[[-]<+>]]]]]]]]]]]<
+  ]
+  >>>>>>>>
+  [                                   subtract divisor from dividend
+    <<<<<<
+    [>>>>>>>>[-]>[-]<<<<<[->>>+>+<<<<]>>>>>>]<<<<<<<<<<
+    [>>>>>>>>[-<<<<+>>>>]<<<[->>>+>+<<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>>[-<<<<+>>>>]>]<<<<<<<<<<
+    [>>>>>>>>[-<->]<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [++++++++++[+>-<]>>>>>>>>>>-<<<<<<<<<<]]]]]]]]]]]>>>]
+    >>>>>>>+
+    [                                 if difference is nonnegative then
+      [-]<<<<<<<<<<<<<<<<<            replace dividend and increment quotient
+      [>>>>[-]>>>>[-<<<<+>>>>]<<[->>+<<]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>[->+<<<+>>]>>]<<<<<<<<<<
+      [>>>[->>>>>>+<<<<<<]<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>>[-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<--------->>>>>>>>>>>>>>>>+<<<<<<<<<<
+                [-<<<<<<+>>>>>>]]]]]]]]]]]>]
+      >>>>>>>
+    ]                                 halve divisor and loop until zero
+    <<<<<<<<<<<<<<<<<[<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[-]<<[->+<]<[->>>+<<<]>>>>>]<<<<<<<<<<
+    [+>>>>>>>[-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>]]]]]]]]]<<<<<<<
+             [->>>>>>>+<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>
+    [-<<<<<<<<<<<+>>>>>>>>>>>]
+      >>>[>>>>>>>[-<<<<<<<<<<<+++++>>>>>>>>>>>]>>>]<<<<<<<<<<
+    [+>>>>>>>>[-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>]]]]]]]]]<<<<<<<<
+              [->>>>>>>>+<<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>>[-<<<<<<<<<<<<<+>>>>>>>>>>>>>]>>
+    [>>>>>>>>[-<<<<<<<<<<<<<+++++>>>>>>>>>>>>>]>>]<<<<<<<<<<
+    [<<<<<<<<<<]>>>>>>>>>>
+    >>>>>>
+  ]
+  <<<<<<
+
+  *
+  * make copies of the loop variable and the quotient
+  *
+
+  [>>>[->>>>+>+<<<<<]>>>>>>>]
+  <<<<<<<<<<
+  [>>>>>>>[-<<<<+>>>>]<<<<<[->>>>>+>>+<<<<<<<]<<<<<<<<<<<<]
+  >>>>>>>>>>[>>>>>>>[-<<<<<+>>>>>]>>>]<<<<<<<<<<
+
+  *
+  * break out of the loop if the quotient is larger than the loop variable
+  *
+
+  [>>>>>>>>>[-<->]<
+    [<<<<<<<<
+      [<<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+  >>>>>>>>[>-<[+[+[+[+[+[+[+[+[+[[-]>+<]]]]]]]]]]]>+
+
+  [ [-]
+
+    *
+    * partially increment the loop variable
+    *
+
+    <[-]+>>>>+>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<
+
+    *
+    * examine the remainder for nonzero digits
+    *
+
+    [<<<<<<[<<<<[<<<<<<<<<<]>>>>+<<<<<<<<<<]<<<<]
+    >>>>>>>>>>>>>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<[<<<<<<<<<<]
+    >>>>-
+
+    [ [+]
+
+      *
+      * decrement the loop variable and replace the number with the quotient
+      *
+
+      >>>>>>>>-<<[>[-]>>[-<<+>>]>>>>>>>]<<<<<<<<<<
+
+      *
+      * display the loop variable
+      *
+
+      [+>>[>>>>>>>>+>>]<<-<<<<<<<<<<]-
+      [>>++++++++++++++++++++++++++++++++++++++++++++++++.
+         ------------------------------------------------<<<<<<<<<<<<]
+      ++++++++++++++++++++++++++++++++.[-]>>>>
+
+    ]
+
+    *
+    * normalize the loop variable
+    *
+
+    >>>>>>
+    [>>[->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>--------->>>>>+<<<<<<<<<<
+       [->>>>>+<<<<<]]]]]]]]]]]>>>>>>>>]
+    <<<<<<<<<<[>>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>
+
+  ]<
+
+]>>
+
+*
+* display the number and end
+*
+
+[>>>>>>>>>>]<<<<<<<<<<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+[>++++++++++++++++++++++++++++++++++++++++++++++++.<<<<<<<<<<<]
++++++++++.
--- a/samples/C#/build.cake
+++ b/samples/C#/build.cake
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+///////////////////////////////////////////////////////////////////////////////
+
+var target = Argument<string>("target", "Default");
+var configuration = Argument<string>("configuration", "Release");
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBAL VARIABLES
+///////////////////////////////////////////////////////////////////////////////
+
+var solutions = GetFiles("./**/*.sln");
+var solutionPaths = solutions.Select(solution => solution.GetDirectory());
+
+///////////////////////////////////////////////////////////////////////////////
+// SETUP / TEARDOWN
+///////////////////////////////////////////////////////////////////////////////
+
+Setup(() =>
+{
+    // Executed BEFORE the first task.
+    Information("Running tasks...");
+});
+
+Teardown(() =>
+{
+    // Executed AFTER the last task.
+    Information("Finished running tasks.");
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TASK DEFINITIONS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Clean")
+    .Does(() =>
+{
+    // Clean solution directories.
+    foreach(var path in solutionPaths)
+    {
+        Information("Cleaning {0}", path);
+        CleanDirectories(path + "/**/bin/" + configuration);
+        CleanDirectories(path + "/**/obj/" + configuration);
+    }
+});
+
+Task("Restore")
+    .Does(() =>
+{
+    // Restore all NuGet packages.
+    foreach(var solution in solutions)
+    {
+        Information("Restoring {0}...", solution);
+        NuGetRestore(solution);
+    }
+});
+
+Task("Build")
+    .IsDependentOn("Clean")
+    .IsDependentOn("Restore")
+    .Does(() =>
+{
+    // Build all solutions.
+    foreach(var solution in solutions)
+    {
+        Information("Building {0}", solution);
+        MSBuild(solution, settings => 
+            settings.SetPlatformTarget(PlatformTarget.MSIL)
+                .WithProperty("TreatWarningsAsErrors","true")
+                .WithTarget("Build")
+                .SetConfiguration(configuration));
+    }
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TARGETS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Default")
+    .IsDependentOn("Build");
+
+///////////////////////////////////////////////////////////////////////////////
+// EXECUTION
+///////////////////////////////////////////////////////////////////////////////
+
+RunTarget(target);
--- a/samples/C++/ClasspathVMSystemProperties.inc
+++ b/samples/C++/ClasspathVMSystemProperties.inc
@@ -0,0 +1,57 @@
+//===- ClasspathVMSystem/Properties.cpp -----------------------------------===//
+//===--------------------- GNU classpath gnu/classpath/VMSystemProperties -===//
+//
+//                            The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <sys/utsname.h>
+
+#include "types.h"
+
+#include "Classpath.h"
+#include "JavaArray.h"
+#include "JavaClass.h"
+#include "JavaObject.h"
+#include "JavaThread.h"
+#include "JavaUpcalls.h"
+#include "Jnjvm.h"
+
+#include "SetProperties.inc"
+
+using namespace j3;
+
+extern "C" {
+
+
+JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(
+#ifdef NATIVE_JNI
+JNIEnv *env,
+jclass clazz,
+#endif
+JavaObject* prop) {
+  
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+extern "C" void Java_gnu_classpath_VMSystemProperties_postInit__Ljava_util_Properties_2(JavaObject* prop) {
+
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setCommandLineProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+}
--- a/samples/C++/initClasses.inc
+++ b/samples/C++/initClasses.inc
--- a/samples/C++/instances.inc
+++ b/samples/C++/instances.inc
@@ -0,0 +1,34 @@
+#include "QPBO.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4661)
+#endif
+
+// Instantiations
+
+template class QPBO<int>;
+template class QPBO<float>;
+template class QPBO<double>;
+
+template <> 
+	inline void QPBO<int>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "int";
+	type_format = "d";
+}
+
+template <> 
+	inline void QPBO<float>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "float";
+	type_format = "f";
+}
+
+template <> 
+	inline void QPBO<double>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "double";
+	type_format = "Lf";
+}
+
+
--- a/samples/Chapel/distributions.chpl
+++ b/samples/Chapel/distributions.chpl
@@ -58,6 +58,34 @@ var BA: [BlockSpace] int;
 forall ba in BA do
  ba = here.id;

+//
+// The 'hasSingleLocalSubdomain' method on arrays will return true if the 
+// index set for a locale can be represented by a single domain.
+//
+if !BA.hasSingleLocalSubdomain() then
+  halt("For a Block distribution, the index set per locale should be \
+      represented by a single domain");
+
+//
+// If the distribution's subdomains can be represented as single subdomain,
+// we can use the 'localSubdomain' method to get the index set for the 
+// current locale.
+//
+// Below, we'll use the index set to confirm that the array elements have the 
+// correct locale id.
+//
+
+for L in Locales {
+  on L {
+    const indices = BA.localSubdomain();
+    for i in indices {
+      if BA[i] != L.id then
+        halt("Error: incorrect locale id");
+    }
+  }
+}
+
+
 //
 // Output the Block-distributed array to visually see how the elements
 // are partitioned across the locales.
@@ -104,6 +132,14 @@ writeln("Block Array Index Map");
 writeln(BA2);
 writeln();

+//
+// We can use the 'targetLocales' method available on an array to get the
+// locales array used as targets.
+//
+for (L, ML) in zip(BA2.targetLocales(), MyLocales) do
+  if L != ML then
+    halt("Error: BA2.targetLocales() should equal MyLocales");
+


 //
@@ -126,6 +162,18 @@ writeln("Cyclic Array Index Map");
 writeln(CA);
 writeln();

+//
+// The domain returned by 'localSubdomain' need not be a dense block, as is
+// the case for the Cyclic Distribution.
+//
+on Locales[0] {
+  const indices = CA.localSubdomain();
+  for i in indices {
+    if CA[i] != 0 then
+      halt("Error: Cyclic array values on Locale 0 should be zero");
+  }
+}
+

 //
 // Next, we'll declare a Block-Cyclic distribution.  These
@@ -134,7 +182,7 @@ writeln();
 // of indices.  Thus, the BlockCyclic distribution is parameterized
 // by a starting index (as with Cyclic) and a block size (per
 // dimension) specifying how large the chunks to be dealt out are.
-// 
+//
 const BlkCycSpace = Space dmapped BlockCyclic(startIdx=Space.low, 
                                              blocksize=(2, 3));
 var BCA: [BlkCycSpace] int;
@@ -146,6 +194,46 @@ writeln("Block-Cyclic Array Index Map");
 writeln(BCA);
 writeln();

+//
+// A locale's index set for a Block-Cyclic distribution cannot be represented
+// by a single subdomain.
+//
+if BCA.hasSingleLocalSubdomain() then
+  halt("A Block-Cyclic index set cannot be represented by a single subdomain");
+
+//
+// If the local index set cannot be represented by a single subdomain, 
+// we can use the 'localSubdomains' iterator to yield a number of domains
+// that represent the whole index set.
+//
+// Let's write a function that will use 'localSubdomains' to verify the 
+// correctness of the array values.
+//
+
+proc verifyID(Data: []) {
+  for L in Locales {
+    on L {
+      for indices in Data.localSubdomains() {
+        for i in indices {
+          if Data[i] != L.id then
+            halt("Error: incorrect locale id");
+        }
+      }
+    }
+  }
+}
+verifyID(BCA);
+
+//
+// The 'localSubdomains' iterator is also available on distributions that
+// can represent a locale's index set with a single domain. This allows us to
+// write more general code that will work for all distributions.
+//
+// This means that we can call the 'verifyID' function on any array, like the
+// 'BA' array from earlier.
+//
+verifyID(BA);
+

 //
 // The ReplicatedDist distribution is different: each of the
--- a/samples/Chapel/lulesh.chpl
+++ b/samples/Chapel/lulesh.chpl
@@ -292,14 +292,14 @@ proc main() {
    LagrangeLeapFrog();

    if debug {
-      //      deprint("[[ Forces ]]", fx, fy, fz);
+      deprintatomic("[[ Forces ]]", fx, fy, fz);
      deprint("[[ Positions ]]", x, y, z);
      deprint("[[ p, e, q ]]", p, e, q);
    }
    if showProgress then
-      writeln("time = ", format("%e", time), ", dt=", format("%e", deltatime),
-              if doTiming then ", elapsed = " + (getCurrentTime()-iterTime) 
-                          else "");
+      writef("time = %er, dt=%er, %s", time, deltatime,
+             if doTiming then ", elapsed = " + (getCurrentTime()-iterTime) +"\n"
+                         else "\n");
  }
  if (cycle == maxcycles) {
    writeln("Stopped early due to reaching maxnumsteps");
@@ -314,12 +314,10 @@ proc main() {
  if printCoords {
    var outfile = open("coords.out", iomode.cw);
    var writer = outfile.writer();
-    var fmtstr = if debug then "%1.9e" else "%1.4e";
-    for i in Nodes {
-      writer.writeln(format(fmtstr, x[i]), " ", 
-                     format(fmtstr, y[i]), " ", 
-                     format(fmtstr, z[i]));
-    }
+    var fmtstr = if debug then "%1.9re %1.9er %1.9er\n" 
+                          else "%1.4er %1.4er %1.4er\n";
+    for i in Nodes do
+      writer.writef(fmtstr, x[i], y[i], z[i]);
    writer.close();
    outfile.close();
  }
@@ -479,7 +477,7 @@ inline proc localizeNeighborNodes(eli: index(Elems),
                                  y: [] real, ref y_local: 8*real,
                                  z: [] real, ref z_local: 8*real) {

-  for param i in 1..nodesPerElem {
+  for i in 1..nodesPerElem {
    const noi = elemToNode[eli][i];

    x_local[i] = x[noi];
@@ -670,7 +668,7 @@ proc SumElemStressesToNodeForces(b_x: 8*real, b_y: 8*real, b_z: 8*real,
                                 ref fx: 8*real,
                                 ref fy: 8*real,
                                 ref fz: 8*real) {
-  for param i in 1..8 {
+  for i in 1..8 {
    fx[i] = -(stress_xx * b_x[i]);
    fy[i] = -(stress_yy * b_y[i]);
    fz[i] = -(stress_zz * b_z[i]);
@@ -725,17 +723,17 @@ inline proc CalcElemFBHourglassForce(xd: 8*real, yd: 8*real, zd: 8*real,
  var hx, hy, hz: 4*real;

  // reduction
-  for param i in 1..4 {
-    for param j in 1..8 {
+  for i in 1..4 {
+    for j in 1..8 {
      hx[i] += hourgam[j][i] * xd[j];
      hy[i] += hourgam[j][i] * yd[j];
      hz[i] += hourgam[j][i] * zd[j];
    }
  }

-  for param i in 1..8 {
+  for i in 1..8 {
    var shx, shy, shz: real;
-    for param j in 1..4 {
+    for j in 1..4 {
      shx += hourgam[i][j] * hx[j];
      shy += hourgam[i][j] * hy[j];
      shz += hourgam[i][j] * hz[j];
@@ -1088,16 +1086,16 @@ proc CalcFBHourglassForceForElems(determ, x8n, y8n, z8n, dvdx, dvdy, dvdz) {

    /* TODO: Can we enable this local block? */
    // local {
-      for param i in 1..4 {
+      for i in 1..4 {
        var hourmodx, hourmody, hourmodz: real;
        // reduction
-        for param j in 1..8 {
+        for j in 1..8 {
          hourmodx += x8n[eli][j] * gammaCoef[i][j];
          hourmody += y8n[eli][j] * gammaCoef[i][j];
          hourmodz += z8n[eli][j] * gammaCoef[i][j];
        }

-        for param j in 1..8 {
+        for j in 1..8 {
          hourgam[j][i] = gammaCoef[i][j] - volinv * 
            (dvdx[eli][j] * hourmodx +
             dvdy[eli][j] * hourmody +
@@ -1221,7 +1219,7 @@ proc CalcKinematicsForElems(dxx, dyy, dzz, const dt: real) {
      arealg[k] = CalcElemCharacteristicLength(x_local, y_local, z_local,
                                               volume);

-      for param i in 1..8 {
+      for i in 1..8 {
        x_local[i] -= dt2 * xd_local[i];
        y_local[i] -= dt2 * yd_local[i];
        z_local[i] -= dt2 * zd_local[i];
@@ -1669,7 +1667,7 @@ proc CalcSoundSpeedForElems(vnewc, rho0:real, enewc, pnewc, pbvc, bvc) {


 iter elemToNodes(elem) {
-  for param i in 1..nodesPerElem do
+  for i in 1..nodesPerElem do
    yield elemToNode[elem][i];
 }
                                 
@@ -1679,14 +1677,19 @@ iter elemToNodesTuple(e) {
 }


-proc deprint(title:string, x:[?D] real, y:[D]real, z:[D]real) {
+proc deprint(title:string, x:[?D] real, y:[D] real, z:[D] real) {
  writeln(title);
-  for i in D {
-    writeln(format("%3d", i), ": ", 
-            format("%3.4e", x[i]), " ", 
-            format("%3.4e", y[i]), " ", 
-            format("%3.4e", z[i]));
-  }
+  for i in D do
+    writef("%3i: %3.4er %3.4er %3.4er\n", 
+           if use3DRepresentation then idx3DTo1D(i, D.dim(1).size) else i, 
+           x[i], y[i], z[i]);
 }


+proc deprintatomic(title:string, x:[?D] atomic real, y:[] atomic real, z:[] atomic real) {
+  writeln(title);
+  for i in D do
+    writef("%3i: %3.4er %3.4er %3.4er\n", 
+           if use3DRepresentation then idx3DTo1D(i, D.dim(1).size) else i, 
+           x[i].peek(), y[i].peek(), z[i].peek());
+}
--- a/samples/Charity/example.ch
+++ b/samples/Charity/example.ch
@@ -0,0 +1,6 @@
+%
+%   Some very badly written Charity
+%
+
+data LA(A) -> D = ss: A -> D
+                | ff: -> D.
--- a/samples/Clarion/CStringClass.clw
+++ b/samples/Clarion/CStringClass.clw
@@ -0,0 +1,172 @@
+      Member()
+         omit('***$***',_VER_C55)
+_ABCDllMode_  EQUATE(0)
+_ABCLinkMode_ EQUATE(1)
+         ***$***
+      Include('Equates.CLW'),ONCE
+      Include('Keycodes.CLW'),ONCE
+      Include('Errors.CLW'),ONCE
+      Map
+      End ! map
+      Include('CStringClass.inc'),ONCE
+CStringClass.Construct PROCEDURE                       ! Declare Procedure
+  CODE
+  SELF.bufferSize  = DEFAULT_CS_BUFFER_SIZE
+  SELF.CS         &= New(CSTRING(SELF.bufferSize))
+CStringClass.Destruct PROCEDURE                        ! Declare Procedure
+  CODE
+  Dispose(SELF.cs)
+CStringClass.Cat PROCEDURE  (STRING pStr) !,*CSTRING,PROC ! Declare Procedure
+newLen                       LONG,AUTO
+oldCS                        &CSTRING
+  CODE
+  newLen = Len(pStr)
+  IF (newLen+SELF.strLength+2) > SELF.newStrSize
+    ! Only grow the internal string if the result of the cat will be larger than the string currently is.
+    ! The reason for the "+2" is because this is used in the string slicing outside this IF. Without this matching +2 there is potential for an out of bounds slice which would be bad!
+
+    ! Save a temporary copy of the old string so we can us it in the concatination after we have grown it!
+    oldCS &= New(CSTRING(SELF.strLength+1))
+    oldCS = SELF.CS
+    Dispose(SELF.CS)
+
+    SELF.newStrSize = newLen + SELF.strLength + 1 + SELF.bufferSize
+    SELF.CS &= New(CSTRING(SELF.newStrSize))
+    SELF.CS = oldCS
+    Dispose(oldCS)
+  END
+
+  ! Append the new string directly to the end of the old one.
+  SELF.CS[SELF.strLength+1 : SELF.strLength+newLen] = pStr
+  ! And terminate the CSTRING manually
+  SELF.CS[SELF.strLength+newLen+1] = '<0>'
+
+  ! This is the same as doing "SELF.strLength = Len(SELF.CS)" but the Len() is _really_ slow on large strings. This is much faster!
+  SELF.strLength += newLen
+
+  ! This is what it used to be:
+  ! SELF.Str(SELF.Str() & s)
+  ! It is a nice and neat solution but performance, especially on large strings was terrible!
+
+  RETURN SELF.Str()
+CStringClass.Str PROCEDURE  (STRING pStr) !,*CSTRING, PROC   ! Declare Procedure
+  CODE
+  IF Len(pStr) > SELF.newStrSize
+    ! Only Dispose/New the internal string if the new one requires it.
+    ! This might be slightly innefficient in terms of memory usage when the string gets smaller
+    ! But it is _vasty_ better for performance when the string gets added to a lot.
+    Dispose(SELF.CS)
+    SELF.newStrSize = Len(pStr) + 1 + SELF.bufferSize
+    SELF.CS &= New(CSTRING(SELF.newStrSize))
+  END
+
+  SELF.CS        = pStr
+  SELF.strLength = Len(SELF.CS)
+
+  RETURN SELF.CS
+CStringClass.Len PROCEDURE  !,LONG                     ! Declare Procedure
+  CODE
+  RETURN SELF.strLength
+CStringClass.Replace PROCEDURE  (STRING pFind, STRING pReplace) !,*CSTRING,PROC ! Declare Procedure
+! FindString , ReplaceWith
+locate                       LONG,AUTO
+lastLocate                   LONG
+  CODE
+  LOOP
+    locate = InString(Upper(pFind), Upper(SELF.Str()), 1, lastLocate+1)
+    IF ~locate
+      BREAK
+    END
+
+    ! So we dont end up having recursive replacement.
+    lastLocate = locate + Len(pReplace)-1
+
+    SELF.Str(Sub(SELF.Str(), 1, locate-1)                  & |
+             pReplace                                      & |
+             Sub(SELF.Str(), locate+Len(pFind), SELF.Len())    |
+             )
+  END
+
+  RETURN SELF.Str()
+CStringClass.Str PROCEDURE  () !,*CSTRING              ! Declare Procedure 3
+  CODE
+  RETURN SELF.CS
+!------------------------------------------------------------------------------
+CStringClass.Contains PROCEDURE  (STRING pFind, BYTE pCaseSensitive=TRUE) !,BYTE ! Declare Procedure
+! Returns a value (TRUE) indicating whether the specified String occurs within this string.
+! Second parameter defaults to a case sensitive search.
+  CODE
+  IF pCaseSensitive = TRUE
+    IF InString(pFind, SELF.Str(), 1 , 1) > 0
+      RETURN TRUE
+    END
+  ELSE
+    IF InString(Lower(pFind), SELF.Lower(), 1 , 1) > 0
+      RETURN TRUE
+    END
+  END
+
+  RETURN FALSE
+CStringClass.Lower PROCEDURE  () !,STRING              ! Declare Procedure
+! Returns a "Lowered" version of the self.cs doesnt change the self.cs
+  CODE
+  RETURN Lower(SELF.CS)
+CStringClass.SubString PROCEDURE  (LONG pPosition, LONG pLength) !,STRING,PROC ! Declare Procedure
+  CODE
+  RETURN Sub(SELF.Str(), pPosition, pLength)
+CStringClass.ToLower PROCEDURE  () !,*CSTRING,PROC     ! Declare Procedure
+! Converts this string to lowercase and returns the converted string
+
+  CODE
+  RETURN SELF.Str(SELF.Lower())
+CStringClass.ToUpper PROCEDURE  () !,*CSTRING,PROC     ! Declare Procedure
+! Converts this string to uppercase and returns the converted string
+
+  CODE
+  RETURN SELF.Str(SELF.Upper())
+CStringClass.Trim PROCEDURE  () !,*CSTRING,PROC        ! Declare Procedure
+  CODE
+  SELF.Str(Left(SELF.Str()))
+  SELF.Str(Clip(SELF.Str()))
+  RETURN SELF.Str()
+CStringClass.Upper PROCEDURE  () !,STRING              ! Declare Procedure
+  CODE
+  RETURN Upper(SELF.Str())
+CStringClass.IndexOf PROCEDURE  (STRING pLookIn, BYTE pCaseSensitive=TRUE) !,LONG ! Declare Procedure
+! Returns the index of the first parameter (pLookIn) is found within the SELF.CS
+! zero if it is not found
+  CODE
+  IF pCaseSensitive = TRUE
+    RETURN InString(SELF.Str(), pLookIn, 1 , 1)
+  ELSE
+    RETURN InString(SELF.Lower(), Lower(pLookIn), 1 , 1)
+  END
+CStringClass.FoundIn PROCEDURE  (STRING pLookIn, BYTE pCaseSensitive=TRUE) !,BYTE ! Declare Procedure
+! Returns TRUE if the first parameter (pLookIn) is found within the SELF.CS
+! FALSE if it is no
+  CODE
+  IF SELF.IndexOf(pLookIn, pCaseSensitive) > 0
+    RETURN TRUE
+  ELSE
+    RETURN FALSE
+  END
+CStringClass.SetBuffer PROCEDURE  (LONG pNewBuffer)    ! Declare Procedure
+  CODE
+  SELF.bufferSize = pNewBuffer
+CStringClass.EscapeXml PROCEDURE  (<STRING pStr>) !,STRING ! Declare Procedure
+CS CStringClass
+  CODE
+  IF Omitted(pStr)=FALSE
+    CS.Str(pStr)
+  ELSE
+    ! Make a copy so we don't alter the original
+    CS.Str(SELF.Str())
+  END
+  CS.Replace('&', '&amp;')
+  CS.Replace('<', '&lt;')
+  CS.Replace('>', '&gt;')
+  CS.Replace('"', '&quot;')
+  CS.Replace('''', '&apos;')
+
+  RETURN CS.Str()
+
--- a/samples/Clarion/ConsoleSupport.clw
+++ b/samples/Clarion/ConsoleSupport.clw
@@ -0,0 +1,68 @@
+      Member()
+      Include('ConsoleSupport.inc'),ONCE
+	  Map
+        MODULE('32-bit Windows API')
+            ! General functions
+            GetLastError(),DWORD,PASCAL
+ 
+            ! Console functions
+            GetStdHandle(DWORD),HANDLE,PASCAL,PROC,RAW
+            WriteConsole(Handle,Long,Dword,long,long),bool,Raw,Pascal,name('WriteConsoleA')
+            ReadConsole(Handle,Long,Dword,long,long),bool,Raw,Pascal,name('ReadConsoleA')
+            SetConsoleTitle(Long),Bool,Raw,Pascal,name('SetConsoleTitleA')
+            GetConsoleTitle(Long,dword),Bool,Raw,Pascal,name('GetConsoleTitleA')
+            SetConsoleMode(Handle,dWord),BOOL,RAW,PASCAL
+            GetConsoleMode(Handle,Long),BOOL,RAW,PASCAL
+        End
+      End 
+      
+ConsoleSupport.Construct PROCEDURE
+
+  CODE
+
+ConsoleSupport.Destruct PROCEDURE
+
+  CODE
+
+ConsoleSupport.Init				   PROCEDURE () !,BYTE,VIRTUAL 
+  CODE
+
+    SELF.OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE)
+    If SELF.OutputHandle = INVALID_HANDLE_VALUE
+        Halt(1,'Unable to get output handle (' & GetLastError() & ')')
+        RETURN INVALID_HANDLE_VALUE
+    End
+ 
+    SELF.InputHandle = GetStdHandle(STD_INPUT_HANDLE)
+    if SELF.InputHandle = INVALID_HANDLE_VALUE
+        Halt(2,'Unable to get console input handle (' & GetLastError() & ')')
+        RETURN INVALID_HANDLE_VALUE
+    End
+ 
+    If ~SetConsoleMode(SELF.InputHandle,ENABLE_PROCESSED_INPUT )
+        Halt(3,'Unable to set console mode (' & GetLastError() & ')')
+        RETURN INVALID_OTHER
+    End
+
+    RETURN FALSE
+
+ConsoleSupport.WriteLine			   PROCEDURE (STRING pText) !,BYTE,PROC,VIRTUAL 
+  CODE
+    SELF.TextBuffer = SELF.Prefix & pText & '<13,10>'
+    If WriteConsole(SELF.OutputHandle, ADDRESS(SELF.TextBuffer), LEN(SELF.TextBuffer),ADDRESS(SELF.BytesWritten), NULL) = 0
+        Halt(4,'WriteConsoleError (' & GetLastError() & ')')
+        RETURN -1
+    End
+    RETURN FALSE
+
+Consolesupport.ReadKey  			   PROCEDURE () !,STRING,PROC,VIRTUAL 
+  CODE
+  SELF.WriteLine('Press any key to continue...')
+  Clear(SELF.InBuffer)
+  Loop
+    IF ReadConsole(SELF.InputHandle,Address(SELF.InBuffer),100,Address(SELF.BytesRead),NULL) = 0 THEN
+      Halt(5,'Error on read console (' & GetLastError() & ')')
+      Break
+    End
+  Until SELF.BytesRead > 0
+  RETURN SELF.InBuffer
--- a/samples/Clarion/HelloWorld.clw
+++ b/samples/Clarion/HelloWorld.clw
@@ -0,0 +1,10 @@
+  PROGRAM
+
+  MAP
+  END
+
+  CODE
+
+  MESSAGE('Hello World!')
+
+  RETURN
--- a/samples/Clarion/hello.clw
+++ b/samples/Clarion/hello.clw
@@ -0,0 +1,12 @@
+  MEMBER()
+  INCLUDE('HelloClass.inc'),ONCE
+  MAP
+  END
+
+HelloClass.Construct              PROCEDURE
+  CODE
+HelloClass.Destruct               PROCEDURE() !,VIRTUAL
+  CODE
+HelloClass.SayHello               PROCEDURE
+  CODE
+  MESSAGE('Hello World!')
--- a/samples/Click/sr2.click
+++ b/samples/Click/sr2.click
@@ -0,0 +1,133 @@
+rates :: AvailableRates
+elementclass sr2 {
+  $sr2_ip, $sr2_nm, $wireless_mac, $gateway, $probes|
+
+
+arp :: ARPTable();
+lt :: LinkTable(IP $sr2_ip);
+
+
+gw :: SR2GatewaySelector(ETHTYPE 0x062c,
+		      IP $sr2_ip,
+		      ETH $wireless_mac,
+		      LT lt,
+		      ARP arp,
+		      PERIOD 15,
+		      GW $gateway);
+
+
+gw -> SR2SetChecksum -> [0] output;
+
+set_gw :: SR2SetGateway(SEL gw);
+
+
+es :: SR2ETTStat(ETHTYPE 0x0641, 
+	      ETH $wireless_mac, 
+	      IP $sr2_ip, 
+	      PERIOD 30000,
+	      TAU 300000,
+	      ARP arp,
+	      PROBES $probes,
+	      ETT metric,
+	      RT rates);
+
+
+metric :: SR2ETTMetric(LT lt);
+
+
+forwarder :: SR2Forwarder(ETHTYPE 0x0643, 
+			      IP $sr2_ip, 
+			      ETH $wireless_mac, 
+			      ARP arp, 
+			      LT lt);
+
+
+querier :: SR2Querier(ETH $wireless_mac, 
+		     SR forwarder,
+		     LT lt, 
+		     ROUTE_DAMPENING true,
+		     TIME_BEFORE_SWITCH 5,
+		     DEBUG true);
+
+
+query_forwarder :: SR2MetricFlood(ETHTYPE 0x0644,
+			       IP $sr2_ip, 
+			       ETH $wireless_mac, 
+			       LT lt, 
+			       ARP arp,
+			       DEBUG false);
+
+query_responder :: SR2QueryResponder(ETHTYPE 0x0645,
+				    IP $sr2_ip, 
+				    ETH $wireless_mac, 
+				    LT lt, 
+				    ARP arp,
+				    DEBUG true);
+
+
+query_responder -> SR2SetChecksum -> [0] output;
+query_forwarder -> SR2SetChecksum -> SR2Print(forwarding) -> [0] output;
+query_forwarder [1] -> query_responder;
+
+data_ck :: SR2SetChecksum() 
+
+input [1] 
+-> host_cl :: IPClassifier(dst net $sr2_ip mask $sr2_nm,
+				-)
+-> querier
+-> data_ck;
+
+
+host_cl [1] -> [0] set_gw [0] -> querier;
+
+forwarder[0] 
+  -> dt ::DecIPTTL
+  -> data_ck
+  -> [2] output;
+
+
+dt[1] 
+-> Print(ttl-error) 
+-> ICMPError($sr2_ip, timeexceeded, 0) 
+-> querier;
+
+
+// queries
+querier [1] -> [1] query_forwarder;
+es -> SetTimestamp() -> [1] output;
+
+
+forwarder[1] //ip packets to me
+  -> SR2StripHeader()
+  -> CheckIPHeader()
+  -> from_gw_cl :: IPClassifier(src net $sr2_ip mask $sr2_nm,
+				-)
+  -> [3] output;
+
+from_gw_cl [1] -> [1] set_gw [1] -> [3] output;
+
+ input [0]
+   -> ncl :: Classifier(
+			12/0643 , //sr2_forwarder
+			12/0644 , //sr2
+			12/0645 , //replies
+			12/0641 , //sr2_es
+			12/062c , //sr2_gw
+			);
+ 
+ 
+ ncl[0] -> SR2CheckHeader() -> [0] forwarder;
+ ncl[1] -> SR2CheckHeader() -> PrintSR(query) -> query_forwarder
+ ncl[2] -> SR2CheckHeader() -> query_responder;
+ ncl[3] -> es;
+ ncl[4] -> SR2CheckHeader() -> gw;
+ 
+}
+
+
+
+Idle -> s :: sr2(2.0.0.1, 255.0.0.0, 00:00:00:00:00:01, false, "12 60 12 1500") -> Discard;
+Idle -> [1] s;
+s[1] -> Discard;
+s[2] -> Discard;
+s[3] -> Discard;
--- a/samples/Click/thomer-nat.click
+++ b/samples/Click/thomer-nat.click
@@ -0,0 +1,142 @@
+// This Click configuration implements a firewall and NAT, roughly based on the
+// mazu-nat.click example.
+//
+// This example assumes there is one interface that is IP-aliased.  In this
+// example, eth0 and eth0:0 have IP addresses 66.68.65.90 and 192.168.1.1,
+// respectively.  There is a local network, 192.168.1.0/24, and an upstream
+// gateway, 66.58.65.89.  Traffic from the local network is NATed.
+//
+// Connections can be initiated from the NAT box itself, also.
+// 
+// For bugs, suggestions, and, corrections, please email me.
+//
+// Author: Thomer M. Gil (click@thomer.com)
+
+AddressInfo(
+    eth0-in     192.168.1.1     192.168.1.0/24  00:0d:87:9d:1c:e9,
+    eth0-ex     66.58.65.90                     00:0d:87:9d:1c:e9,
+    gw-addr     66.58.65.89                     00:20:6f:14:54:c2
+);
+
+
+elementclass SniffGatewayDevice {
+  $device |
+  from :: FromDevice($device)
+    -> t1 :: Tee
+    -> output;
+  input -> q :: Queue(1024)
+    -> t2 :: PullTee
+    -> to :: ToDevice($device);
+  t1[1] -> ToHostSniffers;
+  t2[1] -> ToHostSniffers($device);
+  ScheduleInfo(from .1, to 1);
+}
+
+
+device :: SniffGatewayDevice(eth0);
+arpq_in :: ARPQuerier(eth0-in) -> device;
+ip_to_extern :: GetIPAddress(16)
+        -> CheckIPHeader
+        -> EtherEncap(0x800, eth0-ex, gw-addr)
+        -> device;
+ip_to_host :: EtherEncap(0x800, gw-addr, eth0-ex)
+        -> ToHost;
+ip_to_intern :: GetIPAddress(16)
+        -> CheckIPHeader
+        -> arpq_in;
+
+                 
+arp_class :: Classifier(
+        12/0806 20/0001,        // [0] ARP requests
+        12/0806 20/0002,        // [1] ARP replies to host
+        12/0800);               // [2] IP packets
+
+device -> arp_class;
+
+// ARP crap
+arp_class[0] -> ARPResponder(eth0-in, eth0-ex) -> device;
+arp_class[1] -> arp_t :: Tee;
+                arp_t[0] -> ToHost;
+                arp_t[1] -> [1]arpq_in;
+
+
+// IP packets
+arp_class[2] -> Strip(14)
+   -> CheckIPHeader
+   -> ipclass :: IPClassifier(dst host eth0-ex,
+                              dst host eth0-in,
+                              src net eth0-in);
+
+// Define pattern NAT
+iprw :: IPRewriterPatterns(NAT eth0-ex 50000-65535 - -);
+
+// Rewriting rules for UDP/TCP packets
+// output[0] rewritten to go into the wild
+// output[1] rewritten to come back from the wild or no match
+rw :: IPRewriter(pattern NAT 0 1,
+                 pass 1);
+
+// Rewriting rules for ICMP packets
+irw :: ICMPPingRewriter(eth0-ex, -);
+irw[0] -> ip_to_extern;
+irw[1] -> icmp_me_or_intern :: IPClassifier(dst host eth0-ex, -);
+          icmp_me_or_intern[0] -> ip_to_host;
+          icmp_me_or_intern[1] -> ip_to_intern;
+
+// Rewriting rules for ICMP error packets
+ierw :: ICMPRewriter(rw irw);
+ierw[0] -> icmp_me_or_intern;
+ierw[1] -> icmp_me_or_intern;
+
+
+// Packets directed at eth0-ex.
+// Send it through IPRewriter(pass).  If there was a mapping, it will be
+// rewritten such that dst is eth0-in:net, otherwise dst will still be for
+// eth0-ex.
+ipclass[0] -> [1]rw;
+
+// packets that were rewritten, heading into the wild world.
+rw[0] -> ip_to_extern;
+
+// packets that come back from the wild or are not part of an established
+// connection.
+rw[1] -> established_class :: IPClassifier(dst host eth0-ex,
+                                           dst net eth0-in);
+
+         // not established yet or returning packets for a connection that was
+         // established from this host itself.
+         established_class[0] ->
+           firewall :: IPClassifier(dst tcp port ssh,
+                                    dst tcp port smtp,
+                                    dst tcp port domain,
+                                    dst udp port domain,
+                                    icmp type echo-reply,
+                                    proto icmp,
+                                    port > 4095,
+                                    -);
+
+                                    firewall[0] -> ip_to_host; // ssh
+                                    firewall[1] -> ip_to_host; // smtp
+                                    firewall[2] -> ip_to_host; // domain (t)
+                                    firewall[3] -> ip_to_host; // domain (u)
+                                    firewall[4] -> [0]irw;     // icmp reply
+                                    firewall[5] -> [0]ierw;    // other icmp
+                                    firewall[6] -> ip_to_host; // port > 4095, probably for connection
+                                                               // originating from host itself
+                                    firewall[7] -> Discard;    // don't allow incoming for port <= 4095
+
+        // established connection
+        established_class[1] -> ip_to_intern;
+
+// To eth0-in.  Only accept from inside network.
+ipclass[1] -> IPClassifier(src net eth0-in) -> ip_to_host;
+
+// Packets from eth0-in:net either stay on local network or go to the wild.
+// Those that go into the wild need to go through the appropriate rewriting
+// element.  (Either UDP/TCP rewriter or ICMP rewriter.)
+ipclass[2] -> inter_class :: IPClassifier(dst net eth0-in, -);
+              inter_class[0] -> ip_to_intern;
+              inter_class[1] -> ip_udp_class :: IPClassifier(tcp or udp,
+                                                             icmp type echo);
+                                ip_udp_class[0] -> [0]rw;
+                                ip_udp_class[1] -> [0]irw;
--- a/samples/Clojure/build.boot
+++ b/samples/Clojure/build.boot
@@ -0,0 +1,15 @@
+;; from: https://github.com/boot-clj/boot#configure-task-options
+
+(set-env!
+  :source-paths #{"src"}
+  :dependencies '[[me.raynes/conch "0.8.0"]])
+
+(task-options!
+  pom {:project 'my-project
+       :version "0.1.0"}
+  jar {:manifest {"Foo" "bar"}})
+
+(deftask build
+  "Build my project."
+  []
+  (comp (pom) (jar) (install)))
--- a/samples/CoffeeScript/build.cake
+++ b/samples/CoffeeScript/build.cake
@@ -0,0 +1,17 @@
+fs = require 'fs'
+
+{print} = require 'sys'
+{spawn} = require 'child_process'
+
+build = (callback) ->
+	coffee = spawn 'coffee', ['-c', '-o', '.', '.']
+	coffee.stderr.on 'data', (data) ->
+		process.stderr.write data.toString()
+	coffee.stdout.on 'data', (data) ->
+		print data.toString()
+	coffee.on 'exit', (code) ->
+		callback?() if code is 0
+
+task 'build', 'Build from source',  ->
+	build() 
+	
--- a/samples/Common
+++ b/samples/Common
@@ -0,0 +1,164 @@
+;;; -*- Mode: Lisp; Package: LISP -*-
+;;;
+;;; This file is part of xyzzy.
+;;;
+
+(provide "array")
+
+(in-package "lisp")
+
+(export '(make-vector make-array vector array-dimensions array-in-bounds-p
+	  upgraded-array-element-type adjust-array))
+
+(defun upgraded-array-element-type (type)
+  (cond ((or (eq type 't)
+	     (null type))
+	 't)
+	((member type '(character base-character standard-char
+			extended-character) :test #'eq)
+	 'character)
+	(t
+	 (setq type (car (si:canonicalize-type type)))
+	 (cond ((or (eq type 't)
+		    (null type))
+		't)
+	       ((member type '(character base-character standard-char
+			       extended-character) :test #'eq)
+		'character)
+	       (t 't)))))
+
+(defun check-array-initialize-option (ies-p ics-p displaced-to)
+  (let ((x 0))
+    (and ies-p (incf x))
+    (and ics-p (incf x))
+    (and displaced-to (incf x))
+    (when (> x 1)
+      (error ":initial-element, :initial-contents, :displaced-to"))))
+
+(defun make-vector (length &key
+			   (element-type t)
+			   (initial-element nil ies-p)
+			   (initial-contents nil ics-p)
+			   fill-pointer
+			   adjustable
+			   displaced-to
+			   (displaced-index-offset 0))
+  (setq element-type (upgraded-array-element-type element-type))
+  (check-array-initialize-option ies-p ics-p displaced-to)
+  (let ((vector (si:*make-vector length element-type initial-element adjustable
+				 fill-pointer displaced-to displaced-index-offset)))
+    (when ics-p
+      (si:*copy-into-seq vector initial-contents))
+    vector))
+
+(defun make-array (dimensions &rest rest
+			      &key
+			      (element-type t)
+			      (initial-element nil ies-p)
+			      (initial-contents nil ics-p)
+			      fill-pointer
+			      adjustable
+			      displaced-to
+			      (displaced-index-offset 0))
+  (cond ((integerp dimensions)
+	 (apply #'make-vector dimensions rest))
+	((= (length dimensions) 1)
+	 (apply #'make-vector (car dimensions) rest))
+	(t
+	 (setq element-type (upgraded-array-element-type element-type))
+	 (check-array-initialize-option ies-p ics-p displaced-to)
+	 (when fill-pointer
+	   (error ":fill-pointer"))
+	 (let ((array (si:*make-array dimensions element-type
+				      initial-element adjustable
+				      displaced-to displaced-index-offset)))
+	   (when ics-p
+	     (let ((dims (make-list (array-rank array)
+				    :initial-element 0))
+		   (stack (list initial-contents))
+		   (rank (1- (array-rank array))))
+	       (dolist (x dims)
+		 (push (elt (car stack) 0) stack))
+	       (dotimes (i (array-total-size array))
+		 (setf (row-major-aref array i) (car stack))
+		 (do ((x dims (cdr x))
+		      (j rank (1- j)))
+		     ((null x))
+		   (pop stack)
+		   (incf (car x))
+		   (when (< (car x) (array-dimension array j))
+		     (do ((r (- rank j) (1- r)))
+			 ((< r 0))
+		       (push (elt (car stack) (nth r dims)) stack))
+		     (return))
+		   (setf (car x) 0)))))
+	   array))))
+
+(defun vector (&rest list)
+  (make-vector (length list) :element-type t :initial-contents list))
+
+(defun array-dimensions (array)
+  (do ((i (1- (array-rank array)) (1- i))
+       (dims '()))
+      ((minusp i) dims)
+    (push (array-dimension array i) dims)))
+
+(defun array-in-bounds-p (array &rest subscripts)
+  (let ((r (array-rank array)))
+    (when (/= r (length subscripts))
+      (error "subscripts: ~S" subscripts))
+    (do ((i 0 (1+ i))
+	 (s subscripts (cdr s)))
+	((= i r) t)
+      (unless (<= 0 (car s) (1- (array-dimension array i)))
+	(return nil)))))
+
+(defun adjust-array (old-array
+		     dimensions
+		     &rest rest
+		     &key
+		     (element-type nil ets-p)
+		     initial-element
+		     (initial-contents nil ics-p)
+		     (fill-pointer nil fps-p)
+		     displaced-to
+		     displaced-index-offset)
+  (when (/= (length dimensions) (array-rank old-array))
+    (error "?"))
+  (unless ets-p
+    (push (array-element-type old-array) rest)
+    (push :element-type rest))
+  (when (adjustable-array-p old-array)
+    (push t rest)
+    (push :adjustable rest))
+  (cond (fps-p
+	 (unless (array-has-fill-pointer-p old-array)
+	   (error "?")))
+	(t
+	 (when (array-has-fill-pointer-p old-array)
+	   (push (fill-pointer old-array) rest)
+	   (push :fill-pointer rest))))
+  (when (eq old-array displaced-to)
+    (error "?"))
+  (let ((new-array (apply #'make-array dimensions rest)))
+    (or ics-p displaced-to
+	(copy-array-partially old-array new-array))
+    (cond ((adjustable-array-p old-array)
+	   (si:*replace-array old-array new-array)
+	   old-array)
+	  (t
+	   new-array))))
+
+(defun copy-array-partially (src dst)
+  (let* ((dims (mapcar #'min (array-dimensions src) (array-dimensions dst)))
+	 (r (array-rank src))
+	 (s (make-list r :initial-element 0)))
+    (setq r (1- r))
+    (dotimes (x (apply #'* dims))
+      (setf (apply #'aref dst s) (apply #'aref src s))
+      (do ((i r (1- i)))
+	  ((minusp i))
+	(incf (nth i s))
+	(when (< (nth i s) (nth i dims))
+	  (return))
+	(setf (nth i s) 0)))))
--- a/samples/Common
+++ b/samples/Common
--- a/Lisp/config.sexp
+++ b/Lisp/config.sexp
@@ -0,0 +1,2 @@
+((exe_name hello)
+ (link_order (world hello)))
--- a/Lisp/hello.lisp
+++ b/Lisp/hello.lisp
@@ -0,0 +1,2 @@
+(DEFUN HELLO ()
+  (PRINT 'HELLO))
--- a/samples/Common
+++ b/samples/Common
@@ -0,0 +1,103 @@
+
+(:TURTLE
+
+ (:@PREFIX "rdf:" "<http://www.w3.org/1999/02/22-rdf-syntax-ns#>")
+ (:@PREFIX "owl:" "<http://www.w3.org/2002/07/owl#>")
+ (:@PREFIX "dc:" "<http://purl.org/dc/elements/1.1/>")
+ (:@PREFIX "xsd:" "<http://www.w3.org/2001/XMLSchema#>")
+ (:@PREFIX "rdfs:" "<http://www.w3.org/2000/01/rdf-schema#>")
+
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/channel>")
+ 
+   (:PREDICATE-OBJECT-LIST
+     (:URIREF #1="<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>")
+     (:OBJECTS
+       (:QNAME "rdfs:Class")))
+       
+   (:PREDICATE-OBJECT-LIST
+     (:QNAME "rdfs:comment")
+     (:OBJECTS
+       (:STRING "An RSS information channel.")))
+       
+   (:PREDICATE-OBJECT-LIST
+     (:QNAME "rdfs:isDefinedBy")
+     (:OBJECTS
+       (:URIREF "<http://purl.org/rss/1.0/>")))
+       
+   (:PREDICATE-OBJECT-LIST
+     (:QNAME "rdfs:label")
+     (:OBJECTS
+       (:STRING "Channel"))))
+       
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/description>")
+  
+   (:PREDICATE-OBJECT-LIST
+     (:URIREF #1#)
+     (:OBJECTS
+       (:QNAME "rdf:Property")))
+      
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS (:STRING "A short text description of the subject.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Description")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:description"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/image>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS image.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Image"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/item>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS item.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Item"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/items>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS
+    (:STRING "Points to a list of rss:item elements that are members of the subject channel.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Items"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/link>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS (:STRING "The URL to which an HTML rendering of the subject will link.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Link")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:identifier"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/name>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS (:STRING "The text input field's (variable) name.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Name"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/textinput>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS text input.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Text Input"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/title>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS (:STRING "A descriptive title for the channel.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Title")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:title"))))
+ (:TRIPLES (:URIREF "<http://purl.org/rss/1.0/url>")
+  (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment")
+   (:OBJECTS
+    (:STRING
+     "The URL of the image to used in the 'src' attribute of the channel's image tag when rendered as HTML.")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy")
+   (:OBJECTS (:URIREF "<http://purl.org/rss/1.0/>")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "URL")))
+  (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:identifier")))))
--- a/Language/fis_gtm_kitinstal.com
+++ b/Language/fis_gtm_kitinstal.com
@@ -0,0 +1,443 @@
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!								!
+$!	Copyright 2001, 2011 Fidelity Information Services, Inc	!
+$!								!
+$!	This source code contains the intellectual property	!
+$!	of its copyright holder(s), and is made available	!
+$!	under a license.  If you do not know the terms of	!
+$!	the license, please stop and do not read further.	!
+$!								!
+$!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$!
+$!
+$!	KITINSTAL.COM PROCEDURE FOR THE GT.M PRODUCT
+$!
+$ ON CONTROL_Y THEN VMI$CALLBACK CONTROL_Y
+$! ON WARNING THEN EXIT $STATUS !! allow warning errors for INSTALL REPLACE
+$ IF P1 .EQS. "VMI$_INSTALL" THEN GOTO INSTALL
+$ IF P1 .EQS. "VMI$_POSTINSTALL" THEN GOTO POSTINSTALL
+$ IF P1 .EQS. "VMI$_IVP" THEN GOTO IVP
+$ EXIT VMI$_UNSUPPORTED
+$!
+$INSTALL:
+$ TYPE SYS$INPUT
+
+  GT.M  (c)  COPYRIGHT 1985 - 2000  by  Sanchez Computer Associates
+                            ALL RIGHTS RESERVED
+
+$!  the following 2 lines must be maintained
+$ GTM$VMS_VERSION :== 072	! Minimum VMS version required
+$ ALPHA = (f$getsyi("arch_name") .eqs. "Alpha")
+$ IF ALPHA
+$  THEN
+$   GTM$DISK_SPACE == 28000	! Minumum disk space on system disk required
+$  ELSE
+$   GTM$DISK_SPACE == 16000	! Minumum disk space on system disk required
+$ ENDIF
+$ IF F$ELEMENT(0,",",VMI$VMS_VERSION) .EQS. "RELEASED"
+$  THEN
+$   GTM$VMS_IS == F$ELEMENT(1,",",VMI$VMS_VERSION)
+$   IF GTM$VMS_IS .LTS. GTM$VMS_VERSION
+$    THEN
+$     VMI$CALLBACK MESSAGE E VMSMISMATCH "This GT.M kit requires an existing VMS''GTM$VMS_VERSION' system."
+$     EXIT VMI$_FAILURE
+$   ENDIF
+$  ELSE
+$   GTM$VMS_IS :==
+$   WRITE SYS$OUTPUT "  No VMS version checking performed for field test versions."
+$ ENDIF
+$ IF (GTM$VMS_IS .GES. "052") THEN T1 = F$VERIFY(VMI$KIT_DEBUG)
+$ VMI$CALLBACK CHECK_NET_UTILIZATION GTM$ROOM 'GTM$DISK_SPACE'
+$ IF .NOT. GTM$ROOM
+$  THEN
+$   VMI$CALLBACK MESSAGE E NOSPACE "There is not enough disk space -- GT.M needs ''GTM$DISK_SPACE' blocks."
+$   EXIT VMI$_FAILURE
+$ ENDIF
+$!  setup default answers
+$ GTM$DOPURGE :== YES
+$ GTM$RUN_IVP :== YES
+$ GTM$STD_CNF :== YES
+$ GTM$DST_OWN :== SYSTEM
+$ IF F$IDENTIFIER(GTM$DST_OWN,"NAME_TO_NUMBER") .EQ. 0 THEN GTM$DST_OWN :== 1,4
+$ GTM$SYS_DST :== YES
+$ GTM$DST_DIR :== GTM_DIST
+$ GTM$DST_CRE == GTM$DST_DIR
+$ GTM$DST_DEV :==
+$ GTM$STARTDB :== YES
+$ GTM$MGR_COM :== YES
+$ GTM$HLP_DIR :== NO
+$ GTM$DEF_DCL :== YES
+$ GTM$DEF_SYS :== YES
+$ GTM$LNK_LOG :== YES
+$ GTM$INSTALL :== YES
+$ GTM$DEF_GLD :== YES
+$ GTM$GBL_DIR :== MUMPS.GLD
+$ GTM$DEF_RTN :== YES
+$ GTM$RTN_DIR :== [],GTM$DIST:
+$ GTM$PCT_RTN :== YES
+$ VMI$CALLBACK ASK GTM$DOPURGE "Do you want to purge files replaced by this installation" 'GTM$DOPURGE' B -
+  "@VMI$KWD:GTMKITHLP HELP_PURGE"
+$ IF .NOT. GTM$DOPURGE THEN VMI$CALLBACK SET PURGE NO
+$ VMI$CALLBACK ASK GTM$STD_CNF "Do you want the standard GT.M configuration (performs INSTALL)" 'GTM$STD_CNF' B -
+  "@VMI$KWD:GTMKITHLP HELP_STD_CNF"
+$ IF GTM$STD_CNF
+$  THEN
+$   GTM$SYS_DST == 1
+$   GTM$STARTDB == 1
+$   GTM$MGR_COM == 1
+$   GTM$HLP_DIR == 0
+$   GTM$DEF_DCL == 1
+$   GTM$DEF_SYS == 1
+$   GTM$INSTALL == 1
+$   GTM$LNK_LOG == 1
+$   GTM$INSTALL == 1
+$   GTM$DEF_GLD == 1
+$   GTM$DEF_RTN == 1
+$   GTM$PCT_RTN == 1
+$   GTM$DST_LOG :== SYS$COMMON:['GTM$DST_DIR']
+$   GTM$DIR_TYPE :== COMMON
+$  ELSE ! Not standard configuration
+$   VMI$CALLBACK ASK GTM$DST_OWN "What UIC should own the GT.M distribution" 'GTM$DST_OWN' S "@VMI$KWD:GTMKITHLP HELP_DST_OWN"
+$   GTM$DST_OWN == GTM$DST_OWN - "[" - "]"
+$   VMI$CALLBACK ASK GTM$SYS_DST "Do you want the GT.M distribution to go into a System Directory" 'GTM$SYS_DST' B -
+    "@VMI$KWD:GTMKITHLP HELP_SYS_DST"
+$   IF GTM$SYS_DST
+$    THEN
+$     VMI$CALLBACK ASK GTM$DST_DIR "In what System Directory do you want to place GT.M" 'GTM$DST_DIR' S -
+      "@VMI$KWD:GTMKITHLP HELP_SYS_DIR"
+$     GTM$DST_DIR == GTM$DST_DIR - "[" - "]"
+$     GTM$DST_CRE == GTM$DST_DIR
+$     GTM$DST_LOG :== SYS$COMMON:['GTM$DST_DIR']
+$     GTM$DIR_TYPE :== COMMON
+$    ELSE ! Not system disk
+$     VMI$CALLBACK ASK GTM$DST_DEV "On which device do you want to place GT.M" "''GTM$DST_DEV'" S "@VMI$KWD:GTMKITHLP HELP_DST_DEV"
+$     VMI$CALLBACK ASK GTM$DST_DIR "In what directory on that device do you want to place GT.M" 'GTM$DST_DIR' S -
+      "@VMI$KWD:GTMKITHLP HELP_DST_DIR"
+$     GTM$DST_DEV == GTM$DST_DEV - ":"
+$     GTM$DST_DIR == GTM$DST_DIR - "[" - "]"
+$     GTM$DST_LOG :== 'GTM$DST_DEV':['GTM$DST_DIR']
+$     GTM$DST_CRE == GTM$DST_LOG
+$     GTM$DIR_TYPE :== USER
+$   ENDIF ! system disk
+$   VMI$CALLBACK ASK GTM$STARTDB "Do you want GTMSTART.COM in the startup database" 'GTM$STARTDB' B -
+    "@VMI$KWD:GTMKITHLP HELP_STARTDB"
+$   IF .NOT. GTM$STARTDB
+$    THEN
+$     VMI$CALLBACK ASK GTM$MGR_COM "Do you want the GT.M .COM files in SYS$MANAGER" 'GTM$MGR_COM' B -
+      "@VMI$KWD:GTMKITHLP HELP_MGR_COM"
+$   ENDIF
+$   VMI$CALLBACK ASK GTM$HLP_DIR "Do you want the GT.M help files in SYS$HELP" 'GTM$HLP_DIR' B "@VMI$KWD:GTMKITHLP HELP_HLP_DIR"
+$   VMI$CALLBACK ASK GTM$DEF_DCL "Do you want to define GT.M commands to the system" 'GTM$DEF_DCL' B -
+    "@VMI$KWD:GTMKITHLP HELP_DEF_DCL"
+$   VMI$CALLBACK ASK GTM$DEF_SYS "Do you want to define GT.M logical names in the System Table" 'GTM$DEF_SYS' B -
+    "@VMI$KWD:GTMKITHLP HELP_DEF_SYS"
+$   VMI$CALLBACK ASK GTM$LNK_LOG "Do you want to define the LNK$LIBRARY logical names" 'GTM$LNK_LOG' B -
+    "@VMI$KWD:GTMKITHLP HELP_LNK_LOG"
+$   VMI$CALLBACK ASK GTM$RUN_IVP "Do you want to run the IVP (performs INSTALL)" 'GTM$RUN_IVP' B -
+    "@VMI$KWD:GTMKITHLP HELP_RUN_IVP"
+$   IF GTM$RUN_IVP
+$    THEN
+$     GTM$PCT_RTN == 1
+$    ELSE
+$     VMI$CALLBACK ASK GTM$PCT_RTN "Do you want to compile the GT.M percent routines (performs INSTALL)" 'GTM$PCT_RTN' B -
+      "@VMI$KWD:GTMKITHLP HELP_PCT_RTN"
+$   ENDIF
+$   IF (GTM$RUN_IVP .OR. GTM$PCT_RTN)
+$    THEN
+$     GTM$INSTALL == 1
+$    ELSE
+$     VMI$CALLBACK ASK GTM$INSTALL "Do you want to INSTALL the GT.M shareable images now" 'GTM$INSTALL' B -
+      "@VMI$KWD:GTMKITHLP HELP_INSTALL"
+$   ENDIF
+$   VMI$CALLBACK ASK GTM$DEF_RTN "Do you want to have a default definition for GTM$ROUTINES" 'GTM$DEF_RTN' B -
+    "@VMI$KWD:GTMKITHLP HELP_DEF_RTN"
+$   IF GTM$DEF_RTN
+$    THEN
+$     VMI$CALLBACK ASK GTM$RTN_DIR "What is the search specification for GTM$ROUTINES" 'GTM$RTN_DIR' S -
+      "@VMI$KWD:GTMKITHLP HELP_RTN_DIR"
+$   ENDIF
+$   VMI$CALLBACK ASK GTM$DEF_GLD "Do you want to have a default definition for GTM$GBLDIR" 'GTM$DEF_GLD' B -
+    "@VMI$KWD:GTMKITHLP HELP_DEF_GLD"
+$   IF GTM$DEF_GLD
+$    THEN
+$     VMI$CALLBACK ASK GTM$GBL_DIR "What is the file specification for GTM$GBLDIR" 'GTM$GBL_DIR' S -
+      "@VMI$KWD:GTMKITHLP HELP_GBL_DIR"
+$   ENDIF
+$ ENDIF ! standard configuration
+$!  tell them what's happening
+$ IF GTM$MGR_COM
+$  THEN
+$   WRITE SYS$OUTPUT "  The following command files are created and copied to SYS$MANAGER:"
+$  ELSE
+$   WRITE SYS$OUTPUT "  The following command files are created:"
+$ ENDIF
+$ TYPE SYS$INPUT
+
+        GTMINSTALL.COM
+        GTMLOGICALS.COM
+        GTMLOGIN.COM
+        GTMSTART.COM
+        GTMSTOP.COM
+
+  Each file contains its own user documentation.
+
+  All the questions have been asked.   Installation now proceeds  without your
+  manual intervention for about 10-15 minutes.
+$ IF GTM$RUN_IVP THEN WRITE SYS$OUTPUT "  Finally the Installation Verification Procedure tests the installation."
+$ WRITE SYS$OUTPUT ""
+$ VMI$CALLBACK CREATE_DIRECTORY 'GTM$DIR_TYPE' 'GTM$DST_CRE' "/OWNER_UIC=[''GTM$DST_OWN'] /PROTECTION=(WO:RE)"
+$ VMI$CALLBACK RESTORE_SAVESET B
+$ VMI$CALLBACK RESTORE_SAVESET C
+$ WRITE SYS$OUTPUT ""
+$ VMI$CALLBACK MESSAGE I CRECOM "Creating command files."
+$!  Create GTMINSTALL.COM
+$ OPEN /WRITE OUFILE VMI$KWD:GTMINSTALL.COM
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$!	GTMINSTALL.COM installs GTMSECSHR and other GT.M images."
+$ WRITE OUFILE "$!      GTMSECSHR is a small protected image and must be installed."
+$ WRITE OUFILE "$!      GTMSHR is the run-time library and is installed for performance."
+$ WRITE OUFILE "$!      GTM$DMOD and MCOMPILE are small images frequently used in development."
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$ INSTALL"
+$ WRITE OUFILE "REPLACE  /OPEN/SHARED/HEADER/PROTECTED	GTMSECSHR"
+$ WRITE OUFILE "REPLACE  /OPEN/SHARED/HEADER		GTMSHR"
+$ WRITE OUFILE "REPLACE  /OPEN/SHARED/HEADER		GTM$DMOD"
+$ WRITE OUFILE "REPLACE  /OPEN/SHARED/HEADER		MCOMPILE"
+$ WRITE OUFILE "$ EXIT"
+$ CLOSE OUFILE
+$!  Create GTMLOGICALS.COM
+$ GTM$HLP_LOG :== GTM$DIST
+$ IF GTM$HLP_DIR THEN GTM$HLP_LOG :== SYS$HELP
+$ OPEN /WRITE OUFILE VMI$KWD:GTMLOGICALS.COM
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$!	GTMLOGICALS.COM defines the logical names required to use GT.M."
+$ WRITE OUFILE "$!	By default the definitions are placed in the PROCESS table."
+$ WRITE OUFILE "$!	Parameter 1, if supplied should be the name of a logical name table"
+$ WRITE OUFILE "$!	and/or the mode of definition."
+$ WRITE OUFILE "$!      Assignments in a ""permanent"" table reduce GT.M activation time."
+$ WRITE OUFILE "$!"
+$ IF GTM$LNK_LOG THEN WRITE OUFILE "$!	The LNK$LIBRARY names many require adjustment to your environment."
+$ IF GTM$DEF_GLD THEN WRITE OUFILE "$!	GTM$GBLDIR is defined to provide default access to a global directory."
+$ IF GTM$DEF_RTN THEN WRITE OUFILE "$!	GTM$ROUTINES is defined to provide access to the GT.M utilities."
+$ IF GTM$DEF_RTN THEN WRITE OUFILE "$!	You may wish to define a different structure for $ZROUTINES."
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$ IF (P1 .NES. """") .AND. (F$EXTRACT(0,1,P1) .NES. ""/"") THEN P1 := /'P1"
+$ WRITE OUFILE "$ DEFINE 'P1' GTM$DIST		''GTM$DST_LOG'"
+$ IF GTM$DEF_GLD THEN WRITE OUFILE "$ DEFINE 'P1' GTM$GBLDIR	''GTM$GBL_DIR'"
+$ IF GTM$DEF_RTN THEN WRITE OUFILE "$ DEFINE 'P1' GTM$ROUTINES	""''GTM$RTN_DIR'"""
+$ WRITE OUFILE "$ DEFINE 'P1' GTM$HELP		''GTM$HLP_LOG'"
+$ WRITE OUFILE "$ DEFINE 'P1' GTMSHR		GTM$DIST:GTMSHR.EXE"
+$ WRITE OUFILE "$ DEFINE 'P1' GTMSECSHR		GTM$DIST:GTMSECSHR.EXE"
+$ WRITE OUFILE "$ DEFINE 'P1' GTM$DMOD		GTM$DIST:GTM$DMOD.EXE"
+$ WRITE OUFILE "$ DEFINE 'P1' MCOMPILE		GTM$DIST:MCOMPILE.EXE"
+$ IF GTM$LNK_LOG
+$  THEN
+$   N1 = 0
+$   DN = 0
+$   T1 = F$TRNLNM("LNK$LIBRARY")
+$   IF  (T1 .EQS. "") .OR. (F$LOCATE("GTMLIB",T1) .NE. F$LENGTH(T1)) .OR. (F$LOCATE("GTMSHR",T1) .NE. F$LENGTH(T1))
+$    THEN
+$     WRITE OUFILE "$ DEFINE 'P1' LNK$LIBRARY	GTM$DIST:GTMLIB.OLB"
+$     DN = 1
+$    ELSE ! lnk$library is in use
+$LNK_LOOP:
+$     N1 = N1 + 1
+$     T1 = F$TRNLNM("LNK$LIBRARY_''N1'")
+$     IF  (T1 .EQS. "") .OR. (F$LOCATE("GTMLIB",T1) .NE. F$LENGTH(T1)) .OR. (F$LOCATE("GTMSHR",T1) .NE. F$LENGTH(T1))
+$      THEN
+$       WRITE OUFILE "$ DEFINE 'P1' LNK$LIBRARY_''N1'	GTM$DIST:GTMLIB.OLB"
+$       DN = 1
+$     ENDIF
+$     IF  (.NOT. DN) .AND. (N1 .LT. 998)  THEN  GOTO LNK_LOOP
+$   ENDIF ! gtmlib handling
+$   IF  DN ! placed gtmlib
+$    THEN
+$     N1 = N1 + 1
+$     WRITE OUFILE "$ DEFINE 'P1' LNK$LIBRARY_''N1'	GTM$DIST:GTMSHR.OLB"
+$    ELSE
+$     VMI$CALLBACK MESSAGE I NOLNKLOG "No LNK$LIBRARY logical names available"
+$   ENDIF
+$ ENDIF ! setting up LNK$LIBRARYs
+$ WRITE OUFILE "$ EXIT"
+$ CLOSE OUFILE
+$!  Create GTMLOGIN.COM
+$ OPEN /WRITE OUFILE VMI$KWD:GTMLOGIN.COM
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$!	GTMLOGIN.COM performs process specific setup for GT.M."
+$ WRITE OUFILE "$!	It calls GTMLOGICALS.COM if the logical names are not"
+$ WRITE OUFILE "$!      in the SYSTEM table."
+$ WRITE OUFILE "$!	It defines symbols to access GT.M images."
+$ WRITE OUFILE "$!	It defines GT.M commands locally if they are not defined to the system."
+$ WRITE OUFILE "$!      When the command and logical names are not defined on a process level,"
+$ WRITE OUFILE "$!      a production user may save start-up time by not using GTMLOGIN."
+$ WRITE OUFILE "$!      CCE is infrequently used, but may be defined as a foreign command."
+$ WRITE OUFILE "$!"
+$ IF .NOT. GTM$DEF_SYS
+$  THEN
+$   WRITE OUFILE "$ dir = F$ENVIRONMENT(""PROCEDURE"")"
+$   WRITE OUFILE "$ dir = F$PARSE(dir,,,""DEVICE"") + F$PARSE(dir,,,""DIRECTORY"")"
+$   WRITE OUFILE "$ @'dir'GTMLOGICALS.COM"
+$ ENDIF
+$ IF .NOT. GTM$DEF_DCL THEN WRITE OUFILE "$ SET COMMAND GTM$DIST:GTMCOMMANDS.CLD"
+$ WRITE OUFILE "$ DSE :== $GTM$DIST:DSE.EXE	! Database System Editor"
+$ WRITE OUFILE "$ GDE :== $GTM$DIST:GDE.EXE	! Global Directory Editor"
+$ WRITE OUFILE "$ GTM :== MUMPS/DIRECT		! Direct Mode MUMPS"
+$ WRITE OUFILE "$ LKE :== $GTM$DIST:LKE.EXE	! Lock Editor"
+$ WRITE OUFILE "$ MUPI*P :== $GTM$DIST:MUPIP.EXE	! MUMPS Peripheral Interchange Program"
+$ WRITE OUFILE "$ EXIT"
+$ WRITE OUFILE "$ CCE :== $GTM$DIST:CCE.EXE	! GT.CX Operator Interface Program"
+$ WRITE OUFILE "$ EXIT"
+$ CLOSE OUFILE
+$!  Create GTMSTART.COM
+$ OPEN /WRITE OUFILE VMI$KWD:GTMSTART.COM
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$!	GTMSTART.COM should be placed in the VMS startup database."
+$ WRITE OUFILE "$!	It invokes GTMLOGICALS.COM and GTMINSTALL.COM."
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$ dir = F$ENVIRONMENT(""PROCEDURE"")"
+$ WRITE OUFILE "$ dir = F$PARSE(dir,,,""DEVICE"") + F$PARSE(dir,,,""DIRECTORY"")"
+$ IF GTM$DEF_SYS THEN WRITE OUFILE "$ IF P1 .EQS. """" .OR. (P1 .EQS. ""FULL"") THEN P1 := SYSTEM/EXEC"
+$ WRITE OUFILE "$ @'dir'GTMLOGICALS 'P1'"
+$ WRITE OUFILE "$ @'dir'GTMINSTALL"
+$ WRITE OUFILE "$ EXIT"
+$ CLOSE OUFILE
+$!  Create GTMSTOP.COM
+$ OPEN /WRITE OUFILE VMI$KWD:GTMSTOP.COM
+$ WRITE OUFILE "$!"
+$ WRITE OUFILE "$!	GTMSTOP.COM stops all the active GT.M processes and does a RUNDOWN."
+$ WRITE OUFILE "$!	Place an invocation or copy of this procedure in the site specific"
+$ WRITE OUFILE "$!	 shutdown: SYS$MANAGER:SYSHUTDWN to ensure all GT.M databases are"
+$ WRITE OUFILE "$!	 properly closed before VMS terminates.  GTMSTOP should follow"
+$ WRITE OUFILE "$!	 GTCMSTOP and precede GTCXSTOP, if they are used."
+$ WRITE OUFILE "$!	If GTMSTOP is not intended to disable subsequent use of GT.M,"
+$ WRITE OUFILE "$!	 add a comment (!) before the INSTALL REMOVE GTMSECSHR."
+$ WRITE OUFILE "$!"
+$ IF .NOT. GTM$DEF_SYS
+$  THEN
+$   WRITE OUFILE "$ dir = F$ENVIRONMENT(""PROCEDURE"")"
+$   WRITE OUFILE "$ dir = F$PARSE(dir,,,""DEVICE"") + F$PARSE(dir,,,""DIRECTORY"")"
+$   WRITE OUFILE "$ @'dir'GTMLOGICALS.COM"
+$ ENDIF
+$ WRITE OUFILE "$ MUPIP := $GTM$DIST:MUPIP.EXE"
+$ WRITE OUFILE "$ STOP := $GTM$DIST:GTM$STOP"
+$ WRITE OUFILE "$ STOP 'P1'"
+$ WRITE OUFILE "$ MUPIP RUNDOWN"
+$ WRITE OUFILE "$ INSTALL REMOVE GTMSECSHR"
+$ WRITE OUFILE "$ EXIT"
+$ IF GTM$DEF_SYS THEN WRITE OUFILE "$ IF P2 .EQS. """" THEN P2 := /SYSTEM/EXEC"
+$ WRITE OUFILE "$ DEASSIGN 'P2' GTMSECSHR"
+$ CLOSE OUFILE
+$ VMI$CALLBACK MESSAGE I PREINS "Preparing files for installation."
+$!  GTMFILES.KIT must be maintained as kit contents change
+$ GTM$HLP_LOG == GTM$DST_LOG
+$ IF GTM$HLP_DIR THEN GTM$HLP_LOG :== VMI$ROOT:[SYSHLP]
+$ OPEN /WRITE OUFILE VMI$KWD:GTMFILES.KIT
+$ IF GTM$MGR_COM
+$  THEN
+$   WRITE OUFILE "GTM$ GTMINSTALL.COM VMI$ROOT:[SYSMGR] C"
+$   WRITE OUFILE "GTM$ GTMLOGICALS.COM VMI$ROOT:[SYSMGR] C"
+$   WRITE OUFILE "GTM$ GTMLOGIN.COM VMI$ROOT:[SYSMGR] C"
+$   WRITE OUFILE "GTM$ GTMSTART.COM VMI$ROOT:[SYSMGR] C"
+$   WRITE OUFILE "GTM$ GTMSTOP.COM VMI$ROOT:[SYSMGR] C"
+$ ENDIF
+$ WRITE OUFILE "GTM$ GTMINSTALL.COM ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMLOGICALS.COM ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMLOGIN.COM ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMSTART.COM ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMSTOP.COM ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ DSE.HLB ''GTM$HLP_LOG'"
+$ WRITE OUFILE "GTM$ GDE.HLB ''GTM$HLP_LOG'"
+$ WRITE OUFILE "GTM$ LKE.HLB ''GTM$HLP_LOG'"
+$ WRITE OUFILE "GTM$ MUMPS.HLB ''GTM$HLP_LOG'"
+$ WRITE OUFILE "GTM$ MUPIP.HLB ''GTM$HLP_LOG'"
+$ WRITE OUFILE "GTM$ GTMLIB.OLB ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMSHR.OLB ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMZCALL.MLB ''GTM$DST_LOG'"
+$ IF ALPHA
+$  THEN
+$   WRITE OUFILE "GTM$ GTM$DEFAULTS.M64 ''GTM$DST_LOG'"
+$  ELSE
+$   WRITE OUFILE "GTM$ GTM$DEFAULTS.MAR ''GTM$DST_LOG'"
+$ ENDIF
+$ WRITE OUFILE "GTM$ GTM$CE.H ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMCOLLECT.OPT ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMCOMMANDS.CLD ''GTM$DST_LOG' C"
+$ WRITE OUFILE "GTM$ *.M ''GTM$DST_LOG'"
+$ CLOSE OUFILE
+$!  GTMIMAGES.KIT must be maintained as kit contents change
+$ OPEN /WRITE OUFILE VMI$KWD:GTMIMAGES.KIT
+$ WRITE OUFILE "GTM$ GTMSECSHR.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTMSHR.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ DSE.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GDE.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTM$DMOD.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ LKE.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ MCOMPILE.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ MUPIP.EXE ''GTM$DST_LOG'"
+$ WRITE OUFILE "GTM$ GTM$STOP.EXE ''GTM$DST_LOG'"
+$ CLOSE OUFILE
+$!  Provide with file.KITs
+$ VMI$CALLBACK PROVIDE_FILE "" VMI$KWD:GTMFILES.KIT "" T
+$ VMI$CALLBACK PROVIDE_IMAGE "" VMI$KWD:GTMIMAGES.KIT "" T
+$ VMI$CALLBACK MESSAGE I FININS "Finalizing the installation."
+$ IF GTM$DEF_DCL THEN VMI$CALLBACK PROVIDE_DCL_COMMAND GTMCOMMANDS.CLD
+$ IF GTM$STARTDB THEN VMI$CALLBACK MODIFY_STARTUP_DB ADD GTMSTART.COM LPMAIN
+$!  GTM$INSTALL is TRUE if GTM$RUN_IVP or GTM$PCT_RTN
+$ IF GTM$INSTALL THEN VMI$CALLBACK SET POSTINSTALL YES
+$ IF GTM$RUN_IVP THEN VMI$CALLBACK SET IVP YES
+$ EXIT VMI$_SUCCESS
+$!
+$POSTINSTALL:
+$ ON CONTROL_Y THEN EXIT VMI$_FAILURE
+$! remove MUPIP from command tables for change from V2.4 to V2.5
+$ SET NOON
+$ DEFINE /USER_MODE SYS$OUTPUT NL:
+$ DEFINE /USER_MODE SYS$ERROR NL:
+$ SET COMMAND /TABLE=SYS$COMMON:[SYSLIB]DCLTABLES /OUTPUT=SYS$COMMON:[SYSLIB]DCLTABLES /DELETE=MUPIP
+$ DEFINE /USER_MODE SYS$OUTPUT NL:
+$ DEFINE /USER_MODE SYS$ERROR NL:
+$ SET COMMAND /DELETE=MUPIP
+$ SET ON
+$ IF GTM$MGR_COM
+$  THEN
+$   T1 := SYS$MANAGER:
+$  ELSE
+$   T1 = GTM$DST_LOG
+$ ENDIF
+$ @'T1'GTMSTART
+$ @'T1'GTMLOGIN
+$ ON CONTROL_Y THEN EXIT VMI$_FAILURE
+$ SET DEFAULT GTM$DIST
+$ T2 = F$ENVIRONMENT("PROTECTION")
+$ SET PROTECTION=(S=REWD,O=REWD,G=REWD,W=RE)/DEFAULT
+$ MUMPS GTM$DMOD.M
+$ IF GTM$LNK_LOG
+$  THEN
+$   T1 :=
+$  ELSE
+$   T1 :=,GTMLIB.OLB/LIB,GTMSHR.OLB/LIB
+$ ENDIF
+$ LINK GTM$DMOD.OBJ/NOTRACE'T1
+$ IF GTM$PCT_RTN
+$  THEN
+$   TYPE SYS$INPUT
+
+  Compiling the GT.M percent (%) routines.
+$   MUMPS *
+$   IF GTM$DOPURGE THEN PURGE *.*
+$   SET DEFAULT VMI$KWD
+$ ENDIF ! percent routines
+$ SET PROTECTION=('T2')/DEFAULT
+$ EXIT VMI$_SUCCESS
+$!
+$IVP:
+$!	The real Installation Verification Procedure.
+$ TYPE SYS$INPUT
+
+  GT.M  Installation Verification Procedure
+
+$!	Extract the IVP .COM file from the text library.
+$ LIBRARIAN /EXTRACT=GTM$IVP /OUTPUT=GTM$IVP.COM	GTM$IVP.TLB
+$ @GTM$IVP
+$ EXIT $STATUS
+$!
--- a/Language/ghostpdl_zlib_make_vms.com
+++ b/Language/ghostpdl_zlib_make_vms.com
@@ -0,0 +1,867 @@
+$! make libz under VMS written by
+$! Martin P.J. Zinser
+$!
+$! In case of problems with the install you might contact me at
+$! zinser@zinser.no-ip.info(preferred) or
+$! martin.zinser@eurexchange.com (work)
+$!
+$! Make procedure history for Zlib
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20060120 First version to receive a number
+$! 0.02 20061008 Adapt to new Makefile.in
+$! 0.03 20091224 Add support for large file check
+$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
+$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
+$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
+$!               subdir path, update module search in makefile.in
+$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
+$!               shared image creation
+$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
+$!               image
+$! 0.09 20120305 SMS.  P1 sets builder ("MMK", "MMS", " " (built-in)).
+$!               "" -> automatic, preference: MMK, MMS, built-in.
+$!
+$ on error then goto err_exit
+$!
+$ true  = 1
+$ false = 0
+$ tmpnam = "temp_" + f$getjpi("","pid")
+$ tt = tmpnam + ".txt"
+$ tc = tmpnam + ".c"
+$ th = tmpnam + ".h"
+$ define/nolog tconfig 'th'
+$ its_decc = false
+$ its_vaxc = false
+$ its_gnuc = false
+$ s_case   = False
+$!
+$! Setup variables holding "config" information
+$!
+$ Make    = "''p1'"
+$ name     = "Zlib"
+$ version  = "?.?.?"
+$ v_string = "ZLIB_VERSION"
+$ v_file   = "zlib.h"
+$ ccopt   = "/include = []"
+$ lopts   = ""
+$ dnsrl   = ""
+$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
+$ conf_check_string = ""
+$ linkonly = false
+$ optfile  = name + ".opt"
+$ mapfile  = name + ".map"
+$ libdefs  = ""
+$ vax      = f$getsyi("HW_MODEL").lt.1024
+$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
+$ ia64     = f$getsyi("HW_MODEL").ge.4096
+$!
+$! 2012-03-05 SMS.
+$! Why is this needed?  And if it is needed, why not simply ".not. vax"?
+$!
+$!!! if axp .or. ia64 then  set proc/parse=extended
+$!
+$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
+$ mydef  = F$parse(whoami,,,"DEVICE")
+$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
+$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
+$!
+$! Check for MMK/MMS
+$!
+$ if (Make .eqs. "")
+$ then
+$   If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
+$   If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
+$ else
+$   Make = f$edit( Make, "trim")
+$ endif
+$!
+$ gosub find_version
+$!
+$  open/write topt tmp.opt
+$  open/write optf 'optfile'
+$!
+$ gosub check_opts
+$!
+$! Look for the compiler used
+$!
+$ gosub check_compiler
+$ close topt
+$ close optf
+$!
+$ if its_decc
+$ then
+$   ccopt = "/prefix=all" + ccopt
+$   if f$trnlnm("SYS") .eqs. ""
+$   then
+$     if axp
+$     then
+$       define sys sys$library:
+$     else
+$       ccopt = "/decc" + ccopt
+$       define sys decc$library_include:
+$     endif
+$   endif
+$!
+$! 2012-03-05 SMS.
+$! Why /NAMES = AS_IS?  Why not simply ".not. vax"?  And why not on VAX?
+$!
+$   if axp .or. ia64
+$   then
+$       ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
+$       s_case = true
+$   endif
+$ endif
+$ if its_vaxc .or. its_gnuc
+$ then
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ endif
+$!
+$! Build a fake configure input header
+$!
+$ open/write conf_hin config.hin
+$ write conf_hin "#undef _LARGEFILE64_SOURCE"
+$ close conf_hin
+$!
+$!
+$ i = 0
+$FIND_ACONF:
+$ fname = f$element(i,"#",aconf_in_file)
+$ if fname .eqs. "#" then goto AMISS_ERR
+$ if f$search(fname) .eqs. ""
+$ then
+$   i = i + 1
+$   goto find_aconf
+$ endif
+$ open/read/err=aconf_err aconf_in 'fname'
+$ open/write aconf zconf.h
+$ACONF_LOOP:
+$ read/end_of_file=aconf_exit aconf_in line
+$ work = f$edit(line, "compress,trim")
+$ if f$extract(0,6,work) .nes. "#undef"
+$ then
+$   if f$extract(0,12,work) .nes. "#cmakedefine"
+$   then
+$       write aconf line
+$   endif
+$ else
+$   cdef = f$element(1," ",work)
+$   gosub check_config
+$ endif
+$ goto aconf_loop
+$ACONF_EXIT:
+$ write aconf ""
+$ write aconf "/* VMS specifics added by make_vms.com: */"
+$ write aconf "#define VMS 1"
+$ write aconf "#include <unistd.h>"
+$ write aconf "#include <unixio.h>"
+$ write aconf "#ifdef _LARGEFILE"
+$ write aconf "# define off64_t __off64_t"
+$ write aconf "# define fopen64 fopen"
+$ write aconf "# define fseeko64 fseeko"
+$ write aconf "# define lseek64 lseek"
+$ write aconf "# define ftello64 ftell"
+$ write aconf "#endif"
+$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
+$ write aconf "# define HAVE_VSNPRINTF"
+$ write aconf "#endif"
+$ close aconf_in
+$ close aconf
+$ if f$search("''th'") .nes. "" then delete 'th';*
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if make.eqs.""
+$ then
+$   if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
+$   if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+                adler32.c zlib.h zconf.h
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+                compress.c zlib.h zconf.h
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+                crc32.c zlib.h zconf.h
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+                deflate.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
+                gzclose.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
+                gzlib.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
+                gzread.c zutil.h zlib.h zconf.h
+$   CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
+                gzwrite.c zutil.h zlib.h zconf.h
+$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
+                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+                inffast.c zutil.h zlib.h zconf.h inffast.h
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+                inflate.c zutil.h zlib.h zconf.h infblock.h
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+                trees.c deflate.h zutil.h zlib.h zconf.h
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+                uncompr.c zlib.h zconf.h
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+                zutil.c zutil.h zlib.h zconf.h
+$   write sys$output "Building Zlib ..."
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   write sys$output "Building example..."
+$   CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" -
+                [.test]example.c zlib.h zconf.h
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   write sys$output "Building minigzip..."
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" -
+              [.test]minigzip.c zlib.h zconf.h
+$   call make minigzip.exe -
+              "LINK minigzip,libz.olb/lib" -
+              minigzip.obj libz.olb
+$ else
+$   gosub crea_mms
+$   write sys$output "Make ''name' ''version' with ''Make' "
+$   'make'
+$ endif
+$!
+$! Create shareable image
+$!
+$ gosub crea_olist
+$ write sys$output "Creating libzshr.exe"
+$ call map_2_shopt 'mapfile' 'optfile'
+$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
+$ write sys$output "Zlib build completed"
+$ delete/nolog tmp.opt;*
+$ exit
+$AMISS_ERR:
+$ write sys$output "No source for config.hin found."
+$ write sys$output "Tried any of ''aconf_in_file'"
+$ goto err_exit
+$CC_ERR:
+$ write sys$output "C compiler required to build ''name'"
+$ goto err_exit
+$ERR_EXIT:
+$ set message/facil/ident/sever/text
+$ close/nolog optf
+$ close/nolog topt
+$ close/nolog aconf_in
+$ close/nolog aconf
+$ close/nolog out
+$ close/nolog min
+$ close/nolog mod
+$ close/nolog h_in
+$ write sys$output "Exiting..."
+$ exit 2
+$!
+$!
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8  What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$       Argument = P'arg
+$       If Argument .Eqs. "" Then Goto Exit
+$       El=0
+$Loop2:
+$       File = F$Element(El," ",Argument)
+$       If File .Eqs. " " Then Goto Endl
+$       AFile = ""
+$Loop3:
+$       OFile = AFile
+$       AFile = F$Search(File)
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       Goto Loop3
+$NextEL:
+$       El = El + 1
+$       Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Check command line options and set symbols accordingly
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20041206 First version to receive a number
+$! 0.02 20060126 Add new "HELP" target
+$ CHECK_OPTS:
+$ i = 1
+$ OPT_LOOP:
+$ if i .lt. 9
+$ then
+$   cparm = f$edit(p'i',"upcase")
+$!
+$! Check if parameter actually contains something
+$!
+$   if f$edit(cparm,"trim") .nes. ""
+$   then
+$     if cparm .eqs. "DEBUG"
+$     then
+$       ccopt = ccopt + "/noopt/deb"
+$       lopts = lopts + "/deb"
+$     endif
+$     if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       ccopt = ccopt + f$extract(start,len,cparm)
+$       if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+          then s_case = true
+$     endif
+$     if cparm .eqs. "LINK" then linkonly = true
+$     if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$     then
+$       start = f$locate("=",cparm) + 1
+$       len   = f$length(cparm) - start
+$       lopts = lopts + f$extract(start,len,cparm)
+$     endif
+$     if f$locate("CC=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       cc_com = f$extract(start,len,cparm)
+        if (cc_com .nes. "DECC") .and. -
+           (cc_com .nes. "VAXC") .and. -
+           (cc_com .nes. "GNUC")
+$       then
+$         write sys$output "Unsupported compiler choice ''cc_com' ignored"
+$         write sys$output "Use DECC, VAXC, or GNUC instead"
+$       else
+$         if cc_com .eqs. "DECC" then its_decc = true
+$         if cc_com .eqs. "VAXC" then its_vaxc = true
+$         if cc_com .eqs. "GNUC" then its_gnuc = true
+$       endif
+$     endif
+$     if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$     then
+$       start  = f$locate("=",cparm) + 1
+$       len    = f$length(cparm) - start
+$       mmks = f$extract(start,len,cparm)
+$       if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$       then
+$         make = mmks
+$       else
+$         write sys$output "Unsupported make choice ''mmks' ignored"
+$         write sys$output "Use MMK or MMS instead"
+$       endif
+$     endif
+$     if cparm .eqs. "HELP" then gosub bhelp
+$   endif
+$   i = i + 1
+$   goto opt_loop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Look for the compiler used
+$!
+$! Version history
+$! 0.01 20040223 First version to receive a number
+$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
+$! 0.03 20060202 Extend handling of GNU C
+$! 0.04 20090402 Compaq -> hp
+$CHECK_COMPILER:
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then
+$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
+$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
+$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
+$ endif
+$!
+$! Exit if no compiler available
+$!
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then goto CC_ERR
+$ else
+$   if its_decc
+$   then
+$     write sys$output "CC compiler check ... hp C"
+$     if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
+$     then
+$       dnrsl = f$trnlnm("decc$no_rooted_search_lists")
+$     endif
+$     define/nolog decc$no_rooted_search_lists 1
+$   else
+$     if its_vaxc then write sys$output "CC compiler check ... VAX C"
+$     if its_gnuc
+$     then
+$         write sys$output "CC compiler check ... GNU C"
+$         if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib"
+$         if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib"
+$         cc = "gcc"
+$     endif
+$     if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
+$     if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! If MMS/MMK are available dump out the descrip.mms if required
+$!
+$CREA_MMS:
+$ write sys$output "Creating descrip.mms..."
+$ create descrip.mms
+$ open/append out descrip.mms
+$ copy sys$input: out
+$ deck
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser
+# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
+       gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
+       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
+       inftrees.obj, inffast.obj
+
+$ eod
+$ write out "CFLAGS=", ccopt
+$ write out "LOPTS=", lopts
+$ write out "all : example.exe minigzip.exe libz.olb"
+$ copy sys$input: out
+$ deck
+        @ write sys$output " Example applications available"
+
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+              link $(LOPTS) example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+              link $(LOPTS) minigzip,libz.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
+
+
+# Other dependencies.
+adler32.obj  : adler32.c zutil.h zlib.h zconf.h
+compress.obj : compress.c zlib.h zconf.h
+crc32.obj    : crc32.c zutil.h zlib.h zconf.h
+deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
+example.obj  : [.test]example.c zlib.h zconf.h
+gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
+gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
+gzread.obj   : gzread.c zutil.h zlib.h zconf.h
+gzwrite.obj  : gzwrite.c zutil.h zlib.h zconf.h
+inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
+inflate.obj  : inflate.c zutil.h zlib.h zconf.h
+inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
+minigzip.obj : [.test]minigzip.c zlib.h zconf.h
+trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
+uncompr.obj  : uncompr.c zlib.h zconf.h
+zutil.obj    : zutil.c zutil.h zlib.h zconf.h
+infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ eod
+$ close out
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Read list of core library sources from makefile.in and create options
+$! needed to build shareable image
+$!
+$CREA_OLIST:
+$ open/read min makefile.in
+$ open/write mod modules.opt
+$ src_check_list = "OBJZ =#OBJG ="
+$MRLOOP:
+$ read/end=mrdone min rec
+$ i = 0
+$SRC_CHECK_LOOP:
+$ src_check = f$element(i, "#", src_check_list)
+$ i = i+1
+$ if src_check .eqs. "#" then goto mrloop
+$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
+$ rec = rec - src_check
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
+$MRSLOOP:
+$ read/end=mrdone min rec
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
+$MRDONE:
+$ close min
+$ close mod
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Take record extracted in crea_olist and split it into single filenames
+$!
+$EXTRA_FILNAM:
+$ myrec = f$edit(rec - "\", "trim,compress")
+$ i = 0
+$FELOOP:
+$ srcfil = f$element(i," ", myrec)
+$ if (srcfil .nes. " ")
+$ then
+$   write mod f$parse(srcfil,,,"NAME"), ".obj"
+$   i = i + 1
+$   goto feloop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Find current Zlib version number
+$!
+$FIND_VERSION:
+$ open/read h_in 'v_file'
+$hloop:
+$ read/end=hdone h_in rec
+$ rec = f$edit(rec,"TRIM")
+$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
+$ rec = f$edit(rec - "#", "TRIM")
+$ if f$element(0," ",rec) .nes. "define" then goto hloop
+$ if f$element(1," ",rec) .eqs. v_string
+$ then
+$   version = 'f$element(2," ",rec)'
+$   goto hdone
+$ endif
+$ goto hloop
+$hdone:
+$ close h_in
+$ return
+$!------------------------------------------------------------------------------
+$!
+$CHECK_CONFIG:
+$!
+$ in_ldef = f$locate(cdef,libdefs)
+$ if (in_ldef .lt. f$length(libdefs))
+$ then
+$   write aconf "#define ''cdef' 1"
+$   libdefs = f$extract(0,in_ldef,libdefs) + -
+              f$extract(in_ldef + f$length(cdef) + 1, -
+                        f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
+                        libdefs)
+$ else
+$   if (f$type('cdef') .eqs. "INTEGER")
+$   then
+$     write aconf "#define ''cdef' ", 'cdef'
+$   else
+$     if (f$type('cdef') .eqs. "STRING")
+$     then
+$       write aconf "#define ''cdef' ", """", '''cdef'', """"
+$     else
+$       gosub check_cc_def
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check if this is a define relating to the properties of the C/C++
+$! compiler
+$!
+$ CHECK_CC_DEF:
+$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
+$ then
+$   copy sys$input: 'tc'
+$   deck
+#include "tconfig"
+#define _LARGEFILE
+#include <stdio.h>
+
+int main(){
+FILE *fp;
+  fp = fopen("temp.txt","r");
+  fseeko(fp,1,SEEK_SET);
+  fclose(fp);
+}
+
+$   eod
+$   test_inv = false
+$   comm_h = false
+$   gosub cc_prop_check
+$   return
+$ endif
+$ write aconf "/* ", line, " */"
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler
+$!
+$! Version history
+$! 0.01 20031020 First version to receive a number
+$! 0.02 20031022 Added logic for defines with value
+$! 0.03 20040309 Make sure local config file gets not deleted
+$! 0.04 20041230 Also write include for configure run
+$! 0.05 20050103 Add processing of "comment defines"
+$CC_PROP_CHECK:
+$ cc_prop = true
+$ is_need = false
+$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
+$ if f$search(th) .eqs. "" then create 'th'
+$ set message/nofac/noident/nosever/notext
+$ on error then continue
+$ cc 'tmpnam'
+$ if .not. ($status)  then cc_prop = false
+$ on error then continue
+$! The headers might lie about the capabilities of the RTL
+$ link 'tmpnam',tmp.opt/opt
+$ if .not. ($status)  then cc_prop = false
+$ set message/fac/ident/sever/text
+$ on error then goto err_exit
+$ delete/nolog 'tmpnam'.*;*/exclude='th'
+$ if (cc_prop .and. .not. is_need) .or. -
+     (.not. cc_prop .and. is_need)
+$ then
+$   write sys$output "Checking for ''cdef'... yes"
+$   if f$type('cdef_val'_yes) .nes. ""
+$   then
+$     if f$type('cdef_val'_yes) .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
+$   else
+$     call write_config f$fao("#define !AS 1",cdef)
+$   endif
+$   if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
+       (cdef .eqs. "_LARGEFILE64_SOURCE") then -
+      call write_config f$string("#define _LARGEFILE 1")
+$ else
+$   write sys$output "Checking for ''cdef'... no"
+$   if (comm_h)
+$   then
+      call write_config f$fao("/* !AS */",line)
+$   else
+$     if f$type('cdef_val'_no) .nes. ""
+$     then
+$       if f$type('cdef_val'_no) .eqs. "INTEGER" -
+           then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
+$       if f$type('cdef_val'_no) .eqs. "STRING" -
+           then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
+$     else
+$       call write_config f$fao("#undef !AS",cdef)
+$     endif
+$   endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler with multiple result values
+$!
+$! Version history
+$! 0.01 20040127 First version
+$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
+$CC_MPROP_CHECK:
+$ cc_prop = true
+$ i    = 1
+$ idel = 1
+$ MT_LOOP:
+$ if f$type(result_'i') .eqs. "STRING"
+$ then
+$   set message/nofac/noident/nosever/notext
+$   on error then continue
+$   cc 'tmpnam'_'i'
+$   if .not. ($status)  then cc_prop = false
+$   on error then continue
+$! The headers might lie about the capabilities of the RTL
+$   link 'tmpnam'_'i',tmp.opt/opt
+$   if .not. ($status)  then cc_prop = false
+$   set message/fac/ident/sever/text
+$   on error then goto err_exit
+$   delete/nolog 'tmpnam'_'i'.*;*
+$   if (cc_prop)
+$   then
+$     write sys$output "Checking for ''cdef'... ", mdef_'i'
+$     if f$type(mdef_'i') .eqs. "INTEGER" -
+         then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
+$     if f$type('cdef_val'_yes) .eqs. "STRING" -
+         then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
+$     goto msym_clean
+$   else
+$     i = i + 1
+$     goto mt_loop
+$   endif
+$ endif
+$ write sys$output "Checking for ''cdef'... no"
+$ call write_config f$fao("#undef !AS",cdef)
+$ MSYM_CLEAN:
+$ if (idel .le. msym_max)
+$ then
+$   delete/sym mdef_'idel'
+$   idel = idel + 1
+$   goto msym_clean
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Write configuration to both permanent and temporary config file
+$!
+$! Version history
+$! 0.01 20031029 First version to receive a number
+$!
+$WRITE_CONFIG: SUBROUTINE
+$  write aconf 'p1'
+$  open/append confh 'th'
+$  write confh 'p1'
+$  close confh
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Analyze the project map file and create the symbol vector for a shareable
+$! image from it
+$!
+$! Version history
+$! 0.01 20120128 First version
+$! 0.02 20120226 Add pre-load logic
+$!
+$ MAP_2_SHOPT: Subroutine
+$!
+$ SAY := "WRITE_ SYS$OUTPUT"
+$!
+$ IF F$SEARCH("''P1'") .EQS. ""
+$ THEN
+$    SAY "MAP_2_SHOPT-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
+$    goto exit_m2s
+$ ENDIF
+$ IF "''P2'" .EQS. ""
+$ THEN
+$    SAY "MAP_2_SHOPT:  Error, no output file provided"
+$    goto exit_m2s
+$ ENDIF
+$!
+$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
+$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
+$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
+$ module4 = "inflateSync#uncompress#zlibVersion#compress"
+$ open/read map 'p1
+$ if axp .or. ia64
+$ then
+$     open/write aopt a.opt
+$     open/write bopt b.opt
+$     write aopt " CASE_SENSITIVE=YES"
+$     write bopt "SYMBOL_VECTOR= (-"
+$     mod_sym_num = 1
+$ MOD_SYM_LOOP:
+$     if f$type(module'mod_sym_num') .nes. ""
+$     then
+$         mod_in = 0
+$ MOD_SYM_IN:
+$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$         if shared_proc .nes. "#"
+$         then
+$             write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+        		       f$edit(shared_proc,"upcase"),shared_proc)
+$             write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$             mod_in = mod_in + 1
+$             goto mod_sym_in
+$         endif
+$         mod_sym_num = mod_sym_num + 1
+$         goto mod_sym_loop
+$     endif
+$MAP_LOOP:
+$     read/end=map_end map line
+$     if (f$locate("{",line).lt. f$length(line)) .or. -
+         (f$locate("global:", line) .lt. f$length(line))
+$     then
+$         proc = true
+$         goto map_loop
+$     endif
+$     if f$locate("}",line).lt. f$length(line) then proc = false
+$     if f$locate("local:", line) .lt. f$length(line) then proc = false
+$     if proc
+$     then
+$         shared_proc = f$edit(line,"collapse")
+$         chop_semi = f$locate(";", shared_proc)
+$         if chop_semi .lt. f$length(shared_proc) then -
+              shared_proc = f$extract(0, chop_semi, shared_proc)
+$         write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+        			 f$edit(shared_proc,"upcase"),shared_proc)
+$         write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$     endif
+$     goto map_loop
+$MAP_END:
+$     close/nolog aopt
+$     close/nolog bopt
+$     open/append libopt 'p2'
+$     open/read aopt a.opt
+$     open/read bopt b.opt
+$ALOOP:
+$     read/end=aloop_end aopt line
+$     write libopt line
+$     goto aloop
+$ALOOP_END:
+$     close/nolog aopt
+$     sv = ""
+$BLOOP:
+$     read/end=bloop_end bopt svn
+$     if (svn.nes."")
+$     then
+$        if (sv.nes."") then write libopt sv
+$        sv = svn
+$     endif
+$     goto bloop
+$BLOOP_END:
+$     write libopt f$extract(0,f$length(sv)-2,sv), "-"
+$     write libopt ")"
+$     close/nolog bopt
+$     delete/nolog/noconf a.opt;*,b.opt;*
+$ else
+$     if vax
+$     then
+$     open/append libopt 'p2'
+$     mod_sym_num = 1
+$ VMOD_SYM_LOOP:
+$     if f$type(module'mod_sym_num') .nes. ""
+$     then
+$         mod_in = 0
+$ VMOD_SYM_IN:
+$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$         if shared_proc .nes. "#"
+$         then
+$     	      write libopt f$fao("UNIVERSAL=!AS",-
+      	  			     f$edit(shared_proc,"upcase"))
+$             mod_in = mod_in + 1
+$             goto vmod_sym_in
+$         endif
+$         mod_sym_num = mod_sym_num + 1
+$         goto vmod_sym_loop
+$     endif
+$VMAP_LOOP:
+$     	  read/end=vmap_end map line
+$     	  if (f$locate("{",line).lt. f$length(line)) .or. -
+   	      (f$locate("global:", line) .lt. f$length(line))
+$     	  then
+$     	      proc = true
+$     	      goto vmap_loop
+$     	  endif
+$     	  if f$locate("}",line).lt. f$length(line) then proc = false
+$     	  if f$locate("local:", line) .lt. f$length(line) then proc = false
+$     	  if proc
+$     	  then
+$     	      shared_proc = f$edit(line,"collapse")
+$     	      chop_semi = f$locate(";", shared_proc)
+$     	      if chop_semi .lt. f$length(shared_proc) then -
+      	  	  shared_proc = f$extract(0, chop_semi, shared_proc)
+$     	      write libopt f$fao("UNIVERSAL=!AS",-
+      	  			     f$edit(shared_proc,"upcase"))
+$     	  endif
+$     	  goto vmap_loop
+$VMAP_END:
+$     else
+$         write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
+$         write sys$output "No options file created"
+$     endif
+$ endif
+$ EXIT_M2S:
+$ close/nolog map
+$ close/nolog libopt
+$ endsubroutine
--- a/Language/libxslt_build.com
+++ b/Language/libxslt_build.com
@@ -0,0 +1,342 @@
+$! BUILD_XSLT.COM
+$!
+$! Build the XSLT library
+$!
+$! Arguments:
+$!
+$!	p1	- "DEBUG" is you want to build with debug
+$!
+$! This package requires libxml to have already been installed.  You need
+$! to ensure that the logical name LIBXML is defined and points to the 
+$! directory containing libxml's .h files
+$!
+$! This procedure creates the object libraries
+$!
+$!	XML_LIBDIR:LIBXSLT.OLB
+$!	XML_LIBDIR:LIBEXSLT.OLB
+$!
+$! and the program
+$!
+$!	XSLTPROC
+$!
+$! After the library is built, you can link these routines into
+$! your code with the command  
+$!
+$! 	LINK your_modules,XML_LIBDIR:LIBEXSLT/LIB,LIBXSLT/LIBRARY,LIBXML/LIB
+$!
+$! Change History
+$! --------------
+$! Command file author : John A Fotheringham (jaf@jafsoft.com)
+$! Last update         : 2 Nov 2001
+$! 
+$!- configuration -------------------------------------------------------------
+$!
+$!- compile command.
+$!
+$   cc_opts = "/INCLUDE=([],XML_SRCDIR:,[-.libxslt])/NAMES=(SHORTENED)/FLOAT=IEEE/IEEE_MODE=DENORM_RESULTS"
+$!
+$   if p1.eqs."DEBUG"
+$   then
+$     debug = "Y"
+$     cc_command = "CC''cc_opts'/DEBUG/NOOPTIMIZE/LIST/SHOW=ALL"
+$   else
+$     debug = "N"
+$     cc_command = "CC''cc_opts'"
+$   endif
+$!
+$!- configure multiple build passes for each library. -------------------------
+$!
+$!  For each pass:
+$!
+$!  "libname" is the name of the library or module being created
+$!
+$!  "progname" is the name of the program being created
+$!
+$!  "src" is the list of sources to be built into the library  or program
+$!	- This should be compared to the definition of 
+$!	  "<NAME>_la_SOURCES" in the MAKEFILE.IN file in 
+$!	  corresponding directory.
+$!
+$   num_passes = 3	! two libraries and a program
+$!
+$!- pass 1 - library LIBXSLT
+$!
+$   libname_1  = "LIBXSLT"
+$   h_file_1   = "xslt.h"
+$   progname_1 = ""
+$!
+$   ! see "libxslt_la_SOURCES" in [.libxslt]makefile.in
+$   src_1 = "xslt.c xsltutils.c pattern.c templates.c variables.c keys.c"
+$   src_1 = src_1 + " numbers.c extensions.c extra.c functions.c"
+$   src_1 = src_1 + " namespaces.c imports.c attributes.c documents.c"
+$   src_1 = src_1 + " preproc.c transform.c security.c"
+$!
+$!- pass 2 - library LIBEXSLT
+$!
+$   libname_2  = "LIBEXSLT"
+$   h_file_2   = "exslt.h"
+$   progname_2 = ""
+$!
+$   ! see "libexslt_la_SOURCES" in [.libexslt]makefile.in
+$   src_2   = "exslt.c common.c math.c sets.c functions.c strings.c date.c saxon.c dynamic.c"
+$!
+$!- pass 3 - program XSLTPROC
+$!
+$   libname_3  = ""
+$   h_file_3   = ""
+$   progname_3 = "XSLTPROC"
+$!
+$   ! see "xsltproc_SOURCES" in [.xsltproc]makefile.in
+$   src_3   = "xsltproc.c"
+$!
+$!- set up and check logicals  -----------------------------------------------
+$!
+$!  XML_LIBDIR - object library directory
+$!  XML_SRCDIR - top-level build directory of libxml package -- needed for config.h and trio.h
+$!  LIBXML - source directory containing .h files for libxml package
+$!
+$   if f$trnlnm("XML_LIBDIR").eqs.""
+$   then
+$     on error then continue
+$     globfile = f$search("[--...]libxml.olb")
+$     if globfile.eqs.""
+$     then
+$       write sys$output ""
+$       write sys$output "	You need to define the XML_LIBDIR logical name to"
+$       write sys$output "	point to the directory containing your object"
+$       write sys$output "	libraries.  This should already contain LIBXML.OLB"
+$       write sys$output "	from the libxml package, and will be the directory"
+$       write sys$output "	the new LIBXSLT.OLB library will be placed in"
+$       write sys$output ""
+$       exit
+$     else
+$	srcdir = f$parse(globfile,,,"DEVICE") + f$parse(globfile,,,"DIRECTORY")
+$	define/process XML_LIBDIR "''srcdir'"
+$       write sys$output "Defining XML_LIBDIR as ""''srcdir'"""
+$     endif
+$   endif
+$!
+$   if f$trnlnm("libxml").eqs.""
+$   then
+$     ! look for globals.h in a directory installed paralle to this one
+$     on error then continue
+$     globfile = f$search("[--...]globals.h")
+$     if globfile.eqs.""
+$     then
+$       write sys$output ""
+$       write sys$output "	You need to define a LIBXML logical directory to"
+$       write sys$output "	point to the directory containing the .h files"
+$       write sys$output "	for the libxml package"
+$       write sys$output ""
+$       exit
+$     else
+$	srcdir = f$element(0,"]",globfile)+ "]"
+$	define/process LIBXML "''srcdir'"
+$       write sys$output "Defining LIBXML as ""''srcdir'"""
+$     endif
+$   endif
+$!
+$   if f$trnlnm("XML_SRCDIR").eqs.""
+$   then
+$     globfile = f$search("[--...]globals.c")
+$     if globfile.eqs.""
+$     then
+$	write sys$output "Can't locate globals.c.  You need to manually define a XML_SRCDIR logical"
+$	exit
+$     else
+$	srcdir = f$parse(globfile,,,"DEVICE") + f$parse(globfile,,,"DIRECTORY")
+$	define/process XML_SRCDIR "''srcdir'"
+$       write sys$output "Defining XML_SRCDIR as ""''srcdir'"""
+$     endif
+$   endif
+$!
+$!- set up some working logicals -------------------
+$!
+$ pass_no = 1
+$ set_pass_logical:
+$!
+$   if pass_no.le.num_passes
+$   then
+$!
+$     Libname  = libname_'pass_no'
+$     progname = progname_'pass_no'
+$     if libname.nes.""
+$     then
+$       logname  = "''libname'_SRCDIR"
+$     else
+$       logname  = "''progname'_SRCDIR"
+$     endif
+$     findfile = f$element(0," ",src_'pass_no')
+$!
+$!--- set up a source directory logical
+$!
+$     if f$trnlnm("''logname'").eqs.""
+$     then
+$       ! look for the target file in a parallel subdirectory
+$       globfile = f$search("[-...]''findfile'")
+$       if globfile.eqs.""
+$       then
+$  	  write sys$output "Can't locate ''findfile'.  You need to manually define a ''logname' logical"
+$	  exit
+$       else
+$  	  srcdir = f$element(0,"]",globfile)+ "]"
+$	  define/process 'logname' "''srcdir'"
+$         write sys$output "Defining ''logname' as ""''srcdir'"""
+$       endif
+$     endif
+$!
+$!--- if it's a library, set up a logical pointing to the .h files
+$!
+$     if libname.nes."" 
+$     then
+$	if f$trnlnm("''libname'").eqs."" 
+$       then 
+$         ! look for the target .h file in a parallel subdirectory
+$  	  h_file = h_file_'pass_no'
+$         globfile = f$search("[-...]''h_file'")
+$         if globfile.eqs.""
+$         then
+$	    write sys$output "Can't locate ''h_file'.  You need to manually define a ''libname' logical"
+$	    exit
+$         else
+$	    includedir = f$element(0,"]",globfile)+ "]"
+$	    define/process 'libname' "''includedir'"
+$           write sys$output "Defining ''libname' as ""''includedir'"""
+$	  endif
+$       endif
+$     endif
+$!
+$     pass_no = pass_no +1
+$     goto set_pass_logical
+$!
+$   endif	! for each pass
+$!
+$!- set up error handling (such as it is) -------------------------------------
+$!
+$ exit_status = 1
+$ saved_default = f$environment("default")
+$ on error then goto ERROR_OUT 
+$ on control_y then goto ERROR_OUT 
+$!
+$ goto start_here
+$ start_here:	  ! move this line to debug/rerun parts of this command file
+$!
+$!- compile modules into the library ------------------------------------------
+$!
+$!
+$ pass_no = 1	! make three passes, one for each library, one for XSLTPROC
+$ pass_loop:
+$!
+$ if pass_no.le.num_passes
+$ then
+$   Libname  = libname_'pass_no'
+$   progname = progname_'pass_no'
+$   if libname.nes.""
+$   then
+$     logname  = "''libname'_SRCDIR"
+$     pass_description = "the XML_LIBDIR:''libname'.OLB object library"
+$   else
+$     logname  = "''progname'_SRCDIR"
+$     pass_description = "the programs in ''progname'"
+$   endif
+$   src  = src_'pass_no'
+$!
+$!- create the library if need
+$!
+$   if libname.nes."" 
+$   then
+$     if f$search("XML_LIBDIR:''libname'.OLB").eqs."" 
+$     then
+$       write sys$output "Creating new object library XML_LIBDIR:''libname'.OLB..."
+$       library/create XML_LIBDIR:'libname'.OLB
+$     endif
+$   endif
+$!
+$!- move to the source directory 
+$!
+$   set def 'logname'
+$!
+$!- define the library and link commands (link command not used as is)
+$!
+$   if libname.nes.""
+$   then
+$     lib_command  = "LIBRARY/REPLACE XML_LIBDIR:''libname'.OLB"
+$     link_command = ""
+$   else
+$     lib_command  = ""
+$     link_command = "LINK"
+$   endif
+$!
+$   write sys$output ""
+$   write sys$output "Building ''pass_description'
+$   write sys$output ""
+$!
+$   s_no = 0
+$   src = f$edit(src,"COMPRESS")
+$!
+$ source_loop:
+$!
+$     next_source = f$element (S_no," ",src)
+$     if next_source.nes."" .and. next_source.nes." "
+$     then
+$       call build 'next_source'
+$       s_no = s_no + 1
+$       goto source_loop
+$     endif
+$!
+$     pass_no = pass_no + 1
+$     goto pass_loop
+$!
+$   endif	! for each pass
+$!
+$!- Th-th-th-th-th-that's all folks! ------------------------------------------
+$!
+$EXIT_OUT:
+$!
+$ set def 'saved_default
+$ exit 'exit_status
+$!
+$
+$ERROR_OUT:
+$ exit_status = $status
+$ write sys$output "''f$message(exit_status)'"
+$ goto EXIT_OUT
+$!
+$!- the BUILD subroutine.  Compile then insert into library or link as required
+$!
+$BUILD: subroutine
+$   on warning then goto EXIT_BUILD
+$   source_file = p1
+$   name = f$element(0,".",source_file)
+$   object_file = f$fao("XML_LIBDIR:!AS.OBJ",name)
+$!
+$!- compile
+$   write sys$output "Compiling ",p1,p2,"..."
+$   cc_command /object='object_file 'source_file' 'p2'
+$!
+$!- insert into library if command defined
+$!
+$   if lib_command.nes.""  
+$   then 
+$     lib_command 'object_file'
+$     delete/nolog 'object_file';*
+$   endif
+$!
+$!- link module if command defined
+$!
+$   if link_command.nes."" 
+$   then
+$	text = f$element(0,".",p1)	! lose the ".c"
+$	write sys$output "Linking ",text,"..."
+$	dbgopts = ""
+$	if debug then dbgopts = "/DEBUG"
+$	link_command'dbgopts' 'object_file',-
+      		XML_LIBDIR:libexslt/lib,-
+      		XML_LIBDIR:libxslt/lib,-
+      		XML_LIBDIR:libxml/library
+$   endif
+$!
+$EXIT_BUILD:
+$   exit $status
+$!
+$endsubroutine
--- a/Language/vmsbackup_build.com
+++ b/Language/vmsbackup_build.com
@@ -0,0 +1,10 @@
+$! Compiling with VAXC is said to work, but it requires the usual cruft
+$! (vaxcrtl and all), and to avoid hair we don't supply said cruft here.
+$ CC/DECC/PREFIX=all VMSBACKUP.C/DEFINE=(HAVE_MT_IOCTLS=0,HAVE_UNIXIO_H=1)
+$ CC/DECC/PREFIX=all DCLMAIN.C
+$! Probably we don't want match as it probably doesn't implement VMS-style
+$! matching, but I haven't looking into the issues yet.
+$ CC/DECC/PREFIX=all match
+$ LINK/exe=VMSBACKUP.EXE -
+vmsbackup.obj,dclmain.obj,match.obj,sys$input/opt
+identification="VMSBACKUP4.1.1"
--- a/Zone/sample.arpa
+++ b/Zone/sample.arpa
@@ -0,0 +1,13 @@
+$ORIGIN 0.0.0.c.2.1.0.3.0.0.2.1.e.f.f.3.ip6.arpa.
+$TTL     60
+@ 	 IN SOA ns root (
+	     2002042901 ; SERIAL
+	     7200       ; REFRESH
+	     600        ; RETRY
+	     36000000   ; EXPIRE
+	     120        ; MINIMUM
+	     )
+
+	    NS	 ns.example.com.
+
+c.a.7.e.d.7.e.f.f.f.0.2.8.0.a.0 PTR  sip01.example.com.
--- a/Zone/sneaky.net.zone
+++ b/Zone/sneaky.net.zone
@@ -0,0 +1,12 @@
+$TTL 3d
+@ IN SOA root.localhost. root.sneaky.net. (
+    2015042907 ; serial
+    3d         ; refresh
+    1h         ; retry
+    12d        ; expire
+    2h         ; negative response TTL
+  )
+  IN NS root.localhost.
+  IN NS localhost. ; secondary name server is preferably externally maintained
+
+www IN A 3.141.59.26
--- a/samples/DTrace/javascript-trace.d
+++ b/samples/DTrace/javascript-trace.d
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: dtrace-script; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 *
--- a/samples/ECLiPSe/or-constraint.ecl
+++ b/samples/ECLiPSe/or-constraint.ecl
--- a/samples/Elixir/filenames/mix.lock
+++ b/samples/Elixir/filenames/mix.lock
@@ -0,0 +1,10 @@
+%{"cowboy": {:hex, :cowboy, "1.0.0"},
+  "cowlib": {:hex, :cowlib, "1.0.1"},
+  "hackney": {:hex, :hackney, "0.14.3"},
+  "hound": {:hex, :hound, "0.6.0"},
+  "httpoison": {:hex, :httpoison, "0.5.0"},
+  "idna": {:hex, :idna, "1.0.1"},
+  "phoenix": {:hex, :phoenix, "0.10.0"},
+  "plug": {:hex, :plug, "0.11.1"},
+  "poison": {:hex, :poison, "1.3.1"},
+  "ranch": {:hex, :ranch, "1.0.0"}}
--- a/samples/Erlang/elixir_parser.yrl
+++ b/samples/Erlang/elixir_parser.yrl
@@ -0,0 +1,856 @@
+Nonterminals
+  grammar expr_list
+  expr container_expr block_expr access_expr
+  no_parens_expr no_parens_zero_expr no_parens_one_expr no_parens_one_ambig_expr
+  bracket_expr bracket_at_expr bracket_arg matched_expr unmatched_expr max_expr
+  unmatched_op_expr matched_op_expr no_parens_op_expr no_parens_many_expr
+  comp_op_eol at_op_eol unary_op_eol and_op_eol or_op_eol capture_op_eol
+  add_op_eol mult_op_eol two_op_eol three_op_eol pipe_op_eol stab_op_eol
+  arrow_op_eol match_op_eol when_op_eol in_op_eol in_match_op_eol
+  type_op_eol rel_op_eol
+  open_paren close_paren empty_paren eoe
+  list list_args open_bracket close_bracket
+  tuple open_curly close_curly
+  bit_string open_bit close_bit
+  map map_op map_close map_args map_expr struct_op
+  assoc_op_eol assoc_expr assoc_base assoc_update assoc_update_kw assoc
+  container_args_base container_args
+  call_args_parens_expr call_args_parens_base call_args_parens parens_call
+  call_args_no_parens_one call_args_no_parens_ambig call_args_no_parens_expr
+  call_args_no_parens_comma_expr call_args_no_parens_all call_args_no_parens_many
+  call_args_no_parens_many_strict
+  stab stab_eoe stab_expr stab_op_eol_and_expr stab_parens_many
+  kw_eol kw_base kw call_args_no_parens_kw_expr call_args_no_parens_kw
+  dot_op dot_alias dot_alias_container
+  dot_identifier dot_op_identifier dot_do_identifier
+  dot_paren_identifier dot_bracket_identifier
+  do_block fn_eoe do_eoe end_eoe block_eoe block_item block_list
+  .
+
+Terminals
+  identifier kw_identifier kw_identifier_safe kw_identifier_unsafe bracket_identifier
+  paren_identifier do_identifier block_identifier
+  fn 'end' aliases
+  number atom atom_safe atom_unsafe bin_string list_string sigil
+  dot_call_op op_identifier
+  comp_op at_op unary_op and_op or_op arrow_op match_op in_op in_match_op
+  type_op dual_op add_op mult_op two_op three_op pipe_op stab_op when_op assoc_op
+  capture_op rel_op
+  'true' 'false' 'nil' 'do' eol ';' ',' '.'
+  '(' ')' '[' ']' '{' '}' '<<' '>>' '%{}' '%'
+  .
+
+Rootsymbol grammar.
+
+%% Two shift/reduce conflicts coming from call_args_parens.
+Expect 2.
+
+%% Changes in ops and precedence should be reflected on lib/elixir/lib/macro.ex
+%% Note though the operator => in practice has lower precedence than all others,
+%% its entry in the table is only to support the %{user | foo => bar} syntax.
+Left       5 do.
+Right     10 stab_op_eol.     %% ->
+Left      20 ','.
+Nonassoc  30 capture_op_eol.  %% &
+Left      40 in_match_op_eol. %% <-, \\ (allowed in matches along =)
+Right     50 when_op_eol.     %% when
+Right     60 type_op_eol.     %% ::
+Right     70 pipe_op_eol.     %% |
+Right     80 assoc_op_eol.    %% =>
+Right     90 match_op_eol.    %% =
+Left     130 or_op_eol.       %% ||, |||, or
+Left     140 and_op_eol.      %% &&, &&&, and
+Left     150 comp_op_eol.     %% ==, !=, =~, ===, !==
+Left     160 rel_op_eol.      %% <, >, <=, >=
+Left     170 arrow_op_eol.    %% |>, <<<, >>>, ~>>, <<~, ~>, <~, <~>, <|>
+Left     180 in_op_eol.       %% in
+Left     190 three_op_eol.    %% ^^^
+Right    200 two_op_eol.      %% ++, --, .., <>
+Left     210 add_op_eol.      %% +, -
+Left     220 mult_op_eol.     %% *, /
+Nonassoc 300 unary_op_eol.    %% +, -, !, ^, not, ~~~
+Left     310 dot_call_op.
+Left     310 dot_op.          %% .
+Nonassoc 320 at_op_eol.       %% @
+Nonassoc 330 dot_identifier.
+
+%%% MAIN FLOW OF EXPRESSIONS
+
+grammar -> eoe : nil.
+grammar -> expr_list : to_block('$1').
+grammar -> eoe expr_list : to_block('$2').
+grammar -> expr_list eoe : to_block('$1').
+grammar -> eoe expr_list eoe : to_block('$2').
+grammar -> '$empty' : nil.
+
+% Note expressions are on reverse order
+expr_list -> expr : ['$1'].
+expr_list -> expr_list eoe expr : ['$3'|'$1'].
+
+expr -> matched_expr : '$1'.
+expr -> no_parens_expr : '$1'.
+expr -> unmatched_expr : '$1'.
+
+%% In Elixir we have three main call syntaxes: with parentheses,
+%% without parentheses and with do blocks. They are represented
+%% in the AST as matched, no_parens and unmatched.
+%%
+%% Calls without parentheses are further divided according to how
+%% problematic they are:
+%%
+%% (a) no_parens_one: a call with one unproblematic argument
+%% (e.g. `f a` or `f g a` and similar) (includes unary operators)
+%%
+%% (b) no_parens_many: a call with several arguments (e.g. `f a, b`)
+%%
+%% (c) no_parens_one_ambig: a call with one argument which is
+%% itself a no_parens_many or no_parens_one_ambig (e.g. `f g a, b`
+%% or `f g h a, b` and similar)
+%%
+%% Note, in particular, that no_parens_one_ambig expressions are
+%% ambiguous and are interpreted such that the outer function has
+%% arity 1 (e.g. `f g a, b` is interpreted as `f(g(a, b))` rather
+%% than `f(g(a), b)`). Hence the name, no_parens_one_ambig.
+%%
+%% The distinction is required because we can't, for example, have
+%% a function call with a do block as argument inside another do
+%% block call, unless there are parentheses:
+%%
+%%   if if true do true else false end do  #=> invalid
+%%   if(if true do true else false end) do #=> valid
+%%
+%% Similarly, it is not possible to nest calls without parentheses
+%% if their arity is more than 1:
+%%
+%%   foo a, bar b, c  #=> invalid
+%%   foo(a, bar b, c) #=> invalid
+%%   foo bar a, b     #=> valid
+%%   foo a, bar(b, c) #=> valid
+%%
+%% So the different grammar rules need to take into account
+%% if calls without parentheses are do blocks in particular
+%% segments and act accordingly.
+matched_expr -> matched_expr matched_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+matched_expr -> unary_op_eol matched_expr : build_unary_op('$1', '$2').
+matched_expr -> at_op_eol matched_expr : build_unary_op('$1', '$2').
+matched_expr -> capture_op_eol matched_expr : build_unary_op('$1', '$2').
+matched_expr -> no_parens_one_expr : '$1'.
+matched_expr -> no_parens_zero_expr : '$1'.
+matched_expr -> access_expr : '$1'.
+matched_expr -> access_expr kw_identifier : throw_invalid_kw_identifier('$2').
+
+unmatched_expr -> matched_expr unmatched_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+unmatched_expr -> unmatched_expr matched_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+unmatched_expr -> unmatched_expr unmatched_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+unmatched_expr -> unmatched_expr no_parens_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+unmatched_expr -> unary_op_eol expr : build_unary_op('$1', '$2').
+unmatched_expr -> at_op_eol expr : build_unary_op('$1', '$2').
+unmatched_expr -> capture_op_eol expr : build_unary_op('$1', '$2').
+unmatched_expr -> block_expr : '$1'.
+
+no_parens_expr -> matched_expr no_parens_op_expr : build_op(element(1, '$2'), '$1', element(2, '$2')).
+no_parens_expr -> unary_op_eol no_parens_expr : build_unary_op('$1', '$2').
+no_parens_expr -> at_op_eol no_parens_expr : build_unary_op('$1', '$2').
+no_parens_expr -> capture_op_eol no_parens_expr : build_unary_op('$1', '$2').
+no_parens_expr -> no_parens_one_ambig_expr : '$1'.
+no_parens_expr -> no_parens_many_expr : '$1'.
+
+block_expr -> parens_call call_args_parens do_block : build_identifier('$1', '$2' ++ '$3').
+block_expr -> parens_call call_args_parens call_args_parens do_block : build_nested_parens('$1', '$2', '$3' ++ '$4').
+block_expr -> dot_do_identifier do_block : build_identifier('$1', '$2').
+block_expr -> dot_identifier call_args_no_parens_all do_block : build_identifier('$1', '$2' ++ '$3').
+
+matched_op_expr -> match_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> add_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> mult_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> two_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> three_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> and_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> or_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> in_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> in_match_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> type_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> when_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> pipe_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> comp_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> rel_op_eol matched_expr : {'$1', '$2'}.
+matched_op_expr -> arrow_op_eol matched_expr : {'$1', '$2'}.
+%% Warn for no parens subset
+matched_op_expr -> arrow_op_eol no_parens_one_expr : warn_pipe('$1', '$2'), {'$1', '$2'}.
+
+unmatched_op_expr -> match_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> add_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> mult_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> two_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> three_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> and_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> or_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> in_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> in_match_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> type_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> when_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> pipe_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> comp_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> rel_op_eol unmatched_expr : {'$1', '$2'}.
+unmatched_op_expr -> arrow_op_eol unmatched_expr : {'$1', '$2'}.
+
+no_parens_op_expr -> match_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> add_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> mult_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> two_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> three_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> and_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> or_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> in_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> in_match_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> type_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> when_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> pipe_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> comp_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> rel_op_eol no_parens_expr : {'$1', '$2'}.
+no_parens_op_expr -> arrow_op_eol no_parens_expr : {'$1', '$2'}.
+%% Warn for no parens subset
+no_parens_op_expr -> arrow_op_eol no_parens_one_ambig_expr : warn_pipe('$1', '$2'), {'$1', '$2'}.
+no_parens_op_expr -> arrow_op_eol no_parens_many_expr : warn_pipe('$1', '$2'), {'$1', '$2'}.
+
+%% Allow when (and only when) with keywords
+no_parens_op_expr -> when_op_eol call_args_no_parens_kw : {'$1', '$2'}.
+
+no_parens_one_ambig_expr -> dot_op_identifier call_args_no_parens_ambig : build_identifier('$1', '$2').
+no_parens_one_ambig_expr -> dot_identifier call_args_no_parens_ambig : build_identifier('$1', '$2').
+
+no_parens_many_expr -> dot_op_identifier call_args_no_parens_many_strict : build_identifier('$1', '$2').
+no_parens_many_expr -> dot_identifier call_args_no_parens_many_strict : build_identifier('$1', '$2').
+
+no_parens_one_expr -> dot_op_identifier call_args_no_parens_one : build_identifier('$1', '$2').
+no_parens_one_expr -> dot_identifier call_args_no_parens_one : build_identifier('$1', '$2').
+no_parens_zero_expr -> dot_do_identifier : build_identifier('$1', nil).
+no_parens_zero_expr -> dot_identifier : build_identifier('$1', nil).
+
+%% From this point on, we just have constructs that can be
+%% used with the access syntax. Notice that (dot_)identifier
+%% is not included in this list simply because the tokenizer
+%% marks identifiers followed by brackets as bracket_identifier.
+access_expr -> bracket_at_expr : '$1'.
+access_expr -> bracket_expr : '$1'.
+access_expr -> at_op_eol number : build_unary_op('$1', ?exprs('$2')).
+access_expr -> unary_op_eol number : build_unary_op('$1', ?exprs('$2')).
+access_expr -> capture_op_eol number : build_unary_op('$1', ?exprs('$2')).
+access_expr -> fn_eoe stab end_eoe : build_fn('$1', reverse('$2')).
+access_expr -> open_paren stab close_paren : build_stab(reverse('$2')).
+access_expr -> open_paren stab ';' close_paren : build_stab(reverse('$2')).
+access_expr -> open_paren ';' stab ';' close_paren : build_stab(reverse('$3')).
+access_expr -> open_paren ';' stab close_paren : build_stab(reverse('$3')).
+access_expr -> open_paren ';' close_paren : build_stab([]).
+access_expr -> empty_paren : nil.
+access_expr -> number : ?exprs('$1').
+access_expr -> list : element(1, '$1').
+access_expr -> map : '$1'.
+access_expr -> tuple : '$1'.
+access_expr -> 'true' : ?id('$1').
+access_expr -> 'false' : ?id('$1').
+access_expr -> 'nil' : ?id('$1').
+access_expr -> bin_string  : build_bin_string('$1').
+access_expr -> list_string : build_list_string('$1').
+access_expr -> bit_string : '$1'.
+access_expr -> sigil : build_sigil('$1').
+access_expr -> max_expr : '$1'.
+
+%% Aliases and properly formed calls. Used by map_expr.
+max_expr -> atom : ?exprs('$1').
+max_expr -> atom_safe : build_quoted_atom('$1', true).
+max_expr -> atom_unsafe : build_quoted_atom('$1', false).
+max_expr -> parens_call call_args_parens : build_identifier('$1', '$2').
+max_expr -> parens_call call_args_parens call_args_parens : build_nested_parens('$1', '$2', '$3').
+max_expr -> dot_alias : '$1'.
+
+bracket_arg -> open_bracket kw close_bracket : build_list('$1', '$2').
+bracket_arg -> open_bracket container_expr close_bracket : build_list('$1', '$2').
+bracket_arg -> open_bracket container_expr ',' close_bracket : build_list('$1', '$2').
+
+bracket_expr -> dot_bracket_identifier bracket_arg : build_access(build_identifier('$1', nil), '$2').
+bracket_expr -> access_expr bracket_arg : build_access('$1', '$2').
+
+bracket_at_expr -> at_op_eol dot_bracket_identifier bracket_arg :
+                     build_access(build_unary_op('$1', build_identifier('$2', nil)), '$3').
+bracket_at_expr -> at_op_eol access_expr bracket_arg :
+                     build_access(build_unary_op('$1', '$2'), '$3').
+
+%% Blocks
+
+do_block -> do_eoe 'end' : [[{do, nil}]].
+do_block -> do_eoe stab end_eoe : [[{do, build_stab(reverse('$2'))}]].
+do_block -> do_eoe block_list 'end' : [[{do, nil}|'$2']].
+do_block -> do_eoe stab_eoe block_list 'end' : [[{do, build_stab(reverse('$2'))}|'$3']].
+
+eoe -> eol : '$1'.
+eoe -> ';' : '$1'.
+eoe -> eol ';' : '$1'.
+
+fn_eoe -> 'fn' : '$1'.
+fn_eoe -> 'fn' eoe : '$1'.
+
+do_eoe -> 'do' : '$1'.
+do_eoe -> 'do' eoe : '$1'.
+
+end_eoe -> 'end' : '$1'.
+end_eoe -> eoe 'end' : '$2'.
+
+block_eoe -> block_identifier : '$1'.
+block_eoe -> block_identifier eoe : '$1'.
+
+stab -> stab_expr : ['$1'].
+stab -> stab eoe stab_expr : ['$3'|'$1'].
+
+stab_eoe -> stab : '$1'.
+stab_eoe -> stab eoe : '$1'.
+
+%% Here, `element(1, Token)` is the stab operator,
+%% while `element(2, Token)` is the expression.
+stab_expr -> expr :
+               '$1'.
+stab_expr -> stab_op_eol_and_expr :
+               build_op(element(1, '$1'), [], element(2, '$1')).
+stab_expr -> empty_paren stab_op_eol_and_expr :
+               build_op(element(1, '$2'), [], element(2, '$2')).
+stab_expr -> call_args_no_parens_all stab_op_eol_and_expr :
+               build_op(element(1, '$2'), unwrap_when(unwrap_splice('$1')), element(2, '$2')).
+stab_expr -> stab_parens_many stab_op_eol_and_expr :
+               build_op(element(1, '$2'), unwrap_splice('$1'), element(2, '$2')).
+stab_expr -> stab_parens_many when_op expr stab_op_eol_and_expr :
+               build_op(element(1, '$4'), [{'when', meta_from_token('$2'), unwrap_splice('$1') ++ ['$3']}], element(2, '$4')).
+
+stab_op_eol_and_expr -> stab_op_eol expr : {'$1', '$2'}.
+stab_op_eol_and_expr -> stab_op_eol : warn_empty_stab_clause('$1'), {'$1', nil}.
+
+block_item -> block_eoe stab_eoe : {?exprs('$1'), build_stab(reverse('$2'))}.
+block_item -> block_eoe : {?exprs('$1'), nil}.
+
+block_list -> block_item : ['$1'].
+block_list -> block_item block_list : ['$1'|'$2'].
+
+%% Helpers
+
+open_paren -> '('      : '$1'.
+open_paren -> '(' eol  : '$1'.
+close_paren -> ')'     : '$1'.
+close_paren -> eol ')' : '$2'.
+
+empty_paren -> open_paren ')' : '$1'.
+
+open_bracket  -> '['     : '$1'.
+open_bracket  -> '[' eol : '$1'.
+close_bracket -> ']'     : '$1'.
+close_bracket -> eol ']' : '$2'.
+
+open_bit  -> '<<'     : '$1'.
+open_bit  -> '<<' eol : '$1'.
+close_bit -> '>>'     : '$1'.
+close_bit -> eol '>>' : '$2'.
+
+open_curly  -> '{'     : '$1'.
+open_curly  -> '{' eol : '$1'.
+close_curly -> '}'     : '$1'.
+close_curly -> eol '}' : '$2'.
+
+% Operators
+
+add_op_eol -> add_op : '$1'.
+add_op_eol -> add_op eol : '$1'.
+add_op_eol -> dual_op : '$1'.
+add_op_eol -> dual_op eol : '$1'.
+
+mult_op_eol -> mult_op : '$1'.
+mult_op_eol -> mult_op eol : '$1'.
+
+two_op_eol -> two_op : '$1'.
+two_op_eol -> two_op eol : '$1'.
+
+three_op_eol -> three_op : '$1'.
+three_op_eol -> three_op eol : '$1'.
+
+pipe_op_eol -> pipe_op : '$1'.
+pipe_op_eol -> pipe_op eol : '$1'.
+
+capture_op_eol -> capture_op : '$1'.
+capture_op_eol -> capture_op eol : '$1'.
+
+unary_op_eol -> unary_op : '$1'.
+unary_op_eol -> unary_op eol : '$1'.
+unary_op_eol -> dual_op : '$1'.
+unary_op_eol -> dual_op eol : '$1'.
+
+match_op_eol -> match_op : '$1'.
+match_op_eol -> match_op eol : '$1'.
+
+and_op_eol -> and_op : '$1'.
+and_op_eol -> and_op eol : '$1'.
+
+or_op_eol -> or_op : '$1'.
+or_op_eol -> or_op eol : '$1'.
+
+in_op_eol -> in_op : '$1'.
+in_op_eol -> in_op eol : '$1'.
+
+in_match_op_eol -> in_match_op : '$1'.
+in_match_op_eol -> in_match_op eol : '$1'.
+
+type_op_eol -> type_op : '$1'.
+type_op_eol -> type_op eol : '$1'.
+
+when_op_eol -> when_op : '$1'.
+when_op_eol -> when_op eol : '$1'.
+
+stab_op_eol -> stab_op : '$1'.
+stab_op_eol -> stab_op eol : '$1'.
+
+at_op_eol -> at_op : '$1'.
+at_op_eol -> at_op eol : '$1'.
+
+comp_op_eol -> comp_op : '$1'.
+comp_op_eol -> comp_op eol : '$1'.
+
+rel_op_eol -> rel_op : '$1'.
+rel_op_eol -> rel_op eol : '$1'.
+
+arrow_op_eol -> arrow_op : '$1'.
+arrow_op_eol -> arrow_op eol : '$1'.
+
+% Dot operator
+
+dot_op -> '.' : '$1'.
+dot_op -> '.' eol : '$1'.
+
+dot_identifier -> identifier : '$1'.
+dot_identifier -> matched_expr dot_op identifier : build_dot('$2', '$1', '$3').
+
+dot_alias -> aliases : {'__aliases__', meta_from_token('$1', 0), ?exprs('$1')}.
+dot_alias -> matched_expr dot_op aliases : build_dot_alias('$2', '$1', '$3').
+dot_alias -> matched_expr dot_op dot_alias_container : build_dot_container('$2', '$1', '$3').
+
+dot_alias_container -> open_curly '}' : [].
+dot_alias_container -> open_curly container_args close_curly : '$2'.
+
+dot_op_identifier -> op_identifier : '$1'.
+dot_op_identifier -> matched_expr dot_op op_identifier : build_dot('$2', '$1', '$3').
+
+dot_do_identifier -> do_identifier : '$1'.
+dot_do_identifier -> matched_expr dot_op do_identifier : build_dot('$2', '$1', '$3').
+
+dot_bracket_identifier -> bracket_identifier : '$1'.
+dot_bracket_identifier -> matched_expr dot_op bracket_identifier : build_dot('$2', '$1', '$3').
+
+dot_paren_identifier -> paren_identifier : '$1'.
+dot_paren_identifier -> matched_expr dot_op paren_identifier : build_dot('$2', '$1', '$3').
+
+parens_call -> dot_paren_identifier : '$1'.
+parens_call -> matched_expr dot_call_op : {'.', meta_from_token('$2'), ['$1']}. % Fun/local calls
+
+% Function calls with no parentheses
+
+call_args_no_parens_expr -> matched_expr : '$1'.
+call_args_no_parens_expr -> no_parens_expr : throw_no_parens_many_strict('$1').
+
+call_args_no_parens_comma_expr -> matched_expr ',' call_args_no_parens_expr : ['$3', '$1'].
+call_args_no_parens_comma_expr -> call_args_no_parens_comma_expr ',' call_args_no_parens_expr : ['$3'|'$1'].
+
+call_args_no_parens_all -> call_args_no_parens_one : '$1'.
+call_args_no_parens_all -> call_args_no_parens_ambig : '$1'.
+call_args_no_parens_all -> call_args_no_parens_many : '$1'.
+
+call_args_no_parens_one -> call_args_no_parens_kw : ['$1'].
+call_args_no_parens_one -> matched_expr : ['$1'].
+
+call_args_no_parens_ambig -> no_parens_expr : ['$1'].
+
+call_args_no_parens_many -> matched_expr ',' call_args_no_parens_kw : ['$1', '$3'].
+call_args_no_parens_many -> call_args_no_parens_comma_expr : reverse('$1').
+call_args_no_parens_many -> call_args_no_parens_comma_expr ',' call_args_no_parens_kw : reverse(['$3'|'$1']).
+
+call_args_no_parens_many_strict -> call_args_no_parens_many : '$1'.
+call_args_no_parens_many_strict -> open_paren call_args_no_parens_kw close_paren : throw_no_parens_strict('$1').
+call_args_no_parens_many_strict -> open_paren call_args_no_parens_many close_paren : throw_no_parens_strict('$1').
+
+stab_parens_many -> open_paren call_args_no_parens_kw close_paren : ['$2'].
+stab_parens_many -> open_paren call_args_no_parens_many close_paren : '$2'.
+
+% Containers
+
+container_expr -> matched_expr : '$1'.
+container_expr -> unmatched_expr : '$1'.
+container_expr -> no_parens_expr : throw_no_parens_container_strict('$1').
+
+container_args_base -> container_expr : ['$1'].
+container_args_base -> container_args_base ',' container_expr : ['$3'|'$1'].
+
+container_args -> container_args_base : lists:reverse('$1').
+container_args -> container_args_base ',' : lists:reverse('$1').
+container_args -> container_args_base ',' kw : lists:reverse(['$3'|'$1']).
+
+% Function calls with parentheses
+
+call_args_parens_expr -> matched_expr : '$1'.
+call_args_parens_expr -> unmatched_expr : '$1'.
+call_args_parens_expr -> no_parens_expr : throw_no_parens_many_strict('$1').
+
+call_args_parens_base -> call_args_parens_expr : ['$1'].
+call_args_parens_base -> call_args_parens_base ',' call_args_parens_expr : ['$3'|'$1'].
+
+call_args_parens -> empty_paren : [].
+call_args_parens -> open_paren no_parens_expr close_paren : ['$2'].
+call_args_parens -> open_paren kw close_paren : ['$2'].
+call_args_parens -> open_paren call_args_parens_base close_paren : reverse('$2').
+call_args_parens -> open_paren call_args_parens_base ',' kw close_paren : reverse(['$4'|'$2']).
+
+% KV
+
+kw_eol -> kw_identifier : ?exprs('$1').
+kw_eol -> kw_identifier eol : ?exprs('$1').
+kw_eol -> kw_identifier_safe : build_quoted_atom('$1', true).
+kw_eol -> kw_identifier_safe eol : build_quoted_atom('$1', true).
+kw_eol -> kw_identifier_unsafe : build_quoted_atom('$1', false).
+kw_eol -> kw_identifier_unsafe eol : build_quoted_atom('$1', false).
+
+kw_base -> kw_eol container_expr : [{'$1', '$2'}].
+kw_base -> kw_base ',' kw_eol container_expr : [{'$3', '$4'}|'$1'].
+
+kw -> kw_base : reverse('$1').
+kw -> kw_base ',' : reverse('$1').
+
+call_args_no_parens_kw_expr -> kw_eol matched_expr : {'$1', '$2'}.
+call_args_no_parens_kw_expr -> kw_eol no_parens_expr : {'$1', '$2'}.
+
+call_args_no_parens_kw -> call_args_no_parens_kw_expr : ['$1'].
+call_args_no_parens_kw -> call_args_no_parens_kw_expr ',' call_args_no_parens_kw : ['$1'|'$3'].
+
+% Lists
+
+list_args -> kw : '$1'.
+list_args -> container_args_base : reverse('$1').
+list_args -> container_args_base ',' : reverse('$1').
+list_args -> container_args_base ',' kw : reverse('$1', '$3').
+
+list -> open_bracket ']' : build_list('$1', []).
+list -> open_bracket list_args close_bracket : build_list('$1', '$2').
+
+% Tuple
+
+tuple -> open_curly '}' : build_tuple('$1', []).
+tuple -> open_curly container_args close_curly :  build_tuple('$1', '$2').
+
+% Bitstrings
+
+bit_string -> open_bit '>>' : build_bit('$1', []).
+bit_string -> open_bit container_args close_bit : build_bit('$1', '$2').
+
+% Map and structs
+
+%% Allow unquote/@something/aliases inside maps and structs.
+map_expr -> max_expr : '$1'.
+map_expr -> dot_identifier : build_identifier('$1', nil).
+map_expr -> at_op_eol map_expr : build_unary_op('$1', '$2').
+
+assoc_op_eol -> assoc_op : '$1'.
+assoc_op_eol -> assoc_op eol : '$1'.
+
+assoc_expr -> matched_expr assoc_op_eol matched_expr : {'$1', '$3'}.
+assoc_expr -> unmatched_expr assoc_op_eol unmatched_expr : {'$1', '$3'}.
+assoc_expr -> matched_expr assoc_op_eol unmatched_expr : {'$1', '$3'}.
+assoc_expr -> unmatched_expr assoc_op_eol matched_expr : {'$1', '$3'}.
+assoc_expr -> map_expr : '$1'.
+
+assoc_update -> matched_expr pipe_op_eol assoc_expr : {'$2', '$1', ['$3']}.
+assoc_update -> unmatched_expr pipe_op_eol assoc_expr : {'$2', '$1', ['$3']}.
+
+assoc_update_kw -> matched_expr pipe_op_eol kw : {'$2', '$1', '$3'}.
+assoc_update_kw -> unmatched_expr pipe_op_eol kw : {'$2', '$1', '$3'}.
+
+assoc_base -> assoc_expr : ['$1'].
+assoc_base -> assoc_base ',' assoc_expr : ['$3'|'$1'].
+
+assoc -> assoc_base : reverse('$1').
+assoc -> assoc_base ',' : reverse('$1').
+
+map_op -> '%{}' : '$1'.
+map_op -> '%{}' eol : '$1'.
+
+map_close -> kw close_curly : '$1'.
+map_close -> assoc close_curly : '$1'.
+map_close -> assoc_base ',' kw close_curly : reverse('$1', '$3').
+
+map_args -> open_curly '}' : build_map('$1', []).
+map_args -> open_curly map_close : build_map('$1', '$2').
+map_args -> open_curly assoc_update close_curly : build_map_update('$1', '$2', []).
+map_args -> open_curly assoc_update ',' close_curly : build_map_update('$1', '$2', []).
+map_args -> open_curly assoc_update ',' map_close : build_map_update('$1', '$2', '$4').
+map_args -> open_curly assoc_update_kw close_curly : build_map_update('$1', '$2', []).
+
+struct_op -> '%' : '$1'.
+
+map -> map_op map_args : '$2'.
+map -> struct_op map_expr map_args : {'%', meta_from_token('$1'), ['$2', '$3']}.
+map -> struct_op map_expr eol map_args : {'%', meta_from_token('$1'), ['$2', '$4']}.
+
+Erlang code.
+
+-define(file(), get(elixir_parser_file)).
+-define(id(Token), element(1, Token)).
+-define(location(Token), element(2, Token)).
+-define(exprs(Token), element(3, Token)).
+-define(meta(Node), element(2, Node)).
+-define(rearrange_uop(Op), (Op == 'not' orelse Op == '!')).
+
+%% The following directive is needed for (significantly) faster
+%% compilation of the generated .erl file by the HiPE compiler
+-compile([{hipe, [{regalloc, linear_scan}]}]).
+-import(lists, [reverse/1, reverse/2]).
+
+meta_from_token(Token, Counter) -> [{counter, Counter}|meta_from_token(Token)].
+meta_from_token(Token) -> meta_from_location(?location(Token)).
+
+meta_from_location({Line, Column, EndColumn})
+  when is_integer(Line), is_integer(Column), is_integer(EndColumn) -> [{line, Line}].
+
+%% Operators
+
+build_op({_Kind, Location, 'in'}, {UOp, _, [Left]}, Right) when ?rearrange_uop(UOp) ->
+  {UOp, meta_from_location(Location), [{'in', meta_from_location(Location), [Left, Right]}]};
+
+build_op({_Kind, Location, Op}, Left, Right) ->
+  {Op, meta_from_location(Location), [Left, Right]}.
+
+build_unary_op({_Kind, Location, Op}, Expr) ->
+  {Op, meta_from_location(Location), [Expr]}.
+
+build_list(Marker, Args) ->
+  {Args, ?location(Marker)}.
+
+build_tuple(_Marker, [Left, Right]) ->
+  {Left, Right};
+build_tuple(Marker, Args) ->
+  {'{}', meta_from_token(Marker), Args}.
+
+build_bit(Marker, Args) ->
+  {'<<>>', meta_from_token(Marker), Args}.
+
+build_map(Marker, Args) ->
+  {'%{}', meta_from_token(Marker), Args}.
+
+build_map_update(Marker, {Pipe, Left, Right}, Extra) ->
+  {'%{}', meta_from_token(Marker), [build_op(Pipe, Left, Right ++ Extra)]}.
+
+%% Blocks
+
+build_block([{Op, _, [_]}]=Exprs) when ?rearrange_uop(Op) -> {'__block__', [], Exprs};
+build_block([{unquote_splicing, _, Args}]=Exprs) when
+                                      length(Args) =< 2 -> {'__block__', [], Exprs};
+build_block([Expr])                                     -> Expr;
+build_block(Exprs)                                      -> {'__block__', [], Exprs}.
+
+%% Dots
+
+build_dot_alias(Dot, {'__aliases__', _, Left}, {'aliases', _, Right}) ->
+  {'__aliases__', meta_from_token(Dot), Left ++ Right};
+
+build_dot_alias(_Dot, Atom, {'aliases', _, _} = Token) when is_atom(Atom) ->
+  throw_bad_atom(Token);
+
+build_dot_alias(Dot, Other, {'aliases', _, Right}) ->
+  {'__aliases__', meta_from_token(Dot), [Other|Right]}.
+
+build_dot_container(Dot, Left, Right) ->
+  Meta = meta_from_token(Dot),
+  {{'.', Meta, [Left, '{}']}, Meta, Right}.
+
+build_dot(Dot, Left, Right) ->
+  {'.', meta_from_token(Dot), [Left, extract_identifier(Right)]}.
+
+extract_identifier({Kind, _, Identifier}) when
+    Kind == identifier; Kind == bracket_identifier; Kind == paren_identifier;
+    Kind == do_identifier; Kind == op_identifier ->
+  Identifier.
+
+%% Identifiers
+
+build_nested_parens(Dot, Args1, Args2) ->
+  Identifier = build_identifier(Dot, Args1),
+  Meta = ?meta(Identifier),
+  {Identifier, Meta, Args2}.
+
+build_identifier({'.', Meta, _} = Dot, Args) ->
+  FArgs = case Args of
+    nil -> [];
+    _ -> Args
+  end,
+  {Dot, Meta, FArgs};
+
+build_identifier({op_identifier, Location, Identifier}, [Arg]) ->
+  {Identifier, [{ambiguous_op, nil}|meta_from_location(Location)], [Arg]};
+
+build_identifier({_, Location, Identifier}, Args) ->
+  {Identifier, meta_from_location(Location), Args}.
+
+%% Fn
+
+build_fn(Op, [{'->', _, [_, _]}|_] = Stab) ->
+  {fn, meta_from_token(Op), build_stab(Stab)};
+build_fn(Op, _Stab) ->
+  throw(meta_from_token(Op), "expected clauses to be defined with -> inside: ", "'fn'").
+
+%% Access
+
+build_access(Expr, {List, Location}) ->
+  Meta = meta_from_location(Location),
+  {{'.', Meta, ['Elixir.Access', get]}, Meta, [Expr, List]}.
+
+%% Interpolation aware
+
+build_sigil({sigil, Location, Sigil, Parts, Modifiers}) ->
+  Meta = meta_from_location(Location),
+  {list_to_atom("sigil_" ++ [Sigil]), Meta, [{'<<>>', Meta, string_parts(Parts)}, Modifiers]}.
+
+build_bin_string({bin_string, _Location, [H]}) when is_binary(H) ->
+  H;
+build_bin_string({bin_string, Location, Args}) ->
+  {'<<>>', meta_from_location(Location), string_parts(Args)}.
+
+build_list_string({list_string, _Location, [H]}) when is_binary(H) ->
+  elixir_utils:characters_to_list(H);
+build_list_string({list_string, Location, Args}) ->
+  Meta = meta_from_location(Location),
+  {{'.', Meta, ['Elixir.String', to_char_list]}, Meta, [{'<<>>', Meta, string_parts(Args)}]}.
+
+build_quoted_atom({_, _Location, [H]}, Safe) when is_binary(H) ->
+  Op = binary_to_atom_op(Safe), erlang:Op(H, utf8);
+build_quoted_atom({_, Location, Args}, Safe) ->
+  Meta = meta_from_location(Location),
+  {{'.', Meta, [erlang, binary_to_atom_op(Safe)]}, Meta, [{'<<>>', Meta, string_parts(Args)}, utf8]}.
+
+binary_to_atom_op(true)  -> binary_to_existing_atom;
+binary_to_atom_op(false) -> binary_to_atom.
+
+string_parts(Parts) ->
+  [string_part(Part) || Part <- Parts].
+string_part(Binary) when is_binary(Binary) ->
+  Binary;
+string_part({Location, Tokens}) ->
+  Form = string_tokens_parse(Tokens),
+  Meta = meta_from_location(Location),
+  {'::', Meta, [{{'.', Meta, ['Elixir.Kernel', to_string]}, Meta, [Form]}, {binary, Meta, nil}]}.
+
+string_tokens_parse(Tokens) ->
+  case parse(Tokens) of
+    {ok, Forms} -> Forms;
+    {error, _} = Error -> throw(Error)
+  end.
+
+%% Keywords
+
+build_stab([{'->', Meta, [Left, Right]}|T]) ->
+  build_stab(Meta, T, Left, [Right], []);
+
+build_stab(Else) ->
+  build_block(Else).
+
+build_stab(Old, [{'->', New, [Left, Right]}|T], Marker, Temp, Acc) ->
+  H = {'->', Old, [Marker, build_block(reverse(Temp))]},
+  build_stab(New, T, Left, [Right], [H|Acc]);
+
+build_stab(Meta, [H|T], Marker, Temp, Acc) ->
+  build_stab(Meta, T, Marker, [H|Temp], Acc);
+
+build_stab(Meta, [], Marker, Temp, Acc) ->
+  H = {'->', Meta, [Marker, build_block(reverse(Temp))]},
+  reverse([H|Acc]).
+
+%% Every time the parser sees a (unquote_splicing())
+%% it assumes that a block is being spliced, wrapping
+%% the splicing in a __block__. But in the stab clause,
+%% we can have (unquote_splicing(1, 2, 3)) -> :ok, in such
+%% case, we don't actually want the block, since it is
+%% an arg style call. unwrap_splice unwraps the splice
+%% from such blocks.
+unwrap_splice([{'__block__', [], [{unquote_splicing, _, _}] = Splice}]) ->
+  Splice;
+
+unwrap_splice(Other) -> Other.
+
+unwrap_when(Args) ->
+  case elixir_utils:split_last(Args) of
+    {Start, {'when', Meta, [_, _] = End}} ->
+      [{'when', Meta, Start ++ End}];
+    {_, _} ->
+      Args
+  end.
+
+to_block([One]) -> One;
+to_block(Other) -> {'__block__', [], reverse(Other)}.
+
+%% Warnings and errors
+
+throw(Meta, Error, Token) ->
+  Line =
+    case lists:keyfind(line, 1, Meta) of
+      {line, L} -> L;
+      false -> 0
+    end,
+  throw({error, {Line, ?MODULE, [Error, Token]}}).
+
+throw_bad_atom(Token) ->
+  throw(meta_from_token(Token), "atom cannot be followed by an alias. If the '.' was meant to be "
+    "part of the atom's name, the atom name must be quoted. Syntax error before: ", "'.'").
+
+throw_no_parens_strict(Token) ->
+  throw(meta_from_token(Token), "unexpected parentheses. If you are making a "
+    "function call, do not insert spaces between the function name and the "
+    "opening parentheses. Syntax error before: ", "'('").
+
+throw_no_parens_many_strict(Node) ->
+  throw(?meta(Node),
+    "unexpected comma. Parentheses are required to solve ambiguity in nested calls.\n\n"
+    "This error happens when you have nested function calls without parentheses. "
+    "For example:\n\n"
+    "    one a, two b, c, d\n\n"
+    "In the example above, we don't know if the parameters \"c\" and \"d\" apply "
+    "to the function \"one\" or \"two\". You can solve this by explicitly adding "
+    "parentheses:\n\n"
+    "    one a, two(b, c, d)\n\n"
+    "Elixir cannot compile otherwise. Syntax error before: ", "','").
+
+throw_no_parens_container_strict(Node) ->
+  throw(?meta(Node),
+    "unexpected comma. Parentheses are required to solve ambiguity inside containers.\n\n"
+    "This error may happen when you forget a comma in a list or other container:\n\n"
+    "    [a, b c, d]\n\n"
+    "Or when you have ambiguous calls:\n\n"
+    "    [one, two three, four, five]\n\n"
+    "In the example above, we don't know if the parameters \"four\" and \"five\" "
+    "belongs to the list or the function \"two\". You can solve this by explicitly "
+    "adding parentheses:\n\n"
+    "    [one, two(three, four), five]\n\n"
+    "Elixir cannot compile otherwise. Syntax error before: ", "','").
+
+throw_invalid_kw_identifier({_, _, do} = Token) ->
+  throw(meta_from_token(Token), elixir_tokenizer:invalid_do_error("unexpected keyword \"do:\""), "'do:'");
+throw_invalid_kw_identifier({_, _, KW} = Token) ->
+  throw(meta_from_token(Token), "syntax error before: ", "'" ++ atom_to_list(KW) ++ "':").
+
+%% TODO: Make those warnings errors.
+warn_empty_stab_clause({stab_op, {Line, _Begin, _End}, '->'}) ->
+  elixir_errors:warn(Line, ?file(),
+    "an expression is always required on the right side of ->. "
+    "Please provide a value after ->").
+
+warn_pipe({arrow_op, {Line, _Begin, _End}, Op}, {_, [_|_], [_|_]}) ->
+  elixir_errors:warn(Line, ?file(),
+    io_lib:format(
+      "you are piping into a function call without parentheses, which may be ambiguous. "
+      "Please wrap the function you are piping into in parentheses. For example:\n\n"
+      "    foo 1 ~ts bar 2 ~ts baz 3\n\n"
+      "Should be written as:\n\n"
+      "    foo(1) ~ts bar(2) ~ts baz(3)\n",
+      [Op, Op, Op, Op]
+    )
+  );
+warn_pipe(_Token, _) ->
+  ok.
--- a/samples/Erlang/factorial.script!
+++ b/samples/Erlang/factorial.script!
--- a/samples/Erlang/filenames/rebar.config
+++ b/samples/Erlang/filenames/rebar.config
@@ -0,0 +1,260 @@
+%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% ex: ts=4 sw=4 ft=erlang et
+%% This is a sample rebar.conf file that shows examples of some of rebar's
+%% options.
+
+%% == Core ==
+
+%% Extend list of always recursive commands
+{recursive_cmds, []}.
+
+%% Check required ERTS or OTP release version
+{require_erts_vsn, ".*"}.
+{require_otp_vsn, ".*"}.
+{require_min_otp_vsn, ".*"}.
+
+%% Additional library directories to add to the code path
+{lib_dirs, []}.
+
+%% == Erlang Compiler ==
+
+%% Erlang files to compile before the rest. Rebar automatically compiles
+%% parse_transforms and custom behaviours before anything other than the files
+%% in this list.
+{erl_first_files, ["src/mymib1.erl", "src/mymib2.erl"]}.
+
+%% Erlang compiler options
+{erl_opts, [no_debug_info,
+            {i, "myinclude"},
+            {src_dirs, ["src", "src2", "src3"]},
+            {platform_define,
+             "(linux|solaris|freebsd|darwin)", 'HAVE_SENDFILE'},
+            {platform_define, "(linux|freebsd)", 'BACKLOG', 128},
+            {platform_define, "R13", 'old_inets'}]}.
+
+%% MIB Options?
+{mib_opts, []}.
+
+%% SNMP mibs to compile first?
+{mib_first_files, []}.
+
+%% leex options
+{xrl_opts, []}.
+
+%% leex files to compile first
+{xrl_first_files, []}.
+
+%% yecc options
+{yrl_opts, []}.
+
+%% yecc files to compile first
+{yrl_first_files, []}.
+
+%% == EDoc ==
+
+%% EDoc options
+{edoc_opts, []}.
+
+%% == Port Compiler ==
+
+%% Port compilation environment variables. See rebar_port_compiler.erl for
+%% more info. Default is `[]'
+{port_env, [{"CFLAGS", "$CFLAGS -Ifoo"},
+            {"freebsd", "LDFLAGS", "$LDFLAGS -lfoo"}]}.
+
+%% port_specs
+%% List of filenames or wildcards to be compiled. May also contain a tuple
+%% consisting of a regular expression to be applied against the system
+%% architecture as a filter.
+{port_specs, [{"priv/so_name.so", ["c_src/*.c"]},
+              {"linux", "priv/hello_linux", ["c_src/hello_linux.c"]},
+              {"linux", "priv/hello_linux", ["c_src/*.c"], [{env, []}]}]}.
+
+%% == escriptize ==
+{escript_name, "application"}.
+{escript_incl_apps, []}.
+{escript_shebang, "#!/usr/bin/env escript\n"}.
+{escript_comment, "%%\n"}.
+{escript_emu_args, "%%! -pa application/application/ebin\n"}.
+
+%% == LFE Compiler ==
+
+%% LFE files to compile before the rest
+{lfe_first_files, []}.
+
+%% Options for the LFE compiler: reuse {erl_opts, []}
+
+%% == ErlyDTL Compiler ==
+
+%% Options for the ErlyDTL compiler
+{erlydtl_opts, []}.
+
+%% == Proto compiler ==
+{proto_opts, [
+    {compiler, protobuffs},
+    {src_dirs, ["src"]}
+]}.
+%% Available compilers for protocol buffer files (*.proto):
+%%   protobuffs  (default)
+%%   gpb
+%% Optional src_dirs which is a list of directories where
+%% to look for .proto files, default is src
+
+%% Options for the gpb protocol buffer compiler,
+%% if selected by the proto_compiler option
+{gpb_opts, []}.
+
+%% == EUnit ==
+
+%% Options for eunit:test()
+{eunit_opts, []}.
+
+%% Additional compile options for eunit. erl_opts is also used
+{eunit_compile_opts, []}.
+
+%% Same as erl_first_files, but used only when running 'eunit'
+{eunit_first_files, []}.
+
+%% == Cover ==
+
+%% Whether to enable coverage reporting. Default is `false'
+{cover_enabled, false}.
+
+%% Whether to print coverage report to console. Default is `false'
+{cover_print_enabled, false}.
+
+%% Whether to export coverage report to file. Default is `false'
+{cover_export_enabled, false}.
+
+%% == Common Test ==
+
+%% Override the default "test" directory in which SUITEs are located
+{ct_dir, "itest"}.
+
+%% Override the default "logs" directory in which SUITEs are logged
+{ct_log_dir, "test/logs"}.
+
+%% Option to pass extra parameters when launching Common Test
+{ct_extra_params, "-boot start_sasl -s myapp"}.
+
+%% Option to use short names (i.e., -sname test) when starting ct
+{ct_use_short_names, true}.
+
+%% == QuickCheck ==
+
+%% If qc_mod is unspecified, rebar tries to detect Triq or EQC
+{qc_opts, [{qc_mod, module()}, Options]}.
+
+%% Additional compile options for qc. erl_opts is also used
+{qc_compile_opts, []}.
+
+%% Same as erl_first_files, but used only when running 'qc'
+{qc_first_files, []}.
+
+%% == Cleanup ==
+
+%% Which files to cleanup
+{clean_files, ["file", "file2"]}.
+
+%% == OTP Applications ==
+
+%% Enable validation of the OTP app module list. Default is 'true'
+{validate_app_modules, true}.
+
+%% == Dependencies ==
+
+%% Where to put any downloaded dependencies. Default is "deps"
+{deps_dir, "deps"}.
+
+%% What dependencies we have, dependencies can be of 3 forms, an application
+%% name as an atom, eg. mochiweb, a name and a version (from the .app file), or
+%% an application name, a version and the SCM details on how to fetch it (SCM
+%% type, location and revision).
+%% Rebar currently supports git, hg, bzr, svn, rsync, fossil, and p4.
+{deps, [app_name,
+        {rebar, "1.0.*"},
+        {rebar, ".*",
+         {git, "git://github.com/rebar/rebar.git"}},
+        {rebar, ".*",
+         {git, "git://github.com/rebar/rebar.git", "Rev"}},
+        {rebar, "1.0.*",
+         {git, "git://github.com/rebar/rebar.git", {branch, "master"}}},
+        {rebar, "1.0.0",
+         {git, "git://github.com/rebar/rebar.git", {tag, "1.0.0"}}},
+        %% Dependencies can be marked as 'raw'. Rebar does not require
+        %% such dependencies to have a standard Erlang/OTP layout
+        %% which assumes the presence of either
+        %% "src/dependency_name.app.src" or "ebin/dependency_name.app"
+        %% files.
+        %%
+        %% 'raw' dependencies can still contain 'rebar.config' and
+        %% even can have the proper OTP directory layout, but they
+        %% won't be compiled.
+        %%
+        %% Only a subset of rebar commands will be executed on the
+        %% 'raw' subdirectories: get-deps, update-deps, check-deps,
+        %% list-deps and delete-deps.
+        {rebar, "",
+         {git, "git://github.com/rebar/rebar.git", {branch, "master"}},
+         [raw]},
+        {app_name, ".*", {hg, "https://www.example.org/url"}},
+        {app_name, ".*", {rsync, "Url"}},
+        {app_name, ".*", {svn, "https://www.example.org/url"}},
+        {app_name, ".*", {svn, "svn://svn.example.org/url"}},
+        {app_name, ".*", {bzr, "https://www.example.org/url", "Rev"}},
+        {app_name, ".*", {fossil, "https://www.example.org/url"}},
+        {app_name, ".*", {fossil, "https://www.example.org/url", "Vsn"}},
+        {app_name, ".*", {p4, "//depot/subdir/app_dir"}}]}.
+
+%% == Subdirectories ==
+
+%% Subdirectories?
+{sub_dirs, ["dir1", "dir2"]}.
+
+%% == Plugins ==
+
+%% Plugins you wish to include.
+%% These can include any module on the code path, including deps.
+%% Alternatively, plugins can be placed as source files in the plugin_dir, in
+%% which case they will be compiled and loaded dynamically at runtime.
+{plugins, [plugin1, plugin2]}.
+
+%% Override the directory in which plugin sources can be found.
+%% Defaults to ./plugins
+{plugin_dir, "some_other_directory"}.
+
+
+%% == Pre/Post Command Hooks ==
+
+{pre_hooks, [{clean, "./prepare_package_files.sh"},
+             {"linux", compile, "c_src/build_linux.sh"},
+             {compile, "escript generate_headers"},
+             {compile, "escript check_headers"}]}.
+
+{post_hooks, [{clean, "touch file1.out"},
+              {"freebsd", compile, "c_src/freebsd_tweaks.sh"},
+              {eunit, "touch file2.out"},
+              {compile, "touch postcompile.out"}]}.
+
+%% == xref ==
+
+{xref_warnings, false}.
+
+%% optional extra paths to include in xref:set_library_path/2.
+%% specified relative location of rebar.config.
+%% e.g. {xref_extra_paths,["../gtknode/src"]}
+{xref_extra_paths,[]}.
+
+%% xref checks to run
+{xref_checks, [undefined_function_calls, undefined_functions,
+               locals_not_used, exports_not_used,
+               deprecated_function_calls, deprecated_functions]}.
+
+%% Optional custom xref queries (xref manual has details) specified as
+%%     {xref_queries, [{query_string(), expected_query_result()},...]}
+%% The following for example removes all references to mod:*foo/4
+%% functions from undefined external function calls as those are in a
+%% generated module
+{xref_queries,
+ [{"(XC - UC) || (XU - X - B"
+   " - (\"mod\":\".*foo\"/\"4\"))",[]}]}.
--- a/samples/Erlang/filenames/rebar.config.lock
+++ b/samples/Erlang/filenames/rebar.config.lock
@@ -0,0 +1,158 @@
+%% THIS FILE IS GENERATED. DO NOT EDIT IT MANUALLY %%
+
+{sub_dirs,["rel","apps/riak"]}.
+{require_otp_vsn,"R16|17"}.
+{cover_enabled,true}.
+{lib_dirs,["apps/riak"]}.
+{erl_opts,[debug_info,fail_on_warning]}.
+{eunit_opts,[verbose]}.
+{erlydtl_opts,[{compiler_options,[report,return,debug_info]}]}.
+{deps,[{rebar_lock_deps_plugin,".*",
+                               {git,"git://github.com/seth/rebar_lock_deps_plugin.git",
+                                    "7a5835029c42b8138325405237ea7e8516a84800"}},
+       {node_package,".*",
+                     {git,"git://github.com/basho/node_package.git",
+                          "a829631eccebe3c1d7657a0075584f55bf342977"}},
+       {goldrush,".*",
+                 {git,"git://github.com/DeadZen/goldrush.git",
+                      "71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
+       {lager,".*",
+              {git,"git://github.com/basho/lager.git",
+                   "b6b6cebcb27ccff8acc59ae775acebc2f52e4926"}},
+       {syslog,".*",
+               {git,"git://github.com/Vagabond/erlang-syslog.git",
+                    "918c9b453e0811b24f2c99b35b712b0ef9f29c7e"}},
+       {lager_syslog,".*",
+                     {git,"git://github.com/basho/lager_syslog.git",
+                          "fa2e7e3daee0d0a59dadb820fd3381eac4a65770"}},
+       {cluster_info,".*",
+                     {git,"git://github.com/basho/cluster_info.git",
+                          "e231144ca32dc83317be3360a4a259c73826b08a"}},
+       {sidejob,".*",
+                {git,"git://github.com/basho/sidejob.git",
+                     "c5aabba2d7daa80c340e110902bbcfcb552ccdcf"}},
+       {erlang_js,".*",
+                  {git,"git://github.com/basho/erlang_js.git",
+                       "07467d899ab90a2b719ad19ab0be0048c1c8d873"}},
+       {meck,".*",
+             {git,"git://github.com/basho/meck.git",
+                  "dde759050eff19a1a80fd854d7375174b191665d"}},
+       {getopt,".*",
+               {git,"git://github.com/jcomellas/getopt.git",
+                    "659a28f4145bc9843598972854299dc4ea77e4cb"}},
+       {neotoma,".*",
+                {git,"git://github.com/seancribbs/neotoma.git",
+                     "760928ec8870da02eb11bccb501e2700925d06c6"}},
+       {cuttlefish,".*",
+                   {git,"git://github.com/basho/cuttlefish.git",
+                        "c92c8325aeaea6b6ba7516bbd434f8e408f87d60"}},
+       {bitcask,".*",
+                {git,"git://github.com/basho/bitcask.git",
+                     "c74d0c43fdefdd435f7621ddf1fc2995b5bd123c"}},
+       {eper,".*",
+             {git,"git://github.com/basho/eper.git",
+                  "7222ecaebceb5422e74a9c1503043bbc6036f6b7"}},
+       {edown,".*",
+              {git,"git://github.com/uwiger/edown.git",
+                   "d62ec85281e451a46ba30045917c119d65b72a84"}},
+       {sext,".*",
+             {git,"git://github.com/basho/sext.git",
+                  "846b9cc22456287a572efd4c924203d77778670f"}},
+       {poolboy,".*",
+                {git,"git://github.com/basho/poolboy.git",
+                     "8bb45fbc715c5f493642a1cc572ec7017d0d5fa3"}},
+       {basho_stats,".*",
+                    {git,"git://github.com/basho/basho_stats.git",
+                         "19c532af235ae675439d491b329c55c2f9b02deb"}},
+       {riak_sysmon,".*",
+                    {git,"git://github.com/basho/riak_sysmon.git",
+                         "26a58bcaba96d07df885f7b3db4d4306f995ce14"}},
+       {eleveldb,".*",
+                 {git,"git://github.com/basho/eleveldb.git",
+                      "0e4e4e7cf3ddc26523a77f853ea9409c1707b26c"}},
+       {riak_ensemble,".*",
+                      {git,"git://github.com/basho/riak_ensemble",
+                           "78dc8f623353a212ca3cf12236d1e9ac824bde16"}},
+       {pbkdf2,".*",
+               {git,"git://github.com/basho/erlang-pbkdf2.git",
+                    "7076584f5377e98600a7e2cb81980b2992fb2f71"}},
+       {parse_trans,".*",
+                    {git,"git://github.com/uwiger/parse_trans.git",
+                         "82cc00264aa1bad8fc5c0739b7541feb4a843432"}},
+       {bear,".*",
+             {git,"git://github.com/basho/bear.git",
+                  "da820a13c607c3f816ee8b83c587266da5389761"}},
+       {folsom,".*",
+               {git,"git://github.com/basho/folsom.git",
+                    "72944523b6467c9f7add5f1c96dd5020424a2681"}},
+       {setup,".*",
+              {git,"git://github.com/uwiger/setup.git",
+                   "51ee7c9f64d2bbe9dcbb58c278e8fbfd4d0ca5e2"}},
+       {exometer_core,".*",
+                      {git,"git://github.com/basho/exometer_core.git",
+                           "b47a5d65d9500c2b8f6ccc50e34005503589ef77"}},
+       {clique,".*",
+               {git,"git://github.com/basho/clique.git",
+                    "3af4db8ea0f74aca42f6713446dcd5915c795a74"}},
+       {riak_core,".*",
+                  {git,"git://github.com/basho/riak_core.git",
+                       "044c4e7f8dbfe8c49c45f2f7090adff4cd5aba50"}},
+       {riak_pipe,".*",
+                  {git,"git://github.com/basho/riak_pipe.git",
+                       "3c0abc7ba301d57940c5a9c5de368b70429c28ff"}},
+       {protobuffs,".*",
+                   {git,"git://github.com/basho/erlang_protobuffs.git",
+                        "f88fc3c6881687432ddd5546b3c7b08009dfb26f"}},
+       {riak_pb,".*",
+                {git,"git://github.com/basho/riak_pb.git",
+                     "78c50efa698f33f7d6ab1c7f5fa4666ec03b46b4"}},
+       {mochiweb,".*",
+                 {git,"git://github.com/basho/mochiweb.git",
+                      "ade2a9b29a11034eb550c1d79b4f991bf5ca05ba"}},
+       {webmachine,".*",
+                   {git,"git://github.com/basho/webmachine.git",
+                        "7677c240f4a7ed020f4bab48278224966bb42311"}},
+       {riak_api,".*",
+                 {git,"git://github.com/basho/riak_api.git",
+                      "2781e66796903bc6847bffcf71a6ba7a05d69275"}},
+       {riak_dt,".*",
+                {git,"git://github.com/basho/riak_dt.git",
+                     "f7981d4ad7407ddc085f133f204dd71bf9d50c56"}},
+       {eunit_formatters,".*",
+                         {git,"git://github.com/seancribbs/eunit_formatters",
+                              "96b6ced4d45ba641cbf2c8a8ae9b350dd300bc10"}},
+       {riak_kv,".*",
+                {git,"git://github.com/basho/riak_kv.git",
+                     "404619cb57574cd43e2dc0dc0453884ec6732a99"}},
+       {merge_index,".*",
+                    {git,"git://github.com/basho/merge_index.git",
+                         "b701dde5c28956c3b629411e5ff7e50cbb5cb4b3"}},
+       {riak_search,".*",
+                    {git,"git://github.com/basho/riak_search.git",
+                         "8fe4a8c020a74c52ee877bf6dd410824b4f79f8b"}},
+       {erlydtl,".*",
+                {git,"git://github.com/evanmiller/erlydtl.git",
+                     "d20b53f04837a1053ed18987f645cb60eae82453"}},
+       {riak_control,".*",
+                     {git,"git://github.com/basho/riak_control.git",
+                          "09073ce672260e1ec0ba3999fabed7f319624ba1"}},
+       {riaknostic,".*",
+                   {git,"git://github.com/basho/riaknostic.git",
+                        "101d95bddff4b70afcd1dd5442b8c6651887e0a4"}},
+       {kvc,".*",
+            {git,"git://github.com/etrepum/kvc.git",
+                 "5565fe51857747662410cc3c06362ebcf48a2f04"}},
+       {ibrowse,".*",
+                {git,"git://github.com/cmullaparthi/ibrowse.git",
+                     "e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
+       {yokozuna,".*",
+                 {git,"git://github.com/basho/yokozuna.git",
+                      "5868266b11f131d14c85495e50f899f3fe8158ba"}},
+       {canola,".*",
+               {git,"git://github.com/basho/canola.git",
+                    "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},
+       {riak_auth_mods,".*",
+                       {git,"git://github.com/basho/riak_auth_mods.git",
+                            "31b8b30e6c215418522eaa615264ae9769a87410"}}]}.
+{plugins,[rebar_lock_deps_plugin]}.
+
--- a/samples/Erlang/filenames/rebar.lock
+++ b/samples/Erlang/filenames/rebar.lock
@@ -0,0 +1,16 @@
+[{<<"goldrush">>,
+  {git,"git://github.com/DeadZen/goldrush.git",
+       {ref,"71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
+  1},
+ {<<"riak_dt">>,
+  {git,"git://github.com/helium/riak_dt.git",
+       {ref,"15d66cb26c2028c1ad1271c359b1d5da213825c3"}},
+  0},
+ {<<"lager">>,
+  {git,"git://github.com/basho/lager.git",
+       {ref,"d33ccf3b69de09a628fe38b4d7981bb8671b8a4f"}},
+  0},
+ {<<"eleveldb">>,
+  {git,"git://github.com/helium/eleveldb.git",
+       {ref,"29a5360dc0365b3330dd0cd45b0b8166f3b854be"}},
+  0}].
--- a/samples/Erlang/lfe_scan.xrl
+++ b/samples/Erlang/lfe_scan.xrl
@@ -0,0 +1,256 @@
+%% Copyright (c) 2008-2013 Robert Virding
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+
+%% File    : lfe_scan.xrl
+%% Author  : Robert Virding
+%% Purpose : Token definitions for Lisp Flavoured Erlang.
+
+Definitions.
+B    = [01]
+O    = [0-7]
+D    = [0-9]
+H    = [0-9a-fA-F]
+B36  = [0-9a-zA-Z]
+U    = [A-Z]
+L    = [a-z]
+A    = ({U}|{L})
+DEL  = [][()}{";\000-\s]
+SYM  = [^][()}{";\000-\s\177-\237]
+SSYM = [^][()}{"|;#`',\000-\s\177-\237]
+WS   = ([\000-\s]|;[^\n]*)
+
+Rules.
+%% Bracketed Comments using #| foo |#
+#{D}*\|[^\|]*\|+([^#\|][^\|]*\|+)*# :
+        block_comment(string:substr(TokenChars, 3)).
+
+%% Separators
+'               :    {token,{'\'',TokenLine}}.
+`               :    {token,{'`',TokenLine}}.
+,               :    {token,{',',TokenLine}}.
+,@              :    {token,{',@',TokenLine}}.
+\.              :    {token,{'.',TokenLine}}.
+[][()}{]        :    {token,{list_to_atom(TokenChars),TokenLine}}.
+
+#{D}*[bB]\(     :    {token,{'#B(',TokenLine}}.
+#{D}*[mM]\(     :    {token,{'#M(',TokenLine}}.
+#{D}*\(         :    {token,{'#(',TokenLine}}.
+#{D}*\.         :    {token,{'#.',TokenLine}}.
+
+#{D}*`          :    {token,{'#`',TokenLine}}.
+#{D}*;          :    {token,{'#;',TokenLine}}.
+#{D}*,          :    {token,{'#,',TokenLine}}.
+#{D}*,@         :    {token,{'#,@',TokenLine}}.
+
+%% Characters
+#{D}*\\(x{H}+|.) :   char_token(skip_past(TokenChars, $\\, $\\), TokenLine).
+
+%% Based numbers
+#{D}*\*{SYM}+   :    base_token(skip_past(TokenChars, $*, $*), 2, TokenLine).
+#{D}*[bB]{SYM}+ :    base_token(skip_past(TokenChars, $b, $B), 2, TokenLine).
+#{D}*[oO]{SYM}+ :    base_token(skip_past(TokenChars, $o, $O), 8, TokenLine).
+#{D}*[dD]{SYM}+ :    base_token(skip_past(TokenChars, $d, $D), 10, TokenLine).
+#{D}*[xX]{SYM}+ :    base_token(skip_past(TokenChars, $x, $X), 16, TokenLine).
+#{D}*[rR]{SYM}+ :
+        %% Scan over digit chars to get base.
+        {Base,[_|Ds]} = base1(tl(TokenChars), 10, 0),
+        base_token(Ds, Base, TokenLine).
+
+%% String
+"(\\x{H}+;|\\.|[^"\\])*" :
+        %% Strip quotes.
+        S = string:substr(TokenChars, 2, TokenLen - 2),
+        {token,{string,TokenLine,chars(S)}}.
+%% Binary string
+#"(\\x{H}+;|\\.|[^"\\])*" :
+        %% Strip quotes.
+        S = string:substr(TokenChars, 3, TokenLen - 3),
+        Bin = unicode:characters_to_binary(chars(S), utf8, utf8),
+        {token,{binary,TokenLine,Bin}}.
+%% Symbols
+\|(\\x{H}+;|\\.|[^|\\])*\| :
+        %% Strip quotes.
+        S = string:substr(TokenChars, 2, TokenLen - 2),
+        symbol_token(chars(S), TokenLine).
+%% Funs
+#'{SSYM}{SYM}*/{D}+ :
+        %% Strip sharpsign single-quote.
+        FunStr = string:substr(TokenChars,3),
+        {token,{'#\'',TokenLine,FunStr}}.
+%% Atoms
+[+-]?{D}+       :
+        case catch {ok,list_to_integer(TokenChars)} of
+            {ok,I} -> {token,{number,TokenLine,I}};
+            _ -> {error,"illegal integer"}
+        end.
+[+-]?{D}+\.{D}+([eE][+-]?{D}+)? :
+        case catch {ok,list_to_float(TokenChars)} of
+            {ok,F} -> {token,{number,TokenLine,F}};
+            _ -> {error,"illegal float"}
+        end.
+{SSYM}{SYM}*    :
+        symbol_token(TokenChars, TokenLine).
+{WS}+           :    skip_token.
+
+Erlang code.
+%% Copyright (c) 2008-2013 Robert Virding
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+
+%% File    : lfe_scan.erl
+%% Author  : Robert Virding
+%% Purpose : Token definitions for Lisp Flavoured Erlang.
+
+-export([start_symbol_char/1,symbol_char/1]).
+
+-import(string, [substr/2,substr/3]).
+
+%% start_symbol_char(Char) -> true | false.
+%% symbol_char(Char) -> true | false.
+%%  Define start symbol chars and symbol chars.
+
+start_symbol_char($#) -> false;
+start_symbol_char($`) -> false;
+start_symbol_char($') -> false;                 %'
+start_symbol_char($,) -> false;
+start_symbol_char($|) -> false;                 %Symbol quote character
+start_symbol_char(C) -> symbol_char(C).
+
+symbol_char($() -> false;
+symbol_char($)) -> false;
+symbol_char($[) -> false;
+symbol_char($]) -> false;
+symbol_char(${) -> false;
+symbol_char($}) -> false;
+symbol_char($") -> false;
+symbol_char($;) -> false;
+symbol_char(C) -> ((C > $\s) and (C =< $~)) orelse (C > $\240).
+
+%% symbol_token(Chars, Line) -> {token,{symbol,Line,Symbol}} | {error,E}.
+%%  Build a symbol from list of legal characters, else error.
+
+symbol_token(Cs, L) ->
+    case catch {ok,list_to_atom(Cs)} of
+        {ok,S} -> {token,{symbol,L,S}};
+        _ -> {error,"illegal symbol"}
+    end.
+
+%% base_token(Chars, Base, Line) -> Integer.
+%%  Convert a string of Base characters into a number. We only allow
+%%  base betqeen 2 and 36, and an optional sign character first.
+
+base_token(_, B, _) when B < 2; B > 36 ->
+    {error,"illegal number base"};
+base_token([$+|Cs], B, L) -> base_token(Cs, B, +1, L);
+base_token([$-|Cs], B, L) -> base_token(Cs, B, -1, L);
+base_token(Cs, B, L) -> base_token(Cs, B, +1, L).
+
+base_token(Cs, B, S, L) ->
+    case base1(Cs, B, 0) of
+        {N,[]} -> {token,{number,L,S*N}};
+        {_,_} -> {error,"illegal based number"}
+    end.
+
+base1([C|Cs], Base, SoFar) when C >= $0, C =< $9, C < Base + $0 ->
+    Next = SoFar * Base + (C - $0),
+    base1(Cs, Base, Next);
+base1([C|Cs], Base, SoFar) when C >= $a, C =< $z, C < Base + $a - 10 ->
+    Next = SoFar * Base + (C - $a + 10),
+    base1(Cs, Base, Next);
+base1([C|Cs], Base, SoFar) when C >= $A, C =< $Z, C < Base + $A - 10 ->
+    Next = SoFar * Base + (C - $A + 10),
+    base1(Cs, Base, Next);
+base1([C|Cs], _Base, SoFar) -> {SoFar,[C|Cs]};
+base1([], _Base, N) -> {N,[]}.
+
+-define(IS_UNICODE(C), ((C >= 0) and (C =< 16#10FFFF))).
+
+%% char_token(InputChars, Line) -> {token,{number,L,N}} | {error,E}.
+%%  Convert an input string into the corresponding character. For a
+%%  sequence of hex characters we check resultant is code is in the
+%%  unicode range.
+
+char_token([$x,C|Cs], L) ->
+    case base1([C|Cs], 16, 0) of
+        {N,[]} when ?IS_UNICODE(N) -> {token,{number,L,N}};
+        _ -> {error,"illegal character"}
+    end;
+char_token([C], L) -> {token,{number,L,C}}.
+
+%% chars(InputChars) -> Chars.
+%%  Convert an input string into the corresponding string characters.
+%%  We know that the input string is correct.
+
+chars([$\\,$x,C|Cs0]) ->
+    case hex_char(C) of
+        true ->
+            case base1([C|Cs0], 16, 0) of
+                {N,[$;|Cs1]} -> [N|chars(Cs1)];
+                _Other -> [escape_char($x)|chars([C|Cs0])]
+            end;
+        false -> [escape_char($x)|chars([C|Cs0])]
+    end;
+chars([$\\,C|Cs]) -> [escape_char(C)|chars(Cs)];
+chars([C|Cs]) -> [C|chars(Cs)];
+chars([]) -> [].
+
+hex_char(C) when C >= $0, C =< $9 -> true;
+hex_char(C) when C >= $a, C =< $f -> true;
+hex_char(C) when C >= $A, C =< $F -> true;
+hex_char(_) -> false.
+
+escape_char($b) -> $\b;                %\b = BS
+escape_char($t) -> $\t;                %\t = TAB
+escape_char($n) -> $\n;                %\n = LF
+escape_char($v) -> $\v;                %\v = VT
+escape_char($f) -> $\f;                %\f = FF
+escape_char($r) -> $\r;                %\r = CR
+escape_char($e) -> $\e;                %\e = ESC
+escape_char($s) -> $\s;                %\s = SPC
+escape_char($d) -> $\d;                %\d = DEL
+escape_char(C) -> C.
+
+%% Block Comment:
+%%  Provide a sensible error when people attempt to include nested
+%%  comments because currently the parser cannot process them without
+%%  a rebuild. But simply exploding on a '#|' is not going to be that
+%%  helpful.
+
+block_comment(TokenChars) ->
+    %% Check we're not opening another comment block.
+    case string:str(TokenChars, "#|") of
+        0 -> skip_token; %% No nesting found
+        _ -> {error, "illegal nested block comment"}
+    end.
+
+%% skip_until(String, Char1, Char2) -> String.
+%% skip_past(String, Char1, Char2) -> String.
+
+%% skip_until([C|_]=Cs, C1, C2) when C =:= C1 ; C =:= C2 -> Cs;
+%% skip_until([_|Cs], C1, C2) -> skip_until(Cs, C1, C2);
+%% skip_until([], _, _) -> [].
+
+skip_past([C|Cs], C1, C2) when C =:= C1 ; C =:= C2 -> Cs;
+skip_past([_|Cs], C1, C2) -> skip_past(Cs, C1, C2);
+skip_past([], _, _) -> [].
--- a/samples/Erlang/release.script!
+++ b/samples/Erlang/release.script!
--- a/samples/Filterscript/colormatrix.fs
+++ b/samples/Filterscript/colormatrix.fs
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ip.rsh"
+
+static rs_matrix4x4 Mat;
+
+void init() {
+    rsMatrixLoadIdentity(&Mat);
+}
+
+void setMatrix(rs_matrix4x4 m) {
+    Mat = m;
+}
+
+uchar4 __attribute__((kernel)) root(uchar4 in) {
+    float4 f = convert_float4(in);
+    f = rsMatrixMultiply(&Mat, f);
+    f = clamp(f, 0.f, 255.f);
+    return convert_uchar4(f);
+}
+
--- a/samples/Filterscript/fs_kernel.fs
+++ b/samples/Filterscript/fs_kernel.fs
@@ -0,0 +1,18 @@
+#pragma version(1)
+#pragma rs java_package_name(foo)
+
+int __attribute__((kernel)) root(uint32_t ain) {
+  return 0;
+}
+
+void __attribute__((kernel)) in_only(uint32_t ain) {
+}
+
+int __attribute__((kernel)) out_only() {
+  return 0;
+}
+
+int __attribute__((kernel)) everything(uint32_t ain, uint32_t x, uint32_t y) {
+  return 0;
+}
+
--- a/samples/Formatted/NiAlH_jea.eam.fs
+++ b/samples/Formatted/NiAlH_jea.eam.fs
--- a/samples/Formatted/long_seq.for
+++ b/samples/Formatted/long_seq.for
@@ -0,0 +1,919 @@
+ACCEPTABLE LEFT PRIMERS
+                                  1-based     #                self   self hair-  qual-
+   # sequence                       start ln  N   GC%     Tm any_th end_th   pin   lity
+   0 tgctagctaggcgatgctag             411 20  0 55.00 60.028 23.16 23.16 38.59  0.028
+   1 actgatacgcgatgctagct             476 20  0 50.00 59.957 17.69  1.35  0.00  0.043
+   2 gatcgatgctagctaggcga             405 20  0 55.00 60.100 16.30 16.30  0.00  0.100
+   3 tcgatcgatgctagctaggc             403 20  0 55.00 60.100 18.63  8.45  0.00  0.100
+   4 tagctgatcgatcgtagcgg             565 20  0 55.00 60.101 25.02 17.36  0.00  0.101
+   5 gctgactgatcgatcgatgc             113 20  0 55.00 59.826 24.08 17.09 35.21  0.174
+   6 tatcatctctgcgcgatcga             361 20  0 50.00 59.747 22.07  1.72 38.48  0.253
+   7 agctaggcgatgctagctag             415 20  0 55.00 59.742 17.46 17.46 41.54  0.258
+   8 ctagctaggcgatgctagct             413 20  0 55.00 59.742 18.68 17.35 43.53  0.258
+   9 ggcgatctagctagctgact             583 20  0 55.00 59.671 17.44  7.44 37.58  0.329
+  10 tcgatgctagctaggcgatg             407 20  0 55.00 60.382 14.03  0.00  0.00  0.382
+  11 gctgatcgatcgatgctagc             398 20  0 55.00 59.618 25.97 24.79 35.21  0.382
+  12 gctagctgatcgatcgatgc             394 20  0 55.00 59.618 24.08 21.09 35.21  0.382
+  13 atcatctctgcgcgatcgat             362 20  0 50.00 60.382 22.07  5.02 38.48  0.382
+  14 gactgatacgcgatgctagc             475 20  0 55.00 59.551  8.61  8.61  0.00  0.449
+  15 atcgatgctagctaggcgat             406 20  0 50.00 59.452 18.43 18.43  0.00  0.548
+  16 gctagctgactgatacgcga             468 20  0 55.00 60.589 16.29  0.00  0.00  0.589
+  17 agctagctgactgatacgcg             467 20  0 55.00 60.590 17.99  3.89  0.00  0.590
+  18 atgctagctaggcgatgcta             410 20  0 50.00 59.375 10.59  8.91  0.00  0.625
+  19 ctatcatctctgcgcgatcg             360 20  0 55.00 59.347 12.19 12.19 39.07  0.653
+  20 gatgctagctaggcgatgct             409 20  0 55.00 60.668  7.01  7.53  0.00  0.668
+  21 gctactatcatctctgcgcg             356 20  0 55.00 59.273  0.00  0.00  0.00  0.727
+  22 cgtagcggcgatctagctag             577 20  0 60.00 60.791 15.64 15.64 37.58  0.791
+  23 cggcgatctagctagctgac             582 20  0 60.00 61.003 14.84  7.25 38.70  1.003
+  24 gctagctgatcgatcgtagc             563 20  0 55.00 58.995 23.70 23.70  0.00  1.005
+  25 gatcgatcgatgtgcggcta              81 20  0 55.00 61.006 19.16  0.00 41.65  1.006
+  26 atcgatcgatgtgcggctag              82 20  0 55.00 61.008 29.65  0.00 41.65  1.008
+  27 gctgactgatacgcgatgc              472 19  0 57.89 60.025  0.00  0.00  0.00  1.025
+  28 agctagctgatcatcgatgct            190 21  0 47.62 60.035 17.99 11.09  0.00  1.035
+  29 gctagctagctgactgatcga            105 21  0 52.38 60.037 34.38  0.00 46.11  1.037
+  30 tcatctctgcgcgatcgat              363 19  0 52.63 59.946 22.07  0.12 38.48  1.054
+  31 atcatctctgcgcgatcga              362 19  0 52.63 59.946 22.07  1.72 38.48  1.054
+  32 atcgatcgatgtgcggcta               82 19  0 52.63 59.945 29.65  0.00 41.65  1.055
+  33 gtagcggcgatctagctagc             578 20  0 60.00 61.071 16.97  7.15 39.86  1.071
+  34 gctagctgactgatcgatcg             109 20  0 55.00 58.924 16.84 13.89  0.00  1.076
+  35 gctgatcgatcgatgtgcg               78 19  0 57.89 60.097 29.87 18.15 42.69  1.097
+  36 tatcatctctgcgcgatcgat            361 21  0 47.62 60.172 22.07 11.47 38.48  1.172
+  37 gctagctagctgatcgatcga            390 21  0 52.38 60.172 34.38 22.52 46.11  1.172
+  38 gctagctagctgatcgatcga             70 21  0 52.38 60.172 34.38 22.52 46.11  1.172
+  39 catctctgcgcgatcgatg              364 19  0 57.89 59.810 13.74 13.74 38.48  1.190
+  40 tcgtagcggcgatctagcta             576 20  0 55.00 61.231 11.55  9.27 36.40  1.231
+  41 actgatacgcgatgctagcta            476 21  0 47.62 59.765 17.69  3.08  0.00  1.235
+  42 actgatcgatcgatgctagct            117 21  0 47.62 59.763 23.29 11.70 35.21  1.237
+  43 agctagctgatcgatcgatgt             73 21  0 47.62 59.763 17.99  2.62 35.21  1.237
+  44 tagcggcgatctagctagct             579 20  0 55.00 61.243 23.74 23.74 46.60  1.243
+  45 cgtagcggcgatctagcta              577 19  0 57.89 59.729 11.55  9.27 37.58  1.271
+  46 ctagctgatcgatcgtagcg             564 20  0 55.00 58.727 25.02 15.05  0.00  1.273
+  47 tagcggcgatctagctagc              579 19  0 57.89 59.725 16.97  9.14 39.86  1.275
+  48 catcgatcgatgcatgcatg             442 20  0 50.00 58.722 37.80 23.31 44.93  1.278
+  49 tcatctctgcgcgatcgatg             363 20  0 55.00 61.279 18.01 18.01 38.48  1.279
+  50 gctagctagctgatcgatcg             559 20  0 55.00 58.714 34.38 11.90 46.11  1.286
+  51 gctagctagctgatcgatcg             390 20  0 55.00 58.714 34.38 11.90 46.11  1.286
+  52 gctagctagctgatcgatcg              70 20  0 55.00 58.714 34.38 11.90 46.11  1.286
+  53 agcatcggattagctagctga              3 21  0 47.62 59.689 28.29 20.88  0.00  1.311
+  54 agctgatcgatcgtagcgg              566 19  0 57.89 60.315 25.02 17.36  0.00  1.315
+  55 cggcgatctagctagctga              582 19  0 57.89 59.650 21.57 16.66 38.70  1.350
+  56 ctagctgatcgatcgatgtgc             75 21  0 52.38 59.643 31.83 30.04 35.21  1.357
+  57 gctagctgatcgatcgatgtg             74 21  0 52.38 59.643 12.06  6.93 35.21  1.357
+  58 gctagctaggcgatgctagc             412 20  0 60.00 61.357 30.41 30.41 46.19  1.357
+  59 tagctagctgactgatacgcg            466 21  0 52.38 60.373 28.29  3.89  0.00  1.373
+  60 gctagctgactgatcgatcga            109 21  0 52.38 60.374 22.52 22.52  0.00  1.374
+  61 agctagctgactgatcgatcg            108 21  0 52.38 60.374 17.99 13.89  0.00  1.374
+  62 cgatcgatgctagctaggcg             404 20  0 60.00 61.409 15.59  9.14  0.00  1.409
+  63 gctagctagctgactgatcg             105 20  0 55.00 58.563 34.38  1.84 46.11  1.437
+  64 atgctagctaggcgatgct              410 19  0 52.63 59.561 10.59  7.53  0.00  1.439
+  65 agctagctgatcgatcgtagc            562 21  0 52.38 60.441 26.87 26.87  0.00  1.441
+  66 gctagctagctgatcgatcgt            559 21  0 52.38 60.441 34.38  2.65 46.11  1.441
+  67 tagctaggcgatgctagctag            414 21  0 52.38 59.559 18.42 17.46 42.44  1.441
+  68 ctagctaggcgatgctagcta            413 21  0 52.38 59.559 18.69 17.64 42.44  1.441
+  69 tagctgatcgatcgatgtgc              76 20  0 50.00 58.558 31.83 30.04 35.21  1.442
+  70 gatgctagctaggcgatgcta            409 21  0 52.38 60.444  9.82  8.91  0.00  1.444
+  71 atgctagctaggcgatgctag            410 21  0 52.38 60.444 23.16 23.16 38.59  1.444
+  72 gctagctgatcatcgatgct             191 20  0 50.00 58.539 16.29 12.14  0.00  1.461
+  73 agctagctgatcatcgatgc             190 20  0 50.00 58.539 21.42  9.22  0.00  1.461
+  74 gctgactgatacgcgatgct             472 20  0 55.00 61.494  2.33  0.00  0.00  1.494
+  75 agctgactgatacgcgatgc             471 20  0 55.00 61.494  3.47  0.00  0.00  1.494
+  76 ggcgatctagctagctgacta            583 21  0 52.38 59.491 17.44  5.40 37.58  1.509
+  77 gatcgatgctagctaggcgat            405 21  0 52.38 60.510 21.61 21.61  0.00  1.510
+  78 atcgatcgatgctagctaggc            402 21  0 52.38 60.510 29.65  8.45 33.56  1.510
+  79 ctgatcgatcgatgtgcgg               79 19  0 57.89 59.447 15.54  5.83 41.65  1.553
+  80 agctgatcgatcgatgtgcg              77 20  0 55.00 61.556 31.92 20.26 42.69  1.556
+  81 cgatcatcgatgctagctagc            548 21  0 52.38 59.444 34.89 34.89 46.99  1.556
+  82 tagctaggcgatgctagcta             414 20  0 50.00 58.433 19.37 17.81 42.44  1.567
+  83 agctagctactgatcgatgct            303 21  0 47.62 59.415 17.56 11.51  0.00  1.585
+  84 tcgatcgatgtgcggctag               83 19  0 57.89 60.606 18.63  0.00 41.65  1.606
+  85 gactgatcgatcgatgctagc            116 21  0 52.38 59.378 15.86  8.45 35.21  1.622
+  86 agctagctgactgatcgatca            260 21  0 47.62 59.347 26.99 26.99 35.44  1.653
+  87 ctgactgatacgcgatgctag            473 21  0 52.38 59.312  1.70  0.00  0.00  1.688
+  88 ctagctgactgatacgcgatg            469 21  0 52.38 59.312  0.00  0.00  0.00  1.688
+  89 gctactatcatctctgcgcga            356 21  0 52.38 60.707  2.71  2.71  0.00  1.707
+  90 agctactatcatctctgcgcg            355 21  0 52.38 60.709  0.00  0.00  0.00  1.709
+  91 actatcatctctgcgcgatc             359 20  0 50.00 58.270  4.99  0.00  0.00  1.730
+  92 actgatcgatcgatgctagc             117 20  0 50.00 58.270 23.29 13.61 35.21  1.730
+  93 gctagctgatcgatcgatgt              74 20  0 50.00 58.270 14.29  2.62 35.21  1.730
+  94 ctatcatctctgcgcgatcga            360 21  0 52.38 60.771 22.07  1.72 38.48  1.771
+  95 atcgatgctagctaggcgatg            406 21  0 52.38 60.779 21.16  4.37  0.00  1.779
+  96 tgactgatacgcgatgctag             474 20  0 50.00 58.207  1.70  0.00  0.00  1.793
+  97 ctgactgatacgcgatgcta             473 20  0 50.00 58.207  2.33  0.00  0.00  1.793
+  98 tagctgactgatacgcgatg             470 20  0 50.00 58.207  0.00  0.00  0.00  1.793
+  99 ctgactgatcgatcgatgct             114 20  0 50.00 58.197 26.44 12.40 35.21  1.803
+ 100 agctgactgatcgatcgatg             112 20  0 50.00 58.197 23.05 13.21 35.21  1.803
+ 101 tcggattagctagctgatgc               7 20  0 50.00 58.176 17.46 17.46 40.05  1.824
+ 102 gcatcggattagctagctga               4 20  0 50.00 58.176 28.29 20.88  0.00  1.824
+ 103 agcatcggattagctagctg               3 20  0 50.00 58.171 28.29 10.80  0.00  1.829
+ 104 gatgctagctaggcgatgc              409 19  0 57.89 59.141  4.18  0.00  0.00  1.859
+ 105 ctgatacgcgatgctagctag            477 21  0 52.38 59.113 17.46 17.46  0.00  1.887
+ 106 gctagctgactgatacgcg              468 19  0 57.89 59.086  8.21  3.89  0.00  1.914
+ 107 ctctgcgcgatcgatgctag             367 20  0 60.00 61.946 21.94 18.16 38.48  1.946
+ 108 tctgcgcgatcgatgctag              368 19  0 57.89 60.966 21.94 18.16 38.48  1.966
+ 109 ctctgcgcgatcgatgcta              367 19  0 57.89 60.966 26.61 17.10 38.48  1.966
+ 110 cgatgctagctaggcgatgc             408 20  0 60.00 61.968 11.09  0.00  0.00  1.968
+ 111 gactgatacgcgatgctagct            475 21  0 52.38 60.975 17.69  1.35  0.00  1.975
+ 112 gctagctgactgatacgcgat            468 21  0 52.38 60.975  8.21  0.00  0.00  1.975
+ 113 tgatacgcgatgctagctag             478 20  0 50.00 57.994 17.46 17.46  0.00  2.006
+ 114 ctgatacgcgatgctagcta             477 20  0 50.00 57.994 17.69  3.08  0.00  2.006
+ 115 cgcgatcgatgctagctagc             372 20  0 60.00 62.011 34.89 34.89 43.67  2.011
+ 116 gcgcgatcgatgctagctag             371 20  0 60.00 62.011 21.66 17.46 38.48  2.011
+ 117 ctgatcgatcgatgctagct             399 20  0 50.00 57.983 19.70  2.01 35.21  2.017
+ 118 agctgatcgatcgatgctag             397 20  0 50.00 57.983 27.33 18.05 34.69  2.017
+ 119 ctagctgatcgatcgatgct             395 20  0 50.00 57.983 33.87 33.38 38.16  2.017
+ 120 agctagctgatcgatcgatg             393 20  0 50.00 57.983 21.99 11.03 35.21  2.017
+ 121 ctgatcgatcgatgctagct             118 20  0 50.00 57.983 19.70  2.01 35.21  2.017
+ 122 agctagctgatcgatcgatg              73 20  0 50.00 57.983 21.99 11.03 35.21  2.017
+ 123 catcggattagctagctgatgc             5 22  0 50.00 59.982 24.41 24.41 40.05  2.018
+ 124 gcatcggattagctagctgatg             4 22  0 50.00 59.982 27.81 27.81 33.28  2.018
+ 125 tcgatgctagctaggcgat              407 19  0 52.63 58.964 14.03  3.01  0.00  2.036
+ 126 atcgatgctagctaggcga              406 19  0 52.63 58.964 16.30 16.30  0.00  2.036
+ 127 actatcatctctgcgcgatcg            359 21  0 52.38 61.037 12.19 12.19 39.07  2.037
+ 128 gcgcgatcgatgctagcta              371 19  0 57.89 61.037 21.66  3.08 38.48  2.037
+ 129 gctgatcgatcgatgctagct            398 21  0 52.38 61.044 27.88 12.70 35.21  2.044
+ 130 agctgatcgatcgatgctagc            397 21  0 52.38 61.044 27.33 27.90 34.69  2.044
+ 131 gctagctgatcgatcgatgct            394 21  0 52.38 61.044 33.87 33.38 38.16  2.044
+ 132 agctagctgatcgatcgatgc            393 21  0 52.38 61.044 24.08 21.09 35.21  2.044
+ 133 cgcgatcgatgctagctag              372 19  0 57.89 58.947 22.07 17.46 38.48  2.053
+ 134 tcgtagcggcgatctagc               576 18  0 61.11 59.936  4.70  0.00 36.40  2.064
+ 135 cgtagcggcgatctagct               577 18  0 61.11 59.935 11.03 11.03 37.58  2.065
+ 136 gcggcgatctagctagct               581 18  0 61.11 59.933 23.74 23.74 38.05  2.067
+ 137 agcggcgatctagctagc               580 18  0 61.11 59.933 16.97  7.15 39.86  2.067
+ 138 ctagctgactgatacgcgat             469 20  0 50.00 57.918  1.43  0.00  0.00  2.082
+ 139 ctagctgatcgatcgtagcgg            564 21  0 57.14 61.096 20.31 16.15  0.00  2.096
+ 140 agctactatcatctctgcgc             355 20  0 50.00 57.898  0.00  0.00  0.00  2.102
+ 141 gctagctactgatcgatgct             304 20  0 50.00 57.898 11.51 11.51  0.00  2.102
+ 142 agctagctactgatcgatgc             303 20  0 50.00 57.898 17.56  1.76  0.00  2.102
+ 143 agcatcggattagctagctgat             3 22  0 45.45 60.108 17.84 15.13  0.00  2.108
+ 144 tgctagctaggcgatgcta              411 19  0 52.63 58.881 17.69  8.91  0.00  2.119
+ 145 aagcatcggattagctagctg              2 21  0 47.62 58.879 28.29 10.80  0.00  2.121
+ 146 tctgcgcgatcgatgcta               368 18  0 55.56 59.857 26.61 16.13 38.48  2.143
+ 147 cgatgctagctaggcgatg              408 19  0 57.89 58.856 11.09  0.00  0.00  2.144
+ 148 agctagctgatcatcgatgcta           190 22  0 45.45 59.845 17.99 13.09  0.00  2.155
+ 149 tagctagctgatcatcgatgct           189 22  0 45.45 59.845 16.29 15.30  0.00  2.155
+ 150 atcgatcgatgtgcggct                82 18  0 55.56 60.166 29.65  4.36 41.65  2.166
+ 151 gctagctgactgatcgatca             261 20  0 50.00 57.829 26.99 26.99 35.44  2.171
+ 152 tagctagctgactgatcgatcg           107 22  0 50.00 60.174 28.29 13.89  0.00  2.174
+ 153 agctgatcatcatcgatgct             515 20  0 45.00 57.788 11.25  0.72 40.32  2.212
+ 154 agctagctgactgatcgatcat           260 22  0 45.45 59.778 26.67 18.02 36.62  2.222
+ 155 tgactgatacgcgatgctagc            474 21  0 52.38 61.238  8.61  8.61  0.00  2.238
+ 156 gctgactgatacgcgatgcta            472 21  0 52.38 61.238  2.33  0.00  0.00  2.238
+ 157 tagctgactgatacgcgatgc            470 21  0 52.38 61.238  3.47  0.00  0.00  2.238
+ 158 tagctagctgatcgatcgtagc           561 22  0 50.00 60.238 26.87 26.87  0.00  2.238
+ 159 gctagctagctgatcgatcgta           559 22  0 50.00 60.238 34.38  3.07 46.11  2.238
+ 160 tgatcgatcgatgctagctagg           400 22  0 50.00 60.239 26.44  6.29 35.21  2.239
+ 161 gctgactgatcgatcgatgct            113 21  0 52.38 61.244 26.44 12.40 35.21  2.244
+ 162 agctgactgatcgatcgatgc            112 21  0 52.38 61.244 24.08 19.43 35.21  2.244
+ 163 gatcgatcgatgtgcggct               81 19  0 57.89 61.263 19.16  0.00 41.65  2.263
+ 164 gctgatcatcgatgctactagc           195 22  0 50.00 59.727 18.08 16.44 45.61  2.273
+ 165 gctagctgatcatcgatgctac           191 22  0 50.00 59.727  9.57  5.47  0.00  2.273
+ 166 gatcgatcgatgtgcggc                81 18  0 61.11 59.714 18.10  0.95 41.65  2.286
+ 167 ctagctagctgactgatacgc            465 21  0 52.38 58.703 14.90  0.00  0.00  2.297
+ 168 tagctgatcgatcgatgtgcg             76 21  0 52.38 61.299 31.92 20.26 42.69  2.299
+ 169 agctgatcgatcgatgtgc               77 19  0 52.63 58.698 31.83 30.04 35.21  2.302
+ 170 gctgatcatcatcgatgctagc           516 22  0 50.00 60.302 10.80 10.34 40.32  2.302
+ 171 gctagctgatcatcatcgatgc           512 22  0 50.00 60.302 21.42  7.40 40.32  2.302
+ 172 aagcatcggattagctagctga             2 22  0 45.45 60.306 28.29 20.88  0.00  2.306
+ 173 gatcgatcgtagcggcga               570 18  0 61.11 60.318 13.01  8.51 45.59  2.318
+ 174 atcggattagctagctgatgc              6 21  0 47.62 58.673 17.46 17.46 40.05  2.327
+ 175 gcatcggattagctagctgat              4 21  0 47.62 58.673 17.84 15.13  0.00  2.327
+ 176 gcggcgatctagctagctg              581 19  0 63.16 61.329 17.07  8.17 38.05  2.329
+ 177 tgctagtgatgcatgctagt              24 20  0 45.00 57.636 24.96 11.17 35.89  2.364
+ 178 ctactatcatctctgcgcga             357 20  0 50.00 57.636  2.71  2.71  0.00  2.364
+ 179 actagctagctgactgatacgc           464 22  0 50.00 60.368 21.52  0.00  0.00  2.368
+ 180 gctagctagctgatcatcga             187 20  0 50.00 57.613 34.38  0.24 46.11  2.387
+ 181 tctctgcgcgatcgatgcta             366 20  0 55.00 62.413 26.61 17.10 38.48  2.413
+ 182 tgatcgatcgatgctagctagt           119 22  0 45.45 59.586 26.44  5.69 35.21  2.414
+ 183 actgatcgatcgatgctagcta           117 22  0 45.45 59.586 23.29  7.65 35.21  2.414
+ 184 tagctagctgatcgatcgatgt            72 22  0 45.45 59.586 14.29  2.62 35.21  2.414
+ 185 agctaggcgatgctagcta              415 19  0 52.63 58.572 17.69  3.08 41.54  2.428
+ 186 tagctaggcgatgctagct              414 19  0 52.63 58.572 17.35 17.35 43.53  2.428
+ 187 gatcgatcgatgctagctagg            401 21  0 52.38 58.567 23.89  6.29 35.21  2.433
+ 188 gctagctagctgactgatcgat           105 22  0 50.00 60.434 34.38  0.00 46.11  2.434
+ 189 gatcgatgctagctaggcg              405 19  0 57.89 58.563 15.59  9.02  0.00  2.437
+ 190 cgatcgatgctagctaggc              404 19  0 57.89 58.563 14.87  8.45  0.00  2.437
+ 191 tagctagctgactgatacgc             466 20  0 50.00 57.549 28.29  0.00  0.00  2.451
+ 192 agctagctgactgatcgatc             260 20  0 50.00 57.536 19.32 19.32  0.00  2.464
+ 193 agctagctgactgatcgatc             108 20  0 50.00 57.536 19.32 19.32  0.00  2.464
+ 194 aaagcatcggattagctagctg             1 22  0 45.45 59.524 28.29 10.80  0.00  2.476
+ 195 gctgactgatcgatcatcatgc           265 22  0 50.00 60.493 25.66 25.12 41.77  2.493
+ 196 tagctactatcatctctgcgcg           354 22  0 50.00 60.495  0.00  0.00  0.00  2.495
+ 197 ctgatcgatcgatgtgcggc              79 20  0 60.00 62.497 15.54  4.15 41.65  2.497
+ 198 gctgatcgatcgatgtgcgg              78 20  0 60.00 62.497 29.87 22.23 41.65  2.497
+ 199 tcgtagcggcgatctagct              576 19  0 57.89 61.503 11.03 11.03 36.40  2.503
+ 200 agcggcgatctagctagct              580 19  0 57.89 61.519 23.74 23.74 42.96  2.519
+ 201 ctagctagctgatcatcgatgc           188 22  0 50.00 59.470 21.42  9.22  0.00  2.530
+ 202 gctagctagctgatcatcgatg           187 22  0 50.00 59.470 34.38 20.23 46.11  2.530
+ 203 tcatctctgcgcgatcga               363 18  0 55.56 59.468 22.07  0.00 38.48  2.532
+ 204 tcgatcgatgtgcggcta                83 18  0 55.56 59.465 18.63  0.00 41.65  2.535
+ 205 tgatcgatcgatgtgcggc               80 19  0 57.89 61.549 21.27  8.44 41.65  2.549
+ 206 ctagctaggcgatgctagctag           413 22  0 54.55 60.561 22.99 22.99 46.84  2.561
+ 207 gctagctagctgatcgatcgat           390 22  0 50.00 60.561 34.38 30.53 46.11  2.561
+ 208 gctagctagctgatcgatcgat            70 22  0 50.00 60.561 34.38 30.53 46.11  2.561
+ 209 ctgcgcgatcgatgctag               369 18  0 61.11 59.415 19.79 13.97 38.48  2.585
+ 210 aagcatcggattagctagct               2 20  0 45.00 57.413 23.74 23.74  0.00  2.587
+ 211 gctagctgatcatcgatgcta            191 21  0 47.62 58.410 16.61 13.09  0.00  2.590
+ 212 tagctagctgatcatcgatgc            189 21  0 47.62 58.410 21.42  9.22  0.00  2.590
+ 213 actgatacgcgatgctagc              476 19  0 52.63 58.407  8.61  8.61  0.00  2.593
+ 214 gctagctgactgatcgatcatc           261 22  0 50.00 59.406 23.93 21.92 36.62  2.594
+ 215 atcgatcgatgctagctagg             402 20  0 50.00 57.396 29.65  6.29 33.56  2.604
+ 216 atctctgcgcgatcgatgc              365 19  0 57.89 61.618 22.01 22.01 38.48  2.618
+ 217 tgatcgatcgtagcggcg               569 18  0 61.11 60.621 20.58  0.86  0.00  2.621
+ 218 atcatctctgcgcgatcgatg            362 21  0 52.38 61.633 18.01 18.01 38.48  2.633
+ 219 agctagctgatcgatcgtag             562 20  0 50.00 57.344 17.99 16.86  0.00  2.656
+ 220 ctagctagctgatcgatcgt             560 20  0 50.00 57.344 16.40  2.65  0.00  2.656
+ 221 gctagctgactgatcgatcat            261 21  0 47.62 58.339 26.67 18.02 36.62  2.661
+ 222 ctgatcgatcgtagcggcg              568 19  0 63.16 61.664 14.21  0.86  0.00  2.664
+ 223 ctgactgatacgcgatgct              473 19  0 52.63 58.330  2.33  0.00  0.00  2.670
+ 224 agctgactgatacgcgatg              471 19  0 52.63 58.330  0.00  0.00  0.00  2.670
+ 225 gctagctgatcgatcgtagcg            563 21  0 57.14 61.676 24.18 16.49  0.00  2.676
+ 226 ctagctgactgatcgatcga             110 20  0 50.00 57.276 22.52 22.52  0.00  2.724
+ 227 agctagctactgatcgatgcta           303 22  0 45.45 59.252 17.56 12.23  0.00  2.748
+ 228 tagctagctactgatcgatgct           302 22  0 45.45 59.252 27.80 11.51  0.00  2.748
+ 229 gactgatacgcgatgctagcta           475 22  0 50.00 60.751 17.69  3.08  0.00  2.751
+ 230 actgatacgcgatgctagctag           476 22  0 50.00 60.752 17.46 17.46  0.00  2.752
+ 231 gactgatcgatcgatgctagct           116 22  0 50.00 60.753 18.04  9.56 35.21  2.753
+ 232 gctagctgactgatcgatcgat           109 22  0 50.00 60.753 30.53 30.53 37.90  2.753
+ 233 tgcgcgatcgatgctagcta             370 20  0 55.00 62.756 26.61  9.85 38.48  2.756
+ 234 gcggcgatctagctagctga             581 20  0 60.00 62.765 21.57 16.66 38.70  2.765
+ 235 agcggcgatctagctagctg             580 20  0 60.00 62.771 17.07  8.17 44.87  2.771
+ 236 ctactatcatctctgcgcgatc           357 22  0 50.00 59.220  4.99  0.00  0.00  2.780
+ 237 tatcatctctgcgcgatcg              361 19  0 52.63 58.199 12.19 12.19 39.07  2.801
+ 238 tactatcatctctgcgcgatcg           358 22  0 50.00 60.811 12.19 12.19 39.07  2.811
+ 239 tagctagctgactgatcgatca           259 22  0 45.45 59.187 28.29 26.99 35.44  2.813
+ 240 gctgatcgatcgatgctagcta           398 22  0 50.00 60.816 27.88 12.57 35.21  2.816
+ 241 tagctgatcgatcgatgctagc           396 22  0 50.00 60.816 30.84 27.90 36.80  2.816
+ 242 gctagctgatcgatcgatgcta           394 22  0 50.00 60.816 34.11 32.56 36.80  2.816
+ 243 tagctagctgatcgatcgatgc           392 22  0 50.00 60.816 24.08 21.09 35.21  2.816
+ 244 gctaggcgatgctagctag              416 19  0 57.89 58.179 17.46 17.46 35.42  2.821
+ 245 ctagctaggcgatgctagc              413 19  0 57.89 58.179 18.68  9.44 36.95  2.821
+ 246 gctagctaggcgatgctag              412 19  0 57.89 58.179 23.16 23.16 38.59  2.821
+ 247 catctctgcgcgatcgatgc             364 20  0 60.00 62.823 22.01 22.01 38.48  2.823
+ 248 aaagcatcggattagctagct              1 21  0 42.86 58.168 23.74 23.74  0.00  2.832
+ 249 ctgactgatcgatcgatgctag           114 22  0 50.00 59.155 22.81 19.44 35.21  2.845
+ 250 ctagctgactgatcgatcgatg           110 22  0 50.00 59.155 23.05 13.21 35.21  2.845
+ 251 tactatcatctctgcgcgatc            358 21  0 47.62 58.155  4.99  0.00  0.00  2.845
+ 252 gctagctactgatcgatgctac           304 22  0 50.00 59.151  8.57  4.26  0.00  2.849
+ 253 ctactatcatctctgcgcgat            357 21  0 47.62 58.150  4.99  2.52  0.00  2.850
+ 254 agctgatcatcgatgctact             194 20  0 45.00 57.134 17.14  8.95  0.00  2.866
+ 255 gctagctagctgatcatcgat            187 21  0 47.62 58.132 34.38  0.00 46.11  2.868
+ 256 ctgatacgcgatgctagct              477 19  0 52.63 58.107 17.69  1.35  0.00  2.893
+ 257 ggcgatctagctagctgac              583 19  0 57.89 58.106 14.84  7.25 37.58  2.894
+ 258 tgactgatcgatcgatgctag            115 21  0 47.62 58.084 22.81 19.44 35.21  2.916
+ 259 ctgactgatcgatcgatgcta            114 21  0 47.62 58.084 26.44 14.64 35.21  2.916
+ 260 tagctgactgatcgatcgatg            111 21  0 47.62 58.084 23.05 13.21 35.21  2.916
+ 261 actgatcgatcatcatgctagc           269 22  0 45.45 59.071 26.67  8.61 41.77  2.929
+ 262 agctgactgatcgatcatca             264 20  0 45.00 57.064 26.49 26.49 39.98  2.936
+ 263 ctagctagctgatcgatcga             391 20  0 50.00 57.060 22.52 22.52  0.00  2.940
+ 264 ctagctagctgatcgatcga              71 20  0 50.00 57.060 22.52 22.52  0.00  2.940
+ 265 gatcgatcgatgtgcggctag             81 21  0 57.14 61.947 19.16  0.00 41.65  2.947
+ 266 tgctagctaggcgatgct               411 18  0 55.56 59.050 17.69  7.53  0.00  2.950
+ 267 gctgatcgatcgtagcggc              567 19  0 63.16 61.960 20.49 19.38  0.00  2.960
+ 268 cgatcgatgtgcggctag                84 18  0 61.11 59.032 10.82  0.00 41.65  2.968
+ 269 tgatcgatcgatgtgcggct              80 20  0 55.00 62.987 22.21  0.00 41.65  2.987
+ 270 ctgactgatcgatcatcatgct           266 22  0 45.45 59.004 20.99  6.82 41.77  2.996
+ 271 agctgactgatcgatcatcatg           264 22  0 45.45 59.004 22.70 19.51 41.77  2.996
+ 272 agctagctgactgatacgcga            467 21  0 52.38 62.000 17.99  0.00  0.00  3.000
+ 273 tgactgatcgatcgatgctagc           115 22  0 50.00 61.008 18.17 12.52 35.21  3.008
+ 274 gctgactgatcgatcgatgcta           113 22  0 50.00 61.008 26.44 14.64 35.21  3.008
+ 275 tagctgactgatcgatcgatgc           111 22  0 50.00 61.008 24.08 19.43 35.21  3.008
+ 276 agctagctgatcgatcgatgtg            73 22  0 50.00 61.010 17.99  6.93 35.21  3.010
+ 277 ctgatcgatcgatgctagctag           399 22  0 50.00 58.963 19.70 17.46 35.21  3.037
+ 278 ctagctgatcgatcgatgctag           395 22  0 50.00 58.963 37.86 37.86 43.17  3.037
+ 279 ctagctagctgatcgatcgatg           391 22  0 50.00 58.963 21.99 11.03 35.21  3.037
+ 280 ctgatcgatcgatgctagctag           118 22  0 50.00 58.963 19.70 17.46 35.21  3.037
+ 281 ctagctagctgatcgatcgatg            71 22  0 50.00 58.963 21.99 11.03 35.21  3.037
+ 282 gactgatcgatcatcatgctagc          268 23  0 47.83 60.053 24.51  9.03 41.77  3.053
+ 283 gctagtgatgcatgctagtagtg           25 23  0 47.83 59.929 24.96 10.54  0.00  3.071
+ 284 gctactatcatctctgcgcgat           356 22  0 50.00 61.073  4.99  2.52  0.00  3.073
+ 285 gtagcggcgatctagctag              578 19  0 57.89 57.903 15.64 15.64 37.58  3.097
+ 286 tgactgatcgatcatcatgct            267 21  0 42.86 57.900 26.79 12.28 41.77  3.100
+ 287 ctagctactatcatctctgcgc           353 22  0 50.00 58.892  0.00  0.00  0.00  3.108
+ 288 gctagctactatcatctctgcg           352 22  0 50.00 58.892  8.21  0.00  0.00  3.108
+ 289 ctagctagctactgatcgatgc           301 22  0 50.00 58.892 14.00  1.76  0.00  3.108
+ 290 gctagctagctactgatcgatg           300 22  0 50.00 58.892 34.38  7.78 46.11  3.108
+ 291 catcgatcgatgctagtatgct           325 22  0 45.45 58.885 37.80 10.02 44.93  3.115
+ 292 tgatcgatcgatgctagctag            400 21  0 47.62 57.879 26.44 17.46 35.21  3.121
+ 293 ctgatcgatcgatgctagcta            399 21  0 47.62 57.879 19.70  3.77 35.21  3.121
+ 294 tagctgatcgatcgatgctag            396 21  0 47.62 57.879 34.03 27.12 36.80  3.121
+ 295 ctagctgatcgatcgatgcta            395 21  0 47.62 57.879 34.11 32.56 36.80  3.121
+ 296 tagctagctgatcgatcgatg            392 21  0 47.62 57.879 21.99 11.03 35.21  3.121
+ 297 tgatcgatcgatgctagctag            119 21  0 47.62 57.879 26.44 17.46 35.21  3.121
+ 298 ctgatcgatcgatgctagcta            118 21  0 47.62 57.879 19.70  3.77 35.21  3.121
+ 299 tagctagctgatcgatcgatg             72 21  0 47.62 57.879 21.99 11.03 35.21  3.121
+ 300 gatcgatcgatgctagctagt            120 21  0 47.62 57.878 23.89  3.56 35.21  3.122
+ 301 ctatcatctctgcgcgatcgat           360 22  0 50.00 61.132 22.07 11.47 38.48  3.132
+ 302 tgatcgatcgtagcggcga              569 19  0 57.89 62.144 20.58  8.51 45.59  3.144
+ 303 tcgtagcggcgatctagctag            576 21  0 57.14 62.173 15.64 15.64 36.40  3.173
+ 304 tactagctagctgactgatacgc          463 23  0 47.83 60.176 13.17  0.00  0.00  3.176
+ 305 ctgatcatcatcgatgctagct           517 22  0 45.45 58.807 17.69  1.76 40.32  3.193
+ 306 agctgatcatcatcgatgctag           515 22  0 45.45 58.807  5.93  2.76 40.32  3.193
+ 307 ctagctgatcatcatcgatgct           513 22  0 45.45 58.807 14.14  8.34 40.32  3.193
+ 308 agctagctgatcatcatcgatg           511 22  0 45.45 58.807 20.23 20.23 41.48  3.193
+ 309 ctgatcgatcatcatgctagct           270 22  0 45.45 58.807 26.67  0.00 41.77  3.193
+ 310 ctagctgactgatcgatcgat            110 21  0 47.62 57.806 30.53 30.53 37.90  3.194
+ 311 ttagctagctgactgatcgatca          258 23  0 43.48 59.798 28.29 26.99 35.44  3.202
+ 312 tagctactatcatctctgcgc            354 21  0 47.62 57.798  0.00  0.00  0.00  3.202
+ 313 gctagctactgatcgatgcta            304 21  0 47.62 57.798 12.99 12.23  0.00  3.202
+ 314 tagctagctactgatcgatgc            302 21  0 47.62 57.798 27.80  1.76  0.00  3.202
+ 315 tctctgcgcgatcgatgc               366 18  0 61.11 61.229 22.01 22.01 38.48  3.229
+ 316 ctctgcgcgatcgatgct               367 18  0 61.11 61.232 26.61  0.00 38.48  3.232
+ 317 agctagctactatcatctctgcg          351 23  0 47.83 60.238 17.56  0.00  0.00  3.238
+ 318 ctagctagctactgatcgatgct          301 23  0 47.83 60.238 14.00 11.51  0.00  3.238
+ 319 ctgatcgatcgtagcggc               568 18  0 61.11 58.727 14.21  0.00  0.00  3.273
+ 320 gctgatcgatcgtagcgg               567 18  0 61.11 58.727 20.49 15.03  0.00  3.273
+ 321 agctaggcgatgctagct               415 18  0 55.56 58.725 17.69 13.00 39.84  3.275
+ 322 tgctagtgatgcatgctagtagt           24 23  0 43.48 60.302 24.96 12.98 35.89  3.302
+ 323 gcgcgatcgatgctagct               371 18  0 61.11 61.306 21.66  1.35 38.48  3.306
+ 324 tgatcatcatcgatgctagct            518 21  0 42.86 57.691 17.69  1.76 40.32  3.309
+ 325 agctgatcatcatcgatgcta            515 21  0 42.86 57.691  0.24  0.00 40.32  3.309
+ 326 tagctgatcatcatcgatgct            514 21  0 42.86 57.691 14.14  8.34 40.32  3.309
+ 327 tgatcgatcatcatgctagct            271 21  0 42.86 57.691 27.48  0.00 37.38  3.309
+ 328 ctagctagctgactgatacgcg           465 22  0 54.55 61.313 14.90  3.89  0.00  3.313
+ 329 tgctagtgatgcatgctagtag            24 22  0 45.45 58.673 24.96 19.76 35.89  3.327
+ 330 gctagtgatgcatgctagtagt            25 22  0 45.45 58.672 24.96 12.98  0.00  3.328
+ 331 tagctagctgatcatcgatgcta          189 23  0 43.48 59.671 17.82 15.89  0.00  3.329
+ 332 agctagctgactgatacgc              467 19  0 52.63 57.642 17.99  0.00  0.00  3.358
+ 333 tatcatctctgcgcgatcgatg           361 22  0 50.00 61.383 18.01 18.01 38.48  3.383
+ 334 agctgactgatcgatcatcat            264 21  0 42.86 57.616 26.31 18.90 41.77  3.384
+ 335 actagctagctgatcatcatcga          508 23  0 43.48 59.607 22.43  0.00  0.00  3.393
+ 336 tagctagctgactgatcgatcat          259 23  0 43.48 59.607 28.29 18.02 36.62  3.393
+ 337 gatgctagctaggcgatgctag           409 22  0 54.55 61.393 23.16 23.16 38.59  3.393
+ 338 cggcgatctagctagctgact            582 21  0 57.14 62.394 17.44  7.44 38.70  3.394
+ 339 ctagctagctgatcgatcgat            391 21  0 47.62 57.600 30.53 30.53 37.90  3.400
+ 340 ctagctagctgatcgatcgat             71 21  0 47.62 57.600 30.53 30.53 37.90  3.400
+ 341 actgatcgatcatcatgctagct          269 23  0 43.48 60.428 26.67  4.70 41.77  3.428
+ 342 ctagctagctgactgatcgatc           106 22  0 50.00 58.567 19.32 19.32  0.00  3.433
+ 343 ctgactgatcgatcatcatgc            266 21  0 47.62 57.562 20.99 12.19 41.77  3.438
+ 344 gctgactgatcgatcatcatg            265 21  0 47.62 57.562 22.70 19.51 41.77  3.438
+ 345 gatcgatcgatgctagctaggc           401 22  0 54.55 61.448 23.89  8.45 35.21  3.448
+ 346 gtgatgcatgctagtagtgatgt           29 23  0 43.48 59.551 11.60  0.00  0.00  3.449
+ 347 tgctagtgatgcatgctagta             24 21  0 42.86 57.546 24.96 21.25 35.89  3.454
+ 348 tagcggcgatctagctagctg            579 21  0 57.14 62.457 18.98  9.30 45.57  3.457
+ 349 gtagcggcgatctagctagct            578 21  0 57.14 62.458 23.74 23.74 46.60  3.458
+ 350 tagctgatcgatcgtagcg              565 19  0 52.63 57.539 25.02 11.96  0.00  3.461
+ 351 gctagctagctactgatcgat            300 21  0 47.62 57.517 34.38  0.00 46.11  3.483
+ 352 agctagctactgatcgatgctac          303 23  0 47.83 60.487 17.56  7.81  0.00  3.487
+ 353 atcgatcgatgctagtatgct            326 21  0 42.86 57.502 29.65  2.17 33.56  3.498
+ 354 agctactgatcgatgctacatc           307 22  0 45.45 58.484  7.41  0.00 37.97  3.516
+ 355 agtgatgcatgctagtagtga             28 21  0 42.86 57.471  0.00  0.00  0.00  3.529
+ 356 gactgatcgatcgatgctagcta          116 23  0 47.83 60.546 18.04  4.19 35.21  3.546
+ 357 ctgatcgatcgatgctagctagt          118 23  0 47.83 60.547 22.18  3.56 35.21  3.547
+ 358 actgatcgatcgatgctagctag          117 23  0 47.83 60.547 23.29 17.46 35.21  3.547
+ 359 ctagctagctgatcgatcgatgt           71 23  0 47.83 60.547 14.29  2.62 35.21  3.547
+ 360 catcgatcgatgctagtatgc            325 21  0 47.62 57.452 37.80  0.00 44.93  3.548
+ 361 tagctagctgactgatcgatc            259 21  0 47.62 57.451 28.29 19.32  0.00  3.549
+ 362 tagctagctgactgatcgatc            107 21  0 47.62 57.451 28.29 19.32  0.00  3.549
+ 363 ctagctagctgactgatcgat            106 21  0 47.62 57.445 14.90  0.00  0.00  3.555
+ 364 tcgatgctagctaggcga               407 18  0 55.56 58.427 15.59 13.52  0.00  3.573
+ 365 tgatcgatcgatgctagctagta          119 23  0 43.48 59.424 26.44 18.77 35.21  3.576
+ 366 ctgcgcgatcgatgctagc              369 19  0 63.16 62.586 20.26 12.12 38.48  3.586
+ 367 agctagctgatcatcatcgat            511 21  0 42.86 57.405 17.99  0.00  0.00  3.595
+ 368 tgcgcgatcgatgctagc               370 18  0 61.11 61.605 26.61 17.77 38.48  3.605
+ 369 ctagctagctgatcgatcgtag           560 22  0 50.00 58.387 16.86 16.86  0.00  3.613
+ 370 actagctagctgactgatacg            464 21  0 47.62 57.384 21.52  2.77  0.00  3.616
+ 371 ctagctgactgatacgcga              469 19  0 52.63 57.370 16.29  0.00  0.00  3.630
+ 372 gctactagctagctgactgat            461 21  0 47.62 57.360 15.96  3.00 44.92  3.640
+ 373 ctgatcatcatcgatgctagc            517 21  0 47.62 57.358  8.61  8.61 40.32  3.642
+ 374 gctgatcatcatcgatgctag            516 21  0 47.62 57.358  5.93  2.76 40.32  3.642
+ 375 ctagctgatcatcatcgatgc            513 21  0 47.62 57.358 21.42  7.40 40.32  3.642
+ 376 gctagctgatcatcatcgatg            512 21  0 47.62 57.358 20.23 20.23 41.48  3.642
+ 377 ctgatcgatcatcatgctagc            270 21  0 47.62 57.358 26.67  8.61 41.77  3.642
+ 378 agctactgatcgatgctacat            307 21  0 42.86 57.344  7.41  0.00  0.00  3.656
+ 379 tgatcgatcgatgtgcggcta             80 21  0 52.38 62.663 22.21  0.24 41.65  3.663
+ 380 atctctgcgcgatcgatg               365 18  0 55.56 58.327 12.03  4.19 38.48  3.673
+ 381 catctctgcgcgatcgat               364 18  0 55.56 58.327 22.07  1.26 38.48  3.673
+ 382 atcatctctgcgcgatcg               362 18  0 55.56 58.327 12.19 12.19 39.07  3.673
+ 383 aagcatcggattagctagctgat            2 23  0 43.48 60.682 17.84 15.13  0.00  3.682
+ 384 agtgatgcatgctagtagtgatg           28 23  0 43.48 59.299  7.49  7.49  0.00  3.701
+ 385 gatcgatgctagctaggcgatg           405 22  0 54.55 61.702 24.26  6.24  0.00  3.702
+ 386 atctctgcgcgatcgatgcta            365 21  0 52.38 62.723 26.61 17.10 38.48  3.723
+ 387 tagctagctgactgatacgcga           466 22  0 50.00 61.730 28.29  0.00  0.00  3.730
+ 388 tagctagctgatcgatcgtag            561 21  0 47.62 57.269 16.86 16.86  0.00  3.731
+ 389 ctagctagctgatcgatcgta            560 21  0 47.62 57.269 11.68  3.07  0.00  3.731
+ 390 tcgatcgatgctagctagtag            122 21  0 47.62 57.269 18.63  2.63  0.00  3.731
+ 391 gctagctactgatcgatgctaca          304 23  0 47.83 60.734 11.21  0.06  0.00  3.734
+ 392 agctagctgactgatcgatcatc          260 23  0 47.83 60.736 23.93 21.92 36.62  3.736
+ 393 agctagctgactgatcgatcga           108 22  0 50.00 61.737 22.52 22.52  0.00  3.737
+ 394 tctctgcgcgatcgatgct              366 19  0 57.89 62.740 26.61  0.00 38.48  3.740
+ 395 tgatgcatgctagtagtgatgt            30 22  0 40.91 58.256 11.60  0.00  0.00  3.744
+ 396 tgatcgatcgatgtgcgg                80 18  0 55.56 58.244 21.27  0.00 41.65  3.756
+ 397 cgatcgatgctagctaggcga            404 21  0 57.14 62.770 16.30 16.30  0.00  3.770
+ 398 tcgatcgatgctagctaggcg            403 21  0 57.14 62.770 18.63 11.67  0.00  3.770
+ 399 atcgatcgatgcatgcatg              443 19  0 47.37 57.226 29.65 23.31 37.30  3.774
+ 400 catcgatcgatgcatgcat              442 19  0 47.37 57.226 37.80 33.45 44.93  3.774
+ 401 actagctagctgatcatcatcg           508 22  0 45.45 58.219 22.43  3.40  0.00  3.781
+ 402 ctgatcatcgatgctactagct           196 22  0 45.45 58.219 10.86  0.00 45.92  3.781
+ 403 agctgatcatcgatgctactag           194 22  0 45.45 58.219 13.67  9.68  0.00  3.781
+ 404 ctagctgatcatcgatgctact           192 22  0 45.45 58.219 14.85  7.80  0.00  3.781
+ 405 tttagctagctgactgatcga            257 21  0 42.86 57.216  0.38  0.00  0.00  3.784
+ 406 tagctagctgatcgatcgatgtg           72 23  0 47.83 60.793 10.14  4.94 35.21  3.793
+ 407 gctagctagctgatcatcatct           146 22  0 45.45 58.203 34.38  0.00 46.11  3.797
+ 408 ctagctagctgatcatcgatgct          188 23  0 47.83 60.799 16.29 15.30  0.00  3.799
+ 409 agctagctactatcatcgatcga          429 23  0 43.48 59.170 22.52 22.52  0.00  3.830
+ 410 ttagctagctgactgatcgatc           258 22  0 45.45 58.159 28.29 19.32  0.00  3.841
+ 411 ctagctgactgatcgatcatca           262 22  0 45.45 58.155 26.49 26.49 39.98  3.845
+ 412 aaagcatcggattagctagctga            1 23  0 43.48 60.870 28.29 20.88  0.00  3.870
+ 413 agctgactgatacgcgatgct            471 21  0 52.38 62.876  7.57  2.13  0.00  3.876
+ 414 tagctagctactgatcgatgcta          302 23  0 43.48 59.102 27.80 12.23  0.00  3.898
+ 415 tcatcatcgatgctagctagt            521 21  0 42.86 57.067 22.18  3.56 40.32  3.933
+ 416 tcgatcatcatgctagctact            274 21  0 42.86 57.067  0.00  0.00  0.00  3.933
+ 417 tgatcatcgatgctactagct            197 21  0 42.86 57.067 17.14  0.00 45.92  3.933
+ 418 agctgatcatcgatgctacta            194 21  0 42.86 57.067 17.14  4.89  0.00  3.933
+ 419 tagctgatcatcgatgctact            193 21  0 42.86 57.067 14.85  7.80  0.00  3.933
+ 420 tcgatcgatgctagtatgctag           327 22  0 45.45 58.044 18.63 13.77 46.09  3.956
+ 421 gcgatctagctagctgact              584 19  0 52.63 57.034 17.44  7.44  0.00  3.966
+ 422 gctactgatcgatgctacatc            308 21  0 47.62 57.028  2.44  0.00 37.97  3.972
+ 423 cggcgatctagctagctg               582 18  0 61.11 58.018 17.07  8.17 37.58  3.982
+ 424 gctagctgactgatcgatcatca          261 23  0 47.83 60.983 26.49 26.49 39.98  3.983
+ 425 actatcatctctgcgcgat              359 19  0 47.37 57.015  4.99  2.52  0.00  3.985
+ 426 catcggattagctagctgatg              5 21  0 47.62 57.003 23.69 23.29  0.00  3.997
+ 427 tagctgactgatcgatcatca            263 21  0 42.86 57.000 26.49 26.49 39.98  4.000
+ 428 actagctagctgatcatcatcgat         508 24  0 41.67 59.995 22.43  0.00  0.00  4.005
+ 429 agtgatgcatgctagtagtgat            28 22  0 40.91 57.984  0.00  0.00  0.00  4.016
+ 430 ctagctagctgatcatcatcga           509 22  0 45.45 57.958 11.68  0.00  0.00  4.042
+ 431 gctgatcatcgatgctactagct          195 23  0 47.83 61.046 20.91  5.24 45.92  4.046
+ 432 agctgatcatcgatgctactagc          194 23  0 47.83 61.046 20.78 20.78 45.61  4.046
+ 433 gctagctgatcatcgatgctact          191 23  0 47.83 61.046 12.59  8.92  0.00  4.046
+ 434 agctagctgatcatcgatgctac          190 23  0 47.83 61.046 17.99  7.99  0.00  4.046
+ 435 tagctagctactatcatctctgcg         350 24  0 45.83 60.058 27.80  0.00  0.00  4.058
+ 436 ctagctagctactgatcgatgcta         301 24  0 45.83 60.058 14.00 12.23  0.00  4.058
+ 437 agctactatcatctctgcgcga           355 22  0 50.00 62.058  2.71  2.71  0.00  4.058
+ 438 gctatttagctagctgactgatcg         253 24  0 45.83 60.060  7.27  0.00 46.11  4.060
+ 439 tgatcgatcatcatgctagctac          271 23  0 43.48 58.931 27.48  0.00 37.38  4.069
+ 440 gtgatgcatgctagtagtgatg            29 22  0 45.45 57.921  7.49  7.49  0.00  4.079
+ 441 ctagctagctgactgatcgatcg          106 23  0 52.17 61.091 16.84 13.89  0.00  4.091
+ 442 ctagctactgatcgatgctaca           305 22  0 45.45 57.898 13.79  1.61  0.00  4.102
+ 443 cggcgatctagctagctgacta           582 22  0 54.55 62.109 17.44  5.40 38.70  4.109
+ 444 atgctagctaggcgatgc               410 18  0 55.56 57.890 10.59  0.00  0.00  4.110
+ 445 ctgatcgatcatcatgctagctac         270 24  0 45.83 59.882 26.67  0.00 41.77  4.118
+ 446 gctactagctagctgatcatca           505 22  0 45.45 57.879 14.37  0.00 44.92  4.121
+ 447 gctactagctagctgatcatca           208 22  0 45.45 57.879 14.37  0.00 44.92  4.121
+ 448 ctgactgatacgcgatgctagc           473 22  0 54.55 62.128  8.61  8.61  0.00  4.128
+ 449 gctgactgatacgcgatgctag           472 22  0 54.55 62.128  1.70  0.00  0.00  4.128
+ 450 ctagctgactgatacgcgatgc           469 22  0 54.55 62.128  3.47  0.00  0.00  4.128
+ 451 gctagctgactgatacgcgatg           468 22  0 54.55 62.128  8.21  0.00  0.00  4.128
+ 452 tgactgatcgatcatcatgctag          267 23  0 43.48 58.866 26.79 18.40 41.77  4.134
+ 453 ctgactgatcgatcatcatgcta          266 23  0 43.48 58.866 20.99  8.89 41.77  4.134
+ 454 tagctgactgatcgatcatcatg          263 23  0 43.48 58.866 22.70 19.51 41.77  4.134
+ 455 ctagctagctgatcgatcgtagc          560 23  0 52.17 61.151 26.87 26.87  0.00  4.151
+ 456 gctagctagctgatcgatcgtag          559 23  0 52.17 61.151 34.38 16.86 46.11  4.151
+ 457 ctgatcgatcgatgctagctagg          399 23  0 52.17 61.158 22.67  6.29 35.21  4.158
+ 458 gatcgatcgatgctagctagtag          120 23  0 47.83 58.829 23.89  2.63 35.21  4.171
+ 459 ttagctagctgactgatcgatcat         258 24  0 41.67 60.177 28.29 18.02 36.62  4.177
+ 460 ctgactgatcgatcatcatgctag         266 24  0 45.83 59.822 20.99 12.80 41.77  4.178
+ 461 ctagctgactgatcgatcatcatg         262 24  0 45.83 59.822 22.70 19.51 41.77  4.178
+ 462 ctagctgatcgatcgatgtgcg            75 22  0 54.55 62.180 31.92 20.85 42.69  4.180
+ 463 tttagctagctgactgatcgatc          257 23  0 43.48 58.807 19.32 19.32  0.00  4.193
+ 464 tgactgatcgatcatcatgcta           267 22  0 40.91 57.803 26.79 13.11 41.77  4.197
+ 465 gctagctactatcatcgatcga           430 22  0 45.45 57.783 22.52 22.52  0.00  4.217
+ 466 gatcgatcgatgctagctagta           120 22  0 45.45 57.783 23.89 18.77 35.21  4.217
+ 467 agctagctactatcatcgatcg           429 22  0 45.45 57.777 17.56  9.87  0.00  4.223
+ 468 atcgatcgatgctagctagtag           121 22  0 45.45 57.777 29.65  2.63 33.56  4.223
+ 469 tgatcatcatcgatgctagctagt         518 24  0 41.67 60.238 22.18  3.56 40.32  4.238
+ 470 tgatcgatcatcatgctagctact         271 24  0 41.67 60.238 27.48  0.00 37.38  4.238
+ 471 actgatcgatcatcatgctagcta         269 24  0 41.67 60.238 26.67  2.76 41.77  4.238
+ 472 catcgatcgatgctagtatgcta          325 23  0 43.48 58.753 37.80  6.23 44.93  4.247
+ 473 tttagctagctgactgatcgat           257 22  0 40.91 57.736  0.38  0.00  0.00  4.264
+ 474 atttagctagctgactgatcga           256 22  0 40.91 57.736  4.16  0.00  0.00  4.264
+ 475 cgcgatcgatgctagcta               372 18  0 55.56 57.717 22.07  3.08 38.48  4.283
+ 476 catcgatcgatgctagtatgctag         325 24  0 45.83 59.708 37.80 16.01 44.93  4.292
+ 477 tagctagctactgatcgatgctac         302 24  0 45.83 60.297 27.80  7.81  0.00  4.297
+ 478 agcatcggattagctagctgatg            3 23  0 47.83 61.299 27.81 27.81 33.28  4.299
+ 479 agctagctgactgatacgcgat           467 22  0 50.00 62.317 17.99  0.00  0.00  4.317
+ 480 tgatcatcatcgatgctagctag          518 23  0 43.48 58.678 17.46 17.46 40.32  4.322
+ 481 ctgatcatcatcgatgctagcta          517 23  0 43.48 58.678 17.69  2.41 40.32  4.322
+ 482 tagctgatcatcatcgatgctag          514 23  0 43.48 58.678  9.90  2.76 40.32  4.322
+ 483 ctagctgatcatcatcgatgcta          513 23  0 43.48 58.678 14.58  9.63 40.32  4.322
+ 484 tagctagctgatcatcatcgatg          510 23  0 43.48 58.678 20.23 20.23 41.48  4.322
+ 485 ctgatcgatcatcatgctagcta          270 23  0 43.48 58.678 26.67  2.76 41.77  4.322
+ 486 gatcatcatcgatgctagctagt          519 23  0 43.48 58.677 22.18  3.56 40.32  4.323
+ 487 gatcgatcatcatgctagctact          272 23  0 43.48 58.677 21.11  0.00  0.00  4.323
+ 488 gctagctagctgactgatcgatc          105 23  0 52.17 61.341 34.38 19.32 46.11  4.341
+ 489 tgatcgatcgatgctagctagtag         119 24  0 45.83 60.356 26.44  2.63 35.21  4.356
+ 490 ctgatcgatcgatgctagctagta         118 24  0 45.83 60.356 22.18 18.77 35.21  4.356
+ 491 ctgatcatcatcgatgctagctag         517 24  0 45.83 59.644 17.46 17.46 40.32  4.356
+ 492 ctagctgatcatcatcgatgctag         513 24  0 45.83 59.644 19.54 18.30 42.07  4.356
+ 493 ctagctagctgatcatcatcgatg         509 24  0 45.83 59.644 20.23 20.23 41.48  4.356
+ 494 tttagctagctgactgatcgatca         257 24  0 41.67 60.358 26.99 26.99 35.44  4.358
+ 495 actatcatctctgcgcgatcga           359 22  0 50.00 62.365 22.07  1.72 38.48  4.365
+ 496 agctgatcgatcgtagcg               566 18  0 55.56 57.634 25.02 11.96  0.00  4.366
+ 497 gctactagctagctgactgatac          461 23  0 47.83 58.626 15.96  1.42 44.92  4.374
+ 498 agctgatcgatcgatgctagct           397 22  0 50.00 62.388 30.32 30.32 38.42  4.388
+ 499 agctagctgatcgatcgatgct           393 22  0 50.00 62.388 33.87 33.38 38.16  4.388
+ 500 ctagctgactgatcgatcatcat          262 23  0 43.48 58.612 26.31 20.43 41.77  4.388
+ 501 agctagctactatcatctctgc           351 22  0 45.45 57.608 17.56  0.00  0.00  4.392
+ 502 ctagctactatcatctctgcgcg          353 23  0 52.17 61.393  0.00  0.00  0.00  4.393
+ 503 tgatcatcatcgatgctagcta           518 22  0 40.91 57.602 17.69  3.08 40.32  4.398
+ 504 tagctgatcatcatcgatgcta           514 22  0 40.91 57.602 15.95  9.16 40.32  4.398
+ 505 tgatcgatcatcatgctagcta           271 22  0 40.91 57.602 27.48  3.08 37.38  4.398
+ 506 atcatcatcgatgctagctagt           520 22  0 40.91 57.595 22.18  3.56 40.32  4.405
+ 507 atcgatcatcatgctagctact           273 22  0 40.91 57.595  0.00  0.00  0.00  4.405
+ 508 agctagctactatcatcgatcgat         429 24  0 41.67 59.573 25.37 25.37 35.13  4.427
+ 509 gctagctgatcgatcgatgtgc            74 22  0 54.55 62.443 31.83 30.04 35.21  4.443
+ 510 tagctgactgatcgatcatcat           263 22  0 40.91 57.531 26.31 20.43 41.77  4.469
+ 511 tagctagctgactgatcgatcga          107 23  0 47.83 61.487 28.29 22.52  0.00  4.487
+ 512 atcgatcgatgctagtatgctag          326 23  0 43.48 58.501 29.65 13.77 46.09  4.499
+ 513 ctagtgatgcatgctagtagtga           26 23  0 43.48 58.483 20.00  1.46  0.00  4.517
+ 514 tagctagctgactgatcgatcatc         259 24  0 45.83 60.536 28.29 21.92 36.62  4.536
+ 515 tactagctagctgatcatcatcga         507 24  0 41.67 59.449  0.00  0.00  0.00  4.551
+ 516 gctagctagctactatcatcga           426 22  0 45.45 57.437 34.38  0.00 46.11  4.563
+ 517 tgactgatacgcgatgctagct           474 22  0 50.00 62.569 17.69  1.35  0.00  4.569
+ 518 agctgactgatacgcgatgcta           471 22  0 50.00 62.569  7.57  0.00  0.00  4.569
+ 519 tagctgactgatacgcgatgct           470 22  0 50.00 62.569 10.87  8.44  0.00  4.569
+ 520 atcgatcgatgctagtatgcta           326 22  0 40.91 57.423 29.65  0.00 33.56  4.577
+ 521 ctagctagctgatcatcatcgat          509 23  0 43.48 58.422 11.68  0.00  0.00  4.578
+ 522 agctgactgatcgatcgatgct           112 22  0 50.00 62.580 26.44 23.13 35.21  4.580
+ 523 ctagctagctgatcatcgatgcta         188 24  0 45.83 60.596 16.78 15.81  0.00  4.596
+ 524 gtgatgcatgctagtagtgatgta          29 24  0 41.67 59.398 11.60  8.84  0.00  4.602
+ 525 gctgatcatcatcgatgctagct          516 23  0 47.83 61.603 20.15  8.14 40.32  4.603
+ 526 agctgatcatcatcgatgctagc          515 23  0 47.83 61.603 20.04 19.26 40.32  4.603
+ 527 gctagctgatcatcatcgatgct          512 23  0 47.83 61.603 14.14  8.34 40.32  4.603
+ 528 agctagctgatcatcatcgatgc          511 23  0 47.83 61.603 21.42  7.40 40.32  4.603
+ 529 tagtgatgcatgctagtagtga            27 22  0 40.91 57.391  0.01  0.00  0.00  4.609
+ 530 ctactagctagctgactgatacg          462 23  0 47.83 58.387  3.12  0.00  0.00  4.613
+ 531 tagctactgatcgatgctacatc          306 23  0 43.48 58.368 13.79  0.00 37.97  4.632
+ 532 gactgatacgcgatgctagctag          475 23  0 52.17 61.633 17.46 17.46  0.00  4.633
+ 533 ctagctactgatcgatgctacat          305 23  0 43.48 58.364 13.79  0.09  0.00  4.636
+ 534 gctagctactatcatctctgcgc          352 23  0 52.17 61.644  8.21  0.00  0.00  4.644
+ 535 gctagctagctactgatcgatgc          300 23  0 52.17 61.644 34.38 12.71 46.11  4.644
+ 536 gctactagctagctgatcatcat          505 23  0 43.48 58.350 14.37  0.00 44.92  4.650
+ 537 gctactagctagctgatcatcat          208 23  0 43.48 58.350 14.37  0.00 44.92  4.650
+ 538 ctagctactgatcgatgctacatc         305 24  0 45.83 59.349 13.79  0.00 37.97  4.651
+ 539 gctactagctagctgatcatcatc         505 24  0 45.83 59.343 14.37  0.00 44.92  4.657
+ 540 gctactagctagctgatcatcatc         208 24  0 45.83 59.343 14.37  0.00 44.92  4.657
+ 541 gctgatcatcatctagctagtagc         154 24  0 45.83 59.343 15.25 15.25 45.79  4.657
+ 542 tagctagctgatcatcatcgat           510 22  0 40.91 57.329 10.14  0.00  0.00  4.671
+ 543 ctactatcatctctgcgcgatcg          357 23  0 52.17 61.686 12.19 12.19 39.07  4.686
+ 544 tactagctagctgactgatacg           463 22  0 45.45 57.310 13.17  0.00  0.00  4.690
+ 545 gctgatcgatcgatgctagctag          398 23  0 52.17 61.697 27.88 18.22 35.21  4.697
+ 546 ctagctgatcgatcgatgctagc          395 23  0 52.17 61.697 38.64 35.38 43.05  4.697
+ 547 gctagctgatcgatcgatgctag          394 23  0 52.17 61.697 41.07 41.07 46.89  4.697
+ 548 ctagctagctgatcgatcgatgc          391 23  0 52.17 61.697 24.08 21.09 35.21  4.697
+ 549 gctagctagctgatcgatcgatg          390 23  0 52.17 61.697 34.38 11.03 46.11  4.697
+ 550 gctagctagctgatcgatcgatg           70 23  0 52.17 61.697 34.38 11.03 46.11  4.697
+ 551 gctactagctagctgactgata           461 22  0 45.45 57.286 15.96  3.69 44.92  4.714
+ 552 gatcgatcatcatgctagctac           272 22  0 45.45 57.284 21.11  0.00  0.00  4.716
+ 553 cgatgctagctaggcgat               408 18  0 55.56 57.277 10.81  3.01  0.00  4.723
+ 554 atcgatgctagctaggcg               406 18  0 55.56 57.277 15.59  9.02  0.00  4.723
+ 555 tagctactgatcgatgctacat           306 22  0 40.91 57.270 13.79  0.09  0.00  4.730
+ 556 gctagctactatcatcgatcgat          430 23  0 43.48 58.251 25.37 25.37 35.13  4.749
+ 557 tgcatgctagtagtgatgtatacg          33 24  0 41.67 59.224 20.79  0.00  0.00  4.776
+ 558 gcatgctagtagtgatgtatacgt          34 24  0 41.67 59.223 11.60  0.00  0.00  4.777
+ 559 atttagctagctgactgatcgatc         256 24  0 41.67 59.219 19.32 19.32  0.00  4.781
+ 560 gactgatcgatcatcatgctag           268 22  0 45.45 57.215 24.51 15.87 41.77  4.785
+ 561 atttagctagctgactgatcgat          256 23  0 39.13 58.215  4.16  0.00  0.00  4.785
+ 562 gctgactgatcgatcatcatgct          265 23  0 47.83 61.788 27.72 15.10 41.77  4.788
+ 563 agctgactgatcgatcatcatgc          264 23  0 47.83 61.788 27.74 27.74 41.77  4.788
+ 564 tagctactatcatctctgcgcga          354 23  0 47.83 61.796  2.71  2.71  0.00  4.796
+ 565 gctgatcatcgatgctactagcta         195 24  0 45.83 60.834 20.91  7.37 45.92  4.834
+ 566 tagctgatcatcgatgctactagc         193 24  0 45.83 60.834 20.78 20.78 45.61  4.834
+ 567 gctagctgatcatcgatgctacta         191 24  0 45.83 60.834 11.65  8.83  0.00  4.834
+ 568 tagctagctgatcatcgatgctac         189 24  0 45.83 60.834 17.82 12.06  0.00  4.834
+ 569 tagtgatgcatgctagtagtgatg          27 24  0 41.67 59.155 11.56  7.49  0.00  4.845
+ 570 agtgatgcatgctagtagtgatgt          28 24  0 41.67 60.846 11.60  0.00  0.00  4.846
+ 571 tgatgcatgctagtagtgatgta           30 23  0 39.13 58.147 11.60  8.84  0.00  4.853
+ 572 ctgactgatcgatcgatgctagc          114 23  0 52.17 61.878 18.17 12.52 35.21  4.878
+ 573 gctgactgatcgatcgatgctag          113 23  0 52.17 61.878 22.81 19.44 35.21  4.878
+ 574 ctagctgactgatcgatcgatgc          110 23  0 52.17 61.878 24.08 19.43 35.21  4.878
+ 575 gctagctgactgatcgatcgatg          109 23  0 52.17 61.878 23.05 13.21 35.21  4.878
+ 576 tcatcatcgatgctagctagtag          521 23  0 43.48 58.114  2.81  0.00 40.32  4.886
+ 577 tactagctagctgatcatcatcg          507 23  0 43.48 58.114  0.00  0.00  0.00  4.886
+ 578 tcgatcatcatgctagctactag          274 23  0 43.48 58.114  0.00  0.00 37.62  4.886
+ 579 tgatcatcgatgctactagctag          197 23  0 43.48 58.114 20.04 20.04 45.92  4.886
+ 580 ctgatcatcgatgctactagcta          196 23  0 43.48 58.114 10.86  0.00 45.92  4.886
+ 581 tagctgatcatcgatgctactag          193 23  0 43.48 58.114 13.67  9.68  0.00  4.886
+ 582 ctagctgatcatcgatgctacta          192 23  0 43.48 58.114 11.65  8.83  0.00  4.886
+ 583 ctactagctagctgatcatcatcg         506 24  0 45.83 59.110  1.08  0.00  0.00  4.890
+ 584 ctgatcatcgatgctactagctag         196 24  0 45.83 59.110 20.04 20.04 45.92  4.890
+ 585 ctagctgatcatcgatgctactag         192 24  0 45.83 59.110 15.68 15.68  0.00  4.890
+ 586 gctagctagctgatcatcatctag         146 24  0 45.83 59.102 34.38 13.13 44.71  4.898
+ 587 gctagctagctgatcatcatcta          146 23  0 43.48 58.097 34.38  0.00 46.11  4.903
+ 588 ctagtgatgcatgctagtagtg            26 22  0 45.45 57.072 20.00  3.96  0.00  4.928
+ 589 gctactatcatctctgcgcgatc          356 23  0 52.17 61.936  4.99  0.00  0.00  4.936
+ 590 gctgatcgatcgatgtgc                78 18  0 55.56 57.052 29.71 26.38 35.21  4.948
+ 591 tagctagctactatcatcgatcga         428 24  0 41.67 59.031 27.80 22.52  0.00  4.969
+ 592 agctagctgatcgatcgtagcg           562 22  0 54.55 62.971 27.20 18.31  0.00  4.971
+ 593 tgactgatacgcgatgct               474 18  0 50.00 57.028  2.33  0.00  0.00  4.972
+ 594 gatcatcatcgatgctagctag           519 22  0 45.45 57.019 17.46 17.46 40.32  4.981
+ 595 tcatcatcgatgctagctagta           521 22  0 40.91 57.005 22.18 18.77 40.32  4.995
+ 596 tcgatcatcatgctagctacta           274 22  0 40.91 57.005  0.00  0.00  0.00  4.995
+ 597 tgatcatcgatgctactagcta           197 22  0 40.91 57.005 17.14  1.01 45.92  4.995
+ 598 tagctgatcatcgatgctacta           193 22  0 40.91 57.005 12.62  8.42  0.00  4.995
+ 599 tagctagctgactgatacgcgat          466 23  0 47.83 62.044 28.29  0.00  0.00  5.044
+ 600 ctagctagctactatcatcgatcga        427 25  0 44.00 59.949 27.80 22.52  0.00  5.051
+ 601 agctagctgactgatcgatcgat          108 23  0 47.83 62.053 30.53 30.53 37.90  5.053
+ 602 ctactagctagctgactgatacgc         462 24  0 50.00 61.062  3.61  0.00  0.00  5.062
+ 603 gctactagctagctgactgatacg         461 24  0 50.00 61.062 14.37  0.00 44.92  5.062
+ 604 tgatcatcatcgatgctagctagta        518 25  0 40.00 60.062 22.18 18.77 40.32  5.062
+ 605 tgatcgatcatcatgctagctacta        271 25  0 40.00 60.062 27.48  0.00 37.38  5.062
+ 606 ctagtgatgcatgctagtagtgatg         26 25  0 44.00 60.064 20.00  7.49  0.00  5.064
+ 607 gctagctagctactatcatcgatc         426 24  0 45.83 58.932 34.38  4.20 46.11  5.068
+ 608 gctagctactgatcgatgctacat         304 24  0 45.83 61.072 11.21  0.00  0.00  5.072
+ 609 gctagctagctactatcatcgat          426 23  0 43.48 57.922 34.38  0.00 46.11  5.078
+ 610 ctagtgatgcatgctagtagtgat          26 24  0 41.67 58.911 20.00  4.64  0.00  5.089
+ 611 tactatcatctctgcgcgatcga          358 23  0 47.83 62.092 22.07  1.72 38.48  5.092
+ 612 agctgatcgatcgatgctagcta          397 23  0 47.83 62.111 31.26 14.51 40.03  5.111
+ 613 tagctgatcgatcgatgctagct          396 23  0 47.83 62.111 33.22 33.22 42.08  5.111
+ 614 agctagctgatcgatcgatgcta          393 23  0 47.83 62.111 34.11 32.56 36.80  5.111
+ 615 tagctagctgatcgatcgatgct          392 23  0 47.83 62.111 33.87 33.38 38.16  5.111
+ 616 tagtgatgcatgctagtagtgat           27 23  0 39.13 57.886 11.56  0.00  0.00  5.114
+ 617 tactagctagctgatcatcatcgat        507 25  0 40.00 59.828  0.00  0.00  0.00  5.172
+ 618 gctagctagctgatcatcgatgc          187 23  0 52.17 62.193 34.38  9.22 46.11  5.193
+ 619 gctagtgatgcatgctagtagtga          25 24  0 45.83 61.195 24.96  4.57  0.00  5.195
+ 620 aaagcatcggattagctagctgat           1 24  0 41.67 61.209 17.84 15.13  0.00  5.209
+ 621 gtgatgcatgctagtagtgatgtat         29 25  0 40.00 59.774  1.07  1.07  0.00  5.226
+ 622 ctatcatctctgcgcgatcgatg          360 23  0 52.17 62.227 18.01 18.01 38.48  5.227
+ 623 tgactgatacgcgatgctagcta          474 23  0 47.83 62.287 17.69  3.08  0.00  5.287
+ 624 tagctgactgatacgcgatgcta          470 23  0 47.83 62.287 12.64  9.09  0.00  5.287
+ 625 tgctagtagtgatgtatacgtagct         37 25  0 40.00 59.713  9.37  8.73  0.00  5.287
+ 626 tgactgatcgatcgatgctagct          115 23  0 47.83 62.296 20.19 11.59 35.21  5.296
+ 627 agctgactgatcgatcgatgcta          112 23  0 47.83 62.296 26.44 14.64 35.21  5.296
+ 628 tagctgactgatcgatcgatgct          111 23  0 47.83 62.296 31.98 30.27 35.21  5.296
+ 629 ctagctagctactatcatcgatcg         427 24  0 45.83 58.703 12.49  9.87  0.00  5.297
+ 630 tagctagctactatcatcgatcg          428 23  0 43.48 57.691 27.80  9.87  0.00  5.309
+ 631 gactgatcgatcatcatgctagct         268 24  0 45.83 61.313 24.51  7.81 41.77  5.313
+ 632 gctagctgactgatcgatcatcat         261 24  0 45.83 61.313 26.31 20.43 41.77  5.313
+ 633 ctatttagctagctgactgatcga         254 24  0 41.67 58.679  0.00  0.00  0.00  5.321
+ 634 gcatgctagtagtgatgtatacg           34 23  0 43.48 57.659 11.60  0.00  0.00  5.341
+ 635 tatttagctagctgactgatcga          255 23  0 39.13 57.650  0.00  0.00  0.00  5.350
+ 636 ctactagctagctgatcatcatcga        506 25  0 44.00 60.352  1.08  0.00  0.00  5.352
+ 637 agctactatcatctctgcgcgat          355 23  0 47.83 62.360  4.99  2.52  0.00  5.360
+ 638 gctgatcatcatcgatgctagcta         516 24  0 45.83 61.370 20.15  8.49 40.32  5.370
+ 639 tagctgatcatcatcgatgctagc         514 24  0 45.83 61.370 20.04 19.26 40.32  5.370
+ 640 gctagctgatcatcatcgatgcta         512 24  0 45.83 61.370 14.58  9.63 40.32  5.370
+ 641 tagctagctgatcatcatcgatgc         510 24  0 45.83 61.370 21.42  7.40 40.32  5.370
+ 642 atgcatgctagtagtgatgtatacg         32 25  0 40.00 59.604 11.70  0.00  0.00  5.396
+ 643 tgatgcatgctagtagtgatgtat          30 24  0 37.50 58.592 12.66 12.66  0.00  5.408
+ 644 gactgatcgatcgatgctagctag         116 24  0 50.00 61.409 18.04 17.46 35.21  5.409
+ 645 gctatttagctagctgactgatc          253 23  0 43.48 57.572  7.27  0.00 46.11  5.428
+ 646 tgctagtgatgcatgctagtagtg          24 24  0 45.83 61.434 24.96 10.54 35.89  5.434
+ 647 ctagctagctactatcatctctgc         349 24  0 45.83 58.562 27.80  0.00  0.00  5.438
+ 648 gctagctagctactatcatctctg         348 24  0 45.83 58.562 34.38  6.79 46.11  5.438
+ 649 gatcatcatcgatgctagctagta         519 24  0 41.67 58.557 22.18 18.77 40.32  5.443
+ 650 gatcgatcatcatgctagctacta         272 24  0 41.67 58.557 21.11  0.00  0.00  5.443
+ 651 atcatcatcgatgctagctagtag         520 24  0 41.67 58.554  2.13  0.00 40.32  5.446
+ 652 atcgatcatcatgctagctactag         273 24  0 41.67 58.554  0.00  0.00 37.62  5.446
+ 653 tagctagctactatcatctctgc          350 23  0 43.48 57.527 27.80  0.00  0.00  5.473
+ 654 atcatcatcgatgctagctagta          520 23  0 39.13 57.514 22.18 18.77 40.32  5.486
+ 655 atcgatcatcatgctagctacta          273 23  0 39.13 57.514  0.00  0.00  0.00  5.486
+ 656 gatcatcatcgatgctagctagtag        519 25  0 44.00 59.494  0.21  0.00 40.32  5.506
+ 657 gatcgatcatcatgctagctactag        272 25  0 44.00 59.494 21.11  0.00 37.62  5.506
+ 658 actagctagctgatcatcatctact        211 25  0 40.00 59.471 22.43  6.99  0.00  5.529
+ 659 tgactgatcgatcatcatgctagc         267 24  0 45.83 61.547 26.79 14.13 41.77  5.547
+ 660 gctgactgatcgatcatcatgcta         265 24  0 45.83 61.547 27.72 16.42 41.77  5.547
+ 661 tagctgactgatcgatcatcatgc         263 24  0 45.83 61.547 27.74 27.74 41.77  5.547
+ 662 tgctagtagtgatgtatacgtagc          37 24  0 41.67 58.446  4.93  4.93  0.00  5.554
+ 663 ctagctagctgactgatacgcga          465 23  0 52.17 62.571 14.90  0.00  0.00  5.571
+ 664 tagctagctactatcatcgatcgat        428 25  0 40.00 59.423 27.80 25.37 35.13  5.577
+ 665 gctactagctagctgatcatcatct        208 25  0 44.00 60.585 14.37  0.00 44.92  5.585
+ 666 agctgatcatcatctagctagtagc        153 25  0 44.00 60.585 15.25 15.25 40.45  5.585
+ 667 ctagctagctgatcgatcgatgtg          71 24  0 50.00 61.642 11.68  4.94 35.21  5.642
+ 668 agtgatgcatgctagtagtgatgta         28 25  0 40.00 60.646 11.60  8.84  0.00  5.646
+ 669 tagtgatgcatgctagtagtgatgt         27 25  0 40.00 60.646 11.60  0.00  0.00  5.646
+ 670 actatcatctctgcgcgatcgat          359 23  0 47.83 62.652 22.07 11.47 38.48  5.652
+ 671 ctatttagctagctgactgatcg          254 23  0 43.48 57.339  0.00  0.00  0.00  5.661
+ 672 tagctagctgatcgatcgtagcg          561 23  0 52.17 62.677 27.20 18.31  0.00  5.677
+ 673 gcatcggattagctagctgatgc            4 23  0 52.17 62.687 34.10 34.10 41.15  5.687
+ 674 tgcatgctagtagtgatgtatacgt         33 25  0 40.00 60.700 20.79  0.00  0.00  5.700
+ 675 tttagctagctgactgatcgatcat        257 25  0 40.00 60.702 26.67 18.02 36.62  5.702
+ 676 atttagctagctgactgatcgatca        256 25  0 40.00 60.702 26.99 26.99 35.44  5.702
+ 677 gctagctagctactatcatctct          348 23  0 43.48 57.266 34.38  0.00 46.11  5.734
+ 678 aagcatcggattagctagctgatg           2 24  0 45.83 61.794 27.81 27.81 33.28  5.794
+ 679 agtgatgtatacgtagctagtagc          44 24  0 41.67 58.201 15.25 15.25 45.79  5.799
+ 680 gctagtagtgatgtatacgtagct          38 24  0 41.67 58.201  5.92  5.92  0.00  5.799
+ 681 tagctagctgactgatcgatcgat         107 24  0 45.83 61.800 30.53 30.53 37.90  5.800
+ 682 actagctagctgactgatacgcg          464 23  0 52.17 62.816 21.52  3.89  0.00  5.816
+ 683 actagctagctgatcatcatctac         211 24  0 41.67 58.178 22.43  0.00  0.00  5.822
+ 684 tagctgatcgatcgatgctagcta         396 24  0 45.83 61.857 34.98 33.55 41.05  5.857
+ 685 tagctagctgatcgatcgatgcta         392 24  0 45.83 61.857 34.11 32.56 36.80  5.857
+ 686 tatttagctagctgactgatcgat         255 24  0 37.50 58.112  1.68  0.00  0.00  5.888
+ 687 gcatgctagtagtgatgtatacgta         34 25  0 40.00 59.089 11.60  0.00  0.00  5.911
+ 688 tatttagctagctgactgatcgatc        255 25  0 40.00 59.084 19.32 19.32  0.00  5.916
+ 689 ctatttagctagctgactgatcgat        254 25  0 40.00 59.082  0.00  0.00  0.00  5.918
+ 690 ctagctagctactatcatctctgcg        349 25  0 48.00 60.920 27.80  5.75  0.00  5.920
+ 691 tgatcgatcgatgctagctaggc          400 23  0 52.17 62.955 26.44 12.49 35.21  5.955
+ 692 agctagctactgatcgatgctaca         303 24  0 45.83 61.988 17.56  3.03  0.00  5.988
+ 693 tgactgatcgatcgatgctagcta         115 24  0 45.83 62.034 20.19 11.16 35.21  6.034
+ 694 tagctgactgatcgatcgatgcta         111 24  0 45.83 62.034 33.43 30.74 35.21  6.034
+ 695 catgctagtagtgatgtatacgtagc        35 26  0 42.31 59.961  4.93  4.93  0.00  6.039
+ 696 gcatgctagtagtgatgtatacgtag        34 26  0 42.31 59.961 11.60  0.00  0.00  6.039
+ 697 actgatcgatcgatgctagctagt         117 24  0 45.83 62.039 23.29 15.07 35.21  6.039
+ 698 ctatttagctagctgactgatcgatc       254 26  0 42.31 59.960 19.32 19.32  0.00  6.040
+ 699 ttagctagctgactgatcgatcatc        258 25  0 44.00 61.041 28.29 21.92 36.62  6.041
+ 700 atgctagtagtgatgtatacgtagct        36 26  0 38.46 60.068  9.37  8.73  0.00  6.068
+ 701 ctagctagctgatcatcatctact         212 24  0 41.67 57.930 11.68  6.99  0.00  6.070
+ 702 ctactagctagctgatcatcatct         209 24  0 41.67 57.930  1.08  0.00  0.00  6.070
+ 703 agctgatcatcatctagctagtag         153 24  0 41.67 57.930  7.49  3.73 40.45  6.070
+ 704 ctagctgatcatcatctagctagt         151 24  0 41.67 57.930 21.70  5.56 46.15  6.070
+ 705 tagctactatcatctctgcgcgat         354 24  0 45.83 62.096  4.99  2.52  0.00  6.096
+ 706 gactgatcgatcatcatgctagcta        268 25  0 44.00 61.099 24.51  4.57 41.77  6.099
+ 707 ctgatcatcatcgatgctagctagt        517 25  0 44.00 61.101 22.18  3.56 40.32  6.101
+ 708 actagctagctgatcatcatcgatg        508 25  0 44.00 61.101 22.43 20.23 41.48  6.101
+ 709 ctgatcgatcatcatgctagctact        270 25  0 44.00 61.101 26.67  0.00 41.77  6.101
+ 710 atgctagtagtgatgtatacgtagc         36 25  0 40.00 58.855  4.93  4.93  0.00  6.145
+ 711 ctagctagctactgatcgatgctac        301 25  0 48.00 61.145 14.00  7.81  0.00  6.145
+ 712 gctagctagctactatcatctctgc        348 25  0 48.00 61.152 34.38 11.74 46.11  6.152
+ 713 agctagctgatcatcatctactatca       214 26  0 38.46 59.840 17.99  0.00  0.00  6.160
+ 714 ctgatcgatcgatgctagctagtag        118 25  0 48.00 61.197 19.70  5.49 35.21  6.197
+ 715 agctagctgactgatcgatcatca         260 24  0 45.83 62.232 26.49 26.49 39.98  6.232
+ 716 gctagctagctactatcatcgatcg        426 25  0 48.00 61.252 34.38  9.87 46.11  6.252
+ 717 gctatttagctagctgactgatcga        253 25  0 44.00 61.268  7.27  0.00 46.11  6.268
+ 718 ctagctagctactatcatcgatcgat       427 26  0 42.31 60.291 27.80 25.37 35.13  6.291
+ 719 agctgatcatcgatgctactagct         194 24  0 45.83 62.294 24.11 23.60 45.92  6.294
+ 720 agctagctgatcatcgatgctact         190 24  0 45.83 62.294 17.99 10.88  0.00  6.294
+ 721 ctagctagctgactgatcgatcga         106 24  0 50.00 62.312 22.52 22.52  0.00  6.312
+ 722 actgatcgatcatcatgctagctac        269 25  0 44.00 61.328 26.67  0.00 41.77  6.328
+ 723 tgatgcatgctagtagtgatgtatac        30 26  0 38.46 59.623  9.19  6.43  0.00  6.377
+ 724 gtgatgcatgctagtagtgatgtata        29 26  0 38.46 59.623  4.23  0.00  0.00  6.377
+ 725 tactatcatctctgcgcgatcgat         358 24  0 45.83 62.379 22.07 11.47 38.48  6.379
+ 726 gctagctgatcatcatctactatca        215 25  0 40.00 58.607  8.21  0.00  0.00  6.393
+ 727 gctactagctagctgatcatcatcta       208 26  0 42.31 60.404 14.37  0.00 44.92  6.404
+ 728 tagctgatcatcatctagctagtagc       152 26  0 42.31 60.404 15.25 15.25 41.48  6.404
+ 729 tgctagtagtgatgtatacgtagcta        37 26  0 38.46 59.564 10.00  8.05  0.00  6.436
+ 730 gatgcatgctagtagtgatgtatacg        31 26  0 42.31 60.453  7.40  0.00  0.00  6.453
+ 731 tagtgatgcatgctagtagtgatgta        27 26  0 38.46 60.461 11.60  8.84  0.00  6.461
+ 732 gctagtgatgcatgctagtagtgat         25 25  0 44.00 61.506 24.96  8.51  0.00  6.506
+ 733 tgcatgctagtagtgatgtatacgta        33 26  0 38.46 60.515 20.79  0.00  0.00  6.515
+ 734 tatttagctagctgactgatcgatca       255 26  0 38.46 60.516 26.99 26.99 35.44  6.516
+ 735 tgatgcatgctagtagtgatgtata         30 25  0 36.00 58.479  4.13  0.00  0.00  6.521
+ 736 tactagctagctgactgatacgcg         463 24  0 50.00 62.538 13.17  3.89  0.00  6.538
+ 737 ctagctactatcatctctgcgcga         353 24  0 50.00 62.603  2.71  2.71  0.00  6.603
+ 738 agctagctgatcatcatctactatc        214 25  0 40.00 58.369 17.99  0.00  0.00  6.631
+ 739 agctagctgatcatcatctactat         214 24  0 37.50 57.345 17.99  0.00  0.00  6.655
+ 740 gctactagctagctgatcatcatcg        505 25  0 48.00 61.656 14.37  0.00 44.92  6.656
+ 741 gctgatcatcgatgctactagctag        195 25  0 48.00 61.656 20.91 20.04 45.92  6.656
+ 742 ctagctgatcatcgatgctactagc        192 25  0 48.00 61.656 20.78 20.78 45.61  6.656
+ 743 gctagctgatcatcgatgctactag        191 25  0 48.00 61.656 20.13 20.13  0.00  6.656
+ 744 ctagctagctgatcatcgatgctac        188 25  0 48.00 61.656 17.82 12.06  0.00  6.656
+ 745 actagctagctgatcatcatctacta       211 26  0 38.46 59.328 22.43  8.11  0.00  6.672
+ 746 tactagctagctgatcatcatctact       210 26  0 38.46 59.328  6.99  6.99  0.00  6.672
+ 747 ctactagctagctgatcatcatcgat       506 26  0 42.31 60.681  1.08  0.00  0.00  6.681
+ 748 tagctagctactgatcgatgctaca        302 25  0 44.00 61.746 27.80  5.02  0.00  6.746
+ 749 gtagtgatgtatacgtagctagtagc        42 26  0 42.31 59.249 15.25 15.25 45.79  6.751
+ 750 actgatcgatcgatgctagctagta        117 25  0 44.00 61.797 23.29 18.77 35.21  6.797
+ 751 gatgcatgctagtagtgatgtatac         31 25  0 40.00 58.175 20.79  1.70  0.00  6.825
+ 752 agctgatcatcatcgatgctagct         515 24  0 45.83 62.835 23.00 22.41 41.74  6.835
+ 753 agctagctgatcatcatcgatgct         511 24  0 45.83 62.835 17.99  8.34 40.32  6.835
+ 754 ctagctagctgactgatacgcgat         465 24  0 50.00 62.838 14.90  0.00  0.00  6.838
+ 755 atgcatgctagtagtgatgtatac          32 24  0 37.50 57.161 11.70  0.53  0.00  6.839
+ 756 agctagctactatcatctctgcgc         351 24  0 50.00 62.858 17.56  0.00  0.00  6.858
+ 757 gctagctagctactgatcgatgct         300 24  0 50.00 62.858 34.38 11.51 46.11  6.858
+ 758 ctactatcatctctgcgcgatcga         357 24  0 50.00 62.878 22.07  1.72 38.48  6.878
+ 759 gctagctactgatcgatgctacatc        304 25  0 48.00 61.879 11.21  4.40 37.97  6.879
+ 760 tagtgatgtatacgtagctagtagc         43 25  0 40.00 58.104 15.25 15.25 45.79  6.896
+ 761 gctagtagtgatgtatacgtagcta         38 25  0 40.00 58.104  7.24  5.34  0.00  6.896
+ 762 tgatcatcatcgatgctagctagtag       518 26  0 42.31 60.902 14.93  0.00 40.32  6.902
+ 763 ctgatcatcatcgatgctagctagta       517 26  0 42.31 60.902 22.18 18.77 40.32  6.902
+ 764 tactagctagctgatcatcatcgatg       507 26  0 42.31 60.902 20.23 20.23 41.48  6.902
+ 765 tgatcgatcatcatgctagctactag       271 26  0 42.31 60.902 27.48  0.00 37.38  6.902
+ 766 ctgatcgatcatcatgctagctacta       270 26  0 42.31 60.902 26.67  1.37 41.77  6.902
+ 767 agctgatcgatcgatgctagctag         397 24  0 50.00 62.904 31.26 19.90 40.03  6.904
+ 768 ctagctgatcgatcgatgctagct         395 24  0 50.00 62.904 35.51 33.22 43.05  6.904
+ 769 agctagctgatcgatcgatgctag         393 24  0 50.00 62.904 41.07 41.07 46.89  6.904
+ 770 ctagctagctgatcgatcgatgct         391 24  0 50.00 62.904 33.87 33.38 38.16  6.904
+ 771 tactagctagctgatcatcatctac        210 25  0 40.00 58.081  0.00  0.00  0.00  6.919
+ 772 gctagctgatcatcatctactatc         215 24  0 41.67 57.062  8.21  0.00  0.00  6.938
+ 773 agtgatgcatgctagtagtgatgtat        28 26  0 38.46 60.969  1.07  1.07  0.00  6.969
+ 774 gctagtagtgatgtatacgtagctag        38 26  0 42.31 59.027  8.99  8.99  0.00  6.973
+ 775 tagctagctgactgatcgatcatca        259 25  0 44.00 61.981 28.29 26.49 39.98  6.981
+ 776 ctactagctagctgatcatcatctac       209 26  0 42.31 59.015  1.08  0.00  0.00  6.985
+ 777 agtagtgatgtatacgtagctagt          41 24  0 37.50 57.012  8.68  8.68  0.00  6.988
+ 778 gctagctgatcatcatctactatcat       215 26  0 38.46 59.001  8.21  0.00  0.00  6.999
+ 779 agctgatcatcatctactatcatca        218 25  0 36.00 57.993  0.00  0.00  0.00  7.007
+ 780 atgcatgctagtagtgatgtatacgt        32 26  0 38.46 61.018 11.70  0.00  0.00  7.018
+ 781 atttagctagctgactgatcgatcat       256 26  0 38.46 61.022 26.67 18.02 36.62  7.022
+ 782 agctgatcatcgatgctactagcta        194 25  0 44.00 62.040 24.59  9.79 45.92  7.040
+ 783 tagctgatcatcgatgctactagct        193 25  0 44.00 62.040 27.00 27.00 45.92  7.040
+ 784 agctagctgatcatcgatgctacta        190 25  0 44.00 62.040 17.99 11.59  0.00  7.040
+ 785 tagctagctgatcatcgatgctact        189 25  0 44.00 62.040 17.55 15.53  0.00  7.040
+ 786 atgctagtagtgatgtatacgtagcta       36 27  0 37.04 59.911 10.00  8.05  0.00  7.089
+ 787 gctagctgatcatcatctactatcatc      215 27  0 40.74 59.861  8.21  0.00  0.00  7.139
+ 788 ctagctagctgatcatcatctacta        212 25  0 40.00 57.842 11.68  8.11  0.00  7.158
+ 789 ctactagctagctgatcatcatcta        209 25  0 40.00 57.842  1.08  0.00  0.00  7.158
+ 790 tagctgatcatcatctagctagtag        152 25  0 40.00 57.842 13.40  3.73 41.48  7.158
+ 791 ctagctgatcatcatctagctagta        151 25  0 40.00 57.842 21.70  7.13 46.15  7.158
+ 792 gctgatcatcatcgatgctagctag        516 25  0 48.00 62.165 20.15 17.46 40.32  7.165
+ 793 ctagctgatcatcatcgatgctagc        513 25  0 48.00 62.165 19.27 19.26 41.96  7.165
+ 794 gctagctgatcatcatcgatgctag        512 25  0 48.00 62.165 23.70 23.70 45.51  7.165
+ 795 ctagctagctgatcatcatcgatgc        509 25  0 48.00 62.165 21.42  7.40 40.32  7.165
+ 796 agctagctgatcatcatctactatcat      214 27  0 37.04 60.181 17.99  0.00  0.00  7.181
+ 797 ctactagctagctgatcatcatctact      209 27  0 40.74 60.181  6.99  6.99  0.00  7.181
+ 798 ctagctgatcatcatctagctagtag       151 26  0 42.31 58.789 21.70 10.73 46.15  7.211
+ 799 aaagcatcggattagctagctgatg          1 25  0 44.00 62.249 27.81 27.81 33.28  7.249
+ 800 agctagctactgatcgatgctacat        303 25  0 44.00 62.272 17.56  6.16  0.00  7.272
+ 801 tagctagctgatcatcatctactatca      213 27  0 37.04 59.689  8.31  0.00  0.00  7.311
+ 802 actagctagctgatcatcatctactat      211 27  0 37.04 59.688 22.43  2.36  0.00  7.312
+ 803 ctgactgatcgatcatcatgctagc        266 25  0 48.00 62.333 20.99  8.86 41.77  7.333
+ 804 gctgactgatcgatcatcatgctag        265 25  0 48.00 62.333 27.72 21.73 41.77  7.333
+ 805 ctagctgactgatcgatcatcatgc        262 25  0 48.00 62.333 27.74 27.74 41.77  7.333
+ 806 gctagctgactgatcgatcatcatg        261 25  0 48.00 62.333 22.70 19.51 41.77  7.333
+ 807 tgctagtagtgatgtatacgtagctag       37 27  0 40.74 60.395  8.99  8.99  0.00  7.395
+ 808 agtagtgatgtatacgtagctagtagc       41 27  0 40.74 60.395 15.25 15.25 45.79  7.395
+ 809 gctagtagtgatgtatacgtagctagt       38 27  0 40.74 60.395 15.55 15.55  0.00  7.395
+ 810 ctagtgatgcatgctagtagtgatgt        26 26  0 42.31 61.460 20.00  0.00  0.00  7.460
+ 811 gctgatcatcatctactatcatcatca      219 27  0 37.04 59.533  0.00  0.00  0.00  7.467
+ 812 agctagctgactgatcgatcatcat        260 25  0 44.00 62.507 26.31 20.43 41.77  7.507
+ 813 tttagctagctgactgatcgatcatc       257 26  0 42.31 61.507 23.93 21.92 36.62  7.507
+ 814 catgctagtagtgatgtatacgtag         35 25  0 40.00 57.441  4.74  0.00  0.00  7.559
+ 815 agctgatcatcatcgatgctagcta        515 25  0 44.00 62.561 23.50 10.90 43.19  7.561
+ 816 tagctgatcatcatcgatgctagct        514 25  0 44.00 62.561 26.21 26.21 44.79  7.561
+ 817 agctagctgatcatcatcgatgcta        511 25  0 44.00 62.561 17.99  9.63 40.32  7.561
+ 818 tagctagctgatcatcatcgatgct        510 25  0 44.00 62.561 14.14 10.38 40.32  7.561
+ 819 gctatttagctagctgactgatcgat       253 26  0 42.31 61.564  7.27  0.00 46.11  7.564
+ 820 ctagctagctgactgatcgatcgat        106 25  0 48.00 62.579 30.53 30.53 37.90  7.579
+ 821 agctgatcatcatctactatcatcat       218 26  0 34.62 58.415  0.00  0.00  0.00  7.585
+ 822 tagctagctactatcatctctgcgc        350 25  0 48.00 62.587 27.80  0.00  0.00  7.587
+ 823 gctagctagctactgatcgatgcta        300 25  0 48.00 62.587 34.38 12.23 46.11  7.587
+ 824 tgctagtgatgcatgctagtagtga         24 25  0 44.00 62.622 24.96 13.57 35.89  7.622
+ 825 tagctgatcgatcgatgctagctag        396 25  0 48.00 62.632 33.71 21.46 41.05  7.632
+ 826 ctagctgatcgatcgatgctagcta        395 25  0 48.00 62.632 35.51 32.61 43.05  7.632
+ 827 tagctagctgatcgatcgatgctag        392 25  0 48.00 62.632 41.07 41.07 46.89  7.632
+ 828 ctagctagctgatcgatcgatgcta        391 25  0 48.00 62.632 34.11 32.56 36.80  7.632
+ 829 gtgatgcatgctagtagtgatgtatac       29 27  0 40.74 60.659  9.56  7.17  0.00  7.659
+ 830 agctgatcatcatctactatcatcatc      218 27  0 37.04 59.314  0.00  0.00  0.00  7.686
+ 831 tagctagctgatcatcatctactat        213 25  0 36.00 57.279  8.31  0.00  0.00  7.721
+ 832 tagctagctgatcatcatctactatc       213 26  0 38.46 58.269  8.31  0.00  0.00  7.731
+ 833 tgactgatcgatcatcatgctagct        267 25  0 44.00 62.733 26.79 10.55 41.77  7.733
+ 834 agctgactgatcgatcatcatgcta        264 25  0 44.00 62.733 30.60 18.10 41.77  7.733
+ 835 tagctgactgatcgatcatcatgct        263 25  0 44.00 62.733 32.31 32.31 41.77  7.733
+ 836 ctagctagctgatcatcatctactat       212 26  0 38.46 58.265  9.41  0.00  0.00  7.735
+ 837 agtgatgcatgctagtagtgatgtata       28 27  0 37.04 60.779  4.23  0.00  0.00  7.779
+ 838 tagtgatgcatgctagtagtgatgtat       27 27  0 37.04 60.779 11.56  0.00  0.00  7.779
+ 839 tgactgatcgatcgatgctagctag        115 25  0 48.00 62.800 20.19 17.46 35.21  7.800
+ 840 ctgactgatcgatcgatgctagcta        114 25  0 48.00 62.800 20.19 11.97 35.21  7.800
+ 841 tagctgactgatcgatcgatgctag        111 25  0 48.00 62.800 31.45 26.34 35.21  7.800
+ 842 ctagctgactgatcgatcgatgcta        110 25  0 48.00 62.800 31.54 29.68 35.21  7.800
+ 843 tagctagctgactgatcgatcgatg        107 25  0 48.00 62.800 28.29 13.21 35.21  7.800
+ 844 gactgatcgatcgatgctagctagt        116 25  0 48.00 62.802 22.18 12.64 35.21  7.802
+ 845 tactagctagctgatcatcatctacta      210 27  0 37.04 59.196  8.79  8.11  0.00  7.804
+ 846 tagctgatcatcgatgctactagcta       193 26  0 42.31 61.805 28.86 27.39 45.92  7.805
+ 847 tagctagctgatcatcgatgctacta       189 26  0 42.31 61.805 18.93 16.03  0.00  7.805
+ 848 atgcatgctagtagtgatgtatacgta       32 27  0 37.04 60.828 11.70  0.00  0.00  7.828
+ 849 tatttagctagctgactgatcgatcat      255 27  0 37.04 60.831 26.67 18.02 36.62  7.831
+ 850 ctagctagctgatcatcatctactatc      212 27  0 40.74 59.162  9.41  0.06  0.00  7.838
+ 851 tagctactatcatctctgcgcgatc        354 25  0 48.00 62.854  0.00  0.00  0.00  7.854
+ 852 gctgatcatcatctactatcatcat        219 25  0 36.00 57.142  0.00  0.00  0.00  7.858
+ 853 ctagctactatcatctctgcgcgat        353 25  0 48.00 62.859  4.99  2.52  0.00  7.859
+ 854 gctgatcatcatctactatcatcatc       219 26  0 38.46 58.126  0.00  0.00  0.00  7.874
+ 855 tagctagctactgatcgatgctacat       302 26  0 42.31 62.028 27.80  3.08  0.00  8.028
+ 856 agtagtgatgtatacgtagctagtag        41 26  0 38.46 57.950  9.92  1.30  0.00  8.050
+ 857 ctagtagtgatgtatacgtagctagt        39 26  0 38.46 57.950 15.52 15.52  0.00  8.050
+ 858 catgctagtagtgatgtatacgtagct       35 27  0 40.74 61.089  9.37  8.73  0.00  8.089
+ 859 gactgatcgatcatcatgctagctac       268 26  0 46.15 62.094 24.51  8.36 41.77  8.094
+ 860 tagctgatcatcatctactatcatca       217 26  0 34.62 57.906  0.00  0.00  0.00  8.094
+ 861 ctagctgatcatcatctactatcatca      216 27  0 37.04 58.826  0.00  0.00  0.00  8.174
+ 862 ctagctgatcatcatctagctagtagc      151 27  0 44.44 61.196 21.70 15.25 46.15  8.196
+ 863 tagctagctgactgatcgatcatcat       259 26  0 42.31 62.255 28.29 20.43 41.77  8.255
+ 864 ctagtgatgcatgctagtagtgatgta       26 27  0 40.74 61.255 20.00  8.84  0.00  8.255
+ 865 tgcatgctagtagtgatgtatacgtag       33 27  0 40.74 61.300 20.79  0.00  0.00  8.300
+ 866 ctatttagctagctgactgatcgatca      254 27  0 40.74 61.304 26.99 26.99 35.44  8.304
+ 867 tagctgatcatcatcgatgctagcta       514 26  0 42.31 62.307 28.23 26.63 43.19  8.307
+ 868 tagctagctgatcatcatcgatgcta       510 26  0 42.31 62.307 14.58 11.03 40.32  8.307
+ 869 gctagctagctactatcatcgatcga       426 26  0 46.15 62.381 34.38 22.52 46.11  8.381
+ 870 gctactagctagctgatcatcatctac      208 27  0 44.44 61.407 14.37  0.00 44.92  8.407
+ 871 ttagctagctgactgatcgatcatca       258 26  0 42.31 62.416 28.29 26.49 39.98  8.416
+ 872 tgactgatcgatcatcatgctagcta       267 26  0 42.31 62.472 26.79 11.24 41.77  8.472
+ 873 tagctgactgatcgatcatcatgcta       263 26  0 42.31 62.472 33.83 32.61 41.77  8.472
+ 874 actgatcgatcatcatgctagctact       269 26  0 42.31 62.478 26.67  0.00 41.77  8.478
+ 875 gctagtgatgcatgctagtagtgatg        25 26  0 46.15 62.484 24.96  9.07  0.00  8.484
+ 876 ctagctagctactgatcgatgctaca       301 26  0 46.15 62.503 14.00  5.87  0.00  8.503
+ 877 gactgatcgatcgatgctagctagta       116 26  0 46.15 62.543 22.18 18.77 35.21  8.543
+ 878 actgatcgatcgatgctagctagtag       117 26  0 46.15 62.548 23.29 12.42 35.21  8.548
+ 879 ctagctgatcatcatctactatcatc       216 26  0 38.46 57.395  0.00  0.00  0.00  8.605
+ 880 ctgatcatcatcgatgctagctagtag      517 27  0 44.44 61.665 10.30  1.36 40.32  8.665
+ 881 ctactagctagctgatcatcatcgatg      506 27  0 44.44 61.665 20.23 20.23 41.48  8.665
+ 882 ctgatcgatcatcatgctagctactag      270 27  0 44.44 61.665 26.67  8.14 41.77  8.665
+ 883 tagctgatcatcatctactatcatcat      217 27  0 33.33 58.315  0.00  0.00  0.00  8.685
+ 884 tgatgcatgctagtagtgatgtatacg       30 27  0 40.74 61.778  9.81  0.00  0.00  8.778
+ 885 gatgcatgctagtagtgatgtatacgt       31 27  0 40.74 61.779  7.40  0.00  0.00  8.779
+ 886 gctactagctagctgatcatcatcga       505 26  0 46.15 62.779 14.37  0.00 44.92  8.779
+ 887 agctgatcatcgatgctactagctag       194 26  0 46.15 62.784 24.59 20.04 45.92  8.784
+ 888 ctagctgatcatcgatgctactagct       192 26  0 46.15 62.784 27.00 27.00 45.92  8.784
+ 889 agctagctgatcatcgatgctactag       190 26  0 46.15 62.784 20.13 20.13  0.00  8.784
+ 890 ctagctagctgatcatcgatgctact       188 26  0 46.15 62.784 17.55 15.53  0.00  8.784
+ 891 atttagctagctgactgatcgatcatc      256 27  0 40.74 61.785 23.93 21.92 36.62  8.785
+ 892 tctactatcatcatcatctactagct       230 26  0 34.62 57.155  0.00  0.00  0.00  8.845
+ 893 tgctagtgatgcatgctagtagtgat        24 26  0 42.31 62.874 24.96  8.51 35.89  8.874
+ 894 ctgatcatcatctactatcatcatca       220 26  0 34.62 57.026  0.00  0.00  0.00  8.974
+ 895 agctagctactgatcgatgctacatc       303 26  0 46.15 62.999 17.56  7.89 37.97  8.999
+ 896 tagtagtgatgtatacgtagctagtag       40 27  0 37.04 57.869 16.78  1.30  0.00  9.131
+ 897 ctagtagtgatgtatacgtagctagta       39 27  0 37.04 57.869 16.85 15.97  0.00  9.131
+ 898 actgatcgatcatcatgctagctacta      269 27  0 40.74 62.236 26.67  1.37 41.77  9.236
+ 899 gcatgctagtagtgatgtatacgtagc       34 27  0 44.44 62.283 11.60  4.93  0.00  9.283
+ 900 gctatttagctagctgactgatcgatc      253 27  0 44.44 62.291 19.32 19.32 46.11  9.291
+ 901 atctactatcatcatcatctactagct      229 27  0 33.33 57.592  0.00  0.00  0.00  9.408
+ 902 catctactatcatcatcatctactagc      228 27  0 37.04 57.549  0.00  0.00  0.00  9.451
+ 903 tgatcatcatctactatcatcatcatc      221 27  0 33.33 57.467  0.00  0.00  0.00  9.533
+ 904 tagctgatcatcgatgctactagctag      193 27  0 44.44 62.534 27.70 20.04 45.92  9.534
+ 905 ctagctgatcatcgatgctactagcta      192 27  0 44.44 62.534 27.76 26.73 45.92  9.534
+ 906 tagctagctgatcatcgatgctactag      189 27  0 44.44 62.534 20.13 20.13  0.00  9.534
+ 907 ctagctagctgatcatcgatgctacta      188 27  0 44.44 62.534 17.74 15.95  0.00  9.534
+ 908 ctgatcatcatctactatcatcatcat      220 27  0 33.33 57.462  0.00  0.00  0.00  9.538
+ 909 gctagctagctactatcatcgatcgat      426 27  0 44.44 62.627 34.38 25.37 46.11  9.627
+ 910 ttagctagctgactgatcgatcatcat      258 27  0 40.74 62.665 28.29 20.43 41.77  9.665
+ 911 tagctagctactgatcgatgctacatc      302 27  0 44.44 62.742 27.80  7.89 37.97  9.742
+ 912 ctagctagctactgatcgatgctacat      301 27  0 44.44 62.747 14.00  2.51  0.00  9.747
+ 913 gatcatcatctactatcatcatcatct      222 27  0 33.33 57.242  0.00  0.00  0.00  9.758
+ 914 tttagctagctgactgatcgatcatca      257 27  0 40.74 62.820 26.49 26.49 39.98  9.820
+ 915 tctactatcatcatcatctactagcta      230 27  0 33.33 57.100  0.00  0.00  0.00  9.900
--- a/samples/Formatted/wksst8110.for
+++ b/samples/Formatted/wksst8110.for
--- a/samples/FreeMarker/example.ftl
+++ b/samples/FreeMarker/example.ftl
@@ -0,0 +1,31 @@
+<#import "layout.ftl" as layout>
+
+<#assign results = [
+        {
+            "title": "Example Result",
+            "description": "Lorem ipsum dolor sit amet, pede id pellentesque, sollicitudin turpis sed in sed sed, libero dictum."
+        }
+    ] />
+
+<@layout.page title="FreeMarker Example">
+    <#if results?size == 0>
+        There were no results.
+    <#else>
+        <ul>
+            <#list results as result>
+                <li>
+                    <strong>${result.title}</strong>
+                    <p>${result.description}</p>
+                </li>
+            </#list>
+        </ul>
+    </#if>
+
+    <#-- This is a FreeMarker comment -->
+    <@currentTime />
+</@layout.page>
+
+
+<#macro currentTime>
+    ${.now?string.full}
+</#macro>
--- a/samples/FreeMarker/layout.ftl
+++ b/samples/FreeMarker/layout.ftl
@@ -0,0 +1,32 @@
+<#ftl strip_text=true />
+
+<#macro page title>
+    <!doctype html>
+    <html lang="${.lang}">
+        <head>
+            <title>${title}</title>
+            <@metaTags />
+        </head>
+        <body>
+            <#nested />
+            <@footer />
+        </body>
+    </html>
+</#macro>
+
+
+<#---
+  Default meta tags
+-->
+<#macro metaTags>
+    <#compress>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width,initial-scale=1">
+        <meta name="format-detection" content="telephone=no">
+    </#compress>
+</#macro>
+
+<#macro footer>
+    <p>This page is using FreeMarker v${.version}</p>
+</#macro>
--- a/samples/G-code/lm.g
+++ b/samples/G-code/lm.g
--- a/samples/G-code/rm.g
+++ b/samples/G-code/rm.g
--- a/samples/GAS/hello.ms
+++ b/samples/GAS/hello.ms
@@ -0,0 +1,91 @@
+# output(): Hello, world.\n
+# mach(): all
+
+# Emit hello world while switching back and forth between arm/thumb.
+# ??? Unfinished
+
+	.macro invalid
+# This is "undefined" but it's not properly decoded yet.
+	.word 0x07ffffff
+# This is stc which isn't recognized yet.
+	stc 0,cr0,[r0]
+	.endm
+
+	.global _start
+_start:
+# Run some simple insns to confirm the engine is at least working.
+	nop
+
+# Skip over output text.
+
+	bl skip_output
+
+hello_text:
+	.asciz "Hello, world.\n"
+
+	.p2align 2
+skip_output:
+
+# Prime loop.
+
+	mov r4, r14
+
+output_next:
+
+# Switch arm->thumb to output next chacter.
+# At this point r4 must point to the next character to output.
+
+	adr r0, into_thumb + 1
+	bx r0
+
+into_thumb:
+	.thumb
+
+# Output a character.
+
+	mov r0,#3 @ writec angel call
+	mov r1,r4
+	swi 0xab @ ??? Confirm number.
+
+# Switch thumb->arm.
+
+	adr r5, back_to_arm
+	bx r5
+
+	.p2align 2
+back_to_arm:
+	.arm
+
+# Load next character, see if done.
+
+	add r4,r4,#1
+	sub r3,r3,r3
+	ldrb r5,[r4,r3]
+	teq r5,#0
+	beq done
+
+# Output a character (in arm mode).
+
+	mov r0,#3
+	mov r1,r4
+	swi #0x123456
+
+# Load next character, see if done.
+
+	add r4,r4,#1
+	sub r3,r3,r3
+	ldrb r5,[r4,r3]
+	teq r5,#0
+	bne output_next
+
+done:
+	mov r0,#0x18
+	ldr r1,exit_code
+	swi #0x123456
+
+# If that fails, try to die with an invalid insn.
+
+	invalid
+
+exit_code:
+	.word 0x20026
--- a/samples/Go/embedded.go
+++ b/samples/Go/embedded.go
--- a/samples/Go/gen-go-linguist-thrift.go
+++ b/samples/Go/gen-go-linguist-thrift.go
@@ -0,0 +1,18 @@
+// Autogenerated by Thrift Compiler (1.0.0-dev)
+// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+
+package linguist
+
+import (
+	"bytes"
+	"fmt"
+	"git.apache.org/thrift.git/lib/go/thrift"
+)
+
+// (needed to ensure safety because of naive import list construction.)
+var _ = thrift.ZERO
+var _ = fmt.Printf
+var _ = bytes.Equal
+
+func init() {
+}
--- a/samples/Groff/Tcl.n
+++ b/samples/Groff/Tcl.n
@@ -0,0 +1,275 @@
+'\"
+'\" Copyright (c) 1993 The Regents of the University of California.
+'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\"
+.TH Tcl n "8.6" Tcl "Tcl Built-In Commands"
+.so man.macros
+.BS
+.SH NAME
+Tcl \- Tool Command Language
+.SH SYNOPSIS
+Summary of Tcl language syntax.
+.BE
+.SH DESCRIPTION
+.PP
+The following rules define the syntax and semantics of the Tcl language:
+.IP "[1] \fBCommands.\fR"
+A Tcl script is a string containing one or more commands.
+Semi-colons and newlines are command separators unless quoted as
+described below.
+Close brackets are command terminators during command substitution
+(see below) unless quoted.
+.IP "[2] \fBEvaluation.\fR"
+A command is evaluated in two steps.
+First, the Tcl interpreter breaks the command into \fIwords\fR
+and performs substitutions as described below.
+These substitutions are performed in the same way for all
+commands.
+Secondly, the first word is used to locate a command procedure to
+carry out the command, then all of the words of the command are
+passed to the command procedure.
+The command procedure is free to interpret each of its words
+in any way it likes, such as an integer, variable name, list,
+or Tcl script.
+Different commands interpret their words differently.
+.IP "[3] \fBWords.\fR"
+Words of a command are separated by white space (except for
+newlines, which are command separators).
+.IP "[4] \fBDouble quotes.\fR"
+If the first character of a word is double-quote
+.PQ \N'34'
+then the word is terminated by the next double-quote character.
+If semi-colons, close brackets, or white space characters
+(including newlines) appear between the quotes then they are treated
+as ordinary characters and included in the word.
+Command substitution, variable substitution, and backslash substitution
+are performed on the characters between the quotes as described below.
+The double-quotes are not retained as part of the word.
+.IP "[5] \fBArgument expansion.\fR"
+If a word starts with the string
+.QW {*}
+followed by a non-whitespace character, then the leading
+.QW {*}
+is removed and the rest of the word is parsed and substituted as any other
+word. After substitution, the word is parsed as a list (without command or
+variable substitutions; backslash substitutions are performed as is normal for
+a list and individual internal words may be surrounded by either braces or
+double-quote characters), and its words are added to the command being
+substituted. For instance,
+.QW "cmd a {*}{b [c]} d {*}{$e f {g h}}"
+is equivalent to
+.QW "cmd a b {[c]} d {$e} f {g h}" .
+.IP "[6] \fBBraces.\fR"
+If the first character of a word is an open brace
+.PQ {
+and rule [5] does not apply, then
+the word is terminated by the matching close brace
+.PQ } "" .
+Braces nest within the word: for each additional open
+brace there must be an additional close brace (however,
+if an open brace or close brace within the word is
+quoted with a backslash then it is not counted in locating the
+matching close brace).
+No substitutions are performed on the characters between the
+braces except for backslash-newline substitutions described
+below, nor do semi-colons, newlines, close brackets,
+or white space receive any special interpretation.
+The word will consist of exactly the characters between the
+outer braces, not including the braces themselves.
+.IP "[7] \fBCommand substitution.\fR"
+If a word contains an open bracket
+.PQ [
+then Tcl performs \fIcommand substitution\fR.
+To do this it invokes the Tcl interpreter recursively to process
+the characters following the open bracket as a Tcl script.
+The script may contain any number of commands and must be terminated
+by a close bracket
+.PQ ] "" .
+The result of the script (i.e. the result of its last command) is
+substituted into the word in place of the brackets and all of the
+characters between them.
+There may be any number of command substitutions in a single word.
+Command substitution is not performed on words enclosed in braces.
+.IP "[8] \fBVariable substitution.\fR"
+If a word contains a dollar-sign
+.PQ $
+followed by one of the forms
+described below, then Tcl performs \fIvariable
+substitution\fR:  the dollar-sign and the following characters are
+replaced in the word by the value of a variable.
+Variable substitution may take any of the following forms:
+.RS
+.TP 15
+\fB$\fIname\fR
+.
+\fIName\fR is the name of a scalar variable;  the name is a sequence
+of one or more characters that are a letter, digit, underscore,
+or namespace separators (two or more colons).
+Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
+\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
+.TP 15
+\fB$\fIname\fB(\fIindex\fB)\fR
+.
+\fIName\fR gives the name of an array variable and \fIindex\fR gives
+the name of an element within that array.
+\fIName\fR must contain only letters, digits, underscores, and
+namespace separators, and may be an empty string.
+Letters and digits are \fIonly\fR the standard ASCII ones (\fB0\fR\(en\fB9\fR,
+\fBA\fR\(en\fBZ\fR and \fBa\fR\(en\fBz\fR).
+Command substitutions, variable substitutions, and backslash
+substitutions are performed on the characters of \fIindex\fR.
+.TP 15
+\fB${\fIname\fB}\fR
+.
+\fIName\fR is the name of a scalar variable or array element.  It may contain
+any characters whatsoever except for close braces.  It indicates an array
+element if \fIname\fR is in the form
+.QW \fIarrayName\fB(\fIindex\fB)\fR
+where \fIarrayName\fR does not contain any open parenthesis characters,
+.QW \fB(\fR ,
+or close brace characters,
+.QW \fB}\fR ,
+and \fIindex\fR can be any sequence of characters except for close brace
+characters.  No further
+substitutions are performed during the parsing of \fIname\fR.
+.PP
+There may be any number of variable substitutions in a single word.
+Variable substitution is not performed on words enclosed in braces.
+.PP
+Note that variables may contain character sequences other than those listed
+above, but in that case other mechanisms must be used to access them (e.g.,
+via the \fBset\fR command's single-argument form).
+.RE
+.IP "[9] \fBBackslash substitution.\fR"
+If a backslash
+.PQ \e
+appears within a word then \fIbackslash substitution\fR occurs.
+In all cases but those described below the backslash is dropped and
+the following character is treated as an ordinary
+character and included in the word.
+This allows characters such as double quotes, close brackets,
+and dollar signs to be included in words without triggering
+special processing.
+The following table lists the backslash sequences that are
+handled specially, along with the value that replaces each sequence.
+.RS
+.TP 7
+\e\fBa\fR
+Audible alert (bell) (Unicode U+000007).
+.TP 7
+\e\fBb\fR
+Backspace (Unicode U+000008).
+.TP 7
+\e\fBf\fR
+Form feed (Unicode U+00000C).
+.TP 7
+\e\fBn\fR
+Newline (Unicode U+00000A).
+.TP 7
+\e\fBr\fR
+Carriage-return (Unicode U+00000D).
+.TP 7
+\e\fBt\fR
+Tab (Unicode U+000009).
+.TP 7
+\e\fBv\fR
+Vertical tab (Unicode U+00000B).
+.TP 7
+\e\fB<newline>\fIwhiteSpace\fR
+.
+A single space character replaces the backslash, newline, and all spaces
+and tabs after the newline.  This backslash sequence is unique in that it
+is replaced in a separate pre-pass before the command is actually parsed.
+This means that it will be replaced even when it occurs between braces,
+and the resulting space will be treated as a word separator if it is not
+in braces or quotes.
+.TP 7
+\e\e
+Backslash
+.PQ \e "" .
+.TP 7
+\e\fIooo\fR 
+.
+The digits \fIooo\fR (one, two, or three of them) give a eight-bit octal 
+value for the Unicode character that will be inserted, in the range
+\fI000\fR\(en\fI377\fR (i.e., the range U+000000\(enU+0000FF).
+The parser will stop just before this range overflows, or when
+the maximum of three digits is reached.  The upper bits of the Unicode
+character will be 0.
+.TP 7
+\e\fBx\fIhh\fR 
+.
+The hexadecimal digits \fIhh\fR (one or two of them) give an eight-bit
+hexadecimal value for the Unicode character that will be inserted.  The upper
+bits of the Unicode character will be 0 (i.e., the character will be in the
+range U+000000\(enU+0000FF).
+.TP 7
+\e\fBu\fIhhhh\fR 
+.
+The hexadecimal digits \fIhhhh\fR (one, two, three, or four of them) give a
+sixteen-bit hexadecimal value for the Unicode character that will be
+inserted.  The upper bits of the Unicode character will be 0 (i.e., the
+character will be in the range U+000000\(enU+00FFFF).
+.TP 7
+\e\fBU\fIhhhhhhhh\fR 
+.
+The hexadecimal digits \fIhhhhhhhh\fR (one up to eight of them) give a
+twenty-one-bit hexadecimal value for the Unicode character that will be
+inserted, in the range U+000000\(enU+10FFFF.  The parser will stop just
+before this range overflows, or when the maximum of eight digits
+is reached.  The upper bits of the Unicode character will be 0.
+.RS
+.PP
+The range U+010000\(enU+10FFFD is reserved for the future.
+.RE
+.PP
+Backslash substitution is not performed on words enclosed in braces,
+except for backslash-newline as described above.
+.RE
+.IP "[10] \fBComments.\fR"
+If a hash character
+.PQ #
+appears at a point where Tcl is
+expecting the first character of the first word of a command,
+then the hash character and the characters that follow it, up
+through the next newline, are treated as a comment and ignored.
+The comment character only has significance when it appears
+at the beginning of a command.
+.IP "[11] \fBOrder of substitution.\fR"
+Each character is processed exactly once by the Tcl interpreter
+as part of creating the words of a command.
+For example, if variable substitution occurs then no further
+substitutions are performed on the value of the variable;  the
+value is inserted into the word verbatim.
+If command substitution occurs then the nested command is
+processed entirely by the recursive call to the Tcl interpreter;
+no substitutions are performed before making the recursive
+call and no additional substitutions are performed on the result
+of the nested script.
+.RS
+.PP
+Substitutions take place from left to right, and each substitution is
+evaluated completely before attempting to evaluate the next.  Thus, a
+sequence like
+.PP
+.CS
+set y [set x 0][incr x][incr x]
+.CE
+.PP
+will always set the variable \fIy\fR to the value, \fI012\fR.
+.RE
+.IP "[12] \fBSubstitution and word boundaries.\fR"
+Substitutions do not affect the word boundaries of a command,
+except for argument expansion as specified in rule [5].
+For example, during variable substitution the entire value of
+the variable becomes part of a single word, even if the variable's
+value contains spaces.
+.SH KEYWORDS
+backslash, command, comment, script, substitution, variable
+'\" Local Variables:
+'\" mode: nroff
+'\" fill-column: 78
+'\" End:
--- a/samples/Groff/create_view.l
+++ b/samples/Groff/create_view.l
@@ -0,0 +1,135 @@
+.\\" auto-generated by docbook2man-spec $Revision: 1.1.1.1 $
+.TH "CREATE VIEW" "" "2005-11-05" "SQL - Language Statements" "SQL Commands"
+.SH NAME
+CREATE VIEW \- define a new view
+
+.SH SYNOPSIS
+.sp
+.nf
+CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW \fIname\fR [ ( \fIcolumn_name\fR [, ...] ) ]
+    AS \fIquery\fR
+.sp
+.fi
+.SH "DESCRIPTION"
+.PP
+\fBCREATE VIEW\fR defines a view of a query. The view
+is not physically materialized. Instead, the query is run every time
+the view is referenced in a query.
+.PP
+\fBCREATE OR REPLACE VIEW\fR is similar, but if a view
+of the same name already exists, it is replaced. You can only replace
+a view with a new query that generates the identical set of columns
+(i.e., same column names and data types).
+.PP
+If a schema name is given (for example, CREATE VIEW
+myschema.myview ...) then the view is created in the specified
+schema. Otherwise it is created in the current schema. Temporary
+views exist in a special schema, so a schema name may not be given
+when creating a temporary view. The name of the view must be
+distinct from the name of any other view, table, sequence, or index
+in the same schema.
+.SH "PARAMETERS"
+.TP
+\fBTEMPORARY or TEMP\fR
+If specified, the view is created as a temporary view.
+Temporary views are automatically dropped at the end of the
+current session. Existing
+permanent relations with the same name are not visible to the
+current session while the temporary view exists, unless they are
+referenced with schema-qualified names.
+
+If any of the tables referenced by the view are temporary,
+the view is created as a temporary view (whether
+TEMPORARY is specified or not).
+.TP
+\fB\fIname\fB\fR
+The name (optionally schema-qualified) of a view to be created.
+.TP
+\fB\fIcolumn_name\fB\fR
+An optional list of names to be used for columns of the view.
+If not given, the column names are deduced from the query.
+.TP
+\fB\fIquery\fB\fR
+A query (that is, a \fBSELECT\fR statement) which will
+provide the columns and rows of the view.
+
+Refer to SELECT [\fBselect\fR(l)]
+for more information about valid queries.
+.SH "NOTES"
+.PP
+Currently, views are read only: the system will not allow an insert,
+update, or delete on a view. You can get the effect of an updatable
+view by creating rules that rewrite inserts, etc. on the view into
+appropriate actions on other tables. For more information see
+CREATE RULE [\fBcreate_rule\fR(l)].
+.PP
+Use the DROP VIEW [\fBdrop_view\fR(l)]
+statement to drop views.
+.PP
+Be careful that the names and types of the view's columns will be
+assigned the way you want. For example,
+.sp
+.nf
+CREATE VIEW vista AS SELECT 'Hello World';
+.sp
+.fi
+is bad form in two ways: the column name defaults to ?column?,
+and the column data type defaults to \fBunknown\fR. If you want a
+string literal in a view's result, use something like
+.sp
+.nf
+CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
+.sp
+.fi
+.PP
+Access to tables referenced in the view is determined by permissions of
+the view owner. However, functions called in the view are treated the
+same as if they had been called directly from the query using the view.
+Therefore the user of a view must have permissions to call all functions
+used by the view.
+.SH "EXAMPLES"
+.PP
+Create a view consisting of all comedy films:
+.sp
+.nf
+CREATE VIEW comedies AS
+    SELECT *
+    FROM films
+    WHERE kind = 'Comedy';
+.sp
+.fi
+.SH "COMPATIBILITY"
+.PP
+The SQL standard specifies some additional capabilities for the
+\fBCREATE VIEW\fR statement:
+.sp
+.nf
+CREATE VIEW \fIname\fR [ ( \fIcolumn_name\fR [, ...] ) ]
+    AS \fIquery\fR
+    [ WITH [ CASCADED | LOCAL ] CHECK OPTION ]
+.sp
+.fi
+.PP
+The optional clauses for the full SQL command are:
+.TP
+\fBCHECK OPTION\fR
+This option has to do with updatable views. All
+\fBINSERT\fR and \fBUPDATE\fR commands on the view
+will be checked to ensure data satisfy the view-defining
+condition (that is, the new data would be visible through the
+view). If they do not, the update will be rejected.
+.TP
+\fBLOCAL\fR
+Check for integrity on this view.
+.TP
+\fBCASCADED\fR
+Check for integrity on this view and on any dependent
+view. CASCADED is assumed if neither
+CASCADED nor LOCAL is specified.
+.PP
+.PP
+\fBCREATE OR REPLACE VIEW\fR is a
+PostgreSQL language extension.
+So is the concept of a temporary view.
+.SH "SEE ALSO"
+DROP VIEW [\fBdrop_view\fR(l)]
--- a/samples/Groff/fsinterface.ms
+++ b/samples/Groff/fsinterface.ms
--- a/samples/Groovy/build.script!
+++ b/samples/Groovy/build.script!
--- a/samples/Groovy/groovy.script!
+++ b/samples/Groovy/groovy.script!
--- a/samples/HCL/example.hcl
+++ b/samples/HCL/example.hcl
@@ -0,0 +1,6 @@
+consul = "1.2.3.4"
+
+// This is a comment
+template "foo" {
+  bar = "zip"
+}
--- a/samples/HCL/example.tf
+++ b/samples/HCL/example.tf
@@ -0,0 +1,13 @@
+resource "aws_instance" "web" {
+  // Copies the myapp.conf file to /etc/myapp.conf
+  provisioner "file" {
+    source = "conf/myapp.conf"
+    destination = "/etc/myapp.conf"
+  }
+
+  // Copies the configs.d folder to /etc/configs.d
+  provisioner "file" {
+    source = "conf/configs.d"
+    destination = "/etc"
+  }
+}
--- a/samples/HTML+EEX/index.html.eex
+++ b/samples/HTML+EEX/index.html.eex
@@ -0,0 +1,26 @@
+<h1>Listing Books</h1>
+ 
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Summary</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<%= for book <- @books do %>
+  <tr>
+    <%# comment %>
+    <td><%= book.title %></td>
+    <td><%= book.content %></td>
+    <td><%= link "Show", to: book_path(@conn, :show, book) %></td>
+    <td><%= link "Edit", to: book_path(@conn, :edit, book) %></td>
+    <td><%= link "Delete", to: book_path(@conn, :delete, book), method: :delete, data: [confirm: "Are you sure?"] %></td>
+  </tr>
+<% end %>
+</table>
+ 
+<br />
+ 
+<%= link "New book", to: book_path(@conn, :new) %>
--- a/samples/HTML/rpanel.inc
+++ b/samples/HTML/rpanel.inc
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" charset="UTF-8" type="text/css" href="main.css">
+<meta charset="UTF-8">
+</head>
+<body>
+    <div id="panel_header_main_form">
+        <p id="panel_header_main_form_title">Поддержка:</p>
+    </div>
+    <table>
+        <tbody>
+            <tr>
+                <td>    
+                    <p>Москва:</p>
+                </td>
+                <td>    
+                    <p>+7-902-7-800-807</p>
+                </td>
+            </tr>
+            <tr>
+                <td>    
+                    <p>Регионы:</p>
+                </td>
+                <td>    
+                    <p>+7-902-7-800-807</p>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</body>
--- a/samples/HTML/tailDel.inc
+++ b/samples/HTML/tailDel.inc
@@ -0,0 +1,5 @@
+</UL>
+<P><A HREF="devices.html">Supported Targets</A></P>
+</BODY>
+</HEAD>
+
--- a/samples/Haskell/HsColour.hs
+++ b/samples/Haskell/HsColour.hs
@@ -0,0 +1,114 @@
+-- | This is a library which colourises Haskell code.
+--   It currently has six output formats:
+--
+-- * ANSI terminal codes
+--
+-- * LaTeX macros
+--
+-- * HTML 3.2 with font tags
+--
+-- * HTML 4.01 with external CSS.
+--
+-- * XHTML 1.0 with internal CSS.
+--
+-- * mIRC chat client colour codes.
+--
+module Language.Haskell.HsColour (Output(..), ColourPrefs(..),
+                                  hscolour) where
+
+import Language.Haskell.HsColour.Colourise  (ColourPrefs(..))
+import qualified Language.Haskell.HsColour.TTY        as TTY
+import qualified Language.Haskell.HsColour.HTML       as HTML
+import qualified Language.Haskell.HsColour.CSS        as CSS
+import qualified Language.Haskell.HsColour.ACSS       as ACSS 
+import qualified Language.Haskell.HsColour.InlineCSS  as ICSS
+import qualified Language.Haskell.HsColour.LaTeX      as LaTeX
+import qualified Language.Haskell.HsColour.MIRC       as MIRC
+import Data.List(mapAccumL, isPrefixOf)
+import Data.Maybe
+import Language.Haskell.HsColour.Output
+--import Debug.Trace
+
+-- | Colourise Haskell source code with the given output format.
+hscolour :: Output      -- ^ Output format.
+         -> ColourPrefs -- ^ Colour preferences (for formats that support them).
+         -> Bool        -- ^ Whether to include anchors.
+         -> Bool        -- ^ Whether output document is partial or complete.
+         -> String	-- ^ Title for output.
+         -> Bool        -- ^ Whether input document is literate haskell or not
+         -> String      -- ^ Haskell source code.
+         -> String      -- ^ Coloured Haskell source code.
+hscolour output pref anchor partial title False =
+        (if partial then id else top'n'tail output title) .
+        hscolour' output pref anchor
+hscolour output pref anchor partial title True  =
+        (if partial then id else top'n'tail output title) .
+        concatMap chunk . joinL . classify . inlines
+  where
+    chunk (Code c) = hscolour' output pref anchor c
+    chunk (Lit c)  = c
+
+-- | The actual colourising worker, despatched on the chosen output format.
+hscolour' :: Output      -- ^ Output format.
+          -> ColourPrefs -- ^ Colour preferences (for formats that support them)
+          -> Bool        -- ^ Whether to include anchors.
+          -> String      -- ^ Haskell source code.
+          -> String      -- ^ Coloured Haskell source code.
+hscolour' TTY       pref _      = TTY.hscolour     pref
+hscolour' (TTYg tt) pref _      = TTY.hscolourG tt pref
+hscolour' MIRC      pref _      = MIRC.hscolour    pref
+hscolour' LaTeX     pref _      = LaTeX.hscolour   pref
+hscolour' HTML      pref anchor = HTML.hscolour    pref anchor
+hscolour' CSS       _    anchor = CSS.hscolour          anchor
+hscolour' ICSS      pref anchor = ICSS.hscolour    pref anchor
+hscolour' ACSS      _    anchor = ACSS.hscolour         anchor
+
+-- | Choose the right headers\/footers, depending on the output format.
+top'n'tail :: Output           -- ^ Output format
+           -> String           -- ^ Title for output
+           -> (String->String) -- ^ Output transformer
+top'n'tail TTY   _     = id
+top'n'tail (TTYg _) _  = id
+top'n'tail MIRC  _     = id
+top'n'tail LaTeX title = LaTeX.top'n'tail title
+top'n'tail HTML  title = HTML.top'n'tail title
+top'n'tail CSS   title = CSS.top'n'tail  title
+top'n'tail ICSS  title = ICSS.top'n'tail title
+top'n'tail ACSS  title = CSS.top'n'tail  title
+
+-- | Separating literate files into code\/comment chunks.
+data Lit = Code {unL :: String} | Lit {unL :: String} deriving (Show)
+
+-- Re-implementation of 'lines', for better efficiency (but decreased laziness).
+-- Also, importantly, accepts non-standard DOS and Mac line ending characters.
+-- And retains the trailing '\n' character in each resultant string.
+inlines :: String -> [String]
+inlines s = lines' s id
+  where
+  lines' []             acc = [acc []]
+  lines' ('\^M':'\n':s) acc = acc ['\n'] : lines' s id	-- DOS
+--lines' ('\^M':s)      acc = acc ['\n'] : lines' s id	-- MacOS
+  lines' ('\n':s)       acc = acc ['\n'] : lines' s id	-- Unix
+  lines' (c:s)          acc = lines' s (acc . (c:))
+
+
+-- | The code for classify is largely stolen from Language.Preprocessor.Unlit.
+classify ::  [String] -> [Lit]
+classify []             = []
+classify (x:xs) | "\\begin{code}"`isPrefixOf`x
+                        = Lit x: allProg xs
+   where allProg []     = []  -- Should give an error message,
+                              -- but I have no good position information.
+         allProg (x:xs) | "\\end{code}"`isPrefixOf`x
+                        = Lit x: classify xs
+         allProg (x:xs) = Code x: allProg xs
+classify (('>':x):xs)   = Code ('>':x) : classify xs
+classify (x:xs)         = Lit x: classify xs
+
+-- | Join up chunks of code\/comment that are next to each other.
+joinL :: [Lit] -> [Lit]
+joinL []                  = []
+joinL (Code c:Code c2:xs) = joinL (Code (c++c2):xs)
+joinL (Lit c :Lit c2 :xs) = joinL (Lit  (c++c2):xs)
+joinL (any:xs)            = any: joinL xs
+
--- a/samples/HyPhy/AAModelComparison.bf
+++ b/samples/HyPhy/AAModelComparison.bf
@@ -0,0 +1,252 @@
+if (Rows (modelMatrixList) == 0)
+{
+	modelMatrixList = 
+	{
+	{"Equal Input", "EIAA.mdl", "19"}
+	{"Dayhoff","Dayhoff.mdl","0"}
+	{"Dayhoff+F","Dayhoff_F.mdl","19"}
+	{"JTT", "Jones.mdl", "0"}
+	{"JTT+F", "Jones_F.mdl", "19"}
+	{"WAG", "WAG.mdl", "0"}
+	{"WAG+F", "WAG_F.mdl", "19"}
+	{"rtREV", "rtREV.mdl", "0"}
+	{"rtREV+F", "rtREV_F.mdl", "19"}
+	{"mtMAM", 		  "mtMAM.mdl", "0"}
+	{"mtMAM+F", 	  "mtMAM_F.mdl", "19"}
+	{"mtREV 24",      "mtREV_24.mdl", "0"}
+	{"mtREV 24+F",    "mtREV_24_F.mdl", "19"}
+	{"HIV within",    "HIVwithin.mdl", "0"}
+	{"HIV within+F",  "HIVwithin+F.mdl", "19"}
+	{"HIV between",   "HIVbetween.mdl", "0"}
+	{"HIV between+F", "HIVbetween+F.mdl", "19"}
+	{"REV-1 step", "reducedREV.mdl", "19"}
+	{"REV",   "mtREV.mdl",    "19"}
+	};
+}
+
+/*___________________________________________________________________________________________________________*/
+
+function runAModel (modelID, fileName, xtraP, midx)
+{
+	ExecuteCommands ("#include \"TemplateModels/"+fileName+"\";"); 
+	Tree 					givenTree 			= treeString;
+	LikelihoodFunction 		lf 					= (filteredData,givenTree);
+	
+	GetString (lf_info, lf, -1);
+	locals = lf_info["Local Independent"];
+
+	if (Columns (branchLengthStash))
+	{
+		USE_LAST_RESULTS = 1;
+		for (_iv = 0; _iv < Columns (locals); _iv = _iv+1)
+		{
+			ExecuteCommands (locals[_iv] + "=1;\n");
+		}
+		currentBL = BranchLength (givenTree,0);
+		currentBN = BranchName	 (givenTree,-1);
+		for (_iv = 0; _iv < Columns (currentBN); _iv = _iv+1)
+		{
+			ExecuteCommands ("givenTree."+currentBN[_iv]+".t="+branchLengthStash[_iv]/currentBL+";");
+			
+		}
+	}
+	else
+	{
+		for (_iv = 0; _iv < Columns (locals); _iv = _iv+1)
+		{
+			ExecuteCommands (locals[_iv] + "=0.1;\n");
+		}
+		USE_LAST_RESULTS = 1;
+	}
+
+	Optimize (res,lf);
+	
+	fprintf (stdout, "| ", modelID);
+	for (k=0; k<maxModelWidth-Abs(modelID)-1; k=k+1)
+	{
+		fprintf (stdout, " ");
+	}
+
+	params = res[1][1]+xtraP;
+	AIC    =  2(-res[1][0]+params);
+	
+	if (filteredData.sites-params>1)
+	{
+		cAIC   = 2(-res[1][0]+params*(filteredData.sites/(filteredData.sites-params-1)));
+	}
+	else
+	{
+		cAIC = 0;
+	}
+	
+	branchLengths = BranchLength (givenTree,-1);
+	TL = 0;
+	for (k=Rows(branchLengths)*Columns(branchLengths)-1; k>=0; k=k-1)				  
+	{
+		TL = TL + branchLengths[k];
+	}
+
+	fprintf (stdout, "| ", Format (res[1][0],14,3), " | ", Format (params,5,0), " | ",
+						   Format (AIC, 9,3), " | ",);
+					
+	if (cAIC > 0)
+	{
+		 fprintf (stdout, Format (cAIC,11,3), " | ");
+	}
+	else
+	{
+		 fprintf (stdout, "    N/A     | ");
+	}
+		   
+	fprintf (stdout, Format (TL,11,3), " |\n", sepString);
+	
+	resultMatrix[midx][0] = res[1][0];
+	resultMatrix[midx][1] = params;
+	resultMatrix[midx][2] = AIC;
+	resultMatrix[midx][3] = cAIC;
+	resultMatrix[midx][4] = TL;
+	
+	if (AIC < bestAIC)
+	{
+		bestAIC 	= AIC;
+		bestAICidx  = midx;
+		branchLengthStash = BranchLength (givenTree,-1);
+	}
+	
+	if (cAIC > 0)
+	{
+		if (bestCAIC > cAIC)
+		{
+			bestCAIC = cAIC;
+			bestCAICidx = midx;
+			
+		}
+	}
+	
+	return 0;
+}
+
+
+/*___________________________________________________________________________________________________________*/
+
+
+
+maxModelWidth = 7;
+skipCodeSelectionStep = 0;
+
+ChoiceList (doREV, "Include REV?", 1, SKIP_NONE, "Yes", "Include REV and reduced REV models. CAUTION: these models take a long time to fit.",
+												 "No", "Only use empirical models");
+												 
+if (doREV < 0)
+{
+	return 0;
+}
+
+if (doREV == 0)
+{
+	#include "TemplateModels/chooseGeneticCode.def";
+	skipCodeSelectionStep = 1;
+}
+
+modelCount    = Rows (modelMatrixList) - 2*doREV;
+
+for (k=0; k<modelCount; k=k+1)
+{
+	maxModelWidth = Max(maxModelWidth,Abs (modelMatrixList[k][0])+2);
+}
+
+sepString = "";
+capString = "";
+sepString * 256;
+sepString * "+";
+
+capString * 256;
+capString * "| Model";
+
+for (k=0; k<maxModelWidth; k=k+1)
+{
+	sepString * "-";
+}
+
+for (k=0; k<maxModelWidth-6; k=k+1)
+{
+	capString * " ";
+}
+
+capString * "| Log Likelihood | #prms | AIC Score | c-AIC Score | Tree Length |\n";
+sepString * "+----------------+-------+-----------+-------------+-------------+\n";
+sepString * 0;
+capString * 0;
+
+branchLengthStash = 0;
+
+SKIP_MODEL_PARAMETER_LIST = 0;
+
+#include "TemplateModels/modelParameters2.mdl";
+if (modelType == 1)
+{
+	#include "TemplateModels/defineGamma.mdl";
+}
+
+if (modelType == 2)
+{
+	#include "TemplateModels/defineHM.mdl";
+}
+SKIP_MODEL_PARAMETER_LIST = 1;
+
+SetDialogPrompt ("Please load an amino-acid data file:");
+
+DataSet ds = ReadDataFile (PROMPT_FOR_FILE);
+DataSetFilter filteredData = CreateFilter (ds,1);
+
+fprintf (stdout,"\nRunning aminoacid model comparisons on ", LAST_FILE_PATH, "\n\nThe alignment has ",ds.species, " sequences and ", ds.sites, " sites\n");
+
+_DO_TREE_REBALANCE_ = 1;
+
+#include "queryTree.bf";
+
+resultMatrix = {modelCount, 5};
+
+fprintf (stdout, "\n",sepString,capString,sepString);
+
+bestAIC 	= 1e100;
+bestCAIC	= 1e100;
+bestAICidx	= 0;
+bestCAICidx = -1;
+
+for (mid=0; mid<modelCount; mid=mid+1)
+{
+	runAModel (modelMatrixList[mid][0], modelMatrixList[mid][1], 0+modelMatrixList[mid][2], mid);
+}	
+
+fprintf (stdout, "\n\nBest AIC model:\n\t", modelMatrixList[bestAICidx][0], " with the score of ", bestAIC);
+
+if (bestCAICidx>=0)
+{
+	fprintf (stdout, "\n\nBest c-AIC model:\n\t", modelMatrixList[bestCAICidx][0], " with the score of ", bestCAIC);
+}
+
+labelMatrix  = {{"Log-likelihood","Parameters","AIC","c-AIC","Total tree length",""}};
+
+aaString = "Model";
+
+for (fC = 0; fC < modelCount; fC = fC+1)
+{
+	aaString = aaString + ";" + modelMatrixList[fC][0];
+}
+
+USE_LAST_RESULTS = 0;
+
+labelMatrix[5] = aaString;
+skipCodeSelectionStep = 0;
+OpenWindow (CHARTWINDOW,{{"Model Fits"}
+						   {"labelMatrix"},
+						   {"resultMatrix"},
+						   {"Bar Chart"},
+						   {"Index"},
+						   {"c-AIC"},
+						   {"Model Index"},
+						   {""},
+						   {"AIC"}
+						   },
+						   "SCREEN_WIDTH-60;SCREEN_HEIGHT-60;30;30");
--- a/samples/HyPhy/CodonModelCompare.bf
+++ b/samples/HyPhy/CodonModelCompare.bf
--- a/samples/HyPhy/MFPositiveSelection.bf
+++ b/samples/HyPhy/MFPositiveSelection.bf
--- a/samples/HyPhy/MatrixIndexing.bf
+++ b/samples/HyPhy/MatrixIndexing.bf
@@ -0,0 +1 @@
+fprintf (stdout, "\n1). Spawning a zero-populated 5x6 matrix and setting it's values to random numbers in [0,1].\n");
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`fprintf (stdout, "\n1). Spawning a zero-populated 5x6 matrix and setting it's values to random numbers in [0,1].\n");`