Merge pull request #3116 from github/cut-release-v4.8.8

Bumping to v4.8.8
Merge branch 'master' into cut-release-v4.8.8
2025-10-29 17:50:22 +00:00 · 2016-07-14 10:16:16 -06:00 · 2016-07-14 08:25:37 -06:00 · 2016-07-14 08:24:56 -06:00 · 2016-07-14 13:29:08 +02:00 · 2016-07-14 12:59:09 +02:00
563 changed files with 43821 additions and 7440 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "vendor/grammars/sublime-cirru"]
 	path = vendor/grammars/sublime-cirru
 	url = https://github.com/Cirru/sublime-cirru
-[submodule "vendor/grammars/Sublime-Logos"]
-	path = vendor/grammars/Sublime-Logos
-	url = https://github.com/Cykey/Sublime-Logos
 [submodule "vendor/grammars/SublimeBrainfuck"]
 	path = vendor/grammars/SublimeBrainfuck
 	url = https://github.com/Drako/SublimeBrainfuck
@@ -25,15 +22,9 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/autoitv3-tmbundle"]
-	path = vendor/grammars/autoitv3-tmbundle
-	url = https://github.com/Red-Nova-Technologies/autoitv3-tmbundle
 [submodule "vendor/grammars/Sublime-VimL"]
 	path = vendor/grammars/Sublime-VimL
 	url = https://github.com/SalGnt/Sublime-VimL
-[submodule "vendor/grammars/boo-sublime"]
-	path = vendor/grammars/boo-sublime
-	url = https://github.com/Shammah/boo-sublime
 [submodule "vendor/grammars/ColdFusion"]
 	path = vendor/grammars/ColdFusion
 	url = https://github.com/SublimeText/ColdFusion
@@ -88,9 +79,6 @@
 [submodule "vendor/grammars/language-yaml"]
 	path = vendor/grammars/language-yaml
 	url = https://github.com/atom/language-yaml
-[submodule "vendor/grammars/sublime-sourcepawn"]
-	path = vendor/grammars/sublime-sourcepawn
-	url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/Sublime-Lasso"]
 	path = vendor/grammars/Sublime-Lasso
 	url = https://github.com/bfad/Sublime-Lasso
@@ -109,9 +97,6 @@
 [submodule "vendor/grammars/sublime-MuPAD"]
 	path = vendor/grammars/sublime-MuPAD
 	url = https://github.com/ccreutzig/sublime-MuPAD
-[submodule "vendor/grammars/nesC.tmbundle"]
-	path = vendor/grammars/nesC.tmbundle
-	url = https://github.com/cdwilson/nesC.tmbundle
 [submodule "vendor/grammars/haxe-sublime-bundle"]
 	path = vendor/grammars/haxe-sublime-bundle
 	url = https://github.com/clemos/haxe-sublime-bundle
@@ -133,9 +118,6 @@
 [submodule "vendor/grammars/fancy-tmbundle"]
 	path = vendor/grammars/fancy-tmbundle
 	url = https://github.com/fancy-lang/fancy-tmbundle
-[submodule "vendor/grammars/monkey.tmbundle"]
-	path = vendor/grammars/monkey.tmbundle
-	url = https://github.com/gingerbeardman/monkey.tmbundle
 [submodule "vendor/grammars/dart-sublime-bundle"]
 	path = vendor/grammars/dart-sublime-bundle
 	url = https://github.com/guillermooo/dart-sublime-bundle
@@ -166,18 +148,12 @@
 [submodule "vendor/grammars/fish-tmbundle"]
 	path = vendor/grammars/fish-tmbundle
 	url = https://github.com/l15n/fish-tmbundle
-[submodule "vendor/grammars/sublime-idris"]
-	path = vendor/grammars/sublime-idris
-	url = https://github.com/laughedelic/sublime-idris
 [submodule "vendor/grammars/moonscript-tmbundle"]
 	path = vendor/grammars/moonscript-tmbundle
 	url = https://github.com/leafo/moonscript-tmbundle
 [submodule "vendor/grammars/Isabelle.tmbundle"]
 	path = vendor/grammars/Isabelle.tmbundle
 	url = https://github.com/lsf37/Isabelle.tmbundle
-[submodule "vendor/grammars/x86-assembly-textmate-bundle"]
-	path = vendor/grammars/x86-assembly-textmate-bundle
-	url = https://github.com/lunixbochs/x86-assembly-textmate-bundle
 [submodule "vendor/grammars/Alloy.tmbundle"]
 	path = vendor/grammars/Alloy.tmbundle
 	url = https://github.com/macekond/Alloy.tmbundle
@@ -208,9 +184,6 @@
 [submodule "vendor/grammars/Julia.tmbundle"]
 	path = vendor/grammars/Julia.tmbundle
 	url = https://github.com/nanoant/Julia.tmbundle
-[submodule "vendor/grammars/assembly.tmbundle"]
-	path = vendor/grammars/assembly.tmbundle
-	url = https://github.com/nanoant/assembly.tmbundle
 [submodule "vendor/grammars/ooc.tmbundle"]
 	path = vendor/grammars/ooc.tmbundle
 	url = https://github.com/nilium/ooc.tmbundle
@@ -220,9 +193,6 @@
 [submodule "vendor/grammars/sublime-tea"]
 	path = vendor/grammars/sublime-tea
 	url = https://github.com/pferruggiaro/sublime-tea
-[submodule "vendor/grammars/puppet-textmate-bundle"]
-	path = vendor/grammars/puppet-textmate-bundle
-	url = https://github.com/puppet-textmate-bundle/puppet-textmate-bundle
 [submodule "vendor/grammars/abap.tmbundle"]
 	path = vendor/grammars/abap.tmbundle
 	url = https://github.com/pvl/abap.tmbundle
@@ -394,9 +364,6 @@
 [submodule "vendor/grammars/r.tmbundle"]
 	path = vendor/grammars/r.tmbundle
 	url = https://github.com/textmate/r.tmbundle
-[submodule "vendor/grammars/restructuredtext.tmbundle"]
-	path = vendor/grammars/restructuredtext.tmbundle
-	url = https://github.com/textmate/restructuredtext.tmbundle
 [submodule "vendor/grammars/ruby-haml.tmbundle"]
 	path = vendor/grammars/ruby-haml.tmbundle
 	url = https://github.com/textmate/ruby-haml.tmbundle
@@ -448,9 +415,6 @@
 [submodule "vendor/grammars/llvm.tmbundle"]
 	path = vendor/grammars/llvm.tmbundle
 	url = https://github.com/whitequark/llvm.tmbundle
-[submodule "vendor/grammars/sublime-nix"]
-	path = vendor/grammars/sublime-nix
-	url = https://github.com/wmertens/sublime-nix
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
@@ -479,9 +443,6 @@
 [submodule "vendor/grammars/Scalate.tmbundle"]
 	path = vendor/grammars/Scalate.tmbundle
 	url = https://github.com/scalate/Scalate.tmbundle
-[submodule "vendor/grammars/Elm.tmLanguage"]
-	path = vendor/grammars/Elm.tmLanguage
-	url = https://github.com/deadfoxygrandpa/Elm.tmLanguage
 [submodule "vendor/grammars/sublime-bsv"]
 	path = vendor/grammars/sublime-bsv
 	url = https://github.com/thotypous/sublime-bsv
@@ -509,24 +470,9 @@
 [submodule "vendor/grammars/liquid.tmbundle"]
 	path = vendor/grammars/liquid.tmbundle
 	url = https://github.com/bastilian/validcode-textmate-bundles
-[submodule "vendor/grammars/ats.sublime"]
-	path = vendor/grammars/ats.sublime
-	url = https://github.com/steinwaywhw/ats-mode-sublimetext
 [submodule "vendor/grammars/Modelica"]
 	path = vendor/grammars/Modelica
 	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
-[submodule "vendor/grammars/sublime-apl"]
-	path = vendor/grammars/sublime-apl
-	url = https://github.com/StoneCypher/sublime-apl
-[submodule "vendor/grammars/CLIPS-sublime"]
-	path = vendor/grammars/CLIPS-sublime
-	url = https://github.com/psicomante/CLIPS-sublime
-[submodule "vendor/grammars/Creole"]
-	path = vendor/grammars/Creole
-	url = https://github.com/Siddley/Creole
-[submodule "vendor/grammars/GDScript-sublime"]
-	path = vendor/grammars/GDScript-sublime
-	url = https://github.com/beefsack/GDScript-sublime
 [submodule "vendor/grammars/sublime-golo"]
 	path = vendor/grammars/sublime-golo
 	url = https://github.com/TypeUnsafe/sublime-golo
@@ -539,9 +485,6 @@
 [submodule "vendor/grammars/G-Code"]
 	path = vendor/grammars/G-Code
 	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
-[submodule "vendor/grammars/grace-tmbundle"]
-	path = vendor/grammars/grace-tmbundle
-	url = https://github.com/zmthy/grace-tmbundle
 [submodule "vendor/grammars/sublime-text-ox"]
 	path = vendor/grammars/sublime-text-ox
 	url = https://github.com/andreashetland/sublime-text-ox
@@ -551,9 +494,6 @@
 [submodule "vendor/grammars/ec.tmbundle"]
 	path = vendor/grammars/ec.tmbundle
 	url = https://github.com/ecere/ec.tmbundle
-[submodule "vendor/grammars/InnoSetup"]
-	path = vendor/grammars/InnoSetup
-	url = https://github.com/idleberg/InnoSetup-Sublime-Text
 [submodule "vendor/grammars/gap-tmbundle"]
 	path = vendor/grammars/gap-tmbundle
 	url = https://github.com/dhowden/gap-tmbundle
@@ -575,9 +515,6 @@
 [submodule "vendor/grammars/SublimeClarion"]
 	path = vendor/grammars/SublimeClarion
 	url = https://github.com/fushnisoft/SublimeClarion
-[submodule "vendor/grammars/oracle.tmbundle"]
-	path = vendor/grammars/oracle.tmbundle
-	url = https://github.com/mulander/oracle.tmbundle.git
 [submodule "vendor/grammars/BrightScript.tmbundle"]
 	path = vendor/grammars/BrightScript.tmbundle
 	url = https://github.com/cmink/BrightScript.tmbundle
@@ -587,18 +524,12 @@
 [submodule "vendor/grammars/asciidoc.tmbundle"]
 	path = vendor/grammars/asciidoc.tmbundle
 	url = https://github.com/zuckschwerdt/asciidoc.tmbundle
-[submodule "vendor/grammars/sublime-text-pig-latin"]
-	path = vendor/grammars/sublime-text-pig-latin
-	url = https://github.com/goblindegook/sublime-text-pig-latin
 [submodule "vendor/grammars/Lean.tmbundle"]
 	path = vendor/grammars/Lean.tmbundle
 	url = https://github.com/leanprover/Lean.tmbundle
 [submodule "vendor/grammars/ampl"]
 	path = vendor/grammars/ampl
 	url = https://github.com/ampl/sublime-ampl
-[submodule "vendor/grammars/openscad.tmbundle"]
-	path = vendor/grammars/openscad.tmbundle
-	url = https://github.com/tbuser/openscad.tmbundle
 [submodule "vendor/grammars/sublime-varnish"]
 	path = vendor/grammars/sublime-varnish
 	url = https://github.com/brandonwamboldt/sublime-varnish
@@ -650,6 +581,9 @@
 [submodule "vendor/grammars/language-ncl"]
 	path = vendor/grammars/language-ncl
 	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/pawn-sublime-language"]
+	path = vendor/grammars/pawn-sublime-language
+	url = https://github.com/Southclaw/pawn-sublime-language.git
 [submodule "vendor/grammars/atom-language-purescript"]
 	path = vendor/grammars/atom-language-purescript
 	url = https://github.com/purescript-contrib/atom-language-purescript
@@ -716,3 +650,108 @@
 [submodule "vendor/grammars/language-povray"]
 	path = vendor/grammars/language-povray
 	url = https://github.com/c-lipka/language-povray
+[submodule "vendor/grammars/sublime-terra"]
+	path = vendor/grammars/sublime-terra
+	url = https://github.com/pyk/sublime-terra
+[submodule "vendor/grammars/SublimePuppet"]
+	path = vendor/grammars/SublimePuppet
+	url = https://github.com/russCloak/SublimePuppet
+[submodule "vendor/grammars/sublimeassembly"]
+	path = vendor/grammars/sublimeassembly
+	url = https://github.com/Nessphoro/sublimeassembly
+[submodule "vendor/grammars/monkey"]
+	path = vendor/grammars/monkey
+	url = https://github.com/gingerbeardman/monkey.tmbundle
+[submodule "vendor/grammars/assembly"]
+	path = vendor/grammars/assembly
+	url = https://github.com/nanoant/assembly.tmbundle
+[submodule "vendor/grammars/boo"]
+	path = vendor/grammars/boo
+	url = https://github.com/Shammah/boo-sublime
+[submodule "vendor/grammars/logos"]
+	path = vendor/grammars/logos
+	url = https://github.com/Cykey/Sublime-Logos
+[submodule "vendor/grammars/pig-latin"]
+	path = vendor/grammars/pig-latin
+	url = https://github.com/goblindegook/sublime-text-pig-latin
+[submodule "vendor/grammars/sourcepawn"]
+path = vendor/grammars/sourcepawn
+url = https://github.com/austinwagner/sublime-sourcepawn
+[submodule "vendor/grammars/gdscript"]
+	path = vendor/grammars/gdscript
+	url = https://github.com/beefsack/GDScript-sublime
+[submodule "vendor/grammars/nesC"]
+	path = vendor/grammars/nesC
+	url = https://github.com/cdwilson/nesC.tmbundle
+[submodule "vendor/grammars/ats"]
+	path = vendor/grammars/ats
+	url = https://github.com/steinwaywhw/ats-mode-sublimetext
+[submodule "vendor/grammars/grace"]
+	path = vendor/grammars/grace
+	url = https://github.com/zmthy/grace-tmbundle
+[submodule "vendor/grammars/ejs-tmbundle"]
+	path = vendor/grammars/ejs-tmbundle
+	url = https://github.com/gregory-m/ejs-tmbundle
+[submodule "vendor/grammars/nix"]
+	path = vendor/grammars/nix
+	url = https://github.com/wmertens/sublime-nix
+[submodule "vendor/grammars/idris"]
+	path = vendor/grammars/idris
+	url = https://github.com/idris-hackers/idris-sublime.git
+[submodule "vendor/grammars/atomic-dreams"]
+	path = vendor/grammars/atomic-dreams
+	url = https://github.com/PJB3005/atomic-dreams
+[submodule "vendor/grammars/language-apl"]
+	path = vendor/grammars/language-apl
+	url = https://github.com/Alhadis/language-apl.git
+[submodule "vendor/grammars/language-graphql"]
+	path = vendor/grammars/language-graphql
+	url = https://github.com/rmosolgo/language-graphql
+[submodule "vendor/grammars/language-toc-wow"]
+	path = vendor/grammars/language-toc-wow
+	url = https://github.com/nebularg/language-toc-wow
+[submodule "vendor/grammars/sublime-autoit"]
+	path = vendor/grammars/sublime-autoit
+	url = https://github.com/AutoIt/SublimeAutoItScript
+[submodule "vendor/grammars/TLA"]
+	path = vendor/grammars/TLA
+	url = https://github.com/agentultra/TLAGrammar
+[submodule "vendor/grammars/sublime-clips"]
+	path = vendor/grammars/sublime-clips
+	url = https://github.com/psicomante/CLIPS-sublime
+[submodule "vendor/grammars/creole"]
+	path = vendor/grammars/creole
+	url = https://github.com/Siddley/Creole
+[submodule "vendor/grammars/language-csound"]
+	path = vendor/grammars/language-csound
+	url = https://github.com/nwhetsell/language-csound
+[submodule "vendor/grammars/language-wavefront"]
+	path = vendor/grammars/language-wavefront
+	url = https://github.com/Alhadis/language-wavefront
+[submodule "vendor/grammars/nu.tmbundle"]
+	path = vendor/grammars/nu.tmbundle
+	url = https://github.com/jsallis/nu.tmbundle
+[submodule "vendor/grammars/Elm"]
+	path = vendor/grammars/Elm
+	url = https://github.com/elm-community/Elm.tmLanguage
+[submodule "vendor/grammars/language-restructuredtext"]
+	path = vendor/grammars/language-restructuredtext
+	url = https://github.com/Lukasa/language-restructuredtext
+[submodule "vendor/grammars/atom-language-clean"]
+	path = vendor/grammars/atom-language-clean
+	url = https://github.com/timjs/atom-language-clean.git
+[submodule "vendor/grammars/language-turing"]
+	path = vendor/grammars/language-turing
+	url = https://github.com/Alhadis/language-turing
+[submodule "vendor/grammars/atom-language-srt"]
+	path = vendor/grammars/atom-language-srt
+	url = https://github.com/314eter/atom-language-srt
+[submodule "vendor/grammars/language-agc"]
+	path = vendor/grammars/language-agc
+	url = https://github.com/Alhadis/language-agc
+[submodule "vendor/grammars/language-blade"]
+	path = vendor/grammars/language-blade
+	url = https://github.com/jawee/language-blade
+[submodule "vendor/grammars/SublimeGDB"]
+	path = vendor/grammars/SublimeGDB
+	url = https://github.com/quarnster/SublimeGDB
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ addons:
    - libicu-dev
    - libicu48
 before_install: script/travis/before_install
+script:
+  - bundle exec rake
+  - script/licensed verify
 rvm:
  - 2.0.0
  - 2.1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,6 @@
 # Contributing

-[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.
+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 [Contributor Covenant Code of Conduct](http://contributor-covenant.org/). By participating, you are expected to uphold this code.

 The majority of contributions won't need to touch any Ruby code at all.

@@ -33,6 +31,7 @@ To add support for a new language:
 0. Add a grammar for your language. Please only add grammars that have a license that permits redistribution.
  0. Add your grammar as a submodule: `git submodule add https://github.com/JaneSmith/MyGrammar vendor/grammars/MyGrammar`.
  0. Add your grammar to [`grammars.yml`][grammars] by running `script/convert-grammars --add vendor/grammars/MyGrammar`.
+  0. Download the license for the grammar: `script/licensed`. Be careful to only commit the file for the new grammar, as this script may update licenses for other grammars as well.
 0. Add samples for your language 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.

@@ -78,8 +77,20 @@ Sometimes getting the tests running can be too much work, especially if you don'

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

+## Maintainers

-## Releasing
+Linguist is maintained with :heart: by:
+
+- @arfon (GitHub Staff)
+- @larsbrinkhoff
+- @pchaigno
+ 
+As Linguist is a production dependency for GitHub we have a couple of workflow restrictions:
+
+- Anyone with commit rights can merge Pull Requests provided that there is a :+1: from a GitHub member of staff
+- Releases are performed by GitHub staff so we can ensure GitHub.com always stays up to date with the latest release of Linguist and there are no regressions in production.
+
+### Releasing

 If you are the current maintainer of this gem:

--- a/1
+++ b/1
@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gemspec :name => "github-linguist"
-gemspec :name => "github-linguist-grammars"
 gem 'byebug' if RUBY_VERSION >= '2.0'
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ special-vendored-path/* linguist-vendored
 jquery.js linguist-vendored=false
 ```

-Similar to vendored files, Linguist excludes documentation files from your project's language stats. (Unlike vendored files, documentation files are displayed in diffs on github.com.) [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.
+Just like vendored files, Linguist excludes documentation files from your project's language stats. [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.

 Use the `linguist-documentation` attribute to mark or unmark paths as documentation.

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

+#### Generated file detection
+
+Not all plain text files are true source files. Generated files like minified js and compiled CoffeeScript can be detected and excluded from language stats. As an added bonus, unlike vendored and documentation files, these files are suppressed in diffs.
+
+```ruby
+Linguist::FileBlob.new("underscore.min.js").generated? # => true
+```
+
+See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/master/lib/linguist/generated.rb).
+
 ### Using Emacs or Vim modelines

 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
@@ -114,4 +124,9 @@ lib/linguist.rb

 Please check out our [contributing guidelines](CONTRIBUTING.md).

-##
+## License
+
+The language grammars included in this gem are covered by their repositories'
+respective licenses. `grammars.yml` specifies the repository for each grammar.
+
+All other files are covered by the MIT license, see `LICENSE`.
--- a/8
+++ b/8
@@ -40,18 +40,14 @@ task :samples do
 end

 task :build_gem => :samples do
+  rm_rf "grammars"
+  sh "script/convert-grammars"
  languages = YAML.load_file("lib/linguist/languages.yml")
  File.write("lib/linguist/languages.json", Yajl.dump(languages))
  `gem build github-linguist.gemspec`
  File.delete("lib/linguist/languages.json")
 end

-task :build_grammars_gem do
-  rm_rf "grammars"
-  sh "script/convert-grammars"
-  sh "gem", "build", "github-linguist-grammars.gemspec"
-end
-
 namespace :benchmark do
  benchmark_path = "benchmark/results"

--- a/bin/git-linguist
+++ b/bin/git-linguist
@@ -111,7 +111,7 @@ def git_linguist(args)
  parser.parse!(args)

  git_dir = `git rev-parse --git-dir`.strip
-  raise "git-linguist must be ran in a Git repository" unless $?.success?
+  raise "git-linguist must be ran in a Git repository (#{Dir.pwd})" unless $?.success?
  wrapper = GitLinguist.new(git_dir, commit, incremental)

  case args.pop
--- a/github-linguist-grammars.gemspec
+++ b/github-linguist-grammars.gemspec
@@ -1,14 +0,0 @@
-require File.expand_path('../lib/linguist/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name    = 'github-linguist-grammars'
-  s.version = Linguist::VERSION
-  s.summary = "Language grammars for use with github-linguist"
-
-  s.authors  = "GitHub"
-  s.homepage = "https://github.com/github/linguist"
-
-  s.files = ['lib/linguist/grammars.rb'] + Dir['grammars/*']
-
-  s.add_development_dependency 'plist', '~>3.1'
-end
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
  s.homepage = "https://github.com/github/linguist"
  s.license  = "MIT"

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

  s.add_dependency 'charlock_holmes', '~> 0.7.3'
@@ -20,10 +20,12 @@ Gem::Specification.new do |s|

  s.add_development_dependency 'minitest', '>= 5.0'
  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'plist', '~>3.1'
  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'
+  s.add_development_dependency 'licensed'
+  s.add_development_dependency 'licensee', '>= 8.3.0'

 end
--- a/grammars.yml
+++ b/grammars.yml
@@ -18,8 +18,6 @@ http://svn.textmate.org/trunk/Review/Bundles/XQuery.tmbundle:
 https://bitbucket.org/Clams/sublimesystemverilog/get/default.tar.gz:
 - source.systemverilog
 - source.ucfconstraints
-https://fan.googlecode.com/hg-history/Build%201.0.55/adm/tools/textmate/Fan.tmbundle/Syntaxes/Fan.tmLanguage:
- source.fan
 vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
@@ -29,18 +27,14 @@ vendor/grammars/AutoHotkey/:
 vendor/grammars/BrightScript.tmbundle/:
 - source.brightauthorproject
 - source.brightscript
-vendor/grammars/CLIPS-sublime:
- source.clips
 vendor/grammars/ColdFusion:
 - source.cfscript
 - source.cfscript.cfc
 - text.cfml.basic
 - text.html.cfm
-vendor/grammars/Creole:
- text.html.creole
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm.tmLanguage:
+vendor/grammars/Elm/:
 - source.elm
 vendor/grammars/FreeMarker.tmbundle:
 - text.html.ftl
@@ -50,14 +44,10 @@ vendor/grammars/G-Code/:
 - source.MOD
 - source.apt
 - source.gcode
-vendor/grammars/GDScript-sublime/:
- source.gdscript
 vendor/grammars/Handlebars:
 - text.html.handlebars
 vendor/grammars/IDL-Syntax:
 - source.webidl
-vendor/grammars/InnoSetup/:
- source.inno
 vendor/grammars/Isabelle.tmbundle:
 - source.isabelle.root
 - source.isabelle.theory
@@ -108,8 +98,6 @@ vendor/grammars/Sublime-HTTP:
 - source.httpspec
 vendor/grammars/Sublime-Lasso:
 - file.lasso
-vendor/grammars/Sublime-Logos:
- source.logos
 vendor/grammars/Sublime-Loom:
 - source.loomscript
 vendor/grammars/Sublime-Modula-2/:
@@ -133,12 +121,19 @@ vendor/grammars/SublimeBrainfuck:
 - source.bf
 vendor/grammars/SublimeClarion/:
 - source.clarion
+vendor/grammars/SublimeGDB/:
+- source.disasm
+- source.gdb
+- source.gdb.session
+- source.gdbregs
 vendor/grammars/SublimePapyrus/:
- source.compiled-papyrus
- source.papyrus
- source.papyrus-assembly
+- source.papyrus.skyrim
+vendor/grammars/SublimePuppet/:
+- source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
+vendor/grammars/TLA:
+- source.tla
 vendor/grammars/TXL/:
 - source.txl
 vendor/grammars/Textmate-Gosu-Bundle:
@@ -178,7 +173,7 @@ vendor/grammars/asciidoc.tmbundle/:
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly.tmbundle:
+vendor/grammars/assembly/:
 - objdump.x86asm
 - source.x86asm
 vendor/grammars/atom-fsharp/:
@@ -186,22 +181,27 @@ vendor/grammars/atom-fsharp/:
 - source.fsharp.fsi
 - source.fsharp.fsl
 - source.fsharp.fsx
+vendor/grammars/atom-language-clean:
+- source.clean
 vendor/grammars/atom-language-purescript/:
 - source.purescript
+vendor/grammars/atom-language-srt:
+- text.srt
 vendor/grammars/atom-language-stan/:
 - source.stan
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
-vendor/grammars/ats.sublime:
+vendor/grammars/atomic-dreams/:
+- source.dm
+- source.dmf
+vendor/grammars/ats:
 - source.ats
-vendor/grammars/autoitv3-tmbundle:
- source.autoit.3
 vendor/grammars/awk-sublime:
 - source.awk
 vendor/grammars/bison.tmbundle:
 - source.bison
-vendor/grammars/boo-sublime:
+vendor/grammars/boo/:
 - source.boo
 vendor/grammars/bro-sublime:
 - source.bro
@@ -226,6 +226,8 @@ vendor/grammars/cool-tmbundle:
 vendor/grammars/cpp-qt.tmbundle:
 - source.c++.qt
 - source.qmake
+vendor/grammars/creole/:
+- text.html.creole
 vendor/grammars/css.tmbundle:
 - source.css
 vendor/grammars/cucumber-tmbundle:
@@ -252,6 +254,8 @@ vendor/grammars/ec.tmbundle/:
 - source.c.ec
 vendor/grammars/eiffel.tmbundle:
 - source.eiffel
+vendor/grammars/ejs-tmbundle:
+- text.html.js
 vendor/grammars/elixir-tmbundle:
 - source.elixir
 - text.elixir
@@ -271,13 +275,15 @@ vendor/grammars/fortran.tmbundle:
 - source.fortran.modern
 vendor/grammars/gap-tmbundle/:
 - source.gap
+vendor/grammars/gdscript/:
+- source.gdscript
 vendor/grammars/gettext.tmbundle:
 - source.po
 vendor/grammars/gnuplot-tmbundle:
 - source.gnuplot
 vendor/grammars/go-tmbundle:
 - source.go
-vendor/grammars/grace-tmbundle/:
+vendor/grammars/grace:
 - source.grace
 vendor/grammars/gradle.tmbundle:
 - source.groovy.gradle
@@ -300,6 +306,8 @@ vendor/grammars/idl.tmbundle:
 - source.idl
 - source.idl-dlm
 - text.idl-idldoc
+vendor/grammars/idris/:
+- source.idris
 vendor/grammars/ini.tmbundle:
 - source.ini
 vendor/grammars/io.tmbundle:
@@ -324,9 +332,15 @@ vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-agc:
+- source.agc
+vendor/grammars/language-apl:
+- source.apl
 vendor/grammars/language-babel/:
 - source.js.jsx
 - source.regexp.babel
+vendor/grammars/language-blade/:
+- text.html.php.blade
 vendor/grammars/language-click/:
 - source.click
 vendor/grammars/language-clojure:
@@ -336,13 +350,20 @@ vendor/grammars/language-coffee-script:
 - source.litcoffee
 vendor/grammars/language-crystal:
 - source.crystal
+- text.html.ecr
 vendor/grammars/language-csharp:
 - source.cake
 - source.cs
 - source.csx
 - source.nant-build
+vendor/grammars/language-csound:
+- source.csound
+- source.csound-document
+- source.csound-score
 vendor/grammars/language-gfm:
 - source.gfm
+vendor/grammars/language-graphql:
+- source.graphql
 vendor/grammars/language-hy:
 - source.hy
 vendor/grammars/language-inform7:
@@ -367,11 +388,20 @@ vendor/grammars/language-python:
 - text.python.traceback
 vendor/grammars/language-renpy:
 - source.renpy
+vendor/grammars/language-restructuredtext:
+- text.restructuredtext
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
 vendor/grammars/language-supercollider:
 - source.supercollider
+vendor/grammars/language-toc-wow:
+- source.toc
+vendor/grammars/language-turing:
+- source.turing
+vendor/grammars/language-wavefront:
+- source.wavefront.mtl
+- source.wavefront.obj
 vendor/grammars/language-xbase:
 - source.harbour
 vendor/grammars/language-yaml:
@@ -393,6 +423,8 @@ vendor/grammars/lisp.tmbundle:
 - source.lisp
 vendor/grammars/llvm.tmbundle:
 - source.llvm
+vendor/grammars/logos:
+- source.logos
 vendor/grammars/logtalk.tmbundle:
 - source.logtalk
 vendor/grammars/lua.tmbundle:
@@ -412,16 +444,20 @@ vendor/grammars/mediawiki.tmbundle/:
 - text.html.mediawiki
 vendor/grammars/mercury-tmlanguage:
 - source.mercury
-vendor/grammars/monkey.tmbundle:
+vendor/grammars/monkey/:
 - source.monkey
 vendor/grammars/moonscript-tmbundle:
 - source.moonscript
 vendor/grammars/nemerle.tmbundle:
 - source.nemerle
-vendor/grammars/nesC.tmbundle:
+vendor/grammars/nesC:
 - source.nesc
 vendor/grammars/ninja.tmbundle:
 - source.ninja
+vendor/grammars/nix:
+- source.nix
+vendor/grammars/nu.tmbundle:
+- source.nu
 vendor/grammars/objective-c.tmbundle:
 - source.objc
 - source.objc++
@@ -436,14 +472,12 @@ vendor/grammars/ooc.tmbundle:
 - source.ooc
 vendor/grammars/opa.tmbundle:
 - source.opa
-vendor/grammars/openscad.tmbundle/:
- source.scad
-vendor/grammars/oracle.tmbundle:
- source.plsql.oracle
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
 - source.pascal
+vendor/grammars/pawn-sublime-language/:
+- source.pawn
 vendor/grammars/perl.tmbundle/:
 - source.perl
 - source.perl.6
@@ -455,6 +489,8 @@ vendor/grammars/php-smarty.tmbundle:
 - text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
+vendor/grammars/pig-latin/:
+- source.pig_latin
 vendor/grammars/pike-textmate:
 - source.pike
 vendor/grammars/postscript.tmbundle:
@@ -465,16 +501,12 @@ vendor/grammars/processing.tmbundle:
 - source.processing
 vendor/grammars/protobuf-tmbundle:
 - source.protobuf
-vendor/grammars/puppet-textmate-bundle:
- source.puppet
 vendor/grammars/python-django.tmbundle:
 - source.python.django
 - text.html.django
 vendor/grammars/r.tmbundle:
 - source.r
 - text.tex.latex.rd
-vendor/grammars/restructuredtext.tmbundle:
- text.restructuredtext
 vendor/grammars/ruby-haml.tmbundle:
 - text.haml
 vendor/grammars/ruby-slim.tmbundle:
@@ -483,8 +515,8 @@ 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:
@@ -498,6 +530,8 @@ vendor/grammars/smali-sublime/smali.tmLanguage:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
+vendor/grammars/sourcepawn/:
+- source.sp
 vendor/grammars/sql.tmbundle:
 - source.sql
 vendor/grammars/st2-zonefile:
@@ -507,23 +541,23 @@ vendor/grammars/standard-ml.tmbundle:
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
-vendor/grammars/sublime-apl/:
- source.apl
 vendor/grammars/sublime-aspectj/:
 - source.aspectj
+vendor/grammars/sublime-autoit/:
+- source.autoit
 vendor/grammars/sublime-befunge:
 - source.befunge
 vendor/grammars/sublime-bsv:
 - source.bsv
 vendor/grammars/sublime-cirru:
 - source.cirru
+vendor/grammars/sublime-clips/:
+- source.clips
 vendor/grammars/sublime-glsl:
 - source.essl
 - source.glsl
 vendor/grammars/sublime-golo/:
 - source.golo
-vendor/grammars/sublime-idris:
- source.idris
 vendor/grammars/sublime-mask:
 - source.mask
 vendor/grammars/sublime-netlinx:
@@ -531,8 +565,6 @@ vendor/grammars/sublime-netlinx:
 - source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
-vendor/grammars/sublime-nix:
- source.nix
 vendor/grammars/sublime-opal/:
 - source.opal
 - source.opalsysdefs
@@ -542,17 +574,15 @@ vendor/grammars/sublime-robot-plugin:
 - text.robot
 vendor/grammars/sublime-rust:
 - source.rust
-vendor/grammars/sublime-sourcepawn:
- source.sp
 vendor/grammars/sublime-spintools/:
 - source.regexp.spin
 - source.spin
 vendor/grammars/sublime-tea:
 - source.tea
+vendor/grammars/sublime-terra:
+- source.terra
 vendor/grammars/sublime-text-ox/:
 - source.ox
-vendor/grammars/sublime-text-pig-latin/:
- source.pig_latin
 vendor/grammars/sublime-typescript/:
 - source.ts
 - source.tsx
@@ -566,6 +596,8 @@ vendor/grammars/sublime_cobol:
 vendor/grammars/sublime_man_page_support:
 - source.man
 - text.groff
+vendor/grammars/sublimeassembly/:
+- source.assembly
 vendor/grammars/sublimeprolog/:
 - source.prolog
 - source.prolog.eclipse
@@ -587,8 +619,6 @@ vendor/grammars/verilog.tmbundle:
 - source.verilog
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
-vendor/grammars/x86-assembly-textmate-bundle:
- source.asm.x86
 vendor/grammars/xc.tmbundle/:
 - source.xc
 vendor/grammars/xml.tmbundle:
--- a/lib/linguist.rb
+++ b/lib/linguist.rb
@@ -1,5 +1,6 @@
 require 'linguist/blob_helper'
 require 'linguist/generated'
+require 'linguist/grammars'
 require 'linguist/heuristics'
 require 'linguist/language'
 require 'linguist/repository'
@@ -8,8 +9,85 @@ require 'linguist/shebang'
 require 'linguist/version'

 class << Linguist
+  # Public: Detects the Language of the blob.
+  #
+  # blob - an object that includes the Linguist `BlobHelper` interface;
+  #       see Linguist::LazyBlob and Linguist::FileBlob for examples
+  #
+  # Returns Language or nil.
+  def detect(blob)
+    # Bail early if the blob is binary or empty.
+    return nil if blob.likely_binary? || blob.binary? || blob.empty?
+
+    Linguist.instrument("linguist.detection", :blob => blob) do
+      # Call each strategy until one candidate is returned.
+      languages = []
+      returning_strategy = nil
+
+      STRATEGIES.each do |strategy|
+        returning_strategy = strategy
+        candidates = Linguist.instrument("linguist.strategy", :blob => blob, :strategy => strategy, :candidates => languages) do
+          strategy.call(blob, languages)
+        end
+        if candidates.size == 1
+          languages = candidates
+          break
+        elsif candidates.size > 1
+          # More than one candidate was found, pass them to the next strategy.
+          languages = candidates
+        else
+          # No candidates, try the next strategy
+        end
+      end
+
+      Linguist.instrument("linguist.detected", :blob => blob, :strategy => returning_strategy, :language => languages.first)
+
+      languages.first
+    end
+  end
+
+  # Internal: The strategies used to detect the language of a file.
+  #
+  # A strategy is an object that has a `.call` method that takes two arguments:
+  #
+  #   blob - An object that quacks like a blob.
+  #   languages - An Array of candidate Language objects that were returned by the
+  #               previous strategy.
+  #
+  # A strategy should return an Array of Language candidates.
+  #
+  # Strategies are called in turn until a single Language is returned.
+  STRATEGIES = [
+    Linguist::Strategy::Modeline,
+    Linguist::Shebang,
+    Linguist::Strategy::Filename,
+    Linguist::Heuristics,
+    Linguist::Classifier
+  ]
+
+  # Public: Set an instrumenter.
+  #
+  #     class CustomInstrumenter
+  #       def instrument(name, payload = {})
+  #         warn "Instrumenting #{name}: #{payload[:blob]}"
+  #       end
+  #     end
+  #
+  #     Linguist.instrumenter = CustomInstrumenter
+  #
+  # The instrumenter must conform to the `ActiveSupport::Notifications`
+  # interface, which defines `#instrument` and accepts:
+  #
+  # name    - the String name of the event (e.g. "linguist.detected")
+  # payload - a Hash of the exception context.
  attr_accessor :instrumenter

+  # Internal: Perform instrumentation on a block
+  #
+  #     Linguist.instrument("linguist.dosomething", :blob => blob) do
+  #       # logic to instrument here.
+  #     end
+  #
  def instrument(*args, &bk)
    if instrumenter
      instrumenter.instrument(*args, &bk)
@@ -17,4 +95,5 @@ class << Linguist
      yield
    end
  end
+
 end
--- a/lib/linguist/blob.rb
+++ b/lib/linguist/blob.rb
@@ -63,7 +63,7 @@ module Linguist
    #
    # Returns an Array
    def extensions
-      basename, *segments = name.downcase.split(".")
+      _, *segments = name.downcase.split(".")

      segments.map.with_index do |segment, index|
        "." + segments[index..-1].join(".")
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -6,7 +6,7 @@ require 'yaml'

 module Linguist
  # DEPRECATED Avoid mixing into Blob classes. Prefer functional interfaces
-  # like `Language.detect` over `Blob#language`. Functions are much easier to
+  # like `Linguist.detect` over `Blob#language`. Functions are much easier to
  # cache and compose.
  #
  # Avoid adding additional bloat to this module.
@@ -325,7 +325,7 @@ module Linguist
    #
    # Returns a Language or nil if none is detected
    def language
-      @language ||= Language.detect(self)
+      @language ||= Linguist.detect(self)
    end

    # Internal: Get the TextMate compatible scope for the blob
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -56,9 +56,11 @@ module Linguist
      generated_net_specflow_feature_file? ||
      composer_lock? ||
      node_modules? ||
+      npm_shrinkwrap? ||
      godeps? ||
      generated_by_zephir? ||
      minified_files? ||
+      has_source_map? ||
      source_map? ||
      compiled_coffeescript? ||
      generated_parser? ||
@@ -104,6 +106,21 @@ module Linguist
      end
    end

+    # Internal: Does the blob contain a source map reference?
+    #
+    # We assume that if one of the last 2 lines starts with a source map
+    # reference, then the current file was generated from other files.
+    #
+    # We use the last 2 lines because the last line might be empty.
+    #
+    # We only handle JavaScript, no CSS support yet.
+    #
+    # Returns true or false.
+    def has_source_map?
+      return false unless extname.downcase == '.js'
+      lines.last(2).any? { |line| line.start_with?('//# sourceMappingURL') }
+    end
+
    # Internal: Is the blob a generated source map?
    #
    # Source Maps usually have .css.map or .js.map extensions. In case they
@@ -287,6 +304,13 @@ module Linguist
      !!name.match(/node_modules\//)
    end

+    # Internal: Is the blob a generated npm shrinkwrap file.
+    #
+    # Returns true or false.
+    def npm_shrinkwrap?
+      !!name.match(/npm-shrinkwrap\.json/)
+    end
+
    # Internal: Is the blob part of Godeps/,
    # which are not meant for humans in pull requests.
    #
@@ -339,14 +363,14 @@ module Linguist
    # on the first line.
    #
    # GFortran module files contain:
-    # GFORTRAN module version 'x' created from 
+    # 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") || 
+      return lines[0].include?("PCBNEW-LibModule-V") ||
              lines[0].include?("GFORTRAN module version '")
    end

--- a/lib/linguist/grammars.rb
+++ b/lib/linguist/grammars.rb
@@ -1,6 +1,3 @@
-# Note: This file is included in the github-linguist-grammars gem, not the
-# github-linguist gem.
-
 module Linguist
  module Grammars
    # Get the path to the directory containing the language grammar JSON files.
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -86,6 +86,14 @@ module Linguist
      end
    end

+    disambiguate ".builds" do |data|
+      if /^(\s*)(<Project|<Import|<Property|<?xml|xmlns)/i.match(data)
+        Language["XML"]
+      else
+        Language["Text"]
+      end
+    end
+
    disambiguate ".ch" do |data|
      if /^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b/i.match(data)
        Language["xBase"]
@@ -127,6 +135,14 @@ module Linguist
        Language["ECL"]
      end
    end
+    
+    disambiguate ".es" do |data|
+      if /^\s*(?:%%|main\s*\(.*?\)\s*->)/.match(data)
+        Language["Erlang"]
+      elsif /(?:\/\/|("|')use strict\1|export\s+default\s|\/\*.*?\*\/)/m.match(data)
+        Language["JavaScript"]
+      end
+    end

    disambiguate ".for", ".f" do |data|
      if /^: /.match(data)
@@ -171,6 +187,12 @@ module Linguist
      end
    end

+    disambiguate ".inc" do |data|
+      if /^<\?(?:php)?/.match(data)
+        Language["PHP"]
+      end
+    end
+
    disambiguate ".l" do |data|
      if /\(def(un|macro)\s/.match(data)
        Language["Common Lisp"]
@@ -217,6 +239,14 @@ module Linguist
      end
    end

+    disambiguate ".md" do |data|
+      if /^[-a-z0-9=#!\*\[|]/i.match(data)
+        Language["Markdown"]
+      elsif /^(;;|\(define_)/.match(data)
+        Language["GCC machine description"]
+      end
+    end
+
    disambiguate ".ml" do |data|
      if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
        Language["OCaml"]
@@ -313,6 +343,14 @@ module Linguist
      end
    end

+    disambiguate ".props" do |data|
+      if /^(\s*)(<Project|<Import|<Property|<?xml|xmlns)/i.match(data)
+        Language["XML"]
+      elsif /\w+\s*=\s*/i.match(data)
+        Language["INI"]
+      end
+    end
+
    disambiguate ".r" do |data|
      if /\bRebol\b/i.match(data)
        Language["Rebol"]
@@ -321,6 +359,14 @@ module Linguist
      end
    end

+    disambiguate ".rpy" do |data|
+      if /(^(import|from|class|def)\s)/m.match(data)
+        Language["Python"]
+      else
+        Language["Ren'Py"]
+      end
+    end
+
    disambiguate ".rs" do |data|
      if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
        Language["Rust"]
@@ -338,13 +384,13 @@ module Linguist
    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)
+      if /^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
        #Postgres
        Language["PLpgSQL"]
      elsif /(alter module)|(language sql)|(begin( NOT)+ atomic)/i.match(data)  || /signal SQLSTATE '[0-9]+'/i.match(data)
        #IBM db2
        Language["SQLPL"]
-      elsif /pragma|\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)/i.match(data) || /constructor\W+function/i.match(data)
+      elsif /\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)/i.match(data) || /constructor\W+function/i.match(data)
        #Oracle
        Language["PLSQL"]
      elsif ! /begin|boolean|package|exception/i.match(data)
@@ -352,9 +398,31 @@ module Linguist
        Language["SQL"]
      end
    end
+    
+    disambiguate ".srt" do |data|
+      if /^(\d{2}:\d{2}:\d{2},\d{3})\s*(-->)\s*(\d{2}:\d{2}:\d{2},\d{3})$/.match(data)
+        Language["SubRip Text"]
+      end
+    end
+    
+    disambiguate ".t" do |data|
+      if /^\s*%|^\s*var\s+\w+\s*:\s*\w+/.match(data)
+        Language["Turing"]
+      elsif /^\s*use\s+v6\s*;/.match(data)
+        Language["Perl6"]
+      end
+    end
+    
+    disambiguate ".toc" do |data|
+      if /^## |@no-lib-strip@/.match(data)
+        Language["World of Warcraft Addon Data"]
+      elsif /^\\(contentsline|defcounter|beamer|boolfalse)/.match(data)
+        Language["TeX"]
+      end
+    end

    disambiguate ".ts" do |data|
-      if data.include?("<TS ")
+      if data.include?("</TS>")
        Language["XML"]
      else
        Language["TypeScript"]
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -87,14 +87,6 @@ module Linguist
      language
    end

-    STRATEGIES = [
-      Linguist::Strategy::Modeline,
-      Linguist::Shebang,
-      Linguist::Strategy::Filename,
-      Linguist::Heuristics,
-      Linguist::Classifier
-    ]
-
    # Public: Detects the Language of the blob.
    #
    # blob - an object that includes the Linguist `BlobHelper` interface;
@@ -102,34 +94,8 @@ module Linguist
    #
    # Returns Language or nil.
    def self.detect(blob)
-      # Bail early if the blob is binary or empty.
-      return nil if blob.likely_binary? || blob.binary? || blob.empty?
-
-      Linguist.instrument("linguist.detection", :blob => blob) do
-        # Call each strategy until one candidate is returned.
-        languages = []
-        returning_strategy = nil
-
-        STRATEGIES.each do |strategy|
-          returning_strategy = strategy
-          candidates = Linguist.instrument("linguist.strategy", :blob => blob, :strategy => strategy, :candidates => languages) do
-            strategy.call(blob, languages)
-          end
-          if candidates.size == 1
-            languages = candidates
-            break
-          elsif candidates.size > 1
-            # More than one candidate was found, pass them to the next strategy.
-            languages = candidates
-          else
-            # No candidates, try the next strategy
-          end
-        end
-
-        Linguist.instrument("linguist.detected", :blob => blob, :strategy => returning_strategy, :language => languages.first)
-
-        languages.first
-      end
+      warn "[DEPRECATED] `Linguist::Language.detect` is deprecated. Use `Linguist.detect`. #{caller[0]}"
+      Linguist.detect(blob)
    end

    # Public: Get all Languages
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -75,6 +75,10 @@ APL:
  extensions:
  - .apl
  - .dyalog
+  interpreters:
+  - apl
+  - aplx
+  - dyalog
  tm_scope: source.apl
  ace_mode: text

@@ -147,6 +151,17 @@ Alloy:
  - .als
  ace_mode: text

+Alpine Abuild:
+  type: programming
+  group: Shell
+  aliases:
+  - abuild
+  - apkbuild
+  filenames:
+  - APKBUILD
+  tm_scope: source.shell
+  ace_mode: sh
+
 Ant Build System:
  type: data
  tm_scope: text.xml.ant
@@ -173,6 +188,15 @@ Apex:
  tm_scope: source.java
  ace_mode: java

+Apollo Guidance Computer:
+  type: programming
+  color: "#0B3D91"
+  group: Assembly
+  extensions:
+  - .agc
+  tm_scope: source.agc
+  ace_mode: assembly_x86
+
 AppleScript:
  type: programming
  aliases:
@@ -230,7 +254,7 @@ Assembly:
  - .a51
  - .inc
  - .nasm
-  tm_scope: source.asm.x86
+  tm_scope: source.assembly
  ace_mode: assembly_x86

 Augeas:
@@ -260,7 +284,7 @@ AutoIt:
  - AutoItScript
  extensions:
  - .au3
-  tm_scope: source.autoit.3
+  tm_scope: source.autoit
  ace_mode: autohotkey

 Awk:
@@ -315,6 +339,15 @@ BitBake:
  - .bb
  ace_mode: text

+Blade:
+  type: markup
+  group: HTML
+  extensions:
+    - .blade
+    - .blade.php
+  tm_scope: text.html.php.blade
+  ace_mode: text
+
 BlitzBasic:
  type: programming
  aliases:
@@ -350,6 +383,7 @@ Boo:
  extensions:
  - .boo
  ace_mode: text
+  tm_scope: source.boo

 Brainfuck:
  type: programming
@@ -467,6 +501,13 @@ COBOL:
  - .cpy
  ace_mode: cobol

+COLLADA:
+  type: data
+  extensions:
+  - .dae
+  tm_scope: text.xml
+  ace_mode: xml
+
 CSS:
  type: markup
  tm_scope: source.css
@@ -474,7 +515,7 @@ CSS:
  color: "#563d7c"
  extensions:
  - .css
-  
+
 CSV:
  type: data
  ace_mode: text
@@ -548,7 +589,7 @@ Clean:
  extensions:
  - .icl
  - .dcl
-  tm_scope: none
+  tm_scope: source.clean
  ace_mode: text

 Click:
@@ -682,7 +723,7 @@ Cpp-ObjDump:
  - .cxx-objdump
  tm_scope: objdump.x86asm
  aliases:
-  - c++-objdumb
+  - c++-objdump
  ace_mode: assembly_x86

 Creole:
@@ -703,6 +744,34 @@ Crystal:
  interpreters:
  - crystal

+Csound:
+  type: programming
+  aliases:
+  - csound-orc
+  extensions:
+  - .orc
+  - .udo
+  tm_scope: source.csound
+  ace_mode: text
+
+Csound Document:
+  type: programming
+  aliases:
+  - csound-csd
+  extensions:
+  - .csd
+  tm_scope: source.csound-document
+  ace_mode: text
+
+Csound Score:
+  type: programming
+  aliases:
+  - csound-sco
+  extensions:
+  - .sco
+  tm_scope: source.csound-score
+  ace_mode: text
+
 Cucumber:
  type: programming
  extensions:
@@ -771,7 +840,7 @@ DM:
  - .dm
  aliases:
  - byond
-  tm_scope: source.c++
+  tm_scope: source.dm
  ace_mode: c_cpp

 DNS Zone:
@@ -809,6 +878,8 @@ Dart:
  color: "#00B4AB"
  extensions:
  - .dart
+  interpreters:
+  - dart
  ace_mode: dart

 Diff:
@@ -853,6 +924,8 @@ E:
  color: "#ccce35"
  extensions:
  - .E
+  interpreters:
+  - rune
  tm_scope: none
  ace_mode: text

@@ -873,6 +946,23 @@ ECLiPSe:
  tm_scope: source.prolog.eclipse
  ace_mode: prolog

+EJS:
+  type: markup
+  color: "#a91e50"
+  group: HTML
+  extensions:
+  - .ejs
+  tm_scope: text.html.js
+  ace_mode: ejs
+
+EQ:
+  type: programming
+  color: "#a78649"
+  extensions:
+  - .eq
+  tm_scope: source.cs
+  ace_mode: csharp
+
 Eagle:
  type: markup
  color: "#814C05"
@@ -947,6 +1037,7 @@ Erlang:
  color: "#B83998"
  extensions:
  - .erl
+  - .app.src
  - .es
  - .escript
  - .hrl
@@ -1022,7 +1113,7 @@ Fantom:
  color: "#dbded5"
  extensions:
  - .fan
-  tm_scope: source.fan
+  tm_scope: none
  ace_mode: text

 Filterscript:
@@ -1106,9 +1197,24 @@ GAS:
  extensions:
  - .s
  - .ms
-  tm_scope: source.asm.x86
+  tm_scope: source.assembly
  ace_mode: assembly_x86

+GCC Machine Description:
+  type: programming
+  extensions:
+  - .md
+  tm_scope: source.lisp
+  ace_mode: lisp
+
+GDB:
+  type: programming
+  extensions:
+  - .gdb
+  - .gdbinit
+  tm_scope: source.gdb
+  ace_mode: text
+
 GDScript:
  type: programming
  extensions:
@@ -1124,6 +1230,7 @@ GLSL:
  - .frag
  - .frg
  - .fs
+  - .fsh
  - .fshader
  - .geo
  - .geom
@@ -1132,6 +1239,7 @@ GLSL:
  - .shader
  - .vert
  - .vrx
+  - .vsh
  - .vshader
  ace_mode: glsl

@@ -1261,6 +1369,13 @@ Graph Modeling Language:
  tm_scope: none
  ace_mode: text

+GraphQL:
+  type: data
+  extensions:
+    - .graphql
+  tm_scope: source.graphql
+  ace_mode: text
+
 Graphviz (DOT):
  type: data
  tm_scope: source.dot
@@ -1271,6 +1386,7 @@ Graphviz (DOT):

 Groff:
  type: markup
+  color: "#ecdebe"
  extensions:
  - .man
  - '.1'
@@ -1290,6 +1406,7 @@ Groff:
  - '.8'
  - '.9'
  - .l
+  - .me
  - .ms
  - .n
  - .rno
@@ -1310,6 +1427,8 @@ Groovy:
  - .gvy
  interpreters:
  - groovy
+  filenames:
+  - Jenkinsfile

 Groovy Server Pages:
  type: programming
@@ -1330,6 +1449,16 @@ HCL:
  ace_mode: ruby
  tm_scope: source.ruby

+HLSL:
+  type: programming
+  extensions:
+    - .hlsl
+    - .fx
+    - .fxh
+    - .hlsli
+  ace_mode: text
+  tm_scope: none
+
 HTML:
  type: markup
  tm_scope: text.html.basic
@@ -1360,6 +1489,16 @@ HTML+Django:
  - htmldjango
  ace_mode: django

+HTML+ECR:
+  type: markup
+  tm_scope: text.html.ecr
+  group: HTML
+  aliases:
+  - ecr
+  extensions:
+  - .ecr
+  ace_mode: text
+
 HTML+EEX:
  type: markup
  tm_scope: text.html.elixir
@@ -1441,6 +1580,8 @@ Haskell:
  extensions:
  - .hs
  - .hsc
+  interpreters:
+  - runhaskell
  ace_mode: haskell

 Haxe:
@@ -1518,6 +1659,7 @@ Idris:
  - .idr
  - .lidr
  ace_mode: text
+  tm_scope: source.idris

 Inform 7:
  type: programming
@@ -1535,7 +1677,7 @@ Inno Setup:
  type: programming
  extensions:
  - .iss
-  tm_scope: source.inno
+  tm_scope: none
  ace_mode: text

 Io:
@@ -1543,6 +1685,8 @@ Io:
  color: "#a9188d"
  extensions:
  - .io
+  interpreters:
+  - io
  ace_mode: io

 Ioke:
@@ -1575,6 +1719,8 @@ J:
  color: "#9EEDFF"
  extensions:
  - .ijs
+  interpreters:
+  - jconsole
  tm_scope: source.j
  ace_mode: text

@@ -1597,11 +1743,13 @@ JSON:
  extensions:
  - .json
  - .geojson
-  - .lock
+  - .JSON-tmLanguage
  - .topojson
  filenames:
+  - .arcconfig
  - .jshintrc
  - composer.lock
+  - mcmod.info

 JSON5:
  type: data
@@ -1639,6 +1787,7 @@ Jade:
  type: markup
  extensions:
  - .jade
+  - .pug
  tm_scope: text.jade
  ace_mode: jade

@@ -1679,6 +1828,7 @@ JavaScript:
  - .js
  - ._js
  - .bones
+  - .es
  - .es6
  - .frag
  - .gs
@@ -1834,7 +1984,7 @@ Lean:
  extensions:
  - .lean
  - .hlean
-  ace_mode: lean
+  ace_mode: text

 Less:
  type: markup
@@ -1948,6 +2098,7 @@ Logos:
  - .x
  - .xi
  ace_mode: text
+  tm_scope: source.logos

 Logtalk:
  type: programming
@@ -1995,6 +2146,25 @@ M:
  tm_scope: source.lisp
  ace_mode: lisp

+M4:
+  type: programming
+  extensions:
+  - .m4
+  tm_scope: none
+  ace_mode: text
+
+M4Sugar:
+  type: programming
+  group: M4
+  aliases:
+  - autoconf
+  extensions:
+  - .m4
+  filenames:
+  - configure.ac
+  tm_scope: none
+  ace_mode: text
+
 MAXScript:
  type: programming
  color: "#00a6a6"
@@ -2032,14 +2202,19 @@ Makefile:
  - .mak
  - .d
  - .mk
+  - .mkfile
  filenames:
+  - BSDmakefile
  - GNUmakefile
  - Kbuild
  - Makefile
  - Makefile.am
+  - Makefile.frag
  - Makefile.in
  - Makefile.inc
  - makefile
+  - makefile.sco
+  - mkfile
  interpreters:
  - make
  ace_mode: makefile
@@ -2064,7 +2239,6 @@ Markdown:
  - .mkdown
  - .ron
  tm_scope: source.gfm
-  color: "#083FA1"

 Mask:
  type: markup
@@ -2202,6 +2376,7 @@ Monkey:
  extensions:
  - .monkey
  ace_mode: text
+  tm_scope: source.monkey

 Moocode:
  type: programming
@@ -2349,7 +2524,7 @@ Nu:
  - .nu
  filenames:
  - Nukefile
-  tm_scope: source.scheme
+  tm_scope: source.nu
  ace_mode: scheme
  interpreters:
  - nush
@@ -2380,6 +2555,7 @@ OCaml:
  interpreters:
  - ocaml
  - ocamlrun
+  - ocamlscript
  tm_scope: source.ocaml

 ObjDump:
@@ -2470,11 +2646,21 @@ OpenEdge ABL:
  tm_scope: source.abl
  ace_mode: text

+OpenRC runscript:
+  type: programming
+  group: Shell
+  aliases:
+  - openrc
+  interpreters:
+  - openrc-run
+  tm_scope: source.shell
+  ace_mode: sh
+
 OpenSCAD:
  type: programming
  extensions:
  - .scad
-  tm_scope: source.scad
+  tm_scope: none
  ace_mode: scad

 Org:
@@ -2515,8 +2701,9 @@ PAWN:
  color: "#dbb284"
  extensions:
  - .pwn
-  tm_scope: source.c++
-  ace_mode: c_cpp
+  - .inc
+  tm_scope: source.pawn
+  ace_mode: text

 PHP:
  type: programming
@@ -2545,7 +2732,7 @@ PHP:
 PLSQL:
  type: programming
  ace_mode: sql
-  tm_scope: source.plsql.oracle
+  tm_scope: none
  color: "#dad8d8"
  extensions:
  - .pls
@@ -2587,7 +2774,7 @@ Papyrus:
  color: "#6600cc"
  extensions:
  - .psc
-  tm_scope: source.papyrus
+  tm_scope: source.papyrus.skyrim
  ace_mode: text

 Parrot:
@@ -2631,7 +2818,10 @@ Pascal:
  - .dpr
  - .inc
  - .lpr
+  - .pascal
  - .pp
+  interpreters:
+  - instantfpc
  ace_mode: pascal

 Perl:
@@ -2809,6 +2999,7 @@ Puppet:
  filenames:
  - Modulefile
  ace_mode: text
+  tm_scope: source.puppet

 Pure Data:
  type: programming
@@ -2850,10 +3041,12 @@ Python:
  - .pyp
  - .pyt
  - .pyw
+  - .rpy
  - .tac
  - .wsgi
  - .xpy
  filenames:
+  - BUCK
  - BUILD
  - SConscript
  - SConstruct
@@ -2925,7 +3118,6 @@ RDoc:
  extensions:
  - .rdoc
  tm_scope: text.rdoc
-  color: "#8E84BF"

 REALbasic:
  type: programming
@@ -3023,7 +3215,6 @@ Redcode:

 Ren'Py:
  type: programming
-  group: Python
  aliases:
  - renpy
  color: "#ff7f7f"
@@ -3196,6 +3387,14 @@ SQLPL:
  - .sql
  - .db2

+SRecode Template:
+  type: markup
+  color: "#348a34"
+  tm_scope: source.lisp
+  ace_mode: lisp
+  extensions:
+  - .srt
+
 STON:
  type: data
  group: Smalltalk
@@ -3272,6 +3471,9 @@ Scheme:
  - guile
  - bigloo
  - chicken
+  - csi
+  - gosh
+  - r6rs
  ace_mode: scheme

 Scilab:
@@ -3311,6 +3513,13 @@ Shell:
  - .tmux
  - .tool
  - .zsh
+  filenames:
+  - .bash_history
+  - .bash_logout
+  - .bash_profile
+  - .bashrc
+  - PKGBUILD
+  - gradlew
  interpreters:
  - bash
  - rc
@@ -3438,6 +3647,13 @@ Stylus:
  tm_scope: source.stylus
  ace_mode: stylus

+SubRip Text:
+  type: data
+  extensions:
+  - .srt
+  ace_mode: text
+  tm_scope: text.srt
+
 SuperCollider:
  type: programming
  color: "#46390b"
@@ -3466,6 +3682,13 @@ SystemVerilog:
  - .vh
  ace_mode: verilog

+TLA:
+  type: programming
+  extensions:
+  - .tla
+  tm_scope: source.tla
+  ace_mode: text
+
 TOML:
  type: data
  extensions:
@@ -3532,6 +3755,15 @@ Tea:
  tm_scope: source.tea
  ace_mode: text

+Terra:
+  type: programming
+  extensions:
+  - .t
+  color: "#00004c"
+  ace_mode: lua
+  interpreters:
+  - lua
+
 Text:
  type: prose
  wrap: true
@@ -3540,7 +3772,21 @@ Text:
  extensions:
  - .txt
  - .fr
+  - .nb
  - .ncl
+  - .no
+  filenames:
+  - COPYING
+  - INSTALL
+  - LICENSE
+  - NEWS
+  - README.1ST
+  - README.me
+  - click.me
+  - delete.me
+  - keep.me
+  - read.me
+  - test.me
  tm_scope: none
  ace_mode: text

@@ -3561,11 +3807,11 @@ Thrift:

 Turing:
  type: programming
-  color: "#45f715"
+  color: "#cf142b"
  extensions:
  - .t
  - .tu
-  tm_scope: none
+  tm_scope: source.turing
  ace_mode: text

 Turtle:
@@ -3731,6 +3977,20 @@ Vue:
  tm_scope: text.html.vue
  ace_mode: html

+Wavefront Material:
+  type: data
+  extensions:
+  - .mtl
+  tm_scope: source.wavefront.mtl
+  ace_mode: text
+
+Wavefront Object:
+  type: data
+  extensions:
+  - .obj
+  tm_scope: source.wavefront.obj
+  ace_mode: text
+
 Web Ontology Language:
  type: markup
  color: "#9cc9dd"
@@ -3746,6 +4006,13 @@ WebIDL:
  tm_scope: source.webidl
  ace_mode: text

+World of Warcraft Addon Data:
+  type: data
+  extensions:
+  - .toc
+  tm_scope: source.toc
+  ace_mode: text
+
 X10:
  type: programming
  aliases:
@@ -3775,6 +4042,7 @@ XML:
  - .xml
  - .ant
  - .axml
+  - .builds
  - .ccxml
  - .clixml
  - .cproject
@@ -3785,6 +4053,7 @@ XML:
  - .ditamap
  - .ditaval
  - .dll.config
+  - .dotsettings
  - .filters
  - .fsproj
  - .fxml
@@ -3805,14 +4074,18 @@ XML:
  - .nuspec
  - .odd
  - .osm
+  - .pkgproj
  - .plist
  - .pluginspec
+  - .props
  - .ps1xml
  - .psc1
  - .pt
  - .rdf
+  - .resx
  - .rss
  - .scxml
+  - .sfproj
  - .srdf
  - .storyboard
  - .stTheme
@@ -3831,6 +4104,7 @@ XML:
  - .ux
  - .vbproj
  - .vcxproj
+  - .vssettings
  - .vxml
  - .wsdl
  - .wsf
@@ -3852,6 +4126,8 @@ XML:
  filenames:
  - .classpath
  - .project
+  - App.config
+  - NuGet.config
  - Settings.StyleCop
  - Web.Debug.config
  - Web.Release.config
@@ -3931,9 +4207,12 @@ YAML:
  - .yml
  - .reek
  - .rviz
+  - .sublime-syntax
  - .syntax
  - .yaml
  - .yaml-tmlanguage
+  filenames:
+  - .clang-format
  ace_mode: yaml

 YANG:
@@ -3998,6 +4277,8 @@ edn:
 fish:
  type: programming
  group: Shell
+  interpreters:
+  - fish
  extensions:
  - .fish
  tm_scope: source.fish
@@ -4015,6 +4296,7 @@ nesC:
  extensions:
  - .nc
  ace_mode: text
+  tm_scope: source.nesc

 ooc:
  type: programming
@@ -4035,7 +4317,6 @@ reStructuredText:
  - .rest.txt
  - .rst.txt
  ace_mode: text
-  color: "#B3BCBC"

 wisp:
  type: programming
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -28,6 +28,7 @@ module Linguist
      @oid = oid
      @path = path
      @mode = mode
+      @data = nil
    end

    def git_attributes
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -30,6 +30,9 @@ module Linguist
      @repository = repo
      @commit_oid = commit_oid

+      @old_commit_oid = nil
+      @old_stats = nil
+
      raise TypeError, 'commit_oid must be a commit SHA1' unless commit_oid.is_a?(String)
    end

--- a/lib/linguist/samples.rb
+++ b/lib/linguist/samples.rb
@@ -21,7 +21,7 @@ module Linguist
    def self.cache
      @cache ||= begin
        serializer = defined?(Yajl) ? Yajl : YAML
-        serializer.load(File.read(PATH))
+        serializer.load(File.read(PATH, encoding: 'utf-8'))
      end
    end

--- a/lib/linguist/shebang.rb
+++ b/lib/linguist/shebang.rb
@@ -42,10 +42,10 @@ module Linguist
      return unless script

      # "python2.6" -> "python2"
-      script.sub! /(\.\d+)$/, ''
+      script.sub!(/(\.\d+)$/, '')

      # #! perl -> perl
-      script.sub! /^#!\s*/, ''
+      script.sub!(/^#!\s*/, '')

      # Check for multiline shebang hacks that call `exec`
      if script == 'sh' &&
--- a/lib/linguist/strategy/modeline.rb
+++ b/lib/linguist/strategy/modeline.rb
@@ -15,6 +15,10 @@ module Linguist

      MODELINES = [EMACS_MODELINE, VIM_MODELINE_1, VIM_MODELINE_2]

+      # Scope of the search for modelines
+      # Number of lines to check at the beginning and at the end of the file
+      SEARCH_SCOPE = 5
+
      # Public: Detects language based on Vim and Emacs modelines
      #
      # blob               - An object that quacks like a blob.
@@ -26,7 +30,9 @@ module Linguist
      # Returns an Array with one Language if the blob has a Vim or Emacs modeline
      # that matches a Language name or alias. Returns an empty array if no match.
      def self.call(blob, _ = nil)
-        Array(Language.find_by_alias(modeline(blob.data)))
+        header = blob.lines.first(SEARCH_SCOPE).join("\n")
+        footer = blob.lines.last(SEARCH_SCOPE).join("\n")
+        Array(Language.find_by_alias(modeline(header + footer)))
      end

      # Public: Get the modeline from the first n-lines of the file
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -20,10 +20,17 @@
 - ^deps/
 - ^tools/
 - (^|/)configure$
- (^|/)configure.ac$
 - (^|/)config.guess$
 - (^|/)config.sub$

+# stuff autogenerated by autoconf - still C deps
+- (^|/)aclocal.m4
+- (^|/)libtool.m4
+- (^|/)ltoptions.m4
+- (^|/)ltsugar.m4
+- (^|/)ltversion.m4
+- (^|/)lt~obsolete.m4
+
 # Linters
 - cpplint.py

@@ -146,6 +153,12 @@
 - (^|/)tiny_mce([^.]*)\.js$
 - (^|/)tiny_mce/(langs|plugins|themes|utils)

+# Ace Editor
+- (^|/)ace-builds/
+
+# Fontello CSS files
+- (^|/)fontello(.*?)\.css$
+
 # MathJax
 - (^|/)MathJax/

@@ -183,6 +196,7 @@

 # django
 - (^|/)admin_media/
+- (^|/)env/

 # Fabric
 - ^fabfile\.py$
@@ -302,3 +316,6 @@

 # Android Google APIs
 - (^|/)\.google_apis/
+
+# Jenkins Pipeline
+- ^Jenkinsfile$
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.7.6"
+  VERSION = "4.8.8"
 end
--- a/package.json
+++ b/package.json
@@ -2,5 +2,6 @@
  "repository": "https://github.com/github/linguist",
  "dependencies": {
    "season": "~>5.0"
-  }
+  },
+  "license": "MIT"
 }
--- a/samples/APL/hashbang
+++ b/samples/APL/hashbang
@@ -0,0 +1,7 @@
+#!/usr/local/bin/apl --script
+NEWLINE ← ⎕UCS 10
+HEADERS ← 'Content-Type: text/plain', NEWLINE
+HEADERS
+⍝ ⎕←HEADERS
+⍝ ⍕⎕TS
+)OFF
--- a/samples/ATS/basis_ssntype.sats
+++ b/samples/ATS/basis_ssntype.sats
@@ -0,0 +1,318 @@
+(*
+* The MIT License (MIT)
+*
+* Copyright (c) 2014 Hongwei Xi
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.)
+*)
+
+// Source: https://github.com/githwxi/ATS-Postiats-contrib/blob/201d635062d0ea64ff5ba5457a4ea0bb4d5ae202/contrib/libats-/hwxi/teaching/mysession-g/SATS/basis_ssntype.sats
+
+(*
+** Basis for g-session types
+*)
+
+(* ****** ****** *)
+//
+staload
+"./basis_intset.sats"
+//
+(* ****** ****** *)
+//
+fun{}
+channel_cap(): intGte(1)  
+//
+(* ****** ****** *)
+//
+abstype
+session_msg
+  (i:int, j:int, a:vt@ype)
+//
+(* ****** ****** *)
+
+abstype ssession_nil
+abstype ssession_cons(a:type, ssn:type)
+
+(* ****** ****** *)
+//
+stadef msg = session_msg
+//
+stadef nil = ssession_nil
+//
+stadef :: = ssession_cons
+stadef cons = ssession_cons
+//
+(* ****** ****** *)
+//
+abstype
+session_append
+  (ssn1: type, ssn2: type)
+//
+stadef append = session_append
+//
+(* ****** ****** *)
+//
+abstype
+session_choose
+(
+  i:int, ssn1:type, ssn2:type
+) (* session_choose *)
+//
+stadef choose = session_choose
+//
+(* ****** ****** *)
+//
+abstype
+session_repeat
+(
+  i:int, ssn:type(*body*)
+) (* session_repeat *)
+//
+stadef repeat = session_repeat
+//
+(* ****** ****** *)
+//
+typedef
+session_sing
+(
+  i: int
+, j: int
+, a:vt@ype
+) = cons(msg(i, j, a), nil)
+//
+(* ****** ****** *)
+//
+absvtype
+channel1_vtype
+  (G:iset, n:int, ssn:type) = ptr
+//
+vtypedef
+channel1
+  (G:iset, n:int, ssn:type) = channel1_vtype(G, n, ssn)
+//
+vtypedef
+cchannel1
+  (G:iset, n:int, ssn:type) = channel1_vtype(ncomp(n, G), n, ssn)
+//
+(* ****** ****** *)
+//
+fun{}
+channel1_get_nrole
+  {n:int}{ssn:type}{G:iset}
+  (chan: !channel1(G, n, ssn)): int(n)
+//
+fun{}
+channel1_get_group
+  {n:int}{ssn:type}{G:iset}
+  (chan: !channel1(G, n, ssn)): intset(n,G)
+//
+(* ****** ****** *)
+//
+fun
+{a:vt0p}
+channel1_close
+  {n:int}{ssn:type}{G:iset}(chan: channel1(G, n, nil)): void
+//
+(* ****** ****** *)
+//
+fun{}
+channel1_skipin
+  {a:vt0p}
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | ismbr(G, i); ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn)
+) : void // end-of-function
+praxi
+lemma_channel1_skipin
+  {a:vt0p}
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | ismbr(G, i); ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn)
+) : void // lemma_channel1_skipin
+//
+fun{}
+channel1_skipex
+  {a:vt0p}
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | ~ismbr(G, i); ~ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn)
+) : void // end-of-function
+praxi
+lemma_channel1_skipex
+  {a:vt0p}
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | ~ismbr(G, i); ~ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn)
+) : void // lemma_channel1_skipex
+//
+(* ****** ****** *)
+//
+fun
+{a:vt0p}
+channel1_send
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | i < n; j < n; ismbr(G, i); ~ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn), int(i), int(j), a
+) : void // end of [channel1_send]
+//
+fun
+{a:vt0p}
+channel1_recv
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | i < n; j < n; ~ismbr(G, i); ismbr(G, j)}
+(
+  !channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn), int(i), int(j), &a? >> a
+) : void // end of [channel1_recv]
+//
+fun
+{a:vt0p}
+channel1_recv_val
+  {n:int}{ssn:type}{G:iset}
+  {i,j:nat | i < n; j < n; ~ismbr(G, i); ismbr(G, j)}
+  (!channel1(G, n, msg(i, j, a)::ssn) >> channel1(G, n, ssn), int(i), int(j)): (a)
+//
+(* ****** ****** *)
+
+fun{}
+channel1_append
+  {n:int}
+  {ssn1,ssn2:type}
+  {G:iset}
+(
+  chan: !channel1(G, n, append(ssn1, ssn2)) >> channel1(G, n, ssn2)
+, fserv: (!channel1(G, n, ssn1) >> channel1(G, n, nil)) -<lincloptr1> void
+) : void // end of [channel1_append]
+
+(* ****** ****** *)
+//
+datatype
+choosetag
+(
+  a:type, b:type, c:type
+) =
+  | choosetag_l(a, b, a) of ()
+  | choosetag_r(a, b, b) of ()
+//
+(* ****** ****** *)
+//
+fun{}
+channel1_choose_l
+  {n:int}
+  {ssn1,ssn2:type}
+  {G:iset}
+  {i:nat | i < n; ismbr(G, i)}
+(
+  !channel1(G, n, choose(i,ssn1,ssn2)) >> channel1(G, n, ssn1), i: int(i)
+) : void // end of [channel1_choose_l]
+//
+fun{}
+channel1_choose_r
+  {n:int}
+  {ssn1,ssn2:type}
+  {G:iset}
+  {i:nat | i < n; ismbr(G, i)}
+(
+  !channel1(G, n, choose(i,ssn1,ssn2)) >> channel1(G, n, ssn2), i: int(i)
+) : void // end of [channel1_choose_r]
+//
+fun{}
+channel1_choose_tag
+  {n:int}
+  {ssn1,ssn2:type}
+  {G:iset}
+  {i:nat | i < n; ~isnil(G); ~ismbr(G, i)}
+(
+  !channel1(G, n, choose(i,ssn1,ssn2)) >> channel1(G, n, ssn_chosen), i: int(i)
+) : #[ssn_chosen:type] choosetag(ssn1, ssn2, ssn_chosen)
+//
+(* ****** ****** *)
+//
+fun{}
+channel1_repeat_0
+  {n:int}
+  {ssn:type}
+  {G:iset}
+  {i:nat | i < n; ismbr(G, i)}
+(
+  !channel1(G, n, repeat(i,ssn)) >> channel1(G, n, nil), i: int(i)
+) : void // end of [channel1_repeat_nil]
+//
+fun{}
+channel1_repeat_1
+  {n:int}
+  {ssn:type}
+  {G:iset}
+  {i:nat | i < n; ismbr(G, i)}
+(
+  !channel1(G, n, repeat(i,ssn)) >> channel1(G, n, append(ssn,repeat(i,ssn))), i: int(i)
+) : void // end of [channel1_repeat_more]
+//
+fun{}
+channel1_repeat_tag
+  {n:int}
+  {ssn:type}
+  {G:iset}
+  {i:nat | i < n; ~isnil(G); ~ismbr(G, i)}
+(
+  !channel1(G, n, repeat(i,ssn)) >> channel1(G, n, ssn_chosen), i: int(i)
+) : #[ssn_chosen:type] choosetag(nil, append(ssn,repeat(i,ssn)), ssn_chosen)
+//
+(* ****** ****** *)
+//
+(*
+//
+// HX-2015-03-06:
+// This one does not work with sschoose!!!
+//
+fun{}
+channel1_link
+  {n:int}{ssn:type}
+  {G1,G2:iset | isnil(G1*G2)}
+  (channel1(G1, n, ssn), channel1(G2, n, ssn)): channel1(G1+G2, n, ssn)
+*)
+//
+fun{}
+channel1_link
+  {n:int}{ssn:type}
+  {G1,G2:iset | isful(G1+G2,n)}
+  (channel1(G1, n, ssn), channel1(G2, n, ssn)): channel1(G1*G2, n, ssn)
+//
+(* ****** ****** *)
+//
+fun{}
+channel1_link_elim
+  {n:int}{ssn:type}{G:iset}(channel1(G, n, ssn), cchannel1(G, n, ssn)): void
+//
+(* ****** ****** *)
+//
+fun{}
+cchannel1_create_exn
+  {n:nat}{ssn:type}{G:iset}
+(
+  nrole: int(n), G: intset(n), fserv: channel1(G, n, ssn) -<lincloptr1> void
+) : cchannel1(G, n, ssn) // end of [cchannel1_create_exn]
+//
+(* ****** ****** *)
+
+(* end of [basis_ssntype.sats] *)
--- a/samples/ATS/csv_parse.hats
+++ b/samples/ATS/csv_parse.hats
@@ -0,0 +1,179 @@
+(*
+* The MIT License (MIT)
+*
+* Copyright (c) 2014 Hongwei Xi
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.)
+*)
+
+// Source: https://github.com/githwxi/ATS-Postiats-contrib/blob/0f26aa0df8542d2ae21df9be1e13208f66f571d6/contrib/libats-/hwxi/teaching/mygrading/HATS/csv_parse.hats
+
+(* ****** ****** *)
+//
+// Author: Hongwei Xi
+// Authoremail: gmhwxiATgmailDOTcom
+// Start time: the first of July, 2016
+//
+(* ****** ****** *)
+//
+#ifdef
+MYGRADING_HATS
+#then
+#else
+//
+extern
+fun
+csv_parse_line
+(
+  line: string
+) : List0_vt(Strptr1)
+//
+#endif // #ifdef
+//
+(* ****** ****** *)
+
+local
+//
+staload
+UN = "prelude/SATS/unsafe.sats"
+//
+extern
+fun{}
+getpos(): int
+//
+extern
+fun{}
+is_end(): bool
+//
+extern
+fun{}
+char_at(): int
+//
+extern
+fun{}
+Strptr1_at(i0: int): Strptr1
+//
+extern
+fun{}
+rmove(): void
+extern
+fun{}
+rmove_while(test: char -<cloref1> bool): void
+//
+in (* in-of-local *)
+//
+implement
+{}(*tmp*)
+rmove_while
+  (test) = let
+//
+val c0 = char_at()
+//
+in
+//
+if c0 >= 0 then
+  if test(int2char0(c0)) then (rmove(); rmove_while(test)) else ()
+// end of [if]
+//
+end // end of [rmove_while]
+
+(* ****** ****** *)
+
+implement
+csv_parse_line
+  (line) = let
+//
+val line = g1ofg0(line)
+//
+var i: int = 0
+val p_i = addr@i
+//
+val n0 = sz2i(length(line))
+//
+macdef get_i() = $UN.ptr0_get<int>(p_i)
+macdef inc_i() = $UN.ptr0_addby<int>(p_i, 1)
+macdef set_i(i0) = $UN.ptr0_set<int>(p_i, ,(i0))
+//
+implement
+getpos<>() = get_i()
+//
+implement
+is_end<>() = get_i() >= n0
+//
+implement
+char_at<>() = let
+  val i = get_i()
+  val i = ckastloc_gintGte(i, 0)
+//
+in
+  if i < n0 then char2u2int0(line[i]) else ~1
+end // end of [char_at]
+//
+implement
+Strptr1_at<>(i0) = let
+//
+  val i1 = get_i()
+  val i0 = ckastloc_gintGte(i0, 0)
+  val i1 = ckastloc_gintBtwe(i1, i0, n0)
+//
+in
+  $UN.castvwtp0(
+    string_make_substring(line, i2sz(i0), i2sz(i1-i0))
+  ) (* $UN.castvwtp0 *)
+end // end of [Strptr1_at]
+//
+implement
+rmove<>() =
+  if get_i() < n0 then inc_i()
+//
+vtypedef res_vt = List0_vt(Strptr1)
+//
+fun
+loop
+(
+  i: int, res: res_vt
+) : res_vt =
+if
+is_end()
+then res
+else let
+  val () =
+  (
+    if i > 0 then rmove()
+  )
+  val i0 = getpos()
+  var f0 =
+  (
+    lam@(c: char) =<clo> c != ','
+  )
+  val () = rmove_while($UN.cast(addr@f0))
+  val s0 = Strptr1_at(i0)
+in
+  loop(i+1, list_vt_cons(s0, res))
+end // end of [else]
+//
+in
+  list_vt_reverse(loop(0(*i*), list_vt_nil((*void*))))
+end // end of [csv_parse_line]
+
+end // end of [local]
+
+(* ****** ****** *)
+
+(* end of [csv_parse.hats] *)
--- a/samples/ATS/intinf_vt.dats
+++ b/samples/ATS/intinf_vt.dats
@@ -0,0 +1,694 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                         ATS/contrib/atshwxi                         *)
+(*                                                                     *)
+(***********************************************************************)
+
+(*
+** Copyright (C) 2013 Hongwei Xi, ATS Trustful Software, Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and associated documentation files (the "Software"),
+** to deal in the Software without restriction, including without limitation
+** the rights to use, copy, modify, merge, publish, distribute, sublicense,
+** and/or sell copies of the Software, and to permit persons to whom the
+** Software is furnished to do so, subject to the following stated conditions:
+** 
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+** 
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+** THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+** IN THE SOFTWARE.
+*)
+
+// Source: https://github.com/githwxi/ATS-Postiats-contrib/blob/04a984d9c08c1831f7dda8a05ce356db01f81850/contrib/libats-/hwxi/intinf/DATS/intinf_vt.dats
+
+(* ****** ****** *)
+//
+// Author: Hongwei Xi
+// Authoremail: hwxi AT gmail DOT com
+// Start Time: April, 2013
+//
+(* ****** ****** *)
+
+#include
+"share/atspre_define.hats"
+
+(* ****** ****** *)
+
+staload
+UN = "prelude/SATS/unsafe.sats"
+
+(* ****** ****** *)
+
+staload
+GMP = "{$LIBGMP}/SATS/gmp.sats"
+
+(* ****** ****** *)
+
+vtypedef mpz = $GMP.mpz_vt0ype
+
+(* ****** ****** *)
+//
+staload "./../SATS/intinf.sats"
+staload "./../SATS/intinf_vt.sats"
+//
+(* ****** ****** *)
+
+macdef i2u (x) = g1int2uint_int_uint (,(x))
+
+(* ****** ****** *)
+
+local
+
+assume
+intinf_vtype
+  (i: int) = // HX: [i] is a fake
+  [l:addr] (mpz @ l, mfree_gc_v (l) | ptr l)
+// end of [intinf_vtype]
+
+in (* in of [local] *)
+
+implement{}
+intinf_make_int
+  (i) = (x) where
+{
+//
+val x = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init_set_int (!(x.2), i)
+//
+} (* end of [intinf_make_int] *)
+
+implement{}
+intinf_make_uint
+  (i) = (x) where
+{
+//
+val x = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init_set_uint (!(x.2), i)
+//
+} (* end of [intinf_make_uint] *)
+
+implement{}
+intinf_make_lint
+  (i) = (x) where
+{
+//
+val x = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init_set_lint (!(x.2), i)
+//
+} (* end of [intinf_make_lint] *)
+
+implement{}
+intinf_make_ulint
+  (i) = (x) where
+{
+//
+val x = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init_set_ulint (!(x.2), i)
+//
+} (* end of [intinf_make_ulint] *)
+
+(* ****** ****** *)
+
+implement{}
+intinf_free (x) = let
+  val (pfat, pfgc | p) = x
+  val () = $GMP.mpz_clear (!p) in ptr_free (pfgc, pfat | p)
+end (* end of [intinf_free] *)
+
+(* ****** ****** *)
+
+implement{}
+intinf_get_int (x) = $GMP.mpz_get_int (!(x.2))
+implement{}
+intinf_get_lint (x) = $GMP.mpz_get_lint (!(x.2))
+
+(* ****** ****** *)
+
+implement{}
+intinf_get_strptr
+  (x, base) = $GMP.mpz_get_str_null (base, !(x.2))
+// end of [intinf_get_strptr]
+
+(* ****** ****** *)
+
+implement{}
+fprint_intinf_base
+  (out, x, base) = let
+  val nsz = $GMP.mpz_out_str (out, base, !(x.2))
+in
+//
+if (nsz = 0) then
+  exit_errmsg (1, "libgmp/gmp: fprint_intinf_base")
+// end of [if]
+//
+end (* fprint_intinf_base *)
+
+(* ****** ****** *)
+
+implement{
+} neg_intinf0
+  (x) = (x) where
+{
+//
+val () = $GMP.mpz_neg (!(x.2))
+//
+} (* end of [neg_intinf0] *)
+
+implement{
+} neg_intinf1
+  (x) = (y) where
+{
+//
+val y = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(y.2))
+val () = $GMP.mpz_neg (!(y.2), !(x.2))
+//
+} (* end of [neg_intinf1] *)
+
+(* ****** ****** *)
+
+implement{
+} abs_intinf0
+  (x) = (x) where
+{
+//
+val () = $GMP.mpz_abs (!(x.2))
+//
+} (* end of [abs_intinf0] *)
+
+implement{
+} abs_intinf1
+  (x) = (y) where
+{
+//
+val y = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(y.2))
+val () = $GMP.mpz_abs (!(y.2), !(x.2))
+//
+} (* end of [abs_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+succ_intinf0 (x) = add_intinf0_int (x, 1)
+implement{}
+succ_intinf1 (x) = add_intinf1_int (x, 1)
+
+(* ****** ****** *)
+
+implement{}
+pred_intinf0 (x) = sub_intinf0_int (x, 1)
+implement{}
+pred_intinf1 (x) = sub_intinf1_int (x, 1)
+
+(* ****** ****** *)
+
+implement{}
+add_intinf0_int
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_add2_int (!(x.2), y)
+//
+} (* end of [add_intinf0_int] *)
+
+implement{}
+add_intinf1_int
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_add3_int (!(z.2), !(x.2), y)
+//
+} (* end of [add_intinf1_int] *)
+
+(* ****** ****** *)
+
+implement{}
+add_int_intinf0 (x, y) = add_intinf0_int (y, x)
+implement{}
+add_int_intinf1 (x, y) = add_intinf1_int (y, x)
+
+(* ****** ****** *)
+
+implement{}
+add_intinf0_intinf1
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_add2_mpz (!(x.2), !(y.2))
+//
+} (* end of [add_intinf0_intinf1] *)
+
+implement{}
+add_intinf1_intinf0
+  (x, y) = (y) where
+{
+//
+val () = $GMP.mpz_add2_mpz (!(y.2), !(x.2))
+//
+} (* end of [add_intinf1_intinf0] *)
+
+(* ****** ****** *)
+
+implement{}
+add_intinf1_intinf1
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_add3_mpz (!(z.2), !(x.2), !(y.2))
+//
+} (* end of [add_intinf1_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+sub_intinf0_int
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_sub2_int (!(x.2), y)
+//
+} (* end of [sub_intinf0_int] *)
+
+implement{}
+sub_intinf1_int
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_sub3_int (!(z.2), !(x.2), y)
+//
+} (* end of [sub_intinf1_int] *)
+
+(* ****** ****** *)
+
+implement{}
+sub_int_intinf0 (x, y) = let
+  val z = sub_intinf0_int (y, x) in neg_intinf0 (z)
+end (* end of [sub_int_intinf0] *)
+
+implement{}
+sub_int_intinf1 (x, y) = let
+  val z = sub_intinf1_int (y, x) in neg_intinf0 (z)
+end (* end of [sub_int_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+sub_intinf0_intinf1
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_sub2_mpz (!(x.2), !(y.2))
+//
+} (* end of [sub_intinf0_intinf1] *)
+
+implement{}
+sub_intinf1_intinf0
+  (x, y) = neg_intinf0 (sub_intinf0_intinf1 (y, x))
+// end of [sub_intinf1_intinf0]
+
+implement{}
+sub_intinf1_intinf1
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_sub3_mpz (!(z.2), !(x.2), !(y.2))
+//
+} (* end of [sub_intinf1_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+mul_intinf0_int
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_mul2_int (!(x.2), y)
+//
+} (* end of [mul_intinf0_int] *)
+
+implement{}
+mul_intinf1_int
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_mul3_int (!(z.2), !(x.2), y)
+//
+} (* end of [mul_intinf1_int] *)
+
+(* ****** ****** *)
+
+implement{}
+mul_int_intinf0 (x, y) = mul_intinf0_int (y, x)
+implement{}
+mul_int_intinf1 (x, y) = mul_intinf1_int (y, x)
+
+(* ****** ****** *)
+
+implement{}
+mul_intinf0_intinf1
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_mul2_mpz (!(x.2), !(y.2))
+//
+} (* end of [mul_intinf0_intinf1] *)
+
+implement{}
+mul_intinf1_intinf0
+  (x, y) = (y) where
+{
+//
+val () = $GMP.mpz_mul2_mpz (!(y.2), !(x.2))
+//
+} (* end of [mul_intinf0_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+mul_intinf1_intinf1
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_mul3_mpz (!(z.2), !(x.2), !(y.2))
+//
+} (* end of [mul_intinf1_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+div_intinf0_int
+  {i,j} (x, y) = let
+in
+//
+if y >= 0 then let
+  val () = $GMP.mpz_tdiv2_q_uint (!(x.2), i2u(y)) in x
+end else let
+  val () = $GMP.mpz_tdiv2_q_uint (!(x.2), i2u(~y)) in neg_intinf0 (x)
+end // end of [if]
+//
+end (* end of [div_intinf0_int] *)
+
+implement{}
+div_intinf1_int
+  {i,j} (x, y) = let
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+//
+in
+//
+if y >= 0 then let
+  val () = $GMP.mpz_tdiv3_q_uint (!(z.2), !(x.2), i2u(y)) in z
+end else let
+  val () = $GMP.mpz_tdiv3_q_uint (!(z.2), !(x.2), i2u(~y)) in neg_intinf0 (z)
+end // end of [if]
+//
+end (* end of [div_intinf1_int] *)
+
+(* ****** ****** *)
+
+implement{}
+div_intinf0_intinf1
+  (x, y) = (x) where
+{
+//
+val () = $GMP.mpz_tdiv2_q_mpz (!(x.2), !(y.2))
+//
+} (* end of [div_intinf0_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+div_intinf1_intinf1
+  (x, y) = (z) where
+{
+//
+val z = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(z.2))
+val () = $GMP.mpz_tdiv3_q_mpz (!(z.2), !(x.2), !(y.2))
+//
+} (* end of [div_intinf1_intinf1] *)
+
+(* ****** ****** *)
+
+implement{}
+ndiv_intinf0_int (x, y) = div_intinf0_int (x, y)
+implement{}
+ndiv_intinf1_int (x, y) = div_intinf1_int (x, y)
+
+(* ****** ****** *)
+
+implement{}
+nmod_intinf0_int
+  {i,j} (x, y) = let
+//
+val r =
+  $GMP.mpz_fdiv_uint (!(x.2), i2u(y))
+val () = intinf_free (x)
+//
+in
+  $UN.cast{intBtw(0,j)}(r)
+end (* end of [nmod_intinf0_int] *)
+
+implement{}
+nmod_intinf1_int
+  {i,j} (x, y) = let
+//
+val r = $GMP.mpz_fdiv_uint (!(x.2), i2u(y))
+//
+in
+  $UN.cast{intBtw(0,j)}(r)
+end (* end of [nmod_intinf1_int] *)
+
+(* ****** ****** *)
+//
+// comparison-functions
+//
+(* ****** ****** *)
+
+implement{}
+lt_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn < 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i < j)}(sgn)
+end // end of [lt_intinf_int]
+
+implement{}
+lt_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn < 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i < j)}(sgn)
+end // end of [lt_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+lte_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn <= 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i <= j)}(sgn)
+end // end of [lte_intinf_int]
+
+implement{}
+lte_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn <= 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i <= j)}(sgn)
+end // end of [lte_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+gt_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn > 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i > j)}(sgn)
+end // end of [gt_intinf_int]
+
+implement{}
+gt_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn > 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i > j)}(sgn)
+end // end of [gt_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+gte_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn >= 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i >= j)}(sgn)
+end // end of [gte_intinf_int]
+
+implement{}
+gte_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn >= 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i >= j)}(sgn)
+end // end of [gte_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+eq_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn = 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i == j)}(sgn)
+end // end of [eq_intinf_int]
+
+implement{}
+eq_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn = 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i == j)}(sgn)
+end // end of [eq_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+neq_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val ans = (if sgn != 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i != j)}(sgn)
+end // end of [neq_intinf_int]
+
+implement{}
+neq_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val ans = (if sgn != 0 then true else false): bool
+//
+in
+  $UN.cast{bool(i != j)}(sgn)
+end // end of [neq_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+compare_intinf_int
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(x.2), y)
+val sgn = (if sgn < 0 then ~1 else (if sgn > 0 then 1 else 0)): int
+//
+in
+  $UN.cast{int(sgn(i-j))}(sgn)
+end // end of [compare_intinf_int]
+
+implement{}
+compare_int_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_int (!(y.2), x)
+val sgn = (if sgn > 0 then ~1 else (if sgn < 0 then 1 else 0)): int
+//
+in
+  $UN.cast{int(sgn(i-j))}(sgn)
+end // end of [compare_int_intinf]
+
+implement{}
+compare_intinf_intinf
+  {i,j} (x, y) = let
+//
+val sgn = $GMP.mpz_cmp_mpz (!(x.2), !(y.2))
+val sgn = (if sgn < 0 then ~1 else (if sgn > 0 then 1 else 0)): int
+//
+in
+  $UN.cast{int(sgn(i-j))}(sgn)
+end // end of [compare_intinf_intinf]
+
+(* ****** ****** *)
+
+implement{}
+pow_intinf_int
+  (base, exp) = r where
+{
+//
+val r = ptr_alloc<mpz> ()
+val () = $GMP.mpz_init (!(r.2))
+val () = $GMP.mpz_pow_uint (!(r.2), !(base.2), i2u(exp))
+//
+} (* end of [pow_intinf_int] *)
+
+(* ****** ****** *)
+
+end // end of [local]
+
+(* ****** ****** *)
+
+implement{}
+print_intinf (x) = fprint_intinf (stdout_ref, x)
+implement{}
+prerr_intinf (x) = fprint_intinf (stderr_ref, x)
+implement{}
+fprint_intinf (out, x) = fprint_intinf_base (out, x, 10(*base*))
+
+(* ****** ****** *)
+
+(* end of [intinf_vt.dats] *)
--- a/samples/ATS/linset.hats
+++ b/samples/ATS/linset.hats
@@ -1,187 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                         Applied Type System                         *)
-(*                                                                     *)
-(***********************************************************************)
-
-(*
-** ATS/Postiats - Unleashing the Potential of Types!
-** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
-** All rights reserved
-**
-** ATS is free software;  you can  redistribute it and/or modify it under
-** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
-** Free Software Foundation; either version 3, or (at  your  option)  any
-** later version.
-** 
-** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
-** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
-** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
-** for more details.
-** 
-** You  should  have  received  a  copy of the GNU General Public License
-** along  with  ATS;  see the  file COPYING.  If not, please write to the
-** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
-** 02110-1301, USA.
-*)
-
-(* ****** ****** *)
-
-(* Author: Hongwei Xi *)
-(* Authoremail: hwxi AT cs DOT bu DOT edu *)
-(* Start time: December, 2012 *)
-
-(* ****** ****** *)
-//
-// HX: shared by linset_listord (* ordered list *)
-// HX: shared by linset_avltree (* AVL-tree-based *)
-//
-(* ****** ****** *)
-//
-// HX-2013-02:
-// for sets of nonlinear elements
-//
-absvtype set_vtype (a:t@ype+) = ptr
-//
-(* ****** ****** *)
-
-vtypedef set (a:t0p) = set_vtype (a)
-
-(* ****** ****** *)
-
-fun{a:t0p}
-compare_elt_elt (x1: a, x2: a):<> int
-
-(* ****** ****** *)
-
-fun{} linset_nil{a:t0p} ():<> set(a)
-fun{} linset_make_nil{a:t0p} ():<> set(a)
-
-(* ****** ****** *)
-
-fun{a:t0p} linset_sing (x: a):<!wrt> set(a)
-fun{a:t0p} linset_make_sing (x: a):<!wrt> set(a)
-
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_make_list (xs: List(INV(a))):<!wrt> set(a)
-
-(* ****** ****** *)
-
-fun{}
-linset_is_nil {a:t0p} (xs: !set(INV(a))):<> bool
-fun{}
-linset_isnot_nil {a:t0p} (xs: !set(INV(a))):<> bool
-
-(* ****** ****** *)
-
-fun{a:t0p} linset_size (!set(INV(a))): size_t
-
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_is_member (xs: !set(INV(a)), x0: a):<> bool
-fun{a:t0p}
-linset_isnot_member (xs: !set(INV(a)), x0: a):<> bool
-
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_copy (!set(INV(a))):<!wrt> set(a)
-fun{a:t0p}
-linset_free (xs: set(INV(a))):<!wrt> void
-
-(* ****** ****** *)
-//
-fun{a:t0p}
-linset_insert
-  (xs: &set(INV(a)) >> _, x0: a):<!wrt> bool
-//
-(* ****** ****** *)
-//
-fun{a:t0p}
-linset_takeout
-(
-  &set(INV(a)) >> _, a, res: &(a?) >> opt(a, b)
-) :<!wrt> #[b:bool] bool(b) // endfun
-fun{a:t0p}
-linset_takeout_opt (&set(INV(a)) >> _, a):<!wrt> Option_vt(a)
-//
-(* ****** ****** *)
-//
-fun{a:t0p}
-linset_remove
-  (xs: &set(INV(a)) >> _, x0: a):<!wrt> bool
-//
-(* ****** ****** *)
-//
-// HX: choosing an element in an unspecified manner
-//
-fun{a:t0p}
-linset_choose
-(
-  xs: !set(INV(a)), x: &a? >> opt (a, b)
-) :<!wrt> #[b:bool] bool(b)
-//
-fun{a:t0p}
-linset_choose_opt (xs: !set(INV(a))):<!wrt> Option_vt(a)
-//
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_takeoutmax
-(
-  xs: &set(INV(a)) >> _, res: &a? >> opt(a, b)
-) :<!wrt> #[b:bool] bool (b)
-fun{a:t0p}
-linset_takeoutmax_opt (xs: &set(INV(a)) >> _):<!wrt> Option_vt(a)
-
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_takeoutmin
-(
-  xs: &set(INV(a)) >> _, res: &a? >> opt(a, b)
-) :<!wrt> #[b:bool] bool (b)
-fun{a:t0p}
-linset_takeoutmin_opt (xs: &set(INV(a)) >> _):<!wrt> Option_vt(a)
-
-(* ****** ****** *)
-//
-fun{}
-fprint_linset$sep (FILEref): void // ", "
-//
-fun{a:t0p}
-fprint_linset (out: FILEref, xs: !set(INV(a))): void
-//
-overload fprint with fprint_linset
-//
-(* ****** ****** *)
-//
-fun{
-a:t0p}{env:vt0p
-} linset_foreach$fwork
-  (x: a, env: &(env) >> _): void
-//
-fun{a:t0p}
-linset_foreach (set: !set(INV(a))): void
-fun{
-a:t0p}{env:vt0p
-} linset_foreach_env
-  (set: !set(INV(a)), env: &(env) >> _): void
-// end of [linset_foreach_env]
-//
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_listize (xs: set(INV(a))): List0_vt (a)
-
-(* ****** ****** *)
-
-fun{a:t0p}
-linset_listize1 (xs: !set(INV(a))): List0_vt (a)
-
-(* ****** ****** *)
-
-(* end of [linset.hats] *)
--- a/samples/ATS/linset_listord.dats
+++ b/samples/ATS/linset_listord.dats
@@ -1,504 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                         Applied Type System                         *)
-(*                                                                     *)
-(***********************************************************************)
-
-(*
-** ATS/Postiats - Unleashing the Potential of Types!
-** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
-** All rights reserved
-**
-** ATS is free software;  you can  redistribute it and/or modify it under
-** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
-** Free Software Foundation; either version 3, or (at  your  option)  any
-** later version.
-** 
-** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
-** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
-** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
-** for more details.
-** 
-** You  should  have  received  a  copy of the GNU General Public License
-** along  with  ATS;  see the  file COPYING.  If not, please write to the
-** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
-** 02110-1301, USA.
-*)
-
-(* ****** ****** *)
-
-(* Author: Hongwei Xi *)
-(* Authoremail: hwxi AT cs DOT bu DOT edu *)
-(* Start time: February, 2013 *)
-
-(* ****** ****** *)
-//
-// HX-2013-08:
-// a set is represented as a sorted list in descending order;
-// note that descending order is chosen to faciliate set comparison
-//
-(* ****** ****** *)
-
-staload
-UN = "prelude/SATS/unsafe.sats"
-
-(* ****** ****** *)
-
-staload "libats/SATS/linset_listord.sats"
-
-(* ****** ****** *)
-
-#include "./SHARE/linset.hats" // code reuse
-#include "./SHARE/linset_node.hats" // code reuse
-
-(* ****** ****** *)
-
-assume
-set_vtype (elt:t@ype) = List0_vt (elt)
-
-(* ****** ****** *)
-
-implement{}
-linset_nil () = list_vt_nil ()
-implement{}
-linset_make_nil () = list_vt_nil ()
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-linset_sing
-  (x) = list_vt_cons{a}(x, list_vt_nil)
-// end of [linset_sing]
-implement{a}
-linset_make_sing
-  (x) = list_vt_cons{a}(x, list_vt_nil)
-// end of [linset_make_sing]
-
-(* ****** ****** *)
-
-implement{}
-linset_is_nil (xs) = list_vt_is_nil (xs)
-implement{}
-linset_isnot_nil (xs) = list_vt_is_cons (xs)
-
-(* ****** ****** *)
-
-implement{a}
-linset_size (xs) =
-  let val n = list_vt_length(xs) in i2sz(n) end
-// end of [linset_size]
-
-(* ****** ****** *)
-
-implement{a}
-linset_is_member
-  (xs, x0) = let
-//
-fun aux
-  {n:nat} .<n>.
-(
-  xs: !list_vt (a, n)
-) :<> bool = let
-in
-//
-case+ xs of
-| list_vt_cons (x, xs) => let
-    val sgn = compare_elt_elt<a> (x0, x) in
-    if sgn > 0 then false else (if sgn < 0 then aux (xs) else true)
-  end // end of [list_vt_cons]
-| list_vt_nil ((*void*)) => false
-//
-end // end of [aux]
-//
-in
-  aux (xs)
-end // end of [linset_is_member]
-
-(* ****** ****** *)
-
-implement{a}
-linset_copy (xs) = list_vt_copy<a> (xs)
-implement{a}
-linset_free (xs) = list_vt_free<a> (xs)
-
-(* ****** ****** *)
-
-implement{a}
-linset_insert
-  (xs, x0) = let
-//
-fun
-mynode_cons
-  {n:nat} .<>.
-(
-  nx: mynode1 (a), xs: list_vt (a, n)
-) : list_vt (a, n+1) = let
-//
-val xs1 =
-$UN.castvwtp0{List1_vt(a)}(nx)
-val+@list_vt_cons (_, xs2) = xs1
-prval () = $UN.cast2void (xs2); val () = (xs2 := xs)
-//
-in
-  fold@ (xs1); xs1
-end // end of [mynode_cons]
-//
-fun ins
-  {n:nat} .<n>. // tail-recursive
-(
-  xs: &list_vt (a, n) >> list_vt (a, n1)
-) : #[n1:nat | n <= n1; n1 <= n+1] bool =
-(
-case+ xs of
-| @list_vt_cons
-    (x, xs1) => let
-    val sgn =
-      compare_elt_elt<a> (x0, x)
-    // end of [val]
-  in
-    if sgn > 0 then let
-      prval () = fold@ (xs)
-      val nx = mynode_make_elt<a> (x0)
-      val ((*void*)) = xs := mynode_cons (nx, xs)
-    in
-      false
-    end else if sgn < 0 then let
-      val ans = ins (xs1)
-      prval () = fold@ (xs)
-    in
-      ans
-    end else let // [x0] is found
-      prval () = fold@ (xs)
-    in
-      true (* [x0] in [xs] *)
-    end (* end of [if] *)
-  end // end of [list_vt_cons]
-| list_vt_nil () => let
-    val nx = mynode_make_elt<a> (x0)
-    val ((*void*)) = xs := mynode_cons (nx, xs)
-  in
-    false
-  end // end of [list_vt_nil]
-) (* end of [ins] *)
-//
-in
-  $effmask_all (ins (xs))
-end // end of [linset_insert]
-
-(* ****** ****** *)
-
-(*
-//
-HX-2013-08:
-[linset_remove] moved up
-//
-implement{a}
-linset_remove
-  (xs, x0) = let
-//
-fun rem
-  {n:nat} .<n>. // tail-recursive
-(
-  xs: &list_vt (a, n) >> list_vt (a, n1)
-) : #[n1:nat | n1 <= n; n <= n1+1] bool =
-(
-case+ xs of
-| @list_vt_cons
-    (x, xs1) => let
-    val sgn =
-      compare_elt_elt<a> (x0, x)
-    // end of [val]
-  in
-    if sgn > 0 then let
-      prval () = fold@ (xs)
-    in
-      false
-    end else if sgn < 0 then let
-      val ans = rem (xs1)
-      prval () = fold@ (xs)
-    in
-      ans
-    end else let // x0 = x
-      val xs1_ = xs1
-      val ((*void*)) = free@{a}{0}(xs)
-      val () = xs := xs1_
-    in
-      true // [x0] in [xs]
-    end (* end of [if] *)
-  end // end of [list_vt_cons]
-| list_vt_nil () => false
-) (* end of [rem] *)
-//
-in
-  $effmask_all (rem (xs))
-end // end of [linset_remove]
-*)
-
-(* ****** ****** *)
-(*
-** By Brandon Barker
-*)
-implement
-{a}(*tmp*)
-linset_choose
-  (xs, x0) = let
-in
-//
-case+ xs of
-| list_vt_cons
-    (x, xs1) => let
-    val () = x0 := x
-    prval () = opt_some{a}(x0)
-  in
-    true
-  end // end of [list_vt_cons]
-| list_vt_nil () => let
-    prval () = opt_none{a}(x0)
-  in
-    false
-  end // end of [list_vt_nil]
-//
-end // end of [linset_choose]
-
-(* ****** ****** *)
-
-implement
-{a}{env}
-linset_foreach_env (xs, env) = let
-//
-implement
-list_vt_foreach$fwork<a><env>
-  (x, env) = linset_foreach$fwork<a><env> (x, env)
-//
-in
-  list_vt_foreach_env<a><env> (xs, env)
-end // end of [linset_foreach_env]
-
-(* ****** ****** *)
-
-implement{a}
-linset_listize (xs) = xs
-
-(* ****** ****** *)
-
-implement{a}
-linset_listize1 (xs) = list_vt_copy (xs)
-
-(* ****** ****** *)
-//
-// HX: functions for processing mynodes
-//
-(* ****** ****** *)
-
-implement{
-} mynode_null{a} () =
-  $UN.castvwtp0{mynode(a,null)}(the_null_ptr)
-// end of [mynode_null]
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-mynode_make_elt
-  (x) = let
-//
-val nx = list_vt_cons{a}{0}(x, _ )
-//
-in
-  $UN.castvwtp0{mynode1(a)}(nx)
-end // end of [mynode_make_elt]
-
-(* ****** ****** *)
-
-implement{
-} mynode_free
-  {a}(nx) = () where {
-val nx =
-  $UN.castvwtp0{List1_vt(a)}(nx)
-//
-val+~list_vt_cons (_, nx2) = nx
-//
-prval ((*void*)) = $UN.cast2void (nx2)
-//
-} (* end of [mynode_free] *)
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-mynode_get_elt
-  (nx) = (x) where {
-//
-val nx1 =
-  $UN.castvwtp1{List1_vt(a)}(nx)
-//
-val+list_vt_cons (x, _) = nx1
-//
-prval ((*void*)) = $UN.cast2void (nx1)
-//
-} (* end of [mynode_get_elt] *)
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-mynode_set_elt
-  {l} (nx, x0) =
-{
-//
-val nx1 =
-  $UN.castvwtp1{List1_vt(a)}(nx)
-//
-val+@list_vt_cons (x, _) = nx1
-//
-val () = x := x0
-//
-prval () = fold@ (nx1)
-prval () = $UN.cast2void (nx1)
-//
-prval () = __assert (nx) where
-{
-  extern praxi __assert (nx: !mynode(a?, l) >> mynode (a, l)): void
-} (* end of [prval] *)
-//
-} (* end of [mynode_set_elt] *)
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-mynode_getfree_elt
-  (nx) = (x) where {
-//
-val nx =
-  $UN.castvwtp0{List1_vt(a)}(nx)
-//
-val+~list_vt_cons (x, nx2) = nx
-//
-prval ((*void*)) = $UN.cast2void (nx2)
-//
-} (* end of [mynode_getfree_elt] *)
-
-(* ****** ****** *)
-
-(*
-fun{a:t0p}
-linset_takeout_ngc
-  (set: &set(INV(a)) >> _, x0: a):<!wrt> mynode0 (a)
-// end of [linset_takeout_ngc]
-*)
-implement
-{a}(*tmp*)
-linset_takeout_ngc
-  (set, x0) = let
-//
-fun takeout
-(
-  xs: &List0_vt (a) >> _
-) : mynode0(a) = let
-in
-//
-case+ xs of
-| @list_vt_cons
-    (x, xs1) => let
-    prval pf_x = view@x
-    prval pf_xs1 = view@xs1
-    val sgn =
-      compare_elt_elt<a> (x0, x)
-    // end of [val]
-  in
-    if sgn > 0 then let
-      prval () = fold@ (xs)
-    in
-      mynode_null{a}((*void*))
-    end else if sgn < 0 then let
-      val res = takeout (xs1)
-      prval ((*void*)) = fold@ (xs)
-    in
-      res
-    end else let // x0 = x
-      val xs1_ = xs1
-      val res = $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs))
-      val () = xs := xs1_
-    in
-      res // [x0] in [xs]
-    end (* end of [if] *)
-  end // end of [list_vt_cons]
-| list_vt_nil () => mynode_null{a}((*void*))
-//
-end (* end of [takeout] *)
-//
-in
-  $effmask_all (takeout (set))
-end // end of [linset_takeout_ngc]
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-linset_takeoutmax_ngc
-  (xs) = let
-in
-//
-case+ xs of
-| @list_vt_cons
-    (x, xs1) => let
-    prval pf_x = view@x
-    prval pf_xs1 = view@xs1
-    val xs_ = xs
-    val () = xs := xs1
-  in
-    $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs_))
-  end // end of [list_vt_cons]
-| @list_vt_nil () => let
-    prval () = fold@ (xs)
-  in
-    mynode_null{a}((*void*))
-  end // end of [list_vt_nil]
-//
-end // end of [linset_takeoutmax_ngc]
-
-(* ****** ****** *)
-
-implement
-{a}(*tmp*)
-linset_takeoutmin_ngc
-  (xs) = let
-//
-fun unsnoc
-  {n:pos} .<n>.
-(
-  xs: &list_vt (a, n) >> list_vt (a, n-1)
-) :<!wrt> mynode1 (a) = let
-//
-val+@list_vt_cons (x, xs1) = xs
-//
-prval pf_x = view@x and pf_xs1 = view@xs1
-//
-in
-//
-case+ xs1 of
-| list_vt_cons _ =>
-    let val res = unsnoc(xs1) in fold@xs; res end
-  // end of [list_vt_cons]
-| list_vt_nil () => let
-    val xs_ = xs
-    val () = xs := list_vt_nil{a}()
-  in
-    $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs_))
-  end // end of [list_vt_nil]
-//
-end // end of [unsnoc]
-//
-in
-//
-case+ xs of
-| list_vt_cons _ => unsnoc (xs)
-| list_vt_nil () => mynode_null{a}((*void*))
-//
-end // end of [linset_takeoutmin_ngc]
-
-(* ****** ****** *)
-
-(* end of [linset_listord.dats] *)
--- a/samples/ATS/linset_listord.sats
+++ b/samples/ATS/linset_listord.sats
@@ -1,51 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                         Applied Type System                         *)
-(*                                                                     *)
-(***********************************************************************)
-
-(*
-** ATS/Postiats - Unleashing the Potential of Types!
-** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
-** All rights reserved
-**
-** ATS is free software;  you can  redistribute it and/or modify it under
-** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
-** Free Software Foundation; either version 3, or (at  your  option)  any
-** later version.
-** 
-** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
-** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
-** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
-** for more details.
-** 
-** You  should  have  received  a  copy of the GNU General Public License
-** along  with  ATS;  see the  file COPYING.  If not, please write to the
-** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
-** 02110-1301, USA.
-*)
-
-(* ****** ****** *)
-//
-// Author: Hongwei Xi
-// Authoremail: hwxiATcsDOTbuDOTedu
-// Time: October, 2010
-//
-(* ****** ****** *)
-
-#define ATS_PACKNAME "ATSLIB.libats.linset_listord"
-#define ATS_STALOADFLAG 0 // no static loading at run-time
-
-(* ****** ****** *)
-
-#include "./SHARE/linset.hats"
-#include "./SHARE/linset_node.hats"
-
-(* ****** ****** *)
-
-castfn
-linset2list {a:t0p} (xs: set (INV(a))):<> List0_vt (a)
-
-(* ****** ****** *)
-
-(* end of [linset_listord.sats] *)
--- a/Abuild/filenames/APKBUILD
+++ b/Abuild/filenames/APKBUILD
@@ -0,0 +1,70 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=abuild
+pkgver=2.27.0
+_ver=${pkgver%_git*}
+pkgrel=0
+pkgdesc="Script to build Alpine Packages"
+url="http://git.alpinelinux.org/cgit/abuild/"
+arch="all"
+license="GPL2"
+depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
+	attr tar pkgconf patch"
+if [ "$CBUILD" = "$CHOST" ]; then
+	depends="$depends curl"
+fi
+makedepends_build="pkgconfig"
+makedepends_host="openssl-dev"
+makedepends="$makedepends_host $makedepends_build"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems"
+options="suid"
+pkggroups="abuild"
+source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
+	"
+
+_builddir="$srcdir/$pkgname-$_ver"
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR="$pkgdir" || return 1
+	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf || return 1
+	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles || return 1
+}
+
+cpan() {
+	pkgdesc="Script to generate perl APKBUILD from CPAN"
+	depends="perl perl-libwww perl-json"
+	arch="noarch"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
+}
+
+gems() {
+	pkgdesc="APKBUILD dependency resolver for RubyGems"
+	depends="ruby ruby-augeas"
+	arch="noarch"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
+}
+
+md5sums="c67e4c971c54b4d550e16db3ba331f96  abuild-2.27.0.tar.xz"
+sha256sums="c8db017e3dd168edb20ceeb91971535cf66b8c95f29d3288f88ac755bffc60e5  abuild-2.27.0.tar.xz"
+sha512sums="98e1da4e47f3ab68700b3bc992c83e103f770f3196e433788ee74145f57cd33e5239c87f0a7a15f7266840d5bad893fc8c0d4c826d663df53deaee2678c56984  abuild-2.27.0.tar.xz"
--- a/Computer/BURN_BABY_BURN--MASTER_IGNITION_ROUTINE.agc
+++ b/Computer/BURN_BABY_BURN--MASTER_IGNITION_ROUTINE.agc
--- a/samples/Arduino/octave_changer.ino
+++ b/samples/Arduino/octave_changer.ino
@@ -0,0 +1,55 @@
+const int buttons[4] = {2,3,4,5};
+const int octaves[2] = {6,7};
+
+void setup() {                
+  // initialize the digital pin as an output.
+  // Pin 13 has an LED connected on most Arduino boards:
+
+  pinMode(13,OUTPUT);
+
+ for(int i =0;i<sizeof(buttons)/sizeof(int);i++){
+   pinMode(buttons[i],INPUT );
+ }
+ 
+ for(int i =0;i<sizeof(octaves)/sizeof(int);i++){
+   pinMode(octaves[i],INPUT );
+ }
+ 
+  Serial.begin(9600);
+}
+
+
+void loop() {
+  delay(1);              // wait
+  int output = -1;
+  
+ // Serial.print(digitalRead(buttons[0]));
+  
+ for(int i =0;i<sizeof(buttons)/sizeof(int);i++){
+   if(digitalRead(buttons[i])==LOW
+   ){
+     if(output<=0){
+       output=1;
+     }
+     output+=i+1;
+   }
+ }
+ 
+ for(int i =0;i<sizeof(octaves)/sizeof(int);i++){
+    if(output<=0){
+       break;
+     }
+   if(digitalRead(octaves[i])==LOW
+   ){
+     output*=7*(i==1 ? -1 : 1);
+   }
+ }
+  if(output>=0){
+  Serial.print(output);
+  Serial.println(";");
+  digitalWrite(13,HIGH);
+  }else{
+  digitalWrite(13,LOW);
+  }
+  
+}
--- a/samples/Blade/hello.blade
+++ b/samples/Blade/hello.blade
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>@yield('title', 'We love GitHub')</title>
+    @stack('scripts')
+    @stack('styles')
+</head>
+<body>
+    @include('partials.nav')
+
+    @yield('content')
+
+    <ul>
+        @foreach($foo as $bar)
+        <li>{{ $bar }}</li>
+        @endforeach
+    </ul>
+
+    {!! $raw_content !!}
+</body>
+</html>
--- a/samples/Blade/hello.blade.php
+++ b/samples/Blade/hello.blade.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>@yield('title', 'We love GitHub')</title>
+    @stack('scripts')
+    @stack('styles')
+</head>
+<body>
+    @include('partials.nav')
+
+    @yield('content')
+
+    <ul>
+        @foreach($foo as $bar)
+        <li>{{ $bar }}</li>
+        @endforeach
+    </ul>
+
+    {!! $raw_content !!}
+</body>
+</html>
--- a/samples/C++/PackageInfoParser.cpp
+++ b/samples/C++/PackageInfoParser.cpp
--- a/samples/C++/bcm2835.h
+++ b/samples/C++/bcm2835.h
--- a/samples/C++/crypter.cpp
+++ b/samples/C++/crypter.cpp
@@ -0,0 +1,123 @@
+// Copyright (c) 2009-2012 The Bitcoin Developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+// Source - https://github.com/Bradfrogger/Marvelous/blob/master/src/crypter.cpp
+
+#include <openssl/aes.h>
+#include <openssl/evp.h>
+#include <vector>
+#include <string>
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#include "crypter.h"
+
+bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::vector<unsigned char>& chSalt, const unsigned int nRounds, const unsigned int nDerivationMethod)
+{
+    if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE)
+        return false;
+
+    int i = 0;
+    if (nDerivationMethod == 0)
+        i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0],
+                          (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV);
+
+    if (i != (int)WALLET_CRYPTO_KEY_SIZE)
+    {
+        OPENSSL_cleanse(chKey, sizeof(chKey));
+        OPENSSL_cleanse(chIV, sizeof(chIV));
+        return false;
+    }
+
+    fKeySet = true;
+    return true;
+}
+
+bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector<unsigned char>& chNewIV)
+{
+    if (chNewKey.size() != WALLET_CRYPTO_KEY_SIZE || chNewIV.size() != WALLET_CRYPTO_KEY_SIZE)
+        return false;
+
+    memcpy(&chKey[0], &chNewKey[0], sizeof chKey);
+    memcpy(&chIV[0], &chNewIV[0], sizeof chIV);
+
+    fKeySet = true;
+    return true;
+}
+
+bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char> &vchCiphertext)
+{
+    if (!fKeySet)
+        return false;
+
+    // max ciphertext len for a n bytes of plaintext is
+    // n + AES_BLOCK_SIZE - 1 bytes
+    int nLen = vchPlaintext.size();
+    int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;
+    vchCiphertext = std::vector<unsigned char> (nCLen);
+
+    EVP_CIPHER_CTX ctx;
+
+    bool fOk = true;
+
+    EVP_CIPHER_CTX_init(&ctx);
+    if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);
+    if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen);
+    if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0])+nCLen, &nFLen);
+    EVP_CIPHER_CTX_cleanup(&ctx);
+
+    if (!fOk) return false;
+
+    vchCiphertext.resize(nCLen + nFLen);
+    return true;
+}
+
+bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial& vchPlaintext)
+{
+    if (!fKeySet)
+        return false;
+
+    // plaintext will always be equal to or lesser than length of ciphertext
+    int nLen = vchCiphertext.size();
+    int nPLen = nLen, nFLen = 0;
+
+    vchPlaintext = CKeyingMaterial(nPLen);
+
+    EVP_CIPHER_CTX ctx;
+
+    bool fOk = true;
+
+    EVP_CIPHER_CTX_init(&ctx);
+    if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);
+    if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen);
+    if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0])+nPLen, &nFLen);
+    EVP_CIPHER_CTX_cleanup(&ctx);
+
+    if (!fOk) return false;
+
+    vchPlaintext.resize(nPLen + nFLen);
+    return true;
+}
+
+
+bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext)
+{
+    CCrypter cKeyCrypter;
+    std::vector<unsigned char> chIV(WALLET_CRYPTO_KEY_SIZE);
+    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_KEY_SIZE);
+    if(!cKeyCrypter.SetKey(vMasterKey, chIV))
+        return false;
+    return cKeyCrypter.Encrypt(*((const CKeyingMaterial*)&vchPlaintext), vchCiphertext);
+}
+
+bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext)
+{
+    CCrypter cKeyCrypter;
+    std::vector<unsigned char> chIV(WALLET_CRYPTO_KEY_SIZE);
+    memcpy(&chIV[0], &nIV, WALLET_CRYPTO_KEY_SIZE);
+    if(!cKeyCrypter.SetKey(vMasterKey, chIV))
+        return false;
+    return cKeyCrypter.Decrypt(vchCiphertext, *((CKeyingMaterial*)&vchPlaintext));
+}
--- a/samples/C++/graphics.cpp
+++ b/samples/C++/graphics.cpp
@@ -0,0 +1,109 @@
+// License - https://github.com/TurtleP/Flask/blob/master/LICENSE
+
+#include <shared.h>
+
+int currentR = 0xFF;
+int currentG = 0xFF;
+int currentB = 0xFF;
+int currentA = 0xFF;
+
+int currentScreen = GFX_BOTTOM;
+
+float transX = 0;
+float transY = 0;
+bool isPushed = false;
+
+u32 getCurrentColor() 
+{
+	return RGBA8(currentR, currentG, currentB, currentA);
+}
+
+void setColor(int r, int g, int b)
+{
+	currentR = r;
+	currentG = g;
+	currentB = b;
+	currentA = currentA;
+}
+
+void setColor(int r, int g, int b, int a)
+{
+	currentR = r;
+	currentG = g;
+	currentB = b;
+	currentA = a;
+}
+
+void setScreen(int screen)
+{
+	currentScreen = screen;
+}
+
+int getCurrentScreen()
+{
+	return currentScreen;
+}
+
+void screenShot() //for showing stuff being done
+{
+	FILE * topScreen = fopen("sdmc:/framebuffer_top.rgb", "w+");
+
+	fwrite(gfxGetFramebuffer(GFX_TOP, GFX_LEFT, NULL, NULL), 288000, 1, topScreen);
+
+	fclose(topScreen);
+
+	FILE * bottomScreen = fopen("sdmc:/framebuffer_bottom.rgb", "w+");;
+
+	fwrite(gfxGetFramebuffer(GFX_BOTTOM, GFX_LEFT, NULL, NULL), 230400, 1, bottomScreen);
+
+	fclose(bottomScreen);
+}
+
+void translateCoords(float * x, float * y) {
+	if (isPushed) 
+	{
+		*x += transX;
+		*y += transY;
+	}
+}
+
+void translate(float dx, float dy)
+{
+	if (sf2d_get_current_screen() == getCurrentScreen()) 
+	{
+		transX = transX + dx;
+		transY = transY + dy;
+	}
+}
+
+void push()
+{
+	if (sf2d_get_current_screen() == getCurrentScreen()) 
+	{
+		isPushed = true;
+	}
+}
+
+void pop()
+{
+	if (sf2d_get_current_screen() == getCurrentScreen()) 
+	{
+		transX = 0;
+		transY = 0;
+		isPushed = false;
+	}
+}
+
+void setScissor(u32 x, u32 y, u32 width, u32 height)
+{
+	if (sf2d_get_current_screen() == getCurrentScreen()) 
+	{
+		GPU_SCISSORMODE mode = GPU_SCISSOR_NORMAL;
+
+		if (!x && !y && !width && !height) {
+			mode = GPU_SCISSOR_DISABLE;
+		}
+
+		sf2d_set_scissor_test(mode, x, y, width, height);
+	}
+}
--- a/samples/C++/json_reader.cpp
+++ b/samples/C++/json_reader.cpp
@@ -0,0 +1,920 @@
+// Copyright 2007-2010 Baptiste Lepilleur
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+/*
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Source - https://github.com/Ij888/ApacheCordovaRecipes/blob/6e8a2c1d9de7302f74bc3dbac54a021f0499bbb3/jqmsandbox/plugins/cordova-plugin-globalization/src/blackberry10/native/public/json_reader.cpp
+
+#include <json/reader.h>
+#include <json/value.h>
+#include <utility>
+#include <cstdio>
+#include <cassert>
+#include <cstring>
+#include <iostream>
+#include <stdexcept>
+
+#if _MSC_VER >= 1400 // VC++ 8.0
+#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
+#endif
+
+namespace Json {
+
+// QNX is strict about declaring C symbols in the std namespace.
+#ifdef __QNXNTO__
+using std::memcpy;
+using std::sprintf;
+using std::sscanf;
+#endif
+
+// Implementation of class Features
+// ////////////////////////////////
+
+Features::Features()
+   : allowComments_( true )
+   , strictRoot_( false )
+{
+}
+
+
+Features 
+Features::all()
+{
+   return Features();
+}
+
+
+Features 
+Features::strictMode()
+{
+   Features features;
+   features.allowComments_ = false;
+   features.strictRoot_ = true;
+   return features;
+}
+
+// Implementation of class Reader
+// ////////////////////////////////
+
+
+static inline bool 
+in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
+{
+   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4;
+}
+
+static inline bool 
+in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5 )
+{
+   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4  ||  c == c5;
+}
+
+
+static bool 
+containsNewLine( Reader::Location begin, 
+                 Reader::Location end )
+{
+   for ( ;begin < end; ++begin )
+      if ( *begin == '\n'  ||  *begin == '\r' )
+         return true;
+   return false;
+}
+
+static std::string codePointToUTF8(unsigned int cp)
+{
+   std::string result;
+   
+   // based on description from http://en.wikipedia.org/wiki/UTF-8
+
+   if (cp <= 0x7f) 
+   {
+      result.resize(1);
+      result[0] = static_cast<char>(cp);
+   } 
+   else if (cp <= 0x7FF) 
+   {
+      result.resize(2);
+      result[1] = static_cast<char>(0x80 | (0x3f & cp));
+      result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
+   } 
+   else if (cp <= 0xFFFF) 
+   {
+      result.resize(3);
+      result[2] = static_cast<char>(0x80 | (0x3f & cp));
+      result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
+      result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
+   }
+   else if (cp <= 0x10FFFF) 
+   {
+      result.resize(4);
+      result[3] = static_cast<char>(0x80 | (0x3f & cp));
+      result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
+      result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
+      result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
+   }
+
+   return result;
+}
+
+
+// Class Reader
+// //////////////////////////////////////////////////////////////////
+
+Reader::Reader()
+   : features_( Features::all() )
+{
+}
+
+
+Reader::Reader( const Features &features )
+   : features_( features )
+{
+}
+
+
+bool
+Reader::parse( const std::string &document, 
+               Value &root,
+               bool collectComments )
+{
+   document_ = document;
+   const char *begin = document_.c_str();
+   const char *end = begin + document_.length();
+   return parse( begin, end, root, collectComments );
+}
+
+
+bool
+Reader::parse( std::istream& sin,
+               Value &root,
+               bool collectComments )
+{
+   //std::istream_iterator<char> begin(sin);
+   //std::istream_iterator<char> end;
+   // Those would allow streamed input from a file, if parse() were a
+   // template function.
+
+   // Since std::string is reference-counted, this at least does not
+   // create an extra copy.
+   std::string doc;
+   std::getline(sin, doc, (char)EOF);
+   return parse( doc, root, collectComments );
+}
+
+bool 
+Reader::parse( const char *beginDoc, const char *endDoc, 
+               Value &root,
+               bool collectComments )
+{
+   if ( !features_.allowComments_ )
+   {
+      collectComments = false;
+   }
+
+   begin_ = beginDoc;
+   end_ = endDoc;
+   collectComments_ = collectComments;
+   current_ = begin_;
+   lastValueEnd_ = 0;
+   lastValue_ = 0;
+   commentsBefore_ = "";
+   errors_.clear();
+   while ( !nodes_.empty() )
+      nodes_.pop();
+   nodes_.push( &root );
+   
+   bool successful = readValue();
+   Token token;
+   skipCommentTokens( token );
+   if ( collectComments_  &&  !commentsBefore_.empty() )
+      root.setComment( commentsBefore_, commentAfter );
+   if ( features_.strictRoot_ )
+   {
+      if ( !root.isArray()  &&  !root.isObject() )
+      {
+         // Set error location to start of doc, ideally should be first token found in doc
+         token.type_ = tokenError;
+         token.start_ = beginDoc;
+         token.end_ = endDoc;
+         addError( "A valid JSON document must be either an array or an object value.",
+                   token );
+         return false;
+      }
+   }
+   return successful;
+}
+
+
+bool
+Reader::readValue()
+{
+   Token token;
+   skipCommentTokens( token );
+   bool successful = true;
+
+   if ( collectComments_  &&  !commentsBefore_.empty() )
+   {
+      currentValue().setComment( commentsBefore_, commentBefore );
+      commentsBefore_ = "";
+   }
+
+
+   switch ( token.type_ )
+   {
+   case tokenObjectBegin:
+      successful = readObject( token );
+      break;
+   case tokenArrayBegin:
+      successful = readArray( token );
+      break;
+   case tokenNumber:
+      successful = decodeNumber( token );
+      break;
+   case tokenString:
+      successful = decodeString( token );
+      break;
+   case tokenTrue:
+      currentValue() = true;
+      break;
+   case tokenFalse:
+      currentValue() = false;
+      break;
+   case tokenNull:
+      currentValue() = Value();
+      break;
+   default:
+      return addError( "Syntax error: value, object or array expected.", token );
+   }
+
+   if ( collectComments_ )
+   {
+      lastValueEnd_ = current_;
+      lastValue_ = &currentValue();
+   }
+
+   return successful;
+}
+
+
+void 
+Reader::skipCommentTokens( Token &token )
+{
+   if ( features_.allowComments_ )
+   {
+      do
+      {
+         readToken( token );
+      }
+      while ( token.type_ == tokenComment );
+   }
+   else
+   {
+      readToken( token );
+   }
+}
+
+
+bool 
+Reader::expectToken( TokenType type, Token &token, const char *message )
+{
+   readToken( token );
+   if ( token.type_ != type )
+      return addError( message, token );
+   return true;
+}
+
+
+bool 
+Reader::readToken( Token &token )
+{
+   skipSpaces();
+   token.start_ = current_;
+   Char c = getNextChar();
+   bool ok = true;
+   switch ( c )
+   {
+   case '{':
+      token.type_ = tokenObjectBegin;
+      break;
+   case '}':
+      token.type_ = tokenObjectEnd;
+      break;
+   case '[':
+      token.type_ = tokenArrayBegin;
+      break;
+   case ']':
+      token.type_ = tokenArrayEnd;
+      break;
+   case '"':
+      token.type_ = tokenString;
+      ok = readString();
+      break;
+   case '/':
+      token.type_ = tokenComment;
+      ok = readComment();
+      break;
+   case '0':
+   case '1':
+   case '2':
+   case '3':
+   case '4':
+   case '5':
+   case '6':
+   case '7':
+   case '8':
+   case '9':
+   case '-':
+      token.type_ = tokenNumber;
+      readNumber();
+      break;
+   case 't':
+      token.type_ = tokenTrue;
+      ok = match( "rue", 3 );
+      break;
+   case 'f':
+      token.type_ = tokenFalse;
+      ok = match( "alse", 4 );
+      break;
+   case 'n':
+      token.type_ = tokenNull;
+      ok = match( "ull", 3 );
+      break;
+   case ',':
+      token.type_ = tokenArraySeparator;
+      break;
+   case ':':
+      token.type_ = tokenMemberSeparator;
+      break;
+   case 0:
+      token.type_ = tokenEndOfStream;
+      break;
+   default:
+      ok = false;
+      break;
+   }
+   if ( !ok )
+      token.type_ = tokenError;
+   token.end_ = current_;
+   return true;
+}
+
+
+void 
+Reader::skipSpaces()
+{
+   while ( current_ != end_ )
+   {
+      Char c = *current_;
+      if ( c == ' '  ||  c == '\t'  ||  c == '\r'  ||  c == '\n' )
+         ++current_;
+      else
+         break;
+   }
+}
+
+
+bool 
+Reader::match( Location pattern, 
+               int patternLength )
+{
+   if ( end_ - current_ < patternLength )
+      return false;
+   int index = patternLength;
+   while ( index-- )
+      if ( current_[index] != pattern[index] )
+         return false;
+   current_ += patternLength;
+   return true;
+}
+
+
+bool
+Reader::readComment()
+{
+   Location commentBegin = current_ - 1;
+   Char c = getNextChar();
+   bool successful = false;
+   if ( c == '*' )
+      successful = readCStyleComment();
+   else if ( c == '/' )
+      successful = readCppStyleComment();
+   if ( !successful )
+      return false;
+
+   if ( collectComments_ )
+   {
+      CommentPlacement placement = commentBefore;
+      if ( lastValueEnd_  &&  !containsNewLine( lastValueEnd_, commentBegin ) )
+      {
+         if ( c != '*'  ||  !containsNewLine( commentBegin, current_ ) )
+            placement = commentAfterOnSameLine;
+      }
+
+      addComment( commentBegin, current_, placement );
+   }
+   return true;
+}
+
+
+void 
+Reader::addComment( Location begin, 
+                    Location end, 
+                    CommentPlacement placement )
+{
+   assert( collectComments_ );
+   if ( placement == commentAfterOnSameLine )
+   {
+      assert( lastValue_ != 0 );
+      lastValue_->setComment( std::string( begin, end ), placement );
+   }
+   else
+   {
+      if ( !commentsBefore_.empty() )
+         commentsBefore_ += "\n";
+      commentsBefore_ += std::string( begin, end );
+   }
+}
+
+
+bool 
+Reader::readCStyleComment()
+{
+   while ( current_ != end_ )
+   {
+      Char c = getNextChar();
+      if ( c == '*'  &&  *current_ == '/' )
+         break;
+   }
+   return getNextChar() == '/';
+}
+
+
+bool 
+Reader::readCppStyleComment()
+{
+   while ( current_ != end_ )
+   {
+      Char c = getNextChar();
+      if (  c == '\r'  ||  c == '\n' )
+         break;
+   }
+   return true;
+}
+
+
+void 
+Reader::readNumber()
+{
+   while ( current_ != end_ )
+   {
+      if ( !(*current_ >= '0'  &&  *current_ <= '9')  &&
+           !in( *current_, '.', 'e', 'E', '+', '-' ) )
+         break;
+      ++current_;
+   }
+}
+
+bool
+Reader::readString()
+{
+   Char c = 0;
+   while ( current_ != end_ )
+   {
+      c = getNextChar();
+      if ( c == '\\' )
+         getNextChar();
+      else if ( c == '"' )
+         break;
+   }
+   return c == '"';
+}
+
+
+bool 
+Reader::readObject( Token &tokenStart )
+{
+   Token tokenName;
+   std::string name;
+   currentValue() = Value( objectValue );
+   while ( readToken( tokenName ) )
+   {
+      bool initialTokenOk = true;
+      while ( tokenName.type_ == tokenComment  &&  initialTokenOk )
+         initialTokenOk = readToken( tokenName );
+      if  ( !initialTokenOk )
+         break;
+      if ( tokenName.type_ == tokenObjectEnd  &&  name.empty() )  // empty object
+         return true;
+      if ( tokenName.type_ != tokenString )
+         break;
+      
+      name = "";
+      if ( !decodeString( tokenName, name ) )
+         return recoverFromError( tokenObjectEnd );
+
+      Token colon;
+      if ( !readToken( colon ) ||  colon.type_ != tokenMemberSeparator )
+      {
+         return addErrorAndRecover( "Missing ':' after object member name", 
+                                    colon, 
+                                    tokenObjectEnd );
+      }
+      Value &value = currentValue()[ name ];
+      nodes_.push( &value );
+      bool ok = readValue();
+      nodes_.pop();
+      if ( !ok ) // error already set
+         return recoverFromError( tokenObjectEnd );
+
+      Token comma;
+      if ( !readToken( comma )
+            ||  ( comma.type_ != tokenObjectEnd  &&  
+                  comma.type_ != tokenArraySeparator &&
+		  comma.type_ != tokenComment ) )
+      {
+         return addErrorAndRecover( "Missing ',' or '}' in object declaration", 
+                                    comma, 
+                                    tokenObjectEnd );
+      }
+      bool finalizeTokenOk = true;
+      while ( comma.type_ == tokenComment &&
+              finalizeTokenOk )
+         finalizeTokenOk = readToken( comma );
+      if ( comma.type_ == tokenObjectEnd )
+         return true;
+   }
+   return addErrorAndRecover( "Missing '}' or object member name", 
+                              tokenName, 
+                              tokenObjectEnd );
+}
+
+
+bool 
+Reader::readArray( Token &tokenStart )
+{
+   currentValue() = Value( arrayValue );
+   skipSpaces();
+   if ( *current_ == ']' ) // empty array
+   {
+      Token endArray;
+      readToken( endArray );
+      return true;
+   }
+   int index = 0;
+   while ( true )
+   {
+      Value &value = currentValue()[ index++ ];
+      nodes_.push( &value );
+      bool ok = readValue();
+      nodes_.pop();
+      if ( !ok ) // error already set
+         return recoverFromError( tokenArrayEnd );
+
+      Token token;
+      // Accept Comment after last item in the array.
+      ok = readToken( token );
+      while ( token.type_ == tokenComment  &&  ok )
+      {
+         ok = readToken( token );
+      }
+      bool badTokenType = ( token.type_ == tokenArraySeparator  &&  
+                            token.type_ == tokenArrayEnd );
+      if ( !ok  ||  badTokenType )
+      {
+         return addErrorAndRecover( "Missing ',' or ']' in array declaration", 
+                                    token, 
+                                    tokenArrayEnd );
+      }
+      if ( token.type_ == tokenArrayEnd )
+         break;
+   }
+   return true;
+}
+
+
+bool 
+Reader::decodeNumber( Token &token )
+{
+   bool isDouble = false;
+   for ( Location inspect = token.start_; inspect != token.end_; ++inspect )
+   {
+      isDouble = isDouble  
+                 ||  in( *inspect, '.', 'e', 'E', '+' )  
+                 ||  ( *inspect == '-'  &&  inspect != token.start_ );
+   }
+   if ( isDouble )
+      return decodeDouble( token );
+   Location current = token.start_;
+   bool isNegative = *current == '-';
+   if ( isNegative )
+      ++current;
+   Value::UInt threshold = (isNegative ? Value::UInt(-Value::minInt) 
+                                       : Value::maxUInt) / 10;
+   Value::UInt value = 0;
+   while ( current < token.end_ )
+   {
+      Char c = *current++;
+      if ( c < '0'  ||  c > '9' )
+         return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
+      if ( value >= threshold )
+         return decodeDouble( token );
+      value = value * 10 + Value::UInt(c - '0');
+   }
+   if ( isNegative )
+      currentValue() = -Value::Int( value );
+   else if ( value <= Value::UInt(Value::maxInt) )
+      currentValue() = Value::Int( value );
+   else
+      currentValue() = value;
+   return true;
+}
+
+
+bool 
+Reader::decodeDouble( Token &token )
+{
+   double value = 0;
+   const int bufferSize = 32;
+   int count;
+   int length = int(token.end_ - token.start_);
+   if ( length <= bufferSize )
+   {
+      Char buffer[bufferSize];
+      memcpy( buffer, token.start_, length );
+      buffer[length] = 0;
+      count = sscanf( buffer, "%lf", &value );
+   }
+   else
+   {
+      std::string buffer( token.start_, token.end_ );
+      count = sscanf( buffer.c_str(), "%lf", &value );
+   }
+
+   if ( count != 1 )
+      return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
+   currentValue() = value;
+   return true;
+}
+
+
+bool 
+Reader::decodeString( Token &token )
+{
+   std::string decoded;
+   if ( !decodeString( token, decoded ) )
+      return false;
+   currentValue() = decoded;
+   return true;
+}
+
+
+bool 
+Reader::decodeString( Token &token, std::string &decoded )
+{
+   decoded.reserve( token.end_ - token.start_ - 2 );
+   Location current = token.start_ + 1; // skip '"'
+   Location end = token.end_ - 1;      // do not include '"'
+   while ( current != end )
+   {
+      Char c = *current++;
+      if ( c == '"' )
+         break;
+      else if ( c == '\\' )
+      {
+         if ( current == end )
+            return addError( "Empty escape sequence in string", token, current );
+         Char escape = *current++;
+         switch ( escape )
+         {
+         case '"': decoded += '"'; break;
+         case '/': decoded += '/'; break;
+         case '\\': decoded += '\\'; break;
+         case 'b': decoded += '\b'; break;
+         case 'f': decoded += '\f'; break;
+         case 'n': decoded += '\n'; break;
+         case 'r': decoded += '\r'; break;
+         case 't': decoded += '\t'; break;
+         case 'u':
+            {
+               unsigned int unicode;
+               if ( !decodeUnicodeCodePoint( token, current, end, unicode ) )
+                  return false;
+               decoded += codePointToUTF8(unicode);
+            }
+            break;
+         default:
+            return addError( "Bad escape sequence in string", token, current );
+         }
+      }
+      else
+      {
+         decoded += c;
+      }
+   }
+   return true;
+}
+
+bool
+Reader::decodeUnicodeCodePoint( Token &token, 
+                                     Location &current, 
+                                     Location end, 
+                                     unsigned int &unicode )
+{
+
+   if ( !decodeUnicodeEscapeSequence( token, current, end, unicode ) )
+      return false;
+   if (unicode >= 0xD800 && unicode <= 0xDBFF)
+   {
+      // surrogate pairs
+      if (end - current < 6)
+         return addError( "additional six characters expected to parse unicode surrogate pair.", token, current );
+      unsigned int surrogatePair;
+      if (*(current++) == '\\' && *(current++)== 'u')
+      {
+         if (decodeUnicodeEscapeSequence( token, current, end, surrogatePair ))
+         {
+            unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
+         } 
+         else
+            return false;
+      } 
+      else
+         return addError( "expecting another \\u token to begin the second half of a unicode surrogate pair", token, current );
+   }
+   return true;
+}
+
+bool 
+Reader::decodeUnicodeEscapeSequence( Token &token, 
+                                     Location &current, 
+                                     Location end, 
+                                     unsigned int &unicode )
+{
+   if ( end - current < 4 )
+      return addError( "Bad unicode escape sequence in string: four digits expected.", token, current );
+   unicode = 0;
+   for ( int index =0; index < 4; ++index )
+   {
+      Char c = *current++;
+      unicode *= 16;
+      if ( c >= '0'  &&  c <= '9' )
+         unicode += c - '0';
+      else if ( c >= 'a'  &&  c <= 'f' )
+         unicode += c - 'a' + 10;
+      else if ( c >= 'A'  &&  c <= 'F' )
+         unicode += c - 'A' + 10;
+      else
+         return addError( "Bad unicode escape sequence in string: hexadecimal digit expected.", token, current );
+   }
+   return true;
+}
+
+
+bool 
+Reader::addError( const std::string &message, 
+                  Token &token,
+                  Location extra )
+{
+   ErrorInfo info;
+   info.token_ = token;
+   info.message_ = message;
+   info.extra_ = extra;
+   errors_.push_back( info );
+   return false;
+}
+
+
+bool 
+Reader::recoverFromError( TokenType skipUntilToken )
+{
+   int errorCount = int(errors_.size());
+   Token skip;
+   while ( true )
+   {
+      if ( !readToken(skip) )
+         errors_.resize( errorCount ); // discard errors caused by recovery
+      if ( skip.type_ == skipUntilToken  ||  skip.type_ == tokenEndOfStream )
+         break;
+   }
+   errors_.resize( errorCount );
+   return false;
+}
+
+
+bool 
+Reader::addErrorAndRecover( const std::string &message, 
+                            Token &token,
+                            TokenType skipUntilToken )
+{
+   addError( message, token );
+   return recoverFromError( skipUntilToken );
+}
+
+
+Value &
+Reader::currentValue()
+{
+   return *(nodes_.top());
+}
+
+
+Reader::Char 
+Reader::getNextChar()
+{
+   if ( current_ == end_ )
+      return 0;
+   return *current_++;
+}
+
+
+void 
+Reader::getLocationLineAndColumn( Location location,
+                                  int &line,
+                                  int &column ) const
+{
+   Location current = begin_;
+   Location lastLineStart = current;
+   line = 0;
+   while ( current < location  &&  current != end_ )
+   {
+      Char c = *current++;
+      if ( c == '\r' )
+      {
+         if ( *current == '\n' )
+            ++current;
+         lastLineStart = current;
+         ++line;
+      }
+      else if ( c == '\n' )
+      {
+         lastLineStart = current;
+         ++line;
+      }
+   }
+   // column & line start at 1
+   column = int(location - lastLineStart) + 1;
+   ++line;
+}
+
+
+std::string
+Reader::getLocationLineAndColumn( Location location ) const
+{
+   int line, column;
+   getLocationLineAndColumn( location, line, column );
+   char buffer[18+16+16+1];
+   sprintf( buffer, "Line %d, Column %d", line, column );
+   return buffer;
+}
+
+
+std::string 
+Reader::getFormatedErrorMessages() const
+{
+   std::string formattedMessage;
+   for ( Errors::const_iterator itError = errors_.begin();
+         itError != errors_.end();
+         ++itError )
+   {
+      const ErrorInfo &error = *itError;
+      formattedMessage += "* " + getLocationLineAndColumn( error.token_.start_ ) + "\n";
+      formattedMessage += "  " + error.message_ + "\n";
+      if ( error.extra_ )
+         formattedMessage += "See " + getLocationLineAndColumn( error.extra_ ) + " for detail.\n";
+   }
+   return formattedMessage;
+}
+
+
+std::istream& operator>>( std::istream &sin, Value &root )
+{
+    Json::Reader reader;
+    bool ok = reader.parse(sin, root, true);
+    //JSON_ASSERT( ok );
+    if (!ok) throw std::runtime_error(reader.getFormatedErrorMessages());
+    return sin;
+}
+
+
+} // namespace Json
--- a/samples/C++/json_writer.cpp
+++ b/samples/C++/json_writer.cpp
@@ -0,0 +1,857 @@
+// Copyright 2007-2010 Baptiste Lepilleur
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+/*
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Source - https://github.com/Ij888/ApacheCordovaRecipes/blob/6e8a2c1d9de7302f74bc3dbac54a021f0499bbb3/jqmsandbox/plugins/cordova-plugin-globalization/src/blackberry10/native/public/json_writer.cpp
+
+#include <json/writer.h>
+#include <utility>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
+#if _MSC_VER >= 1400 // VC++ 8.0
+#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
+#endif
+
+namespace Json {
+
+static bool isControlCharacter(char ch)
+{
+   return ch > 0 && ch <= 0x1F;
+}
+
+static bool containsControlCharacter( const char* str )
+{
+   while ( *str ) 
+   {
+      if ( isControlCharacter( *(str++) ) )
+         return true;
+   }
+   return false;
+}
+static void uintToString( unsigned int value, 
+                          char *&current )
+{
+   *--current = 0;
+   do
+   {
+      *--current = (value % 10) + '0';
+      value /= 10;
+   }
+   while ( value != 0 );
+}
+
+std::string valueToString( Int value )
+{
+   char buffer[32];
+   char *current = buffer + sizeof(buffer);
+   bool isNegative = value < 0;
+   if ( isNegative )
+      value = -value;
+   uintToString( UInt(value), current );
+   if ( isNegative )
+      *--current = '-';
+   assert( current >= buffer );
+   return current;
+}
+
+
+std::string valueToString( UInt value )
+{
+   char buffer[32];
+   char *current = buffer + sizeof(buffer);
+   uintToString( value, current );
+   assert( current >= buffer );
+   return current;
+}
+
+std::string valueToString( double value )
+{
+   char buffer[32];
+#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning. 
+   sprintf_s(buffer, sizeof(buffer), "%#.16g", value); 
+#else	
+   sprintf(buffer, "%#.16g", value); 
+#endif
+   char* ch = buffer + strlen(buffer) - 1;
+   if (*ch != '0') return buffer; // nothing to truncate, so save time
+   while(ch > buffer && *ch == '0'){
+     --ch;
+   }
+   char* last_nonzero = ch;
+   while(ch >= buffer){
+     switch(*ch){
+     case '0':
+     case '1':
+     case '2':
+     case '3':
+     case '4':
+     case '5':
+     case '6':
+     case '7':
+     case '8':
+     case '9':
+       --ch;
+       continue;
+     case '.':
+       // Truncate zeroes to save bytes in output, but keep one.
+       *(last_nonzero+2) = '\0';
+       return buffer;
+     default:
+       return buffer;
+     }
+   }
+   return buffer;
+}
+
+
+std::string valueToString( bool value )
+{
+   return value ? "true" : "false";
+}
+
+std::string valueToQuotedString( const char *value )
+{
+   // Not sure how to handle unicode...
+   if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
+      return std::string("\"") + value + "\"";
+   // We have to walk value and escape any special characters.
+   // Appending to std::string is not efficient, but this should be rare.
+   // (Note: forward slashes are *not* rare, but I am not escaping them.)
+   unsigned maxsize = strlen(value)*2 + 3; // allescaped+quotes+NULL
+   std::string result;
+   result.reserve(maxsize); // to avoid lots of mallocs
+   result += "\"";
+   for (const char* c=value; *c != 0; ++c)
+   {
+      switch(*c)
+      {
+         case '\"':
+            result += "\\\"";
+            break;
+         case '\\':
+            result += "\\\\";
+            break;
+         case '\b':
+            result += "\\b";
+            break;
+         case '\f':
+            result += "\\f";
+            break;
+         case '\n':
+            result += "\\n";
+            break;
+         case '\r':
+            result += "\\r";
+            break;
+         case '\t':
+            result += "\\t";
+            break;
+         //case '/':
+            // Even though \/ is considered a legal escape in JSON, a bare
+            // slash is also legal, so I see no reason to escape it.
+            // (I hope I am not misunderstanding something.
+            // blep notes: actually escaping \/ may be useful in javascript to avoid </ 
+            // sequence.
+            // Should add a flag to allow this compatibility mode and prevent this 
+            // sequence from occurring.
+         default:
+            if ( isControlCharacter( *c ) )
+            {
+               std::ostringstream oss;
+               oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*c);
+               result += oss.str();
+            }
+            else
+            {
+               result += *c;
+            }
+            break;
+      }
+   }
+   result += "\"";
+   return result;
+}
+
+// Class Writer
+// //////////////////////////////////////////////////////////////////
+Writer::~Writer()
+{
+}
+
+
+// Class FastWriter
+// //////////////////////////////////////////////////////////////////
+
+FastWriter::FastWriter()
+   : yamlCompatiblityEnabled_( false )
+{
+}
+
+
+void 
+FastWriter::enableYAMLCompatibility()
+{
+   yamlCompatiblityEnabled_ = true;
+}
+
+
+std::string 
+FastWriter::write( const Value &root )
+{
+   document_ = "";
+   writeValue( root );
+   document_ += "\n";
+   return document_;
+}
+
+
+void 
+FastWriter::writeValue( const Value &value )
+{
+   switch ( value.type() )
+   {
+   case nullValue:
+      document_ += "null";
+      break;
+   case intValue:
+      document_ += valueToString( value.asInt() );
+      break;
+   case uintValue:
+      document_ += valueToString( value.asUInt() );
+      break;
+   case realValue:
+      document_ += valueToString( value.asDouble() );
+      break;
+   case stringValue:
+      document_ += valueToQuotedString( value.asCString() );
+      break;
+   case booleanValue:
+      document_ += valueToString( value.asBool() );
+      break;
+   case arrayValue:
+      {
+         document_ += "[";
+         int size = value.size();
+         for ( int index =0; index < size; ++index )
+         {
+            if ( index > 0 )
+               document_ += ",";
+            writeValue( value[index] );
+         }
+         document_ += "]";
+      }
+      break;
+   case objectValue:
+      {
+         Value::Members members( value.getMemberNames() );
+         document_ += "{";
+         for ( Value::Members::iterator it = members.begin(); 
+               it != members.end(); 
+               ++it )
+         {
+            const std::string &name = *it;
+            if ( it != members.begin() )
+               document_ += ",";
+            document_ += valueToQuotedString( name.c_str() );
+            document_ += yamlCompatiblityEnabled_ ? ": " 
+                                                  : ":";
+            writeValue( value[name] );
+         }
+         document_ += "}";
+      }
+      break;
+   }
+}
+
+
+// Class StyledWriter
+// //////////////////////////////////////////////////////////////////
+
+StyledWriter::StyledWriter()
+   : rightMargin_( 74 )
+   , indentSize_( 3 )
+{
+}
+
+
+std::string 
+StyledWriter::write( const Value &root )
+{
+   document_ = "";
+   addChildValues_ = false;
+   indentString_ = "";
+   writeCommentBeforeValue( root );
+   writeValue( root );
+   writeCommentAfterValueOnSameLine( root );
+   document_ += "\n";
+   return document_;
+}
+
+
+void 
+StyledWriter::writeValue( const Value &value )
+{
+   switch ( value.type() )
+   {
+   case nullValue:
+      pushValue( "null" );
+      break;
+   case intValue:
+      pushValue( valueToString( value.asInt() ) );
+      break;
+   case uintValue:
+      pushValue( valueToString( value.asUInt() ) );
+      break;
+   case realValue:
+      pushValue( valueToString( value.asDouble() ) );
+      break;
+   case stringValue:
+      pushValue( valueToQuotedString( value.asCString() ) );
+      break;
+   case booleanValue:
+      pushValue( valueToString( value.asBool() ) );
+      break;
+   case arrayValue:
+      writeArrayValue( value);
+      break;
+   case objectValue:
+      {
+         Value::Members members( value.getMemberNames() );
+         if ( members.empty() )
+            pushValue( "{}" );
+         else
+         {
+            writeWithIndent( "{" );
+            indent();
+            Value::Members::iterator it = members.begin();
+            while ( true )
+            {
+               const std::string &name = *it;
+               const Value &childValue = value[name];
+               writeCommentBeforeValue( childValue );
+               writeWithIndent( valueToQuotedString( name.c_str() ) );
+               document_ += " : ";
+               writeValue( childValue );
+               if ( ++it == members.end() )
+               {
+                  writeCommentAfterValueOnSameLine( childValue );
+                  break;
+               }
+               document_ += ",";
+               writeCommentAfterValueOnSameLine( childValue );
+            }
+            unindent();
+            writeWithIndent( "}" );
+         }
+      }
+      break;
+   }
+}
+
+
+void 
+StyledWriter::writeArrayValue( const Value &value )
+{
+   unsigned size = value.size();
+   if ( size == 0 )
+      pushValue( "[]" );
+   else
+   {
+      bool isArrayMultiLine = isMultineArray( value );
+      if ( isArrayMultiLine )
+      {
+         writeWithIndent( "[" );
+         indent();
+         bool hasChildValue = !childValues_.empty();
+         unsigned index =0;
+         while ( true )
+         {
+            const Value &childValue = value[index];
+            writeCommentBeforeValue( childValue );
+            if ( hasChildValue )
+               writeWithIndent( childValues_[index] );
+            else
+            {
+               writeIndent();
+               writeValue( childValue );
+            }
+            if ( ++index == size )
+            {
+               writeCommentAfterValueOnSameLine( childValue );
+               break;
+            }
+            document_ += ",";
+            writeCommentAfterValueOnSameLine( childValue );
+         }
+         unindent();
+         writeWithIndent( "]" );
+      }
+      else // output on a single line
+      {
+         assert( childValues_.size() == size );
+         document_ += "[ ";
+         for ( unsigned index =0; index < size; ++index )
+         {
+            if ( index > 0 )
+               document_ += ", ";
+            document_ += childValues_[index];
+         }
+         document_ += " ]";
+      }
+   }
+}
+
+
+bool 
+StyledWriter::isMultineArray( const Value &value )
+{
+   int size = value.size();
+   bool isMultiLine = size*3 >= rightMargin_ ;
+   childValues_.clear();
+   for ( int index =0; index < size  &&  !isMultiLine; ++index )
+   {
+      const Value &childValue = value[index];
+      isMultiLine = isMultiLine  ||
+                     ( (childValue.isArray()  ||  childValue.isObject())  &&  
+                        childValue.size() > 0 );
+   }
+   if ( !isMultiLine ) // check if line length > max line length
+   {
+      childValues_.reserve( size );
+      addChildValues_ = true;
+      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
+      for ( int index =0; index < size  &&  !isMultiLine; ++index )
+      {
+         writeValue( value[index] );
+         lineLength += int( childValues_[index].length() );
+         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
+      }
+      addChildValues_ = false;
+      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
+   }
+   return isMultiLine;
+}
+
+
+void 
+StyledWriter::pushValue( const std::string &value )
+{
+   if ( addChildValues_ )
+      childValues_.push_back( value );
+   else
+      document_ += value;
+}
+
+
+void 
+StyledWriter::writeIndent()
+{
+   if ( !document_.empty() )
+   {
+      char last = document_[document_.length()-1];
+      if ( last == ' ' )     // already indented
+         return;
+      if ( last != '\n' )    // Comments may add new-line
+         document_ += '\n';
+   }
+   document_ += indentString_;
+}
+
+
+void 
+StyledWriter::writeWithIndent( const std::string &value )
+{
+   writeIndent();
+   document_ += value;
+}
+
+
+void 
+StyledWriter::indent()
+{
+   indentString_ += std::string( indentSize_, ' ' );
+}
+
+
+void 
+StyledWriter::unindent()
+{
+   assert( int(indentString_.size()) >= indentSize_ );
+   indentString_.resize( indentString_.size() - indentSize_ );
+}
+
+
+void 
+StyledWriter::writeCommentBeforeValue( const Value &root )
+{
+   if ( !root.hasComment( commentBefore ) )
+      return;
+   document_ += normalizeEOL( root.getComment( commentBefore ) );
+   document_ += "\n";
+}
+
+
+void 
+StyledWriter::writeCommentAfterValueOnSameLine( const Value &root )
+{
+   if ( root.hasComment( commentAfterOnSameLine ) )
+      document_ += " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
+
+   if ( root.hasComment( commentAfter ) )
+   {
+      document_ += "\n";
+      document_ += normalizeEOL( root.getComment( commentAfter ) );
+      document_ += "\n";
+   }
+}
+
+
+bool 
+StyledWriter::hasCommentForValue( const Value &value )
+{
+   return value.hasComment( commentBefore )
+          ||  value.hasComment( commentAfterOnSameLine )
+          ||  value.hasComment( commentAfter );
+}
+
+
+std::string 
+StyledWriter::normalizeEOL( const std::string &text )
+{
+   std::string normalized;
+   normalized.reserve( text.length() );
+   const char *begin = text.c_str();
+   const char *end = begin + text.length();
+   const char *current = begin;
+   while ( current != end )
+   {
+      char c = *current++;
+      if ( c == '\r' ) // mac or dos EOL
+      {
+         if ( *current == '\n' ) // convert dos EOL
+            ++current;
+         normalized += '\n';
+      }
+      else // handle unix EOL & other char
+         normalized += c;
+   }
+   return normalized;
+}
+
+
+// Class StyledStreamWriter
+// //////////////////////////////////////////////////////////////////
+
+StyledStreamWriter::StyledStreamWriter( std::string indentation )
+   : document_(NULL)
+   , rightMargin_( 74 )
+   , indentation_( indentation )
+{
+}
+
+
+void
+StyledStreamWriter::write( std::ostream &out, const Value &root )
+{
+   document_ = &out;
+   addChildValues_ = false;
+   indentString_ = "";
+   writeCommentBeforeValue( root );
+   writeValue( root );
+   writeCommentAfterValueOnSameLine( root );
+   *document_ << "\n";
+   document_ = NULL; // Forget the stream, for safety.
+}
+
+
+void 
+StyledStreamWriter::writeValue( const Value &value )
+{
+   switch ( value.type() )
+   {
+   case nullValue:
+      pushValue( "null" );
+      break;
+   case intValue:
+      pushValue( valueToString( value.asInt() ) );
+      break;
+   case uintValue:
+      pushValue( valueToString( value.asUInt() ) );
+      break;
+   case realValue:
+      pushValue( valueToString( value.asDouble() ) );
+      break;
+   case stringValue:
+      pushValue( valueToQuotedString( value.asCString() ) );
+      break;
+   case booleanValue:
+      pushValue( valueToString( value.asBool() ) );
+      break;
+   case arrayValue:
+      writeArrayValue( value);
+      break;
+   case objectValue:
+      {
+         Value::Members members( value.getMemberNames() );
+         if ( members.empty() )
+            pushValue( "{}" );
+         else
+         {
+            writeWithIndent( "{" );
+            indent();
+            Value::Members::iterator it = members.begin();
+            while ( true )
+            {
+               const std::string &name = *it;
+               const Value &childValue = value[name];
+               writeCommentBeforeValue( childValue );
+               writeWithIndent( valueToQuotedString( name.c_str() ) );
+               *document_ << " : ";
+               writeValue( childValue );
+               if ( ++it == members.end() )
+               {
+                  writeCommentAfterValueOnSameLine( childValue );
+                  break;
+               }
+               *document_ << ",";
+               writeCommentAfterValueOnSameLine( childValue );
+            }
+            unindent();
+            writeWithIndent( "}" );
+         }
+      }
+      break;
+   }
+}
+
+
+void 
+StyledStreamWriter::writeArrayValue( const Value &value )
+{
+   unsigned size = value.size();
+   if ( size == 0 )
+      pushValue( "[]" );
+   else
+   {
+      bool isArrayMultiLine = isMultineArray( value );
+      if ( isArrayMultiLine )
+      {
+         writeWithIndent( "[" );
+         indent();
+         bool hasChildValue = !childValues_.empty();
+         unsigned index =0;
+         while ( true )
+         {
+            const Value &childValue = value[index];
+            writeCommentBeforeValue( childValue );
+            if ( hasChildValue )
+               writeWithIndent( childValues_[index] );
+            else
+            {
+	       writeIndent();
+               writeValue( childValue );
+            }
+            if ( ++index == size )
+            {
+               writeCommentAfterValueOnSameLine( childValue );
+               break;
+            }
+            *document_ << ",";
+            writeCommentAfterValueOnSameLine( childValue );
+         }
+         unindent();
+         writeWithIndent( "]" );
+      }
+      else // output on a single line
+      {
+         assert( childValues_.size() == size );
+         *document_ << "[ ";
+         for ( unsigned index =0; index < size; ++index )
+         {
+            if ( index > 0 )
+               *document_ << ", ";
+            *document_ << childValues_[index];
+         }
+         *document_ << " ]";
+      }
+   }
+}
+
+
+bool 
+StyledStreamWriter::isMultineArray( const Value &value )
+{
+   int size = value.size();
+   bool isMultiLine = size*3 >= rightMargin_ ;
+   childValues_.clear();
+   for ( int index =0; index < size  &&  !isMultiLine; ++index )
+   {
+      const Value &childValue = value[index];
+      isMultiLine = isMultiLine  ||
+                     ( (childValue.isArray()  ||  childValue.isObject())  &&  
+                        childValue.size() > 0 );
+   }
+   if ( !isMultiLine ) // check if line length > max line length
+   {
+      childValues_.reserve( size );
+      addChildValues_ = true;
+      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
+      for ( int index =0; index < size  &&  !isMultiLine; ++index )
+      {
+         writeValue( value[index] );
+         lineLength += int( childValues_[index].length() );
+         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
+      }
+      addChildValues_ = false;
+      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
+   }
+   return isMultiLine;
+}
+
+
+void 
+StyledStreamWriter::pushValue( const std::string &value )
+{
+   if ( addChildValues_ )
+      childValues_.push_back( value );
+   else
+      *document_ << value;
+}
+
+
+void 
+StyledStreamWriter::writeIndent()
+{
+  /*
+    Some comments in this method would have been nice. ;-)
+
+   if ( !document_.empty() )
+   {
+      char last = document_[document_.length()-1];
+      if ( last == ' ' )     // already indented
+         return;
+      if ( last != '\n' )    // Comments may add new-line
+         *document_ << '\n';
+   }
+  */
+   *document_ << '\n' << indentString_;
+}
+
+
+void 
+StyledStreamWriter::writeWithIndent( const std::string &value )
+{
+   writeIndent();
+   *document_ << value;
+}
+
+
+void 
+StyledStreamWriter::indent()
+{
+   indentString_ += indentation_;
+}
+
+
+void 
+StyledStreamWriter::unindent()
+{
+   assert( indentString_.size() >= indentation_.size() );
+   indentString_.resize( indentString_.size() - indentation_.size() );
+}
+
+
+void 
+StyledStreamWriter::writeCommentBeforeValue( const Value &root )
+{
+   if ( !root.hasComment( commentBefore ) )
+      return;
+   *document_ << normalizeEOL( root.getComment( commentBefore ) );
+   *document_ << "\n";
+}
+
+
+void 
+StyledStreamWriter::writeCommentAfterValueOnSameLine( const Value &root )
+{
+   if ( root.hasComment( commentAfterOnSameLine ) )
+      *document_ << " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
+
+   if ( root.hasComment( commentAfter ) )
+   {
+      *document_ << "\n";
+      *document_ << normalizeEOL( root.getComment( commentAfter ) );
+      *document_ << "\n";
+   }
+}
+
+
+bool 
+StyledStreamWriter::hasCommentForValue( const Value &value )
+{
+   return value.hasComment( commentBefore )
+          ||  value.hasComment( commentAfterOnSameLine )
+          ||  value.hasComment( commentAfter );
+}
+
+
+std::string 
+StyledStreamWriter::normalizeEOL( const std::string &text )
+{
+   std::string normalized;
+   normalized.reserve( text.length() );
+   const char *begin = text.c_str();
+   const char *end = begin + text.length();
+   const char *current = begin;
+   while ( current != end )
+   {
+      char c = *current++;
+      if ( c == '\r' ) // mac or dos EOL
+      {
+         if ( *current == '\n' ) // convert dos EOL
+            ++current;
+         normalized += '\n';
+      }
+      else // handle unix EOL & other char
+         normalized += c;
+   }
+   return normalized;
+}
+
+
+std::ostream& operator<<( std::ostream &sout, const Value &root )
+{
+   Json::StyledStreamWriter writer;
+   writer.write(sout, root);
+   return sout;
+}
+
+
+} // namespace Json
--- a/samples/C++/program.cp
+++ b/samples/C++/program.cp
@@ -0,0 +1,170 @@
+/**
+The MIT License (MIT)
+
+Copyright (c) 2016 Sahil Dua ( sahildua2305 | http://sahildua.com )
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+#include <iostream>
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+#include <queue>
+#include <stack>
+using namespace std;
+typedef long long ll;
+#define DEBUG
+#define mod 1000000007
+#define pb push_back
+
+int r2, c2, n, m;
+
+bool dfs(vector<string> graph, int r, int c){
+    //cout<<r<<" "<<c<<endl;
+    if(graph[r][c] == 'X'){
+        if(r==r2 && c==c2)
+            return true;
+        else
+            return false;
+    }
+    else{
+        graph[r][c] = 'X';
+    }
+    if(r>0){
+        if(dfs(graph, r-1, c))
+            return true;
+    }
+    if(c>0){
+        if(dfs(graph, r, c-1))
+            return true;
+    }
+    if(r<(n-1)){
+        if(dfs(graph, r+1, c))
+            return true;
+    }
+    if(c<(m-1)){
+        if(dfs(graph, r, c+1))
+            return true;
+    }
+    return false;
+}
+
+struct point{
+    int r,c;
+    point(int rr, int cc){
+        r = rr;
+        c = cc;
+    }
+};
+
+stack<point> st;
+
+// if(r>0){
+//     if(dfs(graph, r-1, c))
+//         return true;
+// }
+// if(c>0){
+//     if(dfs(graph, r, c-1))
+//         return true;
+// }
+// if(r<(n-1)){
+//     if(dfs(graph, r+1, c))
+//         return true;
+// }
+// if(c<(m-1)){
+//     if(dfs(graph, r, c+1))
+//         return true;
+// }
+
+bool search(vector<string> graph, int rr, int cc){
+    point t;
+    t.r=rr;
+    t.c=cc;
+    st.push(t);
+
+    while(!st.empty()){
+        point u = st.top();
+        st.pop();
+        int r = u.r, c = u.c;
+        cout<<r<<" "<<c<<endl;
+        if(graph[r][c]=='X'){
+            if(r==r2 && c==c2)
+                return true;
+            return false;
+        }
+        else{
+            graph[r][c] = 'X';
+        }
+        if(r>0){
+            t.r=r-1;
+            t.c=c;
+            st.push(t);
+        }
+        if(c>0){
+            t.r=r;
+            t.c=c-1;
+            st.push(t);
+        }
+        if(r<(n-1)){
+            t.r=r+1;
+            t.c=c;
+            st.push(t);
+        }
+        if(c<(m-1)){
+            t.r=r;
+            t.c=c+1;
+            st.push(t);
+        }
+    }
+    return false;
+}
+
+int main(){
+    ios::sync_with_stdio(false);
+    #ifdef DEBUG
+    freopen("input.txt", "r", stdin);
+    #endif // DEBUG
+
+    cin>>n>>m;
+    string temp;
+    vector<string> graph;
+    for(int i=0;i<n;i++){
+        cin>>temp;
+        graph.pb(temp);
+    }
+    int r1,c1;
+    cin>>r1>>c1;
+    cin>>r2>>c2;
+    r2--;
+    c2--;
+    r1--;
+    c1--;
+    graph[r1][c1] = '.';
+    if(search(graph, r1, c1))
+        cout<<"YES\n";
+    else
+        cout<<"NO\n";
+
+    return 0;
+}
--- a/samples/C++/qscicommand.h
+++ b/samples/C++/qscicommand.h
@@ -1,415 +0,0 @@
-// This defines the interface to the QsciCommand class.
-//
-// Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
-// 
-// This file is part of QScintilla.
-// 
-// This file may be used under the terms of the GNU General Public
-// License versions 2.0 or 3.0 as published by the Free Software
-// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-// included in the packaging of this file.  Alternatively you may (at
-// your option) use any later version of the GNU General Public
-// License if such license has been publicly approved by Riverbank
-// Computing Limited (or its successors, if any) and the KDE Free Qt
-// Foundation. In addition, as a special exception, Riverbank gives you
-// certain additional rights. These rights are described in the Riverbank
-// GPL Exception version 1.1, which can be found in the file
-// GPL_EXCEPTION.txt in this package.
-// 
-// If you are unsure which license is appropriate for your use, please
-// contact the sales department at sales@riverbankcomputing.com.
-// 
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-#ifndef QSCICOMMAND_H
-#define QSCICOMMAND_H
-
-#ifdef __APPLE__
-extern "C++" {
-#endif
-
-#include <qstring.h>
-
-#include <Qsci/qsciglobal.h>
-#include <Qsci/qsciscintillabase.h>
-
-
-class QsciScintilla;
-
-
-//! \brief The QsciCommand class represents an internal editor command that may
-//! have one or two keys bound to it.
-//!
-//! Methods are provided to change the keys bound to the command and to remove
-//! a key binding.  Each command has a user friendly description of the command
-//! for use in key mapping dialogs.
-class QSCINTILLA_EXPORT QsciCommand
-{
-public:
-    //! This enum defines the different commands that can be assigned to a key.
-    enum Command {
-        //! Move down one line.
-        LineDown = QsciScintillaBase::SCI_LINEDOWN,
-
-        //! Extend the selection down one line.
-        LineDownExtend = QsciScintillaBase::SCI_LINEDOWNEXTEND,
-
-        //! Extend the rectangular selection down one line.
-        LineDownRectExtend = QsciScintillaBase::SCI_LINEDOWNRECTEXTEND,
-
-        //! Scroll the view down one line.
-        LineScrollDown = QsciScintillaBase::SCI_LINESCROLLDOWN,
-
-        //! Move up one line.
-        LineUp = QsciScintillaBase::SCI_LINEUP,
-
-        //! Extend the selection up one line.
-        LineUpExtend = QsciScintillaBase::SCI_LINEUPEXTEND,
-
-        //! Extend the rectangular selection up one line.
-        LineUpRectExtend = QsciScintillaBase::SCI_LINEUPRECTEXTEND,
-
-        //! Scroll the view up one line.
-        LineScrollUp = QsciScintillaBase::SCI_LINESCROLLUP,
-
-        //! Scroll to the start of the document.
-        ScrollToStart = QsciScintillaBase::SCI_SCROLLTOSTART,
-
-        //! Scroll to the end of the document.
-        ScrollToEnd = QsciScintillaBase::SCI_SCROLLTOEND,
-
-        //! Scroll vertically to centre the current line.
-        VerticalCentreCaret = QsciScintillaBase::SCI_VERTICALCENTRECARET,
-
-        //! Move down one paragraph.
-        ParaDown = QsciScintillaBase::SCI_PARADOWN,
-
-        //! Extend the selection down one paragraph.
-        ParaDownExtend = QsciScintillaBase::SCI_PARADOWNEXTEND,
-
-        //! Move up one paragraph.
-        ParaUp = QsciScintillaBase::SCI_PARAUP,
-
-        //! Extend the selection up one paragraph.
-        ParaUpExtend = QsciScintillaBase::SCI_PARAUPEXTEND,
-
-        //! Move left one character.
-        CharLeft = QsciScintillaBase::SCI_CHARLEFT,
-
-        //! Extend the selection left one character.
-        CharLeftExtend = QsciScintillaBase::SCI_CHARLEFTEXTEND,
-
-        //! Extend the rectangular selection left one character.
-        CharLeftRectExtend = QsciScintillaBase::SCI_CHARLEFTRECTEXTEND,
-
-        //! Move right one character.
-        CharRight = QsciScintillaBase::SCI_CHARRIGHT,
-
-        //! Extend the selection right one character.
-        CharRightExtend = QsciScintillaBase::SCI_CHARRIGHTEXTEND,
-
-        //! Extend the rectangular selection right one character.
-        CharRightRectExtend = QsciScintillaBase::SCI_CHARRIGHTRECTEXTEND,
-
-        //! Move left one word.
-        WordLeft = QsciScintillaBase::SCI_WORDLEFT,
-
-        //! Extend the selection left one word.
-        WordLeftExtend = QsciScintillaBase::SCI_WORDLEFTEXTEND,
-
-        //! Move right one word.
-        WordRight = QsciScintillaBase::SCI_WORDRIGHT,
-
-        //! Extend the selection right one word.
-        WordRightExtend = QsciScintillaBase::SCI_WORDRIGHTEXTEND,
-
-        //! Move to the end of the previous word.
-        WordLeftEnd = QsciScintillaBase::SCI_WORDLEFTEND,
-
-        //! Extend the selection to the end of the previous word.
-        WordLeftEndExtend = QsciScintillaBase::SCI_WORDLEFTENDEXTEND,
-
-        //! Move to the end of the next word.
-        WordRightEnd = QsciScintillaBase::SCI_WORDRIGHTEND,
-
-        //! Extend the selection to the end of the next word.
-        WordRightEndExtend = QsciScintillaBase::SCI_WORDRIGHTENDEXTEND,
-
-        //! Move left one word part.
-        WordPartLeft = QsciScintillaBase::SCI_WORDPARTLEFT,
-
-        //! Extend the selection left one word part.
-        WordPartLeftExtend = QsciScintillaBase::SCI_WORDPARTLEFTEXTEND,
-
-        //! Move right one word part.
-        WordPartRight = QsciScintillaBase::SCI_WORDPARTRIGHT,
-
-        //! Extend the selection right one word part.
-        WordPartRightExtend = QsciScintillaBase::SCI_WORDPARTRIGHTEXTEND,
-
-        //! Move to the start of the document line.
-        Home = QsciScintillaBase::SCI_HOME,
-
-        //! Extend the selection to the start of the document line.
-        HomeExtend = QsciScintillaBase::SCI_HOMEEXTEND,
-
-        //! Extend the rectangular selection to the start of the document line.
-        HomeRectExtend = QsciScintillaBase::SCI_HOMERECTEXTEND,
-
-        //! Move to the start of the displayed line.
-        HomeDisplay = QsciScintillaBase::SCI_HOMEDISPLAY,
-
-        //! Extend the selection to the start of the displayed line.
-        HomeDisplayExtend = QsciScintillaBase::SCI_HOMEDISPLAYEXTEND,
-
-        //! Move to the start of the displayed or document line.
-        HomeWrap = QsciScintillaBase::SCI_HOMEWRAP,
-
-        //! Extend the selection to the start of the displayed or document
-        //! line.
-        HomeWrapExtend = QsciScintillaBase::SCI_HOMEWRAPEXTEND,
-
-        //! Move to the first visible character in the document line.
-        VCHome = QsciScintillaBase::SCI_VCHOME,
-
-        //! Extend the selection to the first visible character in the document
-        //! line.
-        VCHomeExtend = QsciScintillaBase::SCI_VCHOMEEXTEND,
-
-        //! Extend the rectangular selection to the first visible character in
-        //! the document line.
-        VCHomeRectExtend = QsciScintillaBase::SCI_VCHOMERECTEXTEND,
-
-        //! Move to the first visible character of the displayed or document
-        //! line.
-        VCHomeWrap = QsciScintillaBase::SCI_VCHOMEWRAP,
-
-        //! Extend the selection to the first visible character of the
-        //! displayed or document line.
-        VCHomeWrapExtend = QsciScintillaBase::SCI_VCHOMEWRAPEXTEND,
-
-        //! Move to the end of the document line.
-        LineEnd = QsciScintillaBase::SCI_LINEEND,
-
-        //! Extend the selection to the end of the document line.
-        LineEndExtend = QsciScintillaBase::SCI_LINEENDEXTEND,
-
-        //! Extend the rectangular selection to the end of the document line.
-        LineEndRectExtend = QsciScintillaBase::SCI_LINEENDRECTEXTEND,
-
-        //! Move to the end of the displayed line.
-        LineEndDisplay = QsciScintillaBase::SCI_LINEENDDISPLAY,
-
-        //! Extend the selection to the end of the displayed line.
-        LineEndDisplayExtend = QsciScintillaBase::SCI_LINEENDDISPLAYEXTEND,
-
-        //! Move to the end of the displayed or document line.
-        LineEndWrap = QsciScintillaBase::SCI_LINEENDWRAP,
-
-        //! Extend the selection to the end of the displayed or document line.
-        LineEndWrapExtend = QsciScintillaBase::SCI_LINEENDWRAPEXTEND,
-
-        //! Move to the start of the document.
-        DocumentStart = QsciScintillaBase::SCI_DOCUMENTSTART,
-
-        //! Extend the selection to the start of the document.
-        DocumentStartExtend = QsciScintillaBase::SCI_DOCUMENTSTARTEXTEND,
-
-        //! Move to the end of the document.
-        DocumentEnd = QsciScintillaBase::SCI_DOCUMENTEND,
-
-        //! Extend the selection to the end of the document.
-        DocumentEndExtend = QsciScintillaBase::SCI_DOCUMENTENDEXTEND,
-
-        //! Move up one page.
-        PageUp = QsciScintillaBase::SCI_PAGEUP,
-
-        //! Extend the selection up one page.
-        PageUpExtend = QsciScintillaBase::SCI_PAGEUPEXTEND,
-
-        //! Extend the rectangular selection up one page.
-        PageUpRectExtend = QsciScintillaBase::SCI_PAGEUPRECTEXTEND,
-
-        //! Move down one page.
-        PageDown = QsciScintillaBase::SCI_PAGEDOWN,
-
-        //! Extend the selection down one page.
-        PageDownExtend = QsciScintillaBase::SCI_PAGEDOWNEXTEND,
-
-        //! Extend the rectangular selection down one page.
-        PageDownRectExtend = QsciScintillaBase::SCI_PAGEDOWNRECTEXTEND,
-
-        //! Stuttered move up one page.
-        StutteredPageUp = QsciScintillaBase::SCI_STUTTEREDPAGEUP,
-
-        //! Stuttered extend the selection up one page.
-        StutteredPageUpExtend = QsciScintillaBase::SCI_STUTTEREDPAGEUPEXTEND,
-
-        //! Stuttered move down one page.
-        StutteredPageDown = QsciScintillaBase::SCI_STUTTEREDPAGEDOWN,
-
-        //! Stuttered extend the selection down one page.
-        StutteredPageDownExtend = QsciScintillaBase::SCI_STUTTEREDPAGEDOWNEXTEND,
-
-        //! Delete the current character.
-        Delete = QsciScintillaBase::SCI_CLEAR,
-
-        //! Delete the previous character.
-        DeleteBack = QsciScintillaBase::SCI_DELETEBACK,
-
-        //! Delete the previous character if not at start of line.
-        DeleteBackNotLine = QsciScintillaBase::SCI_DELETEBACKNOTLINE,
-
-        //! Delete the word to the left.
-        DeleteWordLeft = QsciScintillaBase::SCI_DELWORDLEFT,
-
-        //! Delete the word to the right.
-        DeleteWordRight = QsciScintillaBase::SCI_DELWORDRIGHT,
-
-        //! Delete right to the end of the next word.
-        DeleteWordRightEnd = QsciScintillaBase::SCI_DELWORDRIGHTEND,
-
-        //! Delete the line to the left.
-        DeleteLineLeft = QsciScintillaBase::SCI_DELLINELEFT,
-
-        //! Delete the line to the right.
-        DeleteLineRight = QsciScintillaBase::SCI_DELLINERIGHT,
-
-        //! Delete the current line.
-        LineDelete = QsciScintillaBase::SCI_LINEDELETE,
-
-        //! Cut the current line to the clipboard.
-        LineCut = QsciScintillaBase::SCI_LINECUT,
-
-        //! Copy the current line to the clipboard.
-        LineCopy = QsciScintillaBase::SCI_LINECOPY,
-
-        //! Transpose the current and previous lines.
-        LineTranspose = QsciScintillaBase::SCI_LINETRANSPOSE,
-
-        //! Duplicate the current line.
-        LineDuplicate = QsciScintillaBase::SCI_LINEDUPLICATE,
-
-        //! Select the whole document.
-        SelectAll = QsciScintillaBase::SCI_SELECTALL,
-
-        //! Move the selected lines up one line.
-        MoveSelectedLinesUp = QsciScintillaBase::SCI_MOVESELECTEDLINESUP,
-
-        //! Move the selected lines down one line.
-        MoveSelectedLinesDown = QsciScintillaBase::SCI_MOVESELECTEDLINESDOWN,
-
-        //! Duplicate the selection.
-        SelectionDuplicate = QsciScintillaBase::SCI_SELECTIONDUPLICATE,
-
-        //! Convert the selection to lower case.
-        SelectionLowerCase = QsciScintillaBase::SCI_LOWERCASE,
-
-        //! Convert the selection to upper case.
-        SelectionUpperCase = QsciScintillaBase::SCI_UPPERCASE,
-
-        //! Cut the selection to the clipboard.
-        SelectionCut = QsciScintillaBase::SCI_CUT,
-
-        //! Copy the selection to the clipboard.
-        SelectionCopy = QsciScintillaBase::SCI_COPY,
-
-        //! Paste from the clipboard.
-        Paste = QsciScintillaBase::SCI_PASTE,
-
-        //! Toggle insert/overtype.
-        EditToggleOvertype = QsciScintillaBase::SCI_EDITTOGGLEOVERTYPE,
-
-        //! Insert a platform dependent newline.
-        Newline = QsciScintillaBase::SCI_NEWLINE,
-
-        //! Insert a formfeed.
-        Formfeed = QsciScintillaBase::SCI_FORMFEED,
-
-        //! Indent one level.
-        Tab = QsciScintillaBase::SCI_TAB,
-
-        //! De-indent one level.
-        Backtab = QsciScintillaBase::SCI_BACKTAB,
-
-        //! Cancel any current operation.
-        Cancel = QsciScintillaBase::SCI_CANCEL,
-
-        //! Undo the last command.
-        Undo = QsciScintillaBase::SCI_UNDO,
-
-        //! Redo the last command.
-        Redo = QsciScintillaBase::SCI_REDO,
-
-        //! Zoom in.
-        ZoomIn = QsciScintillaBase::SCI_ZOOMIN,
-
-        //! Zoom out.
-        ZoomOut = QsciScintillaBase::SCI_ZOOMOUT,
-    };
-
-    //! Return the command that will be executed by this instance.
-    Command command() const {return scicmd;}
-
-    //! Execute the command.
-    void execute();
-
-    //! Binds the key \a key to the command.  If \a key is 0 then the key
-    //! binding is removed.  If \a key is invalid then the key binding is
-    //! unchanged.  Valid keys are any visible or control character or any
-    //! of \c Key_Down, \c Key_Up, \c Key_Left, \c Key_Right, \c Key_Home,
-    //! \c Key_End, \c Key_PageUp, \c Key_PageDown, \c Key_Delete,
-    //! \c Key_Insert, \c Key_Escape, \c Key_Backspace, \c Key_Tab and
-    //! \c Key_Return.  Keys may be modified with any combination of \c SHIFT,
-    //! \c CTRL, \c ALT and \c META.
-    //!
-    //! \sa key(), setAlternateKey(), validKey()
-    void setKey(int key);
-
-    //! Binds the alternate key \a altkey to the command.  If \a key is 0
-    //! then the alternate key binding is removed.
-    //!
-    //! \sa alternateKey(), setKey(), validKey()
-    void setAlternateKey(int altkey);
-
-    //! The key that is currently bound to the command is returned.
-    //!
-    //! \sa setKey(), alternateKey()
-    int key() const {return qkey;}
-
-    //! The alternate key that is currently bound to the command is
-    //! returned.
-    //!
-    //! \sa setAlternateKey(), key()
-    int alternateKey() const {return qaltkey;}
-
-    //! If the key \a key is valid then true is returned.
-    static bool validKey(int key);
-
-    //! The user friendly description of the command is returned.
-    QString description() const;
-
-private:
-    friend class QsciCommandSet;
-
-    QsciCommand(QsciScintilla *qs, Command cmd, int key, int altkey,
-            const char *desc);
-
-    void bindKey(int key,int &qk,int &scik);
-
-    QsciScintilla *qsCmd;
-    Command scicmd;
-    int qkey, scikey, qaltkey, scialtkey;
-    const char *descCmd;
-
-    QsciCommand(const QsciCommand &);
-    QsciCommand &operator=(const QsciCommand &);
-};
-
-#ifdef __APPLE__
-}
-#endif
-
-#endif
--- a/samples/C++/qsciprinter.cp
+++ b/samples/C++/qsciprinter.cp
@@ -1,116 +0,0 @@
-// This module defines interface to the QsciPrinter class.
-//
-// Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
-// 
-// This file is part of QScintilla.
-// 
-// This file may be used under the terms of the GNU General Public
-// License versions 2.0 or 3.0 as published by the Free Software
-// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-// included in the packaging of this file.  Alternatively you may (at
-// your option) use any later version of the GNU General Public
-// License if such license has been publicly approved by Riverbank
-// Computing Limited (or its successors, if any) and the KDE Free Qt
-// Foundation. In addition, as a special exception, Riverbank gives you
-// certain additional rights. These rights are described in the Riverbank
-// GPL Exception version 1.1, which can be found in the file
-// GPL_EXCEPTION.txt in this package.
-// 
-// If you are unsure which license is appropriate for your use, please
-// contact the sales department at sales@riverbankcomputing.com.
-// 
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-#ifndef QSCIPRINTER_H
-#define QSCIPRINTER_H
-
-#ifdef __APPLE__
-extern "C++" {
-#endif
-
-#include <qprinter.h>
-
-#include <Qsci/qsciglobal.h>
-#include <Qsci/qsciscintilla.h>
-
-
-QT_BEGIN_NAMESPACE
-class QRect;
-class QPainter;
-QT_END_NAMESPACE
-
-class QsciScintillaBase;
-
-
-//! \brief The QsciPrinter class is a sub-class of the Qt QPrinter class that
-//! is able to print the text of a Scintilla document.
-//!
-//! The class can be further sub-classed to alter to layout of the text, adding
-//! headers and footers for example.
-class QSCINTILLA_EXPORT QsciPrinter : public QPrinter
-{
-public:
-    //! Constructs a printer paint device with mode \a mode.
-    QsciPrinter(PrinterMode mode = ScreenResolution);
-
-    //! Destroys the QsciPrinter instance.
-    virtual ~QsciPrinter();
-
-    //! Format a page, by adding headers and footers for example, before the
-    //! document text is drawn on it.  \a painter is the painter to be used to
-    //! add customised text and graphics.  \a drawing is true if the page is
-    //! actually being drawn rather than being sized.  \a painter drawing
-    //! methods must only be called when \a drawing is true.  \a area is the
-    //! area of the page that will be used to draw the text.  This should be
-    //! modified if it is necessary to reserve space for any customised text or
-    //! graphics.  By default the area is relative to the printable area of the
-    //! page.  Use QPrinter::setFullPage() because calling printRange() if you
-    //! want to try and print over the whole page.  \a pagenr is the number of
-    //! the page.  The first page is numbered 1.
-    virtual void formatPage(QPainter &painter, bool drawing, QRect &area,
-            int pagenr);
-
-    //! Return the number of points to add to each font when printing.
-    //!
-    //! \sa setMagnification()
-    int magnification() const {return mag;}
-
-    //! Sets the number of points to add to each font when printing to \a
-    //! magnification.
-    //!
-    //! \sa magnification()
-    virtual void setMagnification(int magnification);
-
-    //! Print a range of lines from the Scintilla instance \a qsb.  \a from is
-    //! the first line to print and a negative value signifies the first line
-    //! of text.  \a to is the last line to print and a negative value
-    //! signifies the last line of text.  true is returned if there was no
-    //! error.
-    virtual int printRange(QsciScintillaBase *qsb, int from = -1, int to = -1);
-
-    //! Return the line wrap mode used when printing.  The default is
-    //! QsciScintilla::WrapWord.
-    //!
-    //! \sa setWrapMode()
-    QsciScintilla::WrapMode wrapMode() const {return wrap;}
-
-    //! Sets the line wrap mode used when printing to \a wmode.
-    //!
-    //! \sa wrapMode()
-    virtual void setWrapMode(QsciScintilla::WrapMode wmode);
-
-private:
-    int mag;
-    QsciScintilla::WrapMode wrap;
-
-    QsciPrinter(const QsciPrinter &);
-    QsciPrinter &operator=(const QsciPrinter &);
-};
-
-#ifdef __APPLE__
-}
-#endif
-
-#endif
--- a/samples/C++/qsciprinter.h
+++ b/samples/C++/qsciprinter.h
@@ -1,116 +0,0 @@
-// This module defines interface to the QsciPrinter class.
-//
-// Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
-// 
-// This file is part of QScintilla.
-// 
-// This file may be used under the terms of the GNU General Public
-// License versions 2.0 or 3.0 as published by the Free Software
-// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-// included in the packaging of this file.  Alternatively you may (at
-// your option) use any later version of the GNU General Public
-// License if such license has been publicly approved by Riverbank
-// Computing Limited (or its successors, if any) and the KDE Free Qt
-// Foundation. In addition, as a special exception, Riverbank gives you
-// certain additional rights. These rights are described in the Riverbank
-// GPL Exception version 1.1, which can be found in the file
-// GPL_EXCEPTION.txt in this package.
-// 
-// If you are unsure which license is appropriate for your use, please
-// contact the sales department at sales@riverbankcomputing.com.
-// 
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
-#ifndef QSCIPRINTER_H
-#define QSCIPRINTER_H
-
-#ifdef __APPLE__
-extern "C++" {
-#endif
-
-#include <qprinter.h>
-
-#include <Qsci/qsciglobal.h>
-#include <Qsci/qsciscintilla.h>
-
-
-QT_BEGIN_NAMESPACE
-class QRect;
-class QPainter;
-QT_END_NAMESPACE
-
-class QsciScintillaBase;
-
-
-//! \brief The QsciPrinter class is a sub-class of the Qt QPrinter class that
-//! is able to print the text of a Scintilla document.
-//!
-//! The class can be further sub-classed to alter to layout of the text, adding
-//! headers and footers for example.
-class QSCINTILLA_EXPORT QsciPrinter : public QPrinter
-{
-public:
-    //! Constructs a printer paint device with mode \a mode.
-    QsciPrinter(PrinterMode mode = ScreenResolution);
-
-    //! Destroys the QsciPrinter instance.
-    virtual ~QsciPrinter();
-
-    //! Format a page, by adding headers and footers for example, before the
-    //! document text is drawn on it.  \a painter is the painter to be used to
-    //! add customised text and graphics.  \a drawing is true if the page is
-    //! actually being drawn rather than being sized.  \a painter drawing
-    //! methods must only be called when \a drawing is true.  \a area is the
-    //! area of the page that will be used to draw the text.  This should be
-    //! modified if it is necessary to reserve space for any customised text or
-    //! graphics.  By default the area is relative to the printable area of the
-    //! page.  Use QPrinter::setFullPage() because calling printRange() if you
-    //! want to try and print over the whole page.  \a pagenr is the number of
-    //! the page.  The first page is numbered 1.
-    virtual void formatPage(QPainter &painter, bool drawing, QRect &area,
-            int pagenr);
-
-    //! Return the number of points to add to each font when printing.
-    //!
-    //! \sa setMagnification()
-    int magnification() const {return mag;}
-
-    //! Sets the number of points to add to each font when printing to \a
-    //! magnification.
-    //!
-    //! \sa magnification()
-    virtual void setMagnification(int magnification);
-
-    //! Print a range of lines from the Scintilla instance \a qsb.  \a from is
-    //! the first line to print and a negative value signifies the first line
-    //! of text.  \a to is the last line to print and a negative value
-    //! signifies the last line of text.  true is returned if there was no
-    //! error.
-    virtual int printRange(QsciScintillaBase *qsb, int from = -1, int to = -1);
-
-    //! Return the line wrap mode used when printing.  The default is
-    //! QsciScintilla::WrapWord.
-    //!
-    //! \sa setWrapMode()
-    QsciScintilla::WrapMode wrapMode() const {return wrap;}
-
-    //! Sets the line wrap mode used when printing to \a wmode.
-    //!
-    //! \sa wrapMode()
-    virtual void setWrapMode(QsciScintilla::WrapMode wmode);
-
-private:
-    int mag;
-    QsciScintilla::WrapMode wrap;
-
-    QsciPrinter(const QsciPrinter &);
-    QsciPrinter &operator=(const QsciPrinter &);
-};
-
-#ifdef __APPLE__
-}
-#endif
-
-#endif
--- a/samples/C++/srs_app_ingest.cpp
+++ b/samples/C++/srs_app_ingest.cpp
@@ -0,0 +1,557 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 SRS(ossrs)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+// Source - https://github.com/REN-I/srs/blob/3aae7854702a37955bce706fcd8122b02ac07f53/trunk/src/app/srs_app_ingest.cpp
+
+#include <srs_app_ingest.hpp>
+
+#ifdef SRS_AUTO_INGEST
+
+#include <stdlib.h>
+using namespace std;
+
+#include <srs_kernel_error.hpp>
+#include <srs_app_config.hpp>
+#include <srs_kernel_log.hpp>
+#include <srs_app_ffmpeg.hpp>
+#include <srs_app_pithy_print.hpp>
+#include <srs_kernel_utility.hpp>
+#include <srs_app_utility.hpp>
+
+// when error, ingester sleep for a while and retry.
+// ingest never sleep a long time, for we must start the stream ASAP.
+#define SRS_AUTO_INGESTER_SLEEP_US (int64_t)(3*1000*1000LL)
+
+SrsIngesterFFMPEG::SrsIngesterFFMPEG()
+{
+    ffmpeg = NULL;
+}
+
+SrsIngesterFFMPEG::~SrsIngesterFFMPEG()
+{
+    srs_freep(ffmpeg);
+}
+
+int SrsIngesterFFMPEG::initialize(SrsFFMPEG* ff, string v, string i)
+{
+    int ret = ERROR_SUCCESS;
+    
+    ffmpeg = ff;
+    vhost = v;
+    id = i;
+    starttime = srs_get_system_time_ms();
+    
+    return ret;
+}
+
+string SrsIngesterFFMPEG::uri()
+{
+    return vhost + "/" + id;
+}
+
+int SrsIngesterFFMPEG::alive()
+{
+    return (int)(srs_get_system_time_ms() - starttime);
+}
+
+bool SrsIngesterFFMPEG::equals(string v)
+{
+    return vhost == v;
+}
+
+bool SrsIngesterFFMPEG::equals(string v, string i)
+{
+    return vhost == v && id == i;
+}
+
+int SrsIngesterFFMPEG::start()
+{
+    return ffmpeg->start();
+}
+
+void SrsIngesterFFMPEG::stop()
+{
+    ffmpeg->stop();
+}
+
+int SrsIngesterFFMPEG::cycle()
+{
+    return ffmpeg->cycle();
+}
+
+void SrsIngesterFFMPEG::fast_stop()
+{
+    ffmpeg->fast_stop();
+}
+
+SrsIngester::SrsIngester()
+{
+    _srs_config->subscribe(this);
+    
+    pthread = new SrsReusableThread("ingest", this, SRS_AUTO_INGESTER_SLEEP_US);
+    pprint = SrsPithyPrint::create_ingester();
+}
+
+SrsIngester::~SrsIngester()
+{
+    _srs_config->unsubscribe(this);
+    
+    srs_freep(pthread);
+    clear_engines();
+}
+
+int SrsIngester::start()
+{
+    int ret = ERROR_SUCCESS;
+    
+    if ((ret = parse()) != ERROR_SUCCESS) {
+        clear_engines();
+        ret = ERROR_SUCCESS;
+        return ret;
+    }
+    
+    // even no ingesters, we must also start it,
+    // for the reload may add more ingesters.
+    
+    // start thread to run all encoding engines.
+    if ((ret = pthread->start()) != ERROR_SUCCESS) {
+        srs_error("st_thread_create failed. ret=%d", ret);
+        return ret;
+    }
+    srs_trace("ingest thread cid=%d, current_cid=%d", pthread->cid(), _srs_context->get_id());
+    
+    return ret;
+}
+
+int SrsIngester::parse_ingesters(SrsConfDirective* vhost)
+{
+    int ret = ERROR_SUCCESS;
+    
+    std::vector<SrsConfDirective*> ingesters = _srs_config->get_ingesters(vhost->arg0());
+    
+    // create engine
+    for (int i = 0; i < (int)ingesters.size(); i++) {
+        SrsConfDirective* ingest = ingesters[i];
+        if ((ret = parse_engines(vhost, ingest)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    }
+    
+    return ret;
+}
+
+int SrsIngester::parse_engines(SrsConfDirective* vhost, SrsConfDirective* ingest)
+{
+    int ret = ERROR_SUCCESS;
+
+    if (!_srs_config->get_ingest_enabled(ingest)) {
+        return ret;
+    }
+    
+    std::string ffmpeg_bin = _srs_config->get_ingest_ffmpeg(ingest);
+    if (ffmpeg_bin.empty()) {
+        ret = ERROR_ENCODER_PARSE;
+        srs_trace("empty ffmpeg ret=%d", ret);
+        return ret;
+    }
+    
+    // get all engines.
+    std::vector<SrsConfDirective*> engines = _srs_config->get_transcode_engines(ingest);
+    
+    // create ingesters without engines.
+    if (engines.empty()) {
+        SrsFFMPEG* ffmpeg = new SrsFFMPEG(ffmpeg_bin);
+        if ((ret = initialize_ffmpeg(ffmpeg, vhost, ingest, NULL)) != ERROR_SUCCESS) {
+            srs_freep(ffmpeg);
+            if (ret != ERROR_ENCODER_LOOP) {
+                srs_error("invalid ingest engine. ret=%d", ret);
+            }
+            return ret;
+        }
+
+        SrsIngesterFFMPEG* ingester = new SrsIngesterFFMPEG();
+        if ((ret = ingester->initialize(ffmpeg, vhost->arg0(), ingest->arg0())) != ERROR_SUCCESS) {
+            srs_freep(ingester);
+            return ret;
+        }
+        
+        ingesters.push_back(ingester);
+        return ret;
+    }
+
+    // create ingesters with engine
+    for (int i = 0; i < (int)engines.size(); i++) {
+        SrsConfDirective* engine = engines[i];
+        SrsFFMPEG* ffmpeg = new SrsFFMPEG(ffmpeg_bin);
+        if ((ret = initialize_ffmpeg(ffmpeg, vhost, ingest, engine)) != ERROR_SUCCESS) {
+            srs_freep(ffmpeg);
+            if (ret != ERROR_ENCODER_LOOP) {
+                srs_error("invalid ingest engine: %s %s, ret=%d", 
+                    ingest->arg0().c_str(), engine->arg0().c_str(), ret);
+            }
+            return ret;
+        }
+        
+        SrsIngesterFFMPEG* ingester = new SrsIngesterFFMPEG();
+        if ((ret = ingester->initialize(ffmpeg, vhost->arg0(), ingest->arg0())) != ERROR_SUCCESS) {
+            srs_freep(ingester);
+            return ret;
+        }
+
+        ingesters.push_back(ingester);
+    }
+    
+    return ret;
+}
+
+void SrsIngester::dispose()
+{
+    // first, use fast stop to notice all FFMPEG to quit gracefully.
+    std::vector<SrsIngesterFFMPEG*>::iterator it;
+    for (it = ingesters.begin(); it != ingesters.end(); ++it) {
+        SrsIngesterFFMPEG* ingester = *it;
+        ingester->fast_stop();
+    }
+    
+    if (!ingesters.empty()) {
+        srs_trace("fast stop all ingesters ok.");
+    }
+    
+    // then, use stop to wait FFMPEG quit one by one and send SIGKILL if needed.
+    stop();
+}
+
+void SrsIngester::stop()
+{
+    pthread->stop();
+    clear_engines();
+}
+
+int SrsIngester::cycle()
+{
+    int ret = ERROR_SUCCESS;
+    
+    std::vector<SrsIngesterFFMPEG*>::iterator it;
+    for (it = ingesters.begin(); it != ingesters.end(); ++it) {
+        SrsIngesterFFMPEG* ingester = *it;
+        
+        // start all ffmpegs.
+        if ((ret = ingester->start()) != ERROR_SUCCESS) {
+            srs_error("ingest ffmpeg start failed. ret=%d", ret);
+            return ret;
+        }
+
+        // check ffmpeg status.
+        if ((ret = ingester->cycle()) != ERROR_SUCCESS) {
+            srs_error("ingest ffmpeg cycle failed. ret=%d", ret);
+            return ret;
+        }
+    }
+
+    // pithy print
+    show_ingest_log_message();
+    
+    return ret;
+}
+
+void SrsIngester::on_thread_stop()
+{
+}
+
+void SrsIngester::clear_engines()
+{
+    std::vector<SrsIngesterFFMPEG*>::iterator it;
+    
+    for (it = ingesters.begin(); it != ingesters.end(); ++it) {
+        SrsIngesterFFMPEG* ingester = *it;
+        srs_freep(ingester);
+    }
+
+    ingesters.clear();
+}
+
+int SrsIngester::parse()
+{
+    int ret = ERROR_SUCCESS;
+    
+    // parse ingesters
+    std::vector<SrsConfDirective*> vhosts;
+    _srs_config->get_vhosts(vhosts);
+    
+    for (int i = 0; i < (int)vhosts.size(); i++) {
+        SrsConfDirective* vhost = vhosts[i];
+        if ((ret = parse_ingesters(vhost)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    }
+    
+    return ret;
+}
+
+int SrsIngester::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsConfDirective* vhost, SrsConfDirective* ingest, SrsConfDirective* engine)
+{
+    int ret = ERROR_SUCCESS;
+    
+    std::string port;
+    if (true) {
+        std::vector<std::string> ip_ports = _srs_config->get_listens();
+        srs_assert(ip_ports.size() > 0);
+        
+        std::string ep = ip_ports[0];
+        std::string ip;
+        srs_parse_endpoint(ep, ip, port);
+    }
+    
+    std::string output = _srs_config->get_engine_output(engine);
+    // output stream, to other/self server
+    // ie. rtmp://localhost:1935/live/livestream_sd
+    output = srs_string_replace(output, "[vhost]", vhost->arg0());
+    output = srs_string_replace(output, "[port]", port);
+    if (output.empty()) {
+        ret = ERROR_ENCODER_NO_OUTPUT;
+        srs_trace("empty output url, ingest=%s. ret=%d", ingest->arg0().c_str(), ret);
+        return ret;
+    }
+    
+    // find the app and stream in rtmp url
+    std::string url = output;
+    std::string app, stream;
+    size_t pos = std::string::npos;
+    if ((pos = url.rfind("/")) != std::string::npos) {
+        stream = url.substr(pos + 1);
+        url = url.substr(0, pos);
+    }
+    if ((pos = url.rfind("/")) != std::string::npos) {
+        app = url.substr(pos + 1);
+        url = url.substr(0, pos);
+    }
+    if ((pos = app.rfind("?")) != std::string::npos) {
+        app = app.substr(0, pos);
+    }
+    
+    std::string log_file = SRS_CONSTS_NULL_FILE; // disabled
+    // write ffmpeg info to log file.
+    if (_srs_config->get_ffmpeg_log_enabled()) {
+        log_file = _srs_config->get_ffmpeg_log_dir();
+        log_file += "/";
+        log_file += "ffmpeg-ingest";
+        log_file += "-";
+        log_file += vhost->arg0();
+        log_file += "-";
+        log_file += app;
+        log_file += "-";
+        log_file += stream;
+        log_file += ".log";
+    }
+    
+    // input
+    std::string input_type = _srs_config->get_ingest_input_type(ingest);
+    if (input_type.empty()) {
+        ret = ERROR_ENCODER_NO_INPUT;
+        srs_trace("empty intput type, ingest=%s. ret=%d", ingest->arg0().c_str(), ret);
+        return ret;
+    }
+
+    if (srs_config_ingest_is_file(input_type)) {
+        std::string input_url = _srs_config->get_ingest_input_url(ingest);
+        if (input_url.empty()) {
+            ret = ERROR_ENCODER_NO_INPUT;
+            srs_trace("empty intput url, ingest=%s. ret=%d", ingest->arg0().c_str(), ret);
+            return ret;
+        }
+        
+        // for file, set re.
+        ffmpeg->set_iparams("-re");
+    
+        if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    } else if (srs_config_ingest_is_stream(input_type)) {
+        std::string input_url = _srs_config->get_ingest_input_url(ingest);
+        if (input_url.empty()) {
+            ret = ERROR_ENCODER_NO_INPUT;
+            srs_trace("empty intput url, ingest=%s. ret=%d", ingest->arg0().c_str(), ret);
+            return ret;
+        }
+        
+        // for stream, no re.
+        ffmpeg->set_iparams("");
+    
+        if ((ret = ffmpeg->initialize(input_url, output, log_file)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    } else {
+        ret = ERROR_ENCODER_INPUT_TYPE;
+        srs_error("invalid ingest=%s type=%s, ret=%d", 
+            ingest->arg0().c_str(), input_type.c_str(), ret);
+    }
+    
+    // set output format to flv for RTMP
+    ffmpeg->set_oformat("flv");
+    
+    std::string vcodec = _srs_config->get_engine_vcodec(engine);
+    std::string acodec = _srs_config->get_engine_acodec(engine);
+    // whatever the engine config, use copy as default.
+    bool engine_disabled = !engine || !_srs_config->get_engine_enabled(engine);
+    if (engine_disabled || vcodec.empty() || acodec.empty()) {
+        if ((ret = ffmpeg->initialize_copy()) != ERROR_SUCCESS) {
+            return ret;
+        }
+    } else {
+        if ((ret = ffmpeg->initialize_transcode(engine)) != ERROR_SUCCESS) {
+            return ret;
+        }
+    }
+    
+    srs_trace("parse success, ingest=%s, vhost=%s", 
+        ingest->arg0().c_str(), vhost->arg0().c_str());
+    
+    return ret;
+}
+
+void SrsIngester::show_ingest_log_message()
+{
+    pprint->elapse();
+
+    if ((int)ingesters.size() <= 0) {
+        return;
+    }
+    
+    // random choose one ingester to report.
+    int index = rand() % (int)ingesters.size();
+    SrsIngesterFFMPEG* ingester = ingesters.at(index);
+    
+    // reportable
+    if (pprint->can_print()) {
+        srs_trace("-> "SRS_CONSTS_LOG_INGESTER" time=%"PRId64", ingesters=%d, #%d(alive=%ds, %s)",
+            pprint->age(), (int)ingesters.size(), index, ingester->alive() / 1000, ingester->uri().c_str());
+    }
+}
+
+int SrsIngester::on_reload_vhost_added(string vhost)
+{
+    int ret = ERROR_SUCCESS;
+    
+    SrsConfDirective* _vhost = _srs_config->get_vhost(vhost);
+    if ((ret = parse_ingesters(_vhost)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    
+    srs_trace("reload add vhost ingesters, vhost=%s", vhost.c_str());
+
+    return ret;
+}
+
+int SrsIngester::on_reload_vhost_removed(string vhost)
+{
+    int ret = ERROR_SUCCESS;
+    
+    std::vector<SrsIngesterFFMPEG*>::iterator it;
+    
+    for (it = ingesters.begin(); it != ingesters.end();) {
+        SrsIngesterFFMPEG* ingester = *it;
+        
+        if (!ingester->equals(vhost)) {
+            ++it;
+            continue;
+        }
+        
+        // stop the ffmpeg and free it.
+        ingester->stop();
+        
+        srs_trace("reload stop ingester, vhost=%s, id=%s", vhost.c_str(), ingester->uri().c_str());
+            
+        srs_freep(ingester);
+        
+        // remove the item from ingesters.
+        it = ingesters.erase(it);
+    }
+
+    return ret;
+}
+
+int SrsIngester::on_reload_ingest_removed(string vhost, string ingest_id)
+{
+    int ret = ERROR_SUCCESS;
+    
+    std::vector<SrsIngesterFFMPEG*>::iterator it;
+    
+    for (it = ingesters.begin(); it != ingesters.end();) {
+        SrsIngesterFFMPEG* ingester = *it;
+        
+        if (!ingester->equals(vhost, ingest_id)) {
+            ++it;
+            continue;
+        }
+        
+        // stop the ffmpeg and free it.
+        ingester->stop();
+        
+        srs_trace("reload stop ingester, vhost=%s, id=%s", vhost.c_str(), ingester->uri().c_str());
+            
+        srs_freep(ingester);
+        
+        // remove the item from ingesters.
+        it = ingesters.erase(it);
+    }
+    
+    return ret;
+}
+
+int SrsIngester::on_reload_ingest_added(string vhost, string ingest_id)
+{
+    int ret = ERROR_SUCCESS;
+    
+    SrsConfDirective* _vhost = _srs_config->get_vhost(vhost);
+    SrsConfDirective* _ingester = _srs_config->get_ingest_by_id(vhost, ingest_id);
+    
+    if ((ret = parse_engines(_vhost, _ingester)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    
+    srs_trace("reload add ingester, "
+        "vhost=%s, id=%s", vhost.c_str(), ingest_id.c_str());
+    
+    return ret;
+}
+
+int SrsIngester::on_reload_ingest_updated(string vhost, string ingest_id)
+{
+    int ret = ERROR_SUCCESS;
+
+    if ((ret = on_reload_ingest_removed(vhost, ingest_id)) != ERROR_SUCCESS) {
+        return ret;
+    }
+
+    if ((ret = on_reload_ingest_added(vhost, ingest_id)) != ERROR_SUCCESS) {
+        return ret;
+    }
+    
+    srs_trace("reload updated ingester, "
+        "vhost=%s, id=%s", vhost.c_str(), ingest_id.c_str());
+    
+    return ret;
+}
+
+#endif
+
--- a/samples/C/Arduino.cats
+++ b/samples/C/Arduino.cats
@@ -0,0 +1,60 @@
+/** The MIT License (MIT)
+
+Copyright (c) 2014 Hongwei Xi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+// Source: https://github.com/githwxi/ATS-Postiats-contrib/blob/master/contrib/arduino/CATS/Arduino.cats
+
+
+/*
+** The prelude for Ardunio
+*/
+
+/* ****** ****** */
+
+#ifndef ARDUINO_CATS_ARDUINO
+#define ARDUINO_CATS_ARDUINO
+
+/* ****** ****** */
+
+#include <Arduino.h>
+
+/* ****** ****** */
+
+#define delay_int(ms) delay(ms)
+#define delay_ulint(ms) delay(ms)
+
+/* ****** ****** */
+//
+#define random_int_1(x) random(x)
+#define random_int_2(x, y) random(x, y)
+#define random_lint_1(x) random(x)
+#define random_lint_2(x, y) random(x, y)
+//
+#define randomSeed_int(x) randomSeed(x)
+#define randomSeed_uint(x) randomSeed(x)
+//
+/* ****** ****** */
+
+#endif // #ifndef(ARDUINO_CATS_ARDUINO)
+
+/* ****** ****** */
+
+/* end of [Arduino.cats] */
--- a/samples/C/array.c
+++ b/samples/C/array.c
@@ -0,0 +1,45 @@
+#include <array.h>
+
+unsigned __bump_up(unsigned n) {
+    unsigned base = 1;
+    --n;
+    while (base < sizeof n * 8) {
+        n |= n >> base;
+        base *= 2;
+    }
+    ++n;
+    n += (n == 0);
+    return n;
+}
+
+void *__array_alloc(size_t size, unsigned length) {
+    unsigned allocated = __bump_up(length);
+    struct __array_header *head = malloc(sizeof *head + allocated * size);
+    assert(head);
+    head->length = length;
+    head->allocated = allocated;
+    return (void *) (head + 1);
+}
+
+void __array_resize(void **array, size_t size, int difference) {
+    if (difference == 0) {
+        return;
+    }
+    struct __array_header *head = __header(*array);
+    head->length += difference;
+    if (head->length >= head->allocated) {
+        head->allocated = __bump_up(head->length);
+        head = realloc(head, sizeof *head + head->allocated * size);
+        assert(head);
+        *array = head + 1;
+    }
+}
+
+int __array_search(void *array, void *elem, size_t size) {
+    for (unsigned i = 0; i < alength(array) * size; i += size) {
+        if (memcmp((char *)array + i, elem, size) == 0) {
+            return 1;
+        }
+    }
+    return 0;
+}
--- a/samples/C/array.h
+++ b/samples/C/array.h
@@ -0,0 +1,58 @@
+#ifndef ARRAY_H
+#define ARRAY_H value
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define array(type, name, initial_length) \
+    type *name = __array_alloc(sizeof(type), initial_length)
+
+#define aforeach(it, array) \
+    for (unsigned it = 0; \
+            it < alength(array); \
+            ++it)
+
+#define __header(array) \
+    ((struct __array_header *) array - 1)
+
+#define alength(array) \
+    (__header(array)->length)
+
+#define afree(array) \
+    free(__header(array))
+
+#define apush(array, elem) \
+    __array_resize((void **) &array, sizeof *array, 1); \
+    array[alength(array)-1] = elem
+
+#define apop(array) \
+    aremove(array, (alength(array) - 1))
+
+#define aremove(array, index) \
+    assert(alength(array) > index); \
+    memmove(array + index, array + index + 1, sizeof *array * (alength(array) - index - 1)); \
+    __array_resize((void **) &array, sizeof *array, -1)
+
+#define ainsert(array, index, elem) \
+    __array_resize((void **) &array, sizeof *array, index >= alength(array) ? index - alength(array) + 1 : 1); \
+    memmove(array + index + 1, array + index, sizeof *array * (alength(array) - index - 1)); \
+    array[index] = elem
+
+#define acontains(array, elem) \
+    __array_search(array, &elem, sizeof elem)
+
+#define __arrayallocated(array) \
+    (__header(array)->allocated)
+
+struct __array_header {
+    unsigned length;
+    unsigned allocated;
+};
+
+unsigned __bump_up(unsigned n);
+void *__array_alloc(size_t size, unsigned length);
+void __array_resize(void **array, size_t size, int difference);
+int __array_search(void *array, void *elem, size_t size);
+
+#endif /* ifndef ARRAY_H */
--- a/samples/C/cache.c
+++ b/samples/C/cache.c
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "common.h"
-#include "repository.h"
-#include "commit.h"
-#include "thread-utils.h"
-#include "util.h"
-#include "cache.h"
-
-int git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr)
-{
-	if (size < 8)
-		size = 8;
-	size = git__size_t_powerof2(size);
-
-	cache->size_mask = size - 1;
-	cache->lru_count = 0;
-	cache->free_obj = free_ptr;
-
-	git_mutex_init(&cache->lock);
-
-	cache->nodes = git__malloc(size * sizeof(git_cached_obj *));
-	GITERR_CHECK_ALLOC(cache->nodes);
-
-	memset(cache->nodes, 0x0, size * sizeof(git_cached_obj *));
-	return 0;
-}
-
-void git_cache_free(git_cache *cache)
-{
-	size_t i;
-
-	for (i = 0; i < (cache->size_mask + 1); ++i) {
-		if (cache->nodes[i] != NULL)
-			git_cached_obj_decref(cache->nodes[i], cache->free_obj);
-	}
-
-	git__free(cache->nodes);
-}
-
-void *git_cache_get(git_cache *cache, const git_oid *oid)
-{
-	uint32_t hash;
-	git_cached_obj *node = NULL, *result = NULL;
-
-	memcpy(&hash, oid->id, sizeof(hash));
-
-	git_mutex_lock(&cache->lock);
-	{
-		node = cache->nodes[hash & cache->size_mask];
-
-		if (node != NULL && git_oid_cmp(&node->oid, oid) == 0) {
-			git_cached_obj_incref(node);
-			result = node;
-		}
-	}
-	git_mutex_unlock(&cache->lock);
-
-	return result;
-}
-
-void *git_cache_try_store(git_cache *cache, void *_entry)
-{
-	git_cached_obj *entry = _entry;
-	uint32_t hash;
-
-	memcpy(&hash, &entry->oid, sizeof(uint32_t));
-
-	/* increase the refcount on this object, because
-	 * the cache now owns it */
-	git_cached_obj_incref(entry);
-
-	git_mutex_lock(&cache->lock);
-	{
-		git_cached_obj *node = cache->nodes[hash & cache->size_mask];
-
-		if (node == NULL) {
-			cache->nodes[hash & cache->size_mask] = entry;
-		} else if (git_oid_cmp(&node->oid, &entry->oid) == 0) {
-			git_cached_obj_decref(entry, cache->free_obj);
-			entry = node;
-		} else {
-			git_cached_obj_decref(node, cache->free_obj);
-			cache->nodes[hash & cache->size_mask] = entry;
-		}
-	}
-	git_mutex_unlock(&cache->lock);
-
-	/* increase the refcount again, because we are
-	 * returning it to the user */
-	git_cached_obj_incref(entry);
-
-	return entry;
-}
--- a/samples/C/cpu.c
+++ b/samples/C/cpu.c
@@ -1,725 +0,0 @@
-/* CPU control.
- * (C) 2001, 2002, 2003, 2004 Rusty Russell
- *
- * This code is licenced under the GPL.
- */
-#include <linux/proc_fs.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/notifier.h>
-#include <linux/sched.h>
-#include <linux/unistd.h>
-#include <linux/cpu.h>
-#include <linux/oom.h>
-#include <linux/rcupdate.h>
-#include <linux/export.h>
-#include <linux/bug.h>
-#include <linux/kthread.h>
-#include <linux/stop_machine.h>
-#include <linux/mutex.h>
-#include <linux/gfp.h>
-#include <linux/suspend.h>
-
-#include "smpboot.h"
-
-#ifdef CONFIG_SMP
-/* Serializes the updates to cpu_online_mask, cpu_present_mask */
-static DEFINE_MUTEX(cpu_add_remove_lock);
-
-/*
- * The following two API's must be used when attempting
- * to serialize the updates to cpu_online_mask, cpu_present_mask.
- */
-void cpu_maps_update_begin(void)
-{
-	mutex_lock(&cpu_add_remove_lock);
-}
-
-void cpu_maps_update_done(void)
-{
-	mutex_unlock(&cpu_add_remove_lock);
-}
-
-static RAW_NOTIFIER_HEAD(cpu_chain);
-
-/* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
- * Should always be manipulated under cpu_add_remove_lock
- */
-static int cpu_hotplug_disabled;
-
-#ifdef CONFIG_HOTPLUG_CPU
-
-static struct {
-	struct task_struct *active_writer;
-	struct mutex lock; /* Synchronizes accesses to refcount, */
-	/*
-	 * Also blocks the new readers during
-	 * an ongoing cpu hotplug operation.
-	 */
-	int refcount;
-} cpu_hotplug = {
-	.active_writer = NULL,
-	.lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
-	.refcount = 0,
-};
-
-void get_online_cpus(void)
-{
-	might_sleep();
-	if (cpu_hotplug.active_writer == current)
-		return;
-	mutex_lock(&cpu_hotplug.lock);
-	cpu_hotplug.refcount++;
-	mutex_unlock(&cpu_hotplug.lock);
-
-}
-EXPORT_SYMBOL_GPL(get_online_cpus);
-
-void put_online_cpus(void)
-{
-	if (cpu_hotplug.active_writer == current)
-		return;
-	mutex_lock(&cpu_hotplug.lock);
-	if (!--cpu_hotplug.refcount && unlikely(cpu_hotplug.active_writer))
-		wake_up_process(cpu_hotplug.active_writer);
-	mutex_unlock(&cpu_hotplug.lock);
-
-}
-EXPORT_SYMBOL_GPL(put_online_cpus);
-
-/*
- * This ensures that the hotplug operation can begin only when the
- * refcount goes to zero.
- *
- * Note that during a cpu-hotplug operation, the new readers, if any,
- * will be blocked by the cpu_hotplug.lock
- *
- * Since cpu_hotplug_begin() is always called after invoking
- * cpu_maps_update_begin(), we can be sure that only one writer is active.
- *
- * Note that theoretically, there is a possibility of a livelock:
- * - Refcount goes to zero, last reader wakes up the sleeping
- *   writer.
- * - Last reader unlocks the cpu_hotplug.lock.
- * - A new reader arrives at this moment, bumps up the refcount.
- * - The writer acquires the cpu_hotplug.lock finds the refcount
- *   non zero and goes to sleep again.
- *
- * However, this is very difficult to achieve in practice since
- * get_online_cpus() not an api which is called all that often.
- *
- */
-static void cpu_hotplug_begin(void)
-{
-	cpu_hotplug.active_writer = current;
-
-	for (;;) {
-		mutex_lock(&cpu_hotplug.lock);
-		if (likely(!cpu_hotplug.refcount))
-			break;
-		__set_current_state(TASK_UNINTERRUPTIBLE);
-		mutex_unlock(&cpu_hotplug.lock);
-		schedule();
-	}
-}
-
-static void cpu_hotplug_done(void)
-{
-	cpu_hotplug.active_writer = NULL;
-	mutex_unlock(&cpu_hotplug.lock);
-}
-
-#else /* #if CONFIG_HOTPLUG_CPU */
-static void cpu_hotplug_begin(void) {}
-static void cpu_hotplug_done(void) {}
-#endif	/* #else #if CONFIG_HOTPLUG_CPU */
-
-/* Need to know about CPUs going up/down? */
-int __ref register_cpu_notifier(struct notifier_block *nb)
-{
-	int ret;
-	cpu_maps_update_begin();
-	ret = raw_notifier_chain_register(&cpu_chain, nb);
-	cpu_maps_update_done();
-	return ret;
-}
-
-static int __cpu_notify(unsigned long val, void *v, int nr_to_call,
-			int *nr_calls)
-{
-	int ret;
-
-	ret = __raw_notifier_call_chain(&cpu_chain, val, v, nr_to_call,
-					nr_calls);
-
-	return notifier_to_errno(ret);
-}
-
-static int cpu_notify(unsigned long val, void *v)
-{
-	return __cpu_notify(val, v, -1, NULL);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-
-static void cpu_notify_nofail(unsigned long val, void *v)
-{
-	BUG_ON(cpu_notify(val, v));
-}
-EXPORT_SYMBOL(register_cpu_notifier);
-
-void __ref unregister_cpu_notifier(struct notifier_block *nb)
-{
-	cpu_maps_update_begin();
-	raw_notifier_chain_unregister(&cpu_chain, nb);
-	cpu_maps_update_done();
-}
-EXPORT_SYMBOL(unregister_cpu_notifier);
-
-/**
- * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU
- * @cpu: a CPU id
- *
- * This function walks all processes, finds a valid mm struct for each one and
- * then clears a corresponding bit in mm's cpumask.  While this all sounds
- * trivial, there are various non-obvious corner cases, which this function
- * tries to solve in a safe manner.
- *
- * Also note that the function uses a somewhat relaxed locking scheme, so it may
- * be called only for an already offlined CPU.
- */
-void clear_tasks_mm_cpumask(int cpu)
-{
-	struct task_struct *p;
-
-	/*
-	 * This function is called after the cpu is taken down and marked
-	 * offline, so its not like new tasks will ever get this cpu set in
-	 * their mm mask. -- Peter Zijlstra
-	 * Thus, we may use rcu_read_lock() here, instead of grabbing
-	 * full-fledged tasklist_lock.
-	 */
-	WARN_ON(cpu_online(cpu));
-	rcu_read_lock();
-	for_each_process(p) {
-		struct task_struct *t;
-
-		/*
-		 * Main thread might exit, but other threads may still have
-		 * a valid mm. Find one.
-		 */
-		t = find_lock_task_mm(p);
-		if (!t)
-			continue;
-		cpumask_clear_cpu(cpu, mm_cpumask(t->mm));
-		task_unlock(t);
-	}
-	rcu_read_unlock();
-}
-
-static inline void check_for_tasks(int cpu)
-{
-	struct task_struct *p;
-
-	write_lock_irq(&tasklist_lock);
-	for_each_process(p) {
-		if (task_cpu(p) == cpu && p->state == TASK_RUNNING &&
-		    (p->utime || p->stime))
-			printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d "
-				"(state = %ld, flags = %x)\n",
-				p->comm, task_pid_nr(p), cpu,
-				p->state, p->flags);
-	}
-	write_unlock_irq(&tasklist_lock);
-}
-
-struct take_cpu_down_param {
-	unsigned long mod;
-	void *hcpu;
-};
-
-/* Take this CPU down. */
-static int __ref take_cpu_down(void *_param)
-{
-	struct take_cpu_down_param *param = _param;
-	int err;
-
-	/* Ensure this CPU doesn't handle any more interrupts. */
-	err = __cpu_disable();
-	if (err < 0)
-		return err;
-
-	cpu_notify(CPU_DYING | param->mod, param->hcpu);
-	return 0;
-}
-
-/* Requires cpu_add_remove_lock to be held */
-static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
-{
-	int err, nr_calls = 0;
-	void *hcpu = (void *)(long)cpu;
-	unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
-	struct take_cpu_down_param tcd_param = {
-		.mod = mod,
-		.hcpu = hcpu,
-	};
-
-	if (num_online_cpus() == 1)
-		return -EBUSY;
-
-	if (!cpu_online(cpu))
-		return -EINVAL;
-
-	cpu_hotplug_begin();
-
-	err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls);
-	if (err) {
-		nr_calls--;
-		__cpu_notify(CPU_DOWN_FAILED | mod, hcpu, nr_calls, NULL);
-		printk("%s: attempt to take down CPU %u failed\n",
-				__func__, cpu);
-		goto out_release;
-	}
-
-	err = __stop_machine(take_cpu_down, &tcd_param, cpumask_of(cpu));
-	if (err) {
-		/* CPU didn't die: tell everyone.  Can't complain. */
-		cpu_notify_nofail(CPU_DOWN_FAILED | mod, hcpu);
-
-		goto out_release;
-	}
-	BUG_ON(cpu_online(cpu));
-
-	/*
-	 * The migration_call() CPU_DYING callback will have removed all
-	 * runnable tasks from the cpu, there's only the idle task left now
-	 * that the migration thread is done doing the stop_machine thing.
-	 *
-	 * Wait for the stop thread to go away.
-	 */
-	while (!idle_cpu(cpu))
-		cpu_relax();
-
-	/* This actually kills the CPU. */
-	__cpu_die(cpu);
-
-	/* CPU is completely dead: tell everyone.  Too late to complain. */
-	cpu_notify_nofail(CPU_DEAD | mod, hcpu);
-
-	check_for_tasks(cpu);
-
-out_release:
-	cpu_hotplug_done();
-	if (!err)
-		cpu_notify_nofail(CPU_POST_DEAD | mod, hcpu);
-	return err;
-}
-
-int __ref cpu_down(unsigned int cpu)
-{
-	int err;
-
-	cpu_maps_update_begin();
-
-	if (cpu_hotplug_disabled) {
-		err = -EBUSY;
-		goto out;
-	}
-
-	err = _cpu_down(cpu, 0);
-
-out:
-	cpu_maps_update_done();
-	return err;
-}
-EXPORT_SYMBOL(cpu_down);
-#endif /*CONFIG_HOTPLUG_CPU*/
-
-/* Requires cpu_add_remove_lock to be held */
-static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
-{
-	int ret, nr_calls = 0;
-	void *hcpu = (void *)(long)cpu;
-	unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
-	struct task_struct *idle;
-
-	if (cpu_online(cpu) || !cpu_present(cpu))
-		return -EINVAL;
-
-	cpu_hotplug_begin();
-
-	idle = idle_thread_get(cpu);
-	if (IS_ERR(idle)) {
-		ret = PTR_ERR(idle);
-		goto out;
-	}
-
-	ret = __cpu_notify(CPU_UP_PREPARE | mod, hcpu, -1, &nr_calls);
-	if (ret) {
-		nr_calls--;
-		printk(KERN_WARNING "%s: attempt to bring up CPU %u failed\n",
-				__func__, cpu);
-		goto out_notify;
-	}
-
-	/* Arch-specific enabling code. */
-	ret = __cpu_up(cpu, idle);
-	if (ret != 0)
-		goto out_notify;
-	BUG_ON(!cpu_online(cpu));
-
-	/* Now call notifier in preparation. */
-	cpu_notify(CPU_ONLINE | mod, hcpu);
-
-out_notify:
-	if (ret != 0)
-		__cpu_notify(CPU_UP_CANCELED | mod, hcpu, nr_calls, NULL);
-out:
-	cpu_hotplug_done();
-
-	return ret;
-}
-
-int __cpuinit cpu_up(unsigned int cpu)
-{
-	int err = 0;
-
-#ifdef	CONFIG_MEMORY_HOTPLUG
-	int nid;
-	pg_data_t	*pgdat;
-#endif
-
-	if (!cpu_possible(cpu)) {
-		printk(KERN_ERR "can't online cpu %d because it is not "
-			"configured as may-hotadd at boot time\n", cpu);
-#if defined(CONFIG_IA64)
-		printk(KERN_ERR "please check additional_cpus= boot "
-				"parameter\n");
-#endif
-		return -EINVAL;
-	}
-
-#ifdef	CONFIG_MEMORY_HOTPLUG
-	nid = cpu_to_node(cpu);
-	if (!node_online(nid)) {
-		err = mem_online_node(nid);
-		if (err)
-			return err;
-	}
-
-	pgdat = NODE_DATA(nid);
-	if (!pgdat) {
-		printk(KERN_ERR
-			"Can't online cpu %d due to NULL pgdat\n", cpu);
-		return -ENOMEM;
-	}
-
-	if (pgdat->node_zonelists->_zonerefs->zone == NULL) {
-		mutex_lock(&zonelists_mutex);
-		build_all_zonelists(NULL);
-		mutex_unlock(&zonelists_mutex);
-	}
-#endif
-
-	cpu_maps_update_begin();
-
-	if (cpu_hotplug_disabled) {
-		err = -EBUSY;
-		goto out;
-	}
-
-	err = _cpu_up(cpu, 0);
-
-out:
-	cpu_maps_update_done();
-	return err;
-}
-EXPORT_SYMBOL_GPL(cpu_up);
-
-#ifdef CONFIG_PM_SLEEP_SMP
-static cpumask_var_t frozen_cpus;
-
-void __weak arch_disable_nonboot_cpus_begin(void)
-{
-}
-
-void __weak arch_disable_nonboot_cpus_end(void)
-{
-}
-
-int disable_nonboot_cpus(void)
-{
-	int cpu, first_cpu, error = 0;
-
-	cpu_maps_update_begin();
-	first_cpu = cpumask_first(cpu_online_mask);
-	/*
-	 * We take down all of the non-boot CPUs in one shot to avoid races
-	 * with the userspace trying to use the CPU hotplug at the same time
-	 */
-	cpumask_clear(frozen_cpus);
-	arch_disable_nonboot_cpus_begin();
-
-	printk("Disabling non-boot CPUs ...\n");
-	for_each_online_cpu(cpu) {
-		if (cpu == first_cpu)
-			continue;
-		error = _cpu_down(cpu, 1);
-		if (!error)
-			cpumask_set_cpu(cpu, frozen_cpus);
-		else {
-			printk(KERN_ERR "Error taking CPU%d down: %d\n",
-				cpu, error);
-			break;
-		}
-	}
-
-	arch_disable_nonboot_cpus_end();
-
-	if (!error) {
-		BUG_ON(num_online_cpus() > 1);
-		/* Make sure the CPUs won't be enabled by someone else */
-		cpu_hotplug_disabled = 1;
-	} else {
-		printk(KERN_ERR "Non-boot CPUs are not disabled\n");
-	}
-	cpu_maps_update_done();
-	return error;
-}
-
-void __weak arch_enable_nonboot_cpus_begin(void)
-{
-}
-
-void __weak arch_enable_nonboot_cpus_end(void)
-{
-}
-
-void __ref enable_nonboot_cpus(void)
-{
-	int cpu, error;
-
-	/* Allow everyone to use the CPU hotplug again */
-	cpu_maps_update_begin();
-	cpu_hotplug_disabled = 0;
-	if (cpumask_empty(frozen_cpus))
-		goto out;
-
-	printk(KERN_INFO "Enabling non-boot CPUs ...\n");
-
-	arch_enable_nonboot_cpus_begin();
-
-	for_each_cpu(cpu, frozen_cpus) {
-		error = _cpu_up(cpu, 1);
-		if (!error) {
-			printk(KERN_INFO "CPU%d is up\n", cpu);
-			continue;
-		}
-		printk(KERN_WARNING "Error taking CPU%d up: %d\n", cpu, error);
-	}
-
-	arch_enable_nonboot_cpus_end();
-
-	cpumask_clear(frozen_cpus);
-out:
-	cpu_maps_update_done();
-}
-
-static int __init alloc_frozen_cpus(void)
-{
-	if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO))
-		return -ENOMEM;
-	return 0;
-}
-core_initcall(alloc_frozen_cpus);
-
-/*
- * Prevent regular CPU hotplug from racing with the freezer, by disabling CPU
- * hotplug when tasks are about to be frozen. Also, don't allow the freezer
- * to continue until any currently running CPU hotplug operation gets
- * completed.
- * To modify the 'cpu_hotplug_disabled' flag, we need to acquire the
- * 'cpu_add_remove_lock'. And this same lock is also taken by the regular
- * CPU hotplug path and released only after it is complete. Thus, we
- * (and hence the freezer) will block here until any currently running CPU
- * hotplug operation gets completed.
- */
-void cpu_hotplug_disable_before_freeze(void)
-{
-	cpu_maps_update_begin();
-	cpu_hotplug_disabled = 1;
-	cpu_maps_update_done();
-}
-
-
-/*
- * When tasks have been thawed, re-enable regular CPU hotplug (which had been
- * disabled while beginning to freeze tasks).
- */
-void cpu_hotplug_enable_after_thaw(void)
-{
-	cpu_maps_update_begin();
-	cpu_hotplug_disabled = 0;
-	cpu_maps_update_done();
-}
-
-/*
- * When callbacks for CPU hotplug notifications are being executed, we must
- * ensure that the state of the system with respect to the tasks being frozen
- * or not, as reported by the notification, remains unchanged *throughout the
- * duration* of the execution of the callbacks.
- * Hence we need to prevent the freezer from racing with regular CPU hotplug.
- *
- * This synchronization is implemented by mutually excluding regular CPU
- * hotplug and Suspend/Hibernate call paths by hooking onto the Suspend/
- * Hibernate notifications.
- */
-static int
-cpu_hotplug_pm_callback(struct notifier_block *nb,
-			unsigned long action, void *ptr)
-{
-	switch (action) {
-
-	case PM_SUSPEND_PREPARE:
-	case PM_HIBERNATION_PREPARE:
-		cpu_hotplug_disable_before_freeze();
-		break;
-
-	case PM_POST_SUSPEND:
-	case PM_POST_HIBERNATION:
-		cpu_hotplug_enable_after_thaw();
-		break;
-
-	default:
-		return NOTIFY_DONE;
-	}
-
-	return NOTIFY_OK;
-}
-
-
-static int __init cpu_hotplug_pm_sync_init(void)
-{
-	pm_notifier(cpu_hotplug_pm_callback, 0);
-	return 0;
-}
-core_initcall(cpu_hotplug_pm_sync_init);
-
-#endif /* CONFIG_PM_SLEEP_SMP */
-
-/**
- * notify_cpu_starting(cpu) - call the CPU_STARTING notifiers
- * @cpu: cpu that just started
- *
- * This function calls the cpu_chain notifiers with CPU_STARTING.
- * It must be called by the arch code on the new cpu, before the new cpu
- * enables interrupts and before the "boot" cpu returns from __cpu_up().
- */
-void __cpuinit notify_cpu_starting(unsigned int cpu)
-{
-	unsigned long val = CPU_STARTING;
-
-#ifdef CONFIG_PM_SLEEP_SMP
-	if (frozen_cpus != NULL && cpumask_test_cpu(cpu, frozen_cpus))
-		val = CPU_STARTING_FROZEN;
-#endif /* CONFIG_PM_SLEEP_SMP */
-	cpu_notify(val, (void *)(long)cpu);
-}
-
-#endif /* CONFIG_SMP */
-
-/*
- * cpu_bit_bitmap[] is a special, "compressed" data structure that
- * represents all NR_CPUS bits binary values of 1<<nr.
- *
- * It is used by cpumask_of() to get a constant address to a CPU
- * mask value that has a single bit set only.
- */
-
-/* cpu_bit_bitmap[0] is empty - so we can back into it */
-#define MASK_DECLARE_1(x)	[x+1][0] = (1UL << (x))
-#define MASK_DECLARE_2(x)	MASK_DECLARE_1(x), MASK_DECLARE_1(x+1)
-#define MASK_DECLARE_4(x)	MASK_DECLARE_2(x), MASK_DECLARE_2(x+2)
-#define MASK_DECLARE_8(x)	MASK_DECLARE_4(x), MASK_DECLARE_4(x+4)
-
-const unsigned long cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)] = {
-
-	MASK_DECLARE_8(0),	MASK_DECLARE_8(8),
-	MASK_DECLARE_8(16),	MASK_DECLARE_8(24),
-#if BITS_PER_LONG > 32
-	MASK_DECLARE_8(32),	MASK_DECLARE_8(40),
-	MASK_DECLARE_8(48),	MASK_DECLARE_8(56),
-#endif
-};
-EXPORT_SYMBOL_GPL(cpu_bit_bitmap);
-
-const DECLARE_BITMAP(cpu_all_bits, NR_CPUS) = CPU_BITS_ALL;
-EXPORT_SYMBOL(cpu_all_bits);
-
-#ifdef CONFIG_INIT_ALL_POSSIBLE
-static DECLARE_BITMAP(cpu_possible_bits, CONFIG_NR_CPUS) __read_mostly
-	= CPU_BITS_ALL;
-#else
-static DECLARE_BITMAP(cpu_possible_bits, CONFIG_NR_CPUS) __read_mostly;
-#endif
-const struct cpumask *const cpu_possible_mask = to_cpumask(cpu_possible_bits);
-EXPORT_SYMBOL(cpu_possible_mask);
-
-static DECLARE_BITMAP(cpu_online_bits, CONFIG_NR_CPUS) __read_mostly;
-const struct cpumask *const cpu_online_mask = to_cpumask(cpu_online_bits);
-EXPORT_SYMBOL(cpu_online_mask);
-
-static DECLARE_BITMAP(cpu_present_bits, CONFIG_NR_CPUS) __read_mostly;
-const struct cpumask *const cpu_present_mask = to_cpumask(cpu_present_bits);
-EXPORT_SYMBOL(cpu_present_mask);
-
-static DECLARE_BITMAP(cpu_active_bits, CONFIG_NR_CPUS) __read_mostly;
-const struct cpumask *const cpu_active_mask = to_cpumask(cpu_active_bits);
-EXPORT_SYMBOL(cpu_active_mask);
-
-void set_cpu_possible(unsigned int cpu, bool possible)
-{
-	if (possible)
-		cpumask_set_cpu(cpu, to_cpumask(cpu_possible_bits));
-	else
-		cpumask_clear_cpu(cpu, to_cpumask(cpu_possible_bits));
-}
-
-void set_cpu_present(unsigned int cpu, bool present)
-{
-	if (present)
-		cpumask_set_cpu(cpu, to_cpumask(cpu_present_bits));
-	else
-		cpumask_clear_cpu(cpu, to_cpumask(cpu_present_bits));
-}
-
-void set_cpu_online(unsigned int cpu, bool online)
-{
-	if (online)
-		cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits));
-	else
-		cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits));
-}
-
-void set_cpu_active(unsigned int cpu, bool active)
-{
-	if (active)
-		cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits));
-	else
-		cpumask_clear_cpu(cpu, to_cpumask(cpu_active_bits));
-}
-
-void init_cpu_present(const struct cpumask *src)
-{
-	cpumask_copy(to_cpumask(cpu_present_bits), src);
-}
-
-void init_cpu_possible(const struct cpumask *src)
-{
-	cpumask_copy(to_cpumask(cpu_possible_bits), src);
-}
-
-void init_cpu_online(const struct cpumask *src)
-{
-	cpumask_copy(to_cpumask(cpu_online_bits), src);
-}
--- a/samples/C/custom_extensions.c
+++ b/samples/C/custom_extensions.c
@@ -0,0 +1,257 @@
+/* Copyright (c) 2014, Google Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+
+#include <openssl/ssl.h>
+
+#include <assert.h>
+#include <string.h>
+
+#include <openssl/bytestring.h>
+#include <openssl/err.h>
+#include <openssl/mem.h>
+#include <openssl/stack.h>
+
+#include "internal.h"
+
+
+void SSL_CUSTOM_EXTENSION_free(SSL_CUSTOM_EXTENSION *custom_extension) {
+  OPENSSL_free(custom_extension);
+}
+
+static const SSL_CUSTOM_EXTENSION *custom_ext_find(
+    STACK_OF(SSL_CUSTOM_EXTENSION) *stack,
+    unsigned *out_index, uint16_t value) {
+  size_t i;
+  for (i = 0; i < sk_SSL_CUSTOM_EXTENSION_num(stack); i++) {
+    const SSL_CUSTOM_EXTENSION *ext = sk_SSL_CUSTOM_EXTENSION_value(stack, i);
+    if (ext->value == value) {
+      if (out_index != NULL) {
+        *out_index = i;
+      }
+      return ext;
+    }
+  }
+
+  return NULL;
+}
+
+/* default_add_callback is used as the |add_callback| when the user doesn't
+ * provide one. For servers, it does nothing while, for clients, it causes an
+ * empty extension to be included. */
+static int default_add_callback(SSL *ssl, unsigned extension_value,
+                                const uint8_t **out, size_t *out_len,
+                                int *out_alert_value, void *add_arg) {
+  if (ssl->server) {
+    return 0;
+  }
+  *out_len = 0;
+  return 1;
+}
+
+static int custom_ext_add_hello(SSL *ssl, CBB *extensions) {
+  STACK_OF(SSL_CUSTOM_EXTENSION) *stack = ssl->ctx->client_custom_extensions;
+  if (ssl->server) {
+    stack = ssl->ctx->server_custom_extensions;
+  }
+
+  if (stack == NULL) {
+    return 1;
+  }
+
+  size_t i;
+  for (i = 0; i < sk_SSL_CUSTOM_EXTENSION_num(stack); i++) {
+    const SSL_CUSTOM_EXTENSION *ext = sk_SSL_CUSTOM_EXTENSION_value(stack, i);
+
+    if (ssl->server &&
+        !(ssl->s3->tmp.custom_extensions.received & (1u << i))) {
+      /* Servers cannot echo extensions that the client didn't send. */
+      continue;
+    }
+
+    const uint8_t *contents;
+    size_t contents_len;
+    int alert = SSL_AD_DECODE_ERROR;
+    CBB contents_cbb;
+
+    switch (ext->add_callback(ssl, ext->value, &contents, &contents_len, &alert,
+                              ext->add_arg)) {
+      case 1:
+        if (!CBB_add_u16(extensions, ext->value) ||
+            !CBB_add_u16_length_prefixed(extensions, &contents_cbb) ||
+            !CBB_add_bytes(&contents_cbb, contents, contents_len) ||
+            !CBB_flush(extensions)) {
+          OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
+          ERR_add_error_dataf("extension: %u", (unsigned) ext->value);
+          if (ext->free_callback && 0 < contents_len) {
+            ext->free_callback(ssl, ext->value, contents, ext->add_arg);
+          }
+          return 0;
+        }
+
+        if (ext->free_callback && 0 < contents_len) {
+          ext->free_callback(ssl, ext->value, contents, ext->add_arg);
+        }
+
+        if (!ssl->server) {
+          assert((ssl->s3->tmp.custom_extensions.sent & (1u << i)) == 0);
+          ssl->s3->tmp.custom_extensions.sent |= (1u << i);
+        }
+        break;
+
+      case 0:
+        break;
+
+      default:
+        ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
+        OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
+        ERR_add_error_dataf("extension: %u", (unsigned) ext->value);
+        return 0;
+    }
+  }
+
+  return 1;
+}
+
+int custom_ext_add_clienthello(SSL *ssl, CBB *extensions) {
+  return custom_ext_add_hello(ssl, extensions);
+}
+
+int custom_ext_parse_serverhello(SSL *ssl, int *out_alert, uint16_t value,
+                                 const CBS *extension) {
+  unsigned index;
+  const SSL_CUSTOM_EXTENSION *ext =
+      custom_ext_find(ssl->ctx->client_custom_extensions, &index, value);
+
+  if (/* Unknown extensions are not allowed in a ServerHello. */
+      ext == NULL ||
+      /* Also, if we didn't send the extension, that's also unacceptable. */
+      !(ssl->s3->tmp.custom_extensions.sent & (1u << index))) {
+    OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION);
+    ERR_add_error_dataf("extension: %u", (unsigned)value);
+    *out_alert = SSL_AD_DECODE_ERROR;
+    return 0;
+  }
+
+  if (ext->parse_callback != NULL &&
+      !ext->parse_callback(ssl, value, CBS_data(extension), CBS_len(extension),
+                           out_alert, ext->parse_arg)) {
+    OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
+    ERR_add_error_dataf("extension: %u", (unsigned)ext->value);
+    return 0;
+  }
+
+  return 1;
+}
+
+int custom_ext_parse_clienthello(SSL *ssl, int *out_alert, uint16_t value,
+                                 const CBS *extension) {
+  unsigned index;
+  const SSL_CUSTOM_EXTENSION *ext =
+      custom_ext_find(ssl->ctx->server_custom_extensions, &index, value);
+
+  if (ext == NULL) {
+    return 1;
+  }
+
+  assert((ssl->s3->tmp.custom_extensions.received & (1u << index)) == 0);
+  ssl->s3->tmp.custom_extensions.received |= (1u << index);
+
+  if (ext->parse_callback &&
+      !ext->parse_callback(ssl, value, CBS_data(extension), CBS_len(extension),
+                           out_alert, ext->parse_arg)) {
+    OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
+    ERR_add_error_dataf("extension: %u", (unsigned)ext->value);
+    return 0;
+  }
+
+  return 1;
+}
+
+int custom_ext_add_serverhello(SSL *ssl, CBB *extensions) {
+  return custom_ext_add_hello(ssl, extensions);
+}
+
+/* MAX_NUM_CUSTOM_EXTENSIONS is the maximum number of custom extensions that
+ * can be set on an |SSL_CTX|. It's determined by the size of the bitset used
+ * to track when an extension has been sent. */
+#define MAX_NUM_CUSTOM_EXTENSIONS \
+  (sizeof(((struct ssl3_state_st *)NULL)->tmp.custom_extensions.sent) * 8)
+
+static int custom_ext_append(STACK_OF(SSL_CUSTOM_EXTENSION) **stack,
+                             unsigned extension_value,
+                             SSL_custom_ext_add_cb add_cb,
+                             SSL_custom_ext_free_cb free_cb, void *add_arg,
+                             SSL_custom_ext_parse_cb parse_cb,
+                             void *parse_arg) {
+  if (add_cb == NULL ||
+      0xffff < extension_value ||
+      SSL_extension_supported(extension_value) ||
+      /* Specifying a free callback without an add callback is nonsensical
+       * and an error. */
+      (*stack != NULL &&
+       (MAX_NUM_CUSTOM_EXTENSIONS <= sk_SSL_CUSTOM_EXTENSION_num(*stack) ||
+        custom_ext_find(*stack, NULL, extension_value) != NULL))) {
+    return 0;
+  }
+
+  SSL_CUSTOM_EXTENSION *ext = OPENSSL_malloc(sizeof(SSL_CUSTOM_EXTENSION));
+  if (ext == NULL) {
+    return 0;
+  }
+  ext->add_callback = add_cb;
+  ext->add_arg = add_arg;
+  ext->free_callback = free_cb;
+  ext->parse_callback = parse_cb;
+  ext->parse_arg = parse_arg;
+  ext->value = extension_value;
+
+  if (*stack == NULL) {
+    *stack = sk_SSL_CUSTOM_EXTENSION_new_null();
+    if (*stack == NULL) {
+      SSL_CUSTOM_EXTENSION_free(ext);
+      return 0;
+    }
+  }
+
+  if (!sk_SSL_CUSTOM_EXTENSION_push(*stack, ext)) {
+    SSL_CUSTOM_EXTENSION_free(ext);
+    if (sk_SSL_CUSTOM_EXTENSION_num(*stack) == 0) {
+      sk_SSL_CUSTOM_EXTENSION_free(*stack);
+      *stack = NULL;
+    }
+    return 0;
+  }
+
+  return 1;
+}
+
+int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned extension_value,
+                                  SSL_custom_ext_add_cb add_cb,
+                                  SSL_custom_ext_free_cb free_cb, void *add_arg,
+                                  SSL_custom_ext_parse_cb parse_cb,
+                                  void *parse_arg) {
+  return custom_ext_append(&ctx->client_custom_extensions, extension_value,
+                           add_cb ? add_cb : default_add_callback, free_cb,
+                           add_arg, parse_cb, parse_arg);
+}
+
+int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned extension_value,
+                                  SSL_custom_ext_add_cb add_cb,
+                                  SSL_custom_ext_free_cb free_cb, void *add_arg,
+                                  SSL_custom_ext_parse_cb parse_cb,
+                                  void *parse_arg) {
+  return custom_ext_append(&ctx->server_custom_extensions, extension_value,
+                           add_cb ? add_cb : default_add_callback, free_cb,
+                           add_arg, parse_cb, parse_arg);
+}
--- a/samples/C/diff.c
+++ b/samples/C/diff.c
@@ -1,784 +0,0 @@
-/*
- * Copyright (C) 2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#include "common.h"
-#include "git2/diff.h"
-#include "diff.h"
-#include "fileops.h"
-#include "config.h"
-#include "attr_file.h"
-
-static char *diff_prefix_from_pathspec(const git_strarray *pathspec)
-{
-	git_buf prefix = GIT_BUF_INIT;
-	const char *scan;
-
-	if (git_buf_common_prefix(&prefix, pathspec) < 0)
-		return NULL;
-
-	/* diff prefix will only be leading non-wildcards */
-	for (scan = prefix.ptr; *scan && !git__iswildcard(*scan); ++scan);
-	git_buf_truncate(&prefix, scan - prefix.ptr);
-
-	if (prefix.size > 0)
-		return git_buf_detach(&prefix);
-
-	git_buf_free(&prefix);
-	return NULL;
-}
-
-static bool diff_pathspec_is_interesting(const git_strarray *pathspec)
-{
-	const char *str;
-
-	if (pathspec == NULL || pathspec->count == 0)
-		return false;
-	if (pathspec->count > 1)
-		return true;
-
-	str = pathspec->strings[0];
-	if (!str || !str[0] || (!str[1] && (str[0] == '*' || str[0] == '.')))
-		return false;
-	return true;
-}
-
-static bool diff_path_matches_pathspec(git_diff_list *diff, const char *path)
-{
-	unsigned int i;
-	git_attr_fnmatch *match;
-
-	if (!diff->pathspec.length)
-		return true;
-
-	git_vector_foreach(&diff->pathspec, i, match) {
-		int result = p_fnmatch(match->pattern, path, 0);
-
-		/* if we didn't match, look for exact dirname prefix match */
-		if (result == FNM_NOMATCH &&
-			(match->flags & GIT_ATTR_FNMATCH_HASWILD) == 0 &&
-			strncmp(path, match->pattern, match->length) == 0 &&
-			path[match->length] == '/')
-			result = 0;
-
-		if (result == 0)
-			return (match->flags & GIT_ATTR_FNMATCH_NEGATIVE) ? false : true;
-	}
-
-	return false;
-}
-
-static git_diff_delta *diff_delta__alloc(
-	git_diff_list *diff,
-	git_delta_t status,
-	const char *path)
-{
-	git_diff_delta *delta = git__calloc(1, sizeof(git_diff_delta));
-	if (!delta)
-		return NULL;
-
-	delta->old_file.path = git_pool_strdup(&diff->pool, path);
-	if (delta->old_file.path == NULL) {
-		git__free(delta);
-		return NULL;
-	}
-
-	delta->new_file.path = delta->old_file.path;
-
-	if (diff->opts.flags & GIT_DIFF_REVERSE) {
-		switch (status) {
-		case GIT_DELTA_ADDED:   status = GIT_DELTA_DELETED; break;
-		case GIT_DELTA_DELETED: status = GIT_DELTA_ADDED; break;
-		default: break; /* leave other status values alone */
-		}
-	}
-	delta->status = status;
-
-	return delta;
-}
-
-static git_diff_delta *diff_delta__dup(
-	const git_diff_delta *d, git_pool *pool)
-{
-	git_diff_delta *delta = git__malloc(sizeof(git_diff_delta));
-	if (!delta)
-		return NULL;
-
-	memcpy(delta, d, sizeof(git_diff_delta));
-
-	delta->old_file.path = git_pool_strdup(pool, d->old_file.path);
-	if (delta->old_file.path == NULL)
-		goto fail;
-
-	if (d->new_file.path != d->old_file.path) {
-		delta->new_file.path = git_pool_strdup(pool, d->new_file.path);
-		if (delta->new_file.path == NULL)
-			goto fail;
-	} else {
-		delta->new_file.path = delta->old_file.path;
-	}
-
-	return delta;
-
-fail:
-	git__free(delta);
-	return NULL;
-}
-
-static git_diff_delta *diff_delta__merge_like_cgit(
-	const git_diff_delta *a, const git_diff_delta *b, git_pool *pool)
-{
-	git_diff_delta *dup = diff_delta__dup(a, pool);
-	if (!dup)
-		return NULL;
-
-	if (git_oid_cmp(&dup->new_file.oid, &b->new_file.oid) == 0)
-		return dup;
-
-	git_oid_cpy(&dup->new_file.oid, &b->new_file.oid);
-
-	dup->new_file.mode = b->new_file.mode;
-	dup->new_file.size = b->new_file.size;
-	dup->new_file.flags = b->new_file.flags;
-
-	/* Emulate C git for merging two diffs (a la 'git diff <sha>').
-	 *
-	 * When C git does a diff between the work dir and a tree, it actually
-	 * diffs with the index but uses the workdir contents.  This emulates
-	 * those choices so we can emulate the type of diff.
-	 */
-	if (git_oid_cmp(&dup->old_file.oid, &dup->new_file.oid) == 0) {
-		if (dup->status == GIT_DELTA_DELETED)
-			/* preserve pending delete info */;
-		else if (b->status == GIT_DELTA_UNTRACKED ||
-				 b->status == GIT_DELTA_IGNORED)
-			dup->status = b->status;
-		else
-			dup->status = GIT_DELTA_UNMODIFIED;
-	}
-	else if (dup->status == GIT_DELTA_UNMODIFIED ||
-			 b->status == GIT_DELTA_DELETED)
-		dup->status = b->status;
-
-	return dup;
-}
-
-static int diff_delta__from_one(
-	git_diff_list *diff,
-	git_delta_t   status,
-	const git_index_entry *entry)
-{
-	git_diff_delta *delta;
-
-	if (status == GIT_DELTA_IGNORED &&
-		(diff->opts.flags & GIT_DIFF_INCLUDE_IGNORED) == 0)
-		return 0;
-
-	if (status == GIT_DELTA_UNTRACKED &&
-		(diff->opts.flags & GIT_DIFF_INCLUDE_UNTRACKED) == 0)
-		return 0;
-
-	if (!diff_path_matches_pathspec(diff, entry->path))
-		return 0;
-
-	delta = diff_delta__alloc(diff, status, entry->path);
-	GITERR_CHECK_ALLOC(delta);
-
-	/* This fn is just for single-sided diffs */
-	assert(status != GIT_DELTA_MODIFIED);
-
-	if (delta->status == GIT_DELTA_DELETED) {
-		delta->old_file.mode = entry->mode;
-		delta->old_file.size = entry->file_size;
-		git_oid_cpy(&delta->old_file.oid, &entry->oid);
-	} else /* ADDED, IGNORED, UNTRACKED */ {
-		delta->new_file.mode = entry->mode;
-		delta->new_file.size = entry->file_size;
-		git_oid_cpy(&delta->new_file.oid, &entry->oid);
-	}
-
-	delta->old_file.flags |= GIT_DIFF_FILE_VALID_OID;
-	delta->new_file.flags |= GIT_DIFF_FILE_VALID_OID;
-
-	if (git_vector_insert(&diff->deltas, delta) < 0) {
-		git__free(delta);
-		return -1;
-	}
-
-	return 0;
-}
-
-static int diff_delta__from_two(
-	git_diff_list *diff,
-	git_delta_t   status,
-	const git_index_entry *old_entry,
-	const git_index_entry *new_entry,
-	git_oid *new_oid)
-{
-	git_diff_delta *delta;
-
-	if (status == GIT_DELTA_UNMODIFIED &&
-		(diff->opts.flags & GIT_DIFF_INCLUDE_UNMODIFIED) == 0)
-		return 0;
-
-	if ((diff->opts.flags & GIT_DIFF_REVERSE) != 0) {
-		const git_index_entry *temp = old_entry;
-		old_entry = new_entry;
-		new_entry = temp;
-	}
-
-	delta = diff_delta__alloc(diff, status, old_entry->path);
-	GITERR_CHECK_ALLOC(delta);
-
-	delta->old_file.mode = old_entry->mode;
-	git_oid_cpy(&delta->old_file.oid, &old_entry->oid);
-	delta->old_file.flags |= GIT_DIFF_FILE_VALID_OID;
-
-	delta->new_file.mode = new_entry->mode;
-	git_oid_cpy(&delta->new_file.oid, new_oid ? new_oid : &new_entry->oid);
-	if (new_oid || !git_oid_iszero(&new_entry->oid))
-		delta->new_file.flags |= GIT_DIFF_FILE_VALID_OID;
-
-	if (git_vector_insert(&diff->deltas, delta) < 0) {
-		git__free(delta);
-		return -1;
-	}
-
-	return 0;
-}
-
-static char *diff_strdup_prefix(git_pool *pool, const char *prefix)
-{
-	size_t len = strlen(prefix);
-
-	/* append '/' at end if needed */
-	if (len > 0 && prefix[len - 1] != '/')
-		return git_pool_strcat(pool, prefix, "/");
-	else
-		return git_pool_strndup(pool, prefix, len + 1);
-}
-
-static int diff_delta__cmp(const void *a, const void *b)
-{
-	const git_diff_delta *da = a, *db = b;
-	int val = strcmp(da->old_file.path, db->old_file.path);
-	return val ? val : ((int)da->status - (int)db->status);
-}
-
-static int config_bool(git_config *cfg, const char *name, int defvalue)
-{
-	int val = defvalue;
-
-	if (git_config_get_bool(&val, cfg, name) < 0)
-		giterr_clear();
-
-	return val;
-}
-
-static git_diff_list *git_diff_list_alloc(
-	git_repository *repo, const git_diff_options *opts)
-{
-	git_config *cfg;
-	size_t i;
-	git_diff_list *diff = git__calloc(1, sizeof(git_diff_list));
-	if (diff == NULL)
-		return NULL;
-
-	diff->repo = repo;
-
-	if (git_vector_init(&diff->deltas, 0, diff_delta__cmp) < 0 ||
-		git_pool_init(&diff->pool, 1, 0) < 0)
-		goto fail;
-
-	/* load config values that affect diff behavior */
-	if (git_repository_config__weakptr(&cfg, repo) < 0)
-		goto fail;
-	if (config_bool(cfg, "core.symlinks", 1))
-		diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_HAS_SYMLINKS;
-	if (config_bool(cfg, "core.ignorestat", 0))
-		diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_ASSUME_UNCHANGED;
-	if (config_bool(cfg, "core.filemode", 1))
-		diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_TRUST_EXEC_BIT;
-	if (config_bool(cfg, "core.trustctime", 1))
-		diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_TRUST_CTIME;
-	/* Don't set GIT_DIFFCAPS_USE_DEV - compile time option in core git */
-
-	if (opts == NULL)
-		return diff;
-
-	memcpy(&diff->opts, opts, sizeof(git_diff_options));
-	memset(&diff->opts.pathspec, 0, sizeof(diff->opts.pathspec));
-
-	diff->opts.old_prefix = diff_strdup_prefix(&diff->pool,
-		opts->old_prefix ? opts->old_prefix : DIFF_OLD_PREFIX_DEFAULT);
-	diff->opts.new_prefix = diff_strdup_prefix(&diff->pool,
-		opts->new_prefix ? opts->new_prefix : DIFF_NEW_PREFIX_DEFAULT);
-
-	if (!diff->opts.old_prefix || !diff->opts.new_prefix)
-		goto fail;
-
-	if (diff->opts.flags & GIT_DIFF_REVERSE) {
-		char *swap = diff->opts.old_prefix;
-		diff->opts.old_prefix = diff->opts.new_prefix;
-		diff->opts.new_prefix = swap;
-	}
-
-	/* only copy pathspec if it is "interesting" so we can test
-	 * diff->pathspec.length > 0 to know if it is worth calling
-	 * fnmatch as we iterate.
-	 */
-	if (!diff_pathspec_is_interesting(&opts->pathspec))
-		return diff;
-
-	if (git_vector_init(
-		&diff->pathspec, (unsigned int)opts->pathspec.count, NULL) < 0)
-		goto fail;
-
-	for (i = 0; i < opts->pathspec.count; ++i) {
-		int ret;
-		const char *pattern = opts->pathspec.strings[i];
-		git_attr_fnmatch *match = git__calloc(1, sizeof(git_attr_fnmatch));
-		if (!match)
-			goto fail;
-		match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE;
-		ret = git_attr_fnmatch__parse(match, &diff->pool, NULL, &pattern);
-		if (ret == GIT_ENOTFOUND) {
-			git__free(match);
-			continue;
-		} else if (ret < 0)
-			goto fail;
-
-		if (git_vector_insert(&diff->pathspec, match) < 0)
-			goto fail;
-	}
-
-	return diff;
-
-fail:
-	git_diff_list_free(diff);
-	return NULL;
-}
-
-void git_diff_list_free(git_diff_list *diff)
-{
-	git_diff_delta *delta;
-	git_attr_fnmatch *match;
-	unsigned int i;
-
-	if (!diff)
-		return;
-
-	git_vector_foreach(&diff->deltas, i, delta) {
-		git__free(delta);
-		diff->deltas.contents[i] = NULL;
-	}
-	git_vector_free(&diff->deltas);
-
-	git_vector_foreach(&diff->pathspec, i, match) {
-		git__free(match);
-		diff->pathspec.contents[i] = NULL;
-	}
-	git_vector_free(&diff->pathspec);
-
-	git_pool_clear(&diff->pool);
-	git__free(diff);
-}
-
-static int oid_for_workdir_item(
-	git_repository *repo,
-	const git_index_entry *item,
-	git_oid *oid)
-{
-	int result;
-	git_buf full_path = GIT_BUF_INIT;
-
-	if (git_buf_joinpath(&full_path, git_repository_workdir(repo), item->path) < 0)
-		return -1;
-
-	/* calculate OID for file if possible*/
-	if (S_ISLNK(item->mode))
-		result = git_odb__hashlink(oid, full_path.ptr);
-	else if (!git__is_sizet(item->file_size)) {
-		giterr_set(GITERR_OS, "File size overflow for 32-bit systems");
-		result = -1;
-	} else {
-		int fd = git_futils_open_ro(full_path.ptr);
-		if (fd < 0)
-			result = fd;
-		else {
-			result = git_odb__hashfd(
-				oid, fd, (size_t)item->file_size, GIT_OBJ_BLOB);
-			p_close(fd);
-		}
-	}
-
-	git_buf_free(&full_path);
-
-	return result;
-}
-
-#define EXEC_BIT_MASK 0000111
-
-static int maybe_modified(
-	git_iterator *old_iter,
-	const git_index_entry *oitem,
-	git_iterator *new_iter,
-	const git_index_entry *nitem,
-	git_diff_list *diff)
-{
-	git_oid noid, *use_noid = NULL;
-	git_delta_t status = GIT_DELTA_MODIFIED;
-	unsigned int omode = oitem->mode;
-	unsigned int nmode = nitem->mode;
-
-	GIT_UNUSED(old_iter);
-
-	if (!diff_path_matches_pathspec(diff, oitem->path))
-		return 0;
-
-	/* on platforms with no symlinks, promote plain files to symlinks */
-	if (S_ISLNK(omode) && S_ISREG(nmode) &&
-		!(diff->diffcaps & GIT_DIFFCAPS_HAS_SYMLINKS))
-		nmode = GIT_MODE_TYPE(omode) | (nmode & GIT_MODE_PERMS_MASK);
-
-	/* on platforms with no execmode, clear exec bit from comparisons */
-	if (!(diff->diffcaps & GIT_DIFFCAPS_TRUST_EXEC_BIT)) {
-		omode = omode & ~EXEC_BIT_MASK;
-		nmode = nmode & ~EXEC_BIT_MASK;
-	}
-
-	/* support "assume unchanged" (badly, b/c we still stat everything) */
-	if ((diff->diffcaps & GIT_DIFFCAPS_ASSUME_UNCHANGED) != 0)
-		status = (oitem->flags_extended & GIT_IDXENTRY_INTENT_TO_ADD) ?
-			GIT_DELTA_MODIFIED : GIT_DELTA_UNMODIFIED;
-
-	/* support "skip worktree" index bit */
-	else if ((oitem->flags_extended & GIT_IDXENTRY_SKIP_WORKTREE) != 0)
-		status = GIT_DELTA_UNMODIFIED;
-
-	/* if basic type of file changed, then split into delete and add */
-	else if (GIT_MODE_TYPE(omode) != GIT_MODE_TYPE(nmode)) {
-		if (diff_delta__from_one(diff, GIT_DELTA_DELETED, oitem) < 0 ||
-			diff_delta__from_one(diff, GIT_DELTA_ADDED, nitem) < 0)
-			return -1;
-		return 0;
-	}
-
-	/* if oids and modes match, then file is unmodified */
-	else if (git_oid_cmp(&oitem->oid, &nitem->oid) == 0 &&
-			 omode == nmode)
-		status = GIT_DELTA_UNMODIFIED;
-
-	/* if we have a workdir item with an unknown oid, check deeper */
-	else if (git_oid_iszero(&nitem->oid) && new_iter->type == GIT_ITERATOR_WORKDIR) {
-		/* TODO: add check against index file st_mtime to avoid racy-git */
-
-		/* if they files look exactly alike, then we'll assume the same */
-		if (oitem->file_size == nitem->file_size &&
-			(!(diff->diffcaps & GIT_DIFFCAPS_TRUST_CTIME) ||
-			 (oitem->ctime.seconds == nitem->ctime.seconds)) &&
-			oitem->mtime.seconds == nitem->mtime.seconds &&
-			(!(diff->diffcaps & GIT_DIFFCAPS_USE_DEV) ||
-			 (oitem->dev == nitem->dev)) &&
-			oitem->ino == nitem->ino &&
-			oitem->uid == nitem->uid &&
-			oitem->gid == nitem->gid)
-			status = GIT_DELTA_UNMODIFIED;
-
-		else if (S_ISGITLINK(nmode)) {
-			git_submodule *sub;
-
-			if ((diff->opts.flags & GIT_DIFF_IGNORE_SUBMODULES) != 0)
-				status = GIT_DELTA_UNMODIFIED;
-			else if (git_submodule_lookup(&sub, diff->repo, nitem->path) < 0)
-				return -1;
-			else if (sub->ignore == GIT_SUBMODULE_IGNORE_ALL)
-				status = GIT_DELTA_UNMODIFIED;
-			else {
-				/* TODO: support other GIT_SUBMODULE_IGNORE values */
-				status = GIT_DELTA_UNMODIFIED;
-			}
-		}
-
-		/* TODO: check git attributes so we will not have to read the file
-		 * in if it is marked binary.
-		 */
-
-		else if (oid_for_workdir_item(diff->repo, nitem, &noid) < 0)
-			return -1;
-
-		else if (git_oid_cmp(&oitem->oid, &noid) == 0 &&
-				 omode == nmode)
-			status = GIT_DELTA_UNMODIFIED;
-
-		/* store calculated oid so we don't have to recalc later */
-		use_noid = &noid;
-	}
-
-	return diff_delta__from_two(diff, status, oitem, nitem, use_noid);
-}
-
-static int diff_from_iterators(
-	git_repository *repo,
-	const git_diff_options *opts, /**< can be NULL for defaults */
-	git_iterator *old_iter,
-	git_iterator *new_iter,
-	git_diff_list **diff_ptr)
-{
-	const git_index_entry *oitem, *nitem;
-	git_buf ignore_prefix = GIT_BUF_INIT;
-	git_diff_list *diff = git_diff_list_alloc(repo, opts);
-	if (!diff)
-		goto fail;
-
-	diff->old_src = old_iter->type;
-	diff->new_src = new_iter->type;
-
-	if (git_iterator_current(old_iter, &oitem) < 0 ||
-		git_iterator_current(new_iter, &nitem) < 0)
-		goto fail;
-
-	/* run iterators building diffs */
-	while (oitem || nitem) {
-
-		/* create DELETED records for old items not matched in new */
-		if (oitem && (!nitem || strcmp(oitem->path, nitem->path) < 0)) {
-			if (diff_delta__from_one(diff, GIT_DELTA_DELETED, oitem) < 0 ||
-				git_iterator_advance(old_iter, &oitem) < 0)
-				goto fail;
-		}
-
-		/* create ADDED, TRACKED, or IGNORED records for new items not
-		 * matched in old (and/or descend into directories as needed)
-		 */
-		else if (nitem && (!oitem || strcmp(oitem->path, nitem->path) > 0)) {
-			git_delta_t delta_type = GIT_DELTA_UNTRACKED;
-
-			/* check if contained in ignored parent directory */
-			if (git_buf_len(&ignore_prefix) &&
-				git__prefixcmp(nitem->path, git_buf_cstr(&ignore_prefix)) == 0)
-				delta_type = GIT_DELTA_IGNORED;
-
-			if (S_ISDIR(nitem->mode)) {
-				/* recurse into directory only if there are tracked items in
-				 * it or if the user requested the contents of untracked
-				 * directories and it is not under an ignored directory.
-				 */
-				if ((oitem && git__prefixcmp(oitem->path, nitem->path) == 0) ||
-					(delta_type == GIT_DELTA_UNTRACKED &&
-					 (diff->opts.flags & GIT_DIFF_RECURSE_UNTRACKED_DIRS) != 0))
-				{
-					/* if this directory is ignored, remember it as the
-					 * "ignore_prefix" for processing contained items
-					 */
-					if (delta_type == GIT_DELTA_UNTRACKED &&
-						git_iterator_current_is_ignored(new_iter))
-						git_buf_sets(&ignore_prefix, nitem->path);
-
-					if (git_iterator_advance_into_directory(new_iter, &nitem) < 0)
-						goto fail;
-
-					continue;
-				}
-			}
-
-			/* In core git, the next two "else if" clauses are effectively
-			 * reversed -- i.e. when an untracked file contained in an
-			 * ignored directory is individually ignored, it shows up as an
-			 * ignored file in the diff list, even though other untracked
-			 * files in the same directory are skipped completely.
-			 *
-			 * To me, this is odd.  If the directory is ignored and the file
-			 * is untracked, we should skip it consistently, regardless of
-			 * whether it happens to match a pattern in the ignore file.
-			 *
-			 * To match the core git behavior, just reverse the following
-			 * two "else if" cases so that individual file ignores are
-			 * checked before container directory exclusions are used to
-			 * skip the file.
-			 */
-			else if (delta_type == GIT_DELTA_IGNORED) {
-				if (git_iterator_advance(new_iter, &nitem) < 0)
-					goto fail;
-				continue; /* ignored parent directory, so skip completely */
-			}
-
-			else if (git_iterator_current_is_ignored(new_iter))
-				delta_type = GIT_DELTA_IGNORED;
-
-			else if (new_iter->type != GIT_ITERATOR_WORKDIR)
-				delta_type = GIT_DELTA_ADDED;
-
-			if (diff_delta__from_one(diff, delta_type, nitem) < 0 ||
-				git_iterator_advance(new_iter, &nitem) < 0)
-				goto fail;
-		}
-
-		/* otherwise item paths match, so create MODIFIED record
-		 * (or ADDED and DELETED pair if type changed)
-		 */
-		else {
-			assert(oitem && nitem && strcmp(oitem->path, nitem->path) == 0);
-
-			if (maybe_modified(old_iter, oitem, new_iter, nitem, diff) < 0 ||
-				git_iterator_advance(old_iter, &oitem) < 0 ||
-				git_iterator_advance(new_iter, &nitem) < 0)
-				goto fail;
-		}
-	}
-
-	git_iterator_free(old_iter);
-	git_iterator_free(new_iter);
-	git_buf_free(&ignore_prefix);
-
-	*diff_ptr = diff;
-	return 0;
-
-fail:
-	git_iterator_free(old_iter);
-	git_iterator_free(new_iter);
-	git_buf_free(&ignore_prefix);
-
-	git_diff_list_free(diff);
-	*diff_ptr = NULL;
-	return -1;
-}
-
-
-int git_diff_tree_to_tree(
-	git_repository *repo,
-	const git_diff_options *opts, /**< can be NULL for defaults */
-	git_tree *old_tree,
-	git_tree *new_tree,
-	git_diff_list **diff)
-{
-	git_iterator *a = NULL, *b = NULL;
-	char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
-
-	assert(repo && old_tree && new_tree && diff);
-
-	if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
-		git_iterator_for_tree_range(&b, repo, new_tree, prefix, prefix) < 0)
-		return -1;
-
-	git__free(prefix);
-
-	return diff_from_iterators(repo, opts, a, b, diff);
-}
-
-int git_diff_index_to_tree(
-	git_repository *repo,
-	const git_diff_options *opts,
-	git_tree *old_tree,
-	git_diff_list **diff)
-{
-	git_iterator *a = NULL, *b = NULL;
-	char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
-
-	assert(repo && diff);
-
-	if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
-		git_iterator_for_index_range(&b, repo, prefix, prefix) < 0)
-		return -1;
-
-	git__free(prefix);
-
-	return diff_from_iterators(repo, opts, a, b, diff);
-}
-
-int git_diff_workdir_to_index(
-	git_repository *repo,
-	const git_diff_options *opts,
-	git_diff_list **diff)
-{
-	git_iterator *a = NULL, *b = NULL;
-	char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
-
-	assert(repo && diff);
-
-	if (git_iterator_for_index_range(&a, repo, prefix, prefix) < 0 ||
-		git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
-		return -1;
-
-	git__free(prefix);
-
-	return diff_from_iterators(repo, opts, a, b, diff);
-}
-
-
-int git_diff_workdir_to_tree(
-	git_repository *repo,
-	const git_diff_options *opts,
-	git_tree *old_tree,
-	git_diff_list **diff)
-{
-	git_iterator *a = NULL, *b = NULL;
-	char *prefix = opts ? diff_prefix_from_pathspec(&opts->pathspec) : NULL;
-
-	assert(repo && old_tree && diff);
-
-	if (git_iterator_for_tree_range(&a, repo, old_tree, prefix, prefix) < 0 ||
-		git_iterator_for_workdir_range(&b, repo, prefix, prefix) < 0)
-		return -1;
-
-	git__free(prefix);
-
-	return diff_from_iterators(repo, opts, a, b, diff);
-}
-
-int git_diff_merge(
-	git_diff_list *onto,
-	const git_diff_list *from)
-{
-	int error = 0;
-	git_pool onto_pool;
-	git_vector onto_new;
-	git_diff_delta *delta;
-	unsigned int i, j;
-
-	assert(onto && from);
-
-	if (!from->deltas.length)
-		return 0;
-
-	if (git_vector_init(&onto_new, onto->deltas.length, diff_delta__cmp) < 0 ||
-		git_pool_init(&onto_pool, 1, 0) < 0)
-		return -1;
-
-	for (i = 0, j = 0; i < onto->deltas.length || j < from->deltas.length; ) {
-		git_diff_delta *o = GIT_VECTOR_GET(&onto->deltas, i);
-		const git_diff_delta *f = GIT_VECTOR_GET(&from->deltas, j);
-		int cmp = !f ? -1 : !o ? 1 : strcmp(o->old_file.path, f->old_file.path);
-
-		if (cmp < 0) {
-			delta = diff_delta__dup(o, &onto_pool);
-			i++;
-		} else if (cmp > 0) {
-			delta = diff_delta__dup(f, &onto_pool);
-			j++;
-		} else {
-			delta = diff_delta__merge_like_cgit(o, f, &onto_pool);
-			i++;
-			j++;
-		}
-
-		if ((error = !delta ? -1 : git_vector_insert(&onto_new, delta)) < 0)
-			break;
-	}
-
-	if (!error) {
-		git_vector_swap(&onto->deltas, &onto_new);
-		git_pool_swap(&onto->pool, &onto_pool);
-		onto->new_src = from->new_src;
-	}
-
-	git_vector_foreach(&onto_new, i, delta)
-		git__free(delta);
-	git_vector_free(&onto_new);
-	git_pool_clear(&onto_pool);
-
-	return error;
-}
-
--- a/samples/C/dynarray.cats
+++ b/samples/C/dynarray.cats
@@ -1,56 +0,0 @@
-/* ******************************************************************* */
-/*                                                                     */
-/*                         Applied Type System                         */
-/*                                                                     */
-/* ******************************************************************* */
-
-/*
-** ATS/Postiats - Unleashing the Potential of Types!
-** Copyright (C) 2011-20?? Hongwei Xi, ATS Trustful Software, Inc.
-** All rights reserved
-**
-** ATS is free software;  you can  redistribute it and/or modify it under
-** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
-** Free Software Foundation; either version 3, or (at  your  option)  any
-** later version.
-** 
-** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
-** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
-** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
-** for more details.
-** 
-** You  should  have  received  a  copy of the GNU General Public License
-** along  with  ATS;  see the  file COPYING.  If not, please write to the
-** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
-** 02110-1301, USA.
-*/
-
-/* ****** ****** */
-
-/*
-(* Author: Hongwei Xi *)
-(* Authoremail: hwxi AT cs DOT bu DOT edu *)
-(* Start time: March, 2013 *)
-*/
-
-/* ****** ****** */
-
-#ifndef ATSHOME_LIBATS_DYNARRAY_CATS
-#define ATSHOME_LIBATS_DYNARRAY_CATS
-
-/* ****** ****** */
-
-#include <string.h>
-
-/* ****** ****** */
-
-#define atslib_dynarray_memcpy memcpy
-#define atslib_dynarray_memmove memmove
-
-/* ****** ****** */
-
-#endif // ifndef ATSHOME_LIBATS_DYNARRAY_CATS
-
-/* ****** ****** */
-
-/* end of [dynarray.cats] */
--- a/samples/C/fudge_node.c
+++ b/samples/C/fudge_node.c
@@ -0,0 +1,188 @@
+/* Copyright (c) 2010 Jens Nyberg
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE. */
+
+#include <fudge.h>
+#include <kernel.h>
+#include <modules/system/system.h>
+#include "pipe.h"
+
+static struct system_node root;
+static struct system_node clone;
+
+static unsigned int read(struct pipe_end *endself, struct pipe_end *endtarget, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    count = buffer_rcfifo(&endself->buffer, count, buffer);
+
+    if (!count && endtarget->node.refcount)
+    {
+
+        list_add(&endself->readlinks, &state->link);
+        task_setstatus(state->link.data, TASK_STATUS_BLOCKED);
+
+    }
+
+    system_wakeup(&endtarget->writelinks);
+
+    return count;
+
+}
+
+static unsigned int write(struct pipe_end *endself, struct pipe_end *endtarget, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    count = buffer_wcfifo(&endtarget->buffer, count, buffer);
+
+    if (!count)
+    {
+
+        list_add(&endself->writelinks, &state->link);
+        task_setstatus(state->link.data, TASK_STATUS_BLOCKED);
+
+    }
+
+    system_wakeup(&endtarget->readlinks);
+
+    return count;
+
+}
+
+static unsigned int end0_read(struct system_node *self, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    struct pipe *pipe = (struct pipe *)self->parent;
+
+    return read(&pipe->end0, &pipe->end1, state, count, buffer);
+
+}
+
+static unsigned int end0_write(struct system_node *self, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    struct pipe *pipe = (struct pipe *)self->parent;
+
+    return write(&pipe->end0, &pipe->end1, state, count, buffer);
+
+}
+
+static unsigned int end1_read(struct system_node *self, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    struct pipe *pipe = (struct pipe *)self->parent;
+
+    return read(&pipe->end1, &pipe->end0, state, count, buffer);
+
+}
+
+static unsigned int end1_write(struct system_node *self, struct service_state *state, unsigned int count, void *buffer)
+{
+
+    struct pipe *pipe = (struct pipe *)self->parent;
+
+    return write(&pipe->end1, &pipe->end0, state, count, buffer);
+
+}
+
+static unsigned int clone_child(struct system_node *self, unsigned int count, char *path)
+{
+
+    struct list_item *current;
+
+    for (current = root.children.head; current; current = current->next)
+    {
+
+        struct system_node *node = current->data;
+        struct pipe *pipe = current->data;
+
+        if (node == self)
+            continue;
+
+        if (pipe->end0.node.refcount || pipe->end1.node.refcount)
+            continue;
+
+        return node->child(node, count, path);
+
+    }
+
+    return 0;
+
+}
+
+void pipe_init(struct pipe *pipe)
+{
+
+    buffer_init(&pipe->end0.buffer, 4096, pipe->end0.data);
+    buffer_init(&pipe->end1.buffer, 4096, pipe->end1.data);
+    system_initnode(&pipe->end0.node, SYSTEM_NODETYPE_NORMAL, "0");
+    system_initnode(&pipe->end1.node, SYSTEM_NODETYPE_NORMAL, "1");
+
+    pipe->end0.node.read = end0_read;
+    pipe->end0.node.write = end0_write;
+    pipe->end1.node.read = end1_read;
+    pipe->end1.node.write = end1_write;
+
+    system_initnode(&pipe->root, SYSTEM_NODETYPE_GROUP | SYSTEM_NODETYPE_MULTI, "pipe");
+    system_addchild(&pipe->root, &pipe->end0.node);
+    system_addchild(&pipe->root, &pipe->end1.node);
+
+}
+
+void pipe_register(struct pipe *pipe)
+{
+
+    system_addchild(&root, &pipe->root);
+
+}
+
+void pipe_unregister(struct pipe *pipe)
+{
+
+    system_removechild(&root, &pipe->root);
+
+}
+
+void module_init(void)
+{
+
+    system_initnode(&root, SYSTEM_NODETYPE_GROUP, "pipe");
+    system_initnode(&clone, SYSTEM_NODETYPE_GROUP, "clone");
+
+    clone.child = clone_child;
+
+    system_addchild(&root, &clone);
+
+}
+
+void module_register(void)
+{
+
+    system_registernode(&root);
+
+}
+
+void module_unregister(void)
+{
+
+    system_unregisternode(&root);
+
+}
--- a/samples/C/hash.c
+++ b/samples/C/hash.c
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "common.h"
-#include "hash.h"
-
-#if defined(PPC_SHA1)
-# include "ppc/sha1.h"
-#else
-# include "sha1.h"
-#endif
-
-struct git_hash_ctx {
-	SHA_CTX c;
-};
-
-git_hash_ctx *git_hash_new_ctx(void)
-{
-	git_hash_ctx *ctx = git__malloc(sizeof(*ctx));
-
-	if (!ctx)
-		return NULL;
-
-	SHA1_Init(&ctx->c);
-
-	return ctx;
-}
-
-void git_hash_free_ctx(git_hash_ctx *ctx)
-{
-	git__free(ctx);
-}
-
-void git_hash_init(git_hash_ctx *ctx)
-{
-	assert(ctx);
-	SHA1_Init(&ctx->c);
-}
-
-void git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
-{
-	assert(ctx);
-	SHA1_Update(&ctx->c, data, len);
-}
-
-void git_hash_final(git_oid *out, git_hash_ctx *ctx)
-{
-	assert(ctx);
-	SHA1_Final(out->id, &ctx->c);
-}
-
-void git_hash_buf(git_oid *out, const void *data, size_t len)
-{
-	SHA_CTX c;
-
-	SHA1_Init(&c);
-	SHA1_Update(&c, data, len);
-	SHA1_Final(out->id, &c);
-}
-
-void git_hash_vec(git_oid *out, git_buf_vec *vec, size_t n)
-{
-	SHA_CTX c;
-	size_t i;
-
-	SHA1_Init(&c);
-	for (i = 0; i < n; i++)
-		SHA1_Update(&c, vec[i].data, vec[i].len);
-	SHA1_Final(out->id, &c);
-}
--- a/samples/C/main.c
+++ b/samples/C/main.c
@@ -0,0 +1,397 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "src/runtime/runtime-utils.h"
+
+#include "src/arguments.h"
+#include "src/compiler.h"
+#include "src/deoptimizer.h"
+#include "src/frames-inl.h"
+#include "src/full-codegen/full-codegen.h"
+#include "src/isolate-inl.h"
+#include "src/messages.h"
+#include "src/v8threads.h"
+#include "src/vm-state-inl.h"
+
+namespace v8 {
+namespace internal {
+
+RUNTIME_FUNCTION(Runtime_CompileLazy) {
+	HandleScope scope(isolate);
+	DCHECK_EQ(1, args.length());
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+
+#ifdef DEBUG
+	if (FLAG_trace_lazy && !function->shared()->is_compiled()) {
+		PrintF("[unoptimized: ");
+		function->PrintName();
+		PrintF("]\n");
+	}
+#endif
+
+	StackLimitCheck check(isolate);
+	if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+	if (!Compiler::Compile(function, Compiler::KEEP_EXCEPTION)) {
+		return isolate->heap()->exception();
+	}
+	DCHECK(function->is_compiled());
+	return function->code();
+}
+
+RUNTIME_FUNCTION(Runtime_CompileBaseline) {
+	HandleScope scope(isolate);
+	DCHECK_EQ(1, args.length());
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+	StackLimitCheck check(isolate);
+	if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+	if (!Compiler::CompileBaseline(function)) {
+		return isolate->heap()->exception();
+	}
+	DCHECK(function->is_compiled());
+	return function->code();
+}
+
+RUNTIME_FUNCTION(Runtime_CompileOptimized_Concurrent) {
+	HandleScope scope(isolate);
+	DCHECK_EQ(1, args.length());
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+	StackLimitCheck check(isolate);
+	if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+	if (!Compiler::CompileOptimized(function, Compiler::CONCURRENT)) {
+		return isolate->heap()->exception();
+	}
+	DCHECK(function->is_compiled());
+	return function->code();
+}
+
+
+RUNTIME_FUNCTION(Runtime_CompileOptimized_NotConcurrent) {
+	HandleScope scope(isolate);
+	DCHECK_EQ(1, args.length());
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+	StackLimitCheck check(isolate);
+	if (check.JsHasOverflowed(1 * KB)) return isolate->StackOverflow();
+	if (!Compiler::CompileOptimized(function, Compiler::NOT_CONCURRENT)) {
+		return isolate->heap()->exception();
+	}
+	DCHECK(function->is_compiled());
+	return function->code();
+}
+
+
+RUNTIME_FUNCTION(Runtime_NotifyStubFailure) {
+	HandleScope scope(isolate);
+	DCHECK(args.length() == 0);
+	Deoptimizer* deoptimizer = Deoptimizer::Grab(isolate);
+	DCHECK(AllowHeapAllocation::IsAllowed());
+	delete deoptimizer;
+	return isolate->heap()->undefined_value();
+}
+
+
+class ActivationsFinder : public ThreadVisitor {
+public:
+	Code* code_;
+	bool has_code_activations_;
+
+	explicit ActivationsFinder(Code* code)
+		: code_(code), has_code_activations_(false) {}
+
+	void VisitThread(Isolate* isolate, ThreadLocalTop* top) {
+		JavaScriptFrameIterator it(isolate, top);
+		VisitFrames(&it);
+	}
+
+	void VisitFrames(JavaScriptFrameIterator* it) {
+		for (; !it->done(); it->Advance()) {
+			JavaScriptFrame* frame = it->frame();
+			if (code_->contains(frame->pc())) has_code_activations_ = true;
+		}
+	}
+};
+
+
+RUNTIME_FUNCTION(Runtime_NotifyDeoptimized) {
+	HandleScope scope(isolate);
+	DCHECK(args.length() == 1);
+	CONVERT_SMI_ARG_CHECKED(type_arg, 0);
+	Deoptimizer::BailoutType type =
+		static_cast<Deoptimizer::BailoutType>(type_arg);
+	Deoptimizer* deoptimizer = Deoptimizer::Grab(isolate);
+	DCHECK(AllowHeapAllocation::IsAllowed());
+	TimerEventScope<TimerEventDeoptimizeCode> timer(isolate);
+	TRACE_EVENT0("v8", "V8.DeoptimizeCode");
+
+	Handle<JSFunction> function = deoptimizer->function();
+	Handle<Code> optimized_code = deoptimizer->compiled_code();
+
+	DCHECK(optimized_code->kind() == Code::OPTIMIZED_FUNCTION);
+	DCHECK(type == deoptimizer->bailout_type());
+
+	// Make sure to materialize objects before causing any allocation.
+	JavaScriptFrameIterator it(isolate);
+	deoptimizer->MaterializeHeapObjects(&it);
+	delete deoptimizer;
+
+	// Ensure the context register is updated for materialized objects.
+	JavaScriptFrameIterator top_it(isolate);
+	JavaScriptFrame* top_frame = top_it.frame();
+	isolate->set_context(Context::cast(top_frame->context()));
+
+	if (type == Deoptimizer::LAZY) {
+		return isolate->heap()->undefined_value();
+	}
+
+	// Search for other activations of the same optimized code.
+	// At this point {it} is at the topmost frame of all the frames materialized
+	// by the deoptimizer. Note that this frame does not necessarily represent
+	// an activation of {function} because of potential inlined tail-calls.
+	ActivationsFinder activations_finder(*optimized_code);
+	activations_finder.VisitFrames(&it);
+	isolate->thread_manager()->IterateArchivedThreads(&activations_finder);
+
+	if (!activations_finder.has_code_activations_) {
+		if (function->code() == *optimized_code) {
+			if (FLAG_trace_deopt) {
+				PrintF("[removing optimized code for: ");
+				function->PrintName();
+				PrintF("]\n");
+			}
+			function->ReplaceCode(function->shared()->code());
+		}
+		// Evict optimized code for this function from the cache so that it
+		// doesn't get used for new closures.
+		function->shared()->EvictFromOptimizedCodeMap(*optimized_code, "notify deoptimized");
+	} else {
+		// TODO(titzer): we should probably do DeoptimizeCodeList(code)
+		// unconditionally if the code is not already marked for deoptimization.
+		// If there is an index by shared function info, all the better.
+		Deoptimizer::DeoptimizeFunction(*function);
+	}
+
+	return isolate->heap()->undefined_value();
+}
+
+
+static bool IsSuitableForOnStackReplacement(
+	Isolate* isolate,
+	Handle<JSFunction> function
+) {
+	// Keep track of whether we've succeeded in optimizing.
+	if (function->shared()->optimization_disabled()) return false;
+	// If we are trying to do OSR when there are already optimized
+	// activations of the function, it means (a) the function is directly or
+	// indirectly recursive and (b) an optimized invocation has been
+	// deoptimized so that we are currently in an unoptimized activation.
+	// Check for optimized activations of this function.
+	for (JavaScriptFrameIterator it(isolate); !it.done(); it.Advance()) {
+		JavaScriptFrame* frame = it.frame();
+		if (frame->is_optimized() && frame->function() == *function) return false;
+	}
+
+	return true;
+}
+
+
+RUNTIME_FUNCTION(Runtime_CompileForOnStackReplacement) {
+	HandleScope scope(isolate);
+	DCHECK(args.length() == 1);
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+	Handle<Code> caller_code(function->shared()->code());
+
+	// We're not prepared to handle a function with arguments object.
+	DCHECK(!function->shared()->uses_arguments());
+
+	RUNTIME_ASSERT(FLAG_use_osr);
+
+	// Passing the PC in the javascript frame from the caller directly is
+	// not GC safe, so we walk the stack to get it.
+	JavaScriptFrameIterator it(isolate);
+	JavaScriptFrame* frame = it.frame();
+	if (!caller_code->contains(frame->pc())) {
+		// Code on the stack may not be the code object referenced by the shared
+		// function info.	It may have been replaced to include deoptimization data.
+		caller_code = Handle<Code>(frame->LookupCode());
+	}
+
+	uint32_t pc_offset =
+		static_cast<uint32_t>(frame->pc() - caller_code->instruction_start());
+
+#ifdef DEBUG
+	DCHECK_EQ(frame->function(), *function);
+	DCHECK_EQ(frame->LookupCode(), *caller_code);
+	DCHECK(caller_code->contains(frame->pc()));
+#endif	// DEBUG
+
+	BailoutId ast_id = caller_code->TranslatePcOffsetToAstId(pc_offset);
+	DCHECK(!ast_id.IsNone());
+
+	MaybeHandle<Code> maybe_result;
+	if (IsSuitableForOnStackReplacement(isolate, function)) {
+		if (FLAG_trace_osr) {
+			PrintF("[OSR - Compiling: ");
+			function->PrintName();
+			PrintF(" at -*- scheme -*- %d]\n", ast_id.ToInt());
+		}
+		maybe_result = Compiler::GetOptimizedCodeForOSR(function, ast_id, frame);
+	}
+
+	// Revert the patched back edge table, regardless of whether OSR succeeds.
+	BackEdgeTable::Revert(isolate, *caller_code);
+
+	// Check whether we ended up with usable optimized code.
+	Handle<Code> result;
+	if (maybe_result.ToHandle(&result)
+	&& result->kind() == Code::OPTIMIZED_FUNCTION) {
+		DeoptimizationInputData* data =
+			DeoptimizationInputData::cast(result->deoptimization_data());
+		
+		if (data->OsrPcOffset()->value() >= 0) {
+			DCHECK(BailoutId(data->OsrAstId()->value()) == ast_id);
+			if (FLAG_trace_osr) {
+				PrintF("[OSR - Entry at AST id %d, offset %d in optimized code]\n",
+					ast_id.ToInt(), data->OsrPcOffset()->value());
+			}
+			// TODO(titzer): this is a massive hack to make the deopt counts
+			// match. Fix heuristics for reenabling optimizations!
+			function->shared()->increment_deopt_count();
+
+			if (result->is_turbofanned()) {
+				// TurboFanned OSR code cannot be installed into the function.
+				// But the function is obviously hot, so optimize it next time.
+				function->ReplaceCode(
+					isolate->builtins()->builtin(Builtins::kCompileOptimized));
+			} else {
+				// Crankshafted OSR code can be installed into the function.
+				function->ReplaceCode(*result);
+			}
+			return *result;
+		}
+	}
+
+	// Failed.
+	if (FLAG_trace_osr) {
+		PrintF("[OSR - Failed: ");
+		function->PrintName();
+		PrintF(" at AST id %d]\n", ast_id.ToInt());
+	}
+
+	if (!function->IsOptimized()) {
+		function->ReplaceCode(function->shared()->code());
+	}
+	return NULL;
+}
+
+
+RUNTIME_FUNCTION(Runtime_TryInstallOptimizedCode) {
+	HandleScope scope(isolate);
+	DCHECK(args.length() == 1);
+	CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+
+	// First check if this is a real stack overflow.
+	StackLimitCheck check(isolate);
+	if (check.JsHasOverflowed()) {
+		SealHandleScope shs(isolate);
+		return isolate->StackOverflow();
+	}
+
+	isolate->optimizing_compile_dispatcher()->InstallOptimizedFunctions();
+	return (function->IsOptimized())
+		? function->code()
+		: function->shared()->code();
+}
+
+
+bool CodeGenerationFromStringsAllowed(
+	Isolate* isolate,
+	Handle<Context> context
+){
+	DCHECK(context->allow_code_gen_from_strings()->IsFalse());
+	// Check with callback if set.
+	AllowCodeGenerationFromStringsCallback callback =
+			isolate->allow_code_gen_callback();
+	if (callback == NULL) {
+		// No callback set and code generation disallowed.
+		return false;
+	} else {
+		// Callback set. Let it decide if code generation is allowed.
+		VMState<EXTERNAL> state(isolate);
+		return callback(v8::Utils::ToLocal(context));
+	}
+}
+
+static Object* CompileGlobalEval(
+	Isolate* isolate,
+	Handle<String> source,
+	Handle<SharedFunctionInfo> outer_info,
+	LanguageMode language_mode,
+	int eval_scope_position,
+	int eval_position
+){
+	Handle<Context> context = Handle<Context>(isolate->context());
+	Handle<Context> native_context = Handle<Context>(context->native_context());
+
+	// Check if native context allows code generation from
+	// strings. Throw an exception if it doesn't.
+	if (native_context->allow_code_gen_from_strings()->IsFalse() &&
+	!CodeGenerationFromStringsAllowed(isolate, native_context)) {
+		Handle<Object> error_message =
+				native_context->ErrorMessageForCodeGenerationFromStrings();
+		Handle<Object> error;
+		MaybeHandle<Object> maybe_error = isolate->factory()->NewEvalError(
+				MessageTemplate::kCodeGenFromStrings, error_message);
+		if (maybe_error.ToHandle(&error)) isolate->Throw(*error);
+		return isolate->heap()->exception();
+	}
+
+	// Deal with a normal eval call with a string argument. Compile it
+	// and return the compiled function bound in the local context.
+	static const ParseRestriction restriction = NO_PARSE_RESTRICTION;
+	Handle<JSFunction> compiled;
+	ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+		isolate, compiled,
+		Compiler::GetFunctionFromEval(
+			source, outer_info, context, language_mode,
+			restriction, eval_scope_position, eval_position
+		),
+		isolate->heap()->exception()
+	);
+	return *compiled;
+}
+
+
+RUNTIME_FUNCTION(Runtime_ResolvePossiblyDirectEval) {
+	HandleScope scope(isolate);
+	DCHECK(args.length() == 6);
+
+	Handle<Object> callee = args.at<Object>(0);
+
+	// If "eval" didn't refer to the original GlobalEval, it's not a
+	// direct call to eval.
+	// (And even if it is, but the first argument isn't a string, just let
+	// execution default to an indirect call to eval, which will also return
+	// the first argument without doing anything).
+	if (*callee != isolate->native_context()->global_eval_fun() || !args[1]->IsString()) {
+		return *callee;
+	}
+
+	DCHECK(args[3]->IsSmi());
+	DCHECK(is_valid_language_mode(args.smi_at(3)));
+	LanguageMode language_mode = static_cast<LanguageMode>(args.smi_at(3));
+	DCHECK(args[4]->IsSmi());
+	Handle<SharedFunctionInfo> outer_info(args.at<JSFunction>(2)->shared(), isolate);
+	return CompileGlobalEval(
+		isolate,
+		args.at<String>(1),
+		outer_info,
+		language_mode,
+		args.smi_at(4),
+		args.smi_at(5)
+	);
+}
+}	// namespace internal
+}	// namespace v8
+
+/* vim: set shiftwidth=4 softtabstop=0 cindent cinoptions={1s: */
+
--- a/Document/allglass.csd
+++ b/Document/allglass.csd
@@ -0,0 +1,21 @@
+<CsoundSynthesizer>
+<CsInstruments>
+sr     = 44100
+kr     = 44100
+ksmps  = 1
+nchnls = 2
+
+; pvanal -n 512 -w 8 allglass1-L.wav allglass1-L.pvc
+; pvanal -n 512 -w 8 allglass1-R.wav allglass1-R.pvc
+instr 1
+  ktime line 0, p3, 17.5018
+  arL pvoc ktime, 1, "allglass1-L.pvc"
+  arR pvoc ktime, 1, "allglass1-R.pvc"
+  out arL, arR
+endin
+</CsInstruments>
+<CsScore>
+i 1 0 70.0073
+e
+</CsScore>
+</CsoundSynthesizer>
--- a/Document/interp.csd
+++ b/Document/interp.csd
@@ -0,0 +1,34 @@
+<CsoundSynthesizer>
+<CsInstruments>
+sr     = 44100
+kr     = 44100
+ksmps  = 1
+nchnls = 2
+
+; pvanal -n 1024 -w 2 partA-L.wav partA-L.pvc
+; pvanal -n 1024 -w 2 partA-R.wav partA-R.pvc
+; pvanal -n 1024 -w 2 partB.wav partB.pvc
+instr 1
+  iscale = 1
+
+  ktimpnt1     line 0, iscale*(82196/44100), 82196/44100
+  ktimpnt2     linseg 0, iscale*1.25, 0, iscale*(103518/44100), 103518/44100
+  kfreqscale   linseg 1, iscale*0.5, 1, iscale*1.6, 0.8
+  kfreqinterpL linseg 0, iscale*0.25, 0, iscale*1.6, 1
+  kampinterpL  linseg 0, iscale*0.25, 0, iscale*1.6, 1
+  kfreqinterpR linseg 0, iscale*0.5, 0, iscale*1.2, 1
+  kampinterpR  linseg 0, iscale*0.5, 0, iscale*1.2, 1
+
+        pvbufread ktimpnt1, "partB.pvc"
+  apvcL pvinterp ktimpnt2, 1, "partA-L.pvc", kfreqscale, 1, 1, 1, 1-kfreqinterpL, 1-kampinterpL
+        pvbufread ktimpnt1, "partB.pvc"
+  apvcR pvinterp ktimpnt2, 1, "partA-R.pvc", kfreqscale, 1, 1, 1, 1-kfreqinterpR, 1-kampinterpR
+
+  outs apvcL*0.8, apvcR*0.8
+endin
+</CsInstruments>
+<CsScore>
+i 1 0 7
+e
+</CsScore>
+</CsoundSynthesizer>
--- a/Document/test.csd
+++ b/Document/test.csd
@@ -0,0 +1,253 @@
+<CsoundSynthesizer>
+<CsInstruments>
+// Csound single-line comments can be preceded by a pair of forward slashes...
+; ...or a semicolon.
+
+/* Block comments begin with /* and end with */
+
+// Orchestras begin with a header of audio parameters.
+nchnls = 1
+nchnls_i = 1
+sr = 44100
+0dbfs = 1
+ksmps = 10
+
+// The control rate kr = sr / ksmps can be omitted when the number of audio
+// samples in a control period (ksmps) is set, but kr may appear in older
+// orchestras.
+kr = 4410
+
+// Orchestras contain instruments. These begin with the keyword instr followed
+// by a comma-separated list of numbers or names of the instrument. Instruments
+// end at the endin keyword and cannot be nested.
+instr 1, N_a_M_e_, +Name
+  // Instruments contain statements. Here is a typical statement:
+  aSignal oscil 0dbfs, 440, 1
+  // Statements are terminated with a newline (possibly preceded by a comment).
+  // To write a statement on several lines, precede the newline with a
+  // backslash.
+  prints \
+    "hello, world\n";comment
+
+  // Csound 6 introduced function syntax for opcodes with one or zero outputs.
+  // The oscil statement above is the same as
+  aSignal = oscil(0dbfs, 440, 1)
+
+  // Instruments can contain control structures.
+  kNote = p3
+  if (kNote == 0) then
+    kFrequency = 220
+  elseif kNote == 1 then // Parentheses around binary expressions are optional.
+    kFrequency = 440
+  endif
+
+  // Csound 6 introduced looping structures.
+  iIndex = 0
+  while iIndex < 5 do
+    print iIndex
+    iIndex += 1
+  od
+  iIndex = 0
+  until iIndex >= 5 do
+    print iIndex
+    iIndex += 1
+  enduntil
+  // Both kinds of loops can be terminated by either od or enduntil.
+
+  // Single-line strings are enclosed in double-quotes.
+  prints "string\\\r\n\t\""
+  // Multi-line strings are enclosed in pairs of curly braces.
+  prints {{
+    hello,
+
+    world
+  }}
+
+  // Instruments often end with a statement containing an output opcode.
+  outc aSignal
+endin
+
+// Orchestras can also contain user-defined opcodes (UDOs). Here is an
+// oscillator with one audio-rate output and two control-rate inputs:
+opcode anOscillator, a, kk
+  kAmplitude, kFrequency xin
+  aSignal vco2 kAmplitude, kFrequency
+  xout aSignal
+endop
+instr TestOscillator
+  outc(anOscillator(0dbfs, 110))
+endin
+
+// Python can be executed in Csound
+// <https://csound.github.io/docs/manual/pyrun.html>. So can Lua
+// <https://csound.github.io/docs/manual/lua.html>.
+pyruni {{
+import random
+
+pool = [(1 + i / 10.0) ** 1.2 for i in range(100)]
+
+def get_number_from_pool(n, p):
+  if random.random() < p:
+    i = int(random.random() * len(pool))
+    pool[i] = n;
+  return random.choice(pool)
+}}
+
+// The Csound preprocessor supports conditional compilation and including files.
+#ifdef DEBUG
+#undef DEBUG
+#include "filename.orc"
+#endif
+
+// The preprocessor also supports object- and function-like macros. This is an
+// object-like macro that defines a number:
+#define A_HZ #440#
+
+// This is a function-like macro:
+#define OSCIL_MACRO(VOLUME'FREQUENCY'TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+
+// Bodies of macros are enclosed in # and can contain newlines. The arguments of
+// function-like macros are separated by single-quotes. Uses of macros are
+// prefixed with a dollar sign.
+instr TestMacro
+  aSignal $OSCIL_MACRO(1'$A_HZ'1)
+  // Not unlike PHP, macros expand in double-quoted strings.
+  prints "The frequency of the oscillator is $A_HZ Hz.\n"
+  out aSignal
+endin
+
+// Here are other things to note about Csound.
+
+// There are two bitwise NOT operators, ~ and ¬ (U+00AC). The latter is common
+// on keyboards in the United Kingdom
+// <https://en.wikipedia.org/wiki/British_and_American_keyboards>.
+instr TestBitwiseNOT
+  print ~42
+  print ¬42
+endin
+
+// Csound uses # for bitwise XOR, which the Csound manual calls bitwise
+// non-equivalence <https://csound.github.io/docs/manual/opnonequiv.html>.
+instr TestBitwiseXOR
+  print 0 # 0
+  print 0 # 1
+  print 1 # 0
+  print 1 # 1
+endin
+
+// Loops and if-then statements are relatively recent additions to Csound. There
+// are many flow-control opcodes that involve goto and labels.
+instr TestGoto
+  // This...
+  if p3 > 0 goto if_label
+  goto else_label
+if_label:
+  prints "if branch\n"
+  goto endif_label
+else_label:
+  prints "else branch\n"
+endif_label:
+
+  // ...is the same as this.
+  if p3 > 0 then
+    prints "if branch\n"
+  else
+    prints "else branch\n"
+  endif
+
+  // This...
+  iIndex = 0
+loop_label:
+  print iIndex
+  iIndex += 1
+  if iIndex < 10 goto loop_label
+
+  // ...is the same as this...
+  iIndex = 0
+loop_lt_label:
+  print iIndex
+  loop_lt iIndex, 1, 10, loop_lt_label
+
+  // ...and this.
+  iIndex = 0
+  while iIndex < 10 do
+    print iIndex
+    iIndex += 1
+  od
+endin
+
+// The prints and printks opcodes
+// <https://github.com/csound/csound/blob/develop/OOps/ugrw1.c#L831>, arguably
+// the primary methods of logging output, treat certain sequences of characters
+// different from printf in C.
+instr TestPrints
+  // ^ prints an ESCAPE character (U+001B), not a CIRCUMFLEX ACCENT character
+  // (U+005E). ^^ prints a CIRCUMFLEX ACCENT.
+  prints "^^\n"
+  // ~ prints an ESCAPE character (U+001B) followed by a [, not a TILDE
+  // character (U+007E). ~~ prints a TILDE.
+  prints "~~\n"
+  // \A, \B, \N, \R, and \T correspond to the escaped lowercase characters (that
+  // is, BELL (U+0007), BACKSPACE (U+0008), new line (U+000A), CARRIAGE RETURN
+  // (U+000D), and tab (U+0009)).
+  prints "\T\R\N"
+  // %n, %r, and %t are the same as \n, \r, and \t, as are %N, %R, and %T.
+  prints "%t%r%n"
+  // %! prints a semicolon. This is a hold-over from old versions of Csound that
+  // allowed comments to begin in strings.
+  prints "; %!\n"
+endin
+
+// The arguments of function-like macros can be separated by # instead of '.
+// These two lines define the same macro.
+#define OSCIL_MACRO(VOLUME'FREQUENCY'TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+#define OSCIL_MACRO(VOLUME#FREQUENCY#TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+
+// Uses of macros can optionally be suffixed with a period.
+instr TestMacroPeriodSuffix
+  aSignal $OSCIL_MACRO.(1'$A_HZ'1)
+  prints "The frequency of the oscillator is $A_HZ.Hz.\n"
+  out aSignal
+endin
+
+// Csound has @ and @@ operator-like macros that, when followed by a literal
+// non-negative integer, expand to the next power of 2 and the next power of 2
+// plus 1:
+//    @x = 2^(ceil(log2(x + 1))), x >= 0
+//   @@0 = 2
+//   @@x = 2^(ceil(log2(x))) + 1, x > 0
+instr TestAt
+  prints "%d  %2d  %2d\n", 0, @0, @@0
+  prints "%d  %2d  %2d\n", 1, @1, @@1
+  prints "%d  %2d  %2d\n", 2, @2, @@2
+  prints "%d  %2d  %2d\n", 3, @3, @@3
+  prints "%d  %2d  %2d\n", 4, @4, @@4
+  prints "%d  %2d  %2d\n", 5, @5, @@5
+  prints "%d  %2d  %2d\n", 6, @6, @@6
+  prints "%d  %2d  %2d\n", 7, @7, @@7
+  prints "%d  %2d  %2d\n", 8, @8, @@8
+  prints "%d  %2d  %2d\n", 9, @9, @@9
+endin
+
+// Including newlines in macros can lead to confusing code.
+instr MacroAbuse
+  if 1 == 1 then
+    prints "on\n"
+#define FOO#
+BAR
+#endif // This ends the if block. It is not a preprocessor directive.
+endin
+</CsInstruments>
+<CsScore>
+f 1 0 16384 10 1
+i "N_a_M_e_" 0 2
+i "TestOscillator" 2 2
+i "TestBitwiseNOT" 0 1
+i "TestBitwiseXOR" 0 1
+i "TestGoto" 0 1
+i "TestMacroPeriodSuffix" 4 1
+i "TestAt" 0 1
+i "MacroAbuse" 0 1
+e
+</CsScore>
+</CsoundSynthesizer>
--- a/Score/allglass.sco
+++ b/Score/allglass.sco
@@ -0,0 +1,2 @@
+i 1 0 70.0073
+e
--- a/Score/interp.sco
+++ b/Score/interp.sco
@@ -0,0 +1,2 @@
+i 1 0 7
+e
--- a/Score/test.sco
+++ b/Score/test.sco
@@ -0,0 +1,10 @@
+f 1 0 16384 10 1
+i "N_a_M_e_" 0 2
+i "TestOscillator" 2 2
+i "TestBitwiseNOT" 0 1
+i "TestBitwiseXOR" 0 1
+i "TestGoto" 0 1
+i "TestMacroPeriodSuffix" 4 1
+i "TestAt" 0 1
+i "MacroAbuse" 0 1
+e
--- a/samples/Csound/allglass.orc
+++ b/samples/Csound/allglass.orc
@@ -0,0 +1,13 @@
+sr     = 44100
+kr     = 44100
+ksmps  = 1
+nchnls = 2
+
+; pvanal -n 512 -w 8 allglass1-L.wav allglass1-L.pvc
+; pvanal -n 512 -w 8 allglass1-R.wav allglass1-R.pvc
+instr 1
+  ktime line 0, p3, 17.5018
+  arL pvoc ktime, 1, "allglass1-L.pvc"
+  arR pvoc ktime, 1, "allglass1-R.pvc"
+  out arL, arR
+endin
--- a/samples/Csound/interp.orc
+++ b/samples/Csound/interp.orc
@@ -0,0 +1,26 @@
+sr     = 44100
+kr     = 44100
+ksmps  = 1
+nchnls = 2
+
+; pvanal -n 1024 -w 2 partA-L.wav partA-L.pvc
+; pvanal -n 1024 -w 2 partA-R.wav partA-R.pvc
+; pvanal -n 1024 -w 2 partB.wav partB.pvc
+instr 1
+  iscale = 1
+
+  ktimpnt1     line 0, iscale*(82196/44100), 82196/44100
+  ktimpnt2     linseg 0, iscale*1.25, 0, iscale*(103518/44100), 103518/44100
+  kfreqscale   linseg 1, iscale*0.5, 1, iscale*1.6, 0.8
+  kfreqinterpL linseg 0, iscale*0.25, 0, iscale*1.6, 1
+  kampinterpL  linseg 0, iscale*0.25, 0, iscale*1.6, 1
+  kfreqinterpR linseg 0, iscale*0.5, 0, iscale*1.2, 1
+  kampinterpR  linseg 0, iscale*0.5, 0, iscale*1.2, 1
+
+        pvbufread ktimpnt1, "partB.pvc"
+  apvcL pvinterp ktimpnt2, 1, "partA-L.pvc", kfreqscale, 1, 1, 1, 1-kfreqinterpL, 1-kampinterpL
+        pvbufread ktimpnt1, "partB.pvc"
+  apvcR pvinterp ktimpnt2, 1, "partA-R.pvc", kfreqscale, 1, 1, 1, 1-kfreqinterpR, 1-kampinterpR
+
+  outs apvcL*0.8, apvcR*0.8
+endin
--- a/samples/Csound/test.orc
+++ b/samples/Csound/test.orc
@@ -0,0 +1,250 @@
+// Csound single-line comments can be preceded by a pair of forward slashes...
+; ...or a semicolon.
+
+/* Block comments begin with /* and end with */
+
+// Orchestras begin with a header of audio parameters.
+nchnls = 1
+nchnls_i = 1
+sr = 44100
+0dbfs = 1
+ksmps = 10
+
+// The control rate kr = sr / ksmps can be omitted when the number of audio
+// samples in a control period (ksmps) is set, but kr may appear in older
+// orchestras.
+kr = 4410
+
+// Orchestras contain instruments. These begin with the keyword instr followed
+// by a comma-separated list of numbers or names of the instrument. Instruments
+// end at the endin keyword and cannot be nested.
+instr 1, N_a_M_e_, +Name
+  // Instruments contain statements. Here is a typical statement:
+  aSignal oscil 0dbfs, 440, 1
+  // Statements are terminated with a newline (possibly preceded by a comment).
+  // To write a statement on several lines, precede the newline with a
+  // backslash.
+  prints \
+    "hello, world\n";comment
+
+  // Csound 6 introduced function syntax for opcodes with one or zero outputs.
+  // The oscil statement above is the same as
+  aSignal = oscil(0dbfs, 440, 1)
+
+  // Instruments can contain control structures.
+  kNote = p3
+  if (kNote == 0) then
+    kFrequency = 220
+  elseif kNote == 1 then // Parentheses around binary expressions are optional.
+    kFrequency = 440
+  endif
+
+  // Csound 6 introduced looping structures.
+  iIndex = 0
+  while iIndex < 5 do
+    print iIndex
+    iIndex += 1
+  od
+  iIndex = 0
+  until iIndex >= 5 do
+    print iIndex
+    iIndex += 1
+  enduntil
+  // Both kinds of loops can be terminated by either od or enduntil.
+
+  // Single-line strings are enclosed in double-quotes.
+  prints "string\\\r\n\t\""
+  // Multi-line strings are enclosed in pairs of curly braces.
+  prints {{
+    hello,
+
+    world
+  }}
+
+  // Instruments often end with a statement containing an output opcode.
+  outc aSignal
+endin
+
+// Orchestras can also contain user-defined opcodes (UDOs). Here is an
+// oscillator with one audio-rate output and two control-rate inputs:
+opcode anOscillator, a, kk
+  kAmplitude, kFrequency xin
+  aSignal vco2 kAmplitude, kFrequency
+  xout aSignal
+endop
+instr TestOscillator
+  outc(anOscillator(0dbfs, 110))
+endin
+
+// Python can be executed in Csound
+// <https://csound.github.io/docs/manual/pyrun.html>. So can Lua
+// <https://csound.github.io/docs/manual/lua.html>.
+pyruni {{
+import random
+
+pool = [(1 + i / 10.0) ** 1.2 for i in range(100)]
+
+def get_number_from_pool(n, p):
+  if random.random() < p:
+    i = int(random.random() * len(pool))
+    pool[i] = n;
+  return random.choice(pool)
+}}
+
+// The Csound preprocessor supports conditional compilation and including files.
+#ifdef DEBUG
+#undef DEBUG
+#include "filename.orc"
+#endif
+
+// The preprocessor also supports object- and function-like macros. This is an
+// object-like macro that defines a number:
+#define A_HZ #440#
+
+// This is a function-like macro:
+#define OSCIL_MACRO(VOLUME'FREQUENCY'TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+
+// Bodies of macros are enclosed in # and can contain newlines. The arguments of
+// function-like macros are separated by single-quotes. Uses of macros are
+// prefixed with a dollar sign.
+instr TestMacro
+  aSignal $OSCIL_MACRO(1'$A_HZ'1)
+  // Not unlike PHP, macros expand in double-quoted strings.
+  prints "The frequency of the oscillator is $A_HZ Hz.\n"
+  out aSignal
+endin
+
+// Here are other things to note about Csound.
+
+// There are two bitwise NOT operators, ~ and ¬ (U+00AC). The latter is common
+// on keyboards in the United Kingdom
+// <https://en.wikipedia.org/wiki/British_and_American_keyboards>.
+instr TestBitwiseNOT
+  print ~42
+  print ¬42
+endin
+
+// Csound uses # for bitwise XOR, which the Csound manual calls bitwise
+// non-equivalence <https://csound.github.io/docs/manual/opnonequiv.html>.
+instr TestBitwiseXOR
+  print 0 # 0
+  print 0 # 1
+  print 1 # 0
+  print 1 # 1
+endin
+
+// Loops and if-then statements are relatively recent additions to Csound. There
+// are many flow-control opcodes that involve goto and labels.
+instr TestGoto
+  // This...
+  if p3 > 0 goto if_label
+  goto else_label
+if_label:
+  prints "if branch\n"
+  goto endif_label
+else_label:
+  prints "else branch\n"
+endif_label:
+
+  // ...is the same as this.
+  if p3 > 0 then
+    prints "if branch\n"
+  else
+    prints "else branch\n"
+  endif
+
+  // This...
+  iIndex = 0
+loop_label:
+  print iIndex
+  iIndex += 1
+  if iIndex < 10 goto loop_label
+
+  // ...is the same as this...
+  iIndex = 0
+loop_lt_label:
+  print iIndex
+  loop_lt iIndex, 1, 10, loop_lt_label
+
+  // ...and this.
+  iIndex = 0
+  while iIndex < 10 do
+    print iIndex
+    iIndex += 1
+  od
+endin
+
+// The prints and printks opcodes
+// <https://github.com/csound/csound/blob/develop/OOps/ugrw1.c#L831>, arguably
+// the primary methods of logging output, treat certain sequences of characters
+// different from printf in C.
+instr TestPrints
+  // ^ prints an ESCAPE character (U+001B), not a CIRCUMFLEX ACCENT character
+  // (U+005E). ^^ prints a CIRCUMFLEX ACCENT.
+  prints "^^\n"
+  // ~ prints an ESCAPE character (U+001B) followed by a [, not a TILDE
+  // character (U+007E). ~~ prints a TILDE.
+  prints "~~\n"
+  // \A, \B, \N, \R, and \T correspond to the escaped lowercase characters (that
+  // is, BELL (U+0007), BACKSPACE (U+0008), new line (U+000A), CARRIAGE RETURN
+  // (U+000D), and tab (U+0009)).
+  prints "\T\R\N"
+  // %n, %r, and %t are the same as \n, \r, and \t, as are %N, %R, and %T.
+  prints "%t%r%n"
+  // %! prints a semicolon. This is a hold-over from old versions of Csound that
+  // allowed comments to begin in strings.
+  prints "; %!\n"
+endin
+
+// The arguments of function-like macros can be separated by # instead of '.
+// These two lines define the same macro.
+#define OSCIL_MACRO(VOLUME'FREQUENCY'TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+#define OSCIL_MACRO(VOLUME#FREQUENCY#TABLE) #oscil $VOLUME, $FREQUENCY, $TABLE#
+
+// Uses of macros can optionally be suffixed with a period.
+instr TestMacroPeriodSuffix
+  aSignal $OSCIL_MACRO.(1'$A_HZ'1)
+  prints "The frequency of the oscillator is $A_HZ.Hz.\n"
+  out aSignal
+endin
+
+// Csound has @ and @@ operator-like macros that, when followed by a literal
+// non-negative integer, expand to the next power of 2 and the next power of 2
+// plus 1:
+//    @x = 2^(ceil(log2(x + 1))), x >= 0
+//   @@0 = 2
+//   @@x = 2^(ceil(log2(x))) + 1, x > 0
+instr TestAt
+  prints "%d  %2d  %2d\n", 0, @0, @@0
+  prints "%d  %2d  %2d\n", 1, @1, @@1
+  prints "%d  %2d  %2d\n", 2, @2, @@2
+  prints "%d  %2d  %2d\n", 3, @3, @@3
+  prints "%d  %2d  %2d\n", 4, @4, @@4
+  prints "%d  %2d  %2d\n", 5, @5, @@5
+  prints "%d  %2d  %2d\n", 6, @6, @@6
+  prints "%d  %2d  %2d\n", 7, @7, @@7
+  prints "%d  %2d  %2d\n", 8, @8, @@8
+  prints "%d  %2d  %2d\n", 9, @9, @@9
+endin
+
+// Including newlines in macros can lead to confusing code.
+instr MacroAbuse
+  if 1 == 1 then
+    prints "on\n"
+#define FOO#
+BAR
+#endif // This ends the if block. It is not a preprocessor directive.
+endin
+
+scoreline_i {{
+f 1 0 16384 10 1
+i "N_a_M_e_" 0 2
+i "TestOscillator" 2 2
+i "TestBitwiseNOT" 0 1
+i "TestBitwiseXOR" 0 1
+i "TestGoto" 0 1
+i "TestMacroPeriodSuffix" 4 1
+i "TestAt" 0 1
+i "MacroAbuse" 0 1
+e
+}}
--- a/samples/E/atomic-updates.E
+++ b/samples/E/atomic-updates.E
@@ -0,0 +1,123 @@
+#!/usr/bin/env rune
+pragma.syntax("0.9")
+
+def pi := (-1.0).acos()
+def makeEPainter := <unsafe:com.zooko.tray.makeEPainter>
+def colors := <awt:makeColor>
+
+# --------------------------------------------------------------
+# --- Definitions
+
+/** Execute 'task' repeatedly as long 'indicator' is unresolved. */
+def doWhileUnresolved(indicator, task) {
+  def loop() {
+    if (!Ref.isResolved(indicator)) {
+      task()
+      loop <- ()
+    }
+  }
+  loop <- ()
+}
+
+/** The data structure specified for the task. */
+def makeBuckets(size) {
+    def values := ([100] * size).diverge() # storage
+    def buckets {
+        to size() :int { return size }
+        /** get current quantity in bucket 'i' */
+        to get(i :int) { return values[i] }
+        /** transfer 'amount' units, as much as possible, from bucket 'i' to bucket 'j'
+            or vice versa if 'amount' is negative */
+        to transfer(i :int, j :int, amount :int) {
+            def amountLim := amount.min(values[i]).max(-(values[j]))
+            values[i] -= amountLim
+            values[j] += amountLim
+        }
+    }
+    return buckets
+}
+
+/** A view of the current state of the buckets. */
+def makeDisplayComponent(buckets) {
+  def c := makeEPainter(def paintCallback {
+    to paintComponent(g) {
+      def pixelsW := c.getWidth()
+      def pixelsH := c.getHeight()
+      def bucketsW := buckets.size()
+
+      g.setColor(colors.getWhite())
+      g.fillRect(0, 0, pixelsW, pixelsH)
+
+      g.setColor(colors.getDarkGray())
+      var sum := 0
+      for i in 0..!bucketsW {
+        sum += def value := buckets[i]
+        def x0 := (i       * pixelsW / bucketsW).floor()
+        def x1 := ((i + 1) * pixelsW / bucketsW).floor()
+        g.fillRect(x0 + 1, pixelsH - value,
+                   x1 - x0 - 1, value)
+      }
+
+      g.setColor(colors.getBlack())
+      g."drawString(String, int, int)"(`Total: $sum`, 2, 20)
+    }
+  })
+  c.setPreferredSize(<awt:makeDimension>(500, 300))
+  return c
+}
+
+# --------------------------------------------------------------
+# --- Application setup
+
+def buckets := makeBuckets(100)
+def done # Promise indicating when the window is closed
+
+# Create the window
+def frame := <unsafe:javax.swing.makeJFrame>("Atomic transfers")
+frame.setContentPane(def display := makeDisplayComponent(buckets))
+frame.addWindowListener(def mainWindowListener {
+  to windowClosing(event) :void {
+    bind done := null
+  }
+  match _ {}
+})
+frame.setLocation(50, 50)
+frame.pack()
+
+# --------------------------------------------------------------
+# --- Tasks
+
+# Neatens up buckets
+var ni := 0
+doWhileUnresolved(done, fn {
+  def i := ni
+  def j := (ni + 1) %% buckets.size()
+  buckets.transfer(i, j, (buckets[i] - buckets[j]) // 4)
+  ni := j
+})
+
+# Messes up buckets
+var mi := 0
+doWhileUnresolved(done, fn {
+    def i := (mi + entropy.nextInt(3)) %% buckets.size()
+    def j := (i + entropy.nextInt(3)) %% buckets.size() #entropy.nextInt(buckets.size())
+    buckets.transfer(i, j, (buckets[i] / pi).floor())
+    mi := j
+})
+
+# Updates display at fixed 10 Hz
+# (Note: tries to catch up; on slow systems slow this down or it will starve the other tasks)
+def clock := timer.every(100, def _(_) {
+  if (Ref.isResolved(done)) {
+    clock.stop()
+  } else {
+    display.repaint()
+  }
+})
+clock.start()
+
+# --------------------------------------------------------------
+# --- All ready, go visible and wait
+
+frame.show()
+interp.waitAtTop(done)
--- a/samples/EJS/dash.ejs
+++ b/samples/EJS/dash.ejs
@@ -0,0 +1,13 @@
+<% include parts/depend %>
+
+<div class="row">
+  <% if (user.primaryAccount == "teacher") { %>
+    <% include teacher/sidebar %>
+    <% include teacher/dashboard %>
+  <% } else if (user.primaryAccount == "student") { %>
+    <% include student/sidebar %>
+    <% include student/dashboard %>
+  <% } else { %>
+    <center><h2>There seems to be a problem</h2></center>
+  <% } %>
+</div>
--- a/samples/EJS/page.ejs
+++ b/samples/EJS/page.ejs
@@ -0,0 +1,102 @@
+<% include ../parts/depend %>
+
+<div class="row">
+  <% include sidebar %>
+  <div class="col-lg-offset-3 col-lg-9 main-content">
+    <div class="page-title">
+      <h1>Pieces</h1>
+      <% if (pieces.length == 1) { %>
+        <p>You have
+          <strong>1</strong>
+          piece to practice</p>
+      <% } else { %>
+        <p>You have
+          <strong><%= pieces.length %></strong>
+          pieces to practice</p>
+      <% } %>
+    </div>
+    <div class="row">
+      <% if (pieces == undefined || pieces.length == 0) { %>
+        <div class="error-main">
+          <h1>No Pieces</h1>
+          <p>You have no
+            <strong>Pieces</strong>
+            assigned.</p>
+        </div>
+      <% } else { %>
+        <div class="col-lg-12 section-title">
+          <div style="margin-top: 10px; margin-bottom: 10px;" class="btn-group" role="group">
+            <button id="inProgressButton" type="button" class="btn btn-md btn-super-round btn-focus-off btn-primary btn-primary-active">In Progress</button>
+            <button id="completedButton" type="button" class="btn btn-md btn-super-round btn-focus-off btn-purple">Completed</button>
+          </div>
+        </div>
+
+        <div id="inProgressPieces">
+          <% if (inProgressPieces == undefined || inProgressPieces.length == 0) { %>
+            <center>
+              <h2>No Pieces in Progress</h2>
+            </center>
+          <% } else { %>
+            <% for (var i = 0; i < inProgressPieces.length; i++) { %>
+              <div class="col-lg-6">
+                <div class="box">
+                  <div class="title">
+                    <h1>
+                      <a href="/pieces/practice/<%= inProgressPieces[i].id %>"><%= inProgressPieces[i].title %></a>
+                    </h1>
+                    <p>By
+                      <strong><%= inProgressPieces[i].author %></strong>
+                    </p>
+                    <p>
+                      Teacher:
+                      <strong><%= inProgressPieces[i].teacherName %></strong>
+                    </p>
+                    <p>Average Practice Time:
+                      <strong><%= inProgressPieces[i].averagePracticeTime %>
+                        mins</strong>
+                    </p>
+                    <a href="/pieces/practice/<%= inProgressPieces[i].id %>" class="btn btn-success btn-block">Practice
+                      <%= inProgressPieces[i].title %></a>
+                  </div>
+                </div>
+              </div>
+            <% } %>
+          <% } %>
+        </div>
+
+        <div id="completedPieces" style="display: none;">
+          <% if (completedPieces == undefined || completedPieces.length == 0) { %>
+            <center>
+              <h2>No Completed Pieces</h2>
+            </center>
+          <% } else { %>
+            <% for (var i = 0; i < completedPieces.length; i++) { %>
+              <div class="col-lg-6">
+                <div class="box">
+                  <div class="title">
+                    <h1>
+                      <a href="/pieces/practice/<%= completedPieces[i].id %>"><%= completedPieces[i].title %></a>
+                    </h1>
+                    <p>By
+                      <strong><%= completedPieces[i].author %></strong>
+                    </p>
+                    <p>
+                      Teacher:
+                      <strong><%= completedPieces[i].teacherName %></strong>
+                    </p>
+                    <p>Average Practice Time:
+                      <strong><%= completedPieces[i].averagePracticeTime %>
+                        mins</strong>
+                    </p>
+                    <a href="/pieces/practice/<%= completedPieces[i].id %>" class="btn btn-success btn-block">Practice
+                      <%= completedPieces[i].title %></a>
+                  </div>
+                </div>
+              </div>
+            <% } %>
+          <% } %>
+        </div>
+      <% } %>
+    </div>
+  </div>
+</div>
--- a/samples/EQ/HTTPServerVirtualHostListener.eq
+++ b/samples/EQ/HTTPServerVirtualHostListener.eq
@@ -0,0 +1,235 @@
+
+/*
+ * This file is part of Jkop
+ * Copyright (c) 2016 Job and Esther Technologies, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+IFNDEF("target_posix")
+{
+	public class HTTPServerVirtualHostListener : EventLoopReadListener
+	{
+		public static HTTPServerVirtualHostListener create(String name, HTTPServer server, String prefix = null) {
+			Logger logger;
+			if(server != null) {
+				logger = server.get_logger();
+			}
+			Log.error("Virtual hosts are not supported on this platform.", logger);
+			return(null);
+		}
+
+		public void on_read_ready() {
+		}
+
+		public void close() {
+		}
+	}
+}
+
+ELSE {
+
+public class HTTPServerVirtualHostListener : LoggerObject, EventLoopReadListener
+{
+	class Client : LoggerObject, EventLoopReadListener
+	{
+		HTTPServer server;
+		LocalSocket socket;
+		EventLoopEntry ee;
+
+		embed "c" {{{
+			#include <unistd.h>
+			#include <sys/types.h>
+			#include <sys/socket.h>
+		}}}
+
+		public static Client create(HTTPServer server, LocalSocket socket) {
+			if(server == null || socket == null) {
+				return(null);
+			}
+			var eventloop = server.get_eventloop();
+			if(eventloop == null) {
+				return(null);
+			}
+			var v = new Client();
+			v.set_logger(server.get_logger());
+			v.server = server;
+			v.socket = socket;
+			v.ee = eventloop.entry_for_object(socket);
+			if(v.ee == null) {
+				return(null);
+			}
+			v.ee.set_read_listener(v);
+			return(v);
+		}
+
+		public void close() {
+			if(ee != null) {
+				ee.remove();
+				ee = null;
+			}
+			if(socket != null) {
+				socket.close();
+				socket = null;
+			}
+			server = null;
+		}
+
+		public void on_read_ready() {
+			receive_fd();
+			close();
+		}
+
+		private void receive_fd() {
+			if(socket is FileDescriptor == false) {
+				return;
+			}
+			int lsfd = ((FileDescriptor)socket).get_fd();
+			int r;
+			int newfd = -1;
+			embed "c" {{{
+				char buf[64];
+				struct msghdr msg;
+				struct iovec iov[1];
+				ssize_t n;
+				union {
+					struct cmsghdr cm;
+					char control[CMSG_SPACE(sizeof(int))];
+				} control_un;
+				struct cmsghdr* cmptr;
+				msg.msg_control = control_un.control;
+				msg.msg_controllen = sizeof(control_un.control);
+				msg.msg_name = NULL;
+				msg.msg_namelen = 0;
+				iov[0].iov_base = buf;
+				iov[0].iov_len = 64;
+				msg.msg_iov = iov;
+				msg.msg_iovlen = 1;
+				r = recvmsg(lsfd, &msg, 0);
+			}}}
+			if(r < 0) {
+				log_error("FAILED to recvmsg() from the local socket in virtual host receiver.");
+				return;
+			}
+			embed "c" {{{
+				if((cmptr = CMSG_FIRSTHDR(&msg)) != NULL && cmptr->cmsg_len == CMSG_LEN(sizeof(int))) {
+					if(cmptr->cmsg_level == SOL_SOCKET && cmptr->cmsg_type == SCM_RIGHTS) {
+						newfd = *((int*)CMSG_DATA(cmptr));
+					}
+				}
+			}}}
+			if(newfd < 0) {
+				log_warning("No file descriptor was passed through the socket in virtual host receiver.");
+				return;
+			}
+			var newsock = TCPSocket.create();
+			if(newsock == null) {
+				embed "c" {{{ close(newfd); }}}
+				log_error("FAILED to create a new socket");
+				return;
+			}
+			var fds = newsock as FileDescriptorSocket;
+			if(fds == null) {
+				embed "c" {{{ close(newfd); }}}
+				log_error("TCPSocket is not a FileDescriptorSocket. Cannot set file descriptor.");
+				return;
+			}
+			fds.set_fd(newfd);
+			server.on_new_client_socket(newsock);
+		}
+	}
+
+	HTTPServer server;
+	LocalSocket socket;
+	EventLoopEntry ee;
+	String socketprefix;
+
+	public static HTTPServerVirtualHostListener create(String name, HTTPServer server, String prefix = null) {
+		if(server == null) {
+			return(null);
+		}
+		var v = new HTTPServerVirtualHostListener();
+		v.server = server;
+		v.socketprefix = prefix;
+		v.set_logger(server.get_logger());
+		if(v.start(name) == false) {
+			v = null;
+		}
+		return(v);
+	}
+
+	public bool start(String name) {
+		if(String.is_empty(name) || server == null) {
+			return(false);
+		}
+		socket = LocalSocket.create();
+		if(socket == null) {
+			log_error("Cannot create local socket");
+			return(false);
+		}
+		var pp = socketprefix;
+		if(String.is_empty(pp)) {
+			pp = "sympathy_vhost_";
+		}
+		var socketname = "%s%s".printf().add(pp).add(name).to_string();
+		if(socket != null) {
+			if(socket.listen(socketname) == false) {
+				socket = null;
+			}
+		}
+		if(socket == null) {
+			log_error("FAILED to listen to local socket `%s'".printf().add(socketname));
+			return(false);
+		}
+		var event_loop = server.get_eventloop();
+		if(event_loop == null) {
+			log_error("No eventloop");
+			return(false);
+		}
+		ee = event_loop.entry_for_object(socket);
+		if(ee == null) {
+			log_error("Failed to register socket with eventloop");
+			return(false);
+		}
+		ee.set_read_listener(this);
+		log_debug("HTTPServerVirtualHostListener: Listening for virtual host `%s'".printf().add(name));
+		return(true);
+	}
+
+	public void close() {
+		if(ee != null) {
+			ee.remove();
+			ee = null;
+		}
+		if(socket != null) {
+			socket.close();
+			socket = null;
+		}
+		server = null;
+	}
+
+	public void on_read_ready() {
+		var ns = socket.accept();
+		if(ns != null) {
+			Client.create(server, ns);
+		}
+	}
+}
+
+}
--- a/samples/EQ/SEButtonEntity.eq
+++ b/samples/EQ/SEButtonEntity.eq
@@ -0,0 +1,181 @@
+
+/*
+ * This file is part of Jkop
+ * Copyright (c) 2016 Job and Esther Technologies, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+public class SEButtonEntity : SESpriteEntity, SEPointerListener
+{
+	class SEImageButtonEntity : SEButtonEntity
+	{
+		property SEImage image_normal;
+		property SEImage image_hover;
+		property SEImage image_pressed;
+
+		public void update() {
+			if(get_pressed()) {
+				var img = image_pressed;
+				if(img == null) {
+					img = image_hover;
+				}
+				if(img == null) {
+					img = image_normal;
+				}
+				set_image(img);
+			}
+			else if(get_has_pointer()) {
+				var img = image_hover;
+				if(img == null) {
+					img = image_normal;
+				}
+				set_image(img);
+			}
+			else {
+				set_image(image_normal);
+			}
+		}
+	}
+
+	class SETextButtonEntity : SEButtonEntity
+	{
+		property String button_text;
+		property String normal_font;
+		property String hover_font;
+		property String pressed_font;
+
+		public void update() {
+			if(get_pressed()) {
+				var ff = pressed_font;
+				if(String.is_empty(ff)) {
+					ff = hover_font;
+				}
+				if(String.is_empty(ff)) {
+					ff = normal_font;
+				}
+				set_text(button_text, ff);
+			}
+			else if(get_has_pointer()) {
+				var ff = hover_font;
+				if(String.is_empty(ff)) {
+					ff = normal_font;
+				}
+				set_text(button_text, ff);
+			}
+			else {
+				set_text(button_text, normal_font);
+			}
+		}
+	}
+
+	public static SEButtonEntity for_image(SEImage img) {
+		return(SEButtonEntity.for_images(img, null, null));
+	}
+
+	public static SEButtonEntity for_images(SEImage normal, SEImage hover, SEImage pressed) {
+		return(new SEImageButtonEntity().set_image_normal(normal).set_image_hover(hover)
+			.set_image_pressed(pressed));
+	}
+
+	public static SEButtonEntity for_text(String text, String normal_font = null, String hover_font = null, String pressed_font = null) {
+		return(new SETextButtonEntity().set_button_text(text).set_normal_font(normal_font).set_hover_font(hover_font)
+			.set_pressed_font(pressed_font));
+	}
+
+	property SEMessageListener listener;
+	property Object data;
+	bool pressed = false;
+	bool has_pointer = false;
+
+	public bool get_pressed() {
+		return(pressed);
+	}
+
+	public bool get_has_pointer() {
+		return(has_pointer);
+	}
+
+	public void initialize(SEResourceCache rsc) {
+		base.initialize(rsc);
+		update();
+	}
+
+	public virtual void update() {
+	}
+
+	public virtual void on_pointer_enter(SEPointerInfo pi) {
+		if(has_pointer) {
+			return;
+		}
+		has_pointer = true;
+		update();
+	}
+
+	public virtual void on_pointer_leave(SEPointerInfo pi) {
+		if(has_pointer == false && pressed == false) {
+			return;
+		}
+		has_pointer = false;
+		pressed = false;
+		update();
+	}
+
+	public void on_pointer_move(SEPointerInfo pi) {
+		if(pi.is_inside(get_x(), get_y(), get_width(), get_height())) {
+			if(has_pointer == false) {
+				on_pointer_enter(pi);
+			}
+		}
+		else {
+			if(has_pointer) {
+				on_pointer_leave(pi);
+			}
+		}
+	}
+
+	public void on_pointer_press(SEPointerInfo pi) {
+		if(pressed) {
+			return;
+		}
+		if(pi.is_inside(get_x(), get_y(), get_width(), get_height()) == false) {
+			return;
+		}
+		pressed = true;
+		update();
+	}
+
+	public void on_pointer_release(SEPointerInfo pi) {
+		if(pressed == false) {
+			return;
+		}
+		if(pi.is_inside(get_x(), get_y(), get_width(), get_height()) == false) {
+			return;
+		}
+		on_pointer_click(pi);
+		pressed = false;
+		update();
+	}
+
+	public virtual void on_pointer_click(SEPointerInfo pi) {
+		if(listener != null) {
+			listener.on_message(data);
+		}
+	}
+}
--- a/samples/EQ/String.eq
+++ b/samples/EQ/String.eq
@@ -0,0 +1,251 @@
+
+/*
+ * This file is part of Jkop
+ * Copyright (c) 2016 Job and Esther Technologies, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+public interface String : Stringable, Integer, Double, Boolean
+{
+	public static String instance(String o) {
+		if(o == null) {
+			return("");
+		}
+		return(o);
+	}
+
+	public static String as_string(Object o) {
+		if(o == null) {
+			return(null);
+		}
+		if(o is String) {
+			return((String)o);
+		}
+		if(o is Stringable) {
+			return(((Stringable)o).to_string());
+		}
+		return(null);
+	}
+
+	public static strptr as_strptr(Object o) {
+		var str = as_string(o);
+		if(str == null) {
+			return(null);
+		}
+		return(str.to_strptr());
+	}
+
+	public static bool is_in_collection(String str, Collection c) {
+		if(str == null) {
+			return(false);
+		}
+		foreach(String s in c) {
+			if(s.equals(str)) {
+				return(true);
+			}
+		}
+		return(false);
+	}
+
+	public static bool is_empty(Object o) {
+		if(o == null) {
+			return(true);
+		}
+		var str = o as String;
+		if(str == null && o is Stringable) {
+			str = ((Stringable)o).to_string();
+		}
+		if(str == null) {
+			return(true);
+		}
+		if(str.get_char(0) < 1) {
+			return(true);
+		}
+		return(false);
+	}
+
+	public static String for_object(Object o) {
+		if(o is String) {
+			return((String)o);
+		}
+		if(o is Stringable) {
+			return(((Stringable)o).to_string());
+		}
+		return(null);
+	}
+
+	public static String for_character(int c) {
+		var sb = StringBuffer.create();
+		sb.append_c(c);
+		return(sb.to_string());
+	}
+
+	public static String for_integer(int av) {
+		IFDEF("target_cs") {
+			strptr v;
+			embed {{{
+				v = av.ToString();
+			}}}
+			return(String.for_strptr(v));
+		}
+		ELSE IFDEF("target_java") {
+			strptr st;
+			embed {{{
+				st = java.lang.String.valueOf(av);
+			}}}
+			return(String.for_strptr(st));
+		}
+		ELSE {
+			return("%d".printf().add(av).to_string());
+		}
+	}
+
+	public static String for_long(long av) {
+		IFDEF("target_cs") {
+			strptr v;
+			embed {{{
+				v = av.ToString();
+			}}}
+			return(String.for_strptr(v));
+		}
+		ELSE IFDEF("target_java") {
+			strptr st;
+			embed {{{
+				st = java.lang.String.valueOf(av);
+			}}}
+			return(String.for_strptr(st));
+		}
+		ELSE {
+			return(for_integer((int)av));
+		}
+	}
+
+	public static String for_double(double v) {
+		IFDEF("target_java") {
+			strptr st;
+			embed {{{
+				st = java.lang.String.valueOf(v);
+			}}}
+			return(String.for_strptr(st));
+		}
+		ELSE {
+			return("%f".printf().add(v).to_string());
+		}
+	}
+
+	public static String for_boolean(bool val) {
+		if(val) {
+			return("true");
+		}
+		return("false");
+	}
+
+	public static String for_strptr(strptr literal) {
+		var v = new StringImpl();
+		v.set_strptr(literal);
+		return(v);
+	}
+
+	public static String for_utf8_buffer(Buffer data, bool haszero = true) {
+		var v = new StringImpl();
+		v.set_utf8_buffer(data, haszero);
+		return(v);
+	}
+
+	public static String combine(Collection strings, int delim = -1, bool unique = false) {
+		var sb = StringBuffer.create();
+		HashTable flags;
+		if(unique) {
+			flags = HashTable.create();
+		}
+		foreach(Object o in strings) {
+			var s = String.as_string(o);
+			if(s == null) {
+				continue;
+			}
+			if(flags != null) {
+				if(flags.get(s) != null) {
+					continue;
+				}
+				flags.set(s, "true");
+			}
+			if(delim > 0 && sb.count() > 0) {
+				sb.append_c(delim);
+			}
+			sb.append(s);
+		}
+		return(sb.to_string());
+	}
+
+	public static String capitalize(String str) {
+		if(str == null) {
+			return(null);
+		}
+		var c0 = str.get_char(0);
+		if(c0 < 1) {
+			return(null);
+		}
+		if(c0 >= 'a' && c0 <= 'z') {
+			var sb = StringBuffer.create();
+			sb.append_c(c0 - 'a' + 'A');
+			sb.append(str.substring(1));
+			return(sb.to_string());
+		}
+		return(str);
+	}
+
+	public StringFormatter printf();
+	public String dup();
+	public String append(String str);
+	public int get_length();
+	public int get_char(int n);
+	public String truncate(int len);
+	public String replace(int o, int r);
+	public String replace_char(int o, int r);
+	public String replace_string(String o, String r);
+	public String remove(int start, int len);
+	public String insert(String str, int pos);
+	public String substring(int start, int alength = -1);
+	public String reverse();
+	public String lowercase();
+	public String uppercase();
+	public String strip();
+	public Iterator split(int delim, int max = -1);
+	public int str(String s);
+	public bool contains(String s);
+	public int rstr(String s);
+	public int chr(int c);
+	public int rchr(int c);
+	public bool has_prefix(String prefix);
+	public bool has_suffix(String suffix);
+	public int compare(Object ao);
+	public int compare_ignore_case(Object ao);
+	public bool equals(Object ao);
+	public bool equals_ptr(strptr str);
+	public bool equals_ignore_case(Object ao);
+	public bool equals_ignore_case_ptr(strptr str);
+	public StringIterator iterate();
+	public StringIterator iterate_reverse();
+	public int to_integer_base(int ibase);
+	public strptr to_strptr();
+	public Buffer to_utf8_buffer(bool zero = true);
+	public int hash();
+	public EditableString as_editable();
+}
--- a/samples/Erlang/170-os-daemons.es
+++ b/samples/Erlang/170-os-daemons.es
@@ -0,0 +1,26 @@
+#! /usr/bin/env escript
+
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+loop() ->
+	loop(io:read("")).
+
+loop({ok, _}) ->
+	loop(io:read(""));
+loop(eof) ->
+	stop;
+loop({error, Reason}) ->
+	throw({error, Reason}).
+
+main([]) ->
+	loop().
--- a/samples/Erlang/release
+++ b/samples/Erlang/release
@@ -119,4 +119,3 @@ execute_overlay([{copy, In, Out} | Rest], Vars, BaseDir, TargetDir) ->

 exit_code(ExitCode) ->
    erlang:halt(ExitCode, [{flush, true}]).
-
--- a/samples/Erlang/sample.app.src
+++ b/samples/Erlang/sample.app.src
@@ -0,0 +1,8 @@
+{application, sample,
+ [{description, "sample app"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {mod, {sample_app, []}},
+  {applications, [kernel, stdlib]},
+  {env, []},
+  {modules, []}]}.
--- a/samples/Erlang/single-context.es
+++ b/samples/Erlang/single-context.es
@@ -0,0 +1,104 @@
+#! /usr/bin/env escript
+% This file is part of Emonk released under the MIT license. 
+% See the LICENSE file for more information.
+
+main([]) ->
+	start(64, 1000);
+main([N]) ->
+	start(list_to_integer(N), 1000);
+main([N, M]) ->
+	start(list_to_integer(N), list_to_integer(M)).
+
+
+start(N, M) ->
+	code:add_pathz("test"),
+	code:add_pathz("ebin"),
+	{ok, Ctx} = emonk:create_ctx(),
+	{ok, undefined} = emonk:eval(Ctx, js()),
+	run(Ctx, N, M),
+	wait(N).
+
+run(_, 0, _) ->
+	ok;
+run(Ctx, N, M) ->
+	Self = self(),
+	Pid = spawn(fun() -> do_js(Self, Ctx, M) end),
+	io:format("Spawned: ~p~n", [Pid]),
+	run(Ctx, N-1, M).
+
+wait(0) ->
+	ok;
+wait(N) ->
+	receive
+		{finished, Pid} -> ok
+	end,
+	io:format("Finished: ~p~n", [Pid]),
+	wait(N-1).
+
+do_js(Parent, _, 0) ->
+	Parent ! {finished, self()};
+do_js(Parent, Ctx, M) ->
+	io:format("Running: ~p~n", [M]),
+	Test = random_test(),
+	{ok, [Resp]} = emonk:call(Ctx, <<"f">>, [Test]),
+	Sorted = sort(Resp),
+	true = Test == Sorted,
+	do_js(Parent, Ctx, M-1).
+
+js() -> 
+	<<"var f = function(x) {return [x];};">>.
+
+random_test() ->
+	Tests = [
+		null,
+		true,
+		false,
+		1,
+		-1,
+		3.1416,
+		-3.1416,
+		12.0e10,
+		1.234E+10,
+		-1.234E-10,
+		10.0,
+		123.456,
+		10.0,
+		<<"foo">>,
+		<<"foo", 5, "bar">>,
+		<<"">>,
+		<<"\n\n\n">>,
+		<<"\" \b\f\r\n\t\"">>,
+		{[]},
+		{[{<<"foo">>, <<"bar">>}]},
+		{[{<<"foo">>, <<"bar">>}, {<<"baz">>, 123}]},
+		[],
+		[[]],
+		[1, <<"foo">>],
+		{[{<<"foo">>, [123]}]},
+		{[{<<"foo">>, [1, 2, 3]}]},
+		{[{<<"foo">>, {[{<<"bar">>, true}]}}]},
+		{[
+			{<<"foo">>, []},
+			{<<"bar">>, {[{<<"baz">>, true}]}}, {<<"alice">>, <<"bob">>}
+		]},
+		[-123, <<"foo">>, {[{<<"bar">>, []}]}, null]
+	],
+	{_, [Test | _]} = lists:split(random:uniform(length(Tests)) - 1, Tests),
+	sort(Test).
+
+sort({Props}) ->
+	objsort(Props, []);
+sort(List) when is_list(List) ->
+	lstsort(List, []);
+sort(Other) ->
+	Other.
+
+objsort([], Acc) ->
+	{lists:sort(Acc)};
+objsort([{K,V} | Rest], Acc) ->
+	objsort(Rest, [{K, sort(V)} | Acc]).
+
+lstsort([], Acc) ->
+	lists:reverse(Acc);
+lstsort([Val | Rest], Acc) ->
+	lstsort(Rest, [sort(Val) | Acc]).
--- a/samples/FLUX/gameserver.fx
+++ b/samples/FLUX/gameserver.fx
@@ -0,0 +1,54 @@
+typedef engine isEngineMessage;
+typedef turn isTurnMessage;
+typedef connect isConnectMessage;
+typedef disconnect isDisconnectMessage;
+
+ClientMessage(char* data) => ();
+ParseMessage(char* data) => (int type, int client, char* data);
+ReadMessage(int type, int client, char* data) => ();
+
+ParseEngine(int type, int client, char* data) => (int client, int direction);
+DoEngine(int client, int direction) => ();
+
+ParseTurn(int type, int client, char* data) => (int client, int direction);
+DoTurn(int client, int direction) => ();
+
+ParseConnect(int type, int client, char* data) 
+	=> (int client, char* host, int port);
+DoConnect(int client, char* host, int port) => ();
+
+ParseDisconnect(int type, int client, char* data) => (int client);
+DoDisconnect(int client) => ();
+
+UpdateBoard(ClientList clients) => (ClientList clients);
+SendData(ClientList clients) => ();
+
+DoUpdate(ClientList clients) => ();
+
+DataTimer() => (ClientList clients);
+
+GetClients() => (ClientList clients);
+
+Wait(ClientList clients) => (ClientList clients);
+
+Listen () => (char* data);
+
+source Listen => ClientMessage;
+source DataTimer => DoUpdate;
+
+DataTimer = GetClients -> Wait;
+
+DoUpdate = UpdateBoard -> SendData;
+
+ClientMessage=ParseMessage -> ReadMessage;
+
+ReadMessage:[engine, _, _] = ParseEngine -> DoEngine;
+ReadMessage:[turn, _, _] = ParseTurn -> DoTurn;
+ReadMessage:[connect, _, _] = ParseConnect -> DoConnect;
+ReadMessage:[disconnect, _, _] = ParseDisconnect -> DoDisconnect;
+
+atomic GetClients:{client_lock};
+atomic DoConnect:{client_lock};
+atomic DoDisconnect:{client_lock};
+
+
--- a/samples/FLUX/imageserver.fx
+++ b/samples/FLUX/imageserver.fx
@@ -0,0 +1,44 @@
+typedef xml TestXML;
+typedef html TestHTML;
+
+typedef inCache TestInCache;
+
+Page (int socket) => ();
+
+ReadRequest (int socket) => (int socket, bool close, image_tag *request);
+
+CheckCache (int socket, bool close, image_tag *request) 
+	=> (int socket, bool close, image_tag *request);
+
+Handler (int socket, bool close, image_tag *request)
+     => (int socket, bool close, image_tag *request);
+
+Complete (int socket, bool close, image_tag *request) => ();
+
+ReadInFromDisk (int socket, bool close, image_tag *request)
+     => (int socket, bool close, image_tag *request, __u8 *rgb_data);
+
+Write (int socket, bool close, image_tag *request)
+     => (int socket, bool close, image_tag *request);
+
+Compress(int socket, bool close, image_tag *request, __u8 *rgb_data)
+	=> (int socket, bool close, image_tag *request);
+
+StoreInCache(int socket, bool close, image_tag *request)
+	=> (int socket, bool close, image_tag *request);
+
+Listen () 
+	=> (int socket);
+
+source Listen => Page;
+
+Handler:[_, _, inCache]=;
+Handler:[_, _, _]=ReadInFromDisk -> Compress -> StoreInCache;
+
+Page = ReadRequest -> CheckCache-> Handler -> Write -> Complete;
+
+atomic CheckCache:{cache};
+atomic StoreInCache:{cache};
+atomic Complete:{cache};
+
+handle error ReadInFromDisk => FourOhFor;
--- a/samples/FLUX/mbittorrent.fx
+++ b/samples/FLUX/mbittorrent.fx
@@ -0,0 +1,151 @@
+typedef choke TestChoke;
+typedef unchoke TestUnchoke;
+typedef interested TestInterested;
+typedef uninterested TestUninterested;
+typedef request TestRequest;
+typedef cancel TestCancel;
+typedef piece TestPiece;
+typedef bitfield TestBitfield;
+typedef have TestHave;
+typedef piececomplete TestPieceComplete;
+
+CheckinWithTracker (torrent_data_t *tdata)
+    => ();
+
+SendRequestToTracker (torrent_data_t *tdata)
+    => (torrent_data_t *tdata, int socket);
+    
+GetTrackerResponse (torrent_data_t *tdata, int socket)
+    => ();
+
+UpdateChokeList (torrent_data_t *tdata)
+    => ();
+
+PickChoked (torrent_data_t *tdata)
+    => (torrent_data_t *tdata, chokelist_t clist);
+    
+SendChokeUnchoke (torrent_data_t *tdata, chokelist_t clist)
+    => ();
+    
+SetupConnection (torrent_data_t *tdata, int socket)
+    => ();
+    
+Handshake (torrent_data_t *tdata, int socket)
+    => (torrent_data_t *tdata, client_data_t *client);
+    
+SendBitfield (torrent_data_t *tdata, client_data_t *client)
+    => ();
+
+Message (torrent_data_t *tdata, client_data_t *client)
+    => ();
+    
+ReadMessage (torrent_data_t *tdata, client_data_t *client)
+    => (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload);
+    
+HandleMessage (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+    
+MessageDone (client_data_t *client)
+    => ();
+    
+CompletePiece (torrent_data_t *tdata, client_data_t *client, int piece)
+    => (torrent_data_t *tdata, client_data_t *client);
+
+VerifyPiece (torrent_data_t *tdata, client_data_t *client, int piece)
+    => (torrent_data_t *tdata, client_data_t *client, int piece);
+
+SendHave (torrent_data_t *tdata, client_data_t *client, int piece)
+    => (torrent_data_t *tdata, client_data_t *client);
+
+SendUninterested (torrent_data_t *tdata, client_data_t *client)
+    => (torrent_data_t *tdata, client_data_t *client);
+    
+Choke (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+    
+Cancel (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+
+Interested (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+
+Uninterested (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+
+Bitfield (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+
+Unchoke (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (torrent_data_t *tdata, client_data_t *client);
+
+SendRequest (torrent_data_t *tdata, client_data_t *client)
+    => (client_data_t *client);
+
+Have (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (torrent_data_t *tdata, client_data_t *client);
+
+Piece (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (torrent_data_t *tdata, client_data_t *client, int piece);
+
+Request (torrent_data_t *tdata, client_data_t *client, int type, int length, char *payload)
+    => (client_data_t *client);
+    
+SendKeepAlives (torrent_data_t *tdata)
+    => ();
+
+GetClients () 
+    => (int maxfd, fd_set *fds);
+
+SelectSockets (int maxfd, fd_set *fds)
+    => (fd_set *fds);
+
+CheckSockets (fd_set *fds)
+    => (torrent_data_t *tdata, client_data_t *client);
+
+TrackerTimer () 
+    => (torrent_data_t *tdata);
+
+ChokeTimer ()
+    => (torrent_data_t *tdata);
+
+Connect ()
+    => (torrent_data_t *tdata, int socket);
+
+KeepAliveTimer ()
+    => (torrent_data_t *tdata);
+
+Listen ()
+    => (torrent_data_t *tdata, client_data_t *client);
+
+source TrackerTimer => CheckinWithTracker;
+source ChokeTimer => UpdateChokeList;
+source Connect => SetupConnection;
+source Listen => Message;
+source KeepAliveTimer => SendKeepAlives;
+
+Listen = GetClients -> SelectSockets -> CheckSockets;
+CheckinWithTracker = SendRequestToTracker -> GetTrackerResponse;
+UpdateChokeList = PickChoked -> SendChokeUnchoke;
+SetupConnection = Handshake -> SendBitfield;
+Message = ReadMessage -> HandleMessage -> MessageDone;
+
+CompletePiece:[_, _, piececomplete] = VerifyPiece -> SendHave -> SendUninterested;
+
+HandleMessage:[_, _, choke, _, _] = Choke;
+HandleMessage:[_, _, unchoke, _, _] = Unchoke -> SendRequest;
+HandleMessage:[_, _, interested, _, _] = Interested;
+
+HandleMessage:[_, _, uninterested, _, _] = Uninterested;
+HandleMessage:[_, _, request, _, _] = Request;
+HandleMessage:[_, _, cancel, _, _] = Cancel;
+HandleMessage:[_, _, piece, _, _] = Piece -> CompletePiece -> SendRequest;
+HandleMessage:[_, _, bitfield, _, _] = Bitfield;
+HandleMessage:[_, _, have, _, _] = Have -> SendRequest;
+
+atomic GetClients:{BigLock};
+atomic CheckSockets:{BigLock};
+atomic Message:{BigLock};
+atomic CheckinWithTracker:{BigLock};
+atomic UpdateChokeList:{BigLock};
+atomic SetupConnection:{BigLock};
+atomic SendKeepAlives:{BigLock};
--- a/samples/FLUX/test.fx
+++ b/samples/FLUX/test.fx
@@ -0,0 +1,38 @@
+// concrete node signatures
+Listen ()
+  => (int socket);
+
+ReadRequest (int socket)
+  => (int socket, bool close, image_tag *request);
+
+CheckCache (int socket, bool close, image_tag *request)
+  => (int socket, bool close, image_tag *request);
+
+// omitted for space:
+// ReadInFromDisk, StoreInCache
+Compress (int socket, bool close, image_tag *request, __u8 *rgb_data)
+  => (int socket, bool close, image_tag *request);
+Write (int socket, bool close, image_tag *request)
+  => (int socket, bool close, image_tag *request);
+Complete (int socket, bool close, image_tag *request) => ();
+
+// source node
+source Listen => Image;
+
+// abstract node
+Image = ReadRequest -> CheckCache -> Handler -> Write -> Complete;
+
+// predicate type & dispatch
+typedef hit TestInCache;
+Handler:[_, _, hit] = ;
+Handler:[_, _, _] =
+ReadInFromDisk -> Compress -> StoreInCache;
+
+// error handler
+handle error ReadInFromDisk => FourOhFor;
+
+// atomicity constraints
+atomic CheckCache:{cache};
+atomic StoreInCache:{cache};
+atomic Complete:{cache};
+
--- a/Description/pdp10.md
+++ b/Description/pdp10.md
--- a/samples/GDB/as3.gdbinit
+++ b/samples/GDB/as3.gdbinit
@@ -0,0 +1,259 @@
+# -*- gdb-script -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Interactive commands to help inspecting ActionScript execution state while debugging in gdb.
+#
+# To use this file, type from the gdb prompt: 
+# source $(hg root)/utils/as3.gdbinit
+# or include in your .gdbinit.
+#
+# See gdb help for individual commands.
+#
+# In case of undefined symbols, try running the gdb 'where' command before aswhere.
+#
+# Typical use case:
+# (gdb) run
+# ^C
+# (gdb) where
+# (gdb) aswhere
+# (gdb) asframe 4    # select 4th AS3 frame from the top
+# (gdb) aslocal      # print locals
+# (gdb) aslocal 2    # print 2nd local as a C++ value
+# $42 = ....
+# (gdb) print *$42   # dereference  $42, assuming it's a pointer (to a ScriptObject or String)
+#
+# Note that the gdb scripting language is rather limited.
+#
+
+define aswhere
+  set var $fcount = avmplus::AvmCore::getActiveCore()->debugger()->frameCount()
+  set var $i = 0
+  while ($i < $fcount) 
+    #  set var $frame = avmplus::AvmCore::getActiveCore()->debugger()->frameAt($k)
+    #  call (void)avmplus::Debugger::printFrame($k)
+    asprintframe $i
+    set var $i = $i + 1
+  end
+end
+
+document aswhere
+Print backtrace of all the ActionScript stack frames.
+May not work in all contexts (notably inside MMgc).
+May not work properly until gdb 'where' is called at least once.
+end
+
+set var $_asframe_selected=-1
+
+define asprintframe 
+  set var $frame = avmplus::AvmCore::getActiveCore()->debugger()->frameAt($arg0)
+  if ($frame == 0)
+    echo no frame\n
+  else
+    aspstring avmplus::Debugger::methodNameAt($frame)
+    echo (
+    set var $vcount = avmplus::Debugger::autoVarCount($frame, avmplus::Debugger::AUTO_ARGUMENT)
+    set var $j = 0
+    while ($j < $vcount) 
+      set var $argname = avmplus::Debugger::autoVarName($frame, $j, avmplus::Debugger::AUTO_ARGUMENT)
+      aspstring $argname 
+      echo =
+      set var $_atom = avmplus::Debugger::autoAtomAt($frame, $j, avmplus::Debugger::AUTO_ARGUMENT)
+      call (void)avmplus::Debugger::printAtom($_atom)
+      set var $j = $j + 1
+      if ($j != $vcount) 
+        echo ,
+      end
+    end
+    echo )
+    echo \n
+  end
+end
+
+
+define asframe 
+  if ($argc != 0)
+    set var $_asframe_selected=$arg0
+  end
+  if ($_asframe_selected >= 0)
+    asprintframe $_asframe_selected
+  else
+    echo no frame\n
+  end
+end
+
+document asframe
+Select and print an ActionScript stack frame.
+With no argument, print the selected AS stack frame.
+An argument specifies the number of the stack frame to select.
+end
+
+
+define aspstring
+  call (void)avmplus::Debugger::printString($arg0)
+end
+
+document aspstring
+Print the AS3 string.
+end
+
+# not pretty, but there's no switch
+define aslocal
+  set var $frame = avmplus::AvmCore::getActiveCore()->debugger()->frameAt($_asframe_selected)
+  if ($frame == 0)
+    echo no frame\n
+  else
+    if $argc == 0
+      set var $lcount = avmplus::Debugger::autoVarCount($frame, avmplus::Debugger::AUTO_LOCAL)
+      set var $k = 0
+      while ($k < $lcount) 
+        set var $lname = avmplus::Debugger::autoVarName($frame, $k, avmplus::Debugger::AUTO_LOCAL)
+        output $k
+        echo :\ \  
+        aspstring $lname
+        echo :\ \ 
+        aslocal $k
+        set var $k = $k + 1
+      end
+    else
+      set var $_last_type=avmplus::Debugger::autoAtomKindAt($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      if ($_last_type == 0)
+        echo unknown\n
+      end
+      if ($_last_type == 1)
+        call avmplus::Debugger::autoVarAsObject($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      end
+      if ($_last_type == 2)
+        call avmplus::Debugger::autoVarAsString($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      end
+      if ($_last_type == 3)
+        ecno namespace (unfinished)\n
+      end
+      if ($_last_type == 4)
+        echo undefined\n
+      end
+      if ($_last_type == 5)
+        call avmplus::Debugger::autoVarAsBoolean($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      end
+      if ($_last_type == 6)
+        call avmplus::Debugger::autoVarAsInteger($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      end
+      if ($_last_type == 7)
+        call avmplus::Debugger::autoVarAsDouble($frame, $arg0, avmplus::Debugger::AUTO_LOCAL) 
+      end
+    end
+  end
+end
+
+document aslocal 
+Print local variables of the currently selected AS stack frame, if debuging information present.
+Information may be incorrect if not at a debugger safepoint.
+With no argument, print all the local variables.
+With a numeric argument print the specific local variable (gdb will store value in history 
+for further manipulation).
+end
+
+define asarg
+  set var $frame = avmplus::AvmCore::getActiveCore()->debugger()->frameAt($_asframe_selected)
+  if ($frame == 0)
+    echo no frame\n
+  else
+    if $argc == 0
+      set var $acount = avmplus::Debugger::autoVarCount($frame, avmplus::Debugger::AUTO_ARGUMENT)
+      set var $k = 0
+      while ($k < $acount) 
+        set var $name = avmplus::Debugger::autoVarName($frame, $k, avmplus::Debugger::AUTO_ARGUMENT)
+        output $k
+        echo :\ \  
+        aspstring $name
+        echo :\ \ 
+        asarg $k
+        set var $k = $k + 1
+      end
+    else
+      set var $_last_type=avmplus::Debugger::autoAtomKindAt($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      if ($_last_type == 0)
+        echo unknown\n
+      end
+      if ($_last_type == 1)
+        print avmplus::Debugger::autoVarAsObject($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      end
+      if ($_last_type == 2)
+        print avmplus::Debugger::autoVarAsString($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      end
+      if ($_last_type == 3)
+        echo namespace (unfinished)\n
+      end
+      if ($_last_type == 4)
+        echo undefined\n
+      end
+      if ($_last_type == 5)
+        print avmplus::Debugger::autoVarAsBoolean($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      end
+      if ($_last_type == 6)
+        print avmplus::Debugger::autoVarAsInteger($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      end
+      if ($_last_type == 7)
+        print avmplus::Debugger::autoVarAsDouble($frame, $arg0, avmplus::Debugger::AUTO_ARGUMENT) 
+      end
+    end
+  end
+end
+
+document asarg 
+Print arguments of the currently selected AS stack frame.
+If no debugging information is available, argument names will not be printed.
+With no argument, print all the arguments.
+With a numeric argument print the specific argument (gdb will store value in history 
+for further manipulation).
+end
+
+
+define asthis
+  set var $frame = avmplus::AvmCore::getActiveCore()->debugger()->frameAt($_asframe_selected)
+  if ($frame == 0)
+    echo no frame\n
+  else
+    print avmplus::Debugger::autoVarAsObject($frame, 0, avmplus::Debugger::AUTO_THIS) 
+  end
+end
+
+document asthis
+Print the receiver of the currently selected frame.
+end
+
+define asmixon
+  print avmshell::DebugCLI::debuggerInterruptOnEnter
+  print avmshell::DebugCLI::debuggerInterruptOnEnter = true
+end
+
+document asmixon
+  turn on stepping.
+  Execution will return to gdb propmpt after asstep* instructions.
+  Requires debugging symbols in .abcs
+end
+
+define asstepout
+  call  avmplus::AvmCore::getActiveCore()->debugger()->stepOut()
+  continue
+  asprintframe 0
+end
+
+define asstepinto
+  output avmplus::AvmCore::getActiveCore()->debugger()->stepInto()
+  continue
+  asprintframe 0
+end
+
+define asstepover
+  output avmplus::AvmCore::getActiveCore()->debugger()->stepOver()
+  continue
+  asprintframe 0
+end
+
+
+define asprint
+  aspstring $arg0->traits()->name()
+  echo \n
+end
--- a/samples/GDB/gdb_lpc17xx_program.gdb
+++ b/samples/GDB/gdb_lpc17xx_program.gdb
@@ -0,0 +1,36 @@
+#
+# MicropendousX LPC17xx Development Board
+#
+# http://www.MicropendousX.org
+#
+# Connect to a debugger controlling a LPC17xx
+# and download firmware.
+#
+# Start your OpenOCD gdb server before running
+# this script with:  arm-none-eabi-gdb -x gdb_lpc17xx_program.gdb
+#
+# Note the 'monitor' command just passes its
+# arguments to OpenOCD
+#
+# This file is released under the MIT License
+#
+
+# Connect to OpenOCD gdb server
+target remote localhost:3333
+
+# reset the LPC17xx IC with the OpenOCD reset command
+monitor reset
+
+# the following are OpenOCD commands as in OpenOCD_program.script
+# which will download a hex file into your LPC17xx
+monitor halt
+monitor sleep 200
+monitor wait_halt
+monitor flash probe 0
+monitor flash info 0
+monitor flash write_image erase unlock USBtoSerial.hex
+monitor sleep 200
+monitor reset run
+monitor exit
+
+quit
--- a/samples/GLSL/gbuffers_textured_lit.fsh
+++ b/samples/GLSL/gbuffers_textured_lit.fsh
@@ -0,0 +1,20 @@
+#version 120
+
+uniform sampler2D texture;
+
+varying vec3 color;
+varying vec2 texcoord;
+
+vec4 GetDiffuse() {
+	vec4 diffuse = vec4(color.rgb, 1.0);
+	     diffuse *= texture2D(texture, texcoord);
+	
+	return diffuse;
+}
+
+
+void main() {
+	vec4 diffuse = GetDiffuse();
+	
+	gl_FragData[0] = diffuse;
+}
--- a/samples/GLSL/gbuffers_textured_lit.vsh
+++ b/samples/GLSL/gbuffers_textured_lit.vsh
@@ -0,0 +1,11 @@
+#version 120
+
+varying vec3 color;
+varying vec2 texcoord;
+
+void main() {
+	color    = gl_Color.rgb;
+	texcoord = gl_MultiTexCoord0.st;
+	
+	gl_Position = ftransform();
+}
--- a/Language/ClientBeginStep.gml
+++ b/Language/ClientBeginStep.gml
@@ -1,642 +0,0 @@
-/*
-    Originally from /Source/gg2/Scripts/Client/ClientBeginStep.gml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-// receive and interpret the server's message(s)
-var i, playerObject, playerID, player, otherPlayerID, otherPlayer, sameVersion, buffer, plugins, pluginsRequired, usePlugins;
-
-if(tcp_eof(global.serverSocket)) {
-    if(gotServerHello)
-        show_message("You have been disconnected from the server.");
-    else
-        show_message("Unable to connect to the server.");
-    instance_destroy();
-    exit;
-}
-
-if(room == DownloadRoom and keyboard_check(vk_escape))
-{
-    instance_destroy();
-    exit;
-}
-
-if(downloadingMap)
-{
-    while(tcp_receive(global.serverSocket, min(1024, downloadMapBytes-buffer_size(downloadMapBuffer))))
-    {
-        write_buffer(downloadMapBuffer, global.serverSocket);
-        if(buffer_size(downloadMapBuffer) == downloadMapBytes)
-        {
-            write_buffer_to_file(downloadMapBuffer, "Maps/" + downloadMapName + ".png");
-            downloadingMap = false;
-            buffer_destroy(downloadMapBuffer);
-            downloadMapBuffer = -1;
-            exit;
-        }
-    }
-    exit;
-}
-
-roomchange = false;
-do {
-    if(tcp_receive(global.serverSocket,1)) {
-        switch(read_ubyte(global.serverSocket)) {
-        case HELLO:
-            gotServerHello = true;
-            global.joinedServerName = receivestring(global.serverSocket, 1);
-            downloadMapName = receivestring(global.serverSocket, 1);
-            advertisedMapMd5 = receivestring(global.serverSocket, 1);
-            receiveCompleteMessage(global.serverSocket, 1, global.tempBuffer);
-            pluginsRequired = read_ubyte(global.tempBuffer);
-            plugins = receivestring(global.serverSocket, 1);
-            if(string_pos("/", downloadMapName) != 0 or string_pos("\", downloadMapName) != 0)
-            {
-                show_message("Server sent illegal map name: "+downloadMapName);
-                instance_destroy();
-                exit;
-            }
-
-            if (!noReloadPlugins && string_length(plugins))
-            {
-                usePlugins = pluginsRequired || !global.serverPluginsPrompt;
-                if (global.serverPluginsPrompt)
-                {
-                    var prompt;
-                    if (pluginsRequired)
-                    {
-                        prompt = show_question(
-                            "This server requires the following plugins to play on it: "
-                            + string_replace_all(plugins, ",", "#")
-                            + '#They are downloaded from the source: "'
-                            + PLUGIN_SOURCE
-                            + '"#The source states: "'
-                            + PLUGIN_SOURCE_NOTICE
-                            + '"#Do you wish to download them and continue connecting?'
-                        );
-                        if (!prompt)
-                        {
-                            instance_destroy();
-                            exit;
-                        }
-                    }
-                    else
-                    {
-                        prompt = show_question(
-                            "This server suggests the following optional plugins to play on it: "
-                            + string_replace_all(plugins, ",", "#")
-                            + '#They are downloaded from the source: "'
-                            + PLUGIN_SOURCE
-                            + '"#The source states: "'
-                            + PLUGIN_SOURCE_NOTICE
-                            + '"#Do you wish to download them and use them?'
-                        );
-                        if (prompt)
-                        {
-                            usePlugins = true;
-                        }
-                    }
-                }
-                if (usePlugins)
-                {
-                    if (!loadserverplugins(plugins))
-                    {
-                        show_message("Error ocurred loading server-sent plugins.");
-                        instance_destroy();
-                        exit;
-                    }
-                    global.serverPluginsInUse = true;
-                }
-            }
-            noReloadPlugins = false;
-            
-            if(advertisedMapMd5 != "")
-            {
-                var download;
-                download = not file_exists("Maps/" + downloadMapName + ".png");
-                if(!download and CustomMapGetMapMD5(downloadMapName) != advertisedMapMd5)
-                {
-                    if(show_question("The server's copy of the map (" + downloadMapName + ") differs from ours.#Would you like to download this server's version of the map?"))
-                        download = true;
-                    else
-                    {
-                        instance_destroy();
-                        exit;
-                    }
-                }
-                
-                if(download)
-                {
-                    write_ubyte(global.serverSocket, DOWNLOAD_MAP);
-                    socket_send(global.serverSocket);
-                    receiveCompleteMessage(global.serverSocket,4,global.tempBuffer);
-                    downloadMapBytes = read_uint(global.tempBuffer);
-                    downloadMapBuffer = buffer_create();
-                    downloadingMap = true;
-                    roomchange=true;
-                }
-            }
-            ClientPlayerJoin(global.serverSocket);
-            if(global.rewardKey != "" and global.rewardId != "")
-            {
-                var rewardId;
-                rewardId = string_copy(global.rewardId, 0, 255);
-                write_ubyte(global.serverSocket, REWARD_REQUEST);
-                write_ubyte(global.serverSocket, string_length(rewardId));
-                write_string(global.serverSocket, rewardId);
-            }
-            if(global.queueJumping == true)
-            {
-                write_ubyte(global.serverSocket, CLIENT_SETTINGS);
-                write_ubyte(global.serverSocket, global.queueJumping);
-            }
-            socket_send(global.serverSocket);
-            break;
-            
-        case JOIN_UPDATE:
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            global.playerID = read_ubyte(global.tempBuffer);
-            global.currentMapArea = read_ubyte(global.tempBuffer);
-            break;
-        
-        case FULL_UPDATE:
-            deserializeState(FULL_UPDATE);
-            break;
-        
-        case QUICK_UPDATE:
-            deserializeState(QUICK_UPDATE);
-            break;
-             
-        case CAPS_UPDATE:
-            deserializeState(CAPS_UPDATE);
-            break;
-                  
-        case INPUTSTATE:
-            deserializeState(INPUTSTATE);
-            break;             
-        
-        case PLAYER_JOIN:
-            player = instance_create(0,0,Player);
-            player.name = receivestring(global.serverSocket, 1);
-                  
-            ds_list_add(global.players, player);
-            if(ds_list_size(global.players)-1 == global.playerID) {
-                global.myself = player;
-                instance_create(0,0,PlayerControl);
-            }
-            break;
-            
-        case PLAYER_LEAVE:
-            // Delete player from the game, adjust own ID accordingly
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            playerID = read_ubyte(global.tempBuffer);
-            player = ds_list_find_value(global.players, playerID);
-            removePlayer(player);
-            if(playerID < global.playerID) {
-                global.playerID -= 1;
-            }
-            break;
-                                   
-        case PLAYER_DEATH:
-            var causeOfDeath, assistantPlayerID, assistantPlayer;
-            receiveCompleteMessage(global.serverSocket,4,global.tempBuffer);
-            playerID = read_ubyte(global.tempBuffer);
-            otherPlayerID = read_ubyte(global.tempBuffer);
-            assistantPlayerID = read_ubyte(global.tempBuffer);
-            causeOfDeath = read_ubyte(global.tempBuffer);
-                  
-            player = ds_list_find_value(global.players, playerID);
-            
-            otherPlayer = noone;
-            if(otherPlayerID != 255)
-                otherPlayer = ds_list_find_value(global.players, otherPlayerID);
-            
-            assistantPlayer = noone;
-            if(assistantPlayerID != 255)
-                assistantPlayer = ds_list_find_value(global.players, assistantPlayerID);
-            
-            doEventPlayerDeath(player, otherPlayer, assistantPlayer, causeOfDeath);
-            break;
-             
-        case BALANCE:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            balanceplayer=read_ubyte(global.tempBuffer);
-            if balanceplayer == 255 {
-                if !instance_exists(Balancer) instance_create(x,y,Balancer);
-                with(Balancer) notice=0;
-            } else {
-                player = ds_list_find_value(global.players, balanceplayer);
-                if(player.object != -1) {
-                    with(player.object) {
-                        instance_destroy();
-                    }
-                    player.object = -1;
-                }
-                if(player.team==TEAM_RED) {
-                    player.team = TEAM_BLUE;
-                } else {
-                    player.team = TEAM_RED;
-                }
-                if !instance_exists(Balancer) instance_create(x,y,Balancer);
-                Balancer.name=player.name;
-                with (Balancer) notice=1;
-            }
-            break;
-                  
-        case PLAYER_CHANGETEAM:
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            if(player.object != -1) {
-                with(player.object) {
-                    instance_destroy();
-                }
-                player.object = -1;
-            }
-            player.team = read_ubyte(global.tempBuffer);
-            break;
-             
-        case PLAYER_CHANGECLASS:
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            if(player.object != -1) {
-                with(player.object) {
-                    instance_destroy();
-                }
-                player.object = -1;
-            }
-            player.class = read_ubyte(global.tempBuffer);
-            break;             
-        
-        case PLAYER_CHANGENAME:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            player.name = receivestring(global.serverSocket, 1);
-            if player=global.myself {
-                global.playerName=player.name
-            }
-            break;
-                 
-        case PLAYER_SPAWN:
-            receiveCompleteMessage(global.serverSocket,3,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventSpawn(player, read_ubyte(global.tempBuffer), read_ubyte(global.tempBuffer));
-            break;
-              
-        case CHAT_BUBBLE:
-            var bubbleImage;
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            setChatBubble(player, read_ubyte(global.tempBuffer));
-            break;
-             
-        case BUILD_SENTRY:
-            receiveCompleteMessage(global.serverSocket,6,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            buildSentry(player, read_ushort(global.tempBuffer)/5, read_ushort(global.tempBuffer)/5, read_byte(global.tempBuffer));
-            break;
-              
-        case DESTROY_SENTRY:
-            receiveCompleteMessage(global.serverSocket,4,global.tempBuffer);
-            playerID = read_ubyte(global.tempBuffer);
-            otherPlayerID = read_ubyte(global.tempBuffer);
-            assistantPlayerID = read_ubyte(global.tempBuffer);
-            causeOfDeath = read_ubyte(global.tempBuffer);
-            
-            player = ds_list_find_value(global.players, playerID);
-            if(otherPlayerID == 255) {
-                doEventDestruction(player, noone, noone, causeOfDeath);
-            } else {
-                otherPlayer = ds_list_find_value(global.players, otherPlayerID);
-                if (assistantPlayerID == 255) {
-                    doEventDestruction(player, otherPlayer, noone, causeOfDeath);
-                } else {
-                    assistantPlayer = ds_list_find_value(global.players, assistantPlayerID);
-                    doEventDestruction(player, otherPlayer, assistantPlayer, causeOfDeath);
-                }
-            }
-            break;
-                      
-        case GRAB_INTEL:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventGrabIntel(player);
-            break;
-      
-        case SCORE_INTEL:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventScoreIntel(player);
-            break;
-      
-        case DROP_INTEL:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventDropIntel(player); 
-            break;
-            
-        case RETURN_INTEL:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            doEventReturnIntel(read_ubyte(global.tempBuffer));
-            break;
-  
-        case GENERATOR_DESTROY:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            team = read_ubyte(global.tempBuffer);
-            doEventGeneratorDestroy(team);
-            break;
-      
-        case UBER_CHARGED:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventUberReady(player);
-            break;
-  
-        case UBER:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            doEventUber(player);
-            break;    
-  
-        case OMNOMNOMNOM:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            if(player.object != -1) {
-                with(player.object) {
-                    omnomnomnom=true;
-                    if(hp < 200)
-                    {
-                        canEat = false;
-                        alarm[6] = eatCooldown; //10 second cooldown
-                    }
-                    if(player.team == TEAM_RED) {
-                        omnomnomnomindex=0;
-                        omnomnomnomend=31;
-                    } else if(player.team==TEAM_BLUE) {
-                        omnomnomnomindex=32;
-                        omnomnomnomend=63;
-                    }
-                    xscale=image_xscale; 
-                } 
-            }
-            break;
-      
-        case TOGGLE_ZOOM:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            if player.object != -1 {
-                toggleZoom(player.object);
-            }
-            break;
-                                         
-        case PASSWORD_REQUEST:
-            if(!usePreviousPwd)
-                global.clientPassword = get_string("Enter Password:", "");
-            write_ubyte(global.serverSocket, string_length(global.clientPassword));
-            write_string(global.serverSocket, global.clientPassword);
-            socket_send(global.serverSocket);
-            break;
-       
-        case PASSWORD_WRONG:                                    
-            show_message("Incorrect Password.");
-            instance_destroy();
-            exit;
-        
-        case INCOMPATIBLE_PROTOCOL:
-            show_message("Incompatible server protocol version.");
-            instance_destroy();
-            exit;
-            
-        case KICK:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            reason = read_ubyte(global.tempBuffer);
-            if reason == KICK_NAME kickReason = "Name Exploit";
-            else if reason == KICK_BAD_PLUGIN_PACKET kickReason = "Invalid plugin packet ID";
-            else if reason == KICK_MULTI_CLIENT kickReason = "There are too many connections from your IP";
-            else kickReason = "";
-            show_message("You have been kicked from the server. "+kickReason+".");
-            instance_destroy();
-            exit;
-              
-        case ARENA_STARTROUND:
-            doEventArenaStartRound();
-            break;
-            
-        case ARENA_ENDROUND:
-            with ArenaHUD clientArenaEndRound();
-            break;   
-        
-        case ARENA_RESTART:
-            doEventArenaRestart();
-            break;
-            
-        case UNLOCKCP:
-            doEventUnlockCP();
-            break;
-                   
-        case MAP_END:
-            global.nextMap=receivestring(global.serverSocket, 1);
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            global.winners=read_ubyte(global.tempBuffer);
-            global.currentMapArea=read_ubyte(global.tempBuffer);
-            global.mapchanging = true;
-            if !instance_exists(ScoreTableController) instance_create(0,0,ScoreTableController);
-            instance_create(0,0,WinBanner);
-            break;
-
-        case CHANGE_MAP:
-            roomchange=true;
-            global.mapchanging = false;
-            global.currentMap = receivestring(global.serverSocket, 1);
-            global.currentMapMD5 = receivestring(global.serverSocket, 1);
-            if(global.currentMapMD5 == "") { // if this is an internal map (signified by the lack of an md5)
-                if(findInternalMapRoom(global.currentMap))
-                    room_goto_fix(findInternalMapRoom(global.currentMap));
-                else
-                {
-                    show_message("Error:#Server went to invalid internal map: " + global.currentMap + "#Exiting.");
-                    instance_destroy();
-                    exit;
-                }
-            } else { // it's an external map
-                if(string_pos("/", global.currentMap) != 0 or string_pos("\", global.currentMap) != 0)
-                {
-                    show_message("Server sent illegal map name: "+global.currentMap);
-                    instance_destroy();
-                    exit;
-                }
-                if(!file_exists("Maps/" + global.currentMap + ".png") or CustomMapGetMapMD5(global.currentMap) != global.currentMapMD5)
-                {   // Reconnect to the server to download the map
-                    var oldReturnRoom;
-                    oldReturnRoom = returnRoom;
-                    returnRoom = DownloadRoom;
-                    if (global.serverPluginsInUse)
-                        noUnloadPlugins = true;
-                    event_perform(ev_destroy,0);
-                    ClientCreate();
-                    if (global.serverPluginsInUse)
-                        noReloadPlugins = true;
-                    returnRoom = oldReturnRoom;
-                    usePreviousPwd = true;
-                    exit;
-                }
-                room_goto_fix(CustomMapRoom);
-            }
-                 
-            for(i=0; i<ds_list_size(global.players); i+=1) {
-                player = ds_list_find_value(global.players, i);
-                if global.currentMapArea == 1 { 
-                    player.stats[KILLS] = 0;
-                    player.stats[DEATHS] = 0;
-                    player.stats[CAPS] = 0;
-                    player.stats[ASSISTS] = 0;
-                    player.stats[DESTRUCTION] = 0;
-                    player.stats[STABS] = 0;
-                    player.stats[HEALING] = 0;
-                    player.stats[DEFENSES] = 0;
-                    player.stats[INVULNS] = 0;
-                    player.stats[BONUS] = 0;
-                    player.stats[DOMINATIONS] = 0;
-                    player.stats[REVENGE] = 0;
-                    player.stats[POINTS] = 0;
-                    player.roundStats[KILLS] = 0;
-                    player.roundStats[DEATHS] = 0;
-                    player.roundStats[CAPS] = 0;
-                    player.roundStats[ASSISTS] = 0;
-                    player.roundStats[DESTRUCTION] = 0;
-                    player.roundStats[STABS] = 0;
-                    player.roundStats[HEALING] = 0;
-                    player.roundStats[DEFENSES] = 0;
-                    player.roundStats[INVULNS] = 0;
-                    player.roundStats[BONUS] = 0;
-                    player.roundStats[DOMINATIONS] = 0;
-                    player.roundStats[REVENGE] = 0;
-                    player.roundStats[POINTS] = 0;
-                    player.team = TEAM_SPECTATOR;
-                }
-            }
-            break;
-        
-        case SERVER_FULL:
-            show_message("The server is full.");
-            instance_destroy();
-            exit;
-        
-        case REWARD_CHALLENGE_CODE:
-            var challengeData;
-            receiveCompleteMessage(global.serverSocket,16,global.tempBuffer);
-            challengeData = read_binstring(global.tempBuffer, buffer_size(global.tempBuffer));
-            challengeData += socket_remote_ip(global.serverSocket);
-
-            write_ubyte(global.serverSocket, REWARD_CHALLENGE_RESPONSE);
-            write_binstring(global.serverSocket, hmac_md5_bin(global.rewardKey, challengeData));
-            socket_send(global.serverSocket);
-            break;
-
-        case REWARD_UPDATE:
-            receiveCompleteMessage(global.serverSocket,1,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            var rewardString;
-            rewardString = receivestring(global.serverSocket, 2);
-            doEventUpdateRewards(player, rewardString);
-            break;
-            
-        case MESSAGE_STRING:
-            var message, notice;
-            message = receivestring(global.serverSocket, 1);
-            with NoticeO instance_destroy();
-            notice = instance_create(0, 0, NoticeO);
-            notice.notice = NOTICE_CUSTOM;
-            notice.message = message;
-            break;
-        
-        case SENTRY_POSITION:
-            receiveCompleteMessage(global.serverSocket,5,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            if(player.sentry)
-            {
-                player.sentry.x = read_ushort(global.tempBuffer) / 5;
-                player.sentry.y = read_ushort(global.tempBuffer) / 5;
-                player.sentry.xprevious = player.sentry.x;
-                player.sentry.yprevious = player.sentry.y;
-                player.sentry.vspeed = 0;
-            }
-            break;
-          
-        case WEAPON_FIRE:
-            receiveCompleteMessage(global.serverSocket,9,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            
-            if(player.object)
-            {
-                with(player.object)
-                {
-                    x = read_ushort(global.tempBuffer)/5;
-                    y = read_ushort(global.tempBuffer)/5;
-                    hspeed = read_byte(global.tempBuffer)/8.5;
-                    vspeed = read_byte(global.tempBuffer)/8.5;
-                    xprevious = x;
-                    yprevious = y;
-                }
-                
-                doEventFireWeapon(player, read_ushort(global.tempBuffer));
-            }
-            break;
-
-        case PLUGIN_PACKET:
-            var packetID, packetLen, buf, success;
-
-            // fetch full packet
-            receiveCompleteMessage(global.serverSocket, 2, global.tempBuffer);
-            packetLen = read_ushort(global.tempBuffer);
-            receiveCompleteMessage(global.serverSocket, packetLen, global.tempBuffer);
-
-            packetID = read_ubyte(global.tempBuffer);
-
-            // get packet data
-            buf = buffer_create();
-            write_buffer_part(buf, global.tempBuffer, packetLen - 1);
-
-            // try to enqueue
-            // give "noone" value for client since received from server
-            success = _PluginPacketPush(packetID, buf, noone);
-            
-            // if it returned false, packetID was invalid
-            if (!success)
-            {
-                // clear up buffer
-                buffer_destroy(buf);
-                show_error("ERROR when reading plugin packet: no such plugin packet ID " + string(packetID), true);
-            }
-            break;
-        
-        case CLIENT_SETTINGS:
-            receiveCompleteMessage(global.serverSocket,2,global.tempBuffer);
-            player = ds_list_find_value(global.players, read_ubyte(global.tempBuffer));
-            player.queueJump = read_ubyte(global.tempBuffer);
-            break;
-
-        default:
-            promptRestartOrQuit("The Server sent unexpected data.");
-            exit;
-        }
-    } else {
-        break;
-    }
-} until(roomchange);
--- a/Language/Create.gml
+++ b/Language/Create.gml
@@ -1,141 +0,0 @@
-/*
-    Originally from /Source/gg2/Objects/Updater.events/Create.xml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-// Downloading code. 
-
-var downloadHandle, url, tmpfile, window_oldshowborder, window_oldfullscreen;
-timeLeft = 0;
-counter = 0;
-AudioControlPlaySong(-1, false);
-window_oldshowborder = window_get_showborder();
-window_oldfullscreen = window_get_fullscreen();
-window_set_fullscreen(false);
-window_set_showborder(false);
-
-if(global.updaterBetaChannel)
-    url = UPDATE_SOURCE_BETA;
-else
-    url = UPDATE_SOURCE;
-
-tmpfile = temp_directory + "\gg2update.zip";
-    
-downloadHandle = httpGet(url, -1);
-
-while(!httpRequestStatus(downloadHandle)) 
-{ // while download isn't finished
-    sleep(floor(1000/30)); // sleep for the equivalent of one frame
-    io_handle(); // this prevents GameMaker from appearing locked-up
-    httpRequestStep(downloadHandle);
-    
-    // check if the user cancelled the download with the esc key
-    if(keyboard_check(vk_escape)) 
-    {
-        httpRequestDestroy(downloadHandle);
-        window_set_showborder(window_oldshowborder);
-        window_set_fullscreen(window_oldfullscreen);
-        room_goto_fix(Menu);
-        exit;
-    }
-     
-    if(counter == 0 || counter mod 60 == 0)
-        timer = random(359)+1;
-    draw_sprite(UpdaterBackgroundS,0,0,0);
-    draw_set_color(c_white);
-    draw_set_halign(fa_left);
-    draw_set_valign(fa_center);
-    minutes=floor(timer/60);
-    seconds=floor(timer-minutes*60);
-    draw_text(x,y-20,string(minutes) + " minutes " + string(seconds) + " seconds Remaining...");
-    counter+=1;
-    var progress, size;
-    progress = httpRequestResponseBodyProgress(downloadHandle);
-    size = httpRequestResponseBodySize(downloadHandle);
-    if (size != -1)
-    {
-        progressBar = floor((progress/size) * 20);
-        offset = 3;
-        for(i=0;i<progressBar;i+=1){
-            draw_sprite(UpdaterProgressS,0,x+offset,y);
-            offset+=12;
-        }
-    }
-    screen_refresh();
-}
-// Errored
-if (httpRequestStatus(downloadHandle) == 2)
-{
-    show_message("Downloading update failed!#" + httpRequestError(downloadHandle));
-    httpRequestDestroy(downloadHandle);
-    window_set_showborder(window_oldshowborder);
-    window_set_fullscreen(window_oldfullscreen);
-    room_goto_fix(Menu);
-    exit;
-}
-// Request failed
-if (httpRequestStatusCode(downloadHandle) != 200)
-{
-    show_message("Downloading update failed!#" + string(httpRequestStatusCode(downloadHandle)) + " " + httpRequestReasonPhrase(downloadHandle));
-    httpRequestDestroy(downloadHandle);
-    window_set_showborder(window_oldshowborder);
-    window_set_fullscreen(window_oldfullscreen);
-    room_goto_fix(Menu);
-    exit;
-}
-
-write_buffer_to_file(httpRequestResponseBody(downloadHandle), tmpfile);
-httpRequestDestroy(downloadHandle);
-
-if(!file_exists(tmpfile))
-{
-    window_set_showborder(window_oldshowborder);
-    window_set_fullscreen(window_oldfullscreen);
-    show_message("Error updating: Missing gg2update.zip in temp directory, download failed(?)");
-    room_goto_fix(Menu);
-    exit;
-}
-
-// rename existing "Gang Garrison 2.exe" to avoid conflict when extracting
-if (file_exists("Gang Garrison 2.exe"))
-{
-    var newName, n;
-    n = 1;
-    
-    // increment until unused name found
-    do
-    {
-        newName = "gg2-old.delete.me." + string(n);
-        n += 1;
-    }
-    until(!file_exists(newName));
-
-    file_rename("Gang Garrison 2.exe", newName);
-}
-
-
-
-// let's extract the downloaded file now.
-extractzip(tmpfile, working_directory);
-
-// run new version    
-execute_program("Gang Garrison 2.exe", "", false);
-
-// exit
-game_end();
--- a/Language/Draw.gml
+++ b/Language/Draw.gml
@@ -1,161 +0,0 @@
-/*
-    Originally from /Source/gg2/Objects/InGameElements/Character.events/Draw.xml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-xoffset = view_xview[0];
-yoffset = view_yview[0];
-xsize = view_wview[0];
-ysize = view_hview[0];
-
-if (distance_to_point(xoffset+xsize/2,yoffset+ysize/2) > 800)
-    exit;
-
-var xr, yr;
-xr = round(x);
-yr = round(y);
-    
-image_alpha = cloakAlpha;
-
-if (global.myself.team == team and canCloak)
-    image_alpha = cloakAlpha/2 + 0.5;
-
-if (invisible)
-    exit;
-
-if(stabbing)
-    image_alpha -= power(currentWeapon.stab.alpha, 2);
-
-if team == global.myself.team && (player != global.myself || global.showHealthBar == 1){
-    draw_set_alpha(1);
-    draw_healthbar(xr-10, yr-30, xr+10, yr-25,hp*100/maxHp,c_black,c_red,c_green,0,true,true);
-}    
-if(distance_to_point(mouse_x, mouse_y)<25) {
-    if cloak && team!=global.myself.team exit;
-    draw_set_alpha(1);
-    draw_set_halign(fa_center);
-    draw_set_valign(fa_bottom);
-    if(team==TEAM_RED) {
-        draw_set_color(c_red);
-    } else {
-        draw_set_color(c_blue);
-    }
-    draw_text(xr, yr-35, player.name);
-    
-    if(team == global.myself.team && global.showTeammateStats)
-    {
-        if(weapons[0] == Medigun)
-            draw_text(xr,yr+50, "Superburst: " + string(currentWeapon.uberCharge/20) + "%");
-        else if(weapons[0] == Shotgun)
-            draw_text(xr,yr+50, "Nuts 'N' Bolts: " + string(nutsNBolts));
-        else if(weapons[0] == Minegun)
-            draw_text(xr,yr+50, "Lobbed Mines: " + string(currentWeapon.lobbed));
-    }
-}  
-
-draw_set_alpha(1);
-if team == TEAM_RED ubercolour = c_red;
-if team == TEAM_BLUE ubercolour = c_blue;
-
-var sprite, overlaySprite;
-if zoomed
-{
-    if (team == TEAM_RED)
-        sprite = SniperCrouchRedS;
-    else
-        sprite = SniperCrouchBlueS;
-    overlaySprite = sniperCrouchOverlay;
-}
-else
-{
-    sprite = sprite_index;
-    overlaySprite = overlay;
-}
-    
-if (omnomnomnom)
-{
-    draw_sprite_ext_overlay(omnomnomnomSprite,omnomnomnomOverlay,omnomnomnomindex,xr,yr,image_xscale,image_yscale,image_angle,c_white,1);
-    if (ubered)
-        draw_sprite_ext_overlay(omnomnomnomSprite,omnomnomnomOverlay,omnomnomnomindex,xr,yr,image_xscale,image_yscale,image_angle,ubercolour,0.7);
-}
-else if (taunting)
-{
-    draw_sprite_ext_overlay(tauntsprite,tauntOverlay,tauntindex,xr,yr,image_xscale,image_yscale,image_angle,c_white,1);
-    if (ubered)
-        draw_sprite_ext_overlay(tauntsprite,tauntOverlay,tauntindex,xr,yr,image_xscale,image_yscale,image_angle,ubercolour,0.7);
-}
-else if (player.humiliated)
-    draw_sprite_ext(humiliationPoses,floor(animationImage)+humiliationOffset,xr,yr,image_xscale,image_yscale,image_angle,c_white,image_alpha);
-else if (!taunting)
-{
-    if (cloak)
-    {
-        if (!ubered)
-            draw_sprite_ext(sprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,c_white,image_alpha);
-        else if (ubered)
-        {
-            draw_sprite_ext(sprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,c_white,1);
-            draw_sprite_ext(sprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,ubercolour,0.7);
-        }
-    }
-    else
-    {
-        if (!ubered)
-            draw_sprite_ext_overlay(sprite,overlaySprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,c_white,image_alpha);
-        else if (ubered)
-        {
-            draw_sprite_ext_overlay(sprite,overlaySprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,c_white,1);
-            draw_sprite_ext_overlay(sprite,overlaySprite,floor(animationImage+animationOffset),xr,yr,image_xscale,image_yscale,image_angle,ubercolour,0.7);
-        }
-    }
-}
-if (burnDuration > 0 or burnIntensity > 0) {
-    for(i = 0; i < numFlames * burnIntensity / maxIntensity; i += 1)
-    {
-        draw_sprite_ext(FlameS, alarm[5] + i + random(2), x + flameArray_x[i], y + flameArray_y[i], 1, 1, 0, c_white, burnDuration / maxDuration * 0.71 + 0.35);
-    }  
-}
-
-// Copied from Lorgan's itemserver "angels" with slight modifications
-// All credit be upon him
-if (demon != -1)
-{
-    demonX = median(x-40,demonX,x+40);
-    demonY = median(y-40,demonY,y);
-    demonOffset += demonDir;
-    if (abs(demonOffset) > 15)
-        demonDir *= -1;
-
-    var dir;
-    if (demonX > x)
-        dir = -1;
-    else
-        dir = 1;
-
-    if (demonFrame > sprite_get_number(demon))
-        demonFrame = 0;
-
-    if (stabbing || ubered)
-        draw_sprite_ext(demon,demonFrame+floor(animationImage)+7*player.team,demonX,demonY+demonOffset,dir*1,1,0,c_white,1);
-    else
-        draw_sprite_ext(demon,demonFrame+floor(animationImage)+7*player.team,demonX,demonY+demonOffset,dir*1,1,0,c_white,image_alpha);
-
-    demonFrame += 1;
-}
--- a/Language/GMLmenus.gml
+++ b/Language/GMLmenus.gml
@@ -0,0 +1,125 @@
+// Source - https://github.com/faissaloo/GMLmenus/blob/master/GMLmenus.gml
+
+#define draw_menu
+///draw_menu(str,background,foreground,x,y,hpadding,vpadding,height,mouse_button)
+//Distributed under the MIT licence:
+/////////////////////////////////////////
+/*Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.*/
+/////////////////////////////////////////
+//Height is the height of 1 box
+//Menu syntax:
+//  |s = seperator (Bug: if |s is placed next to a |n an extra menu item would be added)
+//  |n = new item
+var str, background, foreground,xx,yy, width, height;
+str = " "+argument0 //A hacky thing so that it draws the first item properly, I should probably properly fix this later
+background = argument1
+foreground = argument2
+xx = argument3
+yy = argument4
+width = 0//argument5
+hpadding = argument5
+vpadding = argument6
+height = argument7
+mb=argument8 //This is the main mouse button, I added this to give more choice to the dev
+//xx and yy should be corrected if they are placed outside of the room or if they will lead to the menu being cut off by the edge of the room
+item_list = ds_list_create()
+item_string = ""
+///////////////////////////////////
+for (i=0;i<string_length(str);i+=1) //Parse the string, it's being set to -1 because it won't read the first character otherwise, yes this is very hacky and stupid, but I can't be bothered right now
+{
+if string_char_at(str,i)="|" //If it finds a | it means there will be an escape character
+{
+i+=1 //Move to the next character
+
+switch(string_char_at(str,i)) //Check which escape character it is
+{
+case "s":
+    //i+=1
+    ds_list_add(item_list,"|s")
+    //ds_list_add(item_list,"") //This is for the meta info
+
+case "n":
+    i+=1 //Skip the letter itself as we don't want it to be drawn
+    //For some reason this is always 10
+    //But it works perfectly fine if an escape code isn't the first character
+    //show_message(string(i)+"<"+string(string_length(str))) //Debug
+    for (ii=i;ii<=string_length(str);ii+=1)
+    {
+    //show_message(string_char_at(str,ii))
+    if string_char_at(str,ii)="|"
+    {
+    //i-=1
+    break; //We don't want it to go any further if the next character is a backslash
+    }
+    //If the for loop hasn't been broken then it'll draw the character
+    item_string+=string_char_at(str,ii)
+    }
+    
+    if string_width(item_string)>width
+    {
+        width=string_width(item_string)
+    }
+    
+    
+    ds_list_add(item_list,item_string) //Add a new item to the list
+    item_string="" //Reset the item_string
+}
+}
+}
+draw_set_color(background)
+//draw_rectangle(xx,yy,xx+width,yy+(height*ds_list_size(item_list)),false) //Background, temporary?
+draw_button(xx,yy,xx+width+(hpadding*2),yy+(height*(ds_list_size(item_list)-1))+vpadding,true) //Background, temporary?
+
+for (i=0;i<ds_list_size(item_list);i+=1) //Go through the list of menu items
+{
+
+
+
+    draw_set_color(background)
+    //draw_rectangle(xx,yy+(height*i),xx+width,yy+(height),false) //Draw the rectange for this one, we're doing this so we can add cool effects to each of them
+    draw_set_color(foreground)
+    
+    if ds_list_find_value(item_list,i)="|s"
+    {  
+        draw_line(xx+hpadding,yy+((height*(i+0.5))/2)+vpadding,xx+width,yy+((height*(i+0.5))/2)+vpadding) //Draw the seperator
+    }
+    else
+    {
+        //draw_text(xx+(width/10),yy+((height/2)*i),ds_list_find_value(item_list,i))
+        draw_text(xx+hpadding,yy+((height/2)*i)+vpadding,ds_list_find_value(item_list,i))
+        //padding
+    }
+    
+    if (mouse_x>xx) and (mouse_x<xx+width) and (mouse_y<yy+(height/2)*(i+1)) and (mouse_y>yy) and mouse_check_button_released(mb)
+    {
+        //show_message(i+1) //Debugging
+        return i+1; //Returns the number of the item in the list, we're adding 1 because 0 is reserved for if nothing is clicked
+    }
+
+    
+
+}
+
+if mouse_check_button_released(mb) and !(mouse_x>xx and mouse_y>yy and mouse_x<xx+width and mouse_y<yy+(height*(ds_list_size(item_list)-1))) //If the mouse was clicked outside
+{
+    return 0; //Return 0 to indicate that the user chose to exit the menu by clicking outside of it
+}
+
+return -1; //If we haven't already returned something, return a -1 to indicate that nothing was clicked
+
--- a/Language/_piwikCacheRequest.gml
+++ b/Language/_piwikCacheRequest.gml
@@ -0,0 +1,68 @@
+// Source - https://github.com/johnhatch14/GMS-Extensions/blob/master/PiwikAnalyticsForGMS/GMS_PiwikAnalytics.gmx/scripts/_piwikCacheRequest.gml
+
+var jsonMap, fh;
+
+var otz = date_get_timezone();
+date_set_timezone(timezone_utc);
+var requestToCache = argument0 + "cdt="+_piwikUrlEncode(string(current_year)+"-"+
+                                 string(current_month)+"-"+
+                                 string(current_day)+" "+
+                                 string(current_hour)+":"+
+                                 string(current_minute)+":"+
+                                 string(current_second));
+date_set_timezone(otz);
+
+if (file_exists(_Piwik_CacheFile))
+{
+ //Verify cache signature to make sure no unwanted (heaven-forbid, malicious) requests have been added.
+ var curCacheSig = sha1_string_utf8(sha1_file(_Piwik_CacheFile) + "v5T7uAXnpQ3BGKq" + string(game_id+2563542));
+ ini_open(_Piwik_IniFile);
+ var storedSig = ini_read_string("cache", "sig", "NULL");
+ ini_close();
+ if (string_count(storedSig, curCacheSig) == 1)
+ {
+    fh = file_text_open_read(_Piwik_CacheFile);
+    var cachedJson = base64_decode(file_text_read_string(fh));
+    file_text_close(fh);
+    
+    jsonMap = json_decode(cachedJson);
+    
+    if (!ds_exists(jsonMap, ds_type_map))
+       jsonMap = ds_map_create();
+ }
+ else
+ {
+  if (_PiwikDebugOutput)
+     show_debug_message("Piwik Error: Signature mis-match. LOCAL REQUEST-CACHE HAS BEEN TAMPERED WITH! The ninjas are here somewhere...");
+  jsonMap = ds_map_create();//Start with a fresh cache since the old one is corrupted. An ounce of lost analytics is worth a pound of security.
+ }
+}
+else
+{
+ jsonMap = ds_map_create();
+}
+
+if (!is_undefined(jsonMap[? "requests"]))
+{
+ ds_list_add(jsonMap[? "requests"], requestToCache);
+}
+else
+{
+ var requestList = ds_list_create();
+ ds_list_add(requestList, requestToCache);
+ 
+ ds_map_add_list(jsonMap, "requests", requestList);
+}
+
+var newCachedJson = json_encode(jsonMap);
+ds_map_destroy(jsonMap);
+
+fh = file_text_open_write(_Piwik_CacheFile);
+file_text_write_string(fh, base64_encode(newCachedJson));
+file_text_close(fh);
+
+var cacheSig = sha1_string_utf8(sha1_file(_Piwik_CacheFile) + "v5T7uAXnpQ3BGKq" + string(game_id+2563542));
+
+ini_open(_Piwik_IniFile);
+ini_write_string("cache", "sig", cacheSig);
+ini_close();
--- a/Language/_piwikSendBasicReq.gml
+++ b/Language/_piwikSendBasicReq.gml
@@ -0,0 +1,57 @@
+/***************************************************
+  Builds and sends the actual piwik tracking request
+  
+  Copyright (c) 2015 John Hatch
+  Licenced under the MIT licence: http://opensource.org/licenses/MIT
+ ***************************************************/
+
+// Source - https://github.com/johnhatch14/GMS-Extensions/blob/master/PiwikAnalyticsForGMS/GMS_PiwikAnalytics.gmx/scripts/_piwikSendBasicReq.gml
+
+//Build argument map
+   var args = ds_map_create();
+   
+   //-----
+   // Populate GET arguments to Piwik HTTP API
+   // See full HTTP API reference at http://developer.piwik.org/api-reference/tracking-api
+   //-----
+   
+   //Required args
+   ds_map_add(args, "idsite", string(_Piwik_idsite));
+   ds_map_add(args, "rec", "1");
+   ds_map_add(args, "url", _piwikUrlEncode(_Piwik_baseurl + "/" + room_get_name(room)));
+   ds_map_add(args, "apiv", "1");
+   ds_map_add(args, "_id", _piwikUrlEncode(_Piwik_id));
+   ds_map_add(args, "rand", _piwikUrlEncode( string(round(random(999999999)+game_id)) ));
+   //ds_map_add(args, "new_visit", "0");
+   
+   //Pass local time to API
+   var ctz = date_get_timezone();
+   date_set_timezone(timezone_local);
+   var now = date_current_datetime();
+   ds_map_add(args, "h", _piwikUrlEncode(string(date_get_hour(now))));
+   ds_map_add(args, "m", _piwikUrlEncode(string(date_get_minute(now))));
+   ds_map_add(args, "s", _piwikUrlEncode(string(date_get_second(now))));
+   date_set_timezone(ctz);
+   
+   // Add any other arguments passed to script in the form "param=value" to the http arg map
+   //-----
+   var arg_keyval;
+   for (var i=0; i<argument_count; i++)
+   {
+    arg_keyval = _piwikStringExplode(argument[i],'=');
+    ds_map_add(args, arg_keyval[0], _piwikUrlEncode(string(arg_keyval[1])));
+   }
+
+//Build argument string
+   var argstring = "";
+   var prevkey = ds_map_find_first(args);
+   argstring += (prevkey + "=" + args[? prevkey] + "&");
+   repeat (ds_map_size(args)-1)
+   {
+    prevkey = ds_map_find_next(args, prevkey);
+    argstring += (prevkey + "=" + args[? prevkey] + "&");
+   }
+ds_map_destroy(args);
+
+//Append query string to ds_list of requests to be sent at End Step. 
+ds_list_add(_PIWIK_REQS, "?" + argstring);
--- a/Language/_piwikSendReq.gml
+++ b/Language/_piwikSendReq.gml
@@ -0,0 +1,74 @@
+/***************************************************
+  Builds and sends the actual piwik tracking request
+  
+  Copyright (c) 2015 John Hatch
+  Licenced under the MIT licence: http://opensource.org/licenses/MIT
+ ***************************************************/
+
+// Source - https://github.com/johnhatch14/GMS-Extensions/blob/master/PiwikAnalyticsForGMS/GMS_PiwikAnalytics.gmx/scripts/_piwikSendReq.gml
+
+//Build argument map
+   var args = ds_map_create();
+   
+   //-----
+   // Populate GET arguments to Piwik HTTP API
+   // See full HTTP API reference at http://developer.piwik.org/api-reference/tracking-api
+   //-----
+   
+   //Required args
+   ds_map_add(args, "idsite", string(_Piwik_idsite));
+   ds_map_add(args, "rec", "1");
+   //ds_map_add(args, "send_image", "0");
+   ds_map_add(args, "url", _piwikUrlEncode(_Piwik_baseurl));
+   
+   //
+   ds_map_add(args, "apiv", "1");
+   ds_map_add(args, "_id", _piwikUrlEncode(_Piwik_id));
+   ds_map_add(args, "rand", _piwikUrlEncode( string(round(random(999999999)+game_id)) ));
+   
+   //Pass local time to API
+   var ctz = date_get_timezone();
+   date_set_timezone(timezone_local);
+   var now = date_current_datetime();
+   ds_map_add(args, "h", _piwikUrlEncode(string(date_get_hour(now))));
+   ds_map_add(args, "m", _piwikUrlEncode(string(date_get_minute(now))));
+   ds_map_add(args, "s", _piwikUrlEncode(string(date_get_second(now))));
+   date_set_timezone(ctz);
+   
+   //Pass local display resolution
+   ds_map_add(args, "res", _piwikUrlEncode(string(display_get_width())+'x'+string(display_get_height())));
+   
+   //Pass local language
+   ds_map_add(args, "lang", _piwikUrlEncode(os_get_language()));
+   
+   //Pass stored values if they exist
+   if (_Piwik_idvc != -1)
+      ds_map_add(args, "_idvc", _piwikUrlEncode(string(_Piwik_idvc)));
+   if (_Piwik_idts != -1)
+      ds_map_add(args, "_idts", _piwikUrlEncode(string(_Piwik_idts)));
+   if (_Piwik_viewts != -1)
+      ds_map_add(args, "_viewts", _piwikUrlEncode(string(_Piwik_viewts)));
+   
+   //-----
+   // Add any other arguments passed to script in the form "param=value" to the http arg map
+   //-----
+   var arg_keyval;
+   for (var i=0; i<argument_count; i++)
+   {
+    arg_keyval = _piwikStringExplode(argument[i],'=');
+    ds_map_add(args, arg_keyval[0], _piwikUrlEncode(string(arg_keyval[1])));
+   }
+
+//Build argument string
+   var argstring = "";
+   var prevkey = ds_map_find_first(args);
+   argstring += (prevkey + "=" + args[? prevkey] + "&");
+   repeat (ds_map_size(args)-1)
+   {
+    prevkey = ds_map_find_next(args, prevkey);
+    argstring += (prevkey + "=" + args[? prevkey] + "&");
+   }
+ds_map_destroy(args);
+
+//Append query string to ds_list of requests to be sent at End Step. 
+ds_list_add(_PIWIK_REQS, "?" + argstring);
--- a/Language/doEventPlayerDeath.gml
+++ b/Language/doEventPlayerDeath.gml
@@ -1,251 +0,0 @@
-/*
-    Originally from /Source/gg2/Scripts/Events/doEventPlayerDeath.gml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-/**
- * Perform the "player death" event, i.e. change the appropriate scores,
- * destroy the character object to much splattering and so on.
- *
- * argument0: The player whose character died
- * argument1: The player who inflicted the fatal damage (or noone for unknown)
- * argument2: The player who assisted the kill (or noone for no assist)
- * argument3: The source of the fatal damage
- */
-var victim, killer, assistant, damageSource;
-victim = argument0;
-killer = argument1;
-assistant = argument2;
-damageSource = argument3;
-
-if(!instance_exists(killer))
-    killer = noone;
-
-if(!instance_exists(assistant))
-    assistant = noone;
-
-//*************************************
-//*      Scoring and Kill log
-//*************************************
- 
-
-recordKillInLog(victim, killer, assistant, damageSource);
-
-victim.stats[DEATHS] += 1;
-if(killer)
-{
-    if(damageSource == WEAPON_KNIFE || damageSource == WEAPON_BACKSTAB)
-    {
-        killer.stats[STABS] += 1;
-        killer.roundStats[STABS] += 1;
-        killer.stats[POINTS] += 1;
-        killer.roundStats[POINTS] +=1;
-    }
-    
-    if (victim.object.currentWeapon.object_index == Medigun)
-    {
-        if (victim.object.currentWeapon.uberReady)
-        {
-            killer.stats[BONUS] += 1;
-            killer.roundStats[BONUS] += 1;
-            killer.stats[POINTS] += 1;
-            killer.roundStats[POINTS] += 1;
-        }
-    }
-        
-    if (killer != victim)
-    {
-        killer.stats[KILLS] += 1;
-        killer.roundStats[KILLS] += 1;
-        killer.stats[POINTS] += 1;
-        killer.roundStats[POINTS] += 1;
-        if(victim.object.intel)
-        {
-            killer.stats[DEFENSES] += 1;
-            killer.roundStats[DEFENSES] += 1;
-            killer.stats[POINTS] += 1;
-            killer.roundStats[POINTS] += 1;
-            recordEventInLog(4, killer.team, killer.name, global.myself == killer);
-        }
-    }
-}
-
-if (assistant)
-{
-    assistant.stats[ASSISTS] += 1;
-    assistant.roundStats[ASSISTS] += 1;
-    assistant.stats[POINTS] += .5;
-    assistant.roundStats[POINTS] += .5;
-}
-
-//SPEC
-if (victim == global.myself)
-    instance_create(victim.object.x, victim.object.y, Spectator);
-
-//*************************************
-//*         Gibbing
-//*************************************
-var xoffset, yoffset, xsize, ysize;
-
-xoffset = view_xview[0];
-yoffset = view_yview[0];
-xsize = view_wview[0];
-ysize = view_hview[0];
-
-randomize();
-with(victim.object) {
-    if((damageSource == WEAPON_ROCKETLAUNCHER 
-    or damageSource == WEAPON_MINEGUN or damageSource == FRAG_BOX 
-    or damageSource == WEAPON_REFLECTED_STICKY or damageSource == WEAPON_REFLECTED_ROCKET 
-    or damageSource == FINISHED_OFF_GIB or damageSource == GENERATOR_EXPLOSION) 
-    and (player.class != CLASS_QUOTE) and (global.gibLevel>1) 
-    and distance_to_point(xoffset+xsize/2,yoffset+ysize/2) < 900) {
-        if (hasReward(victim, 'PumpkinGibs'))
-        {
-            repeat(global.gibLevel * 2) {
-                createGib(x,y,PumpkinGib,hspeed,vspeed,random(145)-72, choose(0,1,1,2,2,3), false, true)
-            }
-        }
-        else
-        {
-            repeat(global.gibLevel) {
-                createGib(x,y,Gib,hspeed,vspeed,random(145)-72, 0, false)
-            }
-            switch(player.team)
-            {
-            case TEAM_BLUE :
-                repeat(global.gibLevel - 1) {
-                    createGib(x,y,BlueClump,hspeed,vspeed,random(145)-72, 0, false)
-                }
-                break;
-            case TEAM_RED :
-                repeat(global.gibLevel - 1) {
-                    createGib(x,y,RedClump,hspeed,vspeed,random(145)-72, 0, false)
-                }
-                break;
-            }
-        }
-
-        repeat(global.gibLevel * 14) {
-            var blood;
-            blood = instance_create(x+random(23)-11,y+random(23)-11,BloodDrop);
-            blood.hspeed=(random(21)-10);
-            blood.vspeed=(random(21)-13);
-            if (hasReward(victim, 'PumpkinGibs'))
-            {
-                blood.sprite_index = PumpkinJuiceS;
-            }
-        }
-        if (!hasReward(victim, 'PumpkinGibs'))
-        {
-            //All Classes gib head, hands, and feet
-            if(global.gibLevel > 2 || choose(0,1) == 1)
-                createGib(x,y,Headgib,0,0,random(105)-52, player.class, false);
-            repeat(global.gibLevel -1){
-                //Medic has specially colored hands
-                if (player.class == CLASS_MEDIC){
-                    if (player.team == TEAM_RED)
-                        createGib(x,y,Hand, hspeed, vspeed, random(105)-52 , 9, false);
-                    else
-                        createGib(x,y,Hand, hspeed, vspeed, random(105)-52 , 10, false);
-                }else{
-                    createGib(x,y,Hand, hspeed, vspeed, random(105)-52 , player.class, false);
-                }
-                createGib(x,y,Feet,random(5)-2,random(3),random(13)-6 , player.class, true);
-            }
-        }
-
-        //Class specific gibs
-        switch(player.class) {
-        case CLASS_PYRO :
-            if(global.gibLevel > 2 || choose(0,1) == 1)
-                createGib(x,y,Accesory,hspeed,vspeed,random(105)-52, 4, false)
-            break;
-        case CLASS_SOLDIER :
-            if(global.gibLevel > 2 || choose(0,1) == 1){
-                switch(player.team) {
-                    case TEAM_BLUE :
-                        createGib(x,y,Accesory,hspeed,vspeed,random(105)-52, 2, false);
-                        break;
-                    case TEAM_RED :
-                        createGib(x,y,Accesory,hspeed,vspeed,random(105)-52, 1, false);
-                        break;
-                    }
-            }
-            break;
-        case CLASS_ENGINEER :
-            if(global.gibLevel > 2 || choose(0,1) == 1)
-                createGib(x,y,Accesory,hspeed,vspeed,random(105)-52, 3, false)
-            break;
-        case CLASS_SNIPER :
-            if(global.gibLevel > 2 || choose(0,1) == 1)
-                createGib(x,y,Accesory,hspeed,vspeed,random(105)-52, 0, false)
-            break;
-        }
-        playsound(x,y,Gibbing);
-    } else {
-        var deadbody;
-        if player.class != CLASS_QUOTE playsound(x,y,choose(DeathSnd1, DeathSnd2));
-        deadbody = instance_create(x,y-30,DeadGuy);
-        // 'GS' reward - *G*olden *S*tatue
-        if(hasReward(player, 'GS'))
-        {
-            deadbody.sprite_index = haxxyStatue;
-            deadbody.image_index = 0;
-        }
-        else
-        { 
-            deadbody.sprite_index = sprite_index;
-            deadbody.image_index = CHARACTER_ANIMATION_DEAD;
-        }
-        deadbody.hspeed=hspeed;
-        deadbody.vspeed=vspeed;
-        if(hspeed>0) {
-            deadbody.image_xscale = -1;  
-        }
-    }
-}
-
-if (global.gg_birthday){
-    myHat = instance_create(victim.object.x,victim.object.y,PartyHat);
-    myHat.image_index = victim.team;
-}
-if (global.xmas){
-    myHat = instance_create(victim.object.x,victim.object.y,XmasHat);
-    myHat.image_index = victim.team;
-}
-
-
-with(victim.object) {       
-    instance_destroy();
-}
-
-//*************************************
-//*         Deathcam
-//*************************************
-if( global.killCam and victim == global.myself and killer and killer != victim and !(damageSource == KILL_BOX || damageSource == FRAG_BOX || damageSource == FINISHED_OFF || damageSource == FINISHED_OFF_GIB || damageSource == GENERATOR_EXPLOSION)) {
-    instance_create(0,0,DeathCam);
-    DeathCam.killedby=killer;
-    DeathCam.name=killer.name;
-    DeathCam.oldxview=view_xview[0];
-    DeathCam.oldyview=view_yview[0];
-    DeathCam.lastDamageSource=damageSource;
-    DeathCam.team = global.myself.team;
-}
--- a/Language/draw_menu.gml
+++ b/Language/draw_menu.gml
@@ -0,0 +1,123 @@
+// Source - https://github.com/faissaloo/GMLmenus/blob/master/GMLmenus_example.gmx/scripts/draw_menu.gml
+
+///draw_menu(str,background,foreground,x,y,hpadding,vpadding,height,mouse_button)
+//Distributed under the MIT licence:
+/////////////////////////////////////////
+/*Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.*/
+/////////////////////////////////////////
+//Height is the height of 1 box
+//Menu syntax:
+//  |s = seperator (Bug: if |s is placed next to a |n an extra menu item would be added)
+//  |n = new item
+var str, background, foreground,xx,yy, width, height;
+str = " "+argument0 //A hacky thing so that it draws the first item properly, I should probably properly fix this later
+background = argument1
+foreground = argument2
+xx = argument3
+yy = argument4
+width = 0//argument5
+hpadding = argument5
+vpadding = argument6
+height = argument7
+mb=argument8 //This is the main mouse button, I added this to give more choice to the dev
+//xx and yy should be corrected if they are placed outside of the room or if they will lead to the menu being cut off by the edge of the room
+item_list = ds_list_create()
+item_string = ""
+///////////////////////////////////
+for (i=0;i<string_length(str);i+=1) //Parse the string, it's being set to -1 because it won't read the first character otherwise, yes this is very hacky and stupid, but I can't be bothered right now
+{
+if string_char_at(str,i)="|" //If it finds a | it means there will be an escape character
+{
+i+=1 //Move to the next character
+
+switch(string_char_at(str,i)) //Check which escape character it is
+{
+case "s":
+    //i+=1
+    ds_list_add(item_list,"|s")
+    //ds_list_add(item_list,"") //This is for the meta info
+
+case "n":
+    i+=1 //Skip the letter itself as we don't want it to be drawn
+    //For some reason this is always 10
+    //But it works perfectly fine if an escape code isn't the first character
+    //show_message(string(i)+"<"+string(string_length(str))) //Debug
+    for (ii=i;ii<=string_length(str);ii+=1)
+    {
+    //show_message(string_char_at(str,ii))
+    if string_char_at(str,ii)="|"
+    {
+    //i-=1
+    break; //We don't want it to go any further if the next character is a backslash
+    }
+    //If the for loop hasn't been broken then it'll draw the character
+    item_string+=string_char_at(str,ii)
+    }
+    
+    if string_width(item_string)>width
+    {
+        width=string_width(item_string)
+    }
+    
+    
+    ds_list_add(item_list,item_string) //Add a new item to the list
+    item_string="" //Reset the item_string
+}
+}
+}
+draw_set_color(background)
+//draw_rectangle(xx,yy,xx+width,yy+(height*ds_list_size(item_list)),false) //Background, temporary?
+draw_button(xx,yy,xx+width+(hpadding*2),yy+(height*(ds_list_size(item_list)-1))+vpadding,true) //Background, temporary?
+
+for (i=0;i<ds_list_size(item_list);i+=1) //Go through the list of menu items
+{
+
+
+
+    draw_set_color(background)
+    //draw_rectangle(xx,yy+(height*i),xx+width,yy+(height),false) //Draw the rectange for this one, we're doing this so we can add cool effects to each of them
+    draw_set_color(foreground)
+    
+    if ds_list_find_value(item_list,i)="|s"
+    {  
+        draw_line(xx+hpadding,yy+((height*(i+0.5))/2)+vpadding,xx+width,yy+((height*(i+0.5))/2)+vpadding) //Draw the seperator
+    }
+    else
+    {
+        //draw_text(xx+(width/10),yy+((height/2)*i),ds_list_find_value(item_list,i))
+        draw_text(xx+hpadding,yy+((height/2)*i)+vpadding,ds_list_find_value(item_list,i))
+        //padding
+    }
+    
+    if (mouse_x>xx) and (mouse_x<xx+width) and (mouse_y<yy+(height/2)*(i+1)) and (mouse_y>yy) and mouse_check_button_released(mb)
+    {
+        //show_message(i+1) //Debugging
+        return i+1; //Returns the number of the item in the list, we're adding 1 because 0 is reserved for if nothing is clicked
+    }
+
+    
+
+}
+
+if mouse_check_button_released(mb) and !(mouse_x>xx and mouse_y>yy and mouse_x<xx+width and mouse_y<yy+(height*(ds_list_size(item_list)-1))) //If the mouse was clicked outside
+{
+    return 0; //Return 0 to indicate that the user chose to exit the menu by clicking outside of it
+}
+
+return -1; //If we haven't already returned something, return a -1 to indicate that nothing was clicked
--- a/Language/game_init.gml
+++ b/Language/game_init.gml
@@ -1,484 +0,0 @@
-/*
-    Originally from /Source/gg2/Scripts/game_init.gml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-// Returns true if the game is successfully initialized, false if there was an error and we should quit.
-{
-    instance_create(0,0,RoomChangeObserver);
-    set_little_endian_global(true);
-    if file_exists("game_errors.log") file_delete("game_errors.log");
-    if file_exists("last_plugin.log") file_delete("last_plugin.log");
-    
-    // Delete old left-over files created by the updater
-    var backupFilename;
-    backupFilename = file_find_first("gg2-old.delete.me.*", 0);
-    while(backupFilename != "")
-    {
-        file_delete(backupFilename);
-        backupFilename = file_find_next();
-    }
-    file_find_close();
-    
-    var customMapRotationFile, restart;
-    restart = false;
-
-    //import wav files for music
-    global.MenuMusic=sound_add(choose("Music/menumusic1.wav","Music/menumusic2.wav","Music/menumusic3.wav","Music/menumusic4.wav","Music/menumusic5.wav","Music/menumusic6.wav"), 1, true);
-    global.IngameMusic=sound_add("Music/ingamemusic.wav", 1, true);
-    global.FaucetMusic=sound_add("Music/faucetmusic.wav", 1, true);
-    if(global.MenuMusic != -1)
-        sound_volume(global.MenuMusic, 0.8);
-    if(global.IngameMusic != -1)
-        sound_volume(global.IngameMusic, 0.8);
-    if(global.FaucetMusic != -1)
-        sound_volume(global.FaucetMusic, 0.8);
-        
-    global.sendBuffer = buffer_create();
-    global.tempBuffer = buffer_create();
-    global.HudCheck = false;
-    global.map_rotation = ds_list_create();
-    
-    global.CustomMapCollisionSprite = -1;
-    
-    window_set_region_scale(-1, false);
-    
-    ini_open("gg2.ini");
-    global.playerName = ini_read_string("Settings", "PlayerName", "Player");
-    if string_count("#",global.playerName) > 0 global.playerName = "Player";
-    global.playerName = string_copy(global.playerName, 0, min(string_length(global.playerName), MAX_PLAYERNAME_LENGTH));
-    global.fullscreen = ini_read_real("Settings", "Fullscreen", 0);
-    global.useLobbyServer = ini_read_real("Settings", "UseLobby", 1);
-    global.hostingPort = ini_read_real("Settings", "HostingPort", 8190);
-    global.music = ini_read_real("Settings", "Music", ini_read_real("Settings", "IngameMusic", MUSIC_BOTH));
-    global.playerLimit = ini_read_real("Settings", "PlayerLimit", 10);
-    //thy playerlimit shalt not exceed 48!
-    if (global.playerLimit > 48)
-    {
-        if (global.dedicatedMode != 1)
-            show_message("Warning: Player Limit cannot exceed 48. It has been set to 48");
-        global.playerLimit = 48;
-        ini_write_real("Settings", "PlayerLimit", 48);
-    }
-    global.multiClientLimit = ini_read_real("Settings", "MultiClientLimit", 3);
-    global.particles =  ini_read_real("Settings", "Particles", PARTICLES_NORMAL);
-    global.gibLevel = ini_read_real("Settings", "Gib Level", 3);
-    global.killCam = ini_read_real("Settings", "Kill Cam", 1);
-    global.monitorSync = ini_read_real("Settings", "Monitor Sync", 0);
-    if global.monitorSync == 1 set_synchronization(true);
-    else set_synchronization(false);
-    global.medicRadar = ini_read_real("Settings", "Healer Radar", 1);
-    global.showHealer = ini_read_real("Settings", "Show Healer", 1);
-    global.showHealing = ini_read_real("Settings", "Show Healing", 1);
-    global.showHealthBar = ini_read_real("Settings", "Show Healthbar", 0);
-    global.showTeammateStats = ini_read_real("Settings", "Show Extra Teammate Stats", 0);
-    global.serverPluginsPrompt = ini_read_real("Settings", "ServerPluginsPrompt", 1);
-    global.restartPrompt = ini_read_real("Settings", "RestartPrompt", 1);
-    //user HUD settings
-    global.timerPos=ini_read_real("Settings","Timer Position", 0)
-    global.killLogPos=ini_read_real("Settings","Kill Log Position", 0)
-    global.kothHudPos=ini_read_real("Settings","KoTH HUD Position", 0)
-    global.clientPassword = "";
-    // for admin menu
-    customMapRotationFile = ini_read_string("Server", "MapRotation", "");
-    global.shuffleRotation = ini_read_real("Server", "ShuffleRotation", 1);
-    global.timeLimitMins = max(1, min(255, ini_read_real("Server", "Time Limit", 15)));
-    global.serverPassword = ini_read_string("Server", "Password", "");
-    global.mapRotationFile = customMapRotationFile;
-    global.dedicatedMode = ini_read_real("Server", "Dedicated", 0);
-    global.serverName = ini_read_string("Server", "ServerName", "My Server");
-    global.welcomeMessage = ini_read_string("Server", "WelcomeMessage", "");
-    global.caplimit = max(1, min(255, ini_read_real("Server", "CapLimit", 5)));
-    global.caplimitBkup = global.caplimit;
-    global.autobalance = ini_read_real("Server", "AutoBalance",1);
-    global.Server_RespawntimeSec = ini_read_real("Server", "Respawn Time", 5);
-    global.rewardKey = unhex(ini_read_string("Haxxy", "RewardKey", ""));
-    global.rewardId = ini_read_string("Haxxy", "RewardId", "");
-    global.mapdownloadLimitBps = ini_read_real("Server", "Total bandwidth limit for map downloads in bytes per second", 50000);
-    global.updaterBetaChannel = ini_read_real("General", "UpdaterBetaChannel", isBetaVersion());
-    global.attemptPortForward = ini_read_real("Server", "Attempt UPnP Forwarding", 0); 
-    global.serverPluginList = ini_read_string("Server", "ServerPluginList", "");
-    global.serverPluginsRequired = ini_read_real("Server", "ServerPluginsRequired", 0);
-    if (string_length(global.serverPluginList) > 254) {
-        show_message("Error: Server plugin list cannot exceed 254 characters");
-        return false;
-    }
-    var CrosshairFilename, CrosshairRemoveBG;
-    CrosshairFilename = ini_read_string("Settings", "CrosshairFilename", "");
-    CrosshairRemoveBG = ini_read_real("Settings", "CrosshairRemoveBG", 1);
-    global.queueJumping = ini_read_real("Settings", "Queued Jumping", 0);
-
-    global.backgroundHash = ini_read_string("Background", "BackgroundHash", "default");
-    global.backgroundTitle = ini_read_string("Background", "BackgroundTitle", "");
-    global.backgroundURL = ini_read_string("Background", "BackgroundURL", "");
-    global.backgroundShowVersion = ini_read_real("Background", "BackgroundShowVersion", true);
-    
-    readClasslimitsFromIni();
-
-    global.currentMapArea=1;
-    global.totalMapAreas=1;
-    global.setupTimer=1800;
-    global.joinedServerName="";
-    global.serverPluginsInUse=false;
-    // Create plugin packet maps
-    global.pluginPacketBuffers = ds_map_create();
-    global.pluginPacketPlayers = ds_map_create();
-        
-    ini_write_string("Settings", "PlayerName", global.playerName);
-    ini_write_real("Settings", "Fullscreen", global.fullscreen);
-    ini_write_real("Settings", "UseLobby", global.useLobbyServer);
-    ini_write_real("Settings", "HostingPort", global.hostingPort);
-    ini_key_delete("Settings", "IngameMusic");
-    ini_write_real("Settings", "Music", global.music);
-    ini_write_real("Settings", "PlayerLimit", global.playerLimit);
-    ini_write_real("Settings", "MultiClientLimit", global.multiClientLimit);
-    ini_write_real("Settings", "Particles", global.particles);
-    ini_write_real("Settings", "Gib Level", global.gibLevel);
-    ini_write_real("Settings", "Kill Cam", global.killCam);
-    ini_write_real("Settings", "Monitor Sync", global.monitorSync);
-    ini_write_real("Settings", "Healer Radar", global.medicRadar);
-    ini_write_real("Settings", "Show Healer", global.showHealer);
-    ini_write_real("Settings", "Show Healing", global.showHealing);
-    ini_write_real("Settings", "Show Healthbar", global.showHealthBar);
-    ini_write_real("Settings", "Show Extra Teammate Stats", global.showTeammateStats);
-    ini_write_real("Settings", "Timer Position", global.timerPos);
-    ini_write_real("Settings", "Kill Log Position", global.killLogPos);
-    ini_write_real("Settings", "KoTH HUD Position", global.kothHudPos);
-    ini_write_real("Settings", "ServerPluginsPrompt", global.serverPluginsPrompt);
-    ini_write_real("Settings", "RestartPrompt", global.restartPrompt);
-    ini_write_string("Server", "MapRotation", customMapRotationFile);
-    ini_write_real("Server", "ShuffleRotation", global.shuffleRotation);
-    ini_write_real("Server", "Dedicated", global.dedicatedMode);
-    ini_write_string("Server", "ServerName", global.serverName);
-    ini_write_string("Server", "WelcomeMessage", global.welcomeMessage);
-    ini_write_real("Server", "CapLimit", global.caplimit);
-    ini_write_real("Server", "AutoBalance", global.autobalance);
-    ini_write_real("Server", "Respawn Time", global.Server_RespawntimeSec);
-    ini_write_real("Server", "Total bandwidth limit for map downloads in bytes per second", global.mapdownloadLimitBps);
-    ini_write_real("Server", "Time Limit", global.timeLimitMins);
-    ini_write_string("Server", "Password", global.serverPassword);
-    ini_write_real("General", "UpdaterBetaChannel", global.updaterBetaChannel);
-    ini_write_real("Server", "Attempt UPnP Forwarding", global.attemptPortForward); 
-    ini_write_string("Server", "ServerPluginList", global.serverPluginList); 
-    ini_write_real("Server", "ServerPluginsRequired", global.serverPluginsRequired); 
-    ini_write_string("Settings", "CrosshairFilename", CrosshairFilename);
-    ini_write_real("Settings", "CrosshairRemoveBG", CrosshairRemoveBG);
-    ini_write_real("Settings", "Queued Jumping", global.queueJumping);
-
-    ini_write_string("Background", "BackgroundHash", global.backgroundHash);
-    ini_write_string("Background", "BackgroundTitle", global.backgroundTitle);
-    ini_write_string("Background", "BackgroundURL", global.backgroundURL);
-    ini_write_real("Background", "BackgroundShowVersion", global.backgroundShowVersion);
-    
-    ini_write_real("Classlimits", "Scout", global.classlimits[CLASS_SCOUT])
-    ini_write_real("Classlimits", "Pyro", global.classlimits[CLASS_PYRO])
-    ini_write_real("Classlimits", "Soldier", global.classlimits[CLASS_SOLDIER])
-    ini_write_real("Classlimits", "Heavy", global.classlimits[CLASS_HEAVY])
-    ini_write_real("Classlimits", "Demoman", global.classlimits[CLASS_DEMOMAN])
-    ini_write_real("Classlimits", "Medic", global.classlimits[CLASS_MEDIC])
-    ini_write_real("Classlimits", "Engineer", global.classlimits[CLASS_ENGINEER])
-    ini_write_real("Classlimits", "Spy", global.classlimits[CLASS_SPY])
-    ini_write_real("Classlimits", "Sniper", global.classlimits[CLASS_SNIPER])
-    ini_write_real("Classlimits", "Quote", global.classlimits[CLASS_QUOTE])
-
-    //screw the 0 index we will start with 1
-    //map_truefort 
-    maps[1] = ini_read_real("Maps", "ctf_truefort", 1);
-    //map_2dfort 
-    maps[2] = ini_read_real("Maps", "ctf_2dfort", 2);
-    //map_conflict 
-    maps[3] = ini_read_real("Maps", "ctf_conflict", 3);
-    //map_classicwell 
-    maps[4] = ini_read_real("Maps", "ctf_classicwell", 4);
-    //map_waterway 
-    maps[5] = ini_read_real("Maps", "ctf_waterway", 5);
-    //map_orange 
-    maps[6] = ini_read_real("Maps", "ctf_orange", 6);
-    //map_dirtbowl
-    maps[7] = ini_read_real("Maps", "cp_dirtbowl", 7);
-    //map_egypt
-    maps[8] = ini_read_real("Maps", "cp_egypt", 8);
-    //arena_montane
-    maps[9] = ini_read_real("Maps", "arena_montane", 9);
-    //arena_lumberyard
-    maps[10] = ini_read_real("Maps", "arena_lumberyard", 10);
-    //gen_destroy
-    maps[11] = ini_read_real("Maps", "gen_destroy", 11);
-    //koth_valley
-    maps[12] = ini_read_real("Maps", "koth_valley", 12);
-    //koth_corinth
-    maps[13] = ini_read_real("Maps", "koth_corinth", 13);
-    //koth_harvest
-    maps[14] = ini_read_real("Maps", "koth_harvest", 14);
-    //dkoth_atalia
-    maps[15] = ini_read_real("Maps", "dkoth_atalia", 15);
-    //dkoth_sixties
-    maps[16] = ini_read_real("Maps", "dkoth_sixties", 16);
-    
-    //Server respawn time calculator. Converts each second to a frame. (read: multiply by 30 :hehe:)
-    if (global.Server_RespawntimeSec == 0)
-    {
-        global.Server_Respawntime = 1;
-    }    
-    else
-    {
-        global.Server_Respawntime = global.Server_RespawntimeSec * 30;    
-    }    
-    
-    // I have to include this, or the client'll complain about an unknown variable.
-    global.mapchanging = false;
-    
-    ini_write_real("Maps", "ctf_truefort", maps[1]);
-    ini_write_real("Maps", "ctf_2dfort", maps[2]);
-    ini_write_real("Maps", "ctf_conflict", maps[3]);
-    ini_write_real("Maps", "ctf_classicwell", maps[4]);
-    ini_write_real("Maps", "ctf_waterway", maps[5]);
-    ini_write_real("Maps", "ctf_orange", maps[6]);
-    ini_write_real("Maps", "cp_dirtbowl", maps[7]);
-    ini_write_real("Maps", "cp_egypt", maps[8]);
-    ini_write_real("Maps", "arena_montane", maps[9]);
-    ini_write_real("Maps", "arena_lumberyard", maps[10]);
-    ini_write_real("Maps", "gen_destroy", maps[11]);
-    ini_write_real("Maps", "koth_valley", maps[12]);
-    ini_write_real("Maps", "koth_corinth", maps[13]);
-    ini_write_real("Maps", "koth_harvest", maps[14]);
-    ini_write_real("Maps", "dkoth_atalia", maps[15]);
-    ini_write_real("Maps", "dkoth_sixties", maps[16]);
-
-    ini_close();
-    
-    // parse the protocol version UUID for later use
-    global.protocolUuid = buffer_create();
-    parseUuid(PROTOCOL_UUID, global.protocolUuid);
-
-    global.gg2lobbyId = buffer_create();
-    parseUuid(GG2_LOBBY_UUID, global.gg2lobbyId);
-
-    // Create abbreviations array for rewards use
-    initRewards()
-    
-var a, IPRaw, portRaw;
-doubleCheck=0;
-global.launchMap = "";
-
-    for(a = 1; a <= parameter_count(); a += 1) 
-    {
-        if (parameter_string(a) == "-dedicated")
-        {
-            global.dedicatedMode = 1;
-        }
-        else if (parameter_string(a) == "-restart")
-        {
-            restart = true;
-        }
-        else if (parameter_string(a) == "-server")
-        {
-            IPRaw = parameter_string(a+1);
-            if (doubleCheck == 1)
-            {
-                doubleCheck = 2;
-            }
-            else
-            {
-                doubleCheck = 1;
-            }
-        }
-        else if (parameter_string(a) == "-port")
-        {
-            portRaw = parameter_string(a+1);
-            if (doubleCheck == 1)
-            {
-                doubleCheck = 2;
-            }
-            else
-            {
-                doubleCheck = 1;
-            }
-        }
-        else if (parameter_string(a) == "-map")
-        {
-            global.launchMap = parameter_string(a+1);
-            global.dedicatedMode = 1;
-        }
-    }
-    
-    if (doubleCheck == 2)
-    {
-        global.serverPort = real(portRaw);
-        global.serverIP = IPRaw;
-        global.isHost = false;
-        instance_create(0,0,Client);
-    }   
-    
-    global.customMapdesginated = 0;    
-    
-    // if the user defined a valid map rotation file, then load from there
-
-    if(customMapRotationFile != "" && file_exists(customMapRotationFile) && global.launchMap == "") {
-        global.customMapdesginated = 1;
-        var fileHandle, i, mapname;
-        fileHandle = file_text_open_read(customMapRotationFile);
-        for(i = 1; !file_text_eof(fileHandle); i += 1) {
-            mapname = file_text_read_string(fileHandle);
-            // remove leading whitespace from the string
-            while(string_char_at(mapname, 0) == " " || string_char_at(mapname, 0) == chr(9)) { // while it starts with a space or tab
-              mapname = string_delete(mapname, 0, 1); // delete that space or tab
-            }
-            if(mapname != "" && string_char_at(mapname, 0) != "#") { // if it's not blank and it's not a comment (starting with #)
-                ds_list_add(global.map_rotation, mapname);
-            }
-            file_text_readln(fileHandle);
-        }
-        file_text_close(fileHandle);
-    }
-    
-     else if (global.launchMap != "") && (global.dedicatedMode == 1)
-        {  
-        ds_list_add(global.map_rotation, global.launchMap);
-        }
-    
-     else { // else load from the ini file Maps section
-        //Set up the map rotation stuff
-        var i, sort_list;
-        sort_list = ds_list_create();
-        for(i=1; i <= 16; i += 1) {
-            if(maps[i] != 0) ds_list_add(sort_list, ((100*maps[i])+i));
-        }
-        ds_list_sort(sort_list, 1);
-        
-        // translate the numbers back into the names they represent
-        for(i=0; i < ds_list_size(sort_list); i += 1) {
-            switch(ds_list_find_value(sort_list, i) mod 100) {
-                case 1:
-                    ds_list_add(global.map_rotation, "ctf_truefort");
-                break;
-                case 2:
-                    ds_list_add(global.map_rotation, "ctf_2dfort");
-                break;
-                case 3:
-                    ds_list_add(global.map_rotation, "ctf_conflict");
-                break;
-                case 4:
-                    ds_list_add(global.map_rotation, "ctf_classicwell");
-                break;
-                case 5:
-                    ds_list_add(global.map_rotation, "ctf_waterway");
-                break;
-                case 6:
-                    ds_list_add(global.map_rotation, "ctf_orange");
-                break;
-                case 7:
-                    ds_list_add(global.map_rotation, "cp_dirtbowl");
-                break;
-                case 8:
-                    ds_list_add(global.map_rotation, "cp_egypt");
-                break;
-                case 9:
-                    ds_list_add(global.map_rotation, "arena_montane");
-                break;
-                case 10:
-                    ds_list_add(global.map_rotation, "arena_lumberyard");
-                break;
-                case 11:
-                    ds_list_add(global.map_rotation, "gen_destroy");
-                break;
-                case 12:
-                    ds_list_add(global.map_rotation, "koth_valley");
-                break;
-                case 13:
-                    ds_list_add(global.map_rotation, "koth_corinth");
-                break;
-                case 14:
-                    ds_list_add(global.map_rotation, "koth_harvest");
-                break;
-                case 15:
-                    ds_list_add(global.map_rotation, "dkoth_atalia");
-                break;
-                case 16:
-                    ds_list_add(global.map_rotation, "dkoth_sixties");
-                break;
-                    
-            }
-        }
-        ds_list_destroy(sort_list);
-    }
-    
-    window_set_fullscreen(global.fullscreen);
-    
-    global.gg2Font = font_add_sprite(gg2FontS,ord("!"),false,0);
-    global.countFont = font_add_sprite(countFontS, ord("0"),false,2);
-    draw_set_font(global.gg2Font);
-    cursor_sprite = CrosshairS;
-    
-    if(!directory_exists(working_directory + "\Maps")) directory_create(working_directory + "\Maps");
-    
-    instance_create(0, 0, AudioControl);
-    instance_create(0, 0, SSControl);
-    
-    // custom dialog box graphics
-    message_background(popupBackgroundB);
-    message_button(popupButtonS);
-    message_text_font("Century",9,c_white,1);
-    message_button_font("Century",9,c_white,1);
-    message_input_font("Century",9,c_white,0);
-    
-    //Key Mapping
-    ini_open("controls.gg2");
-    global.jump = ini_read_real("Controls", "jump", ord("W"));
-    global.down = ini_read_real("Controls", "down", ord("S"));
-    global.left = ini_read_real("Controls", "left", ord("A"));
-    global.right = ini_read_real("Controls", "right", ord("D"));
-    global.attack = ini_read_real("Controls", "attack", MOUSE_LEFT);
-    global.special = ini_read_real("Controls", "special", MOUSE_RIGHT);
-    global.taunt = ini_read_real("Controls", "taunt", ord("F"));
-    global.chat1 = ini_read_real("Controls", "chat1", ord("Z"));
-    global.chat2 = ini_read_real("Controls", "chat2", ord("X"));
-    global.chat3 = ini_read_real("Controls", "chat3", ord("C"));
-    global.medic = ini_read_real("Controls", "medic", ord("E"));
-    global.drop = ini_read_real("Controls", "drop", ord("B"));
-    global.changeTeam = ini_read_real("Controls", "changeTeam", ord("N"));
-    global.changeClass = ini_read_real("Controls", "changeClass", ord("M"));
-    global.showScores = ini_read_real("Controls", "showScores", vk_shift);
-    ini_close();
-    
-    calculateMonthAndDay();
-
-    if(!directory_exists(working_directory + "\Plugins")) directory_create(working_directory + "\Plugins");
-    loadplugins();
-    
-    /* Windows 8 is known to crash GM when more than three (?) sounds play at once
-     * We'll store the kernel version (Win8 is 6.2, Win7 is 6.1) and check it there.
-     ***/
-    registry_set_root(1); // HKLM
-    global.NTKernelVersion = real(registry_read_string_ext("\SOFTWARE\Microsoft\Windows NT\CurrentVersion\", "CurrentVersion")); // SIC
-
-    if (file_exists(CrosshairFilename))
-    {
-        sprite_replace(CrosshairS,CrosshairFilename,1,CrosshairRemoveBG,false,0,0);
-        sprite_set_offset(CrosshairS,sprite_get_width(CrosshairS)/2,sprite_get_height(CrosshairS)/2);
-    }
-    if(global.dedicatedMode == 1) {
-        AudioControlToggleMute();
-        room_goto_fix(Menu);
-    } else if(restart) {
-        room_goto_fix(Menu);
-    }
-    return true;
-}
--- a/Language/loadserverplugins.gml
+++ b/Language/loadserverplugins.gml
@@ -1,252 +0,0 @@
-/*
-    Originally from /Source/gg2/Scripts/Plugins/loadserverplugins.gml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-// loads plugins from ganggarrison.com asked for by server
-// argument0 - comma separated plugin list (pluginname@md5hash)
-// returns true on success, false on failure
-var list, hashList, text, i, pluginname, pluginhash, realhash, url, handle, filesize, progress, tempfile, tempdir, failed, lastContact, isCached;
-
-failed = false;
-list = ds_list_create();
-lastContact = 0;
-isCached = false;
-isDebug = false;
-hashList = ds_list_create();
-
-// split plugin list string
-list = split(argument0, ',');
-
-// Split hashes from plugin names
-for (i = 0; i < ds_list_size(list); i += 1)
-{
-    text = ds_list_find_value(list, i);
-    pluginname = string_copy(text, 0, string_pos("@", text) - 1);
-    pluginhash = string_copy(text, string_pos("@", text) + 1, string_length(text) - string_pos("@", text));
-    ds_list_replace(list, i, pluginname);
-    ds_list_add(hashList, pluginhash);
-}
-
-// Check plugin names and check for duplicates
-for (i = 0; i < ds_list_size(list); i += 1)
-{
-    pluginname = ds_list_find_value(list, i);
-    
-    // invalid plugin name
-    if (!checkpluginname(pluginname))
-    {
-        show_message('Error loading server-sent plugins - invalid plugin name:#"' + pluginname + '"');
-        return false;
-    }
-    // is duplicate
-    else if (ds_list_find_index(list, pluginname) != i)
-    {
-        show_message('Error loading server-sent plugins - duplicate plugin:#"' + pluginname + '"');
-        return false;
-    }
-}
-
-// Download plugins
-for (i = 0; i < ds_list_size(list); i += 1)
-{
-    pluginname = ds_list_find_value(list, i);
-    pluginhash = ds_list_find_value(hashList, i);
-    isDebug = file_exists(working_directory + "\ServerPluginsDebug\" + pluginname + ".zip");
-    isCached = file_exists(working_directory + "\ServerPluginsCache\" + pluginname + "@" + pluginhash);
-    tempfile = temp_directory + "\" + pluginname + ".zip.tmp";
-    tempdir = temp_directory + "\" + pluginname + ".tmp";
-
-    // check to see if we have a local copy for debugging
-    if (isDebug)
-    {
-        file_copy(working_directory + "\ServerPluginsDebug\" + pluginname + ".zip", tempfile);
-        // show warning
-        if (global.isHost)
-        {
-            show_message(
-                "Warning: server-sent plugin '"
-                + pluginname
-                + "' is being loaded from ServerPluginsDebug. Make sure clients have the same version, else they may be unable to connect."
-            );
-        }
-        else
-        {
-            show_message(
-                "Warning: server-sent plugin '"
-                + pluginname
-                + "' is being loaded from ServerPluginsDebug. Make sure the server has the same version, else you may be unable to connect."
-            );
-        }
-    }
-    // otherwise, check if we have it cached
-    else if (isCached)
-    {
-        file_copy(working_directory + "\ServerPluginsCache\" + pluginname + "@" + pluginhash, tempfile);
-    }
-    // otherwise, download as usual
-    else
-    {
-        // construct the URL
-        // http://www.ganggarrison.com/plugins/$PLUGINNAME$@$PLUGINHASH$.zip)
-        url = PLUGIN_SOURCE + pluginname + "@" + pluginhash + ".zip";
-        
-        // let's make the download handle
-        handle = httpGet(url, -1);
-        
-        // download it
-        while (!httpRequestStatus(handle)) {
-            // prevent game locking up
-            io_handle();
-
-            httpRequestStep(handle);
-            
-            if (!global.isHost) {
-                // send ping if we haven't contacted server in 20 seconds
-                // we need to do this to keep the connection open
-                if (current_time-lastContact > 20000) {
-                    write_byte(global.serverSocket, PING);
-                    socket_send(global.serverSocket);
-                    lastContact = current_time;
-                }
-            }
-
-            // draw progress bar since they may be waiting a while
-            filesize = httpRequestResponseBodySize(handle);
-            progress = httpRequestResponseBodyProgress(handle);
-            draw_background_ext(background_index[0], 0, 0, background_xscale[0], background_yscale[0], 0, c_white, 1);
-            draw_set_color(c_white);
-            draw_set_alpha(1);
-            draw_set_halign(fa_left);
-            draw_rectangle(50, 550, 300, 560, 2);
-            draw_text(50, 530, "Downloading server-sent plugin " + string(i + 1) + "/" + string(ds_list_size(list)) + ' - "' + pluginname + '"');
-            if (filesize != -1)
-                draw_rectangle(50, 550, 50 + progress / filesize * 250, 560, 0);
-            screen_refresh();
-        }
-
-        // errored
-        if (httpRequestStatus(handle) == 2)
-        {
-            show_message('Error loading server-sent plugins - download failed for "' + pluginname + '":#' + httpRequestError(handle));
-            failed = true;
-            break;
-        }
-
-        // request failed
-        if (httpRequestStatusCode(handle) != 200)
-        {
-            show_message('Error loading server-sent plugins - download failed for "' + pluginname + '":#' + string(httpRequestStatusCode(handle)) + ' ' + httpRequestReasonPhrase(handle));
-            failed = true;
-            break;
-        }
-        else
-        {
-            write_buffer_to_file(httpRequestResponseBody(handle), tempfile);
-            if (!file_exists(tempfile))
-            {
-                show_message('Error loading server-sent plugins - download failed for "' + pluginname + '":# No such file?');
-                failed = true;
-                break;
-            }
-        }
-
-        httpRequestDestroy(handle);
-    }
-
-    // check file integrity
-    realhash = GG2DLL_compute_MD5(tempfile);
-    if (realhash != pluginhash)
-    {
-        show_message('Error loading server-sent plugins - integrity check failed (MD5 hash mismatch) for:#"' + pluginname + '"');
-        failed = true;
-        break;
-    }
-    
-    // don't try to cache debug plugins
-    if (!isDebug)
-    {
-        // add to cache if we don't already have it
-        if (!file_exists(working_directory + "\ServerPluginsCache\" + pluginname + "@" + pluginhash))
-        {
-            // make sure directory exists
-            if (!directory_exists(working_directory + "\ServerPluginsCache"))
-            {
-                directory_create(working_directory + "\ServerPluginsCache");
-            }
-            // store in cache
-            file_copy(tempfile, working_directory + "\ServerPluginsCache\" + pluginname + "@" + pluginhash);
-        }
-    }
-
-    // let's get 7-zip to extract the files
-    extractzip(tempfile, tempdir);
-    
-    // if the directory doesn't exist, extracting presumably failed
-    if (!directory_exists(tempdir))
-    {
-        show_message('Error loading server-sent plugins - extracting zip failed for:#"' + pluginname + '"');
-        failed = true;
-        break;
-    }
-}
-
-if (!failed)
-{
-    // Execute plugins
-    for (i = 0; i < ds_list_size(list); i += 1)
-    {
-        pluginname = ds_list_find_value(list, i);
-        tempdir = temp_directory + "\" + pluginname + ".tmp";
-        
-        // Debugging facility, so we know *which* plugin caused compile/execute error
-        fp = file_text_open_write(working_directory + "\last_plugin.log");
-        file_text_write_string(fp, pluginname);
-        file_text_close(fp);
-
-        // packetID is (i), so make queues for it
-        ds_map_add(global.pluginPacketBuffers, i, ds_queue_create());
-        ds_map_add(global.pluginPacketPlayers, i, ds_queue_create());
-
-        // Execute plugin
-        execute_file(
-            // the plugin's main gml file must be in the root of the zip
-            // it is called plugin.gml
-            tempdir + "\plugin.gml",
-            // the plugin needs to know where it is
-            // so the temporary directory is passed as first argument
-            tempdir,
-            // the plugin needs to know its packetID
-            // so it is passed as the second argument
-            i
-        );
-    }
-}
-
-// Delete last plugin log
-file_delete(working_directory + "\last_plugin.log");
-
-// Get rid of plugin list
-ds_list_destroy(list);
-
-// Get rid of plugin hash list
-ds_list_destroy(hashList);
-
-return !failed;
--- a/Language/processClientCommands.gml
+++ b/Language/processClientCommands.gml
@@ -1,384 +0,0 @@
-/*
-    Originally from /Source/gg2/Scripts/GameServer/processClientCommands.gml in Gang Garrison 2
-
-    Copyright (C) 2008-2013 Faucet Software
-    http://www.ganggarrison.com
-
-    This program is free software; 
-    you can redistribute it and/or modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 3 of the License, or (at your option)
-    any later version.
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-    without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
-    See the GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License along with this program; if not,
-    see <http://www.gnu.org/licenses>.
-
-    Additional permission under GNU GPL version 3 section 7
-    If you modify this Program, or any covered work, by linking or combining it with the Game Maker runtime library, 
-    the 39dll library/extension, Hobbel's Download Manager DLL, or modified versions of these libraries,
-    the licensors of this Program grant you additional permission to convey the resulting work.
-*/
-
-var player, playerId, commandLimitRemaining;
-
-player = argument0;
-playerId = argument1;
-
-// To prevent players from flooding the server, limit the number of commands to process per step and player.
-commandLimitRemaining = 10;
-
-with(player) {
-    if(!variable_local_exists("commandReceiveState")) {
-        // 0: waiting for command byte.
-        // 1: waiting for command data length (1 byte)
-        // 2: waiting for command data.
-        commandReceiveState = 0;
-        commandReceiveExpectedBytes = 1;
-        commandReceiveCommand = 0;
-    }
-}
-
-while(commandLimitRemaining > 0) {
-    var socket;
-    socket = player.socket;
-    if(!tcp_receive(socket, player.commandReceiveExpectedBytes)) {
-        return 0;
-    }
-    
-    switch(player.commandReceiveState)
-    {
-    case 0:
-        player.commandReceiveCommand = read_ubyte(socket);
-        switch(commandBytes[player.commandReceiveCommand]) {
-        case commandBytesInvalidCommand:
-            // Invalid byte received. Wait for another command byte.
-            break;
-            
-        case commandBytesPrefixLength1:
-            player.commandReceiveState = 1;
-            player.commandReceiveExpectedBytes = 1;
-            break;
-
-        case commandBytesPrefixLength2:
-            player.commandReceiveState = 3;
-            player.commandReceiveExpectedBytes = 2;
-            break;
-
-        default:
-            player.commandReceiveState = 2;
-            player.commandReceiveExpectedBytes = commandBytes[player.commandReceiveCommand];
-            break;
-        }
-        break;
-        
-    case 1:
-        player.commandReceiveState = 2;
-        player.commandReceiveExpectedBytes = read_ubyte(socket);
-        break;
-
-    case 3:
-        player.commandReceiveState = 2;
-        player.commandReceiveExpectedBytes = read_ushort(socket);
-        break;
-        
-    case 2:
-        player.commandReceiveState = 0;
-        player.commandReceiveExpectedBytes = 1;
-        commandLimitRemaining -= 1;
-        
-        switch(player.commandReceiveCommand)
-        {
-        case PLAYER_LEAVE:
-            socket_destroy(player.socket);
-            player.socket = -1;
-            break;
-            
-        case PLAYER_CHANGECLASS:
-            var class;
-            class = read_ubyte(socket);
-            if(getCharacterObject(player.team, class) != -1)
-            {
-                if(player.object != -1)
-                {
-                    with(player.object)
-                    {
-                        if (collision_point(x,y,SpawnRoom,0,0) < 0)
-                        {
-                            if (!instance_exists(lastDamageDealer) || lastDamageDealer == player)
-                            {
-                                sendEventPlayerDeath(player, player, noone, BID_FAREWELL);
-                                doEventPlayerDeath(player, player, noone, BID_FAREWELL);
-                            }
-                            else
-                            {
-                                var assistant;
-                                assistant = secondToLastDamageDealer;
-                                if (lastDamageDealer.object)
-                                    if (lastDamageDealer.object.healer)
-                                        assistant = lastDamageDealer.object.healer;
-                                sendEventPlayerDeath(player, lastDamageDealer, assistant, FINISHED_OFF);
-                                doEventPlayerDeath(player, lastDamageDealer, assistant, FINISHED_OFF);
-                            }
-                        }
-                        else 
-                        instance_destroy(); 
-                        
-                    }
-                }
-                else if(player.alarm[5]<=0)
-                    player.alarm[5] = 1;
-                class = checkClasslimits(player, player.team, class);
-                player.class = class;
-                ServerPlayerChangeclass(playerId, player.class, global.sendBuffer);
-            }
-            break;
-            
-        case PLAYER_CHANGETEAM:
-            var newTeam, balance, redSuperiority;
-            newTeam = read_ubyte(socket);
-            
-            redSuperiority = 0   //calculate which team is bigger
-            with(Player)
-            {
-                if(team == TEAM_RED)
-                    redSuperiority += 1;
-                else if(team == TEAM_BLUE)
-                    redSuperiority -= 1;
-            }
-            if(redSuperiority > 0)
-                balance = TEAM_RED;
-            else if(redSuperiority < 0)
-                balance = TEAM_BLUE;
-            else
-                balance = -1;
-            
-            if(balance != newTeam)
-            {
-                if(getCharacterObject(newTeam, player.class) != -1 or newTeam==TEAM_SPECTATOR)
-                {  
-                    if(player.object != -1)
-                    {
-                        with(player.object)
-                        {
-                            if (!instance_exists(lastDamageDealer) || lastDamageDealer == player)
-                            {
-                                sendEventPlayerDeath(player, player, noone, BID_FAREWELL);
-                                doEventPlayerDeath(player, player, noone, BID_FAREWELL);
-                            }
-                            else
-                            {
-                                var assistant;
-                                assistant = secondToLastDamageDealer;
-                                if (lastDamageDealer.object)
-                                    if (lastDamageDealer.object.healer)
-                                        assistant = lastDamageDealer.object.healer;
-                                sendEventPlayerDeath(player, lastDamageDealer, assistant, FINISHED_OFF);
-                                doEventPlayerDeath(player, lastDamageDealer, assistant, FINISHED_OFF);
-                            }
-                        }
-                        player.alarm[5] = global.Server_Respawntime;
-                    }
-                    else if(player.alarm[5]<=0)
-                        player.alarm[5] = 1;                    
-                    var newClass;
-                    newClass = checkClasslimits(player, newTeam, player.class);
-                    if newClass != player.class
-                    {
-                        player.class = newClass;
-                        ServerPlayerChangeclass(playerId, player.class, global.sendBuffer);
-                    }
-                    player.team = newTeam;
-                    ServerPlayerChangeteam(playerId, player.team, global.sendBuffer);
-                    ServerBalanceTeams();
-                }
-            }
-            break;                   
-            
-        case CHAT_BUBBLE:
-            var bubbleImage;
-            bubbleImage = read_ubyte(socket);
-            if(global.aFirst) {
-                bubbleImage = 0;
-            }
-            write_ubyte(global.sendBuffer, CHAT_BUBBLE);
-            write_ubyte(global.sendBuffer, playerId);
-            write_ubyte(global.sendBuffer, bubbleImage);
-            
-            setChatBubble(player, bubbleImage);
-            break;
-            
-        case BUILD_SENTRY:
-            if(player.object != -1)
-            {
-                if(player.class == CLASS_ENGINEER
-                        and collision_circle(player.object.x, player.object.y, 50, Sentry, false, true) < 0
-                        and player.object.nutsNBolts == 100
-                        and (collision_point(player.object.x,player.object.y,SpawnRoom,0,0) < 0)
-                        and !player.sentry
-                        and !player.object.onCabinet)
-                {
-                    write_ubyte(global.sendBuffer, BUILD_SENTRY);
-                    write_ubyte(global.sendBuffer, playerId);
-                    write_ushort(global.serializeBuffer, round(player.object.x*5));
-                    write_ushort(global.serializeBuffer, round(player.object.y*5));
-                    write_byte(global.serializeBuffer, player.object.image_xscale);
-                    buildSentry(player, player.object.x, player.object.y, player.object.image_xscale);
-                }
-            }
-            break;                                       
-
-        case DESTROY_SENTRY:
-            with(player.sentry)
-                instance_destroy();
-            break;                     
-        
-        case DROP_INTEL:
-            if (player.object != -1)
-            {
-                if (player.object.intel)
-                {
-                    sendEventDropIntel(player);
-                    doEventDropIntel(player);
-                }
-            }
-            break;     
-              
-        case OMNOMNOMNOM:
-            if(player.object != -1) {
-                if(!player.humiliated
-                    and !player.object.taunting
-                    and !player.object.omnomnomnom
-                    and player.object.canEat
-                    and player.class==CLASS_HEAVY)
-                {                            
-                    write_ubyte(global.sendBuffer, OMNOMNOMNOM);
-                    write_ubyte(global.sendBuffer, playerId);
-                    with(player.object)
-                    {
-                        omnomnomnom = true;
-                        if player.team == TEAM_RED {
-                            omnomnomnomindex=0;
-                            omnomnomnomend=31;
-                        } else if player.team==TEAM_BLUE {
-                            omnomnomnomindex=32;
-                            omnomnomnomend=63;
-                        } 
-                        xscale=image_xscale;
-                    }             
-                }
-            }
-            break;
-             
-        case TOGGLE_ZOOM:
-            if player.object != -1 {
-                if player.class == CLASS_SNIPER {
-                    write_ubyte(global.sendBuffer, TOGGLE_ZOOM);
-                    write_ubyte(global.sendBuffer, playerId);
-                    toggleZoom(player.object);
-                }
-            }
-            break;
-                                                      
-        case PLAYER_CHANGENAME:
-            var nameLength;
-            nameLength = socket_receivebuffer_size(socket);
-            if(nameLength > MAX_PLAYERNAME_LENGTH)
-            {
-                write_ubyte(player.socket, KICK);
-                write_ubyte(player.socket, KICK_NAME);
-                socket_destroy(player.socket);
-                player.socket = -1;
-            }
-            else
-            {
-                with(player)
-                {
-                    if(variable_local_exists("lastNamechange")) 
-                        if(current_time - lastNamechange < 1000)
-                            break;
-                    lastNamechange = current_time;
-                    name = read_string(socket, nameLength);
-                    if(string_count("#",name) > 0)
-                    {
-                        name = "I <3 Bacon";
-                    }
-                    write_ubyte(global.sendBuffer, PLAYER_CHANGENAME);
-                    write_ubyte(global.sendBuffer, playerId);
-                    write_ubyte(global.sendBuffer, string_length(name));
-                    write_string(global.sendBuffer, name);
-                }
-            }
-            break;
-            
-        case INPUTSTATE:
-            if(player.object != -1)
-            {
-                with(player.object)
-                {
-                    keyState = read_ubyte(socket);
-                    netAimDirection = read_ushort(socket);
-                    aimDirection = netAimDirection*360/65536;
-                    event_user(1);
-                }
-            }
-            break;
-        
-        case REWARD_REQUEST:
-            player.rewardId = read_string(socket, socket_receivebuffer_size(socket));
-            player.challenge = rewardCreateChallenge();
-            
-            write_ubyte(socket, REWARD_CHALLENGE_CODE);
-            write_binstring(socket, player.challenge);
-            break;
-            
-        case REWARD_CHALLENGE_RESPONSE:
-            var answer, i, authbuffer;
-            answer = read_binstring(socket, 16);
-            
-            with(player)
-                if(variable_local_exists("challenge") and variable_local_exists("rewardId"))
-                    rewardAuthStart(player, answer, challenge, true, rewardId);
-           
-            break;
-
-        case PLUGIN_PACKET:
-            var packetID, buf, success;
-
-            packetID = read_ubyte(socket);
-            
-            // get packet data
-            buf = buffer_create();
-            write_buffer_part(buf, socket, socket_receivebuffer_size(socket));
-
-            // try to enqueue
-            success = _PluginPacketPush(packetID, buf, player);
-            
-            // if it returned false, packetID was invalid
-            if (!success)
-            {
-                // clear up buffer
-                buffer_destroy(buf);
-
-                // kick player
-                write_ubyte(player.socket, KICK);
-                write_ubyte(player.socket, KICK_BAD_PLUGIN_PACKET);
-                socket_destroy(player.socket);
-                player.socket = -1;
-            }
-            break;
-            
-        case CLIENT_SETTINGS:
-            var mirror;
-            mirror = read_ubyte(player.socket);
-            player.queueJump = mirror;
-            
-            write_ubyte(global.sendBuffer, CLIENT_SETTINGS);
-            write_ubyte(global.sendBuffer, playerId);
-            write_ubyte(global.sendBuffer, mirror);
-            break;
-        
-        }
-        break;
-    } 
-}
--- a/Show More
+++ b/Show More