Merge pull request #3165 from github/cut-release-v4.8.9

Linguist v4.8.9

.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,18 +22,9 @@
 [submodule "vendor/grammars/Sublime-REBOL"]
 	path = vendor/grammars/Sublime-REBOL
 	url = https://github.com/Oldes/Sublime-REBOL
-[submodule "vendor/grammars/Sublime-Inform"]
-	path = vendor/grammars/Sublime-Inform
-	url = https://github.com/PogiNate/Sublime-Inform
-[submodule "vendor/grammars/autoitv3-tmbundle"]
-	path = vendor/grammars/autoitv3-tmbundle
-	url = https://github.com/Red-Nova-Technologies/autoitv3-tmbundle
 [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
@@ -85,42 +73,33 @@
 [submodule "vendor/grammars/language-shellscript"]
 	path = vendor/grammars/language-shellscript
 	url = https://github.com/atom/language-shellscript
+[submodule "vendor/grammars/language-supercollider"]
+	path = vendor/grammars/language-supercollider
+	url = https://github.com/supercollider/language-supercollider
 [submodule "vendor/grammars/language-yaml"]
 	path = vendor/grammars/language-yaml
 	url = https://github.com/atom/language-yaml
-[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
 [submodule "vendor/grammars/chapel-tmbundle"]
 	path = vendor/grammars/chapel-tmbundle
-	url = https://github.com/bholt/chapel-tmbundle
+	url = https://github.com/chapel-lang/chapel-tmbundle
 [submodule "vendor/grammars/sublime-nginx"]
 	path = vendor/grammars/sublime-nginx
 	url = https://github.com/brandonwamboldt/sublime-nginx
 [submodule "vendor/grammars/bro-sublime"]
 	path = vendor/grammars/bro-sublime
 	url = https://github.com/bro/bro-sublime
-[submodule "vendor/grammars/sublime_man_page_support"]
-	path = vendor/grammars/sublime_man_page_support
-	url = https://github.com/carsonoid/sublime_man_page_support
 [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
 [submodule "vendor/grammars/cucumber-tmbundle"]
 	path = vendor/grammars/cucumber-tmbundle
 	url = https://github.com/cucumber/cucumber-tmbundle
-[submodule "vendor/grammars/Handlebars"]
-	path = vendor/grammars/Handlebars
-	url = https://github.com/daaain/Handlebars
 [submodule "vendor/grammars/powershell"]
 	path = vendor/grammars/powershell
 	url = https://github.com/SublimeText/PowerShell
@@ -136,12 +115,6 @@
 [submodule "vendor/grammars/fancy-tmbundle"]
 	path = vendor/grammars/fancy-tmbundle
 	url = https://github.com/fancy-lang/fancy-tmbundle
-[submodule "vendor/grammars/fsharpbinding"]
-	path = vendor/grammars/fsharpbinding
-	url = https://github.com/fsharp/fsharpbinding
-[submodule "vendor/grammars/monkey.tmbundle"]
-	path = vendor/grammars/monkey.tmbundle
-	url = https://github.com/gingerbeardman/monkey.tmbundle
 [submodule "vendor/grammars/dart-sublime-bundle"]
 	path = vendor/grammars/dart-sublime-bundle
 	url = https://github.com/guillermooo/dart-sublime-bundle
@@ -169,27 +142,15 @@
 [submodule "vendor/grammars/Textmate-Gosu-Bundle"]
 	path = vendor/grammars/Textmate-Gosu-Bundle
 	url = https://github.com/jpcamara/Textmate-Gosu-Bundle
-[submodule "vendor/grammars/jquery-tmbundle"]
-	path = vendor/grammars/jquery-tmbundle
-	url = https://github.com/kswedberg/jquery-tmbundle
 [submodule "vendor/grammars/fish-tmbundle"]
 	path = vendor/grammars/fish-tmbundle
 	url = https://github.com/l15n/fish-tmbundle
-[submodule "vendor/grammars/sublime-idris"]
-	path = vendor/grammars/sublime-idris
-	url = https://github.com/laughedelic/sublime-idris
-[submodule "vendor/grammars/sublime-better-typescript"]
-	path = vendor/grammars/sublime-better-typescript
-	url = https://github.com/lavrton/sublime-better-typescript
 [submodule "vendor/grammars/moonscript-tmbundle"]
 	path = vendor/grammars/moonscript-tmbundle
 	url = https://github.com/leafo/moonscript-tmbundle
 [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
@@ -220,9 +181,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
@@ -232,9 +190,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
@@ -249,7 +204,7 @@
 	url = https://github.com/shellderp/sublime-robot-plugin
 [submodule "vendor/grammars/actionscript3-tmbundle"]
 	path = vendor/grammars/actionscript3-tmbundle
-	url = https://github.com/simongregory/actionscript3-tmbundle
+	url = https://github.com/honzabrecka/actionscript3-tmbundle
 [submodule "vendor/grammars/Sublime-QML"]
 	path = vendor/grammars/Sublime-QML
 	url = https://github.com/skozlovf/Sublime-QML
@@ -265,9 +220,6 @@
 [submodule "vendor/grammars/SublimeXtend"]
 	path = vendor/grammars/SublimeXtend
 	url = https://github.com/staltz/SublimeXtend
-[submodule "vendor/grammars/Stata.tmbundle"]
-	path = vendor/grammars/Stata.tmbundle
-	url = https://github.com/statatmbundle/Stata.tmbundle
 [submodule "vendor/grammars/Vala-TMBundle"]
 	path = vendor/grammars/Vala-TMBundle
 	url = https://github.com/technosophos/Vala-TMBundle
@@ -328,9 +280,6 @@
 [submodule "vendor/grammars/groovy.tmbundle"]
 	path = vendor/grammars/groovy.tmbundle
 	url = https://github.com/textmate/groovy.tmbundle
-[submodule "vendor/grammars/haskell.tmbundle"]
-	path = vendor/grammars/haskell.tmbundle
-	url = https://github.com/textmate/haskell.tmbundle
 [submodule "vendor/grammars/html.tmbundle"]
 	path = vendor/grammars/html.tmbundle
 	url = https://github.com/textmate/html.tmbundle
@@ -346,9 +295,6 @@
 [submodule "vendor/grammars/java.tmbundle"]
 	path = vendor/grammars/java.tmbundle
 	url = https://github.com/textmate/java.tmbundle
-[submodule "vendor/grammars/javadoc.tmbundle"]
-	path = vendor/grammars/javadoc.tmbundle
-	url = https://github.com/textmate/javadoc.tmbundle
 [submodule "vendor/grammars/javascript-objective-j.tmbundle"]
 	path = vendor/grammars/javascript-objective-j.tmbundle
 	url = https://github.com/textmate/javascript-objective-j.tmbundle
@@ -358,9 +304,6 @@
 [submodule "vendor/grammars/latex.tmbundle"]
 	path = vendor/grammars/latex.tmbundle
 	url = https://github.com/textmate/latex.tmbundle
-[submodule "vendor/grammars/less.tmbundle"]
-	path = vendor/grammars/less.tmbundle
-	url = https://github.com/textmate/less.tmbundle
 [submodule "vendor/grammars/lilypond.tmbundle"]
 	path = vendor/grammars/lilypond.tmbundle
 	url = https://github.com/textmate/lilypond.tmbundle
@@ -397,9 +340,6 @@
 [submodule "vendor/grammars/pascal.tmbundle"]
 	path = vendor/grammars/pascal.tmbundle
 	url = https://github.com/textmate/pascal.tmbundle
-[submodule "vendor/grammars/perl.tmbundle"]
-	path = vendor/grammars/perl.tmbundle
-	url = https://github.com/textmate/perl.tmbundle
 [submodule "vendor/grammars/php-smarty.tmbundle"]
 	path = vendor/grammars/php-smarty.tmbundle
 	url = https://github.com/textmate/php-smarty.tmbundle
@@ -412,24 +352,15 @@
 [submodule "vendor/grammars/processing.tmbundle"]
 	path = vendor/grammars/processing.tmbundle
 	url = https://github.com/textmate/processing.tmbundle
-[submodule "vendor/grammars/prolog.tmbundle"]
-	path = vendor/grammars/prolog.tmbundle
-	url = https://github.com/textmate/prolog.tmbundle
 [submodule "vendor/grammars/python-django.tmbundle"]
 	path = vendor/grammars/python-django.tmbundle
 	url = https://github.com/textmate/python-django.tmbundle
 [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
-[submodule "vendor/grammars/ruby-on-rails-tmbundle"]
-	path = vendor/grammars/ruby-on-rails-tmbundle
-	url = https://github.com/textmate/ruby-on-rails-tmbundle
 [submodule "vendor/grammars/scheme.tmbundle"]
 	path = vendor/grammars/scheme.tmbundle
 	url = https://github.com/textmate/scheme.tmbundle
@@ -448,15 +379,6 @@
 [submodule "vendor/grammars/tcl.tmbundle"]
 	path = vendor/grammars/tcl.tmbundle
 	url = https://github.com/textmate/tcl.tmbundle
-[submodule "vendor/grammars/text.tmbundle"]
-	path = vendor/grammars/text.tmbundle
-	url = https://github.com/textmate/text.tmbundle
-[submodule "vendor/grammars/textile.tmbundle"]
-	path = vendor/grammars/textile.tmbundle
-	url = https://github.com/textmate/textile.tmbundle
-[submodule "vendor/grammars/textmate.tmbundle"]
-	path = vendor/grammars/textmate.tmbundle
-	url = https://github.com/textmate/textmate.tmbundle
 [submodule "vendor/grammars/thrift.tmbundle"]
 	path = vendor/grammars/thrift.tmbundle
 	url = https://github.com/textmate/thrift.tmbundle
@@ -487,13 +409,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/ada.tmbundle"]
-	path = vendor/grammars/ada.tmbundle
-	url = https://github.com/aroben/ada.tmbundle
-	branch = better-with-highlighting
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
@@ -522,15 +437,9 @@
 [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
-[submodule "vendor/grammars/AutoHotkey"]
-	path = vendor/grammars/AutoHotkey
-	url = https://github.com/robertcollier4/AutoHotkey
 [submodule "vendor/grammars/Sublime-HTTP"]
 	path = vendor/grammars/Sublime-HTTP
 	url = https://github.com/httpspec/sublime-highlighting
@@ -555,3 +464,324 @@
 [submodule "vendor/grammars/liquid.tmbundle"]
 	path = vendor/grammars/liquid.tmbundle
 	url = https://github.com/bastilian/validcode-textmate-bundles
+[submodule "vendor/grammars/Modelica"]
+	path = vendor/grammars/Modelica
+	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
+[submodule "vendor/grammars/sublime-golo"]
+	path = vendor/grammars/sublime-golo
+	url = https://github.com/TypeUnsafe/sublime-golo
+[submodule "vendor/grammars/JSyntax"]
+	path = vendor/grammars/JSyntax
+	url = https://github.com/bcj/JSyntax
+[submodule "vendor/grammars/TXL"]
+	path = vendor/grammars/TXL
+	url = https://github.com/MikeHoffert/Sublime-Text-TXL-syntax
+[submodule "vendor/grammars/G-Code"]
+	path = vendor/grammars/G-Code
+	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
+[submodule "vendor/grammars/sublime-text-ox"]
+	path = vendor/grammars/sublime-text-ox
+	url = https://github.com/andreashetland/sublime-text-ox
+[submodule "vendor/grammars/AutoHotkey"]
+	path = vendor/grammars/AutoHotkey
+	url = https://github.com/ahkscript/SublimeAutoHotkey
+[submodule "vendor/grammars/ec.tmbundle"]
+	path = vendor/grammars/ec.tmbundle
+	url = https://github.com/ecere/ec.tmbundle
+[submodule "vendor/grammars/gap-tmbundle"]
+	path = vendor/grammars/gap-tmbundle
+	url = https://github.com/dhowden/gap-tmbundle
+[submodule "vendor/grammars/SublimePapyrus"]
+	path = vendor/grammars/SublimePapyrus
+	url = https://github.com/Kapiainen/SublimePapyrus
+[submodule "vendor/grammars/sublime-spintools"]
+	path = vendor/grammars/sublime-spintools
+	url = https://github.com/bitbased/sublime-spintools
+[submodule "vendor/grammars/PogoScript.tmbundle"]
+	path = vendor/grammars/PogoScript.tmbundle
+	url = https://github.com/featurist/PogoScript.tmbundle
+[submodule "vendor/grammars/sublime-opal"]
+	path = vendor/grammars/sublime-opal
+	url = https://github.com/artifactz/sublime-opal
+[submodule "vendor/grammars/mediawiki.tmbundle"]
+	path = vendor/grammars/mediawiki.tmbundle
+	url = https://github.com/textmate/mediawiki.tmbundle
+[submodule "vendor/grammars/SublimeClarion"]
+	path = vendor/grammars/SublimeClarion
+	url = https://github.com/fushnisoft/SublimeClarion
+[submodule "vendor/grammars/BrightScript.tmbundle"]
+	path = vendor/grammars/BrightScript.tmbundle
+	url = https://github.com/cmink/BrightScript.tmbundle
+[submodule "vendor/grammars/Stylus"]
+	path = vendor/grammars/Stylus
+	url = https://github.com/billymoon/Stylus
+[submodule "vendor/grammars/asciidoc.tmbundle"]
+	path = vendor/grammars/asciidoc.tmbundle
+	url = https://github.com/zuckschwerdt/asciidoc.tmbundle
+[submodule "vendor/grammars/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/sublime-varnish"]
+	path = vendor/grammars/sublime-varnish
+	url = https://github.com/brandonwamboldt/sublime-varnish
+[submodule "vendor/grammars/xc.tmbundle"]
+	path = vendor/grammars/xc.tmbundle
+	url = https://github.com/graymalkin/xc.tmbundle
+[submodule "vendor/grammars/perl.tmbundle"]
+	path = vendor/grammars/perl.tmbundle
+	url = https://github.com/textmate/perl.tmbundle
+[submodule "vendor/grammars/sublime-netlinx"]
+	path = vendor/grammars/sublime-netlinx
+	url = https://github.com/amclain/sublime-netlinx
+[submodule "vendor/grammars/Sublime-Red"]
+	path = vendor/grammars/Sublime-Red
+	url = https://github.com/Oldes/Sublime-Red
+[submodule "vendor/grammars/jflex.tmbundle"]
+	path = vendor/grammars/jflex.tmbundle
+	url = https://github.com/jflex-de/jflex.tmbundle.git
+[submodule "vendor/grammars/Sublime-Modula-2"]
+	path = vendor/grammars/Sublime-Modula-2
+	url = https://github.com/harogaston/Sublime-Modula-2
+[submodule "vendor/grammars/ada.tmbundle"]
+	path = vendor/grammars/ada.tmbundle
+	url = https://github.com/textmate/ada.tmbundle
+[submodule "vendor/grammars/api-blueprint-sublime-plugin"]
+	path = vendor/grammars/api-blueprint-sublime-plugin
+	url = https://github.com/apiaryio/api-blueprint-sublime-plugin
+[submodule "vendor/grammars/Handlebars"]
+	path = vendor/grammars/Handlebars
+	url = https://github.com/daaain/Handlebars
+[submodule "vendor/grammars/smali-sublime"]
+	path = vendor/grammars/smali-sublime
+	url = https://github.com/ShaneWilton/sublime-smali
+[submodule "vendor/grammars/language-jsoniq"]
+	path = vendor/grammars/language-jsoniq
+	url = http://github.com/wcandillon/language-jsoniq
+[submodule "vendor/grammars/atom-fsharp"]
+	path = vendor/grammars/atom-fsharp
+	url = https://github.com/fsprojects/atom-fsharp
+[submodule "vendor/grammars/SMT.tmbundle"]
+	path = vendor/grammars/SMT.tmbundle
+	url = https://github.com/SRI-CSL/SMT.tmbundle.git
+[submodule "vendor/grammars/language-crystal"]
+	path = vendor/grammars/language-crystal
+	url = https://github.com/atom-crystal/language-crystal
+[submodule "vendor/grammars/language-xbase"]
+	path = vendor/grammars/language-xbase
+	url = https://github.com/hernad/atom-language-harbour
+[submodule "vendor/grammars/language-ncl"]
+	path = vendor/grammars/language-ncl
+	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/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
+[submodule "vendor/grammars/vue-syntax-highlight"]
+	path = vendor/grammars/vue-syntax-highlight
+	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile
+[submodule "vendor/grammars/sublimeprolog"]
+	path = vendor/grammars/sublimeprolog
+	url = https://github.com/alnkpa/sublimeprolog
+[submodule "vendor/grammars/sublime-aspectj"]
+	path = vendor/grammars/sublime-aspectj
+	url = https://github.com/pchaigno/sublime-aspectj
+[submodule "vendor/grammars/sublime-typescript"]
+	path = vendor/grammars/sublime-typescript
+	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
+[submodule "vendor/grammars/sublime-pony"]
+	path = vendor/grammars/sublime-pony
+	url = https://github.com/CausalityLtd/sublime-pony
+[submodule "vendor/grammars/X10"]
+	path = vendor/grammars/X10
+	url = https://github.com/x10-lang/x10-highlighting
+[submodule "vendor/grammars/language-babel"]
+	path = vendor/grammars/language-babel
+	url = https://github.com/gandm/language-babel
+[submodule "vendor/grammars/UrWeb-Language-Definition"]
+	path = vendor/grammars/UrWeb-Language-Definition
+	url = https://github.com/gwalborn/UrWeb-Language-Definition.git
+[submodule "vendor/grammars/Stata.tmbundle"]
+	path = vendor/grammars/Stata.tmbundle
+	url = https://github.com/pschumm/Stata.tmbundle
+[submodule "vendor/grammars/FreeMarker.tmbundle"]
+	path = vendor/grammars/FreeMarker.tmbundle
+	url = https://github.com/freemarker/FreeMarker.tmbundle
+[submodule "vendor/grammars/MagicPython"]
+	path = vendor/grammars/MagicPython
+	url = https://github.com/MagicStack/MagicPython
+[submodule "vendor/grammars/language-click"]
+	path = vendor/grammars/language-click
+	url = https://github.com/stenverbois/language-click.git
+[submodule "vendor/grammars/language-maxscript"]
+	path = vendor/grammars/language-maxscript
+	url = https://github.com/Alhadis/language-maxscript
+[submodule "vendor/grammars/language-renpy"]
+	path = vendor/grammars/language-renpy
+	url = https://github.com/williamd1k0/language-renpy.git
+[submodule "vendor/grammars/language-inform7"]
+	path = vendor/grammars/language-inform7
+	url = https://github.com/erkyrath/language-inform7
+[submodule "vendor/grammars/atom-language-stan"]
+	path = vendor/grammars/atom-language-stan
+	url = https://github.com/jrnold/atom-language-stan
+[submodule "vendor/grammars/language-yang"]
+	path = vendor/grammars/language-yang
+	url = https://github.com/DzonyKalafut/language-yang.git
+[submodule "vendor/grammars/perl6fe"]
+	path = vendor/grammars/perl6fe
+	url = https://github.com/MadcapJake/language-perl6fe.git
+[submodule "vendor/grammars/language-less"]
+	path = vendor/grammars/language-less
+	url = https://github.com/atom/language-less.git
+[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
+[submodule "vendor/grammars/language-roff"]
+	path = vendor/grammars/language-roff
+	url = https://github.com/Alhadis/language-roff
+[submodule "vendor/grammars/language-haskell"]
+	path = vendor/grammars/language-haskell
+	url = https://github.com/atom-haskell/language-haskell
+[submodule "vendor/grammars/language-asn1"]
+	path = vendor/grammars/language-asn1
+	url = https://github.com/ajLangley12/language-asn1
+[submodule "vendor/grammars/atom-language-1c-bsl"]
+	path = vendor/grammars/atom-language-1c-bsl
+	url = https://github.com/xDrivenDevelopment/atom-language-1c-bsl.git
+[submodule "vendor/grammars/sublime-rexx"]
+	path = vendor/grammars/sublime-rexx
+	url = https://github.com/mblocker/rexx-sublime
+[submodule "vendor/grammars/blitzmax"]
+	path = vendor/grammars/blitzmax
+	url = https://github.com/textmate/blitzmax.tmbundle
+[submodule "vendor/grammars/cython"]
+	path = vendor/grammars/cython
+	url = https://github.com/textmate/cython.tmbundle
+[submodule "vendor/grammars/forth"]
+	path = vendor/grammars/forth
+	url = https://github.com/textmate/forth.tmbundle
+[submodule "vendor/grammars/parrot"]
+	path = vendor/grammars/parrot
+	url = https://github.com/textmate/parrot.tmbundle
+[submodule "vendor/grammars/secondlife-lsl"]
+	path = vendor/grammars/secondlife-lsl
+	url = https://github.com/textmate/secondlife-lsl.tmbundle
+[submodule "vendor/grammars/vhdl"]
+	path = vendor/grammars/vhdl
+	url = https://github.com/textmate/vhdl.tmbundle
+[submodule "vendor/grammars/xquery"]
+	path = vendor/grammars/xquery
+	url = https://github.com/textmate/xquery.tmbundle

.travis.yml

@@ -1,7 +1,15 @@
+language: ruby
 sudo: false
+addons:
+  apt:
+    packages:
+    - libicu-dev
+    - libicu48
 before_install: script/travis/before_install
+script:
+  - bundle exec rake
+  - script/licensed verify
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2

CONTRIBUTING.md

@@ -1,41 +1,116 @@
-## Contributing
+# Contributing
 
-The majority of contributions won't need to touch any Ruby code at all. The [master language list][languages] is just a YAML configuration file.
+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.
 
-Almost all bug fixes or new language additions should come with some additional code samples. Just drop them under [`samples/`][samples] in the correct subdirectory and our test suite will automatically test them. In most cases you shouldn't need to add any new assertions.
+The majority of contributions won't need to touch any Ruby code at all.
 
-### My code is detected as the wrong language
+## Adding an extension to a language
 
-This can usually be solved either by adding a new filename or file name extension to the language's entry in [`languages.yml`][languages] or adding more [samples][samples] for your language to the repository to make Linguist's classifier smarter.
+We try only to add new extensions once they have some usage on GitHub. In most cases we prefer that extensions be in use in hundreds of repositories before supporting them in Linguist.
 
-### Syntax highlighting looks wrong
+To add support for a new extension:
 
-Assuming your code is being detected as the right language (see above), in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
+0. Add your extension to the language entry in [`languages.yml`][languages], keeping the extensions in alphabetical order.
+0. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
+0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
 
-You can also try to fix the bug yourself and submit a Pull Request. [This piece from TextMate's documentation](http://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://lightshow.githubapp.com).
+In addition, if this extension is already listed in [`languages.yml`][languages] then sometimes a few more steps will need to be taken:
 
-Once the bug has been fixed upstream, please let us know and we'll pick it up for GitHub.
+0. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
 
-### I want to add support for the `X` programming language
 
-Great! You'll need to:
+## Adding a language
+
+We try only to add languages once they have some usage on GitHub. In most cases we prefer that each new file extension be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new language:
 
 0. Add an entry for your language to [`languages.yml`][languages].
-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. Add samples for your language to the [samples directory][samples].
+0. Add a grammar for your language. Please only add grammars that have [one of these licenses](https://github.com/github/linguist/blob/257425141d4e2a5232786bf0b13c901ada075f93/vendor/licenses/config.yml#L2-L11).
+  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.
 
 In addition, if your new language defines an extension that's already listed in [`languages.yml`][languages] (such as `.foo`) then sometimes a few more steps will need to be taken:
 
-0. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`. 
+0. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`.
 0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.foo` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
 0. If the Bayesian classifier does a bad job with the sample `.foo` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
 
 Remember, the goal here is to try and avoid false positives!
 
-We try only to add languages once they have some usage on GitHub, so please note in-the-wild usage examples in your pull request. In most cases we prefer that languages already be in use in hundreds of repositories before supporting them in Linguist.
+
+## Fixing a misclassified language
+
+Most languages are detected by their file extension defined in [languages.yml][languages].  For disambiguating between files with common extensions, linguist applies some [heuristics](/lib/linguist/heuristics.rb) and a [statistical classifier](lib/linguist/classifier.rb). This process can help differentiate between, for example, `.h` files which could be either C, C++, or Obj-C.
+
+Misclassifications can often be solved by either adding a new filename or extension for the language or adding more [samples][samples] to make the classifier smarter.
+
+
+## Fixing syntax highlighting
+
+Syntax highlighting in GitHub is performed using TextMate-compatible grammars. These are the same grammars that TextMate, Sublime Text and Atom use. Every language in [languages.yml][languages] is mapped to its corresponding TM `scope`. This scope will be used when picking up a grammar for highlighting.
+
+Assuming your code is being detected as the right language, in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
+
+You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](https://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://github-lightshow.herokuapp.com).
+
+Once the bug has been fixed upstream, we'll pick it up for GitHub in the next release of Linguist.
+
+## Testing
+
+For development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
+
+    git clone https://github.com/github/linguist.git
+    cd linguist/
+    script/bootstrap
+
+To run the tests:
+
+    bundle exec rake test
+
+Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](https://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
+
+Here's our current build status: [![Build Status](https://api.travis-ci.org/github/linguist.svg?branch=master)](https://travis-ci.org/github/linguist)
+
+## Maintainers
+
+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:
+
+0. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
+0. Make sure your local dependencies are up to date: `script/bootstrap`
+0. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
+0. Ensure that samples are updated: `bundle exec rake samples`
+0. Ensure that tests are green: `bundle exec rake test`
+0. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
+0. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
+0. Build a local gem: `bundle exec rake build_gem`
+0. Test the gem:
+  0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
+  0. Install the new gem locally
+  0. Test behavior locally, branch deploy, whatever needs to happen
+0. Merge github/linguist PR
+0. Tag and push: `git tag vx.xx.xx; git push --tags`
+0. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`
 
 [grammars]: /grammars.yml
 [languages]: /lib/linguist/languages.yml
 [samples]: /samples
+[new-issue]: https://github.com/github/linguist/issues/new

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gemspec :name => "github-linguist"
-gemspec :name => "github-linguist-grammars"
 gem 'byebug' if RUBY_VERSION >= '2.0'

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 GitHub, Inc.
+Copyright (c) 2011-2016 GitHub, Inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -1,45 +1,95 @@
 # Linguist
 
-We use this library at GitHub to detect blob languages, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.
+[issues]: https://github.com/github/linguist/issues
+[new-issue]: https://github.com/github/linguist/issues/new
 
-Tips for filing issues and creating pull requests can be found in [`CONTRIBUTING.md`](/CONTRIBUTING.md).
+This library is used on GitHub.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs.
 
-## Features
+See [Troubleshooting](#troubleshooting) and [`CONTRIBUTING.md`](/CONTRIBUTING.md) before filing an issue or creating a pull request.
 
-### Language detection
+## Troubleshooting
 
-Linguist defines a list of all languages known to GitHub in a [yaml file](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
+### My repository is detected as the wrong language
 
-Most languages are detected by their file extension. For disambiguating between files with common extensions, we first apply some common-sense heuristics to pick out obvious languages. After that, we use a
-[statistical
-classifier](https://github.com/github/linguist/blob/master/lib/linguist/classifier.rb).
-This process can help us tell the difference between, for example, `.h` files which could be either C, C++, or Obj-C.
+![language stats bar](https://cloud.githubusercontent.com/assets/173/5562290/48e24654-8ddf-11e4-8fe7-735b0ce3a0d3.png)
 
-```ruby
+The Language stats bar displays languages percentages for the files in the repository. The percentages are calculated based on the bytes of code for each language as reported by the [List Languages](https://developer.github.com/v3/repos/#list-languages) API. If the bar is reporting a language that you don't expect:
 
-Linguist::FileBlob.new("lib/linguist.rb").language.name #=> "Ruby"
+0. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
+0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
+0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you can add, especially links to public repositories, is helpful.
+0. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.
 
-Linguist::FileBlob.new("bin/linguist").language.name #=> "Ruby"
+## Overrides
+
+Linguist supports a number of different custom overrides strategies for language definitions and vendored paths.
+
+### Using gitattributes
+
+Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, and `linguist-vendored`. `.gitattributes` will be used to determine language statistics, but will not be used to syntax highlight files. To manually set syntax highlighting, use [Vim or Emacs modelines](#using-emacs-or-vim-modelines).
+
+```
+$ cat .gitattributes
+*.rb linguist-language=Java
 ```
 
-See [lib/linguist/language.rb](https://github.com/github/linguist/blob/master/lib/linguist/language.rb) and [lib/linguist/languages.yml](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
+Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository.
 
-### Syntax Highlighting
+Use the `linguist-vendored` attribute to vendor or un-vendor paths.
 
-Syntax highlighting in GitHub is performed using TextMate-compatible grammars. These are the same grammars that TextMate, Sublime Text and Atom use.
+```
+$ cat .gitattributes
+special-vendored-path/* linguist-vendored
+jquery.js linguist-vendored=false
+```
 
-Every language in `languages.yml` is mapped to its corresponding TM `scope`. This scope will be used when picking up a grammar for highlighting. **When adding a new language to Linguist, please add its corresponding scope too (assuming there's an existing TextMate bundle, Sublime Text package, or Atom package) so syntax highlighting works for it**.
+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.
 
-### Stats
+Use the `linguist-documentation` attribute to mark or unmark paths as documentation.
 
-The Language stats bar that you see on every repository is built by aggregating the languages of each file in that repository. The top language in the graph determines the project's primary language.
+```
+$ cat .gitattributes
+project-docs/* linguist-documentation
+docs/formatter.rb linguist-documentation=false
+```
 
-The repository stats API, accessed through `#languages`, can be used on a directory:
+#### Generated file detection
 
-***API UPDATE***
+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.
 
-Since [Version 3.0.0](https://github.com/github/linguist/releases/tag/v3.0.0) Linguist expects a git repository (in the form of a [Rugged::Repository](https://github.com/libgit2/rugged#repositories)) to be passed when initializing `Linguist::Repository`.
+```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
+
+##### Vim
+```
+# Some examples of various styles:
+vim: syntax=java
+vim: set syntax=ruby:
+vim: set filetype=prolog:
+vim: set ft=cpp:
+```
+
+##### Emacs
+```
+-*- mode: php;-*-
+```
+
+## Usage
+
+Install the gem:
+
+```
+$ gem install github-linguist
+```
+
+Then use it in your application:
 
 ```ruby
 require 'rugged'
@@ -51,147 +101,32 @@ project.language       #=> "Ruby"
 project.languages      #=> { "Ruby" => 119387 }
 ```
 
-These stats are also printed out by the `linguist` binary. You can use the
+These stats are also printed out by the `linguist` executable. You can use the
 `--breakdown` flag, and the binary will also output the breakdown of files by language.
 
 You can try running `linguist` on the root directory in this repository itself:
 
-    $ bundle exec linguist --breakdown
+```
+$ bundle exec linguist --breakdown
 
-    100.00% Ruby
+100.00% Ruby
 
-    Ruby:
-    Gemfile
-    Rakefile
-    bin/linguist
-    github-linguist.gemspec
-    lib/linguist.rb
-    lib/linguist/blob_helper.rb
-    lib/linguist/classifier.rb
-    lib/linguist/file_blob.rb
-    lib/linguist/generated.rb
-    lib/linguist/heuristics.rb
-    lib/linguist/language.rb
-    lib/linguist/lazy_blob.rb
-    lib/linguist/md5.rb
-    lib/linguist/repository.rb
-    lib/linguist/samples.rb
-    lib/linguist/tokenizer.rb
-    lib/linguist/version.rb
-    test/test_blob.rb
-    test/test_classifier.rb
-    test/test_heuristics.rb
-    test/test_language.rb
-    test/test_md5.rb
-    test/test_pedantic.rb
-    test/test_repository.rb
-    test/test_samples.rb
-    test/test_tokenizer.rb
-
-#### Ignore vendored files
-
-Checking other code into your git repo is a common practice. But this often inflates your project's language stats and may even cause your project to be labeled as another language. We are able to identify some of these files and directories and exclude them.
-
-```ruby
-Linguist::FileBlob.new("vendor/plugins/foo.rb").vendored? # => true
+Ruby:
+Gemfile
+Rakefile
+bin/linguist
+github-linguist.gemspec
+lib/linguist.rb
+…
 ```
 
-See [Linguist::BlobHelper#vendored?](https://github.com/github/linguist/blob/master/lib/linguist/blob_helper.rb) and [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml).
+## Contributing
 
-#### Generated file detection
+Please check out our [contributing guidelines](CONTRIBUTING.md).
 
-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 extra bonus, these files are suppressed in diffs.
+## License
 
-```ruby
-Linguist::FileBlob.new("underscore.min.js").generated? # => true
-```
+The language grammars included in this gem are covered by their repositories'
+respective licenses. `grammars.yml` specifies the repository for each grammar.
 
-See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/master/lib/linguist/generated.rb).
-
-## Overrides
-
-Linguist supports custom overrides for language definitions and vendored paths. Add a `.gitattributes` file to your project using the keys `linguist-language` and `linguist-vendored` with the standard git-style path matchers for the files you want to override.
-
-Please note that the overrides currently only affect the language statistics for a repository and not the syntax-highlighting of files.
-
-```
-$ cat .gitattributes
-*.rb linguist-language=Java
-
-$ linguist --breakdown
-100.00% Java
-
-Java:
-ruby_file.rb
-```
-
-By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository. Use the `linguist-vendored` attribute to vendor or un-vendor paths.
-
-```
-$ cat .gitattributes
-special-vendored-path/* linguist-vendored
-jquery.js linguist-vendored=false
-```
-
-## Installation
-
-Github.com is usually running the latest version of the `github-linguist` gem that is released on [RubyGems.org](http://rubygems.org/gems/github-linguist).
-
-But for development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
-
-    git clone https://github.com/github/linguist.git
-    cd linguist/
-    script/bootstrap
-
-To run the tests:
-
-    bundle exec rake test
-
-### A note on language extensions
-
-Linguist has a number of methods available to it for identifying the language of a particular file. The initial lookup is based upon the extension of the file, possible file extensions are defined in an array called `extensions`. Take a look at this example for example for `Perl`:
-
-```
-Perl:
-  type: programming
-  ace_mode: perl
-  color: "#0298c3"
-  extensions:
-  - .pl
-  - .PL
-  - .perl
-  - .ph
-  - .plx
-  - .pm
-  - .pod
-  - .psgi
-  interpreters:
-  - perl
-```
-Any of the extensions defined are valid but the first in this array should be the most popular.
-
-### Testing
-
-Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](http://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
-
-Here's our current build status, which is hopefully green: [![Build Status](https://secure.travis-ci.org/github/linguist.png?branch=master)](http://travis-ci.org/github/linguist)
-
-### Releasing
-
-If you are the current maintainer of this gem:
-
- 0. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
- 0. Make sure your local dependencies are up to date: `script/bootstrap`
- 0. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
- 0. Ensure that samples are updated: `bundle exec rake samples`
- 0. Ensure that tests are green: `bundle exec rake test`
- 0. Bump gem version in `lib/linguist/version.rb`.  For example, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
- 0. Make a PR to github/linguist.  For example, [#1238](https://github.com/github/linguist/pull/1238).
- 0. Build a local gem: `bundle exec rake build_gem`
- 0. Testing:
-   0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
-   0. Install the new gem locally
-   0. Test behavior locally, branch deploy, whatever needs to happen
- 0. Merge github/linguist PR
- 0. Tag and push: `git tag vx.xx.xx; git push --tags`
- 0. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`
+All other files are covered by the MIT license, see `LICENSE`.

Rakefile

@@ -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"
 
@@ -62,7 +58,7 @@ namespace :benchmark do
 
     corpus = File.expand_path(ENV["CORPUS"] || "samples")
 
-    require 'linguist/language'
+    require 'linguist'
 
     results = Hash.new
     Dir.glob("#{corpus}/**/*").each do |file|

bin/git-linguist

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

bin/linguist

@@ -2,10 +2,8 @@
 
 # linguist — detect language type for a file, or, given a directory, determine language breakdown
 #     usage: linguist <path> [<--breakdown>]
-
-require 'linguist/file_blob'
-require 'linguist/language'
-require 'linguist/repository'
+#
+require 'linguist'
 require 'rugged'
 
 path = ARGV[0] || Dir.pwd

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

github-linguist.gemspec

@@ -10,17 +10,22 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/linguist"
   s.license  = "MIT"
 
-  s.files = Dir['lib/**/*'] - ['lib/linguist/grammars.rb']
-  s.executables << 'linguist'
+  s.files = Dir['lib/**/*'] + Dir['grammars/*'] + ['LICENSE']
+  s.executables = ['linguist', 'git-linguist']
 
   s.add_dependency 'charlock_holmes', '~> 0.7.3'
-  s.add_dependency 'escape_utils',    '~> 1.0.1'
+  s.add_dependency 'escape_utils',    '~> 1.1.0'
   s.add_dependency 'mime-types',      '>= 1.19'
-  s.add_dependency 'rugged',          '~> 0.22.0b4'
+  s.add_dependency 'rugged',          '>= 0.23.0b'
 
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency '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 'licensed'
+  s.add_development_dependency 'licensee', '>= 8.3.0'
+
 end

grammars.yml

@@ -1,31 +1,18 @@
 ---
 http://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage:
 - text.xml.genshi
-http://svn.textmate.org/trunk/Review/Bundles/BlitzMax.tmbundle:
-- source.blitzmax
-http://svn.textmate.org/trunk/Review/Bundles/Cython.tmbundle:
-- source.cython
-http://svn.textmate.org/trunk/Review/Bundles/Forth.tmbundle:
-- source.forth
-http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
-- source.parrot.pir
-http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
-- source.lsl
-http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
-- source.vhdl
-http://svn.textmate.org/trunk/Review/Bundles/XQuery.tmbundle:
-- source.xquery
 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:
 - source.alloy
-vendor/grammars/AutoHotkey:
+vendor/grammars/AutoHotkey/:
 - source.ahk
+vendor/grammars/BrightScript.tmbundle/:
+- source.brightauthorproject
+- source.brightscript
 vendor/grammars/ColdFusion:
 - source.cfscript
 - source.cfscript.cfc
@@ -33,8 +20,16 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm.tmLanguage:
+vendor/grammars/Elm/:
 - source.elm
+vendor/grammars/FreeMarker.tmbundle:
+- text.html.ftl
+vendor/grammars/G-Code/:
+- source.LS
+- source.MCPOST
+- source.MOD
+- source.apt
+- source.gcode
 vendor/grammars/Handlebars:
 - text.html.handlebars
 vendor/grammars/IDL-Syntax:
@@ -42,10 +37,19 @@ vendor/grammars/IDL-Syntax:
 vendor/grammars/Isabelle.tmbundle:
 - source.isabelle.root
 - source.isabelle.theory
+vendor/grammars/JSyntax/:
+- source.j
 vendor/grammars/Julia.tmbundle:
 - source.julia
+vendor/grammars/Lean.tmbundle:
+- source.lean
 vendor/grammars/LiveScript.tmbundle:
 - source.livescript
+vendor/grammars/MagicPython:
+- source.python
+- source.regexp.python
+vendor/grammars/Modelica/:
+- source.modelica
 vendor/grammars/NSIS:
 - source.nsis
 vendor/grammars/NimLime:
@@ -54,54 +58,80 @@ vendor/grammars/NimLime:
 - source.nimcfg
 vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
+vendor/grammars/PogoScript.tmbundle/:
+- source.pogoscript
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
 vendor/grammars/Racket:
 - source.racket
 vendor/grammars/SCSS.tmbundle:
 - source.scss
+vendor/grammars/SMT.tmbundle:
+- source.smt
 vendor/grammars/Scalate.tmbundle:
 - source.scaml
 - text.html.ssp
 vendor/grammars/Slash.tmbundle:
 - text.html.slash
-vendor/grammars/Stata.tmbundle:
+vendor/grammars/Stata.tmbundle/:
 - source.mata
 - source.stata
+vendor/grammars/Stylus/:
+- source.stylus
 vendor/grammars/Sublime-Coq:
 - source.coq
 vendor/grammars/Sublime-HTTP:
 - source.httpspec
-vendor/grammars/Sublime-Inform:
-- source.Inform7
 vendor/grammars/Sublime-Lasso:
 - file.lasso
-vendor/grammars/Sublime-Logos:
-- source.logos
 vendor/grammars/Sublime-Loom:
 - source.loomscript
+vendor/grammars/Sublime-Modula-2/:
+- source.modula2
 vendor/grammars/Sublime-Nit:
 - source.nit
 vendor/grammars/Sublime-QML:
 - source.qml
 vendor/grammars/Sublime-REBOL:
 - source.rebol
+vendor/grammars/Sublime-Red:
+- source.red
 vendor/grammars/Sublime-SQF-Language:
 - source.sqf
 vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
 - source.abl
+- text.html.abl
 vendor/grammars/Sublime-VimL:
 - source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
+vendor/grammars/SublimeClarion/:
+- source.clarion
+vendor/grammars/SublimeGDB/:
+- source.disasm
+- source.gdb
+- source.gdb.session
+- source.gdbregs
+vendor/grammars/SublimePapyrus/:
+- 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:
 - source.gosu.2
+vendor/grammars/UrWeb-Language-Definition:
+- source.ur
 vendor/grammars/VBDotNetSyntax:
 - source.vbnet
 vendor/grammars/Vala-TMBundle:
 - source.vala
+vendor/grammars/X10:
+- source.x10
 vendor/grammars/abap.tmbundle:
 - source.abap
 vendor/grammars/actionscript3-tmbundle:
@@ -110,6 +140,8 @@ vendor/grammars/actionscript3-tmbundle:
 - text.xml.flex-config
 vendor/grammars/ada.tmbundle:
 - source.ada
+vendor/grammars/ampl:
+- source.ampl
 vendor/grammars/ant.tmbundle:
 - text.xml.ant
 vendor/grammars/antlr.tmbundle:
@@ -117,24 +149,50 @@ vendor/grammars/antlr.tmbundle:
 vendor/grammars/apache.tmbundle:
 - source.apache-config
 - source.apache-config.mod_perl
+vendor/grammars/api-blueprint-sublime-plugin/:
+- text.html.markdown.source.gfm.apib
+- text.html.markdown.source.gfm.mson
 vendor/grammars/applescript.tmbundle:
 - source.applescript
+vendor/grammars/asciidoc.tmbundle/:
+- text.html.asciidoc
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly.tmbundle:
+vendor/grammars/assembly/:
 - objdump.x86asm
 - source.x86asm
+vendor/grammars/atom-fsharp/:
+- source.fsharp
+- source.fsharp.fsi
+- source.fsharp.fsl
+- source.fsharp.fsx
+vendor/grammars/atom-language-1c-bsl:
+- source.bsl
+- source.sdbl
+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/autoitv3-tmbundle:
-- source.autoit.3
+vendor/grammars/atomic-dreams/:
+- source.dm
+- source.dmf
+vendor/grammars/ats:
+- source.ats
 vendor/grammars/awk-sublime:
 - source.awk
 vendor/grammars/bison.tmbundle:
 - source.bison
-vendor/grammars/boo-sublime:
+vendor/grammars/blitzmax:
+- source.blitzmax
+vendor/grammars/boo/:
 - source.boo
 vendor/grammars/bro-sublime:
 - source.bro
@@ -159,16 +217,21 @@ 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:
 - source.ruby.rspec.cucumber.steps
 - text.gherkin.feature
+vendor/grammars/cython:
+- source.cython
 vendor/grammars/d.tmbundle:
 - source.d
 vendor/grammars/dart-sublime-bundle:
 - source.dart
 - source.pubspec
+- text.dart-analysis-output
 - text.dart-doccomments
 vendor/grammars/desktop.tmbundle:
 - source.desktop
@@ -180,8 +243,12 @@ vendor/grammars/dylan.tmbundle:
 - source.makegen
 vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
 - source.dosbatch
+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
@@ -196,26 +263,29 @@ vendor/grammars/fancy-tmbundle:
 - source.fancy
 vendor/grammars/fish-tmbundle:
 - source.fish
+vendor/grammars/forth:
+- source.forth
 vendor/grammars/fortran.tmbundle:
 - source.fortran
 - source.fortran.modern
-vendor/grammars/fsharpbinding:
-- source.fsharp
+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:
+- source.grace
 vendor/grammars/gradle.tmbundle:
 - source.groovy.gradle
 vendor/grammars/graphviz.tmbundle:
 - source.dot
 vendor/grammars/groovy.tmbundle:
 - source.groovy
-vendor/grammars/haskell.tmbundle:
-- source.haskell
-- text.tex.latex.haskell
 vendor/grammars/haxe-sublime-bundle:
 - source.erazor
 - source.haxe.2
@@ -228,6 +298,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:
@@ -235,8 +307,8 @@ vendor/grammars/io.tmbundle:
 vendor/grammars/ioke-outdated:
 - source.ioke
 vendor/grammars/jade-tmbundle:
-- source.jade
 - source.pyjade
+- text.jade
 vendor/grammars/jasmin-sublime:
 - source.jasmin
 vendor/grammars/java.tmbundle:
@@ -244,42 +316,106 @@ vendor/grammars/java.tmbundle:
 - source.java-properties
 - text.html.jsp
 - text.junit-test-report
-vendor/grammars/javadoc.tmbundle:
-- text.html.javadoc
 vendor/grammars/javascript-objective-j.tmbundle:
 - source.js.objj
-vendor/grammars/jquery-tmbundle:
-- source.js.jquery
+vendor/grammars/jflex.tmbundle:
+- source.jflex
 vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-agc:
+- source.agc
+vendor/grammars/language-apl:
+- source.apl
+vendor/grammars/language-asn1:
+- source.asn
+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:
 - source.clojure
 vendor/grammars/language-coffee-script:
 - source.coffee
 - 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-haskell:
+- hint.haskell
+- hint.message.haskell
+- hint.type.haskell
+- source.c2hs
+- source.cabal
+- source.haskell
+- source.hsc2hs
+- text.tex.latex.haskell
 vendor/grammars/language-hy:
 - source.hy
+vendor/grammars/language-inform7:
+- source.inform7
 vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
+- source.js.regexp.replacement
+vendor/grammars/language-jsoniq/:
+- source.jq
+- source.xq
+vendor/grammars/language-less/:
+- source.css.less
+vendor/grammars/language-maxscript:
+- source.maxscript
+vendor/grammars/language-ncl:
+- source.ncl
+vendor/grammars/language-povray:
+- source.pov-ray sdl
 vendor/grammars/language-python:
-- source.python
-- source.regexp.python
 - text.python.console
 - text.python.traceback
+vendor/grammars/language-renpy:
+- source.renpy
+vendor/grammars/language-restructuredtext:
+- text.restructuredtext
+vendor/grammars/language-roff:
+- source.ideal
+- source.pic
+- text.roff
+- text.runoff
 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:
 - source.yaml
+vendor/grammars/language-yang/:
+- source.yang
 vendor/grammars/latex.tmbundle:
 - text.bibtex
 - text.log.latex
@@ -287,8 +423,6 @@ vendor/grammars/latex.tmbundle:
 - text.tex.latex
 - text.tex.latex.beamer
 - text.tex.latex.memoir
-vendor/grammars/less.tmbundle:
-- source.css.less
 vendor/grammars/lilypond.tmbundle:
 - source.lilypond
 vendor/grammars/liquid.tmbundle:
@@ -297,6 +431,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:
@@ -312,18 +448,24 @@ vendor/grammars/matlab.tmbundle:
 - source.octave
 vendor/grammars/maven.tmbundle:
 - text.xml.pom
+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++
@@ -340,14 +482,25 @@ vendor/grammars/opa.tmbundle:
 - source.opa
 vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
+vendor/grammars/parrot:
+- source.parrot.pir
 vendor/grammars/pascal.tmbundle:
 - source.pascal
-vendor/grammars/perl.tmbundle:
+vendor/grammars/pawn-sublime-language/:
+- source.pawn
+vendor/grammars/perl.tmbundle/:
 - source.perl
+- source.perl.6
+vendor/grammars/perl6fe:
+- source.meta-info
+- source.perl6fe
+- source.regexp.perl6fe
 vendor/grammars/php-smarty.tmbundle:
-- source.smarty
+- text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
+vendor/grammars/pig-latin/:
+- source.pig_latin
 vendor/grammars/pike-textmate:
 - source.pike
 vendor/grammars/postscript.tmbundle:
@@ -356,28 +509,16 @@ vendor/grammars/powershell:
 - source.powershell
 vendor/grammars/processing.tmbundle:
 - source.processing
-vendor/grammars/prolog.tmbundle:
-- source.prolog
 vendor/grammars/protobuf-tmbundle:
 - source.protobuf
-vendor/grammars/puppet-textmate-bundle:
-- 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-on-rails-tmbundle:
-- source.js.erb.rails
-- source.ruby.rails
-- source.ruby.rails.rjs
-- source.sql.ruby
-- text.html.erb.rails
 vendor/grammars/ruby-slim.tmbundle:
 - text.slim
 vendor/grammars/ruby.tmbundle:
@@ -395,49 +536,82 @@ vendor/grammars/scheme.tmbundle:
 - source.scheme
 vendor/grammars/scilab.tmbundle:
 - source.scilab
+vendor/grammars/secondlife-lsl:
+- source.lsl
+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:
+- text.zone_file
 vendor/grammars/standard-ml.tmbundle:
 - source.cm
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
+vendor/grammars/sublime-aspectj/:
+- source.aspectj
+vendor/grammars/sublime-autoit/:
+- source.autoit
 vendor/grammars/sublime-befunge:
 - source.befunge
-vendor/grammars/sublime-better-typescript:
-- source.ts
 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-idris:
-- source.idris
+vendor/grammars/sublime-golo/:
+- source.golo
 vendor/grammars/sublime-mask:
 - source.mask
+vendor/grammars/sublime-netlinx:
+- source.netlinx
+- source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
-vendor/grammars/sublime-nix:
-- source.nix
+vendor/grammars/sublime-opal/:
+- source.opal
+- source.opalsysdefs
+vendor/grammars/sublime-pony:
+- source.pony
+vendor/grammars/sublime-rexx/:
+- source.rexx
 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-typescript/:
+- source.ts
+- source.tsx
+vendor/grammars/sublime-varnish:
+- source.varnish.vcl
 vendor/grammars/sublime_cobol:
 - source.acucobol
 - source.cobol
+- source.jcl
 - source.opencobol
-vendor/grammars/sublime_man_page_support:
-- source.man
-- text.groff
+vendor/grammars/sublimeassembly/:
+- source.assembly
+vendor/grammars/sublimeprolog/:
+- source.prolog
+- source.prolog.eclipse
 vendor/grammars/sublimetext-cuda-cpp:
 - source.cuda-c++
 vendor/grammars/swift.tmbundle:
@@ -445,13 +619,6 @@ vendor/grammars/swift.tmbundle:
 vendor/grammars/tcl.tmbundle:
 - source.tcl
 - text.html.tcl
-vendor/grammars/text.tmbundle:
-- text.plain
-vendor/grammars/textile.tmbundle:
-- text.html.textile
-vendor/grammars/textmate.tmbundle:
-- source.regexp.oniguruma
-- source.tm-properties
 vendor/grammars/thrift.tmbundle:
 - source.thrift
 vendor/grammars/toml.tmbundle:
@@ -461,10 +628,16 @@ vendor/grammars/turtle.tmbundle:
 - source.turtle
 vendor/grammars/verilog.tmbundle:
 - source.verilog
-vendor/grammars/x86-assembly-textmate-bundle:
-- source.asm.x86
+vendor/grammars/vhdl:
+- source.vhdl
+vendor/grammars/vue-syntax-highlight:
+- text.html.vue
+vendor/grammars/xc.tmbundle/:
+- source.xc
 vendor/grammars/xml.tmbundle:
 - text.xml
 - text.xml.xsl
+vendor/grammars/xquery:
+- source.xquery
 vendor/grammars/zephir-sublime:
 - source.php.zephir

lib/linguist.rb

@@ -1,8 +1,99 @@
 require 'linguist/blob_helper'
 require 'linguist/generated'
+require 'linguist/grammars'
 require 'linguist/heuristics'
 require 'linguist/language'
 require 'linguist/repository'
 require 'linguist/samples'
 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)
+    elsif block_given?
+      yield
+    end
+  end
+
+end

lib/linguist/blob.rb

@@ -0,0 +1,73 @@
+require 'linguist/blob_helper'
+
+module Linguist
+  # A Blob is a wrapper around the content of a file to make it quack
+  # like a Grit::Blob. It provides the basic interface: `name`,
+  # `data`, `path` and `size`.
+  class Blob
+    include BlobHelper
+
+    # Public: Initialize a new Blob.
+    #
+    # path    - A path String (does not necessarily exists on the file system).
+    # content - Content of the file.
+    #
+    # Returns a Blob.
+    def initialize(path, content)
+      @path = path
+      @content = content
+    end
+
+    # Public: Filename
+    #
+    # Examples
+    #
+    #   Blob.new("/path/to/linguist/lib/linguist.rb", "").path
+    #   # =>  "/path/to/linguist/lib/linguist.rb"
+    #
+    # Returns a String
+    attr_reader :path
+
+    # Public: File name
+    #
+    # Returns a String
+    def name
+      File.basename(@path)
+    end
+
+    # Public: File contents.
+    #
+    # Returns a String.
+    def data
+      @content
+    end
+
+    # Public: Get byte size
+    #
+    # Returns an Integer.
+    def size
+      @content.bytesize
+    end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      extensions.last || ""
+    end
+
+    # Public: Return an array of the file extensions
+    #
+    #     >> Linguist::Blob.new("app/views/things/index.html.erb").extensions
+    #     => [".html.erb", ".erb"]
+    #
+    # Returns an Array
+    def extensions
+      _, *segments = name.downcase.split(".")
+
+      segments.map.with_index do |segment, index|
+        "." + segments[index..-1].join(".")
+      end
+    end
+  end
+end

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.
@@ -99,7 +99,7 @@ module Linguist
       elsif name.nil?
         "attachment"
       else
-        "attachment; filename=#{EscapeUtils.escape_url(File.basename(name))}"
+        "attachment; filename=#{EscapeUtils.escape_url(name)}"
       end
     end
 
@@ -233,7 +233,22 @@ module Linguist
     #
     # Return true or false
     def vendored?
-      name =~ VendoredRegexp ? true : false
+      path =~ VendoredRegexp ? true : false
+    end
+
+    documentation_paths = YAML.load_file(File.expand_path("../documentation.yml", __FILE__))
+    DocumentationRegexp = Regexp.new(documentation_paths.join('|'))
+
+    # Public: Is the blob in a documentation directory?
+    #
+    # Documentation files are ignored by language statistics.
+    #
+    # See "documentation.yml" for a list of documentation conventions that match
+    # this pattern.
+    #
+    # Return true or false
+    def documentation?
+      path =~ DocumentationRegexp ? true : false
     end
 
     # Public: Get each line of data
@@ -301,7 +316,7 @@ module Linguist
     #
     # Return true or false
     def generated?
-      @_generated ||= Generated.generated?(name, lambda { data })
+      @_generated ||= Generated.generated?(path, lambda { data })
     end
 
     # Public: Detects the Language of the blob.
@@ -310,12 +325,22 @@ 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
     def tm_scope
       language && language.tm_scope
     end
+
+    DETECTABLE_TYPES = [:programming, :markup].freeze
+
+    # Internal: Should this blob be included in repository language statistics?
+    def include_in_language_stats?
+      !vendored? &&
+      !documentation? &&
+      !generated? &&
+      language && DETECTABLE_TYPES.include?(language.type)
+    end
   end
 end

lib/linguist/documentation.yml

@@ -0,0 +1,30 @@
+# Documentation files and directories are excluded from language
+# statistics.
+#
+# Lines in this file are Regexps that are matched against the file
+# pathname.
+#
+# Please add additional test coverage to
+# `test/test_blob.rb#test_documentation` if you make any changes.
+
+## Documentation directories ##
+
+- ^docs?/
+- (^|/)[Dd]ocumentation/
+- (^|/)javadoc/
+- ^man/
+- ^[Ee]xamples/
+
+## Documentation files ##
+
+- (^|/)CHANGE(S|LOG)?(\.|$)
+- (^|/)CONTRIBUTING(\.|$)
+- (^|/)COPYING(\.|$)
+- (^|/)INSTALL(\.|$)
+- (^|/)LICEN[CS]E(\.|$)
+- (^|/)[Ll]icen[cs]e(\.|$)
+- (^|/)README(\.|$)
+- (^|/)[Rr]eadme(\.|$)
+
+# Samples folders
+- ^[Ss]amples/

lib/linguist/file_blob.rb

@@ -1,10 +1,11 @@
 require 'linguist/blob_helper'
+require 'linguist/blob'
 
 module Linguist
   # A FileBlob is a wrapper around a File object to make it quack
   # like a Grit::Blob. It provides the basic interface: `name`,
-  # `data`, and `size`.
-  class FileBlob
+  # `data`, `path` and `size`.
+  class FileBlob < Blob
     include BlobHelper
 
     # Public: Initialize a new FileBlob from a path
@@ -14,64 +15,29 @@ module Linguist
     #
     # Returns a FileBlob.
     def initialize(path, base_path = nil)
-      @path = path
-      @name = base_path ? path.sub("#{base_path}/", '') : path
+      @fullpath = path
+      @path = base_path ? path.sub("#{base_path}/", '') : path
     end
 
-    # Public: Filename
-    #
-    # Examples
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").name
-    #   # =>  "/path/to/linguist/lib/linguist.rb"
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb",
-    #                "/path/to/linguist").name
-    #   # =>  "lib/linguist.rb"
-    #
-    # Returns a String
-    attr_reader :name
-
     # Public: Read file permissions
     #
     # Returns a String like '100644'
     def mode
-      File.stat(@path).mode.to_s(8)
+      File.stat(@fullpath).mode.to_s(8)
     end
 
     # Public: Read file contents.
     #
     # Returns a String.
     def data
-      File.read(@path)
+      File.read(@fullpath)
     end
 
     # Public: Get byte size
     #
     # Returns an Integer.
     def size
-      File.size(@path)
-    end
-
-    # Public: Get file extension.
-    #
-    # Returns a String.
-    def extension
-      extensions.last || ""
-    end
-
-    # Public: Return an array of the file extensions
-    #
-    #     >> Linguist::FileBlob.new("app/views/things/index.html.erb").extensions
-    #     => [".html.erb", ".erb"]
-    #
-    # Returns an Array
-    def extensions
-      basename, *segments = File.basename(name).split(".")
-
-      segments.map.with_index do |segment, index|
-        "." + segments[index..-1].join(".")
-      end
+      File.size(@fullpath)
     end
   end
 end

lib/linguist/generated.rb

@@ -53,18 +53,30 @@ module Linguist
     def generated?
       xcode_file? ||
       generated_net_designer_file? ||
+      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? ||
       generated_net_docfile? ||
       generated_postscript? ||
+      compiled_cython_file? ||
+      generated_go? ||
       generated_protocol_buffer? ||
+      generated_apache_thrift? ||
       generated_jni_header? ||
-      vcr_cassette?
+      vcr_cassette? ||
+      generated_module? ||
+      generated_unity3d_meta? ||
+      generated_racc? ||
+      generated_jflex? ||
+      generated_grammarkit?
     end
 
     # Internal: Is the blob an Xcode file?
@@ -94,6 +106,35 @@ 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
+    # are not following the name convention, detect them based on the content.
+    #
+    # Returns true or false.
+    def source_map?
+      return false unless extname.downcase == '.map'
+
+      name =~ /(\.css|\.js)\.map$/i ||                 # Name convention
+      lines[0] =~ /^{"version":\d+,/ ||                # Revision 2 and later begin with the version number
+      lines[0] =~ /^\/\*\* Begin line maps\. \*\*\/{/  # Revision 1 begins with a magic comment
+    end
+
     # Internal: Is the blob of JS generated by CoffeeScript?
     #
     # CoffeeScript is meant to output JS that would be difficult to
@@ -162,6 +203,17 @@ module Linguist
       name.downcase =~ /\.designer\.cs$/
     end
 
+    # Internal: Is this a codegen file for Specflow feature file?
+    #
+    # Visual Studio's SpecFlow extension generates *.feature.cs files
+    # from *.feature files, they are not meant to be consumed by humans.
+    # Let's hide them.
+    #
+    # Returns true or false
+    def generated_net_specflow_feature_file?
+      name.downcase =~ /\.feature\.cs$/
+    end
+
     # Internal: Is the blob of JS a parser generated by PEG.js?
     #
     # PEG.js-generated parsers are not meant to be consumed by humans.
@@ -202,17 +254,38 @@ module Linguist
         creator.include?("ImageMagick")
     end
 
+    def generated_go?
+      return false unless extname == '.go'
+      return false unless lines.count > 1
+
+      return lines[0].include?("Code generated by")
+    end
+
+    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp']
+
     # Internal: Is the blob a C++, Java or Python source file generated by the
     # Protocol Buffer compiler?
     #
     # Returns true of false.
     def generated_protocol_buffer?
-      return false unless ['.py', '.java', '.h', '.cc', '.cpp'].include?(extname)
+      return false unless PROTOBUF_EXTENSIONS.include?(extname)
       return false unless lines.count > 1
 
       return lines[0].include?("Generated by the protocol buffer compiler.  DO NOT EDIT!")
     end
 
+    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp']
+
+    # Internal: Is the blob generated by Apache Thrift compiler?
+    #
+    # Returns true or false
+    def generated_apache_thrift?
+      return false unless APACHE_THRIFT_EXTENSIONS.include?(extname)
+      return false unless lines.count > 1
+
+      return lines[0].include?("Autogenerated by Thrift Compiler") || lines[1].include?("Autogenerated by Thrift Compiler")
+    end
+
     # Internal: Is the blob a C/C++ header generated by the Java JNI tool javah?
     #
     # Returns true of false.
@@ -231,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.
     #
@@ -262,5 +342,89 @@ module Linguist
       # VCR Cassettes have "recorded_with: VCR" in the second last line.
       return lines[-2].include?("recorded_with: VCR")
     end
+
+    # Internal: Is this a compiled C/C++ file from Cython?
+    #
+    # Cython-compiled C/C++ files typically contain:
+    # /* Generated by Cython x.x.x on ... */
+    # on the first line.
+    #
+    # Return true or false
+    def compiled_cython_file?
+      return false unless ['.c', '.cpp'].include? extname
+      return false unless lines.count > 1
+      return lines[0].include?("Generated by Cython")
+    end
+
+    # Internal: Is it a KiCAD or GFortran module file?
+    #
+    # KiCAD module files contain:
+    # PCBNEW-LibModule-V1  yyyy-mm-dd h:mm:ss XM
+    # on the first line.
+    #
+    # GFortran module files contain:
+    # GFORTRAN module version 'x' created from
+    # on the first line.
+    #
+    # Return true of false
+    def generated_module?
+      return false unless extname == '.mod'
+      return false unless lines.count > 1
+      return lines[0].include?("PCBNEW-LibModule-V") ||
+              lines[0].include?("GFORTRAN module version '")
+    end
+
+    # Internal: Is this a metadata file from Unity3D?
+    #
+    # Unity3D Meta files start with:
+    #   fileFormatVersion: X
+    #   guid: XXXXXXXXXXXXXXX
+    #
+    # Return true or false
+    def generated_unity3d_meta?
+      return false unless extname == '.meta'
+      return false unless lines.count > 1
+      return lines[0].include?("fileFormatVersion: ")
+    end
+
+    # Internal: Is this a Racc-generated file?
+    #
+    # A Racc-generated file contains:
+    # # This file is automatically generated by Racc x.y.z
+    # on the third line.
+    #
+    # Return true or false
+    def generated_racc?
+      return false unless extname == '.rb'
+      return false unless lines.count > 2
+      return lines[2].start_with?("# This file is automatically generated by Racc")
+    end
+
+    # Internal: Is this a JFlex-generated file?
+    #
+    # A JFlex-generated file contains:
+    # /* The following code was generated by JFlex x.y.z on d/at/e ti:me */
+    # on the first line.
+    #
+    # Return true or false
+    def generated_jflex?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("/* The following code was generated by JFlex ")
+    end
+
+    # Internal: Is this a GrammarKit-generated file?
+    #
+    # A GrammarKit-generated file typically contain:
+    # // This is a generated file. Not intended for manual editing.
+    # on the first line. This is not always the case, as it's possible to
+    # customize the class header.
+    #
+    # Return true or false
+    def generated_grammarkit?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("// This is a generated file. Not intended for manual editing.")
+    end
   end
 end

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.

lib/linguist/heuristics.rb

@@ -13,11 +13,14 @@ module Linguist
     #   ])
     #
     # Returns an Array of languages, or empty if none matched or were inconclusive.
-    def self.call(blob, languages)
+    def self.call(blob, candidates)
       data = blob.data
 
       @heuristics.each do |heuristic|
-        return Array(heuristic.call(data)) if heuristic.matches?(languages)
+        if heuristic.matches?(blob.name)
+          languages = Array(heuristic.call(data))
+          return languages if languages.any? || languages.all? { |l| candidates.include?(l) }
+        end
       end
 
       [] # No heuristics matched
@@ -30,30 +33,31 @@ module Linguist
     #
     # Examples
     #
-    #     disambiguate "Perl", "Prolog" do |data|
+    #     disambiguate ".pm" do |data|
     #       if data.include?("use strict")
     #         Language["Perl"]
-    #       elsif data.include?(":-")
+    #       elsif /^[^#]+:-/.match(data)
     #         Language["Prolog"]
     #       end
     #     end
     #
-    def self.disambiguate(*languages, &heuristic)
-      @heuristics << new(languages, &heuristic)
+    def self.disambiguate(*extensions, &heuristic)
+      @heuristics << new(extensions, &heuristic)
     end
 
     # Internal: Array of defined heuristics
     @heuristics = []
 
     # Internal
-    def initialize(languages, &heuristic)
-      @languages = languages
+    def initialize(extensions, &heuristic)
+      @extensions = extensions
       @heuristic = heuristic
     end
 
     # Internal: Check if this heuristic matches the candidate languages.
-    def matches?(candidates)
-      candidates.any? && candidates.all? { |l| @languages.include?(l.name) }
+    def matches?(filename)
+      filename = filename.downcase
+      @extensions.any? { |ext| filename.end_with?(ext) }
     end
 
     # Internal: Perform the heuristic
@@ -62,9 +66,19 @@ module Linguist
     end
 
     # Common heuristics
-    ObjectiveCRegex = /^[ \t]*@(interface|class|protocol|property|end|synchronised|selector|implementation)\b/
+    ObjectiveCRegex = /^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])/
 
-    disambiguate "BitBake", "BlitzBasic" do |data|
+    disambiguate ".asc" do |data|
+      if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data)
+        Language["Public Key"]
+      elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data)
+        Language["AsciiDoc"]
+      elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
+        Language["AGS Script"]
+      end
+    end
+
+    disambiguate ".bb" do |data|
       if /^\s*; /.match(data) || data.include?("End Function")
         Language["BlitzBasic"]
       elsif /^\s*(# |include|require)\b/.match(data)
@@ -72,60 +86,22 @@ module Linguist
       end
     end
 
-    disambiguate "C#", "Smalltalk" do |data|
-      if /![\w\s]+methodsFor: /.match(data)
-        Language["Smalltalk"]
-      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
-        Language["C#"]
-      end
-    end
-
-    disambiguate "Objective-C", "C++", "C" do |data|
-      if ObjectiveCRegex.match(data)
-        Language["Objective-C"]
-      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
-        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
-        Language["C++"]
-      end
-    end
-
-    disambiguate "Perl", "Perl6", "Prolog" do |data|
-      if data.include?("use v6")
-        Language["Perl6"]
-      elsif data.include?("use strict")
-        Language["Perl"]
-      elsif data.include?(":-")
-        Language["Prolog"]
-      end
-    end
-
-    disambiguate "ECL", "Prolog" do |data|
-      if data.include?(":-")
-        Language["Prolog"]
-      elsif data.include?(":=")
-        Language["ECL"]
-      end
-    end
-
-    disambiguate "IDL", "Prolog" do |data|
-      if data.include?(":-")
-        Language["Prolog"]
+    disambiguate ".builds" do |data|
+      if /^(\s*)(<Project|<Import|<Property|<?xml|xmlns)/i.match(data)
+        Language["XML"]
       else
-        Language["IDL"]
+        Language["Text"]
       end
     end
 
-    disambiguate "GAP", "Scilab" do |data|
-      if (data.include?("gap> "))
-        Language["GAP"]
-      # Heads up - we don't usually write heuristics like this (with no regex match)
-      else
-        Language["Scilab"]
+    disambiguate ".ch" do |data|
+      if /^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b/i.match(data)
+        Language["xBase"]
       end
     end
 
-    disambiguate "Common Lisp", "OpenCL", "Cool" do |data|
-      if data.include?("(defun ")
+    disambiguate ".cl" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
         Language["Common Lisp"]
       elsif /^class/x.match(data)
         Language["Cool"]
@@ -134,87 +110,49 @@ module Linguist
       end
     end
 
-    disambiguate "Hack", "PHP" do |data|
-      if data.include?("<?hh")
-        Language["Hack"]
-      elsif /<?[^h]/.match(data)
-        Language["PHP"]
+    disambiguate ".cs" do |data|
+      if /![\w\s]+methodsFor: /.match(data)
+        Language["Smalltalk"]
+      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
+        Language["C#"]
       end
     end
 
-    disambiguate "Scala", "SuperCollider" do |data|
-      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
-        Language["SuperCollider"]
-      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
-        Language["Scala"]
+    disambiguate ".d" do |data|
+      if /^module /.match(data)
+        Language["D"]
+      elsif /^((dtrace:::)?BEGIN|provider |#pragma (D (option|attributes)|ident)\s)/.match(data)
+        Language["DTrace"]
+      elsif /(\/.*:( .* \\)$| : \\$|^ : |: \\$)/.match(data)
+        Language["Makefile"]
       end
     end
 
-    disambiguate "AsciiDoc", "AGS Script" do |data|
-      Language["AsciiDoc"] if /^=+(\s|\n)/.match(data)
+    disambiguate ".ecl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["ECLiPSe"]
+      elsif data.include?(":=")
+        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 "FORTRAN", "Forth" do |data|
+    disambiguate ".for", ".f" do |data|
       if /^: /.match(data)
         Language["Forth"]
-      elsif /^([c*][^a-z]|      (subroutine|program)\s|!)/i.match(data)
+      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
         Language["FORTRAN"]
       end
     end
 
-    disambiguate "F#", "Forth", "GLSL" do |data|
-      if /^(: |new-device)/.match(data)
-        Language["Forth"]
-      elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
-        Language["F#"]
-      elsif /^\s*(#include|#pragma|precision|uniform|varying|void)/.match(data)
-        Language["GLSL"]
-      end
-    end
-
-    disambiguate "M", "Mathematica", "Matlab", "Mercury", "Objective-C" do |data|
-      if ObjectiveCRegex.match(data)
-        Language["Objective-C"]
-      elsif data.include?(":- module")
-        Language["Mercury"]
-      elsif /^\s*;/.match(data)
-        Language["M"]
-      elsif /^\s*\(\*/.match(data)
-        Language["Mathematica"]
-      elsif /^\s*%/.match(data)
-        Language["Matlab"]
-      end
-    end
-
-    disambiguate "Gosu", "JavaScript" do |data|
-      Language["Gosu"] if /^uses java\./.match(data)
-    end
-
-    disambiguate "LoomScript", "LiveScript" do |data|
-      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
-        Language["LoomScript"]
-      else
-        Language["LiveScript"]
-      end
-    end
-
-    disambiguate "Common Lisp", "NewLisp" do |data|
-      if /^\s*\((defun|in-package|defpackage) /.match(data)
-        Language["Common Lisp"]
-      elsif /^\s*\(define /.match(data)
-        Language["NewLisp"]
-      end
-    end
-
-    disambiguate "TypeScript", "XML" do |data|
-      if data.include?("<TS ")
-        Language["XML"]
-      else
-        Language["TypeScript"]
-      end
-    end
-
-    disambiguate "Frege", "Forth", "Text" do |data|
+    disambiguate ".fr" do |data|
       if /^(: |also |new-device|previous )/.match(data)
         Language["Forth"]
       elsif /^\s*(import|module|package|data|type) /.match(data)
@@ -223,5 +161,289 @@ module Linguist
         Language["Text"]
       end
     end
+
+    disambiguate ".fs" do |data|
+      if /^(: |new-device)/.match(data)
+        Language["Forth"]
+      elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
+        Language["F#"]
+      elsif /^\s*(#version|precision|uniform|varying|vec[234])/.match(data)
+        Language["GLSL"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["Filterscript"]
+      end
+    end
+
+    disambiguate ".gs" do |data|
+      Language["Gosu"] if /^uses java\./.match(data)
+    end
+
+    disambiguate ".h" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
+        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
+        Language["C++"]
+      end
+    end
+
+    disambiguate ".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"]
+      elsif /^(%[%{}]xs|<.*>)/.match(data)
+        Language["Lex"]
+      elsif /^\.[a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /^\((de|class|rel|code|data|must)\s/.match(data)
+        Language["PicoLisp"]
+      end
+    end
+
+    disambiguate ".ls" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
+    disambiguate ".lsp", ".lisp" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".m" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif data.include?(":- module")
+        Language["Mercury"]
+      elsif /^: /.match(data)
+        Language["MUF"]
+      elsif /^\s*;/.match(data)
+        Language["M"]
+      elsif /^\s*\(\*/.match(data)
+        Language["Mathematica"]
+      elsif /^\s*%/.match(data)
+        Language["Matlab"]
+      elsif /^\w+\s*:\s*module\s*{/.match(data)
+        Language["Limbo"]
+      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"]
+      elsif /=> |case\s+(\S+\s)+of/.match(data)
+        Language["Standard ML"]
+      end
+    end
+
+    disambiguate ".mod" do |data|
+      if data.include?('<!ENTITY ')
+        Language["XML"]
+      elsif /MODULE\s\w+\s*;/i.match(data) || /^\s*END \w+;$/i.match(data)
+        Language["Modula-2"]
+      else
+        [Language["Linux Kernel Module"], Language["AMPL"]]
+      end
+    end
+
+    disambiguate ".ms" do |data|
+      if /^[.'][a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z]/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, ""))
+        Language["GAS"]
+      else
+        Language["MAXScript"]
+      end
+    end
+
+    disambiguate ".n" do |data|
+      if /^[.']/.match(data)
+        Language["Groff"]
+      elsif /^(module|namespace|using)\s/.match(data)
+        Language["Nemerle"]
+      end
+    end
+
+    disambiguate ".ncl" do |data|
+      if data.include?("THE_TITLE")
+        Language["Text"]
+      end
+    end
+
+    disambiguate ".nl" do |data|
+      if /^(b|g)[0-9]+ /.match(data)
+        Language["NL"]
+      else
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".php" do |data|
+      if data.include?("<?hh")
+        Language["Hack"]
+      elsif /<?[^h]/.match(data)
+        Language["PHP"]
+      end
+    end
+
+    disambiguate ".pl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pm", ".t" do |data|
+      if /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pod" do |data|
+      if /^=\w+$/.match(data)
+        Language["Pod"]
+      else
+        Language["Perl"]
+      end
+    end
+
+    disambiguate ".pro" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif data.include?("last_client=")
+        Language["INI"]
+      elsif data.include?("HEADERS") && data.include?("SOURCES")
+        Language["QMake"]
+      elsif /^\s*function[ \w,]+$/.match(data)
+        Language["IDL"]
+      end
+    end
+
+    disambiguate ".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"]
+      elsif data.include?("<-")
+        Language["R"]
+      end
+    end
+
+    disambiguate ".rno" do |data|
+      if /^\.!|^\.end lit(?:eral)?\b/i.match(data)
+        Language["RUNOFF"]
+      elsif /^\.\\" /.match(data)
+        Language["Groff"]
+      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"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["RenderScript"]
+      end
+    end
+
+    disambiguate ".sc" do |data|
+      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
+        Language["SuperCollider"]
+      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
+        Language["Scala"]
+      end
+    end
+
+    disambiguate ".sql" do |data|
+      if /^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
+        #Postgres
+        Language["PLpgSQL"]
+      elsif /(alter module)|(language sql)|(begin( NOT)+ atomic)/i.match(data)  || /signal SQLSTATE '[0-9]+'/i.match(data)
+        #IBM db2
+        Language["SQLPL"]
+      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)
+        #Generic SQL
+        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>")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
+    disambiguate ".tst" do |data|
+      if (data.include?("gap> "))
+        Language["GAP"]
+      # Heads up - we don't usually write heuristics like this (with no regex match)
+      else
+        Language["Scilab"]
+      end
+    end
   end
 end

lib/linguist/language.rb

@@ -32,13 +32,6 @@ module Linguist
     # Valid Languages types
     TYPES = [:data, :markup, :programming, :prose]
 
-    # Names of non-programming languages that we will still detect
-    #
-    # Returns an array
-    def self.detectable_markup
-      ["CSS", "Less", "Sass", "SCSS", "Stylus", "TeX"]
-    end
-
     # Detect languages by a specific type
     #
     # type - A symbol that exists within TYPES
@@ -80,7 +73,7 @@ module Linguist
           raise ArgumentError, "Extension is missing a '.': #{extension.inspect}"
         end
 
-        @extension_index[extension] << language
+        @extension_index[extension.downcase] << language
       end
 
       language.interpreters.each do |interpreter|
@@ -94,14 +87,6 @@ module Linguist
       language
     end
 
-    STRATEGIES = [
-      Linguist::Strategy::Modeline,
-      Linguist::Strategy::Filename,
-      Linguist::Shebang,
-      Linguist::Heuristics,
-      Linguist::Classifier
-    ]
-
     # Public: Detects the Language of the blob.
     #
     # blob - an object that includes the Linguist `BlobHelper` interface;
@@ -109,22 +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?
-
-      # Call each strategy until one candidate is returned.
-      STRATEGIES.reduce([]) do |languages, strategy|
-        candidates = strategy.call(blob, languages)
-        if candidates.size == 1
-          return candidates.first
-        elsif candidates.size > 1
-          # More than one candidate was found, pass them to the next strategy.
-          candidates
-        else
-          # No candiates were found, pass on languages from the previous strategy.
-          languages
-        end
-      end.first
+      warn "[DEPRECATED] `Linguist::Language.detect` is deprecated. Use `Linguist.detect`. #{caller[0]}"
+      Linguist.detect(blob)
     end
 
     # Public: Get all Languages
@@ -145,7 +116,8 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.find_by_name(name)
-      name && @name_index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
     end
 
     # Public: Look up Language by one of its aliases.
@@ -159,7 +131,8 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.find_by_alias(name)
-      name && @alias_index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
     end
 
     # Public: Look up Languages by filename.
@@ -198,7 +171,7 @@ module Linguist
     # Returns all matching Languages or [] if none were found.
     def self.find_by_extension(extname)
       extname = ".#{extname}" unless extname.start_with?(".")
-      @extension_index[extname]
+      @extension_index[extname.downcase]
     end
 
     # DEPRECATED
@@ -235,7 +208,8 @@ module Linguist
     #
     # Returns the Language or nil if none was found.
     def self.[](name)
-      name && @index[name.downcase]
+      return nil if name.to_s.empty?
+      name && (@index[name.downcase] || @index[name.split(',').first.downcase])
     end
 
     # Public: A List of popular languages
@@ -535,8 +509,8 @@ module Linguist
 
     if extnames = extensions[name]
       extnames.each do |extname|
-        if !options['extensions'].index { |x| x.end_with? extname }
-          warn "#{name} has a sample with extension (#{extname}) that isn't explicitly defined in languages.yml" unless extname == '.script!'
+        if !options['extensions'].index { |x| x.downcase.end_with? extname.downcase }
+          warn "#{name} has a sample with extension (#{extname.downcase}) that isn't explicitly defined in languages.yml"
           options['extensions'] << extname
         end
       end

lib/linguist/lazy_blob.rb

@@ -4,7 +4,11 @@ require 'rugged'
 
 module Linguist
   class LazyBlob
-    GIT_ATTR = ['linguist-language', 'linguist-vendored']
+    GIT_ATTR = ['linguist-documentation',
+                'linguist-language',
+                'linguist-vendored',
+                'linguist-generated']
+
     GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
     GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)
 
@@ -14,14 +18,17 @@ module Linguist
 
     attr_reader :repository
     attr_reader :oid
-    attr_reader :name
+    attr_reader :path
     attr_reader :mode
 
-    def initialize(repo, oid, name, mode = nil)
+    alias :name :path
+
+    def initialize(repo, oid, path, mode = nil)
       @repository = repo
       @oid = oid
-      @name = name
+      @path = path
       @mode = mode
+      @data = nil
     end
 
     def git_attributes
@@ -29,11 +36,27 @@ module Linguist
         name, GIT_ATTR, GIT_ATTR_FLAGS)
     end
 
+    def documentation?
+      if attr = git_attributes['linguist-documentation']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def generated?
+      if attr = git_attributes['linguist-generated']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
     def vendored?
       if attr = git_attributes['linguist-vendored']
         return boolean_attribute(attr)
       else
-        return super
+        super
       end
     end
 
@@ -41,7 +64,7 @@ module Linguist
       return @language if defined?(@language)
 
       @language = if lang = git_attributes['linguist-language']
-        Language.find_by_name(lang)
+        Language.find_by_alias(lang)
       else
         super
       end
@@ -57,11 +80,15 @@ module Linguist
       @size
     end
 
+    def cleanup!
+      @data.clear if @data
+    end
+
     protected
 
     # Returns true if the attribute is present and not the string "false".
-    def boolean_attribute(attr)
-      attr != "false"
+    def boolean_attribute(attribute)
+      attribute != "false"
     end
 
     def load_blob!

lib/linguist/popular.yml

@@ -9,21 +9,21 @@
 - CSS
 - Clojure
 - CoffeeScript
-- Common Lisp
-- Diff
-- Emacs Lisp
-- Erlang
+- Go
 - HTML
 - Haskell
 - Java
 - JavaScript
 - Lua
+- Matlab
 - Objective-C
 - PHP
 - Perl
 - Python
+- R
 - Ruby
-- SQL
 - Scala
-- Scheme
 - Shell
+- Swift
+- TeX
+- VimL

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
 
@@ -126,12 +129,13 @@ module Linguist
     end
 
     protected
+    MAX_TREE_SIZE = 100_000
 
     def compute_stats(old_commit_oid, cache = nil)
+      return {} if current_tree.count_recursive(MAX_TREE_SIZE) >= MAX_TREE_SIZE
+
       old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
-
       read_index
-
       diff = Rugged::Tree.diff(repository, old_tree, current_tree)
 
       # Clear file map and fetch full diff if any .gitattributes files are changed
@@ -150,19 +154,18 @@ module Linguist
         next if delta.binary
 
         if [:added, :modified].include? delta.status
-          # Skip submodules
+          # Skip submodules and symlinks
           mode = delta.new_file[:mode]
-          next if (mode & 040000) != 0
+          mode_format = (mode & 0170000)
+          next if mode_format == 0120000 || mode_format == 040000 || mode_format == 0160000
 
           blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
 
-          # Skip vendored or generated blobs
-          next if blob.vendored? || blob.generated? || blob.language.nil?
-
-          # Only include programming languages and acceptable markup languages
-          if blob.language.type == :programming || Language.detectable_markup.include?(blob.language.name)
+          if blob.include_in_language_stats?
             file_map[new] = [blob.language.group.name, blob.size]
           end
+
+          blob.cleanup!
         end
       end
 

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
 
@@ -50,16 +50,13 @@ module Linguist
             end
           else
             path = File.join(dirname, filename)
-
-            if File.extname(filename) == ""
-              raise "#{path} is missing an extension, maybe it belongs in filenames/ subdir"
-            end
+            extname = File.extname(filename)
 
             yield({
               :path     => path,
               :language => category,
               :interpreter => Shebang.interpreter(File.read(path)),
-              :extname  => File.extname(filename)
+              :extname  => extname.empty? ? nil : extname
             })
           end
         end

lib/linguist/shebang.rb

@@ -23,23 +23,29 @@ module Linguist
       # First line must start with #!
       return unless shebang && shebang.start_with?("#!")
 
-      # Get the parts of the shebang without the #!
-      tokens = shebang.sub(/^#!\s*/, '').strip.split(' ')
+      s = StringScanner.new(shebang)
 
       # There was nothing after the #!
-      return if tokens.empty?
+      return unless path = s.scan(/^#!\s*\S+/)
 
-      # Get the name of the interpreter
-      script = File.basename(tokens.first)
+      # Keep going
+      script = path.split('/').last
 
-      # Get next argument if interpreter was /usr/bin/env
-      script = tokens[1] if script == 'env'
+      # if /usr/bin/env type shebang then walk the string
+      if script == 'env'
+        s.scan(/\s+/)
+        s.scan(/.*=[^\s]+\s+/) # skip over variable arguments e.g. foo=bar
+        script = s.scan(/\S+/)
+      end
 
       # Interpreter was /usr/bin/env with no arguments
       return unless script
 
       # "python2.6" -> "python2"
-      script.sub! /(\.\d+)$/, ''
+      script.sub!(/(\.\d+)$/, '')
+
+      # #! perl -> perl
+      script.sub!(/^#!\s*/, '')
 
       # Check for multiline shebang hacks that call `exec`
       if script == 'sh' &&

lib/linguist/strategy/filename.rb

@@ -3,17 +3,7 @@ module Linguist
     # Detects language based on filename and/or extension
     class Filename
       def self.call(blob, _)
-        name = blob.name.to_s
-
-        # A bit of an elegant hack. If the file is executable but extensionless,
-        # append a "magic" extension so it can be classified with other
-        # languages that have shebang scripts.
-        extensions = FileBlob.new(name).extensions
-        if extensions.empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
-          name += ".script!"
-        end
-
-        Language.find_by_filename(name)
+        Language.find_by_filename(blob.name.to_s)
       end
     end
   end

lib/linguist/strategy/modeline.rb

@@ -1,8 +1,23 @@
 module Linguist
   module Strategy
     class Modeline
-      EmacsModeline = /-\*-\s*(?:mode:)?\s*(\w+);?\s*-\*-/
-      VimModeline = /\/\*\s*vim:\s*set\s*(?:ft|filetype)=(\w+):\s*\*\//
+      EMACS_MODELINE = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
+
+      # First form vim modeline
+      # [text]{white}{vi:|vim:|ex:}[white]{options}
+      # ex: 'vim: syntax=ruby'
+      VIM_MODELINE_1 = /(?:vim|vi|ex):\s*(?:ft|filetype|syntax)=(\w+)\s?/i
+
+      # Second form vim modeline (compatible with some versions of Vi)
+      # [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
+      # ex: 'vim set syntax=ruby:'
+      VIM_MODELINE_2 = /(?:vim|vi|Vim|ex):\s*se(?:t)?.*\s(?:ft|filetype|syntax)=(\w+)\s?.*:/i
+
+      MODELINES = [EMACS_MODELINE, VIM_MODELINE_1, VIM_MODELINE_2]
+
+      # 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
       #
@@ -15,14 +30,16 @@ 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
       #
       # Returns a String or nil
       def self.modeline(data)
-        match = data.match(EmacsModeline) || data.match(VimModeline)
+        match = MODELINES.map { |regex| data.match(regex) }.reject(&:nil?).first
         match[1] if match
       end
     end

lib/linguist/tokenizer.rb

@@ -22,8 +22,10 @@ module Linguist
     # Start state on token, ignore anything till the next newline
     SINGLE_LINE_COMMENTS = [
       '//', # C
+      '--', # Ada, Haskell, AppleScript
       '#',  # Ruby
       '%',  # Tex
+      '"',  # Vim
     ]
 
     # Start state on opening token, ignore anything until the closing
@@ -84,17 +86,17 @@ module Linguist
           if s.peek(1) == "\""
             s.getch
           else
-            s.skip_until(/[^\\]"/)
+            s.skip_until(/(?<!\\)"/)
           end
         elsif s.scan(/'/)
           if s.peek(1) == "'"
             s.getch
           else
-            s.skip_until(/[^\\]'/)
+            s.skip_until(/(?<!\\)'/)
           end
 
         # Skip number literals
-        elsif s.scan(/(0x)?\d(\d|\.)*/)
+        elsif s.scan(/(0x\h(\h|\.)*|\d(\d|\.)*)([uU][lL]{0,2}|([eE][-+]\d*)?[fFlL]*)/)
 
         # SGML style brackets
         elsif token = s.scan(/<[^\s<>][^<>]*>/)
@@ -130,6 +132,9 @@ module Linguist
     #   extract_shebang("#!/usr/bin/env node")
     #   # => "node"
     #
+    #   extract_shebang("#!/usr/bin/env A=B foo=bar awk -f")
+    #   # => "awk"
+    #
     # Returns String token or nil it couldn't be parsed.
     def extract_shebang(data)
       s = StringScanner.new(data)
@@ -138,6 +143,7 @@ module Linguist
         script = path.split('/').last
         if script == 'env'
           s.scan(/\s+/)
+          s.scan(/.*=[^\s]+\s+/)
           script = s.scan(/\S+/)
         end
         script = script[/[^\d]+/, 0] if script

lib/linguist/vendor.yml

@@ -20,10 +20,20 @@
 - ^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
+
 # Node dependencies
 - node_modules/
 
@@ -40,7 +50,7 @@
 # Minified JavaScript and CSS
 - (\.|-)min\.(js|css)$
 
-#Stylesheets imported from packages
+# Stylesheets imported from packages
 - ([^\s]*)import\.(css|less|scss|styl)$
 
 # Bootstrap css and js
@@ -67,6 +77,7 @@
 - 3rd[-_]?party/
 - vendors?/
 - extern(al)?/
+- (^|/)[Vv]+endor/
 
 # Debian packaging
 - ^debian/
@@ -74,6 +85,9 @@
 # Haxelib projects often contain a neko bytecode file named run.n
 - run.n$
 
+# Bootstrap Datepicker
+- bootstrap-datepicker/
+
 ## Commonly Bundled JavaScript frameworks ##
 
 # jQuery
@@ -84,6 +98,34 @@
 - (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$
 - (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$
 
+# jQuery Gantt
+- jquery.fn.gantt.js
+
+# jQuery fancyBox
+- jquery.fancybox.(js|css)
+
+# Fuel UX
+- fuelux.js
+
+# jQuery File Upload
+- (^|/)jquery\.fileupload(-\w+)?\.js$
+
+# Slick
+- (^|/)slick\.\w+.js$
+
+# Leaflet plugins
+- (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$
+- leaflet.draw-src.js
+- leaflet.draw.css
+- Control.FullScreen.css
+- Control.FullScreen.js
+- leaflet.spin.js
+- wicket-leaflet.js
+
+# Sublime Text workspace files
+- .sublime-project
+- .sublime-workspace
+
 # Prototype
 - (^|/)prototype(.*)\.js$
 - (^|/)effects\.js$
@@ -111,6 +153,12 @@
 - (^|/)tiny_mce([^.]*)\.js$
 - (^|/)tiny_mce/(langs|plugins|themes|utils)
 
+# Ace Editor
+- (^|/)ace-builds/
+
+# Fontello CSS files
+- (^|/)fontello(.*?)\.css$
+
 # MathJax
 - (^|/)MathJax/
 
@@ -118,7 +166,7 @@
 - (^|/)Chart\.js$
 
 # Codemirror
-- (^|/)[Cc]ode[Mm]irror/(lib|mode|theme|addon|keymap)
+- (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)
 
 # SyntaxHighlighter - http://alexgorbatchev.com/
 - (^|/)shBrush([^.]*)\.js$
@@ -143,8 +191,12 @@
 
 ## Python ##
 
+# Sphinx
+- (^|/)docs?/_?(build|themes?|templates?|static)/
+
 # django
 - (^|/)admin_media/
+- (^|/)env/
 
 # Fabric
 - ^fabfile\.py$
@@ -157,12 +209,31 @@
 
 ## Obj-C ##
 
+# Xcode
+
+- \.xctemplate/
+- \.imageset/
+
+# Carthage
+- ^Carthage/
+
 # Cocoapods
 - ^Pods/
 
 # Sparkle
 - (^|/)Sparkle/
 
+# Crashlytics
+- Crashlytics.framework/
+
+# Fabric
+- Fabric.framework/
+
+# git config files
+- gitattributes$
+- gitignore$
+- gitmodules$
+
 ## Groovy ##
 
 # Gradle
@@ -207,21 +278,9 @@
 # Html5shiv
 - (^|/)html5shiv\.js$
 
-# Samples folders
-- ^[Ss]amples/
-
-# LICENSE, README, git config files
-- ^COPYING$
-- LICENSE$
-- License$
-- gitattributes$
-- gitignore$
-- gitmodules$
-- ^README$
-- ^readme$
-
 # Test fixtures
-- ^[Tt]est/fixtures/
+- ^[Tt]ests?/fixtures/
+- ^[Ss]pecs?/fixtures/
 
 # PhoneGap/Cordova
 - (^|/)cordova([^.]*)\.js$
@@ -233,7 +292,7 @@
 # Vagrant
 - ^Vagrantfile$
 
-# .DS_Store's
+# .DS_Stores
 - .[Dd][Ss]_[Ss]tore$
 
 # R packages
@@ -251,3 +310,12 @@
 # ProGuard
 - proguard.pro
 - proguard-rules.pro
+
+# PuPHPet
+- ^puphpet/
+
+# Android Google APIs
+- (^|/)\.google_apis/
+
+# Jenkins Pipeline
+- ^Jenkinsfile$

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.3.0"
+  VERSION = "4.8.9"
 end

package.json

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

samples/1C Enterprise/Catalog.ИсходящиеПисьма.Form.ФормаЭлемента.Form.Module.bsl

@@ -0,0 +1,265 @@
+&НаСервереБезКонтекста
+Функция ПолучитьКонтактноеЛицоПоЭлектроннойПочте(ЭлектроннаяПочта)
+	Запрос = Новый Запрос;
+	Запрос.Текст = "ВЫБРАТЬ КонтактноеЛицо ИЗ Справочник.Контрагенты ГДЕ ЭлектроннаяПочта = &ЭлектроннаяПочта";
+	Запрос.Параметры.Вставить("ЭлектроннаяПочта", СокрЛП(ЭлектроннаяПочта));
+	Выборка = Запрос.Выполнить().Выбрать();
+	КонтактноеЛицо = "";
+	Если Выборка.Следующий() Тогда
+		КонтактноеЛицо = Выборка.КонтактноеЛицо;
+	КонецЕсли;
+	Возврат КонтактноеЛицо;
+КонецФункции
+
+&НаСервереБезКонтекста
+Функция ПолучитьКонтактноеЛицоПоПолучателю(Получатель)
+	Запрос = Новый Запрос;
+	Запрос.Текст = "ВЫБРАТЬ КонтактноеЛицо ИЗ Справочник.Контрагенты ГДЕ Ссылка = &Получатель";
+	Запрос.Параметры.Вставить("Получатель", Получатель);
+	Выборка = Запрос.Выполнить().Выбрать();
+	КонтактноеЛицо = "";
+	Если Выборка.Следующий() Тогда
+		КонтактноеЛицо = Выборка.КонтактноеЛицо;
+	КонецЕсли;
+	Возврат КонтактноеЛицо;
+КонецФункции
+
+&НаСервереБезКонтекста
+Процедура ДобавитьПолучателей(Получатель, Получатели)	
+	Запрос = Новый Запрос;
+	Запрос.Текст = "ВЫБРАТЬ ЭлектроннаяПочта ИЗ Справочник.Контрагенты ГДЕ Ссылка ";
+	Если ТипЗнч(Получатели) = Тип("Массив") Тогда
+		Запрос.Текст = Запрос.Текст + "В (&Получатели)";
+	Иначе
+		Запрос.Текст = Запрос.Текст + "= &Получатели";
+	КонецЕсли;
+	Запрос.Параметры.Вставить("Получатели", Получатели);
+	Выборка = Запрос.Выполнить().Выбрать();
+	Пока Выборка.Следующий() Цикл
+		Если Получатель <> "" Тогда
+			Получатель = Получатель + "; ";
+		КонецЕсли;
+		Получатель = Получатель + Выборка.ЭлектроннаяПочта;
+	КонецЦикла;
+КонецПроцедуры
+
+&НаСервере
+Процедура ПриСозданииНаСервере(Отказ, СтандартнаяОбработка)
+	Если Параметры.Ключ.Пустая() Тогда
+		Заголовок = "Исходящее письмо (Создание)";
+		Объект.Дата = ТекущаяДата();
+		ПоШаблону = Параметры.Свойство("ПоШаблону");
+		ВходящееПисьмо = Параметры.ВходящееПисьмо;
+		Если ПоШаблону = Истина Тогда
+			Элементы.ЗаполнитьПоШаблону.Видимость = Истина;
+			РаботаСПочтой.ЗаполнитьПисьмоПоШаблону(Объект, Содержимое);
+		ИначеЕсли Не ВходящееПисьмо.Пустая() Тогда
+			РаботаСПочтой.ЗаполнитьОтветНаПисьмо(ВходящееПисьмо, Объект, Содержимое);
+		КонецЕсли;
+		Адресаты = Параметры.Адресаты;
+		Если Адресаты <> Неопределено Тогда
+			Запрос = Новый Запрос;
+			Запрос.Текст = "ВЫБРАТЬ
+			               |	Контрагенты.ЭлектроннаяПочта
+			               |ИЗ
+			               |	Справочник.Контрагенты КАК Контрагенты
+			               |ГДЕ
+			               |	Контрагенты.Ссылка В(&Адресаты)
+			               |	И Контрагенты.ЭлектроннаяПочта <> """"";
+			Запрос.УстановитьПараметр("Адресаты", Адресаты);			   
+			Получатель = "";
+			Выборка = Запрос.Выполнить().Выбрать();
+			Пока Выборка.Следующий() Цикл
+				Если Получатель <> "" Тогда
+					Получатель = Получатель + "; ";
+				КонецЕсли;
+				Получатель = Получатель + Выборка.ЭлектроннаяПочта;
+			КонецЦикла;
+			Объект.Получатель = Получатель;
+		КонецЕсли;
+	КонецЕсли;
+КонецПроцедуры
+
+&НаСервере
+Процедура ПриЧтенииНаСервере(ТекущийОбъект)
+	Содержимое = ТекущийОбъект.Содержимое.Получить();
+	Заголовок = ТекущийОбъект.Наименование + " (Исходящее письмо)";
+	Если  РаботаСПочтой.ПисьмоОтправлено(ТекущийОбъект.Ссылка) Тогда
+		Заголовок = Заголовок + " - Отправлено";
+	КонецЕсли;
+КонецПроцедуры
+
+&НаСервере
+Процедура ПередЗаписьюНаСервере(Отказ, ТекущийОбъект, ПараметрыЗаписи)
+	ТекущийОбъект.Содержимое = Новый ХранилищеЗначения(Содержимое, Новый СжатиеДанных());
+	ТекущийОбъект.Текст = Содержимое.ПолучитьТекст();
+КонецПроцедуры
+
+&НаСервере
+Функция ОтправитьПисьмо(Ошибка)
+	Если Не Записать() Тогда
+		Ошибка = "ОшибкаЗаписи";
+		Возврат Ложь;
+	КонецЕсли;
+	Если Не РаботаСПочтой.ОтправитьПисьмо(Объект.Ссылка) Тогда
+		Ошибка = "ОшибкаОтправки";
+		Возврат Ложь;
+	КонецЕсли;
+	Заголовок = Заголовок + " - Отправлено";
+	Возврат Истина;
+КонецФункции
+
+&НаКлиенте
+Функция ОтправитьПисьмоКлиент()
+	Ошибка = "";
+	Если Не ОтправитьПисьмо(Ошибка) Тогда
+		Если Ошибка = "ОшибкаОтправки" Тогда
+			Кнопки = Новый СписокЗначений;
+			Кнопки.Добавить(1, "Настроить почту");
+			Кнопки.Добавить(2, "Закрыть");
+			
+			Оп = Новый ОписаниеОповещения(
+				"ОтправитьПисьмоКлиентВопросЗавершение",
+				ЭтотОбъект);
+			ПоказатьВопрос(Оп,
+				"Не указаны настройки интернет почты!", 
+				Кнопки, , 1);
+		КонецЕсли;
+		Возврат Ложь;
+	КонецЕсли;
+	
+	НавигационнаяСсылка = ПолучитьНавигационнуюСсылку(Объект.Ссылка);
+	ПоказатьОповещениеПользователя("Письмо отправлено", НавигационнаяСсылка, Объект.Наименование);
+	ОповеститьОбИзменении(Объект.Ссылка);
+	Возврат Истина;
+КонецФункции
+
+&НаКлиенте
+Процедура ОтправитьПисьмоКлиентВопросЗавершение(Результат, Параметры) Экспорт
+	Если Результат = 1 Тогда
+		ОткрытьФорму("ОбщаяФорма.НастройкаПочты");
+	КонецЕсли;
+КонецПроцедуры
+
+&НаКлиенте
+Процедура Отправить(Команда)
+	ОтправитьПисьмоКлиент();
+КонецПроцедуры
+
+&НаКлиенте
+Процедура ОтправитьИЗакрыть(Команда)
+	Если Не ОтправитьПисьмоКлиент() Тогда
+		Возврат;
+	КонецЕсли;
+	Закрыть();
+КонецПроцедуры
+
+&НаКлиенте
+Процедура ВставитьСтрокуВТекущуюПозицию(Поле, Документ, Строка)
+	Перем Начало, Конец;
+	Поле.ПолучитьГраницыВыделения(Начало, Конец);
+	Позиция = Документ.ПолучитьПозициюПоЗакладке(Начало);
+	Документ.Удалить(Начало, Конец);
+	Начало = Документ.ПолучитьЗакладкуПоПозиции(Позиция);
+	Документ.Вставить(Начало, Строка);
+	Позиция = Позиция + СтрДлина(Строка);
+	Закладка = Документ.ПолучитьЗакладкуПоПозиции(Позиция);
+	Поле.УстановитьГраницыВыделения(Закладка, Закладка);
+КонецПроцедуры
+
+&НаКлиенте
+Процедура ВставитьКонтактноеЛицо(Команда)
+	Если Объект.Контрагент.Пустая() Тогда
+		Сообщить("Выберите контрагента");
+	Иначе
+		КонтактноеЛицо = ПолучитьКонтактноеЛицоПоПолучателю(Объект.Контрагент);
+		ВставитьСтрокуВТекущуюПозицию(Элементы.Содержимое, Содержимое, КонтактноеЛицо + " ");
+	КонецЕсли;	
+КонецПроцедуры
+
+&НаСервере
+Процедура ПослеЗаписиНаСервере(ТекущийОбъект, ПараметрыЗаписи)
+	Заголовок = ТекущийОбъект.Наименование + " (Исходящее письмо)";
+КонецПроцедуры
+
+&НаКлиенте
+Процедура КонтрагентПриИзменении(Элемент)
+	ДобавитьПолучателей(Объект.Получатель, Объект.Контрагент);
+КонецПроцедуры
+
+&НаКлиенте
+Процедура ВыделитьВажное(Команда)
+	Перем Начало, Конец;
+    ВсеВажное = Истина;
+    Элементы.Содержимое.ПолучитьГраницыВыделения(Начало, Конец);
+    Если Начало = Конец Тогда
+        Возврат;
+    КонецЕсли;
+    
+    НаборТекстовыхЭлементов = Новый Массив();
+    Для Каждого ТекстовыйЭлемент Из Содержимое.СформироватьЭлементы(Начало, Конец) Цикл
+        Если Тип(ТекстовыйЭлемент) = Тип("ТекстФорматированногоДокумента") Тогда
+            НаборТекстовыхЭлементов.Добавить(ТекстовыйЭлемент);    
+        КонецЕсли;    
+    КонецЦикла;
+    
+    Для Каждого ТекстовыйЭлемент Из НаборТекстовыхЭлементов Цикл
+        Если ТекстовыйЭлемент.Шрифт.Жирный <> Истина И
+            ТекстовыйЭлемент.ЦветТекста <> Новый Цвет(255, 0, 0) Тогда
+            ВсеВажное = Ложь;
+            Прервать;
+        КонецЕсли;
+    КонецЦикла;
+    
+    Для Каждого ТекстовыйЭлемент Из НаборТекстовыхЭлементов Цикл
+        ТекстовыйЭлемент.Шрифт = Новый Шрифт(ТекстовыйЭлемент.Шрифт, , , Не ВсеВажное);
+        ТекстовыйЭлемент.ЦветТекста = Новый Цвет(?(ВсеВажное, 0, 255), 0, 0);
+    КонецЦикла;
+КонецПроцедуры
+
+&НаКлиенте
+Процедура ЗаполнитьПоШаблону(Команда)
+	Если Объект.Контрагент.Пустая() Тогда
+		Сообщить("Выберите контрагента");
+	Иначе
+		НайтиИЗаменить("[Контрагент]", Объект.Контрагент);
+		НайтиИЗаменить("[КонтактноеЛицо]", ПолучитьКонтактноеЛицоПоПолучателю(Объект.Контрагент));
+	КонецЕсли;
+	НайтиИЗаменить("[ДатаПисьма]", Объект.Дата);
+КонецПроцедуры
+
+&НаКлиенте
+Процедура НайтиИЗаменить(СтрокаДляПоиска, СтрокаДляЗамены)
+	Перем ВставленныйТекст, ШрифтОформления, ЦветТекстаОформления, ЦветФонаОформления, НавигационнаяСсылкаОформления;
+	РезультатПоиска = Содержимое.НайтиТекст(СтрокаДляПоиска);
+	Пока ((РезультатПоиска <> Неопределено) И (РезультатПоиска.ЗакладкаНачала <> Неопределено) И (РезультатПоиска.ЗакладкаКонца <> Неопределено)) Цикл
+		ПозицияНачалаСледующегоЦиклаПоиска = Содержимое.ПолучитьПозициюПоЗакладке(РезультатПоиска.ЗакладкаНачала) + СтрДлина(СтрокаДляЗамены);
+		МассивЭлементовДляОформления = Содержимое.ПолучитьЭлементы(РезультатПоиска.ЗакладкаНачала, РезультатПоиска.ЗакладкаКонца);
+		Для Каждого ЭлементДляОформления Из МассивЭлементовДляОформления Цикл
+			Если Тип(ЭлементДляОформления) = Тип("ТекстФорматированногоДокумента") Тогда
+				ШрифтОформления = ЭлементДляОформления.Шрифт;
+				ЦветТекстаОформления = ЭлементДляОформления.ЦветТекста;
+				ЦветФонаОформления = ЭлементДляОформления.ЦветФона;
+				НавигационнаяСсылкаОформления = ЭлементДляОформления.НавигационнаяССылка;
+				Прервать;
+			КонецЕсли;
+		КонецЦикла;	
+		Содержимое.Удалить(РезультатПоиска.ЗакладкаНачала, РезультатПоиска.ЗакладкаКонца);
+		ВставленныйТекст = Содержимое.Вставить(РезультатПоиска.ЗакладкаНачала, СтрокаДляЗамены);
+		Если ВставленныйТекст <> Неопределено И ШрифтОформления <> Неопределено Тогда
+			ВставленныйТекст.Шрифт = ШрифтОформления;
+		КонецЕсли;
+		Если ВставленныйТекст <> Неопределено И ЦветТекстаОформления <> Неопределено Тогда
+			ВставленныйТекст.ЦветТекста = ЦветТекстаОформления;
+		КонецЕсли;
+		Если ВставленныйТекст <> Неопределено И ЦветФонаОформления <> Неопределено Тогда
+			ВставленныйТекст.ЦветФона = ЦветФонаОформления;
+		КонецЕсли;
+		Если ВставленныйТекст <> Неопределено И НавигационнаяСсылкаОформления <> Неопределено Тогда
+			ВставленныйТекст.НавигационнаяССылка = НавигационнаяСсылкаОформления;
+		КонецЕсли;
+		
+		РезультатПоиска = Содержимое.НайтиТекст(СтрокаДляПоиска, Содержимое.ПолучитьЗакладкуПоПозиции(ПозицияНачалаСледующегоЦиклаПоиска));
+	КонецЦикла;
+КонецПроцедуры
+

samples/1C Enterprise/Catalog.Товары.Command.ПечатьПрайсЛиста.CommandModule.bsl

@@ -0,0 +1,85 @@
+&НаСервере
+Функция ПечатнаяФорма(ПараметрКоманды)
+	ТабличныйДокумент = Новый ТабличныйДокумент;
+	ТабличныйДокумент.ОтображатьСетку = Истина;
+	ТабличныйДокумент.ОтображатьЗаголовки = Истина;
+	
+	Сформирован = Ложь;
+	ТабМакет = Справочники.Товары.ПолучитьМакет("МакетПрайсЛиста"); 
+
+	Шапка = ТабМакет.ПолучитьОбласть("Шапка");
+	ТабличныйДокумент.Вывести(Шапка);
+
+	ОбластьНоменклатура = ТабМакет.ПолучитьОбласть("ОбластьНоменклатура");
+	
+	Запрос = Новый Запрос;
+    Запрос.Текст =  "ВЫБРАТЬ
+                    |    Товары.Код КАК Код,
+                    |    Товары.Наименование КАК Наименование,
+                    |    Товары.Артикул КАК Артикул,
+                    |    Товары.ФайлКартинки КАК Картинка,
+                    |    Товары.Описание КАК Описание,
+                    |    Товары.Вид КАК Вид,
+                    |    ЦеныТоваров.Цена КАК Цена
+                    |ИЗ
+                    |    РегистрСведений.ЦеныТоваров КАК ЦеныТоваров
+                    |        ЛЕВОЕ СОЕДИНЕНИЕ Справочник.Товары КАК Товары
+                    |        ПО ЦеныТоваров.Товар = Товары.Ссылка
+                    |ГДЕ
+                    |    Товары.ЭтоГруппа = ЛОЖЬ
+                    |    И ЦеныТоваров.ВидЦен = &ВидЦен
+                    |
+                    |УПОРЯДОЧИТЬ ПО
+                    |    Вид,
+                    |    Товары.Родитель.Код,
+                    |    Код";
+
+    Запрос.УстановитьПараметр("ВидЦен", Справочники.ВидыЦен.НайтиПоНаименованию("Розничная"));
+						
+	Выборка = Запрос.Выполнить().Выбрать();
+	Пока Выборка.Следующий() Цикл
+		ОбластьНоменклатура.Параметры.Заполнить(Выборка);
+		
+		Описание = "";
+		
+		Чтение = Новый ЧтениеHTML();
+		Чтение.УстановитьСтроку(Выборка.Описание);
+		
+		ДокDOM = Новый ПостроительDOM();
+		HTML = ДокDOM.Прочитать(Чтение);
+		
+		Если Не HTML.ЭлементДокумента = Неопределено Тогда
+			Для Каждого Узел из HTML.ЭлементДокумента.ДочерниеУзлы Цикл 
+				Если Узел.ИмяУзла = "body" Тогда
+					Для Каждого ЭлементОписания из Узел.ДочерниеУзлы Цикл 
+						Описание = Описание + ЭлементОписания.ТекстовоеСодержимое;
+					КонецЦикла;
+				КонецЕсли;
+			КонецЦикла;
+		КонецЕсли;
+		ОбластьНоменклатура.Параметры.Описание = Описание;
+		
+		Если (Выборка.Картинка <> Null) Тогда 
+			ОбластьНоменклатура.Параметры.ПараметрКартинки = Новый Картинка(Выборка.Картинка.ДанныеФайла.Получить());
+		КонецЕсли;
+		
+		ТабличныйДокумент.Вывести(ОбластьНоменклатура, Выборка.Уровень());
+		Сформирован = Истина;
+	КонецЦикла;
+	
+	Если Сформирован Тогда
+		Возврат ТабличныйДокумент;
+	Иначе 	
+		Возврат Неопределено;
+	КонецЕсли;	
+КонецФункции
+
+&НаКлиенте
+Процедура ОбработкаКоманды(ПараметрКоманды, ПараметрыВыполненияКоманды)
+	ТабличныйДокумент = ПечатнаяФорма(ПараметрКоманды);
+	
+	Если ТабличныйДокумент <> Неопределено Тогда
+		ТабличныйДокумент.Показать();
+	КонецЕсли;	
+	
+КонецПроцедуры

samples/1C Enterprise/CommonModule.ОбменМобильныеОбщее.Module.bsl

@@ -0,0 +1,109 @@
+// Процедура на основании анализа типа данных заменяет их на данные, удаляющие
+// информацию из узла в котором их не должно быть
+//
+// Параметры:
+//  Данные	– Объект, набор записей,... который нужно преобразовать
+//
+Процедура УдалениеДанных(Данные) 
+	
+	// Получаем объект описания метаданного, соответствующий данным
+	ОбъектМетаданных = ?(ТипЗнч(Данные) = Тип("УдалениеОбъекта"), Данные.Ссылка.Метаданные(), Данные.Метаданные());
+    // Проверяем тип, интересуют только те типы, которые реализованы на мобильной платформе
+	Если Метаданные.Справочники.Содержит(ОбъектМетаданных)
+	 	ИЛИ Метаданные.Документы.Содержит(ОбъектМетаданных) Тогда
+		
+		// Перенос удаления объекта для объектных
+		Данные = Новый УдалениеОбъекта(Данные.Ссылка);
+		
+	ИначеЕсли Метаданные.РегистрыСведений.Содержит(ОбъектМетаданных)
+		ИЛИ Метаданные.РегистрыНакопления.Содержит(ОбъектМетаданных)
+		ИЛИ Метаданные.Последовательности.Содержит(ОбъектМетаданных) Тогда
+		
+		// Очищаем данные
+		Данные.Очистить();
+		
+	КонецЕсли;	
+	
+КонецПроцедуры
+
+// Функция формирует пакет обмена, который будет отправлен узлу "УзелОбмена" 
+//
+// Параметры:
+//  УзелОбмена	– узел плана обмена "мобильные", с которым осуществляется обмен
+//
+// Возвращаемое значение:
+//  сформированный пакет, помещенный в хранилище значения
+Функция СформироватьПакетОбмена(УзелОбмена) Экспорт
+    
+	ЗаписьXML = Новый ЗаписьXML;
+	
+	ЗаписьXML.УстановитьСтроку("UTF-8");
+	ЗаписьXML.ЗаписатьОбъявлениеXML();
+    
+	ЗаписьСообщения = ПланыОбмена.СоздатьЗаписьСообщения();
+    ЗаписьСообщения.НачатьЗапись(ЗаписьXML, УзелОбмена);					
+    
+	ЗаписьXML.ЗаписатьСоответствиеПространстваИмен("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+	ЗаписьXML.ЗаписатьСоответствиеПространстваИмен("v8",  "http://v8.1c.ru/data");
+    
+	ТипДанныхУдаления = Тип("УдалениеОбъекта");
+    
+	ВыборкаИзменений = ПланыОбмена.ВыбратьИзменения(УзелОбмена, ЗаписьСообщения.НомерСообщения);
+	Пока ВыборкаИзменений.Следующий() Цикл
+		
+		Данные = ВыборкаИзменений.Получить();
+        
+		// Если перенос данных не нужен, то, возможно, необходимо записать удаление данных
+		Если Не ОбменМобильныеПереопределяемый.НуженПереносДанных(Данные, УзелОбмена) Тогда
+			
+			// Получаем значение с возможным удалением данных
+			УдалениеДанных(Данные); 
+            
+		КонецЕсли;	
+		
+		// Записываем данные в сообщение
+		ОбменМобильныеПереопределяемый.ЗаписатьДанные(ЗаписьXML, Данные);
+        
+    КонецЦикла;
+    
+	ЗаписьСообщения.ЗакончитьЗапись();
+    
+	Возврат Новый ХранилищеЗначения(ЗаписьXML.Закрыть(), Новый СжатиеДанных(9));
+    
+КонецФункции
+
+// Процедура вносит в информационную базу данные, которые присланы из узла "УзелОбмена" 
+//
+// Параметры:
+//  УзелОбмена	– узел плана обмена "мобильные", с которым осуществляется обмен
+//  ДанныеОбмена - пакет обмена полученный из узла УзелОбмена, помещен в ХранилищеЗначения
+//
+Процедура ПринятьПакетОбмена(УзелОбмена, ДанныеОбмена) Экспорт
+    
+	ЧтениеXML = Новый ЧтениеXML;
+	ЧтениеXML.УстановитьСтроку(ДанныеОбмена.Получить());
+    ЧтениеСообщения = ПланыОбмена.СоздатьЧтениеСообщения();
+	ЧтениеСообщения.НачатьЧтение(ЧтениеXML);
+    ПланыОбмена.УдалитьРегистрациюИзменений(ЧтениеСообщения.Отправитель,ЧтениеСообщения.НомерПринятого);
+
+    НачатьТранзакцию();
+    Пока ВозможностьЧтенияXML(ЧтениеXML) Цикл
+        
+		Данные = ОбменМобильныеПереопределяемый.ПрочитатьДанные(ЧтениеXML);
+        
+		Если Не Данные = Неопределено Тогда
+			
+            Данные.ОбменДанными.Отправитель = ЧтениеСообщения.Отправитель;
+            Данные.ОбменДанными.Загрузка = Истина;
+            
+            Данные.Записать();
+        
+        КонецЕсли;
+        
+    КонецЦикла;
+    ЗафиксироватьТранзакцию();
+    
+    ЧтениеСообщения.ЗакончитьЧтение();
+    ЧтениеXML.Закрыть();
+    
+КонецПроцедуры

samples/1C Enterprise/Document.РасходТовара.ObjectModule.bsl

@@ -0,0 +1,302 @@
+//////////////////////////////////////////////////////////////////////////////// 
+
+// ПРОЦЕДУРЫ И ФУНКЦИИ
+
+//
+
+
+
+// Формирование печатной формы документа
+
+// 
+
+// Параметры: 
+
+//  Нет. 
+
+// 
+
+// Возвращаемое значение: 
+
+//  ТабличныйДокумент - Сформированный табличный документ.
+
+Процедура ПечатнаяФорма(ТабличныйДокумент) Экспорт
+
+
+	Макет = Документы.РасходТовара.ПолучитьМакет("МакетПечати");
+
+
+	// Заголовок
+
+	Область = Макет.ПолучитьОбласть("Заголовок");
+
+	ТабличныйДокумент.Вывести(Область);
+
+
+	// Шапка
+
+	Шапка = Макет.ПолучитьОбласть("Шапка");
+
+	Шапка.Параметры.Заполнить(ЭтотОбъект);
+
+	ТабличныйДокумент.Вывести(Шапка);
+
+
+	// Товары
+
+	Область = Макет.ПолучитьОбласть("ТоварыШапка");
+
+	ТабличныйДокумент.Вывести(Область);
+
+	ОбластьТовары = Макет.ПолучитьОбласть("Товары");
+
+
+	Для каждого ТекСтрокаТовары Из Товары Цикл
+
+
+		ОбластьТовары.Параметры.Заполнить(ТекСтрокаТовары);
+
+		ТабличныйДокумент.Вывести(ОбластьТовары);
+
+
+	КонецЦикла;
+
+
+КонецПроцедуры
+
+
+// Формирование печатной формы документа
+// 
+// Параметры: 
+//  Нет. 
+// 
+// Возвращаемое значение: 
+//  ТабличныйДокумент - Сформированный табличный документ.
+Процедура Пересчитать() Экспорт
+
+	Для каждого ТекСтрокаТовары Из Товары Цикл
+
+		ТекСтрокаТовары.Сумма = ТекСтрокаТовары.Количество * ТекСтрокаТовары.Цена;
+
+	КонецЦикла;
+
+КонецПроцедуры
+
+////////////////////////////////////////////////////////////////////////////////
+
+// ОБРАБОТЧИКИ СОБЫТИЙ ОБЪЕКТА
+
+
+Процедура ОбработкаПроведения(Отказ, Режим)
+
+	// Формирование движений регистров накопления ТоварныеЗапасы и Продажи.
+	Движения.ТоварныеЗапасы.Записывать = Истина;
+	Движения.Продажи.Записывать = Истина;
+	Если Режим = РежимПроведенияДокумента.Оперативный Тогда
+		Движения.ТоварныеЗапасы.БлокироватьДляИзменения = Истина;
+	КонецЕсли;	
+
+	// Создадим запрос, чтобы получать информацию об услугах
+	Запрос = Новый Запрос("ВЫБРАТЬ
+						  |    ТоварыВДокументе.НомерСтроки КАК НомерСтроки
+						  |ИЗ
+						  |    Документ.РасходТовара.Товары КАК ТоварыВДокументе
+						  |ГДЕ
+						  |    ТоварыВДокументе.Ссылка = &Ссылка
+						  |    И ТоварыВДокументе.Товар.Вид = ЗНАЧЕНИЕ(Перечисление.ВидыТоваров.Услуга)");
+
+	Запрос.УстановитьПараметр("Ссылка", Ссылка);
+	РезультатУслуги = Запрос.Выполнить().Выгрузить();
+	РезультатУслуги.Индексы.Добавить("НомерСтроки");
+
+	Для каждого ТекСтрокаТовары Из Товары Цикл
+
+		Строка = РезультатУслуги.Найти(ТекСтрокаТовары.НомерСтроки, "НомерСтроки");
+		Если Строка = Неопределено Тогда
+			
+			// Не услуга
+			Движение = Движения.ТоварныеЗапасы.Добавить();
+			Движение.ВидДвижения = ВидДвиженияНакопления.Расход;
+			Движение.Период = Дата;
+			Движение.Товар = ТекСтрокаТовары.Товар;
+			Движение.Склад = Склад;
+			Движение.Количество = ТекСтрокаТовары.Количество;
+
+		КонецЕсли;
+
+		Движение = Движения.Продажи.Добавить();
+		Движение.Период = Дата;
+		Движение.Товар = ТекСтрокаТовары.Товар;
+		Движение.Покупатель = Покупатель;
+		Движение.Количество = ТекСтрокаТовары.Количество;
+		Движение.Сумма = ТекСтрокаТовары.Сумма;
+
+	КонецЦикла;
+
+	// Формирование движения регистра накопления Взаиморасчеты.
+	Движения.Взаиморасчеты.Записывать = Истина;
+	Движение = Движения.Взаиморасчеты.Добавить();
+	Движение.ВидДвижения = ВидДвиженияНакопления.Расход;
+	Движение.Период = Дата;
+	Движение.Контрагент = Покупатель;
+	Движение.Валюта = Валюта;
+
+	Если Валюта.Пустая() Тогда
+		Движение.Сумма = Товары.Итог("Сумма");
+	Иначе
+
+		Курс = РегистрыСведений.КурсыВалют.ПолучитьПоследнее(Дата, Новый Структура("Валюта", Валюта)).Курс;
+
+		Если Курс = 0 Тогда
+			Движение.Сумма = Товары.Итог("Сумма");
+		Иначе
+			Движение.Сумма = Товары.Итог("Сумма") / Курс;
+		КонецЕсли;
+
+	КонецЕсли;
+
+	//Запишем движения
+	Движения.Записать();
+	
+	//Контроль остатков при оперативном проведении
+	Если Режим = РежимПроведенияДокумента.Оперативный Тогда
+		// Создадим запрос, чтобы контролировать остатки по товарам
+		Запрос = Новый Запрос("ВЫБРАТЬ
+							  |    ТоварыВДокументе.Товар КАК Товар,
+							  |    СУММА(ТоварыВДокументе.Количество) КАК Количество,
+							  |    МАКСИМУМ(ТоварыВДокументе.НомерСтроки) КАК НомерСтроки
+							  |
+							  |ПОМЕСТИТЬ ТребуетсяТовара
+							  |
+							  |ИЗ
+							  |    Документ.РасходТовара.Товары КАК ТоварыВДокументе
+							  |
+							  |ГДЕ
+							  |    ТоварыВДокументе.Ссылка = &Ссылка
+							  |    И ТоварыВДокументе.Товар.Вид = ЗНАЧЕНИЕ(Перечисление.ВидыТоваров.Товар)
+							  |
+							  |СГРУППИРОВАТЬ ПО
+							  |    ТоварыВДокументе.Товар
+							  |
+							  |ИНДЕКСИРОВАТЬ ПО
+							  |    Товар
+							  |;
+							  |
+							  |////////////////////////////////////////////////////////////////////////////////
+							  |ВЫБРАТЬ
+							  |    ПРЕДСТАВЛЕНИЕ(ТребуетсяТовара.Товар) КАК ТоварПредставление,
+							  |    ВЫБОР
+							  |        КОГДА - ЕСТЬNULL(ТоварныеЗапасыОстатки.КоличествоОстаток, 0) > ТоварыВДокументе.Количество
+							  |            ТОГДА ТоварыВДокументе.Количество
+							  |        ИНАЧЕ - ЕСТЬNULL(ТоварныеЗапасыОстатки.КоличествоОстаток, 0)
+							  |    КОНЕЦ КАК Нехватка,
+							  |    ТоварыВДокументе.Количество - ВЫБОР
+							  |        КОГДА - ЕСТЬNULL(ТоварныеЗапасыОстатки.КоличествоОстаток, 0) > ТоварыВДокументе.Количество
+							  |            ТОГДА ТоварыВДокументе.Количество
+							  |        ИНАЧЕ - ЕСТЬNULL(ТоварныеЗапасыОстатки.КоличествоОстаток, 0)
+							  |    КОНЕЦ КАК МаксимальноеКоличество,
+							  |    ТребуетсяТовара.НомерСтроки КАК НомерСтроки
+							  |
+							  |ИЗ
+							  |    ТребуетсяТовара КАК ТребуетсяТовара
+							  |        ЛЕВОЕ СОЕДИНЕНИЕ РегистрНакопления.ТоварныеЗапасы.Остатки(
+							  |                ,
+							  |                Товар В
+							  |                        (ВЫБРАТЬ
+							  |                            ТребуетсяТовара.Товар
+							  |                        ИЗ
+							  |                            ТребуетсяТовара)
+							  |                    И Склад = &Склад) КАК ТоварныеЗапасыОстатки
+							  |        ПО ТребуетсяТовара.Товар = ТоварныеЗапасыОстатки.Товар
+							  |        ЛЕВОЕ СОЕДИНЕНИЕ Документ.РасходТовара.Товары КАК ТоварыВДокументе
+							  |        ПО ТребуетсяТовара.Товар = ТоварыВДокументе.Товар
+							  |            И ТребуетсяТовара.НомерСтроки = ТоварыВДокументе.НомерСтроки
+							  |
+							  |ГДЕ
+							  |    ТоварыВДокументе.Ссылка = &Ссылка И
+							  |    0 > ЕСТЬNULL(ТоварныеЗапасыОстатки.КоличествоОстаток, 0)
+							  |
+							  |УПОРЯДОЧИТЬ ПО
+							  |    НомерСтроки");
+
+		Запрос.УстановитьПараметр("Склад", Склад);
+		Запрос.УстановитьПараметр("Ссылка", Ссылка);
+		РезультатСНехваткой = Запрос.Выполнить();
+
+		ВыборкаРезультатаСНехваткой = РезультатСНехваткой.Выбрать();
+
+		// Выдадим ошибки для строк, в которых не хватает остатка
+		Пока ВыборкаРезультатаСНехваткой.Следующий() Цикл
+
+			Сообщение = Новый СообщениеПользователю();
+			Сообщение.Текст = НСтр("ru = 'Не хватает '", "ru") 
+				+ ВыборкаРезультатаСНехваткой.Нехватка 
+				+ НСтр("ru = ' единиц товара'", "ru") + """" 
+				+ ВыборкаРезультатаСНехваткой.ТоварПредставление 
+				+ """" 
+				+ НСтр("ru = ' на складе'", "ru") 
+				+ """" 
+				+ Склад 
+				+ """." 
+				+ НСтр("ru = 'Максимальное количество: '", "ru") 
+				+ ВыборкаРезультатаСНехваткой.МаксимальноеКоличество 
+				+ ".";
+			Сообщение.Поле = НСтр("ru = 'Товары'", "ru") 
+				+ "[" 
+				+ (ВыборкаРезультатаСНехваткой.НомерСтроки - 1) 
+				+ "]." 
+				+ НСтр("ru = 'Количество'", "ru");
+			Сообщение.УстановитьДанные(ЭтотОбъект);
+			Сообщение.Сообщить();
+			Отказ = Истина;
+
+		КонецЦикла;
+
+	КонецЕсли;
+	
+КонецПроцедуры
+
+Процедура ОбработкаПроверкиЗаполнения(Отказ, ПроверяемыеРеквизиты)		
+	// Проверим заполненность поля "Покупатель"
+
+	Если Покупатель.Пустая() Тогда
+
+
+		// Если поле Покупатель не заполнено, сообщим об этом пользователю
+
+		Сообщение = Новый СообщениеПользователю();
+
+		Сообщение.Текст = НСтр("ru = 'Не указан Покупатель, для которого выписывается накладная!'", "ru");
+
+		Сообщение.Поле = НСтр("ru = 'Покупатель'", "ru");
+		Сообщение.УстановитьДанные(ЭтотОбъект);
+
+
+		Сообщение.Сообщить();
+
+
+
+		// Сообщим платформе, что мы сами обработали проверку заполнения поля "Покупатель"
+
+		ПроверяемыеРеквизиты.Удалить(ПроверяемыеРеквизиты.Найти("Покупатель"));
+
+		// Так как информация в документе не консистентна, то продолжать работу дальше смысла нет
+
+		Отказ = Истина;
+
+
+	КонецЕсли;
+
+
+	//Если склад не заполнен, то проверим есть ли в документе что-то кроме услуг
+	Если Склад.Пустая() И Товары.Количество() > 0 Тогда
+
+		// Создадим запрос, чтобы получать информацию об товарах
+		Запрос = Новый Запрос("ВЫБРАТЬ
+							  |    Количество(*) КАК Количество
+							  |ИЗ
+							  |    Справочник.Товары КАК Товары
+							  |ГДЕ
+							  |    Товары.Ссылка В (&ТоварыВДокументе)
+							  |    И Товары.Вид = ЗНАЧЕНИЕ(Перечисление.ВидыТоваров.Товар)");
+

samples/1C Enterprise/ci_before_script.os

@@ -0,0 +1,20 @@
+Каталог = ОбъединитьПути(ТекущийКаталог(), "libs\oscript-library\src");
+Загрузчик_Оригинал_ИмяФайла = ОбъединитьПути(Каталог, "package-loader.os");
+
+Файлы = НайтиФайлы(Каталог, , Ложь);
+Для Каждого ВыбФайл Из Файлы Цикл
+
+    Если ВыбФайл.ЭтоФайл() Тогда
+        Продолжить;
+    КонецЕсли;
+
+    Загрузчик_ИмяФайла = ОбъединитьПути(ВыбФайл.ПолноеИмя, "package-loader.os");
+    Загрузчик_Файл = Новый Файл(Загрузчик_ИмяФайла);
+
+    Если Загрузчик_Файл.Существует() Тогда
+        Продолжить;
+    КонецЕсли;
+
+    КопироватьФайл(Загрузчик_Оригинал_ИмяФайла, Загрузчик_ИмяФайла);
+
+КонецЦикла;

samples/1C Enterprise/test_canCompile.os

@@ -0,0 +1,42 @@
+#Использовать "../libs/oscript-library/src/v8runner"
+#Использовать "../libs/oscript-library/src/tempfiles"
+
+Перем Лог;
+Перем КодВозврата;
+
+Процедура Инициализация()
+
+	Лог = Логирование.ПолучитьЛог("oscript.app.gitlab-test_CanCompile");
+	КодВозврата = 0;
+
+КонецПроцедуры
+
+Процедура ВыполнитьТест()
+
+	Конфигуратор = Новый УправлениеКонфигуратором();
+
+	ПараметрыЗапуска = Конфигуратор.ПолучитьПараметрыЗапуска();
+	КомандаЗапуска = "/LoadConfigFromFiles ""%1""";
+	КомандаЗапуска = СтрШаблон(КомандаЗапуска, ТекущийКаталог() + "\source\cf");
+
+	Лог.Информация("Команда обновления конфигурации: " + КомандаЗапуска);
+
+	ПараметрыЗапуска.Добавить(КомандаЗапуска);
+
+	Попытка
+	    Конфигуратор.ВыполнитьКоманду(ПараметрыЗапуска);
+	Исключение
+
+	    Лог.Ошибка(Конфигуратор.ВыводКоманды());
+	    КодВозврата = 1;
+
+	КонецПопытки;
+
+	УдалитьФайлы(Конфигуратор.ПутьКВременнойБазе());
+
+КонецПроцедуры
+
+Инициализация();
+ВыполнитьТест();
+
+ЗавершитьРаботу(КодВозврата);

samples/AMPL/CT2.mod

@@ -0,0 +1,58 @@
+param num_beams;                  # number of beams
+
+param num_rows >= 1, integer;     # number of rows
+param num_cols >= 1, integer;     # number of columns 
+
+set BEAMS   := 1 .. num_beams;    # set of beams
+
+set ROWS    := 1 .. num_rows;	  # set of rows
+set COLUMNS := 1 .. num_cols;	  # set of columns
+
+# values for entries of each beam
+param beam_values {BEAMS, ROWS, COLUMNS} >= 0; 
+
+# values of tumor
+param tumor_values {ROWS, COLUMNS} >= 0; 
+
+# values of critical area
+param critical_values {ROWS, COLUMNS} >= 0; 
+
+# critical maximum dosage requirement
+param critical_max;
+
+# tumor minimum dosage requirement
+param tumor_min;
+
+# dosage scalar of each beam
+var X {i in BEAMS} >= 0;
+
+
+# define the tumor area which includes the locations where tumor exists
+set tumor_area := {k in ROWS, h in COLUMNS: tumor_values[k,h] > 0};
+
+# define critical area 
+set critical_area := {k in ROWS, h in COLUMNS: critical_values[k,h] > 0};
+
+var S {(k,h) in tumor_area} >= 0;
+var T {(k,h) in critical_area} >= 0;
+
+# maximize total dosage in tumor area
+maximize total_tumor_dosage: sum {i in BEAMS} sum {(k,h) in tumor_area} X[i] * beam_values[i,k,h];
+
+# minimize total dosage in critical area
+minimize total_critical_dosage: sum {i in BEAMS} sum {(k,h) in critical_area} X[i] * beam_values[i,k,h];
+
+# minimize total tumor slack
+minimize total_tumor_slack: sum {(k,h) in tumor_area} S[k,h];
+
+# minimize total critical area slack
+minimize total_critical_slack: sum {(k,h) in critical_area} T[k,h];
+
+# total dosage at each tumor location [k,h] should be >= min tumor dosage with slack variable
+subject to tumor_limit {(k,h) in tumor_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == tumor_min - S[k,h];
+
+# total dosage at each critical location [k,h] should be = max critical dosage with slack variable
+subject to critical_limit {(k,h) in critical_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == critical_max + T[k,h];
+
+
+

samples/AMPL/toy.ampl

@@ -0,0 +1,25 @@
+# A toy knapsack problem from the LocalSolver docs written in AMPL.
+
+set I;
+param Value{I};
+param Weight{I};
+param KnapsackBound;
+var Take{I} binary;
+
+maximize TotalValue: sum{i in I} Take[i] * Value[i];
+s.t. WeightLimit: sum{i in I} Take[i] * Weight[i] <= KnapsackBound;
+
+data;
+
+param:
+I: Weight Value :=
+0    10     1
+1    60    10
+2    30    15
+3    40    40
+4    30    60
+5    20    90
+6    20   100
+7     2    15;
+
+param KnapsackBound := 102;

samples/API Blueprint/actions.apib

@@ -0,0 +1,55 @@
+FORMAT: 1A
+
+# Advanced Action API
+A resource action is – in fact – a state transition. This API example demonstrates an action - state transition - to another resource.
+
+## API Blueprint
++ [Previous: Resource Model](11.%20Resource%20Model.md)
++ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/11.%20Advanced%20Action.md)
+
+# Tasks [/tasks/tasks{?status,priority}]
+
++ Parameters
+    + status (string)
+    + priority (number)
+
+## List All Tasks [GET]
+
++ Response 200 (application/json)
+
+        [
+            {
+                "id": 123,
+                "name": "Exercise in gym",
+                "done": false,
+                "type": "task"
+            },
+            {
+                "id": 124,
+                "name": "Shop for groceries",
+                "done": true,
+                "type": "task"
+            }
+        ]
+
+## Retrieve Task [GET /task/{id}]
+This is a state transition to another resource
+
++ Parameters
+    + id (string)
+
++ Response 200 (application/json)
+
+        {
+            "id": 123,
+            "name": "Go to gym",
+            "done": false,
+            "type": "task"
+        }
+
+## Delete Task [DELETE /task/{id}]
+
++ Parameters
+    + id (string)
+
++ Response 204

samples/API Blueprint/attributes.apib

@@ -0,0 +1,39 @@
+FORMAT: 1A
+
+# Attributes API
+This API example demonstrates how to describe body attributes of a request or response message.
+
+In this case, the description is complementary (and duplicate!) to the provided JSON example in the body section. The [Advanced Attributes](09.%20Advanced%20Attributes.md) API example will demonstrate how to avoid duplicates and how to reuse attributes descriptions.
+
+## API Blueprint
++ [Previous: Parameters](07.%20Parameters.md)
++ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/08.%20Attributes.md)
++ [Next: Advanced Attributes](09.%20Advanced%20Attributes.md)
+
+# Group Coupons
+
+## Coupon [/coupons/{id}]
+A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
+
+### Retrieve a Coupon [GET]
+Retrieves the coupon with the given ID.
+
++ Response 200 (application/json)
+
+    + Attributes (object)
+        + id: 250FF (string)
+        + created: 1415203908 (number) - Time stamp
+        + percent_off: 25 (number)
+
+            A positive integer between 1 and 100 that represents the discount the coupon will apply.
+
+        + redeem_by (number) - Date after which the coupon can no longer be redeemed
+
+    + Body
+
+            {
+                "id": "250FF",
+                "created": 1415203908,
+                "percent_off": 25,
+                "redeem_by:" null
+            }

samples/API Blueprint/simple.apib

@@ -0,0 +1,18 @@
+FORMAT: 1A
+
+# The Simplest API
+This is one of the simplest APIs written in the **API Blueprint**.
+One plain resource combined with a method and that's it! We will explain what is going on in the next installment - [Resource and Actions](02.%20Resource%20and%20Actions.md).
+
+**Note:** As we progress through the examples, do not also forget to view the [Raw](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md) code to see what is really going on in the API Blueprint, as opposed to just seeing the output of the Github Markdown parser.
+
+Also please keep in mind that every single example in this course is a **real API Blueprint** and as such you can **parse** it with the [API Blueprint parser](https://github.com/apiaryio/drafter) or one of its [bindings](https://github.com/apiaryio/drafter#bindings).
+
+## API Blueprint
++ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md)
++ [Next: Resource and Actions](02.%20Resource%20and%20Actions.md)
+
+# GET /message
++ Response 200 (text/plain)
+
+        Hello World!

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

samples/ASN.1/example.asn

@@ -0,0 +1,33 @@
+MyShopPurchaseOrders DEFINITIONS AUTOMATIC TAGS ::= BEGIN
+
+PurchaseOrder ::= SEQUENCE {
+dateOfOrder	DATE,
+customer   	CustomerInfo,
+items      	ListOfItems
+}
+
+CustomerInfo ::= SEQUENCE {
+companyName	   VisibleString (SIZE (3..50)),
+billingAddress	Address,
+contactPhone   NumericString (SIZE (7..12))
+}
+
+Address::= SEQUENCE {
+street	 VisibleString (SIZE (5 .. 50)) OPTIONAL,
+city	   VisibleString (SIZE (2..30)),
+state	  VisibleString (SIZE(2) ^ FROM ("A".."Z")),
+zipCode	NumericString (SIZE(5 | 9))
+}
+
+ListOfItems ::= SEQUENCE (SIZE (1..100)) OF Item
+
+Item ::= SEQUENCE {
+itemCode	       INTEGER (1..99999),
+color          	VisibleString ("Black" | "Blue" | "Brown"),
+power          	INTEGER (110 | 220),
+deliveryTime   	INTEGER (8..12 | 14..19),
+quantity	       INTEGER (1..1000),
+unitPrice	      REAL (1.00 .. 9999.00),
+isTaxable	      BOOLEAN
+}
+END

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] *)

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] *)

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] *)

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] *)

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] *)

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] *)

samples/ATS/main.atxt

@@ -1,215 +0,0 @@
-%{
-#include "./../ATEXT/atextfun.hats"
-%}
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>EFFECTIVATS-DiningPhil2</title>
-#patscode_style()
-</head>
-
-<body>
-
-<h1>
-Effective ATS: Dining Philosophers
-</h1>
-
-In this article, I present an implementation of a slight variant of the
-famous problem of 5-Dining-Philosophers by Dijkstra that makes simple but
-convincing use of linear types.
-
-<h2>
-The Original Problem 
-</h2>
-
-There are five philosophers sitting around a table and there are also 5
-forks placed on the table such that each fork is located between the left
-hand of a philosopher and the right hand of another philosopher. Each
-philosopher does the following routine repeatedly: thinking and dining.  In
-order to dine, a philosopher needs to first acquire two forks: one located
-on his left-hand side and the other on his right-hand side. After
-finishing dining, a philosopher puts the two acquired forks onto the table:
-one on his left-hand side and the other on his right-hand side.
-
-<h2>
-A Variant of the Original Problem 
-</h2>
-
-The following twist is added to the original version:
-
-<p>
-
-After a fork is used, it becomes a "dirty" fork and needs to be put in a
-tray for dirty forks. There is a cleaner who cleans dirty forks and then
-puts them back on the table.
-
-<h2>
-Channels for Communication
-</h2>
-
-A channel is just a shared queue of fixed capacity. The following two
-functions are for inserting an element into and taking an element out of a
-given channel:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun{a:vt0p} channel_insert (channel (a), a): void
-fun{a:vt0p} channel_takeout (chan: channel (a)): (a) 
-")</pre>
-
-If [channel_insert] is called on a channel that is full, then the caller is
-blocked until an element is taken out of the channel.  If [channel_takeout]
-is called on a channel that is empty, then the caller is blocked until an
-element is inserted into the channel.
-
-<h2>
-A Channel for Each Fork
-</h2>
-
-Forks are resources given a linear type. Each fork is initially stored in a
-channel, which can be obtained by calling the following function:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun fork_changet (n: nphil): channel(fork)
-")</pre>
-
-where the type [nphil] is defined to be [natLt(5)] (for natural numbers
-less than 5). The channels for storing forks are chosen to be of capacity
-2. The reason that channels of capacity 2 are chosen to store at most one
-element (in each of them) is to guarantee that these channels can never be
-full (so that there is no attempt made to send signals to awake callers
-supposedly being blocked due to channels being full).
-
-
-<h2>
-A Channel for the Fork Tray
-</h2>
-
-A tray for storing "dirty" forks is also a channel, which can be obtained
-by calling the following function:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun forktray_changet ((*void*)): channel(fork)
-")</pre>
-
-The capacity chosen for the channel is 6 (instead of 5) so that it can
-never become full (as there are only 5 forks in total).
-
-<h2>
-Philosopher Loop
-</h2>
-
-Each philosopher is implemented as a loop:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-phil_loop (n) = let
-//
-val () = phil_think (n)
-//
-val nl = phil_left (n) // = n
-val nr = phil_right (n) // = (n+1) % 5
-//
-val ch_lfork = fork_changet (nl)
-val ch_rfork = fork_changet (nr)
-//
-val lf = channel_takeout (ch_lfork)
-val () = println! ("phil_loop(", n, ") picks left fork")
-//
-val () = randsleep (2) // sleep up to 2 seconds
-//
-val rf = channel_takeout (ch_rfork)
-val () = println! ("phil_loop(", n, ") picks right fork")
-//
-val () = phil_dine (n, lf, rf)
-//
-val ch_forktray = forktray_changet ()
-val () = channel_insert (ch_forktray, lf) // left fork to dirty tray
-val () = channel_insert (ch_forktray, rf) // right fork to dirty tray
-//
-in
-  phil_loop (n)
-end // end of [phil_loop]
-')</pre>
-
-It should be straighforward to follow the code for [phil_loop].
-
-<h2>
-Fork Cleaner Loop
-</h2>
-
-A cleaner is implemented as a loop:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-cleaner_loop () = let
-//
-val ch = forktray_changet ()
-val f0 = channel_takeout (ch) // [f0] is dirty
-//
-val () = cleaner_wash (f0) // washes dirty [f0]
-val () = cleaner_return (f0) // puts back cleaned [f0]
-//
-in
-  cleaner_loop ()
-end // end of [cleaner_loop]
-')</pre>
-
-The function [cleaner_return] first finds out the number of a given fork
-and then uses the number to locate the channel for storing the fork. Its
-actual implementation is given as follows:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-cleaner_return (f) =
-{
-  val n = fork_get_num (f)
-  val ch = fork_changet (n)
-  val () = channel_insert (ch, f)
-}
-')</pre>
-
-It should now be straighforward to follow the code for [cleaner_loop].
-
-<h2>
-Testing
-</h2>
-
-The entire code of this implementation is stored in the following files:
-
-<pre>
-DiningPhil2.sats
-DiningPhil2.dats
-DiningPhil2_fork.dats
-DiningPhil2_thread.dats
-</pre>
-
-There is also a Makefile available for compiling the ATS source code into
-an excutable for testing. One should be able to encounter a deadlock after
-running the simulation for a while.
-
-<hr size="2">
-
-This article is written by <a href="http://www.cs.bu.edu/~hwxi/">Hongwei Xi</a>.
-
-</body>
-</html>
-
-%{
-implement main () = fprint_filsub (stdout_ref, "main_atxt.txt")
-%}

samples/Alpine 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"

samples/ApacheConf/apache.vhost

@@ -0,0 +1,17 @@
+#######################
+# HOSTNAME
+######################
+
+<VirtualHost 127.0.0.1:PORT>
+    ServerAdmin patrick@heysparkbox.com
+    DocumentRoot "/var/www/HOSTNAME"
+    ServerName HOSTNAME
+
+    <Directory "/var/www/HOSTNAME">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride All
+       Order allow,deny
+       Allow from all
+       DirectoryIndex index.php
+   </Directory>
+</VirtualHost>

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);
+  }
+  
+}

samples/AsciiDoc/list.asc

@@ -1,6 +1,9 @@
 AsciiDoc Home Page
 ==================
 
+Title
+-----
+
 Example Articles
 ~~~~~~~~~~~~~~~~
 - Item 1

samples/Assembly/fp_sqr32_160_comba.inc

@@ -0,0 +1,245 @@
+
+    push r2
+    dint
+    nop
+    bis #MPYDLYWRTEN,&MPY32CTL0
+    bic #MPYDLY32,&MPY32CTL0
+    mov #SUMEXT,r13
+    clr r12
+
+    mov @r15+,r4
+    mov @r15+,r5
+
+    mov @r15+,r6
+    mov @r15+,r7
+
+    mov @r15+,r8
+    mov @r15+,r9
+
+    mov @r15+,r10
+    mov @r15+,r11
+
+    sub #2*8,r15
+
+    /* SELF_STEP_FIRST */
+    mov r4,&MPY32L
+    mov r5,&MPY32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*0(r14)
+    mov &RES1,2*(0+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r6,&OP2L
+    mov r7,&OP2H
+    add &SUMEXT,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*2(r14)
+    add @r13,r12
+    mov &RES1,2*(2+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* SELF_STEP */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*4(r14)
+    add @r13,r12
+    mov &RES1,2*(4+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*6(r14)
+    add @r13,r12
+    mov &RES1,2*(6+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+    add &SUMEXT,r12
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* SELF_STEP */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*8(r14)
+    add @r13,r12
+    mov &RES1,2*(8+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    mov 2*8(r15),r4
+    mov 2*(8+1)(r15),r5
+
+    /* STEP_1 */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* STEP_2MORE */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*10(r14)
+    add @r13,r12
+    mov &RES1,2*(10+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* SELF_STEP */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*12(r14)
+    add @r13,r12
+    mov &RES1,2*(12+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*14(r14)
+    add @r13,r12
+    mov &RES1,2*(14+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* SELF_STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*16(r14)
+    add @r13,r12
+    mov &RES1,2*(16+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* END */
+    mov &RES0,2*18(r14)
+    mov &RES1,2*(18+1)(r14)
+    pop r2
+    eint

samples/Assembly/lib.inc

@@ -0,0 +1,170 @@
+
+; ------------------------------------------------------------------------
+; 显示 AL 中的数字
+; ------------------------------------------------------------------------
+DispAL:
+	push	ecx
+	push	edx
+	push	edi
+
+	mov	edi, [dwDispPos]
+
+	mov	ah, 0Fh			; 0000b: 黑底    1111b: 白字
+	mov	dl, al
+	shr	al, 4
+	mov	ecx, 2
+.begin:
+	and	al, 01111b
+	cmp	al, 9
+	ja	.1
+	add	al, '0'
+	jmp	.2
+.1:
+	sub	al, 0Ah
+	add	al, 'A'
+.2:
+	mov	[gs:edi], ax
+	add	edi, 2
+
+	mov	al, dl
+	loop	.begin
+	;add	edi, 2
+
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	edx
+	pop	ecx
+
+	ret
+; DispAL 结束-------------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 显示一个整形数
+; ------------------------------------------------------------------------
+DispInt:
+	mov	eax, [esp + 4]
+	shr	eax, 24
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 16
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 8
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	call	DispAL
+
+	mov	ah, 07h			; 0000b: 黑底    0111b: 灰字
+	mov	al, 'h'
+	push	edi
+	mov	edi, [dwDispPos]
+	mov	[gs:edi], ax
+	add	edi, 4
+	mov	[dwDispPos], edi
+	pop	edi
+
+	ret
+; DispInt 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 显示一个字符串
+; ------------------------------------------------------------------------
+DispStr:
+	push	ebp
+	mov	ebp, esp
+	push	ebx
+	push	esi
+	push	edi
+
+	mov	esi, [ebp + 8]	; pszInfo
+	mov	edi, [dwDispPos]
+	mov	ah, 0Fh
+.1:
+	lodsb
+	test	al, al
+	jz	.2
+	cmp	al, 0Ah	; 是回车吗?
+	jnz	.3
+	push	eax
+	mov	eax, edi
+	mov	bl, 160
+	div	bl
+	and	eax, 0FFh
+	inc	eax
+	mov	bl, 160
+	mul	bl
+	mov	edi, eax
+	pop	eax
+	jmp	.1
+.3:
+	mov	[gs:edi], ax
+	add	edi, 2
+	jmp	.1
+
+.2:
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	esi
+	pop	ebx
+	pop	ebp
+	ret
+; DispStr 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 换行
+; ------------------------------------------------------------------------
+DispReturn:
+	push	szReturn
+	call	DispStr			;printf("\n");
+	add	esp, 4
+
+	ret
+; DispReturn 结束---------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 内存拷贝，仿 memcpy
+; ------------------------------------------------------------------------
+; void* MemCpy(void* es:pDest, void* ds:pSrc, int iSize);
+; ------------------------------------------------------------------------
+MemCpy:
+	push	ebp
+	mov	ebp, esp
+
+	push	esi
+	push	edi
+	push	ecx
+
+	mov	edi, [ebp + 8]	; Destination
+	mov	esi, [ebp + 12]	; Source
+	mov	ecx, [ebp + 16]	; Counter
+.1:
+	cmp	ecx, 0		; 判断计数器
+	jz	.2		; 计数器为零时跳出
+
+	mov	al, [ds:esi]		; ┓
+	inc	esi			; ┃
+					; ┣ 逐字节移动
+	mov	byte [es:edi], al	; ┃
+	inc	edi			; ┛
+
+	dec	ecx		; 计数器减一
+	jmp	.1		; 循环
+.2:
+	mov	eax, [ebp + 8]	; 返回值
+
+	pop	ecx
+	pop	edi
+	pop	esi
+	mov	esp, ebp
+	pop	ebp
+
+	ret			; 函数结束，返回
+; MemCpy 结束-------------------------------------------------------------
+

samples/Assembly/macros.inc

@@ -0,0 +1,321 @@
+BLARGG_MACROS_INCLUDED = 1
+
+; Allows extra error checking with modified version
+; of ca65. Otherwise acts like a constant of 0.
+ADDR = 0
+
+; Switches to Segment and places Line there.
+; Line can be an .align directive, .res, .byte, etc.
+; Examples:
+; seg_data BSS, .align 256
+; seg_data RODATA, {message: .byte "Test",0}
+.macro seg_data Segment, Line
+	.pushseg
+	.segment .string(Segment)
+		Line
+	.popseg
+.endmacro
+
+; Reserves Size bytes in Segment for Name.
+; If Size is omitted, reserves one byte.
+.macro seg_res Segment, Name, Size
+	.ifblank Size
+		seg_data Segment, Name: .res 1
+	.else
+		seg_data Segment, Name: .res Size
+	.endif
+.endmacro
+
+; Shortcuts for zeropage, bss, and stack
+.define zp_res  seg_res ZEROPAGE,
+.define nv_res  seg_res NVRAM,
+.define bss_res seg_res BSS,
+.define sp_res  seg_res STACK,
+.define zp_byte zp_res
+
+; Copies byte from Src to Addr. If Src begins with #,
+; it sets Addr to the immediate value.
+; Out: A = byte copied
+; Preserved: X, Y
+.macro mov Addr, Src
+	lda Src
+	sta Addr
+.endmacro
+
+; Copies word from Src to Addr. If Src begins with #,
+; it sets Addr the immediate value.
+; Out: A = high byte of word
+; Preserved: X, Y
+.macro movw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		lda #<(.right( .tcount( {Src} )-1, {Src} ))
+		sta Addr
+		lda #>(.right( .tcount( {Src} )-1, {Src} ))
+		sta 1+(Addr)
+	.else
+		lda Src
+		sta Addr
+		lda 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+
+; Increments 16-bit value at Addr.
+; Out: EQ/NE based on resulting 16-bit value
+; Preserved: A, X, Y
+.macro incw Addr
+	.local @Skip
+	inc Addr
+	bne @Skip
+	inc 1+(Addr)
+@Skip:
+.endmacro
+
+; Adds Src to word at Addr.
+; Out: A = high byte of result, carry set appropriately
+; Preserved: X, Y
+.macro addw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		addw_ Addr,(.right( .tcount( {Src} )-1, {Src} ))
+	.else
+		lda Addr
+		clc
+		adc Src
+		sta Addr
+		
+		lda 1+(Addr)
+		adc 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+.macro addw_ Addr, Imm
+	lda Addr
+	clc
+	adc #<Imm
+	sta Addr
+	
+	;.if (Imm >> 8) <> 0
+		lda 1+(Addr)
+		adc #>Imm
+		sta 1+(Addr)
+	;.else
+	;   .local @Skip
+	;   bcc @Skip
+	;   inc 1+(Addr)
+	;@Skip:
+	;.endif
+.endmacro
+
+; Splits list of words into tables of low and high bytes
+; Example: split_words foo, {$1234, $5678}
+; expands to:
+; foo_l: $34, $78
+; foo_h: $12, $56
+; foo_count = 2
+.macro split_words Label, Words
+	.ident (.concat (.string(Label), "_l")): .lobytes Words
+	.ident (.concat (.string(Label), "_h")): .hibytes Words
+	.ident (.concat (.string(Label), "_count")) = * - .ident (.concat (.string(Label), "_h"))
+.endmacro
+
+.macro SELECT Bool, True, False, Extra
+	.ifndef Bool
+		False Extra
+	.elseif Bool <> 0
+		True Extra
+	.else
+		False Extra
+	.endif
+.endmacro
+
+.macro DEFAULT Name, Value
+	.ifndef Name
+		Name = Value
+	.endif
+.endmacro
+
+.ifp02
+	; 6502 doesn't define these alternate names
+	.define blt bcc
+	.define bge bcs
+.endif
+.define jlt jcc
+.define jge jcs
+
+; Jxx Target = Bxx Target, except it can go farther than
+; 128 bytes. Implemented via branch around a JMP.
+
+; Don't use ca65's longbranch, because they fail for @labels
+;.macpack longbranch
+
+.macro jeq Target
+	bne *+5
+	jmp Target
+.endmacro
+
+.macro jne Target
+	beq *+5
+	jmp Target
+.endmacro
+
+.macro jmi Target
+	bpl *+5
+	jmp Target
+.endmacro
+
+.macro jpl Target
+	bmi *+5
+	jmp Target
+.endmacro
+
+.macro jcs Target
+	bcc *+5
+	jmp Target
+.endmacro
+
+.macro jcc Target
+	bcs *+5
+	jmp Target
+.endmacro
+
+.macro jvs Target
+	bvc *+5
+	jmp Target
+.endmacro
+
+.macro jvc Target
+	bvs *+5
+	jmp Target
+.endmacro
+
+
+; Passes constant data to routine in addr
+; Preserved: A, X, Y
+.macro jsr_with_addr routine,data
+	.local Addr
+	pha
+	lda #<Addr
+	sta addr
+	lda #>Addr
+	sta addr+1
+	pla
+	jsr routine
+	seg_data RODATA,{Addr: data}
+.endmacro
+
+; Calls routine multiple times, with A having the
+; value 'start' the first time, 'start+step' the
+; second time, up to 'end' for the last time.
+.macro for_loop routine,start,end,step
+	.local @for_loop
+	lda #start
+@for_loop:
+	pha
+	jsr routine
+	pla
+	clc
+	adc #step
+	cmp #<((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Calls routine n times. The value of A in the routine
+; counts from 0 to n-1.
+.macro loop_n_times routine,n
+	for_loop routine,0,n-1,+1
+.endmacro
+
+; Same as for_loop, except uses 16-bit value in YX.
+; -256 <= step <= 255
+.macro for_loop16 routine,start,end,step
+.if (step) < -256 || (step) > 255
+	.error "Step must be within -256 to 255"
+.endif
+	.local @for_loop_skip
+	.local @for_loop
+	ldy #>(start)
+	lda #<(start)
+@for_loop:
+	tax
+	pha
+	tya
+	pha
+	jsr routine
+	pla
+	tay
+	pla
+	clc
+	adc #step
+.if (step) > 0
+	bcc @for_loop_skip
+	iny
+.else
+	bcs @for_loop_skip
+	dey
+.endif
+@for_loop_skip:
+	cmp #<((end)+(step))
+	bne @for_loop
+	cpy #>((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Stores byte at addr
+; Preserved: X, Y
+.macro setb addr, byte
+	lda #byte
+	sta addr
+.endmacro
+
+; Stores word at addr
+; Preserved: X, Y
+.macro setw addr, word
+	lda #<(word)
+	sta addr
+	lda #>(word)
+	sta addr+1
+.endmacro
+
+; Loads XY with 16-bit immediate or value at address
+.macro ldxy Arg
+	.if .match( .left( 1, {Arg} ), # )
+		ldy #<(.right( .tcount( {Arg} )-1, {Arg} ))
+		ldx #>(.right( .tcount( {Arg} )-1, {Arg} ))
+	.else
+		ldy (Arg)
+		ldx (Arg)+1
+	.endif
+.endmacro
+
+; Increments XY as 16-bit register, in CONSTANT time.
+; Z flag set based on entire result.
+; Preserved: A
+; Time: 7 clocks
+.macro inxy
+	iny ; 2
+	beq *+4 ; 3
+		; -1
+	bne *+3 ; 3
+		; -1
+	inx ; 2
+.endmacro
+
+; Negates A and adds it to operand
+.macro subaf Operand
+	eor #$FF
+	sec
+	adc Operand
+.endmacro
+
+; Initializes CPU registers to reasonable values
+; Preserved: A, Y
+.macro init_cpu_regs
+	sei
+	cld     ; unnecessary on NES, but might help on clone
+	ldx #$FF
+	txs
+	.ifndef BUILD_NSF
+		inx
+		stx PPUCTRL
+	.endif
+.endmacro

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>

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>

samples/Brainfuck/factor.b

@@ -0,0 +1,195 @@
+* factor an arbitrarily large positive integer
+*
+* Copyright (C) 1999 by Brian Raiter
+* under the GNU General Public License
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>-
+
+*
+* read in the number
+*
+
+<<<<<<<<<+
+[-[>>>>>>>>>>][-]<<<<<<<<<<[[->>>>>>>>>>+<<<<<<<<<<]<<<<<<<<<<]
+  >>>>>>>>>>,----------]
+>>>>>>>>>>[------------------------------------->>>>>>>>>->]
+<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+
+*
+* display the number and initialize the loop variable to two
+*
+
+[>++++++++++++++++++++++++++++++++++++++++++++++++.
+  ------------------------------------------------<<<<<<<<<<<]
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+--------------------------.[-]
+>>>>>>>>>>>>++<<<<+
+
+*
+* the main loop
+*
+
+[ [-]>>
+
+  *
+  * make copies of the number and the loop variable
+  *
+
+  [>>>>[-]>[-]>[-]>[-]
+    >[-]>[-]
+    <<<<<<<[->>>+>+<<<<]>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<+>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+  [>[->>>+>>+<<<<<]>>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+
+  *
+  * divide the number by the loop variable
+  *
+
+  [>>>[-]>>>[-]>[-]>>>]                                  initialize
+  <<<<<<<<<<[<<<<<<<<<<]
+  >>>>>>>>>[-]>>>>>>>+<<<<<<<<[+]+
+  [ ->>                               double divisor until above dividend
+    [>>>>>>[->++<]>>>>]<<<<<<<<<<
+    [>>>>>>>>[-]>[-]
+       <<<<[->>>++<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [->--------->>>>>>>>>+<<<<<<<<<<[->+<]]]]]]]]]]]>>]
+    <<<<<<<<<<[>>>>>>>>>[-<+<<<+>>>>]<<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>
+            [-<--------->>>>>>>>>>>+<<<<<<<<<<[-<+>]]]]]]]]]]]>>>]
+    <<<<<<<<<<
+    [>>>>[->>>+>>+<<<<<]<<<<<<<<<<<<<<]
+    >>>>>>>>>>[>>>>>>>[-<<<+>>>]>>>]<<<<<<<<<<
+    [>>>>>>>>[->-<]>
+      [<<<<<<<<<[<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<<]
+        >>>>>>>>>>>>>>>>>>>]
+      <<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>[+[+[+[+[+[+[+[+[+[+[[-]<+>]]]]]]]]]]]<
+  ]
+  >>>>>>>>
+  [                                   subtract divisor from dividend
+    <<<<<<
+    [>>>>>>>>[-]>[-]<<<<<[->>>+>+<<<<]>>>>>>]<<<<<<<<<<
+    [>>>>>>>>[-<<<<+>>>>]<<<[->>>+>+<<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>>[-<<<<+>>>>]>]<<<<<<<<<<
+    [>>>>>>>>[-<->]<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [++++++++++[+>-<]>>>>>>>>>>-<<<<<<<<<<]]]]]]]]]]]>>>]
+    >>>>>>>+
+    [                                 if difference is nonnegative then
+      [-]<<<<<<<<<<<<<<<<<            replace dividend and increment quotient
+      [>>>>[-]>>>>[-<<<<+>>>>]<<[->>+<<]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>[->+<<<+>>]>>]<<<<<<<<<<
+      [>>>[->>>>>>+<<<<<<]<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>>[-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<--------->>>>>>>>>>>>>>>>+<<<<<<<<<<
+                [-<<<<<<+>>>>>>]]]]]]]]]]]>]
+      >>>>>>>
+    ]                                 halve divisor and loop until zero
+    <<<<<<<<<<<<<<<<<[<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[-]<<[->+<]<[->>>+<<<]>>>>>]<<<<<<<<<<
+    [+>>>>>>>[-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>]]]]]]]]]<<<<<<<
+             [->>>>>>>+<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>
+    [-<<<<<<<<<<<+>>>>>>>>>>>]
+      >>>[>>>>>>>[-<<<<<<<<<<<+++++>>>>>>>>>>>]>>>]<<<<<<<<<<
+    [+>>>>>>>>[-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>]]]]]]]]]<<<<<<<<
+              [->>>>>>>>+<<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>>[-<<<<<<<<<<<<<+>>>>>>>>>>>>>]>>
+    [>>>>>>>>[-<<<<<<<<<<<<<+++++>>>>>>>>>>>>>]>>]<<<<<<<<<<
+    [<<<<<<<<<<]>>>>>>>>>>
+    >>>>>>
+  ]
+  <<<<<<
+
+  *
+  * make copies of the loop variable and the quotient
+  *
+
+  [>>>[->>>>+>+<<<<<]>>>>>>>]
+  <<<<<<<<<<
+  [>>>>>>>[-<<<<+>>>>]<<<<<[->>>>>+>>+<<<<<<<]<<<<<<<<<<<<]
+  >>>>>>>>>>[>>>>>>>[-<<<<<+>>>>>]>>>]<<<<<<<<<<
+
+  *
+  * break out of the loop if the quotient is larger than the loop variable
+  *
+
+  [>>>>>>>>>[-<->]<
+    [<<<<<<<<
+      [<<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+  >>>>>>>>[>-<[+[+[+[+[+[+[+[+[+[[-]>+<]]]]]]]]]]]>+
+
+  [ [-]
+
+    *
+    * partially increment the loop variable
+    *
+
+    <[-]+>>>>+>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<
+
+    *
+    * examine the remainder for nonzero digits
+    *
+
+    [<<<<<<[<<<<[<<<<<<<<<<]>>>>+<<<<<<<<<<]<<<<]
+    >>>>>>>>>>>>>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<[<<<<<<<<<<]
+    >>>>-
+
+    [ [+]
+
+      *
+      * decrement the loop variable and replace the number with the quotient
+      *
+
+      >>>>>>>>-<<[>[-]>>[-<<+>>]>>>>>>>]<<<<<<<<<<
+
+      *
+      * display the loop variable
+      *
+
+      [+>>[>>>>>>>>+>>]<<-<<<<<<<<<<]-
+      [>>++++++++++++++++++++++++++++++++++++++++++++++++.
+         ------------------------------------------------<<<<<<<<<<<<]
+      ++++++++++++++++++++++++++++++++.[-]>>>>
+
+    ]
+
+    *
+    * normalize the loop variable
+    *
+
+    >>>>>>
+    [>>[->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>--------->>>>>+<<<<<<<<<<
+       [->>>>>+<<<<<]]]]]]]]]]]>>>>>>>>]
+    <<<<<<<<<<[>>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>
+
+  ]<
+
+]>>
+
+*
+* display the number and end
+*
+
+[>>>>>>>>>>]<<<<<<<<<<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+[>++++++++++++++++++++++++++++++++++++++++++++++++.<<<<<<<<<<<]
+++++++++++.

