mirror of
https://github.com/KevinMidboe/linguist.git
synced 2025-10-29 17:50:22 +00:00
Compare commits
5 Commits
v3.5.2
...
test/attri
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f86998866 | ||
|
|
d4c8fb8a28 | ||
|
|
351c1cc8fd | ||
|
|
7ee006cbcb | ||
|
|
525304738e |
9
.gitattributes
vendored
9
.gitattributes
vendored
@@ -0,0 +1,9 @@
|
|||||||
|
Gemfile linguist-vendored=true
|
||||||
|
lib/linguist.rb linguist-language=Java
|
||||||
|
test/*.rb linguist-language=Java
|
||||||
|
Rakefile linguist-generated
|
||||||
|
test/fixtures/* linguist-vendored=false
|
||||||
|
README.md linguist-documentation=false
|
||||||
|
samples/Arduino/* linguist-documentation
|
||||||
|
samples/Markdown/*.md linguist-detectable=true
|
||||||
|
samples/HTML/*.html linguist-detectable=false
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,3 @@
|
|||||||
Gemfile.lock
|
Gemfile.lock
|
||||||
.bundle/
|
.bundle/
|
||||||
benchmark/
|
vendor/
|
||||||
lib/linguist/samples.json
|
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
before_install:
|
before_install:
|
||||||
- git fetch origin master:master
|
- git fetch origin master:master
|
||||||
- git fetch origin v2.0.0:v2.0.0
|
- git fetch origin v2.0.0:v2.0.0
|
||||||
- git fetch origin test/attributes:test/attributes
|
|
||||||
- sudo apt-get install libicu-dev -y
|
- sudo apt-get install libicu-dev -y
|
||||||
|
- gem update --system 2.1.11
|
||||||
rvm:
|
rvm:
|
||||||
- 1.9.3
|
- 1.9.3
|
||||||
- 2.0.0
|
- 2.0.0
|
||||||
- 2.1
|
- 2.1.1
|
||||||
- 2.2
|
|
||||||
notifications:
|
notifications:
|
||||||
disabled: true
|
disabled: true
|
||||||
|
|||||||
1
Gemfile
vendored
1
Gemfile
vendored
@@ -1,3 +1,2 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
gem 'test-unit', require: false if RUBY_VERSION >= '2.2'
|
|
||||||
|
|||||||
89
README.md
89
README.md
@@ -32,57 +32,33 @@ The Language stats bar that you see on every repository is built by aggregating
|
|||||||
|
|
||||||
The repository stats API, accessed through `#languages`, can be used on a directory:
|
The repository stats API, accessed through `#languages`, can be used on a directory:
|
||||||
|
|
||||||
***API UPDATE***
|
|
||||||
|
|
||||||
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
|
```ruby
|
||||||
require 'rugged'
|
project = Linguist::Repository.from_directory(".")
|
||||||
require 'linguist'
|
project.language.name #=> "Ruby"
|
||||||
|
project.languages #=> { "Ruby" => 0.98, "Shell" => 0.02 }
|
||||||
repo = Rugged::Repository.new('.')
|
|
||||||
project = Linguist::Repository.new(repo, repo.head.target_id)
|
|
||||||
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` binary. You can use the
|
||||||
`--breakdown` flag, and the binary will also output the breakdown of files by language.
|
`--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:
|
You can try running `linguist` on the `lib/` directory in this repository itself:
|
||||||
|
|
||||||
$ bundle exec linguist --breakdown
|
$ bundle exec linguist lib/ --breakdown
|
||||||
|
|
||||||
100.00% Ruby
|
100.00% Ruby
|
||||||
|
|
||||||
Ruby:
|
Ruby:
|
||||||
Gemfile
|
linguist/blob_helper.rb
|
||||||
Rakefile
|
linguist/classifier.rb
|
||||||
bin/linguist
|
linguist/file_blob.rb
|
||||||
github-linguist.gemspec
|
linguist/generated.rb
|
||||||
lib/linguist.rb
|
linguist/heuristics.rb
|
||||||
lib/linguist/blob_helper.rb
|
linguist/language.rb
|
||||||
lib/linguist/classifier.rb
|
linguist/md5.rb
|
||||||
lib/linguist/file_blob.rb
|
linguist/repository.rb
|
||||||
lib/linguist/generated.rb
|
linguist/samples.rb
|
||||||
lib/linguist/heuristics.rb
|
linguist/tokenizer.rb
|
||||||
lib/linguist/language.rb
|
linguist.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
|
#### Ignore vendored files
|
||||||
|
|
||||||
@@ -104,34 +80,9 @@ Linguist::FileBlob.new("underscore.min.js").generated? # => true
|
|||||||
|
|
||||||
See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/master/lib/linguist/generated.rb).
|
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
|
## 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).
|
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.
|
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.
|
||||||
|
|
||||||
@@ -151,6 +102,10 @@ We try to only add languages once they have some usage on GitHub, so please note
|
|||||||
|
|
||||||
Almost all bug fixes or new language additions should come with some additional code samples. Just drop them under [`samples/`](https://github.com/github/linguist/tree/master/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.
|
Almost all bug fixes or new language additions should come with some additional code samples. Just drop them under [`samples/`](https://github.com/github/linguist/tree/master/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.
|
||||||
|
|
||||||
|
To update the `samples.json` after adding new files to [`samples/`](https://github.com/github/linguist/tree/master/samples):
|
||||||
|
|
||||||
|
bundle exec rake samples
|
||||||
|
|
||||||
### A note on language extensions
|
### 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`:
|
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`:
|
||||||
@@ -190,7 +145,7 @@ If you are the current maintainer of this gem:
|
|||||||
0. Ensure that tests are green: `bundle exec rake test`
|
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. 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. 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. Build a local gem: `gem build github-linguist.gemspec`
|
||||||
0. Testing:
|
0. Testing:
|
||||||
0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
|
0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
|
||||||
0. Install the new gem locally
|
0. Install the new gem locally
|
||||||
|
|||||||
97
Rakefile
generated
97
Rakefile
generated
@@ -1,97 +1,27 @@
|
|||||||
require 'bundler/setup'
|
require 'json'
|
||||||
require 'rake/clean'
|
require 'rake/clean'
|
||||||
require 'rake/testtask'
|
require 'rake/testtask'
|
||||||
require 'yaml'
|
require 'yaml'
|
||||||
require 'yajl'
|
|
||||||
|
|
||||||
task :default => :test
|
task :default => :test
|
||||||
|
|
||||||
Rake::TestTask.new
|
Rake::TestTask.new
|
||||||
|
|
||||||
# Extend test task to check for samples
|
|
||||||
task :test => :check_samples
|
|
||||||
|
|
||||||
desc "Check that we have samples.json generated"
|
|
||||||
task :check_samples do
|
|
||||||
unless File.exist?('lib/linguist/samples.json')
|
|
||||||
Rake::Task[:samples].invoke
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
task :samples do
|
task :samples do
|
||||||
require 'linguist/samples'
|
require 'linguist/samples'
|
||||||
json = Yajl.dump(Linguist::Samples.data, :pretty => true)
|
require 'yajl'
|
||||||
File.write 'lib/linguist/samples.json', json
|
data = Linguist::Samples.data
|
||||||
|
json = Yajl::Encoder.encode(data, :pretty => true)
|
||||||
|
File.open('lib/linguist/samples.json', 'w') { |io| io.write json }
|
||||||
end
|
end
|
||||||
|
|
||||||
task :build_gem => :samples do
|
task :build_gem do
|
||||||
languages = YAML.load_file("lib/linguist/languages.yml")
|
languages = YAML.load_file("lib/linguist/languages.yml")
|
||||||
File.write("lib/linguist/languages.json", Yajl.dump(languages))
|
File.write("lib/linguist/languages.json", JSON.dump(languages))
|
||||||
`gem build github-linguist.gemspec`
|
`gem build github-linguist.gemspec`
|
||||||
File.delete("lib/linguist/languages.json")
|
File.delete("lib/linguist/languages.json")
|
||||||
end
|
end
|
||||||
|
|
||||||
namespace :benchmark do
|
|
||||||
benchmark_path = "benchmark/results"
|
|
||||||
|
|
||||||
# $ bundle exec rake benchmark:generate CORPUS=path/to/samples
|
|
||||||
desc "Generate results for"
|
|
||||||
task :generate do
|
|
||||||
ref = `git rev-parse HEAD`.strip[0,8]
|
|
||||||
|
|
||||||
corpus = File.expand_path(ENV["CORPUS"] || "samples")
|
|
||||||
|
|
||||||
require 'linguist/language'
|
|
||||||
|
|
||||||
results = Hash.new
|
|
||||||
Dir.glob("#{corpus}/**/*").each do |file|
|
|
||||||
next unless File.file?(file)
|
|
||||||
filename = file.gsub("#{corpus}/", "")
|
|
||||||
results[filename] = Linguist::FileBlob.new(file).language
|
|
||||||
end
|
|
||||||
|
|
||||||
# Ensure results directory exists
|
|
||||||
FileUtils.mkdir_p("benchmark/results")
|
|
||||||
|
|
||||||
# Write results
|
|
||||||
if `git status`.include?('working directory clean')
|
|
||||||
result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}.json"
|
|
||||||
else
|
|
||||||
result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}-unstaged.json"
|
|
||||||
end
|
|
||||||
|
|
||||||
File.write(result_filename, results.to_json)
|
|
||||||
puts "wrote #{result_filename}"
|
|
||||||
end
|
|
||||||
|
|
||||||
# $ bundle exec rake benchmark:compare REFERENCE=path/to/reference.json CANDIDATE=path/to/candidate.json
|
|
||||||
desc "Compare results"
|
|
||||||
task :compare do
|
|
||||||
reference_file = ENV["REFERENCE"]
|
|
||||||
candidate_file = ENV["CANDIDATE"]
|
|
||||||
|
|
||||||
reference = Yajl.load(File.read(reference_file))
|
|
||||||
reference_counts = Hash.new(0)
|
|
||||||
reference.each { |filename, language| reference_counts[language] += 1 }
|
|
||||||
|
|
||||||
candidate = Yajl.load(File.read(candidate_file))
|
|
||||||
candidate_counts = Hash.new(0)
|
|
||||||
candidate.each { |filename, language| candidate_counts[language] += 1 }
|
|
||||||
|
|
||||||
changes = diff(reference_counts, candidate_counts)
|
|
||||||
|
|
||||||
if changes.any?
|
|
||||||
changes.each do |language, (before, after)|
|
|
||||||
before_percent = 100 * before / reference.size.to_f
|
|
||||||
after_percent = 100 * after / candidate.size.to_f
|
|
||||||
puts "%s changed from %.1f%% to %.1f%%" % [language || 'unknown', before_percent, after_percent]
|
|
||||||
end
|
|
||||||
else
|
|
||||||
puts "No changes"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
namespace :classifier do
|
namespace :classifier do
|
||||||
LIMIT = 1_000
|
LIMIT = 1_000
|
||||||
|
|
||||||
@@ -107,7 +37,7 @@ namespace :classifier do
|
|||||||
next if file_language.nil? || file_language == 'Text'
|
next if file_language.nil? || file_language == 'Text'
|
||||||
begin
|
begin
|
||||||
data = open(file_url).read
|
data = open(file_url).read
|
||||||
guessed_language, score = Linguist::Classifier.classify(Linguist::Samples.cache, data).first
|
guessed_language, score = Linguist::Classifier.classify(Linguist::Samples::DATA, data).first
|
||||||
|
|
||||||
total += 1
|
total += 1
|
||||||
guessed_language == file_language ? correct += 1 : incorrect += 1
|
guessed_language == file_language ? correct += 1 : incorrect += 1
|
||||||
@@ -124,12 +54,14 @@ namespace :classifier do
|
|||||||
|
|
||||||
def each_public_gist
|
def each_public_gist
|
||||||
require 'open-uri'
|
require 'open-uri'
|
||||||
|
require 'json'
|
||||||
|
|
||||||
url = "https://api.github.com/gists/public"
|
url = "https://api.github.com/gists/public"
|
||||||
|
|
||||||
loop do
|
loop do
|
||||||
resp = open(url)
|
resp = open(url)
|
||||||
url = resp.meta['link'][/<([^>]+)>; rel="next"/, 1]
|
url = resp.meta['link'][/<([^>]+)>; rel="next"/, 1]
|
||||||
gists = Yajl.load(resp.read)
|
gists = JSON.parse(resp.read)
|
||||||
|
|
||||||
for gist in gists
|
for gist in gists
|
||||||
for filename, attrs in gist['files']
|
for filename, attrs in gist['files']
|
||||||
@@ -139,10 +71,3 @@ namespace :classifier do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def diff(a, b)
|
|
||||||
(a.keys | b.keys).each_with_object({}) do |key, diff|
|
|
||||||
diff[key] = [a[key], b[key]] unless a[key] == b[key]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
|
|||||||
s.add_dependency 'escape_utils', '~> 1.0.1'
|
s.add_dependency 'escape_utils', '~> 1.0.1'
|
||||||
s.add_dependency 'mime-types', '~> 1.19'
|
s.add_dependency 'mime-types', '~> 1.19'
|
||||||
s.add_dependency 'pygments.rb', '~> 0.6.0'
|
s.add_dependency 'pygments.rb', '~> 0.6.0'
|
||||||
s.add_dependency 'rugged', '~> 0.21.1b2'
|
s.add_dependency 'rugged', '~> 0.21.0'
|
||||||
|
|
||||||
|
s.add_development_dependency 'json'
|
||||||
s.add_development_dependency 'mocha'
|
s.add_development_dependency 'mocha'
|
||||||
s.add_development_dependency 'pry'
|
|
||||||
s.add_development_dependency 'rake'
|
s.add_development_dependency 'rake'
|
||||||
s.add_development_dependency 'yajl-ruby'
|
s.add_development_dependency 'yajl-ruby'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -321,11 +321,6 @@ module Linguist
|
|||||||
language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
|
language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
|
||||||
end
|
end
|
||||||
|
|
||||||
# Internal: Get the TextMate compatible scope for the blob
|
|
||||||
def tm_scope
|
|
||||||
language && language.tm_scope
|
|
||||||
end
|
|
||||||
|
|
||||||
# Public: Highlight syntax of blob
|
# Public: Highlight syntax of blob
|
||||||
#
|
#
|
||||||
# options - A Hash of options (defaults to {})
|
# options - A Hash of options (defaults to {})
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ module Linguist
|
|||||||
generated_jni_header? ||
|
generated_jni_header? ||
|
||||||
composer_lock? ||
|
composer_lock? ||
|
||||||
node_modules? ||
|
node_modules? ||
|
||||||
godeps? ||
|
|
||||||
vcr_cassette? ||
|
vcr_cassette? ||
|
||||||
generated_by_zephir?
|
generated_by_zephir?
|
||||||
end
|
end
|
||||||
@@ -232,14 +231,6 @@ module Linguist
|
|||||||
!!name.match(/node_modules\//)
|
!!name.match(/node_modules\//)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Internal: Is the blob part of Godeps/,
|
|
||||||
# which are not meant for humans in pull requests.
|
|
||||||
#
|
|
||||||
# Returns true or false.
|
|
||||||
def godeps?
|
|
||||||
!!name.match(/Godeps\//)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Internal: Is the blob a generated php composer lock file?
|
# Internal: Is the blob a generated php composer lock file?
|
||||||
#
|
#
|
||||||
# Returns true or false.
|
# Returns true or false.
|
||||||
|
|||||||
@@ -19,26 +19,11 @@ module Linguist
|
|||||||
if languages.all? { |l| ["ECL", "Prolog"].include?(l) }
|
if languages.all? { |l| ["ECL", "Prolog"].include?(l) }
|
||||||
result = disambiguate_ecl(data, languages)
|
result = disambiguate_ecl(data, languages)
|
||||||
end
|
end
|
||||||
if languages.all? { |l| ["IDL", "Prolog"].include?(l) }
|
|
||||||
result = disambiguate_pro(data, languages)
|
|
||||||
end
|
|
||||||
if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) }
|
|
||||||
result = disambiguate_cl(data, languages)
|
|
||||||
end
|
|
||||||
if languages.all? { |l| ["Hack", "PHP"].include?(l) }
|
|
||||||
result = disambiguate_hack(data, languages)
|
|
||||||
end
|
|
||||||
if languages.all? { |l| ["Scala", "SuperCollider"].include?(l) }
|
|
||||||
result = disambiguate_sc(data, languages)
|
|
||||||
end
|
|
||||||
if languages.all? { |l| ["AsciiDoc", "AGS Script"].include?(l) }
|
|
||||||
result = disambiguate_asc(data, languages)
|
|
||||||
end
|
|
||||||
return result
|
return result
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# .h extensions are ambiguous between C, C++, and Objective-C.
|
# .h extensions are ambigious between C, C++, and Objective-C.
|
||||||
# We want to shortcut look for Objective-C _and_ now C++ too!
|
# We want to shortcut look for Objective-C _and_ now C++ too!
|
||||||
#
|
#
|
||||||
# Returns an array of Languages or []
|
# Returns an array of Languages or []
|
||||||
@@ -63,16 +48,6 @@ module Linguist
|
|||||||
matches
|
matches
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.disambiguate_pro(data, languages)
|
|
||||||
matches = []
|
|
||||||
if (data.include?(":-"))
|
|
||||||
matches << Language["Prolog"]
|
|
||||||
else
|
|
||||||
matches << Language["IDL"]
|
|
||||||
end
|
|
||||||
matches
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.disambiguate_ts(data, languages)
|
def self.disambiguate_ts(data, languages)
|
||||||
matches = []
|
matches = []
|
||||||
if (data.include?("</translation>"))
|
if (data.include?("</translation>"))
|
||||||
@@ -97,33 +72,6 @@ module Linguist
|
|||||||
matches
|
matches
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.disambiguate_hack(data, languages)
|
|
||||||
matches = []
|
|
||||||
if data.include?("<?hh")
|
|
||||||
matches << Language["Hack"]
|
|
||||||
elsif /<?[^h]/.match(data)
|
|
||||||
matches << Language["PHP"]
|
|
||||||
end
|
|
||||||
matches
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.disambiguate_sc(data, languages)
|
|
||||||
matches = []
|
|
||||||
if (/\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data))
|
|
||||||
matches << Language["SuperCollider"]
|
|
||||||
end
|
|
||||||
if (/^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data))
|
|
||||||
matches << Language["Scala"]
|
|
||||||
end
|
|
||||||
matches
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.disambiguate_asc(data, languages)
|
|
||||||
matches = []
|
|
||||||
matches << Language["AsciiDoc"] if /^=+(\s|\n)/.match(data)
|
|
||||||
matches
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.active?
|
def self.active?
|
||||||
!!ACTIVE
|
!!ACTIVE
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ require 'escape_utils'
|
|||||||
require 'pygments'
|
require 'pygments'
|
||||||
require 'yaml'
|
require 'yaml'
|
||||||
begin
|
begin
|
||||||
require 'yajl'
|
require 'json'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ module Linguist
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Language name index
|
# Language name index
|
||||||
@index[language.name.downcase] = @name_index[language.name.downcase] = language
|
@index[language.name] = @name_index[language.name] = language
|
||||||
|
|
||||||
language.aliases.each do |name|
|
language.aliases.each do |name|
|
||||||
# All Language aliases should be unique. Raise if there is a duplicate.
|
# All Language aliases should be unique. Raise if there is a duplicate.
|
||||||
@@ -70,7 +70,7 @@ module Linguist
|
|||||||
raise ArgumentError, "Duplicate alias: #{name}"
|
raise ArgumentError, "Duplicate alias: #{name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
@index[name.downcase] = @alias_index[name.downcase] = language
|
@index[name] = @alias_index[name] = language
|
||||||
end
|
end
|
||||||
|
|
||||||
language.extensions.each do |extension|
|
language.extensions.each do |extension|
|
||||||
@@ -135,8 +135,8 @@ module Linguist
|
|||||||
# No shebang. Still more work to do. Try to find it with our heuristics.
|
# No shebang. Still more work to do. Try to find it with our heuristics.
|
||||||
elsif (determined = Heuristics.find_by_heuristics(data, possible_language_names)) && !determined.empty?
|
elsif (determined = Heuristics.find_by_heuristics(data, possible_language_names)) && !determined.empty?
|
||||||
determined.first
|
determined.first
|
||||||
# Lastly, fall back to the probabilistic classifier.
|
# Lastly, fall back to the probablistic classifier.
|
||||||
elsif classified = Classifier.classify(Samples.cache, data, possible_language_names).first
|
elsif classified = Classifier.classify(Samples::DATA, data, possible_language_names).first
|
||||||
# Return the actual Language object based of the string language name (i.e., first element of `#classify`)
|
# Return the actual Language object based of the string language name (i.e., first element of `#classify`)
|
||||||
Language[classified[0]]
|
Language[classified[0]]
|
||||||
end
|
end
|
||||||
@@ -164,7 +164,7 @@ module Linguist
|
|||||||
#
|
#
|
||||||
# Returns the Language or nil if none was found.
|
# Returns the Language or nil if none was found.
|
||||||
def self.find_by_name(name)
|
def self.find_by_name(name)
|
||||||
name && @name_index[name.downcase]
|
@name_index[name]
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: Look up Language by one of its aliases.
|
# Public: Look up Language by one of its aliases.
|
||||||
@@ -178,7 +178,7 @@ module Linguist
|
|||||||
#
|
#
|
||||||
# Returns the Lexer or nil if none was found.
|
# Returns the Lexer or nil if none was found.
|
||||||
def self.find_by_alias(name)
|
def self.find_by_alias(name)
|
||||||
name && @alias_index[name.downcase]
|
@alias_index[name]
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: Look up Languages by filename.
|
# Public: Look up Languages by filename.
|
||||||
@@ -194,25 +194,9 @@ module Linguist
|
|||||||
def self.find_by_filename(filename)
|
def self.find_by_filename(filename)
|
||||||
basename = File.basename(filename)
|
basename = File.basename(filename)
|
||||||
extname = FileBlob.new(filename).extension
|
extname = FileBlob.new(filename).extension
|
||||||
(@filename_index[basename] + find_by_extension(extname)).compact.uniq
|
langs = @filename_index[basename] +
|
||||||
end
|
@extension_index[extname]
|
||||||
|
langs.compact.uniq
|
||||||
# Public: Look up Languages by file extension.
|
|
||||||
#
|
|
||||||
# extname - The extension String.
|
|
||||||
#
|
|
||||||
# Examples
|
|
||||||
#
|
|
||||||
# Language.find_by_extension('.rb')
|
|
||||||
# # => [#<Language name="Ruby">]
|
|
||||||
#
|
|
||||||
# Language.find_by_extension('rb')
|
|
||||||
# # => [#<Language name="Ruby">]
|
|
||||||
#
|
|
||||||
# Returns all matching Languages or [] if none were found.
|
|
||||||
def self.find_by_extension(extname)
|
|
||||||
extname = ".#{extname}" unless extname.start_with?(".")
|
|
||||||
@extension_index[extname]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: Look up Languages by shebang line.
|
# Public: Look up Languages by shebang line.
|
||||||
@@ -243,7 +227,7 @@ module Linguist
|
|||||||
#
|
#
|
||||||
# Returns the Language or nil if none was found.
|
# Returns the Language or nil if none was found.
|
||||||
def self.[](name)
|
def self.[](name)
|
||||||
name && @index[name.downcase]
|
@index[name]
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: A List of popular languages
|
# Public: A List of popular languages
|
||||||
@@ -306,16 +290,6 @@ module Linguist
|
|||||||
@lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
|
@lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
|
||||||
raise(ArgumentError, "#{@name} is missing lexer")
|
raise(ArgumentError, "#{@name} is missing lexer")
|
||||||
|
|
||||||
@tm_scope = attributes[:tm_scope] || begin
|
|
||||||
context = case @type
|
|
||||||
when :data, :markup, :prose
|
|
||||||
'text'
|
|
||||||
when :programming, nil
|
|
||||||
'source'
|
|
||||||
end
|
|
||||||
"#{context}.#{@name.downcase}"
|
|
||||||
end
|
|
||||||
|
|
||||||
@ace_mode = attributes[:ace_mode]
|
@ace_mode = attributes[:ace_mode]
|
||||||
@wrap = attributes[:wrap] || false
|
@wrap = attributes[:wrap] || false
|
||||||
|
|
||||||
@@ -389,11 +363,6 @@ module Linguist
|
|||||||
# Returns the Lexer
|
# Returns the Lexer
|
||||||
attr_reader :lexer
|
attr_reader :lexer
|
||||||
|
|
||||||
# Public: Get the name of a TextMate-compatible scope
|
|
||||||
#
|
|
||||||
# Returns the scope
|
|
||||||
attr_reader :tm_scope
|
|
||||||
|
|
||||||
# Public: Get Ace mode
|
# Public: Get Ace mode
|
||||||
#
|
#
|
||||||
# Examples
|
# Examples
|
||||||
@@ -541,16 +510,16 @@ module Linguist
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
extensions = Samples.cache['extnames']
|
extensions = Samples::DATA['extnames']
|
||||||
interpreters = Samples.cache['interpreters']
|
interpreters = Samples::DATA['interpreters']
|
||||||
filenames = Samples.cache['filenames']
|
filenames = Samples::DATA['filenames']
|
||||||
popular = YAML.load_file(File.expand_path("../popular.yml", __FILE__))
|
popular = YAML.load_file(File.expand_path("../popular.yml", __FILE__))
|
||||||
|
|
||||||
languages_yml = File.expand_path("../languages.yml", __FILE__)
|
languages_yml = File.expand_path("../languages.yml", __FILE__)
|
||||||
languages_json = File.expand_path("../languages.json", __FILE__)
|
languages_json = File.expand_path("../languages.json", __FILE__)
|
||||||
|
|
||||||
if File.exist?(languages_json) && defined?(Yajl)
|
if File.exist?(languages_json) && defined?(JSON)
|
||||||
languages = Yajl.load(File.read(languages_json))
|
languages = JSON.load(File.read(languages_json))
|
||||||
else
|
else
|
||||||
languages = YAML.load_file(languages_yml)
|
languages = YAML.load_file(languages_yml)
|
||||||
end
|
end
|
||||||
@@ -595,7 +564,6 @@ module Linguist
|
|||||||
:type => options['type'],
|
:type => options['type'],
|
||||||
:aliases => options['aliases'],
|
:aliases => options['aliases'],
|
||||||
:lexer => options['lexer'],
|
:lexer => options['lexer'],
|
||||||
:tm_scope => options['tm_scope'],
|
|
||||||
:ace_mode => options['ace_mode'],
|
:ace_mode => options['ace_mode'],
|
||||||
:wrap => options['wrap'],
|
:wrap => options['wrap'],
|
||||||
:group_name => options['group'],
|
:group_name => options['group'],
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,13 +1,8 @@
|
|||||||
require 'linguist/blob_helper'
|
require 'linguist/blob_helper'
|
||||||
require 'linguist/language'
|
|
||||||
require 'rugged'
|
require 'rugged'
|
||||||
|
|
||||||
module Linguist
|
module Linguist
|
||||||
class LazyBlob
|
class LazyBlob
|
||||||
GIT_ATTR = ['linguist-language', 'linguist-vendored']
|
|
||||||
GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
|
|
||||||
GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)
|
|
||||||
|
|
||||||
include BlobHelper
|
include BlobHelper
|
||||||
|
|
||||||
MAX_SIZE = 128 * 1024
|
MAX_SIZE = 128 * 1024
|
||||||
@@ -24,29 +19,6 @@ module Linguist
|
|||||||
@mode = mode
|
@mode = mode
|
||||||
end
|
end
|
||||||
|
|
||||||
def git_attributes
|
|
||||||
@git_attributes ||= repository.fetch_attributes(
|
|
||||||
name, GIT_ATTR, GIT_ATTR_FLAGS)
|
|
||||||
end
|
|
||||||
|
|
||||||
def vendored?
|
|
||||||
if attr = git_attributes['linguist-vendored']
|
|
||||||
return boolean_attribute(attr)
|
|
||||||
else
|
|
||||||
return super
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def language
|
|
||||||
return @language if defined?(@language)
|
|
||||||
|
|
||||||
@language = if lang = git_attributes['linguist-language']
|
|
||||||
Language.find_by_name(lang)
|
|
||||||
else
|
|
||||||
super
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def data
|
def data
|
||||||
load_blob!
|
load_blob!
|
||||||
@data
|
@data
|
||||||
@@ -58,12 +30,6 @@ module Linguist
|
|||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
# Returns true if the attribute is present and not the string "false".
|
|
||||||
def boolean_attribute(attr)
|
|
||||||
attr != "false"
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_blob!
|
def load_blob!
|
||||||
@data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil?
|
@data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil?
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -110,37 +110,18 @@ module Linguist
|
|||||||
if @old_commit_oid == @commit_oid
|
if @old_commit_oid == @commit_oid
|
||||||
@old_stats
|
@old_stats
|
||||||
else
|
else
|
||||||
compute_stats(@old_commit_oid, @old_stats)
|
compute_stats(@old_commit_oid, @commit_oid, @old_stats)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def read_index
|
|
||||||
attr_index = Rugged::Index.new
|
|
||||||
attr_index.read_tree(current_tree)
|
|
||||||
repository.index = attr_index
|
|
||||||
end
|
|
||||||
|
|
||||||
def current_tree
|
|
||||||
@tree ||= Rugged::Commit.lookup(repository, @commit_oid).tree
|
|
||||||
end
|
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
def compute_stats(old_commit_oid, commit_oid, cache = nil)
|
||||||
def compute_stats(old_commit_oid, cache = nil)
|
file_map = cache ? cache.dup : {}
|
||||||
old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
|
old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
|
||||||
|
new_tree = Rugged::Commit.lookup(repository, commit_oid).tree
|
||||||
|
|
||||||
read_index
|
diff = Rugged::Tree.diff(repository, old_tree, new_tree)
|
||||||
|
|
||||||
diff = Rugged::Tree.diff(repository, old_tree, current_tree)
|
|
||||||
|
|
||||||
# Clear file map and fetch full diff if any .gitattributes files are changed
|
|
||||||
if cache && diff.each_delta.any? { |delta| File.basename(delta.new_file[:path]) == ".gitattributes" }
|
|
||||||
diff = Rugged::Tree.diff(repository, old_tree = nil, current_tree)
|
|
||||||
file_map = {}
|
|
||||||
else
|
|
||||||
file_map = cache ? cache.dup : {}
|
|
||||||
end
|
|
||||||
|
|
||||||
diff.each_delta do |delta|
|
diff.each_delta do |delta|
|
||||||
old = delta.old_file[:path]
|
old = delta.old_file[:path]
|
||||||
|
|||||||
73542
lib/linguist/samples.json
Normal file
73542
lib/linguist/samples.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
begin
|
begin
|
||||||
require 'yajl'
|
require 'json'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
require 'yaml'
|
require 'yaml'
|
||||||
end
|
end
|
||||||
@@ -17,11 +17,9 @@ module Linguist
|
|||||||
PATH = File.expand_path('../samples.json', __FILE__)
|
PATH = File.expand_path('../samples.json', __FILE__)
|
||||||
|
|
||||||
# Hash of serialized samples object
|
# Hash of serialized samples object
|
||||||
def self.cache
|
if File.exist?(PATH)
|
||||||
@cache ||= begin
|
serializer = defined?(JSON) ? JSON : YAML
|
||||||
serializer = defined?(Yajl) ? Yajl : YAML
|
DATA = serializer.load(File.read(PATH))
|
||||||
serializer.load(File.read(PATH))
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Public: Iterate over each sample.
|
# Public: Iterate over each sample.
|
||||||
|
|||||||
@@ -33,19 +33,15 @@
|
|||||||
# Erlang bundles
|
# Erlang bundles
|
||||||
- ^rebar$
|
- ^rebar$
|
||||||
|
|
||||||
# Go dependencies
|
# Bootstrap minified css and js
|
||||||
- Godeps/_workspace/
|
- (^|/)bootstrap([^.]*)(\.min)?\.(js|css)$
|
||||||
|
|
||||||
# Minified JavaScript and CSS
|
|
||||||
- (\.|-)min\.(js|css)$
|
|
||||||
|
|
||||||
# Bootstrap css and js
|
|
||||||
- (^|/)bootstrap([^.]*)\.(js|css)$
|
|
||||||
|
|
||||||
# Font Awesome
|
# Font Awesome
|
||||||
|
- font-awesome.min.css
|
||||||
- font-awesome.css
|
- font-awesome.css
|
||||||
|
|
||||||
# Foundation css
|
# Foundation css
|
||||||
|
- foundation.min.css
|
||||||
- foundation.css
|
- foundation.css
|
||||||
|
|
||||||
# Normalize.css
|
# Normalize.css
|
||||||
@@ -57,6 +53,7 @@
|
|||||||
|
|
||||||
# Animate.css
|
# Animate.css
|
||||||
- animate.css
|
- animate.css
|
||||||
|
- animate.min.css
|
||||||
|
|
||||||
# Vendored dependencies
|
# Vendored dependencies
|
||||||
- third[-_]?party/
|
- third[-_]?party/
|
||||||
@@ -73,12 +70,12 @@
|
|||||||
## Commonly Bundled JavaScript frameworks ##
|
## Commonly Bundled JavaScript frameworks ##
|
||||||
|
|
||||||
# jQuery
|
# jQuery
|
||||||
- (^|/)jquery([^.]*)\.js$
|
- (^|/)jquery([^.]*)(\.min)?\.js$
|
||||||
- (^|/)jquery\-\d\.\d+(\.\d+)?\.js$
|
- (^|/)jquery\-\d\.\d+(\.\d+)?(\.min)?\.js$
|
||||||
|
|
||||||
# jQuery UI
|
# jQuery UI
|
||||||
- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$
|
- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?(\.min)?\.(js|css)$
|
||||||
- (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$
|
- (^|/)jquery\.(ui|effects)\.([^.]*)(\.min)?\.(js|css)$
|
||||||
|
|
||||||
# Prototype
|
# Prototype
|
||||||
- (^|/)prototype(.*)\.js$
|
- (^|/)prototype(.*)\.js$
|
||||||
@@ -116,20 +113,21 @@
|
|||||||
- (^|/)shLegacy\.js$
|
- (^|/)shLegacy\.js$
|
||||||
|
|
||||||
# AngularJS
|
# AngularJS
|
||||||
- (^|/)angular([^.]*)\.js$
|
- (^|/)angular([^.]*)(\.min)?\.js$
|
||||||
|
|
||||||
# D3.js
|
# D3.js
|
||||||
- (^|\/)d3(\.v\d+)?([^.]*)\.js$
|
- (^|\/)d3(\.v\d+)?([^.]*)(\.min)?\.js$
|
||||||
|
|
||||||
# React
|
# React
|
||||||
- (^|/)react(-[^.]*)?\.js$
|
- (^|/)react(-[^.]*)?(\.min)?\.js$
|
||||||
|
|
||||||
# Modernizr
|
# Modernizr
|
||||||
- (^|/)modernizr\-\d\.\d+(\.\d+)?\.js$
|
- (^|/)modernizr\-\d\.\d+(\.\d+)?(\.min)?\.js$
|
||||||
- (^|/)modernizr\.custom\.\d+\.js$
|
- (^|/)modernizr\.custom\.\d+\.js$
|
||||||
|
|
||||||
# Knockout
|
# Knockout
|
||||||
- (^|/)knockout-(\d+\.){3}(debug\.)?js$
|
- (^|/)knockout-(\d+\.){3}(debug\.)?js$
|
||||||
|
- knockout-min.js
|
||||||
|
|
||||||
## Python ##
|
## Python ##
|
||||||
|
|
||||||
@@ -167,8 +165,8 @@
|
|||||||
- \.intellisense\.js$
|
- \.intellisense\.js$
|
||||||
|
|
||||||
# jQuery validation plugin (MS bundles this with asp.net mvc)
|
# jQuery validation plugin (MS bundles this with asp.net mvc)
|
||||||
- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?\.js$
|
- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?(\.min)?\.js$
|
||||||
- (^|/)jquery([^.]*)\.unobtrusive\-ajax\.js$
|
- (^|/)jquery([^.]*)\.unobtrusive\-ajax(\.min)?\.js$
|
||||||
|
|
||||||
# Microsoft Ajax
|
# Microsoft Ajax
|
||||||
- (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$
|
- (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$
|
||||||
@@ -195,7 +193,7 @@
|
|||||||
- (^|/)extjs/welcome/
|
- (^|/)extjs/welcome/
|
||||||
|
|
||||||
# Html5shiv
|
# Html5shiv
|
||||||
- (^|/)html5shiv\.js$
|
- (^|/)html5shiv(\.min)?\.js$
|
||||||
|
|
||||||
# Samples folders
|
# Samples folders
|
||||||
- ^[Ss]amples/
|
- ^[Ss]amples/
|
||||||
@@ -214,8 +212,8 @@
|
|||||||
- ^[Tt]est/fixtures/
|
- ^[Tt]est/fixtures/
|
||||||
|
|
||||||
# PhoneGap/Cordova
|
# PhoneGap/Cordova
|
||||||
- (^|/)cordova([^.]*)\.js$
|
- (^|/)cordova([^.]*)(\.min)?\.js$
|
||||||
- (^|/)cordova\-\d\.\d(\.\d)?\.js$
|
- (^|/)cordova\-\d\.\d(\.\d)?(\.min)?\.js$
|
||||||
|
|
||||||
# Foundation js
|
# Foundation js
|
||||||
- foundation(\..*)?\.js$
|
- foundation(\..*)?\.js$
|
||||||
@@ -235,12 +233,5 @@
|
|||||||
|
|
||||||
# Octicons
|
# Octicons
|
||||||
- octicons.css
|
- octicons.css
|
||||||
|
- octicons.min.css
|
||||||
- sprockets-octicons.scss
|
- sprockets-octicons.scss
|
||||||
|
|
||||||
# Typesafe Activator
|
|
||||||
- (^|/)activator$
|
|
||||||
- (^|/)activator\.bat$
|
|
||||||
|
|
||||||
# ProGuard
|
|
||||||
- proguard.pro
|
|
||||||
- proguard-rules.pro
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module Linguist
|
module Linguist
|
||||||
VERSION = "3.5.2"
|
VERSION = "3.1.5"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,367 +0,0 @@
|
|||||||
:NameSpace UT
|
|
||||||
|
|
||||||
sac ← 0
|
|
||||||
expect_orig ← expect ← ⎕NS⍬
|
|
||||||
exception ← ⍬
|
|
||||||
nexpect_orig ← nexpect ← ⎕NS⍬
|
|
||||||
|
|
||||||
∇ {Z}←{Conf}run Argument;PRE_test;POST_test;TEST_step;COVER_step;FromSpace
|
|
||||||
|
|
||||||
load_display_if_not_already_loaded
|
|
||||||
load_salt_scripts_into_current_namespace_if_configured
|
|
||||||
|
|
||||||
FromSpace←1⊃⎕RSI
|
|
||||||
|
|
||||||
PRE_test←{}
|
|
||||||
POST_test←{}
|
|
||||||
COVER_step←{}
|
|
||||||
:If 0≠⎕NC'Conf'
|
|
||||||
:If Conf has'cover_target'
|
|
||||||
PRE_test←{{}⎕PROFILE'start'}
|
|
||||||
POST_test←{{}⎕PROFILE'stop'}
|
|
||||||
:EndIf
|
|
||||||
:EndIf
|
|
||||||
|
|
||||||
:If is_function Argument
|
|
||||||
TEST_step←single_function_test_function
|
|
||||||
COVER_file←Argument,'_coverage.html'
|
|
||||||
|
|
||||||
:ElseIf is_list_of_functions Argument
|
|
||||||
TEST_step←list_of_functions_test_function
|
|
||||||
COVER_file←'list_coverage.html'
|
|
||||||
|
|
||||||
:ElseIf is_file Argument
|
|
||||||
TEST_step←file_test_function
|
|
||||||
COVER_file←(get_file_name Argument),'_coverage.html'
|
|
||||||
|
|
||||||
:ElseIf is_dir Argument
|
|
||||||
test_files←test_files_in_dir Argument
|
|
||||||
TEST_step←test_dir_function
|
|
||||||
Argument←test_files
|
|
||||||
:EndIf
|
|
||||||
|
|
||||||
:If 0≠⎕NC'Conf'
|
|
||||||
:If Conf has'cover_target'
|
|
||||||
COVER_step←{Conf,←⊂('cover_file'COVER_file)
|
|
||||||
generate_coverage_page Conf}
|
|
||||||
:EndIf
|
|
||||||
:EndIf
|
|
||||||
|
|
||||||
PRE_test ⍬
|
|
||||||
Z←FromSpace TEST_step Argument
|
|
||||||
POST_test ⍬
|
|
||||||
COVER_step ⍬
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ load_display_if_not_already_loaded
|
|
||||||
:If 0=⎕NC'#.DISPLAY'
|
|
||||||
'DISPLAY'#.⎕CY'display'
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ load_salt_scripts_into_current_namespace_if_configured
|
|
||||||
:If 0≠⎕NC'#.UT.appdir'
|
|
||||||
:If ⍬≢#.UT.appdir
|
|
||||||
⎕SE.SALT.Load #.UT.appdir,'src/*.dyalog -target=#'
|
|
||||||
⎕SE.SALT.Load #.UT.appdir,'test/*.dyalog -target=#'
|
|
||||||
:EndIf
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←FromSpace single_function_test_function TestName
|
|
||||||
Z←run_ut FromSpace TestName
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←FromSpace list_of_functions_test_function ListOfNames;t
|
|
||||||
t←⎕TS
|
|
||||||
Z←run_ut¨{FromSpace ⍵}¨ListOfNames
|
|
||||||
t←⎕TS-t
|
|
||||||
('Test execution report')print_passed_crashed_failed Z t
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←FromSpace file_test_function FilePath;FileNS;Functions;TestFunctions;t
|
|
||||||
FileNS←⎕SE.SALT.Load FilePath,' -target=#'
|
|
||||||
Functions←↓FileNS.⎕NL 3
|
|
||||||
TestFunctions←(is_test¨Functions)/Functions
|
|
||||||
:If (0/⍬,⊂0/'')≡TestFunctions
|
|
||||||
⎕←'No test functions found'
|
|
||||||
Z←⍬
|
|
||||||
:Else
|
|
||||||
t←⎕TS
|
|
||||||
Z←run_ut¨{FileNS ⍵}¨TestFunctions
|
|
||||||
t←⎕TS-t
|
|
||||||
(FilePath,' tests')print_passed_crashed_failed Z t
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←FromSpace test_dir_function Test_files
|
|
||||||
:If Test_files≡⍬/⍬,⊂''
|
|
||||||
⎕←'No test files found'
|
|
||||||
Z←⍬
|
|
||||||
:Else
|
|
||||||
Z←#.UT.run¨Test_files
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←get_file_name Argument;separator
|
|
||||||
separator←⊃⌽(Argument∊'/\')/⍳⍴Argument
|
|
||||||
Z←¯7↓separator↓Argument
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ generate_coverage_page Conf;ProfileData;CoverResults;HTML
|
|
||||||
ProfileData←⎕PROFILE'data'
|
|
||||||
ToCover←retrieve_coverables¨(⊃'cover_target'in Conf)
|
|
||||||
:If (⍴ToCover)≡(⍴⊂1)
|
|
||||||
ToCover←⊃ToCover
|
|
||||||
:EndIf
|
|
||||||
Representations←get_representation¨ToCover
|
|
||||||
CoverResults←ProfileData∘generate_cover_result¨↓ToCover,[1.5]Representations
|
|
||||||
HTML←generate_html CoverResults
|
|
||||||
Conf write_html_to_page HTML
|
|
||||||
⎕PROFILE'clear'
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←retrieve_coverables Something;nc;functions
|
|
||||||
nc←⎕NC Something
|
|
||||||
:If nc=3
|
|
||||||
Z←Something
|
|
||||||
:ElseIf nc=9
|
|
||||||
functions←strip¨↓⍎Something,'.⎕NL 3'
|
|
||||||
Z←{(Something,'.',⍵)}¨functions
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←strip input
|
|
||||||
Z←(input≠' ')/input
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←get_representation Function;nc;rep
|
|
||||||
nc←⎕NC⊂Function
|
|
||||||
:If nc=3.1
|
|
||||||
rep←↓⎕CR Function
|
|
||||||
rep[1]←⊂'∇',⊃rep[1]
|
|
||||||
rep,←⊂'∇'
|
|
||||||
rep←↑rep
|
|
||||||
:Else
|
|
||||||
rep←⎕CR Function
|
|
||||||
:EndIf
|
|
||||||
Z←rep
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←ProfileData generate_cover_result(name representation);Indices;lines;functionlines;covered_lines
|
|
||||||
Indices←({name≡⍵}¨ProfileData[;1])/⍳⍴ProfileData[;1]
|
|
||||||
lines←ProfileData[Indices;2]
|
|
||||||
nc←⎕NC⊂name
|
|
||||||
:If 3.1=nc
|
|
||||||
functionlines←¯2+⍴↓representation
|
|
||||||
:Else
|
|
||||||
functionlines←⊃⍴↓representation
|
|
||||||
:EndIf
|
|
||||||
covered_lines←(⍬∘≢¨lines)/lines
|
|
||||||
Z←(nc lines functionlines covered_lines representation)
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←generate_html CoverResults;Covered;Total;Percentage;CoverageText;ColorizedCode;Timestamp;Page
|
|
||||||
Covered←⊃⊃+/{⍴4⊃⍵}¨CoverResults
|
|
||||||
Total←⊃⊃+/{3⊃⍵}¨CoverResults
|
|
||||||
Percentage←100×Covered÷Total
|
|
||||||
CoverageText←'Coverage: ',Percentage,'% (',Covered,'/',Total,')'
|
|
||||||
ColorizedCode←⊃,/{colorize_code_by_coverage ⍵}¨CoverResults
|
|
||||||
Timestamp←generate_timestamp_text
|
|
||||||
Page←⍬
|
|
||||||
Page,←⊂⍬,'<html>'
|
|
||||||
Page,←⊂⍬,'<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>'
|
|
||||||
Page,←⊂⍬,'<style>pre cov {line-height:80%;}'
|
|
||||||
Page,←⊂⍬,'pre cov {color: green;}'
|
|
||||||
Page,←⊂⍬,'pre uncov {line-height:80%;}'
|
|
||||||
Page,←⊂⍬,'pre uncov {color:red;}</style>'
|
|
||||||
Page,←⊂⍬,CoverageText
|
|
||||||
Page,←⊂⍬,'<pre>'
|
|
||||||
Page,←ColorizedCode
|
|
||||||
Page,←⊂⍬,'</pre>'
|
|
||||||
Page,←Timestamp
|
|
||||||
Page,←⊂⍬,'</html>'
|
|
||||||
Z←Page
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←colorize_code_by_coverage CoverResult;Colors;Ends;Code
|
|
||||||
:If 3.1=⊃CoverResult
|
|
||||||
Colors←(2+3⊃CoverResult)⍴⊂'<uncov>'
|
|
||||||
Colors[1]←⊂''
|
|
||||||
Colors[⍴Colors]←⊂''
|
|
||||||
Ends←(2+3⊃CoverResult)⍴⊂'</uncov>'
|
|
||||||
Ends[1]←⊂''
|
|
||||||
Ends[⍴Ends]←⊂''
|
|
||||||
:Else
|
|
||||||
Colors←(3⊃CoverResult)⍴⊂'<uncov>'
|
|
||||||
Ends←(3⊃CoverResult)⍴⊂'</uncov>'
|
|
||||||
:EndIf
|
|
||||||
Colors[1+4⊃CoverResult]←⊂'<cov>'
|
|
||||||
Ends[1+4⊃CoverResult]←⊂'</cov>'
|
|
||||||
Code←↓5⊃CoverResult
|
|
||||||
Z←Colors,[1.5]Code
|
|
||||||
Z←{⍺,(⎕UCS 13),⍵}/Z,Ends
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←generate_timestamp_text;TS;YYMMDD;HHMMSS
|
|
||||||
TS←⎕TS
|
|
||||||
YYMMDD←⊃{⍺,'-',⍵}/3↑TS
|
|
||||||
HHMMSS←⊃{⍺,':',⍵}/3↑3↓TS
|
|
||||||
Z←'Page generated: ',YYMMDD,'|',HHMMSS
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Conf write_html_to_page Page;tie;filename
|
|
||||||
filename←(⊃'cover_out'in Conf),(⊃'cover_file'in Conf)
|
|
||||||
:Trap 22
|
|
||||||
tie←filename ⎕NTIE 0
|
|
||||||
filename ⎕NERASE tie
|
|
||||||
filename ⎕NCREATE tie
|
|
||||||
:Else
|
|
||||||
tie←filename ⎕NCREATE 0
|
|
||||||
:EndTrap
|
|
||||||
Simple_array←⍕⊃,/Page
|
|
||||||
(⎕UCS'UTF-8'⎕UCS Simple_array)⎕NAPPEND tie
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←is_function Argument
|
|
||||||
Z←'_TEST'≡¯5↑Argument
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←is_list_of_functions Argument
|
|
||||||
Z←2=≡Argument
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←is_file Argument
|
|
||||||
Z←'.dyalog'≡¯7↑Argument
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←is_dir Argument;attr
|
|
||||||
:If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
|
|
||||||
Z←'yes'≡⊃⎕CMD'test -d ',Argument,' && echo yes || echo no'
|
|
||||||
:Else
|
|
||||||
'gfa'⎕NA'I kernel32|GetFileAttributes* <0t'
|
|
||||||
:If Z←¯1≠attr←gfa⊂Argument ⍝ If file exists
|
|
||||||
Z←⊃2 16⊤attr ⍝ Return bit 4
|
|
||||||
:EndIf
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
|
|
||||||
∇ Z←test_files_in_dir Argument
|
|
||||||
:If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
|
|
||||||
Z←⎕SH'find ',Argument,' -name \*_tests.dyalog'
|
|
||||||
:Else
|
|
||||||
#.⎕CY'files'
|
|
||||||
Z←#.Files.Dir Argument,'\*_tests.dyalog'
|
|
||||||
Z←(Argument,'\')∘,¨Z
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←run_ut ut_data;returned;crashed;pass;crash;fail;message
|
|
||||||
(returned crashed time)←execute_function ut_data
|
|
||||||
(pass crash fail)←determine_pass_crash_or_fail returned crashed
|
|
||||||
message←determine_message pass fail crashed(2⊃ut_data)returned time
|
|
||||||
print_message_to_screen message
|
|
||||||
Z←(pass crash fail)
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←execute_function ut_data;function;t
|
|
||||||
reset_UT_globals
|
|
||||||
function←(⍕(⊃ut_data[1])),'.',⊃ut_data[2]
|
|
||||||
:Trap sac
|
|
||||||
:If 3.2≡⎕NC⊂function
|
|
||||||
t←⎕TS
|
|
||||||
Z←(⍎function,' ⍬')0
|
|
||||||
t←⎕TS-t
|
|
||||||
:Else
|
|
||||||
t←⎕TS
|
|
||||||
Z←(⍎function)0
|
|
||||||
t←⎕TS-t
|
|
||||||
:EndIf
|
|
||||||
|
|
||||||
:Else
|
|
||||||
Z←(↑⎕DM)1
|
|
||||||
:If exception≢⍬
|
|
||||||
expect←exception
|
|
||||||
Z[2]←0
|
|
||||||
t←⎕TS-t
|
|
||||||
:EndIf
|
|
||||||
:EndTrap
|
|
||||||
Z,←⊂t
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ reset_UT_globals
|
|
||||||
expect_orig ← expect← ⎕NS⍬
|
|
||||||
exception←⍬
|
|
||||||
nexpect_orig ← nexpect← ⎕NS⍬
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←is_test FunctionName;wsIndex
|
|
||||||
wsIndex←FunctionName⍳' '
|
|
||||||
FunctionName←(wsIndex-1)↑FunctionName
|
|
||||||
Z←'_TEST'≡¯5↑FunctionName
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Heading print_passed_crashed_failed(ArrayRes time)
|
|
||||||
⎕←'-----------------------------------------'
|
|
||||||
⎕←Heading
|
|
||||||
⎕←' ⍋ Passed: ',+/{1⊃⍵}¨ArrayRes
|
|
||||||
⎕←' ⍟ Crashed: ',+/{2⊃⍵}¨ArrayRes
|
|
||||||
⎕←' ⍒ Failed: ',+/{3⊃⍵}¨ArrayRes
|
|
||||||
⎕←' ○ Runtime: ',time[5],'m',time[6],'s',time[7],'ms'
|
|
||||||
∇
|
|
||||||
|
|
||||||
determine_pass_crash_or_fail←{
|
|
||||||
r c←⍵ ⋄ 0≠c:0 1 0 ⋄ z←(0 0 1)(1 0 0)
|
|
||||||
expect_orig≢expect:(⎕IO+expect≡r)⊃z ⋄ (⎕IO+nexpect≢r)⊃z
|
|
||||||
}
|
|
||||||
|
|
||||||
∇ Z←determine_message(pass fail crashed name returned time)
|
|
||||||
:If crashed
|
|
||||||
Z←'CRASHED: 'failure_message name returned
|
|
||||||
:ElseIf pass
|
|
||||||
Z←'Passed ',time[5],'m',time[6],'s',time[7],'ms'
|
|
||||||
:Else
|
|
||||||
Z←'FAILED: 'failure_message name returned
|
|
||||||
:EndIf
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ print_message_to_screen message
|
|
||||||
⎕←message
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←term_to_text Term;Text;Rows
|
|
||||||
Text←#.DISPLAY Term
|
|
||||||
Rows←1⊃⍴Text
|
|
||||||
Z←(Rows 4⍴''),Text
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←Cause failure_message(name returned);hdr;exp;expterm;got;gotterm
|
|
||||||
hdr←Cause,name
|
|
||||||
exp←'Expected'
|
|
||||||
expterm←term_to_text #.UT.expect
|
|
||||||
got←'Got'
|
|
||||||
gotterm←term_to_text returned
|
|
||||||
Z←align_and_join_message_parts hdr exp expterm got gotterm
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←align_and_join_message_parts Parts;hdr;exp;expterm;got;gotterm;R1;C1;R2;C2;W
|
|
||||||
(hdr exp expterm got gotterm)←Parts
|
|
||||||
(R1 C1)←⍴expterm
|
|
||||||
(R2 C2)←⍴gotterm
|
|
||||||
W←⊃⊃⌈/C1 C2(⍴hdr)(⍴exp)(⍴got)
|
|
||||||
Z←(W↑hdr),[0.5](W↑exp)
|
|
||||||
Z←Z⍪(R1 W↑expterm)
|
|
||||||
Z←Z⍪(W↑got)
|
|
||||||
Z←Z⍪(R2 W↑gotterm)
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←confparam in config
|
|
||||||
Z←1↓⊃({confparam≡⊃⍵}¨config)/config
|
|
||||||
∇
|
|
||||||
|
|
||||||
∇ Z←config has confparam
|
|
||||||
Z←∨/{confparam≡⊃⍵}¨config
|
|
||||||
∇
|
|
||||||
|
|
||||||
:EndNameSpace
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
ORG 0000h
|
|
||||||
SJMP START
|
|
||||||
ORG 0003h
|
|
||||||
LCALL INT0_ISR
|
|
||||||
RETI
|
|
||||||
ORG 000Bh
|
|
||||||
LCALL T0_ISR
|
|
||||||
RETI
|
|
||||||
ORG 0013h
|
|
||||||
LCALL INT1_ISR
|
|
||||||
RETI
|
|
||||||
ORG 001Bh
|
|
||||||
LCALL T1_ISR
|
|
||||||
RETI
|
|
||||||
ORG 0023h
|
|
||||||
LCALL UART_ISR
|
|
||||||
RETI
|
|
||||||
ORG 0030h
|
|
||||||
START:
|
|
||||||
MOV A,#11111110b
|
|
||||||
SETB IT0 ; Set External Interrupt 0 to be falling edge triggered
|
|
||||||
SETB EX0 ; Enable External Interrut 0
|
|
||||||
SETB EA ; Enable Interrupt
|
|
||||||
LEFT:
|
|
||||||
CJNE A,#01111111b,LOOP1
|
|
||||||
JMP RIGHT
|
|
||||||
LOOP1:
|
|
||||||
MOV P1,A
|
|
||||||
RL A
|
|
||||||
LCALL DELAY
|
|
||||||
SJMP LEFT
|
|
||||||
RIGHT:
|
|
||||||
CJNE A,#11111110b,LOOP2
|
|
||||||
JMP LEFT
|
|
||||||
LOOP2:
|
|
||||||
MOV P1,A
|
|
||||||
RR A
|
|
||||||
LCALL DELAY
|
|
||||||
SJMP RIGHT
|
|
||||||
|
|
||||||
INT0_ISR:
|
|
||||||
MOV R1,#3
|
|
||||||
FLASH:
|
|
||||||
MOV P1,#00h
|
|
||||||
LCALL DELAY
|
|
||||||
MOV P1,#0FFh
|
|
||||||
LCALL DELAY
|
|
||||||
DJNZ R1,FLASH
|
|
||||||
RET
|
|
||||||
T0_ISR:
|
|
||||||
RET
|
|
||||||
INT1_ISR:
|
|
||||||
RET
|
|
||||||
T1_ISR:
|
|
||||||
RET
|
|
||||||
UART_ISR:
|
|
||||||
RET
|
|
||||||
|
|
||||||
DELAY: MOV R5,#20 ;R5*20 mS
|
|
||||||
D1: MOV R6,#40
|
|
||||||
D2: MOV R7,#249
|
|
||||||
DJNZ R7,$
|
|
||||||
DJNZ R6,D2
|
|
||||||
DJNZ R5,D1
|
|
||||||
RET
|
|
||||||
END
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
class Bar
|
|
||||||
{
|
|
||||||
protected:
|
|
||||||
|
|
||||||
char *name;
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
void hello();
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
"Test function for Ceylon"
|
doc "Test function for Ceylon"
|
||||||
by ("Enrique")
|
by "Enrique"
|
||||||
shared void test() {
|
shared void test() {
|
||||||
print("test");
|
print("test");
|
||||||
}
|
}
|
||||||
|
|
||||||
"Test class for Ceylon"
|
doc "Test class for Ceylon"
|
||||||
shared class Test(name) satisfies Comparable<Test> {
|
shared class Test(name) satisfies Comparable<Test> {
|
||||||
shared String name;
|
shared String name;
|
||||||
shared actual String string = "Test ``name``.";
|
shared actual String string = "Test " name ".";
|
||||||
|
|
||||||
shared actual Comparison compare(Test other) {
|
shared actual Comparison compare(Test other) {
|
||||||
return name<=>other.name;
|
return name<=>other.name;
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
definition module GenHylo
|
|
||||||
|
|
||||||
import StdGeneric, GenMap
|
|
||||||
|
|
||||||
:: Fix f = In (f .(Fix f))
|
|
||||||
Out :: !u:(Fix v:a) -> v:(a w:(Fix v:a)), [u <= w]
|
|
||||||
|
|
||||||
hylo :: ((.f .b) -> .b) (.a -> (.f .a)) -> (.a -> .b) | gMap{|*->*|} f
|
|
||||||
cata :: (u:(f .a) -> .a) -> (Fix u:f) -> .a | gMap{|*->*|} f
|
|
||||||
ana :: (.a -> u:(f .a)) -> .a -> (Fix u:f) | gMap{|*->*|} f
|
|
||||||
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
definition module GenMap
|
|
||||||
|
|
||||||
import StdGeneric
|
|
||||||
|
|
||||||
generic gMap a b :: .a -> .b
|
|
||||||
derive gMap c, UNIT, PAIR, EITHER, CONS, FIELD, OBJECT, {}, {!}
|
|
||||||
|
|
||||||
derive gMap [], (,), (,,), (,,,), (,,,,), (,,,,,), (,,,,,,), (,,,,,,,)
|
|
||||||
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
implementation module GenMap
|
|
||||||
|
|
||||||
import StdClass, StdArray, StdInt, StdFunc
|
|
||||||
import StdGeneric, _Array
|
|
||||||
|
|
||||||
generic gMap a b :: .a -> .b
|
|
||||||
gMap{|c|} x = x
|
|
||||||
gMap{|UNIT|} x = x
|
|
||||||
gMap{|PAIR|} fx fy (PAIR x y) = PAIR (fx x) (fy y)
|
|
||||||
gMap{|EITHER|} fl fr (LEFT x) = LEFT (fl x)
|
|
||||||
gMap{|EITHER|} fl fr (RIGHT x) = RIGHT (fr x)
|
|
||||||
gMap{|CONS|} f (CONS x) = CONS (f x)
|
|
||||||
gMap{|FIELD|} f (FIELD x) = FIELD (f x)
|
|
||||||
gMap{|OBJECT|} f (OBJECT x) = OBJECT (f x)
|
|
||||||
gMap{|{}|} f xs = mapArray f xs
|
|
||||||
gMap{|{!}|} f xs = mapArray f xs
|
|
||||||
|
|
||||||
derive gMap [], (,), (,,), (,,,), (,,,,), (,,,,,), (,,,,,,), (,,,,,,,)
|
|
||||||
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
module fsieve
|
|
||||||
|
|
||||||
/*
|
|
||||||
The Fast Sieve of Eratosthenes.
|
|
||||||
|
|
||||||
A sequential and optimized version of the sieve of Eratosthenes.
|
|
||||||
The program calculates a list of the first NrOfPrime primes.
|
|
||||||
The result of the program is the NrOfPrimes'th prime.
|
|
||||||
|
|
||||||
Strictness annotations have been added because the strictness analyser
|
|
||||||
is not able to deduce all strictness information. Removal of these !'s
|
|
||||||
will make the program about 20% slower.
|
|
||||||
|
|
||||||
On a machine without a math coprocessor the execution of this
|
|
||||||
program might take a (very) long time. Set NrOfPrimes to a smaller value.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import StdClass; // RWS
|
|
||||||
import StdInt, StdReal
|
|
||||||
|
|
||||||
NrOfPrimes :== 3000
|
|
||||||
|
|
||||||
// The sieve algorithm: generate an infinite list of all primes.
|
|
||||||
|
|
||||||
Primes::[Int]
|
|
||||||
Primes = pr where pr = [5 : Sieve 7 4 pr]
|
|
||||||
|
|
||||||
Sieve::Int !Int [Int] -> [Int]
|
|
||||||
Sieve g i prs
|
|
||||||
| IsPrime prs g (toInt (sqrt (toReal g))) = [g : Sieve` g i prs]
|
|
||||||
= Sieve (g + i) (6 - i) prs
|
|
||||||
|
|
||||||
Sieve`::Int Int [Int] -> [Int]
|
|
||||||
Sieve` g i prs = Sieve (g + i) (6 - i) prs
|
|
||||||
|
|
||||||
IsPrime::[Int] !Int Int -> Bool
|
|
||||||
IsPrime [f:r] pr bd | f>bd = True
|
|
||||||
| pr rem f==0 = False
|
|
||||||
= IsPrime r pr bd
|
|
||||||
|
|
||||||
// Select is used to get the NrOfPrimes'th prime from the infinite list.
|
|
||||||
|
|
||||||
Select::[x] Int -> x
|
|
||||||
Select [f:r] 1 = f
|
|
||||||
Select [f:r] n = Select r (n - 1)
|
|
||||||
|
|
||||||
|
|
||||||
/* The Start rule: Select the NrOfPrimes'th prime from the list of primes
|
|
||||||
generated by Primes.
|
|
||||||
*/
|
|
||||||
|
|
||||||
Start::Int
|
|
||||||
Start = Select [2, 3 : Primes] NrOfPrimes
|
|
||||||
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
module monadicSemantics
|
|
||||||
|
|
||||||
import StdEnv, StdGeneric, GenMap, GenHylo
|
|
||||||
|
|
||||||
/* For fun I implemented the recursive datastructre Exp and Stm as fixpoints
|
|
||||||
This helps us define recursive functions on them (only a little bit though)
|
|
||||||
However deriving gMap for Fix did not works out of the box
|
|
||||||
I had to remove some uniqueness typing in GenMap and GenHylo */
|
|
||||||
:: Op = Plus | Minus | Times | Rem | Equal | LessThan
|
|
||||||
:: Var :== String
|
|
||||||
|
|
||||||
:: ExpP a = Int Int | Var Var | Op Op a a
|
|
||||||
:: Exp :== Fix ExpP
|
|
||||||
|
|
||||||
:: StmP a = Assign Var Exp | If Exp a a | While Exp a | Seq a a | Cont
|
|
||||||
:: Stm :== Fix StmP
|
|
||||||
|
|
||||||
derive gMap ExpP, StmP, Fix
|
|
||||||
|
|
||||||
// Environment. Semantics is basically Env -> Env
|
|
||||||
:: Env :== Var -> Int
|
|
||||||
:: Sem :== Env -> (Int, Env)
|
|
||||||
empty = \v . 0
|
|
||||||
|
|
||||||
// return
|
|
||||||
rtn :: Int -> Sem
|
|
||||||
rtn i = \e. (i, e)
|
|
||||||
|
|
||||||
// the usual bind
|
|
||||||
(>>=) infixl 1 :: Sem (Int->Sem) -> Sem
|
|
||||||
(>>=) x y = \e. (\(i,e2).y i e2) (x e)
|
|
||||||
(>>|) infixl 1 :: Sem Sem -> Sem
|
|
||||||
(>>|) x y = x >>= \_. y
|
|
||||||
|
|
||||||
// read variable from environment
|
|
||||||
read :: Var -> Sem
|
|
||||||
read v = \e. (e v, e)
|
|
||||||
|
|
||||||
// assign value to give variable in environment
|
|
||||||
write :: Var Int -> Sem
|
|
||||||
write v i = \e. (i, \w. if (w==v) i (e w))
|
|
||||||
|
|
||||||
// semantics
|
|
||||||
class sem a :: a -> Sem
|
|
||||||
|
|
||||||
operator :: Op -> Int -> Int -> Int
|
|
||||||
operator Plus = (+)
|
|
||||||
operator Minus = (-)
|
|
||||||
operator Times = (*)
|
|
||||||
operator Rem = rem
|
|
||||||
operator Equal = \x y . if (x==y) 1 0
|
|
||||||
operator LessThan = \x y . if (x< y) 1 0
|
|
||||||
|
|
||||||
// semantics of expressions
|
|
||||||
instance sem Exp where
|
|
||||||
sem x = cata phi x where
|
|
||||||
phi (Int n) = rtn n
|
|
||||||
phi (Var v) = read v
|
|
||||||
phi (Op op x y) = x >>= \v1. y >>= return o (operator op v1)
|
|
||||||
|
|
||||||
// semantics of statments
|
|
||||||
// NOTE: while will always return 0, as it might not even be executed
|
|
||||||
instance sem Stm where
|
|
||||||
sem x = cata phi x where
|
|
||||||
phi (Assign v e) = sem e >>= write v
|
|
||||||
phi (If e s1 s2) = sem e >>= \b . if (b<>0) s1 s2
|
|
||||||
phi stm=:(While e s) = sem e >>= \b . if (b<>0) (s >>| phi stm) (phi Cont)
|
|
||||||
phi (Seq s1 s2) = s1 >>| s2 // Here the cata *finally* pays off :D
|
|
||||||
phi Cont = rtn 0
|
|
||||||
|
|
||||||
// convenience functions
|
|
||||||
int = In o Int
|
|
||||||
var = In o Var
|
|
||||||
op o = In o2 (Op o)
|
|
||||||
assign = In o2 Assign
|
|
||||||
ifte e = In o2 (If e)
|
|
||||||
while = In o2 While
|
|
||||||
seq = In o2 Seq
|
|
||||||
cont = In Cont
|
|
||||||
|
|
||||||
// test case, also testing the new operator <
|
|
||||||
pEuclides =
|
|
||||||
while (op LessThan (int 0) (var "b"))(
|
|
||||||
seq (assign "r" (op Rem (var "a") (var "b")))
|
|
||||||
(seq (assign "a" (var "b"))
|
|
||||||
( (assign "b" (var "r")))
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
Start = fst (program start) where
|
|
||||||
program = sem pEuclides >>| read "a"
|
|
||||||
start "a" = 9
|
|
||||||
start "b" = 12
|
|
||||||
start _ = 0
|
|
||||||
|
|
||||||
// Helper
|
|
||||||
(o2) infixr 9
|
|
||||||
(o2) f g x :== f o (g x)
|
|
||||||
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
definition module stack
|
|
||||||
|
|
||||||
:: Stack a
|
|
||||||
|
|
||||||
newStack :: (Stack a)
|
|
||||||
push :: a (Stack a) -> Stack a
|
|
||||||
pushes :: [a] (Stack a) -> Stack a
|
|
||||||
pop :: (Stack a) -> Stack a
|
|
||||||
popn :: Int (Stack a) -> Stack a
|
|
||||||
top :: (Stack a) -> a
|
|
||||||
topn :: Int (Stack a) -> [a]
|
|
||||||
elements :: (Stack a) -> [a]
|
|
||||||
count :: (Stack a) -> Int
|
|
||||||
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
implementation module stack
|
|
||||||
import StdEnv
|
|
||||||
|
|
||||||
:: Stack a :== [a]
|
|
||||||
|
|
||||||
newStack :: (Stack a)
|
|
||||||
newStack = []
|
|
||||||
|
|
||||||
push :: a (Stack a) -> Stack a
|
|
||||||
push x s = [x:s]
|
|
||||||
|
|
||||||
pushes :: [a] (Stack a) -> Stack a
|
|
||||||
pushes x s = x ++ s
|
|
||||||
|
|
||||||
pop :: (Stack a) -> Stack a
|
|
||||||
pop [] = abort "Cannot use pop on an empty stack"
|
|
||||||
pop [e:s] = s
|
|
||||||
|
|
||||||
popn :: Int (Stack a) -> Stack a
|
|
||||||
popn n s = drop n s
|
|
||||||
|
|
||||||
top :: (Stack a) -> a
|
|
||||||
top [] = abort "Cannot use top on an empty stack"
|
|
||||||
top [e:s] = e
|
|
||||||
|
|
||||||
topn :: Int (Stack a) -> [a]
|
|
||||||
topn n s = take n s
|
|
||||||
elements :: (Stack a) -> [a]
|
|
||||||
elements s = s
|
|
||||||
|
|
||||||
count :: (Stack a) -> Int
|
|
||||||
count s = length s
|
|
||||||
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
definition module streams
|
|
||||||
|
|
||||||
import StdEnv
|
|
||||||
|
|
||||||
instance zero [Real]
|
|
||||||
instance one [Real]
|
|
||||||
instance + [Real]
|
|
||||||
instance - [Real]
|
|
||||||
instance * [Real]
|
|
||||||
instance / [Real]
|
|
||||||
|
|
||||||
X :: [Real]
|
|
||||||
invert :: [Real] -> [Real]
|
|
||||||
pow :: [Real] Int -> [Real]
|
|
||||||
(shuffle) infixl 7 :: [Real] [Real] -> [Real]
|
|
||||||
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
implementation module streams
|
|
||||||
|
|
||||||
import StdEnv
|
|
||||||
|
|
||||||
instance zero [Real]
|
|
||||||
where
|
|
||||||
zero = [] //Infinite row of zeroes represented as empty list to ease computation
|
|
||||||
|
|
||||||
instance one [Real]
|
|
||||||
where
|
|
||||||
one = [1.0:zero]
|
|
||||||
|
|
||||||
instance + [Real]
|
|
||||||
where
|
|
||||||
(+) [s:s`] [t:t`] = [s+t:s`+t`]
|
|
||||||
(+) [s:s`] [] = [s:s`]
|
|
||||||
(+) [] [t:t`] = [t:t`]
|
|
||||||
(+) [] [] = []
|
|
||||||
|
|
||||||
instance - [Real]
|
|
||||||
where
|
|
||||||
(-) [s:s`] [t:t`] = [s-t:s`-t`]
|
|
||||||
(-) [s:s`] [] = [s:s`]
|
|
||||||
(-) [] [t:t`] = [-1.0] * [t:t`]
|
|
||||||
(-) [] [] = []
|
|
||||||
|
|
||||||
instance * [Real]
|
|
||||||
where
|
|
||||||
(*) [s:s`] [t:t`] = [s*t:s`*[t:t`]+[s]*t`]
|
|
||||||
(*) _ _ = []
|
|
||||||
|
|
||||||
instance / [Real]
|
|
||||||
where
|
|
||||||
(/) s t = s * (invert t)
|
|
||||||
|
|
||||||
X :: [Real]
|
|
||||||
X = [0.0:one]
|
|
||||||
|
|
||||||
invert :: [Real] -> [Real]
|
|
||||||
invert [s:s`] = [1.0/s:(invert [s:s`]) * s` * [-1.0/s]]
|
|
||||||
|
|
||||||
pow :: [Real] Int -> [Real]
|
|
||||||
pow s 0 = one
|
|
||||||
pow s n = s * pow s (n-1)
|
|
||||||
|
|
||||||
(shuffle) infixl 7 :: [Real] [Real] -> [Real]
|
|
||||||
(shuffle) [s:s`] [t:t`] = [s*t:s` shuffle [t:t`] + [s:s`] shuffle t`]
|
|
||||||
(shuffle) _ _ = []
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
\ Bit arrays.
|
|
||||||
: bits ( u1 -- u2 ) 7 + 3 rshift ;
|
|
||||||
: bitmap ( u "name" -- ) create bits here over erase allot
|
|
||||||
does> ( u -- a x ) over 3 rshift + 1 rot 7 and lshift ;
|
|
||||||
: bit@ ( a x -- f ) swap c@ and ;
|
|
||||||
: 1bit ( a x -- ) over c@ or swap c! ;
|
|
||||||
: 0bit ( a x -- ) invert over c@ and swap c! ;
|
|
||||||
: bit! ( f a x -- ) rot if 1bit else 0bit then ;
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
\ Implements ENUM.
|
|
||||||
|
|
||||||
\ Double DOES>!
|
|
||||||
: enum create 0 , does> create dup @ 1 rot +! , does> @ ;
|
|
||||||
|
|
||||||
\ But this is simpler.
|
|
||||||
: enum create 0 , does> dup @ constant 1 swap +! ;
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
\ Simplifies compiling words.
|
|
||||||
|
|
||||||
: [[ ; immediate
|
|
||||||
: '<> >in @ ' swap >in ! <> ;
|
|
||||||
: (]]) begin dup '<> while postpone postpone repeat drop ;
|
|
||||||
: ]] ['] [[ (]]) ; immediate
|
|
||||||
|
|
||||||
( Usage: : foo ]] dup * [[ ; immediate : bar 42 foo . ; )
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
; RepRapPro Ormerod
|
|
||||||
; Board test GCodes
|
|
||||||
M111 S1; Debug on
|
|
||||||
G21 ; mm
|
|
||||||
G90 ; Absolute positioning
|
|
||||||
M83 ; Extrusion relative
|
|
||||||
M906 X800 Y800 Z800 E800 ; Motor currents (mA)
|
|
||||||
T0 ; Extruder 0
|
|
||||||
G1 X50 F500
|
|
||||||
G1 X0
|
|
||||||
G4 P500
|
|
||||||
G1 Y50 F500
|
|
||||||
G1 Y0
|
|
||||||
G4 P500
|
|
||||||
G1 Z20 F200
|
|
||||||
G1 Z0
|
|
||||||
G4 P500
|
|
||||||
G1 E20 F200
|
|
||||||
G1 E-20
|
|
||||||
G4 P500
|
|
||||||
M106 S255
|
|
||||||
G4 P500
|
|
||||||
M106 S0
|
|
||||||
G4 P500
|
|
||||||
M105
|
|
||||||
G10 P0 S100
|
|
||||||
T0
|
|
||||||
M140 S100
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
G4 P5000
|
|
||||||
M105
|
|
||||||
M0
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
25912
samples/G-code/lm.g
25912
samples/G-code/lm.g
File diff suppressed because it is too large
Load Diff
29735
samples/G-code/rm.g
29735
samples/G-code/rm.g
File diff suppressed because it is too large
Load Diff
@@ -1,13 +0,0 @@
|
|||||||
G28 X0 Y0
|
|
||||||
G1 X55 Y5 F2000
|
|
||||||
G1 Y180
|
|
||||||
G1 X180
|
|
||||||
G1 Y5
|
|
||||||
G1 X55
|
|
||||||
G1 Y180
|
|
||||||
G1 X180
|
|
||||||
G1 Y5
|
|
||||||
G1 X55
|
|
||||||
M0
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
# Taken from https://github.com/okamstudio/godot/wiki/gdscript
|
|
||||||
# a file is a class!
|
|
||||||
|
|
||||||
# inheritance
|
|
||||||
|
|
||||||
extends BaseClass
|
|
||||||
|
|
||||||
# member variables
|
|
||||||
|
|
||||||
var a = 5
|
|
||||||
var s = "Hello"
|
|
||||||
var arr = [1, 2, 3]
|
|
||||||
var dict = {"key":"value", 2:3}
|
|
||||||
|
|
||||||
# constants
|
|
||||||
|
|
||||||
const answer = 42
|
|
||||||
const thename = "Charly"
|
|
||||||
|
|
||||||
# built-in vector types
|
|
||||||
|
|
||||||
var v2 = Vector2(1, 2)
|
|
||||||
var v3 = Vector3(1, 2, 3)
|
|
||||||
|
|
||||||
# function
|
|
||||||
|
|
||||||
func some_function(param1, param2):
|
|
||||||
var local_var = 5
|
|
||||||
|
|
||||||
if param1 < local_var:
|
|
||||||
print(param1)
|
|
||||||
elif param2 > 5:
|
|
||||||
print(param2)
|
|
||||||
else:
|
|
||||||
print("fail!")
|
|
||||||
|
|
||||||
for i in range(20):
|
|
||||||
print(i)
|
|
||||||
|
|
||||||
while(param2 != 0):
|
|
||||||
param2 -= 1
|
|
||||||
|
|
||||||
var local_var2 = param1+3
|
|
||||||
return local_var2
|
|
||||||
|
|
||||||
|
|
||||||
# subclass
|
|
||||||
|
|
||||||
class Something:
|
|
||||||
var a = 10
|
|
||||||
|
|
||||||
# constructor
|
|
||||||
|
|
||||||
func _init():
|
|
||||||
print("constructed!")
|
|
||||||
var lv = Something.new()
|
|
||||||
print(lv.a)
|
|
||||||
@@ -1,216 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
extends Control
|
|
||||||
|
|
||||||
# Simple Tetris-like demo, (c) 2012 Juan Linietsky
|
|
||||||
# Implemented by using a regular Control and drawing on it during the _draw() callback.
|
|
||||||
# The drawing surface is updated only when changes happen (by calling update())
|
|
||||||
|
|
||||||
|
|
||||||
var score = 0
|
|
||||||
var score_label=null
|
|
||||||
|
|
||||||
const MAX_SHAPES = 7
|
|
||||||
|
|
||||||
var block = preload("block.png")
|
|
||||||
|
|
||||||
var block_colors=[
|
|
||||||
Color(1,0.5,0.5),
|
|
||||||
Color(0.5,1,0.5),
|
|
||||||
Color(0.5,0.5,1),
|
|
||||||
Color(0.8,0.4,0.8),
|
|
||||||
Color(0.8,0.8,0.4),
|
|
||||||
Color(0.4,0.8,0.8),
|
|
||||||
Color(0.7,0.7,0.7)]
|
|
||||||
|
|
||||||
var block_shapes=[
|
|
||||||
[ Vector2(0,-1),Vector2(0,0),Vector2(0,1),Vector2(0,2) ], # I
|
|
||||||
[ Vector2(0,0),Vector2(1,0),Vector2(1,1),Vector2(0,1) ], # O
|
|
||||||
[ Vector2(-1,1),Vector2(0,1),Vector2(0,0),Vector2(1,0) ], # S
|
|
||||||
[ Vector2(1,1),Vector2(0,1),Vector2(0,0),Vector2(-1,0) ], # Z
|
|
||||||
[ Vector2(-1,1),Vector2(-1,0),Vector2(0,0),Vector2(1,0) ], # L
|
|
||||||
[ Vector2(1,1),Vector2(1,0),Vector2(0,0),Vector2(-1,0) ], # J
|
|
||||||
[ Vector2(0,1),Vector2(1,0),Vector2(0,0),Vector2(-1,0) ]] # T
|
|
||||||
|
|
||||||
|
|
||||||
var block_rotations=[
|
|
||||||
Matrix32( Vector2(1,0),Vector2(0,1), Vector2() ),
|
|
||||||
Matrix32( Vector2(0,1),Vector2(-1,0), Vector2() ),
|
|
||||||
Matrix32( Vector2(-1,0),Vector2(0,-1), Vector2() ),
|
|
||||||
Matrix32( Vector2(0,-1),Vector2(1,0), Vector2() )
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
var width=0
|
|
||||||
var height=0
|
|
||||||
|
|
||||||
var cells={}
|
|
||||||
|
|
||||||
var piece_active=false
|
|
||||||
var piece_shape=0
|
|
||||||
var piece_pos=Vector2()
|
|
||||||
var piece_rot=0
|
|
||||||
|
|
||||||
|
|
||||||
func piece_cell_xform(p,er=0):
|
|
||||||
var r = (4+er+piece_rot)%4
|
|
||||||
return piece_pos+block_rotations[r].xform(p)
|
|
||||||
|
|
||||||
func _draw():
|
|
||||||
|
|
||||||
var sb = get_stylebox("bg","Tree") # use line edit bg
|
|
||||||
draw_style_box(sb,Rect2(Vector2(),get_size()).grow(3))
|
|
||||||
|
|
||||||
var bs = block.get_size()
|
|
||||||
for y in range(height):
|
|
||||||
for x in range(width):
|
|
||||||
if (Vector2(x,y) in cells):
|
|
||||||
draw_texture_rect(block,Rect2(Vector2(x,y)*bs,bs),false,block_colors[cells[Vector2(x,y)]])
|
|
||||||
|
|
||||||
if (piece_active):
|
|
||||||
|
|
||||||
for c in block_shapes[piece_shape]:
|
|
||||||
draw_texture_rect(block,Rect2(piece_cell_xform(c)*bs,bs),false,block_colors[piece_shape])
|
|
||||||
|
|
||||||
|
|
||||||
func piece_check_fit(ofs,er=0):
|
|
||||||
|
|
||||||
for c in block_shapes[piece_shape]:
|
|
||||||
var pos = piece_cell_xform(c,er)+ofs
|
|
||||||
if (pos.x < 0):
|
|
||||||
return false
|
|
||||||
if (pos.y < 0):
|
|
||||||
return false
|
|
||||||
if (pos.x >= width):
|
|
||||||
return false
|
|
||||||
if (pos.y >= height):
|
|
||||||
return false
|
|
||||||
if (pos in cells):
|
|
||||||
return false
|
|
||||||
|
|
||||||
return true
|
|
||||||
|
|
||||||
func new_piece():
|
|
||||||
|
|
||||||
piece_shape = randi() % MAX_SHAPES
|
|
||||||
piece_pos = Vector2(width/2,0)
|
|
||||||
piece_active=true
|
|
||||||
piece_rot=0
|
|
||||||
if (piece_shape==0):
|
|
||||||
piece_pos.y+=1
|
|
||||||
|
|
||||||
if (not piece_check_fit(Vector2())):
|
|
||||||
#game over
|
|
||||||
#print("GAME OVER!")
|
|
||||||
game_over()
|
|
||||||
|
|
||||||
update()
|
|
||||||
|
|
||||||
|
|
||||||
func test_collapse_rows():
|
|
||||||
var accum_down=0
|
|
||||||
for i in range(height):
|
|
||||||
var y = height - i - 1
|
|
||||||
var collapse = true
|
|
||||||
for x in range(width):
|
|
||||||
if (Vector2(x,y) in cells):
|
|
||||||
if (accum_down):
|
|
||||||
cells[ Vector2(x,y+accum_down) ] = cells[Vector2(x,y)]
|
|
||||||
else:
|
|
||||||
collapse=false
|
|
||||||
if (accum_down):
|
|
||||||
cells.erase( Vector2(x,y+accum_down) )
|
|
||||||
|
|
||||||
if (collapse):
|
|
||||||
accum_down+=1
|
|
||||||
|
|
||||||
|
|
||||||
score+=accum_down*100
|
|
||||||
score_label.set_text(str(score))
|
|
||||||
|
|
||||||
|
|
||||||
func game_over():
|
|
||||||
|
|
||||||
piece_active=false
|
|
||||||
get_node("gameover").set_text("Game Over")
|
|
||||||
update()
|
|
||||||
|
|
||||||
|
|
||||||
func restart_pressed():
|
|
||||||
|
|
||||||
score=0
|
|
||||||
score_label.set_text("0")
|
|
||||||
cells.clear()
|
|
||||||
get_node("gameover").set_text("")
|
|
||||||
piece_active=true
|
|
||||||
update()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func piece_move_down():
|
|
||||||
|
|
||||||
if (!piece_active):
|
|
||||||
return
|
|
||||||
if (piece_check_fit(Vector2(0,1))):
|
|
||||||
piece_pos.y+=1
|
|
||||||
update()
|
|
||||||
else:
|
|
||||||
|
|
||||||
for c in block_shapes[piece_shape]:
|
|
||||||
var pos = piece_cell_xform(c)
|
|
||||||
cells[pos]=piece_shape
|
|
||||||
test_collapse_rows()
|
|
||||||
new_piece()
|
|
||||||
|
|
||||||
|
|
||||||
func piece_rotate():
|
|
||||||
|
|
||||||
var adv = 1
|
|
||||||
if (not piece_check_fit(Vector2(),1)):
|
|
||||||
return
|
|
||||||
piece_rot = (piece_rot + adv) % 4
|
|
||||||
update()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func _input(ie):
|
|
||||||
|
|
||||||
|
|
||||||
if (not piece_active):
|
|
||||||
return
|
|
||||||
if (!ie.is_pressed()):
|
|
||||||
return
|
|
||||||
|
|
||||||
if (ie.is_action("move_left")):
|
|
||||||
if (piece_check_fit(Vector2(-1,0))):
|
|
||||||
piece_pos.x-=1
|
|
||||||
update()
|
|
||||||
elif (ie.is_action("move_right")):
|
|
||||||
if (piece_check_fit(Vector2(1,0))):
|
|
||||||
piece_pos.x+=1
|
|
||||||
update()
|
|
||||||
elif (ie.is_action("move_down")):
|
|
||||||
piece_move_down()
|
|
||||||
elif (ie.is_action("rotate")):
|
|
||||||
piece_rotate()
|
|
||||||
|
|
||||||
|
|
||||||
func setup(w,h):
|
|
||||||
width=w
|
|
||||||
height=h
|
|
||||||
set_size( Vector2(w,h)*block.get_size() )
|
|
||||||
new_piece()
|
|
||||||
get_node("timer").start()
|
|
||||||
|
|
||||||
|
|
||||||
func _ready():
|
|
||||||
# Initalization here
|
|
||||||
|
|
||||||
setup(10,20)
|
|
||||||
score_label = get_node("../score")
|
|
||||||
|
|
||||||
set_process_input(true)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,243 +0,0 @@
|
|||||||
|
|
||||||
extends RigidBody
|
|
||||||
|
|
||||||
# member variables here, example:
|
|
||||||
# var a=2
|
|
||||||
# var b="textvar"
|
|
||||||
|
|
||||||
#var dir=Vector3()
|
|
||||||
|
|
||||||
const ANIM_FLOOR = 0
|
|
||||||
const ANIM_AIR_UP = 1
|
|
||||||
const ANIM_AIR_DOWN = 2
|
|
||||||
|
|
||||||
const SHOOT_TIME = 1.5
|
|
||||||
const SHOOT_SCALE = 2
|
|
||||||
|
|
||||||
const CHAR_SCALE = Vector3(0.3,0.3,0.3)
|
|
||||||
|
|
||||||
var facing_dir = Vector3(1, 0, 0)
|
|
||||||
var movement_dir = Vector3()
|
|
||||||
|
|
||||||
var jumping=false
|
|
||||||
|
|
||||||
var turn_speed=40
|
|
||||||
var keep_jump_inertia = true
|
|
||||||
var air_idle_deaccel = false
|
|
||||||
var accel=19.0
|
|
||||||
var deaccel=14.0
|
|
||||||
var sharp_turn_threshhold = 140
|
|
||||||
|
|
||||||
var max_speed=3.1
|
|
||||||
var on_floor = false
|
|
||||||
|
|
||||||
var prev_shoot = false
|
|
||||||
|
|
||||||
var last_floor_velocity = Vector3()
|
|
||||||
|
|
||||||
var shoot_blend = 0
|
|
||||||
|
|
||||||
func adjust_facing(p_facing, p_target,p_step, p_adjust_rate,current_gn):
|
|
||||||
|
|
||||||
var n = p_target # normal
|
|
||||||
var t = n.cross(current_gn).normalized()
|
|
||||||
|
|
||||||
var x = n.dot(p_facing)
|
|
||||||
var y = t.dot(p_facing)
|
|
||||||
|
|
||||||
var ang = atan2(y,x)
|
|
||||||
|
|
||||||
if (abs(ang)<0.001): # too small
|
|
||||||
return p_facing
|
|
||||||
|
|
||||||
var s = sign(ang)
|
|
||||||
ang = ang * s
|
|
||||||
var turn = ang * p_adjust_rate * p_step
|
|
||||||
var a
|
|
||||||
if (ang<turn):
|
|
||||||
a=ang
|
|
||||||
else:
|
|
||||||
a=turn
|
|
||||||
ang = (ang - a) * s
|
|
||||||
|
|
||||||
return ((n * cos(ang)) + (t * sin(ang))) * p_facing.length()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func _integrate_forces( state ):
|
|
||||||
|
|
||||||
var lv = state.get_linear_velocity() # linear velocity
|
|
||||||
var g = state.get_total_gravity()
|
|
||||||
var delta = state.get_step()
|
|
||||||
var d = 1.0 - delta*state.get_total_density()
|
|
||||||
if (d<0):
|
|
||||||
d=0
|
|
||||||
lv += g * delta #apply gravity
|
|
||||||
|
|
||||||
var anim = ANIM_FLOOR
|
|
||||||
|
|
||||||
var up = -g.normalized() # (up is against gravity)
|
|
||||||
var vv = up.dot(lv) # vertical velocity
|
|
||||||
var hv = lv - (up*vv) # horizontal velocity
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var hdir = hv.normalized() # horizontal direction
|
|
||||||
var hspeed = hv.length() #horizontal speed
|
|
||||||
|
|
||||||
var floor_velocity
|
|
||||||
var onfloor = false
|
|
||||||
|
|
||||||
if (state.get_contact_count() == 0):
|
|
||||||
floor_velocity = last_floor_velocity
|
|
||||||
else:
|
|
||||||
for i in range(state.get_contact_count()):
|
|
||||||
if (state.get_contact_local_shape(i) != 1):
|
|
||||||
continue
|
|
||||||
|
|
||||||
onfloor = true
|
|
||||||
floor_velocity = state.get_contact_collider_velocity_at_pos(i)
|
|
||||||
break
|
|
||||||
|
|
||||||
|
|
||||||
var dir = Vector3() #where does the player intend to walk to
|
|
||||||
var cam_xform = get_node("target/camera").get_global_transform()
|
|
||||||
|
|
||||||
if (Input.is_action_pressed("move_forward")):
|
|
||||||
dir+=-cam_xform.basis[2]
|
|
||||||
if (Input.is_action_pressed("move_backwards")):
|
|
||||||
dir+=cam_xform.basis[2]
|
|
||||||
if (Input.is_action_pressed("move_left")):
|
|
||||||
dir+=-cam_xform.basis[0]
|
|
||||||
if (Input.is_action_pressed("move_right")):
|
|
||||||
dir+=cam_xform.basis[0]
|
|
||||||
|
|
||||||
var jump_attempt = Input.is_action_pressed("jump")
|
|
||||||
var shoot_attempt = Input.is_action_pressed("shoot")
|
|
||||||
|
|
||||||
var target_dir = (dir - up*dir.dot(up)).normalized()
|
|
||||||
|
|
||||||
if (onfloor):
|
|
||||||
|
|
||||||
var sharp_turn = hspeed > 0.1 and rad2deg(acos(target_dir.dot(hdir))) > sharp_turn_threshhold
|
|
||||||
|
|
||||||
if (dir.length()>0.1 and !sharp_turn) :
|
|
||||||
if (hspeed > 0.001) :
|
|
||||||
|
|
||||||
#linear_dir = linear_h_velocity/linear_vel
|
|
||||||
#if (linear_vel > brake_velocity_limit and linear_dir.dot(ctarget_dir)<-cos(Math::deg2rad(brake_angular_limit)))
|
|
||||||
# brake=true
|
|
||||||
#else
|
|
||||||
hdir = adjust_facing(hdir,target_dir,delta,1.0/hspeed*turn_speed,up)
|
|
||||||
facing_dir = hdir
|
|
||||||
else:
|
|
||||||
|
|
||||||
hdir = target_dir
|
|
||||||
|
|
||||||
if (hspeed<max_speed):
|
|
||||||
hspeed+=accel*delta
|
|
||||||
|
|
||||||
else:
|
|
||||||
hspeed-=deaccel*delta
|
|
||||||
if (hspeed<0):
|
|
||||||
hspeed=0
|
|
||||||
|
|
||||||
hv = hdir*hspeed
|
|
||||||
|
|
||||||
var mesh_xform = get_node("Armature").get_transform()
|
|
||||||
var facing_mesh=-mesh_xform.basis[0].normalized()
|
|
||||||
facing_mesh = (facing_mesh - up*facing_mesh.dot(up)).normalized()
|
|
||||||
facing_mesh = adjust_facing(facing_mesh,target_dir,delta,1.0/hspeed*turn_speed,up)
|
|
||||||
var m3 = Matrix3(-facing_mesh,up,-facing_mesh.cross(up).normalized()).scaled( CHAR_SCALE )
|
|
||||||
|
|
||||||
get_node("Armature").set_transform(Transform(m3,mesh_xform.origin))
|
|
||||||
|
|
||||||
if (not jumping and jump_attempt):
|
|
||||||
vv = 7.0
|
|
||||||
jumping = true
|
|
||||||
get_node("sfx").play("jump")
|
|
||||||
else:
|
|
||||||
|
|
||||||
if (vv>0):
|
|
||||||
anim=ANIM_AIR_UP
|
|
||||||
else:
|
|
||||||
anim=ANIM_AIR_DOWN
|
|
||||||
|
|
||||||
var hs
|
|
||||||
if (dir.length()>0.1):
|
|
||||||
|
|
||||||
hv += target_dir * (accel * 0.2) * delta
|
|
||||||
if (hv.length() > max_speed):
|
|
||||||
hv = hv.normalized() * max_speed
|
|
||||||
|
|
||||||
else:
|
|
||||||
|
|
||||||
if (air_idle_deaccel):
|
|
||||||
hspeed = hspeed - (deaccel * 0.2) * delta
|
|
||||||
if (hspeed<0):
|
|
||||||
hspeed=0
|
|
||||||
|
|
||||||
hv = hdir*hspeed
|
|
||||||
|
|
||||||
|
|
||||||
if (jumping and vv < 0):
|
|
||||||
jumping=false
|
|
||||||
|
|
||||||
lv = hv+up*vv
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (onfloor):
|
|
||||||
|
|
||||||
movement_dir = lv
|
|
||||||
#lv += floor_velocity
|
|
||||||
last_floor_velocity = floor_velocity
|
|
||||||
else:
|
|
||||||
|
|
||||||
if (on_floor) :
|
|
||||||
|
|
||||||
#if (keep_jump_inertia):
|
|
||||||
# lv += last_floor_velocity
|
|
||||||
pass
|
|
||||||
|
|
||||||
last_floor_velocity = Vector3()
|
|
||||||
movement_dir = lv
|
|
||||||
|
|
||||||
on_floor = onfloor
|
|
||||||
|
|
||||||
state.set_linear_velocity(lv)
|
|
||||||
|
|
||||||
if (shoot_blend>0):
|
|
||||||
shoot_blend -= delta * SHOOT_SCALE
|
|
||||||
if (shoot_blend<0):
|
|
||||||
shoot_blend=0
|
|
||||||
|
|
||||||
if (shoot_attempt and not prev_shoot):
|
|
||||||
shoot_blend = SHOOT_TIME
|
|
||||||
var bullet = preload("res://bullet.scn").instance()
|
|
||||||
bullet.set_transform( get_node("Armature/bullet").get_global_transform().orthonormalized() )
|
|
||||||
get_parent().add_child( bullet )
|
|
||||||
bullet.set_linear_velocity( get_node("Armature/bullet").get_global_transform().basis[2].normalized() * 20 )
|
|
||||||
PS.body_add_collision_exception( bullet.get_rid(), get_rid() ) #add it to bullet
|
|
||||||
get_node("sfx").play("shoot")
|
|
||||||
|
|
||||||
prev_shoot = shoot_attempt
|
|
||||||
|
|
||||||
if (onfloor):
|
|
||||||
get_node("AnimationTreePlayer").blend2_node_set_amount("walk",hspeed / max_speed)
|
|
||||||
|
|
||||||
get_node("AnimationTreePlayer").transition_node_set_current("state",anim)
|
|
||||||
get_node("AnimationTreePlayer").blend2_node_set_amount("gun",min(shoot_blend,1.0))
|
|
||||||
# state.set_angular_velocity(Vector3())
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func _ready():
|
|
||||||
|
|
||||||
|
|
||||||
# Initalization here
|
|
||||||
get_node("AnimationTreePlayer").set_active(true)
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
|
|
||||||
extends Node2D
|
|
||||||
|
|
||||||
# member variables here, example:
|
|
||||||
# var a=2
|
|
||||||
# var b="textvar"
|
|
||||||
const INITIAL_BALL_SPEED = 80
|
|
||||||
var ball_speed = INITIAL_BALL_SPEED
|
|
||||||
var screen_size = Vector2(640,400)
|
|
||||||
#default ball direction
|
|
||||||
var direction = Vector2(-1,0)
|
|
||||||
var pad_size = Vector2(8,32)
|
|
||||||
const PAD_SPEED = 150
|
|
||||||
|
|
||||||
|
|
||||||
func _process(delta):
|
|
||||||
|
|
||||||
|
|
||||||
# get ball positio and pad rectangles
|
|
||||||
var ball_pos = get_node("ball").get_pos()
|
|
||||||
var left_rect = Rect2( get_node("left").get_pos() - pad_size*0.5, pad_size )
|
|
||||||
var right_rect = Rect2( get_node("right").get_pos() - pad_size*0.5, pad_size )
|
|
||||||
|
|
||||||
#integrate new ball postion
|
|
||||||
ball_pos+=direction*ball_speed*delta
|
|
||||||
|
|
||||||
#flip when touching roof or floor
|
|
||||||
if ( (ball_pos.y<0 and direction.y <0) or (ball_pos.y>screen_size.y and direction.y>0)):
|
|
||||||
direction.y = -direction.y
|
|
||||||
|
|
||||||
#flip, change direction and increase speed when touching pads
|
|
||||||
if ( (left_rect.has_point(ball_pos) and direction.x < 0) or (right_rect.has_point(ball_pos) and direction.x > 0)):
|
|
||||||
direction.x=-direction.x
|
|
||||||
ball_speed*=1.1
|
|
||||||
direction.y=randf()*2.0-1
|
|
||||||
direction = direction.normalized()
|
|
||||||
|
|
||||||
#check gameover
|
|
||||||
if (ball_pos.x<0 or ball_pos.x>screen_size.x):
|
|
||||||
ball_pos=screen_size*0.5
|
|
||||||
ball_speed=INITIAL_BALL_SPEED
|
|
||||||
direction=Vector2(-1,0)
|
|
||||||
|
|
||||||
|
|
||||||
get_node("ball").set_pos(ball_pos)
|
|
||||||
|
|
||||||
#move left pad
|
|
||||||
var left_pos = get_node("left").get_pos()
|
|
||||||
|
|
||||||
if (left_pos.y > 0 and Input.is_action_pressed("left_move_up")):
|
|
||||||
left_pos.y+=-PAD_SPEED*delta
|
|
||||||
if (left_pos.y < screen_size.y and Input.is_action_pressed("left_move_down")):
|
|
||||||
left_pos.y+=PAD_SPEED*delta
|
|
||||||
|
|
||||||
get_node("left").set_pos(left_pos)
|
|
||||||
|
|
||||||
#move right pad
|
|
||||||
var right_pos = get_node("right").get_pos()
|
|
||||||
|
|
||||||
if (right_pos.y > 0 and Input.is_action_pressed("right_move_up")):
|
|
||||||
right_pos.y+=-PAD_SPEED*delta
|
|
||||||
if (right_pos.y < screen_size.y and Input.is_action_pressed("right_move_down")):
|
|
||||||
right_pos.y+=PAD_SPEED*delta
|
|
||||||
|
|
||||||
get_node("right").set_pos(right_pos)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func _ready():
|
|
||||||
screen_size = get_viewport_rect().size # get actual size
|
|
||||||
pad_size = get_node("left").get_texture().get_size()
|
|
||||||
set_process(true)
|
|
||||||
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.Adapters
|
|
||||||
|
|
||||||
local function list_sample = |fabric| {
|
|
||||||
println(">>> list_sample()")
|
|
||||||
let carbonCopy = list[]
|
|
||||||
let conf = map[
|
|
||||||
["extends", "java.util.ArrayList"],
|
|
||||||
["overrides", map[
|
|
||||||
["*", |super, name, args| {
|
|
||||||
if name == "add" {
|
|
||||||
if args: length() == 2 {
|
|
||||||
carbonCopy: add(args: get(1))
|
|
||||||
} else {
|
|
||||||
carbonCopy: add(args: get(1), args: get(2))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return super: invokeWithArguments(args)
|
|
||||||
}
|
|
||||||
]]
|
|
||||||
]]
|
|
||||||
let list = fabric: maker(conf): newInstance()
|
|
||||||
list: add("bar")
|
|
||||||
list: add(0, "foo")
|
|
||||||
list: add("baz")
|
|
||||||
println(" list: " + list + " " + list: getClass())
|
|
||||||
println("carbonCopy: " + carbonCopy + " " + carbonCopy: getClass())
|
|
||||||
}
|
|
||||||
|
|
||||||
local function runnable_sample = |fabric| {
|
|
||||||
println(">>> runnable_sample")
|
|
||||||
let result = array[1, 2, 3]
|
|
||||||
let conf = map[
|
|
||||||
["interfaces", ["java.io.Serializable", "java.lang.Runnable"]],
|
|
||||||
["implements", map[
|
|
||||||
["run", |this| {
|
|
||||||
for (var i = 0, i < result: length(), i = i + 1) {
|
|
||||||
result: set(i, result: get(i) + 10)
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
]]
|
|
||||||
]
|
|
||||||
let runner = fabric: maker(conf): newInstance()
|
|
||||||
runner: run()
|
|
||||||
println(" result: " + result: toString())
|
|
||||||
println("serializable? " + (runner oftype java.io.Serializable.class))
|
|
||||||
println(" runnable? " + (runner oftype java.lang.Runnable.class))
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let fabric = AdapterFabric()
|
|
||||||
list_sample(fabric)
|
|
||||||
runnable_sample(fabric)
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.AsyncHelpers
|
|
||||||
|
|
||||||
import gololang.Async
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
import java.util.concurrent.Executors
|
|
||||||
|
|
||||||
local function fib = |n| {
|
|
||||||
if n <= 1 {
|
|
||||||
return n
|
|
||||||
} else {
|
|
||||||
return fib(n - 1) + fib(n - 2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let executor = newCachedThreadPool()
|
|
||||||
println("Let's do some useless asynchronous operations...")
|
|
||||||
|
|
||||||
var f = executor: enqueue({
|
|
||||||
Thread.sleep(1000_L)
|
|
||||||
return 666
|
|
||||||
})
|
|
||||||
f:
|
|
||||||
onSet(|v| -> println(">>> #slow -> " + v)):
|
|
||||||
onFail(|e| -> println(">>> #fail -> " + e))
|
|
||||||
f:
|
|
||||||
cancel(true)
|
|
||||||
|
|
||||||
f = executor: enqueue({
|
|
||||||
Thread.sleep(1000_L)
|
|
||||||
return 666
|
|
||||||
})
|
|
||||||
f:
|
|
||||||
onSet(|v| -> println(">>> #ok -> " + v)):
|
|
||||||
onFail(|e| -> println(">>> #wtf? -> " + e))
|
|
||||||
|
|
||||||
let fib_10 = promise()
|
|
||||||
let fib_20 = promise()
|
|
||||||
let fib_30 = promise()
|
|
||||||
let fib_40 = promise()
|
|
||||||
|
|
||||||
let futures = [
|
|
||||||
fib_10: future(), fib_20: future(),
|
|
||||||
fib_30: future(), fib_40: future()
|
|
||||||
]
|
|
||||||
|
|
||||||
executor: submit(-> fib_10: set(fib(10)))
|
|
||||||
executor: submit(-> fib_20: set(fib(20)))
|
|
||||||
executor: submit(-> fib_30: set(fib(30)))
|
|
||||||
executor: submit(-> fib_40: set(fib(40)))
|
|
||||||
|
|
||||||
all(futures): onSet(|results| -> println(">>> Fibs: " + results))
|
|
||||||
|
|
||||||
let truth = promise()
|
|
||||||
truth:
|
|
||||||
future():
|
|
||||||
map(|v| -> "truth=" + v):
|
|
||||||
onSet(|v| -> executor: submit(-> println(">>> (another thread) " + v))):
|
|
||||||
onSet(|v| -> println(">>> (same thread) " + v))
|
|
||||||
executor: submit({
|
|
||||||
Thread.sleep(500_L)
|
|
||||||
truth: set(42)
|
|
||||||
})
|
|
||||||
|
|
||||||
Thread.sleep(1000_L)
|
|
||||||
executor: shutdown()
|
|
||||||
executor: awaitTermination(2_L, SECONDS())
|
|
||||||
println("Bye!")
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.Augmentations
|
|
||||||
|
|
||||||
import java.util.LinkedList
|
|
||||||
|
|
||||||
augment java.util.List {
|
|
||||||
function with = |this, value| {
|
|
||||||
this: add(value)
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
augment java.util.Collection {
|
|
||||||
function doToEach = |this, func| {
|
|
||||||
foreach (element in this) {
|
|
||||||
func(element)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let list = LinkedList(): with("foo"): with("bar"): with("baz")
|
|
||||||
list: doToEach(|value| -> println(">>> " + value))
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module Closures
|
|
||||||
|
|
||||||
local function sayHello = |who| -> "Hello " + who + "!"
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let adder = |a, b| -> a + b
|
|
||||||
println(adder: invokeWithArguments(1, 2))
|
|
||||||
println(adder(1, 2))
|
|
||||||
|
|
||||||
let addToTen = adder: bindTo(10)
|
|
||||||
println(addToTen: invokeWithArguments(2))
|
|
||||||
println(addToTen(2))
|
|
||||||
|
|
||||||
let adding = |x| -> |y| -> adder(x, y)
|
|
||||||
let addingTen = adding(10)
|
|
||||||
println(addingTen(4))
|
|
||||||
println(adding(2)(4))
|
|
||||||
|
|
||||||
println(sayHello("Julien"))
|
|
||||||
|
|
||||||
let list = java.util.LinkedList()
|
|
||||||
let pump_it = {
|
|
||||||
list: add("I heard you say")
|
|
||||||
list: add("Hey!")
|
|
||||||
list: add("Hey!")
|
|
||||||
}
|
|
||||||
pump_it()
|
|
||||||
println(list)
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module CoinChange
|
|
||||||
|
|
||||||
import java.util.LinkedList
|
|
||||||
|
|
||||||
function change = |money, coins| -> match {
|
|
||||||
when money == 0 then 1
|
|
||||||
when (money < 0) or (coins: isEmpty()) then 0
|
|
||||||
otherwise change(money - coins: head(), coins) + change(money, coins: tail())
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let coins = LinkedList(): append(1, 2, 5, 10, 20)
|
|
||||||
println("Coins: " + coins)
|
|
||||||
println("0: " + change(0, coins))
|
|
||||||
println("1: " + change(1, coins))
|
|
||||||
println("2: " + change(2, coins))
|
|
||||||
println("10: " + change(10, coins))
|
|
||||||
println("12: " + change(12, coins))
|
|
||||||
println("6: " + change(6, coins))
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.CollectionLiterals
|
|
||||||
|
|
||||||
local function play_with_tuples = {
|
|
||||||
let hello = ["Hello", "world", "!"]
|
|
||||||
foreach str in hello {
|
|
||||||
print(str + " ")
|
|
||||||
}
|
|
||||||
println("")
|
|
||||||
|
|
||||||
println(hello: get(0) + "-" + hello: get(1) + "-" + hello: get(2))
|
|
||||||
|
|
||||||
println(hello: join("/"))
|
|
||||||
}
|
|
||||||
|
|
||||||
local function play_with_literals = {
|
|
||||||
let data = [
|
|
||||||
[1, 2, 3],
|
|
||||||
tuple[1, 2, 3],
|
|
||||||
array[1, 2, 3],
|
|
||||||
set[1, 2, 3, 3, 1],
|
|
||||||
map[
|
|
||||||
["a", 10],
|
|
||||||
["b", 20]
|
|
||||||
],
|
|
||||||
vector[1, 2, 3],
|
|
||||||
list[1, 2, 3]
|
|
||||||
]
|
|
||||||
|
|
||||||
data: each(|element| {
|
|
||||||
println(element: toString())
|
|
||||||
println(" type: " + element: getClass())
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
println(">>> Literals")
|
|
||||||
play_with_literals()
|
|
||||||
println("\n>>> Tuples")
|
|
||||||
play_with_tuples()
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.ContextDecorator
|
|
||||||
|
|
||||||
import gololang.Decorators
|
|
||||||
|
|
||||||
let myContext = defaultContext():
|
|
||||||
count(0):
|
|
||||||
define("entry", |this, args| {
|
|
||||||
this: count(this: count() + 1)
|
|
||||||
println("hello:" + this: count())
|
|
||||||
return args
|
|
||||||
}):
|
|
||||||
define("exit", |this, result| {
|
|
||||||
require(result >= 3, "wrong value")
|
|
||||||
println("goobye")
|
|
||||||
return result
|
|
||||||
}):
|
|
||||||
define("catcher", |this, e| {
|
|
||||||
println("Caught " + e)
|
|
||||||
throw e
|
|
||||||
}):
|
|
||||||
define("finallizer", |this| {println("do some cleanup")})
|
|
||||||
|
|
||||||
|
|
||||||
@withContext(myContext)
|
|
||||||
function foo = |a, b| {
|
|
||||||
println("Hard computation")
|
|
||||||
return a + b
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
println(foo(1,2))
|
|
||||||
println("====")
|
|
||||||
println(withContext(myContext)(|a| -> 2*a)(3))
|
|
||||||
println("====")
|
|
||||||
try {
|
|
||||||
println(foo(1, 1))
|
|
||||||
} catch (e) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.Decorators
|
|
||||||
|
|
||||||
import java.util.LinkedList
|
|
||||||
|
|
||||||
function simple_decorator = |func| {
|
|
||||||
return |a,b| -> func(a+1,b+1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@simple_decorator
|
|
||||||
function simple_adder = |x,y| -> x + y
|
|
||||||
|
|
||||||
function decorator_with_params = |param1, param2|{
|
|
||||||
return |func| {
|
|
||||||
return |a,b| -> func(a+param1,b+param2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@decorator_with_params(10,2)
|
|
||||||
function parametrized_adder = |x,y| -> x + y
|
|
||||||
|
|
||||||
function generic_decorator = |func| {
|
|
||||||
return |args...| {
|
|
||||||
println("number of params : "+args: length())
|
|
||||||
return func: invokeWithArguments(args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@generic_decorator
|
|
||||||
function generic_adder0 = -> 42
|
|
||||||
|
|
||||||
@generic_decorator
|
|
||||||
function generic_adder1 = |x| -> x
|
|
||||||
|
|
||||||
@generic_decorator
|
|
||||||
function generic_adder2 = |x,y| -> x + y
|
|
||||||
|
|
||||||
@generic_decorator
|
|
||||||
function generic_adder3 = |x,y,z| -> x + y + z
|
|
||||||
|
|
||||||
function list_sum_decorator = |func| {
|
|
||||||
return |this| -> func(this) - 8
|
|
||||||
}
|
|
||||||
|
|
||||||
augment java.util.List {
|
|
||||||
|
|
||||||
@list_sum_decorator
|
|
||||||
function sum = |this| {
|
|
||||||
var acc = 0
|
|
||||||
foreach elem in this {
|
|
||||||
acc = acc + elem
|
|
||||||
}
|
|
||||||
return acc
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
println(simple_adder(10,30))
|
|
||||||
println(parametrized_adder(10,20))
|
|
||||||
println(generic_adder0())
|
|
||||||
println(generic_adder1(42))
|
|
||||||
println(generic_adder2(20,22))
|
|
||||||
println(generic_adder3(10,12,20))
|
|
||||||
let list = LinkedList()
|
|
||||||
list: add(5)
|
|
||||||
list: add(10)
|
|
||||||
list: add(15)
|
|
||||||
list: add(20)
|
|
||||||
println(list: sum())
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.DynamicEvaluation
|
|
||||||
|
|
||||||
import gololang.EvaluationEnvironment
|
|
||||||
|
|
||||||
local function test_asModule = |env| {
|
|
||||||
let code =
|
|
||||||
"""
|
|
||||||
module foo
|
|
||||||
|
|
||||||
function a = -> "a!"
|
|
||||||
function b = -> "b!"
|
|
||||||
"""
|
|
||||||
let mod = env: asModule(code)
|
|
||||||
let a = fun("a", mod)
|
|
||||||
let b = fun("b", mod)
|
|
||||||
println(">>> asModule()")
|
|
||||||
println(a())
|
|
||||||
println(b())
|
|
||||||
}
|
|
||||||
|
|
||||||
local function test_anonymousModule = |env| {
|
|
||||||
let code =
|
|
||||||
"""
|
|
||||||
function a = -> "a."
|
|
||||||
function b = -> "b."
|
|
||||||
"""
|
|
||||||
let mod = env: anonymousModule(code)
|
|
||||||
let a = fun("a", mod)
|
|
||||||
let b = fun("b", mod)
|
|
||||||
println(">>> anonymousModule()")
|
|
||||||
println(a())
|
|
||||||
println(b())
|
|
||||||
}
|
|
||||||
|
|
||||||
local function test_asFunction = |env| {
|
|
||||||
let code = "return (a + b) * 2"
|
|
||||||
let f = env: asFunction(code, "a", "b")
|
|
||||||
println(">>> asFunction")
|
|
||||||
println(f(10, 20))
|
|
||||||
}
|
|
||||||
|
|
||||||
local function test_def = |env| {
|
|
||||||
let code = "|a, b| -> (a + b) * 2"
|
|
||||||
let f = env: def(code)
|
|
||||||
println(">>> def")
|
|
||||||
println(f(10, 20))
|
|
||||||
}
|
|
||||||
|
|
||||||
local function test_run = |env| {
|
|
||||||
let code = """println(">>> run")
|
|
||||||
foreach (i in range(0, 3)) {
|
|
||||||
println("w00t")
|
|
||||||
}"""
|
|
||||||
env: run(code)
|
|
||||||
}
|
|
||||||
|
|
||||||
local function test_run_map = |env| {
|
|
||||||
let code = """println(">>> run_map")
|
|
||||||
println(a)
|
|
||||||
println(b)
|
|
||||||
"""
|
|
||||||
let values = java.util.TreeMap(): add("a", 1): add("b", 2)
|
|
||||||
env: run(code, values)
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let env = EvaluationEnvironment()
|
|
||||||
test_asModule(env)
|
|
||||||
test_anonymousModule(env)
|
|
||||||
test_asFunction(env)
|
|
||||||
test_def(env)
|
|
||||||
test_run(env)
|
|
||||||
test_run_map(env)
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.DynamicObjectPerson
|
|
||||||
|
|
||||||
local function mrbean = -> DynamicObject():
|
|
||||||
name("Mr Bean"):
|
|
||||||
email("mrbean@gmail.com"):
|
|
||||||
define("toString", |this| -> this: name() + " <" + this: email() + ">")
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let bean = mrbean()
|
|
||||||
println(bean: toString())
|
|
||||||
|
|
||||||
bean: email("mrbean@outlook.com")
|
|
||||||
println(bean: toString())
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module EchoArgs
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
println("With a for loop and an index:")
|
|
||||||
for (var i = 0, i < args: length(), i = i + 1) {
|
|
||||||
println(" #" + i + " -> " + args: get(i))
|
|
||||||
}
|
|
||||||
|
|
||||||
println("With a foreach loop:")
|
|
||||||
foreach arg in args {
|
|
||||||
println(" " + arg)
|
|
||||||
}
|
|
||||||
|
|
||||||
println("With a foreach over a range:")
|
|
||||||
foreach i in range(0, args: length()) {
|
|
||||||
println(" #" + i + " -> " + args: get(i))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module sample.EnumsThreadState
|
|
||||||
|
|
||||||
import java.lang.Thread$State
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
# Call the enum entry like a function
|
|
||||||
let new = Thread$State.NEW()
|
|
||||||
println("name=" + new: name() + ", ordinal=" + new: ordinal())
|
|
||||||
println("-----------")
|
|
||||||
|
|
||||||
# Walk through all enum entries
|
|
||||||
foreach element in Thread$State.values() {
|
|
||||||
println("name=" + element: name() + ", ordinal=" + element: ordinal())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.Fibonacci
|
|
||||||
|
|
||||||
import java.lang.System
|
|
||||||
|
|
||||||
function fib = |n| {
|
|
||||||
if n <= 1 {
|
|
||||||
return n
|
|
||||||
} else {
|
|
||||||
return fib(n - 1) + fib(n - 2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
local function run = {
|
|
||||||
let start = System.currentTimeMillis()
|
|
||||||
let result = fib(40)
|
|
||||||
let duration = System.currentTimeMillis() - start
|
|
||||||
println(">>> " + result + " (took " + duration + "ms)")
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
while true {
|
|
||||||
run()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module hello.World
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
println("Hello world!")
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.WebServer
|
|
||||||
|
|
||||||
import java.lang
|
|
||||||
import java.net.InetSocketAddress
|
|
||||||
import com.sun.net.httpserver
|
|
||||||
import com.sun.net.httpserver.HttpServer
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let server = HttpServer.create(InetSocketAddress("localhost", 8081), 0)
|
|
||||||
|
|
||||||
server: createContext("/", |exchange| {
|
|
||||||
let headers = exchange: getResponseHeaders()
|
|
||||||
let response = StringBuilder():
|
|
||||||
append("Requested URI: "):
|
|
||||||
append(exchange: getRequestURI()):
|
|
||||||
append("\n"):
|
|
||||||
append("Current time: "):
|
|
||||||
append(java.util.Date()):
|
|
||||||
append("\n"):
|
|
||||||
toString()
|
|
||||||
headers: set("Content-Type", "text/plain")
|
|
||||||
exchange: sendResponseHeaders(200, response: length())
|
|
||||||
exchange: getResponseBody(): write(response: getBytes())
|
|
||||||
exchange: close()
|
|
||||||
})
|
|
||||||
|
|
||||||
server: createContext("/shutdown", |exchange| {
|
|
||||||
let response = "Ok, thanks, bye!"
|
|
||||||
exchange: getResponseHeaders(): set("Content-Type", "text/plain")
|
|
||||||
exchange: sendResponseHeaders(200, response: length())
|
|
||||||
exchange: getResponseBody(): write(response: getBytes())
|
|
||||||
exchange: close()
|
|
||||||
server: stop(5)
|
|
||||||
})
|
|
||||||
|
|
||||||
server: start()
|
|
||||||
println(">>> http://localhost:8081/")
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
|
|
||||||
module samples.LogDeco
|
|
||||||
|
|
||||||
function log1 = |msg| {
|
|
||||||
return |fun| {
|
|
||||||
return |args...| {
|
|
||||||
println(msg)
|
|
||||||
return fun: invokeWithArguments(args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@log1("calling foo")
|
|
||||||
function foo = |a| {
|
|
||||||
println("foo got a " + a)
|
|
||||||
}
|
|
||||||
|
|
||||||
@log1("I'am a bar")
|
|
||||||
function bar = |a| -> 2*a
|
|
||||||
|
|
||||||
let sayHello = log1("Hello")
|
|
||||||
|
|
||||||
@sayHello
|
|
||||||
function baz = -> "Goodbye"
|
|
||||||
|
|
||||||
function log2 = |msgBefore| -> |msgAfter| -> |func| -> |args...| {
|
|
||||||
println(msgBefore)
|
|
||||||
let res = func: invokeWithArguments(args)
|
|
||||||
println(msgAfter)
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
|
|
||||||
@log2("enter foo")("exit foo")
|
|
||||||
function spam = |a| {
|
|
||||||
println("foo: " + a)
|
|
||||||
}
|
|
||||||
|
|
||||||
function logEnterExit = |name| -> log2("# enter " + name)("# exit " + name)
|
|
||||||
|
|
||||||
@logEnterExit("bar")
|
|
||||||
function egg = { println("doing something...") }
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
foo("bar")
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
println(bar(21))
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
println(baz())
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
spam("bar")
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
egg()
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
let strange_use = log2("hello")("goodbye")({println(":p")})
|
|
||||||
strange_use()
|
|
||||||
|
|
||||||
println("---")
|
|
||||||
log2("another")("use")(|a|{println(a)})("strange")
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module Matching
|
|
||||||
|
|
||||||
import java.util.LinkedList
|
|
||||||
|
|
||||||
local function data = {
|
|
||||||
let list = LinkedList()
|
|
||||||
list: add("foo@bar.com")
|
|
||||||
list: add("+33.6.11.22.33")
|
|
||||||
list: add("http://golo-lang.org/")
|
|
||||||
list: add("def foo = bar(_._) with :> T")
|
|
||||||
return list
|
|
||||||
}
|
|
||||||
|
|
||||||
local function what_it_could_be = |item| -> match {
|
|
||||||
when item: contains("@") then "an email?"
|
|
||||||
when item: startsWith("+33") then "a French phone number?"
|
|
||||||
when item: startsWith("http://") then "a website URL?"
|
|
||||||
otherwise "I have no clue, mate!"
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
foreach item in data() {
|
|
||||||
println(item + " => " + what_it_could_be(item))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.MaxInt
|
|
||||||
|
|
||||||
local function max_int = {
|
|
||||||
return java.lang.Integer.MAX_VALUE()
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
println(max_int())
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.MemoizeDecorator
|
|
||||||
|
|
||||||
import gololang.Decorators
|
|
||||||
|
|
||||||
import java.lang.System
|
|
||||||
|
|
||||||
let memo = memoizer()
|
|
||||||
|
|
||||||
@memo
|
|
||||||
function fib = |n| {
|
|
||||||
if n <= 1 {
|
|
||||||
return n
|
|
||||||
} else {
|
|
||||||
return fib(n - 1) + fib(n - 2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@memo
|
|
||||||
function foo = |n| -> n
|
|
||||||
|
|
||||||
local function run = {
|
|
||||||
let start = System.currentTimeMillis()
|
|
||||||
let result = fib(40)
|
|
||||||
let duration = System.currentTimeMillis() - start
|
|
||||||
println(">>> fib(40) = " + result + " (took " + duration + "ms)")
|
|
||||||
}
|
|
||||||
|
|
||||||
local function run2 = {
|
|
||||||
let start = System.currentTimeMillis()
|
|
||||||
let result = foo(40)
|
|
||||||
let duration = System.currentTimeMillis() - start
|
|
||||||
println(">>> foo(40) = " + result + " (took " + duration + "ms)")
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
foreach i in range(0, 5) {
|
|
||||||
println("run " + i)
|
|
||||||
run()
|
|
||||||
run2()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module DealingWithNull
|
|
||||||
|
|
||||||
import java.util
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
# Data model
|
|
||||||
let contacts = map[
|
|
||||||
["mrbean", map[
|
|
||||||
["email", "bean@gmail.com"],
|
|
||||||
["url", "http://mrbean.com"]
|
|
||||||
]],
|
|
||||||
["larry", map[
|
|
||||||
["email", "larry@iamricherthanyou.com"]
|
|
||||||
]]
|
|
||||||
]
|
|
||||||
|
|
||||||
# MrBean and Larry
|
|
||||||
let mrbean = contacts: get("mrbean")
|
|
||||||
let larry = contacts: get("larry")
|
|
||||||
|
|
||||||
# Illustrates orIfNull
|
|
||||||
println(mrbean: get("url") orIfNull "n/a")
|
|
||||||
println(larry: get("url") orIfNull "n/a")
|
|
||||||
|
|
||||||
# Querying a non-existent data model because there is no 'address' entry
|
|
||||||
println(mrbean: get("address")?: street()?: number() orIfNull "n/a")
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.PrepostDecorator
|
|
||||||
|
|
||||||
import gololang.Decorators
|
|
||||||
|
|
||||||
let isInteger = isOfType(Integer.class)
|
|
||||||
|
|
||||||
@checkResult(isString(): andThen(lengthIs(2)))
|
|
||||||
@checkArguments(isInteger: andThen(isPositive()), isString())
|
|
||||||
function foo = |a, b| {
|
|
||||||
return b + a
|
|
||||||
}
|
|
||||||
|
|
||||||
let myCheck = checkArguments(isInteger: andThen(isPositive()))
|
|
||||||
|
|
||||||
@myCheck
|
|
||||||
function inv = |v| -> 1.0 / v
|
|
||||||
|
|
||||||
let isPositiveInt = isInteger: andThen(isPositive())
|
|
||||||
|
|
||||||
@checkArguments(isPositiveInt)
|
|
||||||
function mul = |v| -> 10 * v
|
|
||||||
|
|
||||||
@checkArguments(isNumber())
|
|
||||||
function num = |v| -> "ok"
|
|
||||||
|
|
||||||
@checkArguments(isNotNull())
|
|
||||||
function notnull = |v| -> "ok"
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
try { println(foo(1, "b")) } catch (e) { println(e) }
|
|
||||||
try { println(foo(-1, "b")) } catch (e) { println(e) }
|
|
||||||
try { println(foo("a", 2)) } catch (e) { println(e) }
|
|
||||||
try { println(foo(1, 2)) } catch (e) { println(e) }
|
|
||||||
try { println(foo(10, "ab")) } catch (e) { println(e) }
|
|
||||||
|
|
||||||
try { println(inv(10)) } catch (e) { println(e) }
|
|
||||||
try { println(inv(0)) } catch (e) { println(e) }
|
|
||||||
|
|
||||||
try { println(mul(5)) } catch (e) { println(e) }
|
|
||||||
try { println(mul(0)) } catch (e) { println(e) }
|
|
||||||
|
|
||||||
try { println(num(1)) } catch (e) { println(e) }
|
|
||||||
try { println(num(1_L)) } catch (e) { println(e) }
|
|
||||||
try { println(num(1.5)) } catch (e) { println(e) }
|
|
||||||
try { println(num(1.5_F)) } catch (e) { println(e) }
|
|
||||||
try { println(num("a")) } catch (e) { println(e) }
|
|
||||||
try { println(num('a')) } catch (e) { println(e) }
|
|
||||||
|
|
||||||
try { println(notnull('1')) } catch (e) { println(e) }
|
|
||||||
try { println(notnull(null)) } catch (e) { println(e) }
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module StructDemo
|
|
||||||
|
|
||||||
struct Point = { x, y }
|
|
||||||
|
|
||||||
augment StructDemo.types.Point {
|
|
||||||
|
|
||||||
function move = |this, offsetX, offsetY| {
|
|
||||||
this: x(this: x() + offsetX)
|
|
||||||
this: y(this: y() + offsetY)
|
|
||||||
return this
|
|
||||||
}
|
|
||||||
|
|
||||||
function relative = |this, offsetX, offsetY| -> Point(this: x() + offsetX, this: y() + offsetY)
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let p1 = Point(1, 2)
|
|
||||||
let p2 = Point(): x(1): y(2)
|
|
||||||
let p3 = p1: frozenCopy()
|
|
||||||
let p4 = p1: frozenCopy()
|
|
||||||
|
|
||||||
println(p1)
|
|
||||||
println("x = " + p1: x())
|
|
||||||
println("y = " + p1: y())
|
|
||||||
|
|
||||||
println("p1 == p2 " + (p1 == p2))
|
|
||||||
println("p1 == p3 " + (p1 == p3))
|
|
||||||
println("p3 == p4 " + (p3 == p4))
|
|
||||||
|
|
||||||
println("#p1 " + p1: hashCode())
|
|
||||||
println("#p2 " + p2: hashCode())
|
|
||||||
println("#p3 " + p3: hashCode())
|
|
||||||
println("#p4 " + p4: hashCode())
|
|
||||||
|
|
||||||
println("p1: members() " + p1: members())
|
|
||||||
println("p1: values() " + p1: values())
|
|
||||||
foreach item in p1 {
|
|
||||||
println(item: get(0) + " -> " + item: get(1))
|
|
||||||
}
|
|
||||||
|
|
||||||
println("p1: set(\"x\", 10) " + p1: set("x", 10))
|
|
||||||
println("p1: move(10, 5) " + p1: move(10, 5))
|
|
||||||
println("p1: relative(11, 6) " + p1: relative(11, 6))
|
|
||||||
|
|
||||||
let p5 = ImmutablePoint(10, 20)
|
|
||||||
println("p5: " + p5)
|
|
||||||
try {
|
|
||||||
p5: x(100)
|
|
||||||
} catch (expected) {
|
|
||||||
println("p5 is immutable, so... " + expected: getMessage())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.SwingActionListener
|
|
||||||
|
|
||||||
import java.awt.event
|
|
||||||
import javax.swing
|
|
||||||
import javax.swing.WindowConstants
|
|
||||||
|
|
||||||
local function listener = |handler| -> asInterfaceInstance(ActionListener.class, handler)
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let frame = JFrame("Action listeners")
|
|
||||||
frame: setDefaultCloseOperation(EXIT_ON_CLOSE())
|
|
||||||
|
|
||||||
let button = JButton("Click me!")
|
|
||||||
button: setFont(button: getFont(): deriveFont(96.0_F))
|
|
||||||
|
|
||||||
# Using a helper function
|
|
||||||
button: addActionListener(listener(|event| -> println("Clicked!")))
|
|
||||||
|
|
||||||
# Using a standard augmentation: MethodHandle::to(Class)
|
|
||||||
button: addActionListener((|event| -> println("[click]")): to(ActionListener.class))
|
|
||||||
|
|
||||||
# Straight closure passing
|
|
||||||
button: addActionListener(|event| -> println("( )"))
|
|
||||||
|
|
||||||
frame: getContentPane(): add(button)
|
|
||||||
frame: pack()
|
|
||||||
frame: setVisible(true)
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.SwingHelloWorld
|
|
||||||
|
|
||||||
import javax.swing
|
|
||||||
import javax.swing.WindowConstants
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let frame = JFrame("Hello world")
|
|
||||||
frame: setDefaultCloseOperation(EXIT_ON_CLOSE())
|
|
||||||
|
|
||||||
let label = JLabel("Hello world")
|
|
||||||
label: setFont(label: getFont(): deriveFont(128.0_F))
|
|
||||||
|
|
||||||
frame: getContentPane(): add(label)
|
|
||||||
frame: pack()
|
|
||||||
frame: setVisible(true)
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module samples.TemplatesChatWebapp
|
|
||||||
|
|
||||||
import java.lang
|
|
||||||
import java.io
|
|
||||||
import java.net.InetSocketAddress
|
|
||||||
import com.sun.net.httpserver
|
|
||||||
import com.sun.net.httpserver.HttpServer
|
|
||||||
|
|
||||||
local function redirect = |exchange, to| {
|
|
||||||
exchange: getResponseHeaders(): set("Location", to)
|
|
||||||
exchange: sendResponseHeaders(303, 0)
|
|
||||||
exchange: close()
|
|
||||||
}
|
|
||||||
|
|
||||||
local function respond = |exchange, body| {
|
|
||||||
exchange: getResponseHeaders(): set("Content-Type", "text/html")
|
|
||||||
exchange: sendResponseHeaders(200, body: length())
|
|
||||||
exchange: getResponseBody(): write(body: getBytes())
|
|
||||||
exchange: close()
|
|
||||||
}
|
|
||||||
|
|
||||||
# This is leaky and works with just 1 POST parameter...
|
|
||||||
local function extract_post = |exchange, posts| {
|
|
||||||
let reader = BufferedReader(InputStreamReader(exchange: getRequestBody()))
|
|
||||||
var line = reader: readLine()
|
|
||||||
while line isnt null {
|
|
||||||
if line: startsWith("msg=") {
|
|
||||||
posts: add(java.net.URLDecoder.decode(line: substring(4), "UTF-8"))
|
|
||||||
}
|
|
||||||
line = reader: readLine()
|
|
||||||
}
|
|
||||||
reader: close()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
local function index = |posts, template, exchange| {
|
|
||||||
if exchange: getRequestMethod() == "POST" {
|
|
||||||
extract_post(exchange, posts)
|
|
||||||
redirect(exchange, "/")
|
|
||||||
} else {
|
|
||||||
respond(exchange, template(posts))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
local function index_template = -> """
|
|
||||||
<%@params posts %>
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Golo Chat</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<form action="/" method="post">
|
|
||||||
<input type="text" name="msg">
|
|
||||||
<input type="submit" value="Send">
|
|
||||||
</form>
|
|
||||||
<div>
|
|
||||||
<h3>Last posts</h3>
|
|
||||||
<% foreach post in posts { %>
|
|
||||||
<div>
|
|
||||||
<%= post %>
|
|
||||||
</div>
|
|
||||||
<% } %>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
"""
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
let index_tpl = gololang.TemplateEngine(): compile(index_template())
|
|
||||||
let posts = java.util.concurrent.ConcurrentLinkedDeque()
|
|
||||||
let server = HttpServer.create(InetSocketAddress("localhost", 8081), 0)
|
|
||||||
server: createContext("/", ^index: bindTo(posts): bindTo(index_tpl))
|
|
||||||
server: start()
|
|
||||||
println(">>> http://localhost:8081/")
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module MoreCoolContainers
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
println(">>> DynamicVariable")
|
|
||||||
|
|
||||||
let dyn = DynamicVariable("Foo")
|
|
||||||
println(dyn: value())
|
|
||||||
|
|
||||||
let t1 = Thread({
|
|
||||||
dyn: withValue(666, {
|
|
||||||
println(dyn: value())
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
let t2 = Thread({
|
|
||||||
dyn: withValue(69, {
|
|
||||||
println(dyn: value())
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
t1: start()
|
|
||||||
t2: start()
|
|
||||||
t1: join()
|
|
||||||
t2: join()
|
|
||||||
println(dyn: value())
|
|
||||||
|
|
||||||
println(">>> Observable")
|
|
||||||
|
|
||||||
let foo = Observable("Foo")
|
|
||||||
foo: onChange(|v| -> println("foo = " + v))
|
|
||||||
|
|
||||||
let mapped = foo: map(|v| -> v + "!")
|
|
||||||
mapped: onChange(|v| -> println("mapped = " + v))
|
|
||||||
|
|
||||||
foo: set("69")
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
module Workers
|
|
||||||
|
|
||||||
import java.lang.Thread
|
|
||||||
import java.util.concurrent
|
|
||||||
import gololang.concurrent.workers.WorkerEnvironment
|
|
||||||
|
|
||||||
local function pusher = |queue, message| -> queue: offer(message)
|
|
||||||
|
|
||||||
local function generator = |port, message| {
|
|
||||||
foreach i in range(0, 100) {
|
|
||||||
port: send(message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function main = |args| {
|
|
||||||
|
|
||||||
let env = WorkerEnvironment.builder(): withFixedThreadPool()
|
|
||||||
let queue = ConcurrentLinkedQueue()
|
|
||||||
|
|
||||||
let pusherPort = env: spawn(^pusher: bindTo(queue))
|
|
||||||
let generatorPort = env: spawn(^generator: bindTo(pusherPort))
|
|
||||||
|
|
||||||
let finishPort = env: spawn(|any| -> env: shutdown())
|
|
||||||
|
|
||||||
foreach i in range(0, 10) {
|
|
||||||
generatorPort: send("[" + i + "]")
|
|
||||||
}
|
|
||||||
Thread.sleep(2000_L)
|
|
||||||
finishPort: send("Die!")
|
|
||||||
|
|
||||||
env: awaitTermination(2000)
|
|
||||||
println(queue: reduce("", |acc, next| -> acc + " " + next))
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
graph
|
|
||||||
[
|
|
||||||
directed 0
|
|
||||||
node
|
|
||||||
[
|
|
||||||
id 0
|
|
||||||
label "Node 1"
|
|
||||||
value 100
|
|
||||||
]
|
|
||||||
node
|
|
||||||
[
|
|
||||||
id 1
|
|
||||||
label "Node 2"
|
|
||||||
value 200
|
|
||||||
]
|
|
||||||
edge
|
|
||||||
[
|
|
||||||
source 1
|
|
||||||
target 0
|
|
||||||
]
|
|
||||||
]
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
.TH FOO 1
|
|
||||||
.SH NAME
|
|
||||||
foo \- bar
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B foo
|
|
||||||
.I bar
|
|
||||||
.SH DESCRIPTION
|
|
||||||
Foo bar
|
|
||||||
.BR baz
|
|
||||||
quux.
|
|
||||||
.PP
|
|
||||||
.B Foo
|
|
||||||
bar baz.
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
final class AssertException extends Exception {}
|
|
||||||
|
|
||||||
final class Assert {
|
|
||||||
public static function isNum(mixed $x): num {
|
|
||||||
if (is_float($x)) {
|
|
||||||
return $x;
|
|
||||||
} else if (is_int($x)) {
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
throw new AssertException('Expected an int or float value');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isInt(mixed $x): int {
|
|
||||||
if (is_int($x)) {
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
throw new AssertException('Expected an int');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isFloat(mixed $x): float {
|
|
||||||
if (is_float($x)) {
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
throw new AssertException('Expected a float');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isString(mixed $x): string {
|
|
||||||
if (is_string($x)) {
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
throw new AssertException('Expected a string');
|
|
||||||
}
|
|
||||||
|
|
||||||
// For arrays you need to check every element
|
|
||||||
public static function isArrayOf<T>(
|
|
||||||
(function(mixed): T) $fn,
|
|
||||||
mixed $x,
|
|
||||||
): array<T> {
|
|
||||||
if (is_array($x)) {
|
|
||||||
return array_map($fn, $x);
|
|
||||||
}
|
|
||||||
throw new AssertException('Expected an array');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/recipe/init.php';
|
|
||||||
require_once "demo.php";
|
|
||||||
|
|
||||||
class AssertRecipe extends Recipe implements RecipeWithDemo {
|
|
||||||
|
|
||||||
protected function getName(): string {
|
|
||||||
return 'Assert';
|
|
||||||
}
|
|
||||||
|
|
||||||
<<Override>>
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return 'When you have values with unknown types, it is useful to make '.
|
|
||||||
'some runtime assertions and have the type checker understand. This '.
|
|
||||||
'recipe demonstrates one approach.';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getFilenames(): Vector<string> {
|
|
||||||
return Vector {
|
|
||||||
'Assert.php',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getDocs(): Vector<(string, string)> {
|
|
||||||
return Vector{
|
|
||||||
tuple ('Mixed Types', 'hack.annotations.mixedtypes'),
|
|
||||||
tuple ('Type Inference', 'hack.otherrulesandfeatures.typeinference'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoFilename(): string {
|
|
||||||
return 'demo.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoResult(): string {
|
|
||||||
return assert_main();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoXHP(): ?:xhp {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/startup/init.php';
|
|
||||||
|
|
||||||
abstract class Controller {
|
|
||||||
protected function __construct() {
|
|
||||||
startup();
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract protected function getCSS(): Set<string>;
|
|
||||||
abstract protected function getJS(): Set<string>;
|
|
||||||
abstract protected function getTitle(): string;
|
|
||||||
abstract protected function render(): :xhp;
|
|
||||||
|
|
||||||
final protected function getHead(): :xhp {
|
|
||||||
$css = $this->getCSS()->toVector()->map(
|
|
||||||
($css) ==> <link rel="stylesheet" type="text/css" href={$css} />
|
|
||||||
);
|
|
||||||
$js = $this->getJS()->toVector()->map(
|
|
||||||
($js) ==> <script src={$js} />
|
|
||||||
);
|
|
||||||
return
|
|
||||||
<head>
|
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<title>{$this->getTitle()}</title>
|
|
||||||
{$css->toArray()}
|
|
||||||
{$js->toArray()}
|
|
||||||
</head>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/recipe/init.php';
|
|
||||||
require_once "demo.php";
|
|
||||||
|
|
||||||
class DBResultRecipe extends Recipe implements RecipeWithDemo {
|
|
||||||
|
|
||||||
protected function getName(): string {
|
|
||||||
return 'DB Result';
|
|
||||||
}
|
|
||||||
|
|
||||||
<<Override>>
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return 'Fetching data from a DB introduces a few typing challenges. '.
|
|
||||||
'First, the data comes back untyped. Second, a row in a DB generally '.
|
|
||||||
'contains columns of different types.';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getFilenames(): Vector<string> {
|
|
||||||
return Vector {
|
|
||||||
'FakeDB.php',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getDocs(): Vector<(string, string)> {
|
|
||||||
return Vector{
|
|
||||||
tuple ('Hack Shapes', 'hack.shapes'),
|
|
||||||
tuple ('Mixed Types', 'hack.annotations.mixedtypes'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoFilename(): string {
|
|
||||||
return 'demo.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoResult(): string {
|
|
||||||
return db_result_main();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoXHP(): ?:xhp {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/vendor/hhvm/xhp/src/init.php';
|
|
||||||
|
|
||||||
final class :documentation extends :x:element {
|
|
||||||
attribute string name;
|
|
||||||
|
|
||||||
protected function render(): :xhp {
|
|
||||||
$name = implode('.', explode(' ', $this->getAttribute('name'))).".php";
|
|
||||||
$href = "http://hhvm.com/manual/en/$name";
|
|
||||||
return <a class="docs button" href={$href} target="_blank">docs →</a>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
|
|
||||||
type DBResultExtra = shape('age' => int);
|
|
||||||
type DBResult = shape(
|
|
||||||
'id' => int,
|
|
||||||
'name' => string,
|
|
||||||
'extra' => DBResultExtra,
|
|
||||||
);
|
|
||||||
|
|
||||||
final class FakeDB {
|
|
||||||
public function getRawRows(): array<array<string, mixed>> {
|
|
||||||
$good_extra = json_encode(array('age' => 40));
|
|
||||||
$bad_extra = 'corrupt data';
|
|
||||||
// Real code would query a DB, but for now let's hardcode it
|
|
||||||
return array(
|
|
||||||
array(
|
|
||||||
'id' => 123,
|
|
||||||
'name' => 'Alice',
|
|
||||||
'extra' => $good_extra,
|
|
||||||
),
|
|
||||||
array(
|
|
||||||
'id' => 456,
|
|
||||||
'name' => 'Bob',
|
|
||||||
'extra' => $bad_extra,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When processing untyped data you need to check each piece of data and
|
|
||||||
* figure out whether to give up or recover when the data is bad
|
|
||||||
*/
|
|
||||||
public function processRow(array<string, mixed> $row): ?DBResult {
|
|
||||||
$row = Map::fromArray($row);
|
|
||||||
$id = $row->contains('id') ? $row['id'] : null;
|
|
||||||
$name = $row->contains('name') ? $row['name'] : null;
|
|
||||||
$extra = $row->contains('extra') ? json_decode($row['extra'], true) : null;
|
|
||||||
|
|
||||||
// Ignore rows with invalid IDs or names
|
|
||||||
if (!is_int($id) || !is_string($name)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to recover from a bad extra column
|
|
||||||
if (!is_array($extra)) {
|
|
||||||
$extra = shape('age' => 0);
|
|
||||||
} else {
|
|
||||||
$extra = Map::fromArray($extra);
|
|
||||||
$extra = shape('age' => $extra->contains('age') ? $extra['age'] : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return shape('id' => $id, 'name' => $name, 'extra' => $extra);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDBResults(): Vector<DBResult> {
|
|
||||||
$ret = Vector {};
|
|
||||||
foreach ($this->getRawRows() as $raw_row) {
|
|
||||||
$row = $this->processRow($raw_row);
|
|
||||||
if ($row !== null) {
|
|
||||||
$ret->add($row);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/recipe/init.php';
|
|
||||||
require_once "demo.php";
|
|
||||||
|
|
||||||
class GetAndPostRecipe extends Recipe implements RecipeWithDemo {
|
|
||||||
|
|
||||||
protected function getName(): string {
|
|
||||||
return '$_GET and $_POST';
|
|
||||||
}
|
|
||||||
|
|
||||||
<<Override>>
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return 'A small example of how to interact with superglobals and the '.
|
|
||||||
'untyped data they can contain.';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getFilenames(): Vector<string> {
|
|
||||||
return Vector {
|
|
||||||
'NonStrictFile.php',
|
|
||||||
'StrictFile.php',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getDocs(): Vector<(string, string)> {
|
|
||||||
return Vector {
|
|
||||||
tuple('invariant()', 'hack.otherrulesandfeatures.invariant'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoFilename(): string {
|
|
||||||
return 'demo.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoResult(): string {
|
|
||||||
return get_and_post_main();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoXHP(): :xhp {
|
|
||||||
$url = '/recipes/get-and-post/';
|
|
||||||
return
|
|
||||||
<x:frag>
|
|
||||||
<div>
|
|
||||||
<a href={"$url?myIntParam=8675309#demo"} class="button">GET myIntParam=8675309</a>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<a href={"$url?myIntParam=boom#demo"} class="button">GET myIntParam=boom</a>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<form action={"$url#demo"} method="post">
|
|
||||||
<input type="hidden" name="myIntParam" value="5551234"/>
|
|
||||||
<input type="submit" class="button" value="POST myIntParam=5551234"/>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<form action={"$url#demo"} method="post">
|
|
||||||
<input type="hidden" name="myIntParam" value="boom"/>
|
|
||||||
<input type="submit" class="button" value="POST myIntParam=boom"/>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</x:frag>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
abstract class GetController extends Controller {
|
|
||||||
final protected function __construct(private Request $request) {
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function getRequest(): Request {
|
|
||||||
return $this->request;
|
|
||||||
}
|
|
||||||
|
|
||||||
final public function go(array<mixed, mixed> $get): void {
|
|
||||||
$request = new Request(Map::fromArray($get));
|
|
||||||
$controller = new static($request);
|
|
||||||
echo "<!DOCTYPE html>";
|
|
||||||
$head = $controller->getHead();
|
|
||||||
$body = $controller->render();
|
|
||||||
echo (string)$head;
|
|
||||||
echo (string)$body;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/init.php';
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/standard-page/init.php';
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/vendor/hhvm/xhp/src/init.php';
|
|
||||||
|
|
||||||
class HomeController extends GetController {
|
|
||||||
use StandardPage;
|
|
||||||
|
|
||||||
protected function getTitle(): string {
|
|
||||||
return 'Hack Cookbook';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function renderMainColumn(): :xhp {
|
|
||||||
return <div>
|
|
||||||
<h1>Cookbook</h1>
|
|
||||||
<p>
|
|
||||||
The Hack Cookbook helps you write Hack code by giving you examples of
|
|
||||||
Hack code. It is written in Hack and is open source. If you
|
|
||||||
<a href="http://github.com/facebook/hack-example-site">
|
|
||||||
head over to GitHub,
|
|
||||||
</a>
|
|
||||||
you can read the code, check out the repository, and run it
|
|
||||||
yourself. The recipes in this cookbook are small examples that
|
|
||||||
illustrate how to use Hack to solve common and interesting problems.
|
|
||||||
</p>
|
|
||||||
</div>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/funs/init.php';
|
|
||||||
|
|
||||||
final class MySecureRequest {
|
|
||||||
public function __construct(private Map<string, mixed> $GETParams) {}
|
|
||||||
public function stringParam(string $name): UNESCAPED_STRING {
|
|
||||||
invariant($this->GETParams->contains($name), 'Unknown GET param: '.$name);
|
|
||||||
$raw_string = $this->GETParams[$name];
|
|
||||||
invariant(is_string($raw_string), $name.' is not a string');
|
|
||||||
return unescaped_string($raw_string);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/vendor/hhvm/xhp/src/init.php';
|
|
||||||
|
|
||||||
type NavItem = shape(
|
|
||||||
'name' => string,
|
|
||||||
'location' => string,
|
|
||||||
);
|
|
||||||
|
|
||||||
type NavSection = shape(
|
|
||||||
'name' => string,
|
|
||||||
'location' => ?string,
|
|
||||||
'items' => Vector<NavItem>,
|
|
||||||
);
|
|
||||||
|
|
||||||
final class :hack:nav extends :x:element {
|
|
||||||
private function getNavSections(): Vector<NavSection> {
|
|
||||||
return Vector{
|
|
||||||
shape(
|
|
||||||
'name' => 'Home',
|
|
||||||
'location' => '/',
|
|
||||||
'items' => Vector {},
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'GitHub',
|
|
||||||
'location' => 'http://github.com/facebook/hack-example-site',
|
|
||||||
'items' => Vector {},
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'Recipes',
|
|
||||||
'location' => null,
|
|
||||||
'items' => Vector {
|
|
||||||
shape(
|
|
||||||
'name' => '$_GET and $_POST',
|
|
||||||
'location' => '/recipes/get-and-post/',
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'Assert',
|
|
||||||
'location' => '/recipes/assert/',
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'DB Result',
|
|
||||||
'location' => '/recipes/db-result/',
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'Unescaped String',
|
|
||||||
'location' => '/recipes/unescaped-string/',
|
|
||||||
),
|
|
||||||
shape(
|
|
||||||
'name' => 'User ID',
|
|
||||||
'location' => '/recipes/user-id/',
|
|
||||||
),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private function renderNavItems(Vector<NavItem> $items): :xhp {
|
|
||||||
$render_item = $item ==>
|
|
||||||
<li>
|
|
||||||
<a class="navItem" href={$item['location']}>
|
|
||||||
{$item['name']}
|
|
||||||
</a>
|
|
||||||
</li>;
|
|
||||||
return
|
|
||||||
<x:frag>
|
|
||||||
{$items->map($render_item)->toArray()}
|
|
||||||
</x:frag>;
|
|
||||||
}
|
|
||||||
|
|
||||||
private function renderNavSection(NavSection $section): :xhp {
|
|
||||||
$section_item = <h3 class="navItem">{$section['name']}</h3>;
|
|
||||||
if ($section['location'] !== null) {
|
|
||||||
$section_item = <a href={$section['location']}>{$section_item}</a>;
|
|
||||||
}
|
|
||||||
return
|
|
||||||
<li class="navSectionItem">
|
|
||||||
{$section_item}
|
|
||||||
<ul class="navItems">
|
|
||||||
{$this->renderNavItems($section['items'])}
|
|
||||||
</ul>
|
|
||||||
</li>;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function render(): :xhp {
|
|
||||||
$sections = $this->getNavSections()
|
|
||||||
->map($section ==> $this->renderNavSection($section));
|
|
||||||
return
|
|
||||||
<div class="nav">
|
|
||||||
<ul class="navSections">
|
|
||||||
{$sections->toArray()}
|
|
||||||
</ul>
|
|
||||||
</div>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
<?hh
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
function getGETParams(): Map<string, mixed> {
|
|
||||||
// $_GET is not defined in code so Hack doesn't know about it and you can't
|
|
||||||
// use it in strict mode. You can interact with it outside of strict mode,
|
|
||||||
// though.
|
|
||||||
return Map::fromArray($_GET);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPOSTParams(): Map<string, mixed> {
|
|
||||||
// Same deal with $_POST and other magically defined globals
|
|
||||||
return Map::fromArray($_POST);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Same deal with $_SERVER
|
|
||||||
function isGET(): bool {
|
|
||||||
return $_SERVER['REQUEST_METHOD'] === 'GET';
|
|
||||||
}
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/init.php';
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/standard-page/init.php';
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/myxhp/init.php';
|
|
||||||
|
|
||||||
abstract class Recipe extends GetController {
|
|
||||||
use StandardPage;
|
|
||||||
|
|
||||||
abstract protected function getName(): string;
|
|
||||||
abstract protected function getFilenames(): Vector<string>;
|
|
||||||
abstract protected function getDocs(): Vector<(string, string)>;
|
|
||||||
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function getTitle(): string {
|
|
||||||
return $this->getName().' - Hack Cookbook';
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function renderMainColumn(): :xhp {
|
|
||||||
$main_column =
|
|
||||||
<x:frag>
|
|
||||||
<h1>{$this->getName()}</h1>
|
|
||||||
</x:frag>;
|
|
||||||
$description = $this->getDescription();
|
|
||||||
if ($description !== null) {
|
|
||||||
$main_column->appendChild(<p>{$description}</p>);
|
|
||||||
}
|
|
||||||
foreach ($this->getFilenames() as $filename) {
|
|
||||||
$file =
|
|
||||||
<div class="file">
|
|
||||||
<div class="filename">{$filename}</div>
|
|
||||||
<phpfile filename={$filename}/>
|
|
||||||
</div>;
|
|
||||||
$main_column->appendChild($file);
|
|
||||||
}
|
|
||||||
$recipe = $this;
|
|
||||||
if ($recipe instanceof RecipeWithDemo) {
|
|
||||||
try {
|
|
||||||
$result = $recipe->getDemoResult();
|
|
||||||
} catch (Exception $e) {
|
|
||||||
$result = sprintf(
|
|
||||||
"Demo threw an %s:\n%s",
|
|
||||||
get_class($e),
|
|
||||||
$e->getMessage(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$result = explode("\n", trim($result));
|
|
||||||
$result = array_map($x ==> <x:frag>{$x}<br/></x:frag>, $result);
|
|
||||||
$demo =
|
|
||||||
<x:frag>
|
|
||||||
<div class="demo" id="demo">
|
|
||||||
<h3>Demo</h3>
|
|
||||||
{$recipe->getDemoXHP()}
|
|
||||||
<div class="filename">{$recipe->getDemoFilename()}</div>
|
|
||||||
<phpfile filename={$recipe->getDemoFilename()}/>
|
|
||||||
<div class="filename">Output</div>
|
|
||||||
<div class="demoResult">
|
|
||||||
{$result}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</x:frag>;
|
|
||||||
$main_column->appendChild($demo);
|
|
||||||
}
|
|
||||||
if (!$this->getDocs()->isEmpty()) {
|
|
||||||
$render_doc_link = function($doc) {
|
|
||||||
list($name, $link) = $doc;
|
|
||||||
$link = "http://hhvm.com/manual/en/$link.php";
|
|
||||||
return <li><a href={$link}>{$name}</a></li>;
|
|
||||||
};
|
|
||||||
$main_column->appendChild(
|
|
||||||
<div class="docs">
|
|
||||||
<h3>Relevant Official Documentation</h3>
|
|
||||||
<ul>
|
|
||||||
{$this->getDocs()->map($render_doc_link)->toArray()}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return $main_column;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
interface RecipeWithDemo {
|
|
||||||
public function getDemoFilename(): string;
|
|
||||||
public function getDemoResult(): string;
|
|
||||||
public function getDemoXHP(): ?:xhp;
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
final class Request {
|
|
||||||
public function __construct(private Map<string, mixed> $params) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
trait StandardPage {
|
|
||||||
require extends Controller;
|
|
||||||
|
|
||||||
abstract protected function renderMainColumn(): :xhp;
|
|
||||||
|
|
||||||
protected function getExtraCSS(): Set<string> {
|
|
||||||
return Set {};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getExtraJS(): Set<string> {
|
|
||||||
return Set {};
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function getCSS(): Set<string> {
|
|
||||||
return (Set {
|
|
||||||
'/css/base.css',
|
|
||||||
})->addAll($this->getExtraCSS());
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function getJS(): Set<string> {
|
|
||||||
return (Set {
|
|
||||||
})->addAll($this->getExtraJS());
|
|
||||||
}
|
|
||||||
|
|
||||||
final private function renderHeader(): :xhp {
|
|
||||||
return
|
|
||||||
<div class="hackHeader">
|
|
||||||
<div class="width">
|
|
||||||
<a href="http://hacklang.org/">
|
|
||||||
<div class="logo">Hack</div>
|
|
||||||
</a>
|
|
||||||
<div class="headerNav">
|
|
||||||
<ul>
|
|
||||||
<li>
|
|
||||||
<a href="http://hacklang.org/install/">Install</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="http://hacklang.org/tutorial/">Tutorial</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="/">Cookbook</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="http://hhvm.com/manual">Docs</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="http://github.com/facebook/hhvm">GitHub</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="http://hhvm.com/">HHVM</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>;
|
|
||||||
}
|
|
||||||
|
|
||||||
final protected function render(): :xhp {
|
|
||||||
return
|
|
||||||
<div>
|
|
||||||
{$this->renderHeader()}
|
|
||||||
<div class="width">
|
|
||||||
<div class="mainContainer">
|
|
||||||
<div class="mainColumn">{$this->renderMainColumn()}</div>
|
|
||||||
<hack:nav/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/funs/init.php';
|
|
||||||
|
|
||||||
abstract class MyRequest {
|
|
||||||
abstract public function getParams(): Map<string, mixed>;
|
|
||||||
|
|
||||||
// Throws when things go wrong
|
|
||||||
public function intParamX(string $name): int {
|
|
||||||
$params = $this->getParams();
|
|
||||||
invariant($params->contains($name), sprintf('Unknown param: %s', $name));
|
|
||||||
$param = $params[$name];
|
|
||||||
invariant(is_numeric($param), sprintf('Param %s is not an int', $name));
|
|
||||||
return (int)$param;
|
|
||||||
}
|
|
||||||
|
|
||||||
// A lenient version
|
|
||||||
public function intParam(string $name): ?int {
|
|
||||||
$params = $this->getParams();
|
|
||||||
if (!$params->contains($name)) { return null; }
|
|
||||||
$param = $params[$name];
|
|
||||||
if (!is_numeric($param)) { return null; }
|
|
||||||
return (int)$param;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final class MyGETRequest extends MyRequest {
|
|
||||||
public function getParams(): Map<string, mixed> {
|
|
||||||
return getGETParams();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final class MyPOSTRequest extends MyRequest {
|
|
||||||
public function getParams(): Map<string, mixed> {
|
|
||||||
return getPOSTParams();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
|
|
||||||
// Outside of this file, no one knows that UNESCAPED_STRING is a string
|
|
||||||
newtype UNESCAPED_STRING = string;
|
|
||||||
|
|
||||||
// This is how we initially taint a string.
|
|
||||||
function unescaped_string(string $s): UNESCAPED_STRING {
|
|
||||||
return $s;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the only thing you can do with an UNESCAPED_STRING (other than pass
|
|
||||||
// it around)
|
|
||||||
function escape_unescaped_string(UNESCAPED_STRING $s): string {
|
|
||||||
// Your use case will decide how you want to escape your strings
|
|
||||||
return sprintf('Escaped ---> "%s" <--- Escaped', $s);
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/recipe/init.php';
|
|
||||||
require_once "demo.php";
|
|
||||||
|
|
||||||
class UnescapedStringRecipe extends Recipe implements RecipeWithDemo {
|
|
||||||
|
|
||||||
protected function getName(): string {
|
|
||||||
return 'Unescaped string';
|
|
||||||
}
|
|
||||||
|
|
||||||
<<Override>>
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return 'Forgetting to properly escape the strings you get from your users '.
|
|
||||||
'can lead to serious security holes. Hack can help by forcing you to '.
|
|
||||||
'escape these strings before using them as strings.';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getFilenames(): Vector<string> {
|
|
||||||
return Vector {
|
|
||||||
'UnescapedString.php',
|
|
||||||
'MySecureRequest.php',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getDocs(): Vector<(string, string)> {
|
|
||||||
return Vector{
|
|
||||||
tuple('Opaque Type Aliasing', 'hack.typealiasing.opaquetypealiasing'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoFilename(): string {
|
|
||||||
return 'demo.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoResult(): string {
|
|
||||||
return unescaped_string_main();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoXHP(): ?:xhp {
|
|
||||||
$url = '/recipes/unescaped-string/';
|
|
||||||
return
|
|
||||||
<x:frag>
|
|
||||||
Try setting the myStrParam GET param to something nice and innocent with this button...
|
|
||||||
<div>
|
|
||||||
<a href={"$url?myStrParam='); DROP TABLE important_stuff; --#demo"} class="button">GET myStrParam=Hello world</a>
|
|
||||||
</div>
|
|
||||||
</x:frag>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/funs/init.php';
|
|
||||||
|
|
||||||
// Outside of this file, no one knows that these types are ints. They do know
|
|
||||||
// that USER_ID is an ID and COW_ID is an ID
|
|
||||||
newtype ID = int;
|
|
||||||
newtype USER_ID as ID = ID;
|
|
||||||
newtype COW_ID as ID = ID;
|
|
||||||
|
|
||||||
function assert_user_id(int $x): USER_ID {
|
|
||||||
// Everyone knows all user ids are odd
|
|
||||||
invariant($x % 2, sprintf('Invalid user ID: %d', $x));
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
|
|
||||||
function assert_cow_id(int $x): COW_ID {
|
|
||||||
// Everyone knows all cow ids are even
|
|
||||||
invariant($x % 2 === 0, sprintf('Invalid cow ID: %d', $x));
|
|
||||||
return $x;
|
|
||||||
}
|
|
||||||
|
|
||||||
function id_to_int(ID $id): int {
|
|
||||||
return $id;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/core/controller/recipe/init.php';
|
|
||||||
require_once "demo.php";
|
|
||||||
|
|
||||||
class UserIDRecipe extends Recipe implements RecipeWithDemo {
|
|
||||||
|
|
||||||
protected function getName(): string {
|
|
||||||
return 'User ID';
|
|
||||||
}
|
|
||||||
|
|
||||||
<<Override>>
|
|
||||||
protected function getDescription(): ?string {
|
|
||||||
return 'Protect your user IDs from being confused with normal ints';
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getFilenames(): Vector<string> {
|
|
||||||
return Vector {
|
|
||||||
'UserID.php',
|
|
||||||
'UsingUserID.php',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getDocs(): Vector<(string, string)> {
|
|
||||||
return Vector {
|
|
||||||
tuple('Opaque Type Aliasing', 'hack.typealiasing.opaquetypealiasing'),
|
|
||||||
tuple(
|
|
||||||
'Opaque Type Aliasing with Constraints',
|
|
||||||
'hack.typealiasing.opaquewithconstraints',
|
|
||||||
),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoFilename(): string {
|
|
||||||
return 'demo.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoResult(): string {
|
|
||||||
return user_id_main();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDemoXHP(): ?:xhp {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
function get_something_string(ID $id, string $something): string {
|
|
||||||
return sprintf("Awesome %s #%d\n", $something, id_to_int($id));
|
|
||||||
}
|
|
||||||
|
|
||||||
function get_user_string(USER_ID $id): string {
|
|
||||||
return get_something_string($id, 'user');
|
|
||||||
}
|
|
||||||
|
|
||||||
function get_cow_string(COW_ID $id): string {
|
|
||||||
return get_something_string($id, 'cow');
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
<?hh
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
final class TypehintViolationException extends Exception {
|
|
||||||
}
|
|
||||||
|
|
||||||
function setup_errors(): void {
|
|
||||||
set_error_handler('handle_error', E_ALL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* I want to turn failed typehints into exceptions so that I can handle them in
|
|
||||||
* my example code
|
|
||||||
*/
|
|
||||||
function handle_error(
|
|
||||||
$errno,
|
|
||||||
$errstr,
|
|
||||||
$errfile,
|
|
||||||
$errline,
|
|
||||||
$errcontext = array(),
|
|
||||||
$errtrace = array(),
|
|
||||||
): bool {
|
|
||||||
if (E_RECOVERABLE_ERROR == $errno) {
|
|
||||||
// Transform typehint failures into an exception.
|
|
||||||
if (strpos($errstr, 'must be an instance of ') !== false) {
|
|
||||||
throw new TypehintViolationException($errstr);
|
|
||||||
}
|
|
||||||
// Transform nullable type violations to exceptions.
|
|
||||||
if ((strpos($errstr, 'must be of type ?') !== false) &&
|
|
||||||
(strpos($errstr, 'Value returned from') === false)) {
|
|
||||||
throw new TypehintViolationException($errstr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?hh
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This file contains a bunch of php stubs for functions that have been added
|
|
||||||
* to hhvm (though aren't in a release yet). These are important because the
|
|
||||||
* Hack typechecker can understand them
|
|
||||||
*/
|
|
||||||
|
|
||||||
class InvariantViolationException extends Exception {}
|
|
||||||
|
|
||||||
function invariant(mixed $test, string $message): void {
|
|
||||||
if (!$test) {
|
|
||||||
invariant_violation($message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function invariant_violation(string $message): void {
|
|
||||||
throw new InvariantViolationException($message);
|
|
||||||
}
|
|
||||||
|
|
||||||
function class_meth(string $class, string $method) {
|
|
||||||
return array($class, $method);
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?hh
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This file contains a bunch of php stubs for functions that have been added
|
|
||||||
* to hhvm (though aren't in a release yet). These are important because the
|
|
||||||
* Hack typechecker can understand them
|
|
||||||
*/
|
|
||||||
|
|
||||||
class InvariantViolationException extends Exception {}
|
|
||||||
|
|
||||||
function invariant(mixed $test, string $message): void {
|
|
||||||
if (!$test) {
|
|
||||||
invariant_violation($message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function invariant_violation(string $message): void {
|
|
||||||
throw new InvariantViolationException($message);
|
|
||||||
}
|
|
||||||
|
|
||||||
function class_meth(string $class, string $method) {
|
|
||||||
return array($class, $method);
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<?hh
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once 'HomeController.php';
|
|
||||||
|
|
||||||
HomeController::go($_GET);
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'].'/vendor/hhvm/xhp/src/init.php';
|
|
||||||
|
|
||||||
final class :phpfile extends :x:primitive {
|
|
||||||
category %flow;
|
|
||||||
|
|
||||||
attribute string filename;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ok, I'll admit this is kind of gross. I don't really want to implement
|
|
||||||
* syntax highlighting, so I'm relying on the built-in PHP support. XHP
|
|
||||||
* makes html strings sort of difficult to use (which is good cause they're
|
|
||||||
* dangerous). Anyway, this is one way around it :)
|
|
||||||
*/
|
|
||||||
protected function stringify(): string {
|
|
||||||
return
|
|
||||||
'<div class="code">'.
|
|
||||||
(string)highlight_file($this->getAttribute('filename'), /*ret*/ true).
|
|
||||||
'</div>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<?hh // strict
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2014, Facebook, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the BSD-style license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree. An additional grant
|
|
||||||
* of patent rights can be found in the PATENTS file in the same directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
function startup(): void {
|
|
||||||
setup_errors();
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user