samples/Brainfuck/fib100.bf

@@ -0,0 +1,13 @@
+# Calculate and output all fibonacci numbers under 100
+
++++++++++++
+>+>>>>++++++++++++++++++++++++++++++++++++++++++++
+>++++++++++++++++++++++++++++++++<<<<<<[>[>>>>>>+>
++<<<<<<<-]>>>>>>>[<<<<<<<+>>>>>>>-]<[>++++++++++[-
+<-[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]>[<<[>>>+<<<
+-]>>[-]]<<]>>>[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]
+>[<<+>>[-]]<<<<<<<]>>>>>[+++++++++++++++++++++++++
++++++++++++++++++++++++.[-]]++++++++++<[->-<]>++++
+++++++++++++++++++++++++++++++++++++++++++++.[-]<<
+<<<<<<<<<<[>>>+>+<<<<-]>>>>[<<<<+>>>>-]<-[>>.>.<<<
+[-]]<<[>>+>+<<<-]>>>[<<<+>>>-]<<[<+>-]>[<+>-]<<<-]

samples/Brainfuck/hello.bf

@@ -0,0 +1,4 @@
+// More complex version of hello world
+
+>++++++++[<+++++++++>-]<.>>+>+>++>[-]+<[>[->+<<++++>]<<]>.+++++++..+++.>
+>+++++++.<<<[[-]<[-]>]<+++++++++++++++.>>.+++.------.--------.>>+.>++++.

samples/Brainfuck/helloworld.bf

@@ -0,0 +1,3 @@
+// Hello World
+
+++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.

samples/Brainfuck/rot13.bf

@@ -0,0 +1,30 @@
+# ROT13 cipher
+
+-,+[                         Read first character and start outer character reading loop
+    -[                       Skip forward if character is 0
+        >>++++[>++++++++<-]  Set up divisor (32) for division loop
+                               (MEMORY LAYOUT: dividend copy remainder divisor quotient zero zero)
+        <+<-[                Set up dividend (x minus 1) and enter division loop
+            >+>+>-[>>>]      Increase copy and remainder / reduce divisor / Normal case: skip forward
+            <[[>+<-]>>+>]    Special case: move remainder back to divisor and increase quotient
+            <<<<<-           Decrement dividend
+        ]                    End division loop
+    ]>>>[-]+                 End skip loop; zero former divisor and reuse space for a flag
+    >--[-[<->+++[-]]]<[         Zero that flag unless quotient was 2 or 3; zero quotient; check flag
+        ++++++++++++<[       If flag then set up divisor (13) for second division loop
+                               (MEMORY LAYOUT: zero copy dividend divisor remainder quotient zero zero)
+            >-[>+>>]         Reduce divisor; Normal case: increase remainder
+            >[+[<+>-]>+>>]   Special case: increase remainder / move it back to divisor / increase quotient
+            <<<<<-           Decrease dividend
+        ]                    End division loop
+        >>[<+>-]             Add remainder back to divisor to get a useful 13
+        >[                   Skip forward if quotient was 0
+            -[               Decrement quotient and skip forward if quotient was 1
+                -<<[-]>>     Zero quotient and divisor if quotient was 2
+            ]<<[<<->>-]>>    Zero divisor and subtract 13 from copy if quotient was 1
+        ]<<[<<+>>-]          Zero divisor and add 13 to copy if quotient was 0
+    ]                        End outer skip loop (jump to here if ((character minus 1)/32) was not 2 or 3)
+    <[-]                     Clear remainder from first division if second division was skipped
+    <.[-]                    Output ROT13ed character from copy and clear it
+    <-,+                     Read next character
+]                            End character reading loop

samples/C#/build.cake

@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+///////////////////////////////////////////////////////////////////////////////
+
+var target = Argument<string>("target", "Default");
+var configuration = Argument<string>("configuration", "Release");
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBAL VARIABLES
+///////////////////////////////////////////////////////////////////////////////
+
+var solutions = GetFiles("./**/*.sln");
+var solutionPaths = solutions.Select(solution => solution.GetDirectory());
+
+///////////////////////////////////////////////////////////////////////////////
+// SETUP / TEARDOWN
+///////////////////////////////////////////////////////////////////////////////
+
+Setup(() =>
+{
+    // Executed BEFORE the first task.
+    Information("Running tasks...");
+});
+
+Teardown(() =>
+{
+    // Executed AFTER the last task.
+    Information("Finished running tasks.");
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TASK DEFINITIONS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Clean")
+    .Does(() =>
+{
+    // Clean solution directories.
+    foreach(var path in solutionPaths)
+    {
+        Information("Cleaning {0}", path);
+        CleanDirectories(path + "/**/bin/" + configuration);
+        CleanDirectories(path + "/**/obj/" + configuration);
+    }
+});
+
+Task("Restore")
+    .Does(() =>
+{
+    // Restore all NuGet packages.
+    foreach(var solution in solutions)
+    {
+        Information("Restoring {0}...", solution);
+        NuGetRestore(solution);
+    }
+});
+
+Task("Build")
+    .IsDependentOn("Clean")
+    .IsDependentOn("Restore")
+    .Does(() =>
+{
+    // Build all solutions.
+    foreach(var solution in solutions)
+    {
+        Information("Building {0}", solution);
+        MSBuild(solution, settings => 
+            settings.SetPlatformTarget(PlatformTarget.MSIL)
+                .WithProperty("TreatWarningsAsErrors","true")
+                .WithTarget("Build")
+                .SetConfiguration(configuration));
+    }
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TARGETS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Default")
+    .IsDependentOn("Build");
+
+///////////////////////////////////////////////////////////////////////////////
+// EXECUTION
+///////////////////////////////////////////////////////////////////////////////
+
+RunTarget(target);

samples/C++/ClasspathVMSystemProperties.inc

@@ -0,0 +1,57 @@
+//===- ClasspathVMSystem/Properties.cpp -----------------------------------===//
+//===--------------------- GNU classpath gnu/classpath/VMSystemProperties -===//
+//
+//                            The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <sys/utsname.h>
+
+#include "types.h"
+
+#include "Classpath.h"
+#include "JavaArray.h"
+#include "JavaClass.h"
+#include "JavaObject.h"
+#include "JavaThread.h"
+#include "JavaUpcalls.h"
+#include "Jnjvm.h"
+
+#include "SetProperties.inc"
+
+using namespace j3;
+
+extern "C" {
+
+
+JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(
+#ifdef NATIVE_JNI
+JNIEnv *env,
+jclass clazz,
+#endif
+JavaObject* prop) {
+  
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+extern "C" void Java_gnu_classpath_VMSystemProperties_postInit__Ljava_util_Properties_2(JavaObject* prop) {
+
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setCommandLineProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+}

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));
+}

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);
+	}
+}

samples/C++/instances.inc

@@ -0,0 +1,34 @@
+#include "QPBO.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4661)
+#endif
+
+// Instantiations
+
+template class QPBO<int>;
+template class QPBO<float>;
+template class QPBO<double>;
+
+template <> 
+	inline void QPBO<int>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "int";
+	type_format = "d";
+}
+
+template <> 
+	inline void QPBO<float>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "float";
+	type_format = "f";
+}
+
+template <> 
+	inline void QPBO<double>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "double";
+	type_format = "Lf";
+}
+
+

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

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

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;
+}

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

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

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
+

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] */

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;
+}

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 */

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;
-}

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);
-}

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);
+}

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;
-}
-

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] */

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);
+
+}

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);
-}

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: */
+

samples/C/pqiv.h

@@ -0,0 +1,166 @@
+/**
+ * pqiv
+ *
+ * Copyright (c) 2013-2014, Phillip Berndt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// This file contains the definition of files, image types and
+// the plugin infrastructure. It should be included in file type
+// handlers.
+
+#ifndef _PQIV_H_INCLUDED
+#define _PQIV_H_INCLUDED
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include "lib/bostree.h"
+
+#ifndef PQIV_VERSION
+#define PQIV_VERSION "2.3"
+#endif
+
+#define FILE_FLAGS_ANIMATION      (guint)(1)
+#define FILE_FLAGS_MEMORY_IMAGE   (guint)(1<<1)
+
+// The structure for images {{{
+typedef struct file_type_handler_struct_t file_type_handler_t;
+typedef struct {
+	// File type
+	const file_type_handler_t *file_type;
+
+	// Special flags
+	// FILE_FLAGS_ANIMATION        -> Animation functions are invoked
+	//                                Set by file type handlers
+	// FILE_FLAGS_MEMORY_IMAGE     -> File lives in memory
+	guint file_flags;
+
+	// The file name to display and to sort by
+	gchar *display_name;
+
+	// The URI or file name of the file
+	gchar *file_name;
+
+	// If the file is a memory image, the actual image data
+	GBytes *file_data;
+
+	// The file monitor structure is used for inotify-watching of
+	// the files
+	GFileMonitor *file_monitor;
+
+	// This flag stores whether this image is currently loaded
+	// and valid. i.e. if it is set, you can assume that
+	// private_data contains a representation of the image;
+	// if not, you can NOT assume that it does not.
+	gboolean is_loaded;
+
+	// Cached image size
+	guint width;
+	guint height;
+
+	// File-type specific data, allocated and freed by the file type handlers
+	void *private;
+} file_t;
+// }}}
+// Definition of the built-in file types {{{
+
+// If you want to implement your own file type, you'll have to implement the
+// following functions and a non-static initialization function named
+// file_type_NAME_initializer that fills a file_type_handler_t with pointers to
+// the functions. Store the file in backends/NAME.c and adjust the Makefile to
+// add the required libraries if your backend is listed in the $(BACKENDS)
+// variable.
+
+typedef enum { PARAMETER, RECURSION, INOTIFY, BROWSE_ORIGINAL_PARAMETER, FILTER_OUTPUT } load_images_state_t;
+// Allocation function: Allocate the ->private structure within a file and add the
+// image(s) to the list of available images via load_images_handle_parameter_add_file()
+// If an image is not to be loaded for any reason, the file structure should be
+// deallocated using file_free()
+// Returns a pointer to the first added image
+// Optional, you can also set the pointer to this function to NULL.
+typedef BOSNode *(*file_type_alloc_fn_t)(load_images_state_t state, file_t *file);
+
+// Deallocation, if a file is removed from the images list. Free the ->private structure.
+// Only called if ->private is non-NULL.
+typedef void (*file_type_free_fn_t)(file_t *file);
+
+// Actually load a file into memory
+typedef void (*file_type_load_fn_t)(file_t *file, GInputStream *data, GError **error_pointer);
+
+// Unload a file
+typedef void (*file_type_unload_fn_t)(file_t *file);
+
+// Animation support: Initialize memory for animations, return ms until first frame
+// Optional, you can also set the pointer to this function to NULL.
+typedef double (*file_type_animation_initialize_fn_t)(file_t *file);
+
+// Animation support: Advance to the next frame, return ms until next frame
+// Optional, you can also set the pointer to this function to NULL.
+typedef double (*file_type_animation_next_frame_fn_t)(file_t *file);
+
+// Draw the current view to a cairo context
+typedef void (*file_type_draw_fn_t)(file_t *file, cairo_t *cr);
+
+struct file_type_handler_struct_t {
+	// All files will be filtered with this filter. If it lets it pass,
+	// a handler is assigned to a file. If none do, the file is
+	// discarded if it was found during directory traversal or
+	// loaded using the first image backend if it was an explicit
+	// parameter.
+	GtkFileFilter *file_types_handled;
+
+	// Pointers to the functions defined above
+	file_type_alloc_fn_t alloc_fn;
+	file_type_free_fn_t free_fn;
+	file_type_load_fn_t load_fn;
+	file_type_unload_fn_t unload_fn;
+	file_type_animation_initialize_fn_t animation_initialize_fn;
+	file_type_animation_next_frame_fn_t animation_next_frame_fn;
+	file_type_draw_fn_t draw_fn;
+};
+
+// Initialization function: Tell pqiv about a backend
+typedef void (*file_type_initializer_fn_t)(file_type_handler_t *info);
+
+// pqiv symbols available to plugins {{{
+
+// Global cancellable that should be used for every i/o operation
+extern GCancellable *image_loader_cancellable;
+
+// Current scale level. For backends that don't support cairo natively.
+extern gdouble current_scale_level;
+
+// Load a file from disc/memory/network
+GInputStream *image_loader_stream_file(file_t *file, GError **error_pointer);
+
+// Add a file to the list of loaded files
+// Should be called at least once in a file_type_alloc_fn_t, with the state being
+// forwarded unaltered.
+BOSNode *load_images_handle_parameter_add_file(load_images_state_t state, file_t *file);
+
+// Load all data from an input stream into memory, conveinience function
+GBytes *g_input_stream_read_completely(GInputStream *input_stream, GCancellable *cancellable, GError **error_pointer);
+
+// Free a file
+void file_free(file_t *file);
+
+// }}}
+
+// File type handlers, used in the initializer and file type guessing
+extern file_type_handler_t file_type_handlers[];
+
+/* }}} */
+
+#endif

samples/CLIPS/demo.clp

@@ -0,0 +1,343 @@
+;;;***************************
+;;;* DEFFACTS KNOWLEDGE BASE *
+;;;***************************
+
+(deffacts MAIN::knowledge-base
+   (welcome (message WelcomeMessage))
+   (goal (variable type.animal))
+   (legalanswers (values yes no))
+   (displayanswers (values "Yes" "No"))
+   (rule (if backbone is yes) 
+         (then superphylum is backbone))
+   (rule (if backbone is no) 
+         (then superphylum is jellyback))
+   (question (variable backbone)
+             (query backbone.query))
+   (rule (if superphylum is backbone and
+          warm.blooded is yes) 
+         (then phylum is warm))
+   (rule (if superphylum is backbone and
+          warm.blooded is no) 
+         (then phylum is cold))
+   (question (variable warm.blooded)
+             (query warm.blooded.query))
+   (rule (if superphylum is jellyback and
+          live.prime.in.soil is yes) 
+         (then phylum is soil))
+   (rule (if superphylum is jellyback and
+          live.prime.in.soil is no) 
+         (then phylum is elsewhere))
+   (question (variable live.prime.in.soil)
+             (query live.prime.in.soil.query))
+   (rule (if phylum is warm and
+          has.breasts is yes) 
+         (then class is breasts))
+   (rule (if phylum is warm and
+          has.breasts is no) 
+         (then type.animal is bird))
+   (question (variable has.breasts)
+             (query has.breasts.query))
+   (rule (if phylum is cold and
+          always.in.water is yes) 
+         (then class is water))
+   (rule (if phylum is cold and
+          always.in.water is no) 
+         (then class is dry))
+   (question (variable always.in.water)
+             (query always.in.water.query))
+   (rule (if phylum is soil and
+          flat.bodied is yes) 
+         (then type.animal is flatworm))
+   (rule (if phylum is soil and
+          flat.bodied is no) 
+         (then type.animal is worm.leech))
+   (question (variable flat.bodied)
+             (query flat.bodied.query))
+   (rule (if phylum is elsewhere and
+          body.in.segments is yes) 
+         (then class is segments))
+   (rule (if phylum is elsewhere and
+          body.in.segments is no) 
+         (then class is unified))
+   (question (variable body.in.segments)
+             (query body.in.segments.query))
+   (rule (if class is breasts and
+          can.eat.meat is yes) 
+         (then order is meat))
+   (rule (if class is breasts and
+          can.eat.meat is no) 
+         (then order is vegy))
+   (question (variable can.eat.meat)
+             (query can.eat.meat.query))
+   (rule (if class is water and
+          boney is yes) 
+         (then type.animal is fish))
+   (rule (if class is water and
+          boney is no) 
+         (then type.animal is shark.ray))
+   (question (variable boney)
+             (query boney.query))
+   (rule (if class is dry and
+          scaly is yes) 
+         (then order is scales))
+   (rule (if class is dry and
+          scaly is no) 
+         (then order is soft))
+   (question (variable scaly)
+             (query scaly.query))
+   (rule (if class is segments and
+          shell is yes) 
+         (then order is shell))
+   (rule (if class is segments and
+          shell is no) 
+         (then type.animal is centipede.millipede.insect))
+   (question (variable shell)
+             (query shell.query))
+   (rule (if class is unified and
+          digest.cells is yes) 
+         (then order is cells))
+   (rule (if class is unified and
+          digest.cells is no) 
+         (then order is stomach))
+   (question (variable digest.cells)
+             (query digest.cells.query))
+   (rule (if order is meat and
+          fly is yes) 
+         (then type.animal is bat))
+   (rule (if order is meat and
+          fly is no) 
+         (then family is nowings))
+   (question (variable fly)
+             (query fly.query))
+   (rule (if order is vegy and
+          hooves is yes) 
+         (then family is hooves))
+   (rule (if order is vegy and
+          hooves is no) 
+         (then family is feet))
+   (question (variable hooves)
+             (query hooves.query))
+   (rule (if order is scales and
+          rounded.shell is yes) 
+         (then type.animal is turtle))
+   (rule (if order is scales and
+          rounded.shell is no) 
+         (then family is noshell))
+   (question (variable rounded.shell)
+             (query rounded.shell.query))
+   (rule (if order is soft and
+          jump is yes) 
+         (then type.animal is frog))
+   (rule (if order is soft and
+          jump is no) 
+         (then type.animal is salamander))
+   (question (variable jump)
+             (query jump.query))
+   (rule (if order is shell and
+          tail is yes) 
+         (then type.animal is lobster))
+   (rule (if order is shell and
+          tail is no) 
+         (then type.animal is crab))
+   (question (variable tail)
+             (query tail.query))
+   (rule (if order is cells and
+          stationary is yes) 
+         (then family is stationary))
+   (rule (if order is cells and
+          stationary is no) 
+         (then type.animal is jellyfish))
+   (question (variable stationary)
+             (query stationary.query))
+   (rule (if order is stomach and
+          multicelled is yes) 
+         (then family is multicelled))
+   (rule (if order is stomach and
+          multicelled is no) 
+         (then type.animal is protozoa))
+   (question (variable multicelled)
+             (query multicelled.query))
+   (rule (if family is nowings and
+          opposing.thumb is yes) 
+         (then genus is thumb))
+   (rule (if family is nowings and
+          opposing.thumb is no) 
+         (then genus is nothumb))
+   (question (variable opposing.thumb)
+             (query opposing.thumb.query))
+   (rule (if family is hooves and
+          two.toes is yes) 
+         (then genus is twotoes))
+   (rule (if family is hooves and
+          two.toes is no) 
+         (then genus is onetoe))
+   (question (variable two.toes)
+             (query two.toes.query))
+   (rule (if family is feet and
+          live.in.water is yes) 
+         (then genus is water))
+   (rule (if family is feet and
+          live.in.water is no) 
+         (then genus is dry))
+   (question (variable live.in.water)
+             (query live.in.water.query))
+   (rule (if family is noshell and
+          limbs is yes) 
+         (then type.animal is crocodile.alligator))
+   (rule (if family is noshell and
+          limbs is no) 
+         (then type.animal is snake))
+   (question (variable limbs)
+             (query limbs.query))
+   (rule (if family is stationary and
+          spikes is yes) 
+         (then type.animal is sea.anemone))
+   (rule (if family is stationary and
+          spikes is no) 
+         (then type.animal is coral.sponge))
+   (question (variable spikes)
+             (query spikes.query))
+   (rule (if family is multicelled and
+          spiral.shell is yes) 
+         (then type.animal is snail))
+   (rule (if family is multicelled and
+          spiral.shell is no) 
+         (then genus is noshell))
+   (question (variable spiral.shell)
+             (query spiral.shell.query))
+   (rule (if genus is thumb and
+          prehensile.tail is yes) 
+         (then type.animal is monkey))
+   (rule (if genus is thumb and
+          prehensile.tail is no) 
+         (then species is notail))
+   (question (variable prehensile.tail)
+             (query prehensile.tail.query))
+   (rule (if genus is nothumb and
+          over.400 is yes) 
+         (then species is 400))
+   (rule (if genus is nothumb and
+          over.400 is no) 
+         (then species is under400))
+   (question (variable over.400)
+             (query over.400.query))
+   (rule (if genus is twotoes and
+          horns is yes) 
+         (then species is horns))
+   (rule (if genus is twotoes and
+          horns is no) 
+         (then species is nohorns))
+   (question (variable horns)
+             (query horns.query))
+   (rule (if genus is onetoe and
+          plating is yes) 
+         (then type.animal is rhinoceros))
+   (rule (if genus is onetoe and
+          plating is no) 
+         (then type.animal is horse.zebra))
+   (question (variable plating)
+             (query plating.query))
+   (rule (if genus is water and
+          hunted is yes) 
+         (then type.animal is whale))
+   (rule (if genus is water and
+          hunted is no) 
+         (then type.animal is dolphin.porpoise))
+   (question (variable hunted)
+             (query hunted.query))
+   (rule (if genus is dry and
+          front.teeth is yes) 
+         (then species is teeth))
+   (rule (if genus is dry and
+          front.teeth is no) 
+         (then species is noteeth))
+   (question (variable front.teeth)
+             (query front.teeth.query))
+   (rule (if genus is noshell and
+          bivalve is yes) 
+         (then type.animal is clam.oyster))
+   (rule (if genus is noshell and
+          bivalve is no) 
+         (then type.animal is squid.octopus))
+   (question (variable bivalve)
+             (query bivalve.query))
+   (rule (if species is notail and
+          nearly.hairless is yes) 
+         (then type.animal is man))
+   (rule (if species is notail and
+          nearly.hairless is no) 
+         (then subspecies is hair))
+   (question (variable nearly.hairless)
+             (query nearly.hairless.query))
+   (rule (if species is 400 and
+          land.based is yes) 
+         (then type.animal is bear.tiger.lion))
+   (rule (if species is 400 and
+          land.based is no) 
+         (then type.animal is walrus))
+   (question (variable land.based)
+             (query land.based.query))
+   (rule (if species is under400 and
+          thintail is yes) 
+         (then type.animal is cat))
+   (rule (if species is under400 and
+          thintail is no) 
+         (then type.animal is coyote.wolf.fox.dog))
+   (question (variable thintail)
+             (query thintail.query))
+   (rule (if species is nohorns and
+          lives.in.desert is yes) 
+         (then type.animal is camel))
+   (rule (if species is nohorns and
+          lives.in.desert is no and
+          semi.aquatic is no) 
+         (then type.animal is giraffe))
+   (rule (if species is nohorns and
+          lives.in.desert is no and
+          semi.aquatic is yes) 
+         (then type.animal is hippopotamus))
+   (question (variable lives.in.desert)
+             (query lives.in.desert.query))
+   (question (variable semi.aquatic)
+             (query semi.aquatic.query))
+   (rule (if species is teeth and
+          large.ears is yes) 
+         (then type.animal is rabbit))
+   (rule (if species is teeth and
+          large.ears is no)
+         (then type.animal is rat.mouse.squirrel.beaver.porcupine))
+   (question (variable large.ears)
+             (query large.ears.query))
+   (rule (if species is noteeth and
+          pouch is yes) 
+         (then type.animal is kangaroo.koala.bear))
+   (rule (if species is noteeth and
+          pouch is no) 
+         (then type.animal is mole.shrew.elephant))
+   (question (variable pouch)
+             (query pouch.query))
+   (rule (if subspecies is hair and
+          long.powerful.arms is yes) 
+         (then type.animal is orangutan.gorilla.chimpanzee))
+   (rule (if subspecies is hair and
+          long.powerful.arms is no) 
+         (then type.animal is baboon))
+   (question (variable long.powerful.arms)
+             (query long.powerful.arms.query))
+   (rule (if species is horns and
+          fleece is yes) 
+         (then type.animal is sheep.goat))
+   (rule (if species is horns and
+          fleece is no) 
+         (then subsubspecies is nofleece))
+   (question (variable fleece)
+             (query fleece.query))
+   (rule (if subsubspecies is nofleece and
+          domesticated is yes) 
+         (then type.animal is cow))
+   (rule (if subsubspecies is nofleece and
+          domesticated is no) 
+         (then type.animal is deer.moose.antelope))
+   (question (variable domesticated)
+             (query domesticated.query))
+   (answer (prefix "I think your animal is a ") (variable type.animal) (postfix ".")))

samples/CLIPS/sudoku.clp

@@ -0,0 +1,281 @@
+;;; http://www.angusj.com/sudoku/hints
+;;; http://www.scanraid.com/BasicStrategies.htm
+;;; http://www.sudokuoftheday.com/pages/techniques-overview
+;;; http://www.sudokuonline.us/sudoku_solving_techniques
+;;; http://www.sadmansoftware.com/sudoku/techniques.htm
+;;; http://www.krazydad.com/blog/2005/09/29/an-index-of-sudoku-strategies/
+
+;;; #######################
+;;; DEFTEMPLATES & DEFFACTS
+;;; #######################
+
+(deftemplate possible
+   (slot row)
+   (slot column)
+   (slot value)
+   (slot group)
+   (slot id))
+   
+(deftemplate impossible
+   (slot id)
+   (slot value)
+   (slot priority)
+   (slot reason))
+   
+(deftemplate technique-employed
+   (slot reason)
+   (slot priority))
+
+(deftemplate technique
+   (slot name)
+   (slot priority))
+   
+(deffacts startup
+   (phase grid-values))
+
+(deftemplate size-value
+   (slot size)
+   (slot value))
+   
+(deffacts values
+   (size-value (size 1) (value 1))
+   (size-value (size 2) (value 2))
+   (size-value (size 2) (value 3))
+   (size-value (size 2) (value 4))
+   (size-value (size 3) (value 5))
+   (size-value (size 3) (value 6))
+   (size-value (size 3) (value 7))
+   (size-value (size 3) (value 8))
+   (size-value (size 3) (value 9))
+   (size-value (size 4) (value 10))
+   (size-value (size 4) (value 11))
+   (size-value (size 4) (value 12))
+   (size-value (size 4) (value 13))
+   (size-value (size 4) (value 14))
+   (size-value (size 4) (value 15))
+   (size-value (size 4) (value 16))
+   (size-value (size 5) (value 17))
+   (size-value (size 5) (value 18))
+   (size-value (size 5) (value 19))
+   (size-value (size 5) (value 20))
+   (size-value (size 5) (value 21))
+   (size-value (size 5) (value 22))
+   (size-value (size 5) (value 23))
+   (size-value (size 5) (value 24))
+   (size-value (size 5) (value 25)))
+   
+;;; ###########
+;;; SETUP RULES
+;;; ###########
+
+;;; ***********
+;;; stress-test
+;;; ***********
+
+(defrule stress-test
+   
+   (declare (salience 10))
+   
+   (phase match)
+   
+   (stress-test)
+   
+   (priority ?last)
+   
+   (not (priority ?p&:(> ?p ?last)))
+   
+   (technique (priority ?next&:(> ?next ?last)))
+   
+   (not (technique (priority ?p&:(> ?p ?last)&:(< ?p ?next))))
+   
+   =>
+   
+   (assert (priority ?next)))
+   
+;;; *****************
+;;; enable-techniques
+;;; *****************
+
+(defrule enable-techniques
+
+   (declare (salience 10))
+   
+   (phase match)
+   
+   (size ?)
+   
+   (not (possible (value any)))
+   
+   =>
+   
+   (assert (priority 1)))
+
+;;; **********
+;;; expand-any
+;;; **********
+
+(defrule expand-any
+
+   (declare (salience 10))
+
+   (phase expand-any)
+   
+   ?f <- (possible (row ?r) (column ?c) (value any) (group ?g) (id ?id))
+  
+   (not (possible (value any) (id ?id2&:(< ?id2 ?id))))
+   
+   (size ?s)
+   
+   (size-value (size ?as&:(<= ?as ?s)) (value ?v))
+   
+   (not (possible (row ?r) (column ?c) (value ?v)))
+  
+   (not (and (size-value (value ?v2&:(< ?v2 ?v)))
+               
+             (not (possible (row ?r) (column ?c) (value ?v2)))))
+   
+   =>
+   
+   (assert (possible (row ?r) (column ?c) (value ?v) (group ?g) (id ?id))))
+   
+;;; *****************
+;;; position-expanded
+;;; *****************
+
+(defrule position-expanded
+
+   (declare (salience 10))
+
+   (phase expand-any)
+   
+   ?f <- (possible (row ?r) (column ?c) (value any) (group ?g) (id ?id))
+     
+   (size ?s)
+   
+   (not (and (size-value (size ?as&:(<= ?as ?s)) (value ?v))
+   
+             (not (possible (row ?r) (column ?c) (value ?v)))))
+
+   =>
+   
+   (retract ?f))
+   
+;;; ###########
+;;; PHASE RULES
+;;; ###########
+
+;;; ***************
+;;; expand-any-done
+;;; ***************
+
+(defrule expand-any-done
+
+   (declare (salience 10))
+
+   ?f <- (phase expand-any)
+
+   (not (possible (value any)))
+   
+   =>
+   
+   (retract ?f)
+   
+   (assert (phase initial-output))
+   (assert (print-position 1 1)))
+   
+;;; ***********
+;;; begin-match
+;;; ***********
+
+(defrule begin-match
+
+   (declare (salience -20))
+   
+   ?f <- (phase initial-output)
+      
+   =>
+   
+   (retract ?f)
+   
+   (assert (phase match)))
+
+;;; *****************
+;;; begin-elimination
+;;; *****************
+
+(defrule begin-elimination
+
+   (declare (salience -20))
+   
+   ?f <- (phase match)
+   
+   (not (not (impossible)))
+   
+   =>
+   
+   (retract ?f)
+   
+   (assert (phase elimination)))
+
+;;; *************
+;;; next-priority
+;;; *************
+
+(defrule next-priority
+
+   (declare (salience -20))
+   
+   (phase match)
+   
+   (not (impossible))
+   
+   (priority ?last)
+   
+   (not (priority ?p&:(> ?p ?last)))
+   
+   (technique (priority ?next&:(> ?next ?last)))
+   
+   (not (technique (priority ?p&:(> ?p ?last)&:(< ?p ?next))))
+   
+   =>
+   
+   (assert (priority ?next)))
+
+;;; ************
+;;; begin-output
+;;; ************
+
+(defrule begin-output
+
+   (declare (salience -20))
+   
+   ?f <- (phase match)
+   
+   (not (impossible))
+   
+   (priority ?last)
+   
+   (not (priority ?p&:(> ?p ?last)))
+
+   (not (technique (priority ?next&:(> ?next ?last))))
+   
+   =>
+   
+   (retract ?f)
+   
+   (assert (phase final-output))
+   (assert (print-position 1 1)))
+
+   
+
+  
+    
+   
+   
+   
+   
+   
+   
+   
+   
+   

samples/CSV/cars.csv

@@ -1,3 +1,3 @@
 Year,Make,Model,Length
 1997,Ford,E350,2.34
-2000,Mercury,Cougar,2.38
+2000,Mercury,Cougar,2.38

samples/Chapel/distributions.chpl

@@ -58,6 +58,34 @@ var BA: [BlockSpace] int;
 forall ba in BA do
   ba = here.id;
 
+//
+// The 'hasSingleLocalSubdomain' method on arrays will return true if the 
+// index set for a locale can be represented by a single domain.
+//
+if !BA.hasSingleLocalSubdomain() then
+  halt("For a Block distribution, the index set per locale should be \
+      represented by a single domain");
+
+//
+// If the distribution's subdomains can be represented as single subdomain,
+// we can use the 'localSubdomain' method to get the index set for the 
+// current locale.
+//
+// Below, we'll use the index set to confirm that the array elements have the 
+// correct locale id.
+//
+
+for L in Locales {
+  on L {
+    const indices = BA.localSubdomain();
+    for i in indices {
+      if BA[i] != L.id then
+        halt("Error: incorrect locale id");
+    }
+  }
+}
+
+
 //
 // Output the Block-distributed array to visually see how the elements
 // are partitioned across the locales.
@@ -104,6 +132,14 @@ writeln("Block Array Index Map");
 writeln(BA2);
 writeln();
 
+//
+// We can use the 'targetLocales' method available on an array to get the
+// locales array used as targets.
+//
+for (L, ML) in zip(BA2.targetLocales(), MyLocales) do
+  if L != ML then
+    halt("Error: BA2.targetLocales() should equal MyLocales");
+
 
 
 //
@@ -126,6 +162,18 @@ writeln("Cyclic Array Index Map");
 writeln(CA);
 writeln();
 
+//
+// The domain returned by 'localSubdomain' need not be a dense block, as is
+// the case for the Cyclic Distribution.
+//
+on Locales[0] {
+  const indices = CA.localSubdomain();
+  for i in indices {
+    if CA[i] != 0 then
+      halt("Error: Cyclic array values on Locale 0 should be zero");
+  }
+}
+
 
 //
 // Next, we'll declare a Block-Cyclic distribution.  These
@@ -134,7 +182,7 @@ writeln();
 // of indices.  Thus, the BlockCyclic distribution is parameterized
 // by a starting index (as with Cyclic) and a block size (per
 // dimension) specifying how large the chunks to be dealt out are.
-// 
+//
 const BlkCycSpace = Space dmapped BlockCyclic(startIdx=Space.low, 
                                               blocksize=(2, 3));
 var BCA: [BlkCycSpace] int;
@@ -146,6 +194,46 @@ writeln("Block-Cyclic Array Index Map");
 writeln(BCA);
 writeln();
 
+//
+// A locale's index set for a Block-Cyclic distribution cannot be represented
+// by a single subdomain.
+//
+if BCA.hasSingleLocalSubdomain() then
+  halt("A Block-Cyclic index set cannot be represented by a single subdomain");
+
+//
+// If the local index set cannot be represented by a single subdomain, 
+// we can use the 'localSubdomains' iterator to yield a number of domains
+// that represent the whole index set.
+//
+// Let's write a function that will use 'localSubdomains' to verify the 
+// correctness of the array values.
+//
+
+proc verifyID(Data: []) {
+  for L in Locales {
+    on L {
+      for indices in Data.localSubdomains() {
+        for i in indices {
+          if Data[i] != L.id then
+            halt("Error: incorrect locale id");
+        }
+      }
+    }
+  }
+}
+verifyID(BCA);
+
+//
+// The 'localSubdomains' iterator is also available on distributions that
+// can represent a locale's index set with a single domain. This allows us to
+// write more general code that will work for all distributions.
+//
+// This means that we can call the 'verifyID' function on any array, like the
+// 'BA' array from earlier.
+//
+verifyID(BA);
+
 
 //
 // The ReplicatedDist distribution is different: each of the