nydp 0.3.0 → 0.4.0

data/spec/symbol_spec.rb

@@ -47,7 +47,7 @@ describe Nydp::Symbol do
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.args.pop).to eq Nydp::T
+    expect(vm.args.pop).to eq bar
   end
 
   it "works with builtin greater-than when false" do
@@ -63,7 +63,7 @@ describe Nydp::Symbol do
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.args.pop).to eq Nydp::T
+    expect(vm.args.pop).to eq foo
   end
 
   it "works with builtin less-than when false" do

data/spec/tokeniser_spec.rb

@@ -0,0 +1,101 @@
+require "spec_helper"
+
+describe "tokenising" do
+  it "should return another stream of tokens" do
+    tt = []
+      reader = Nydp::StringReader.new "(a b c 1 2 3)"
+      t = Nydp::Tokeniser.new reader
+      tt = []
+      tok = t.next_token
+      while tok
+        tt << tok
+        tok = t.next_token
+      end
+    expect(tt).to eq [[:left_paren, ""],
+                      [:symbol, "a"],
+                      [:symbol, "b"],
+                      [:symbol, "c"],
+                      [:number, 1.0],
+                      [:number, 2.0],
+                      [:number, 3.0],
+                      [:right_paren]]
+  end
+
+  it "should return a stream of tokens, including whitespace before right-paren" do
+    reader = Nydp::StringReader.new "foo )"
+    t = Nydp::Tokeniser.new reader
+    tt = []
+    tok = t.next_token
+    while tok
+      tt << tok
+      tok = t.next_token
+    end
+    expect(tt).to eq [[:symbol     , "foo"],
+                      [:right_paren]]
+  end
+
+  it "returns nothing at all" do
+    s = Nydp::StringReader.new ""
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns a whitespace token" do
+    s = Nydp::StringReader.new "  "
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns a symbol token" do
+    s = Nydp::StringReader.new "hello"
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:symbol, "hello"]
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns symbol then whitespace" do
+    s = Nydp::StringReader.new "hello  "
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:symbol, "hello"]
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns whitespace symbol whitespace symbol whitespace" do
+    s = Nydp::StringReader.new " hello world "
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:symbol, "hello"]
+    expect(tkz.next_token).to eq [:symbol, "world"]
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns whitespace left_paren symbol whitespace symbol right_paren whitespace" do
+    s = Nydp::StringReader.new " (hello world) "
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:left_paren, ""]
+    expect(tkz.next_token).to eq [:symbol, "hello"]
+    expect(tkz.next_token).to eq [:symbol, "world"]
+    expect(tkz.next_token).to eq [:right_paren]
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns whitespace left_paren with prefix symbol whitespace symbol right_paren whitespace" do
+    s = Nydp::StringReader.new " %w(hello world) "
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:left_paren, "%w"]
+    expect(tkz.next_token).to eq [:symbol, "hello"]
+    expect(tkz.next_token).to eq [:symbol, "world"]
+    expect(tkz.next_token).to eq [:right_paren]
+    expect(tkz.next_token).to be_nil
+  end
+
+  it "returns a comment" do
+    s = Nydp::StringReader.new "hello
+; observe!
+world"
+    tkz = Nydp::Tokeniser.new s
+    expect(tkz.next_token).to eq [:symbol        , 'hello']
+    expect(tkz.next_token).to eq [:comment       , "observe!"  ]
+    expect(tkz.next_token).to eq [:symbol        , "world"]
+    expect(tkz.next_token).to be_nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".zeiger.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -90,6 +91,7 @@ files:
 - lib/lisp/core-015-documentation.nydp
 - lib/lisp/core-017-builtin-dox.nydp
 - lib/lisp/core-020-utils.nydp
+- lib/lisp/core-025-warnings.nydp
 - lib/lisp/core-030-syntax.nydp
 - lib/lisp/core-035-flow-control.nydp
 - lib/lisp/core-037-list-utils.nydp
@@ -108,6 +110,7 @@ files:
 - lib/lisp/tests/add-hook-examples.nydp
 - lib/lisp/tests/aif-examples.nydp
 - lib/lisp/tests/all-examples.nydp
+- lib/lisp/tests/ampersand-syntax-examples.nydp
 - lib/lisp/tests/any-examples.nydp
 - lib/lisp/tests/auto-hash-examples.nydp
 - lib/lisp/tests/best-examples.nydp
@@ -131,6 +134,7 @@ files:
 - lib/lisp/tests/explain-mac-examples.nydp
 - lib/lisp/tests/fill-bucket-examples.nydp
 - lib/lisp/tests/filter-forms-examples.nydp
+- lib/lisp/tests/floor-examples.nydp
 - lib/lisp/tests/foundation-test.nydp
 - lib/lisp/tests/group-by-examples.nydp
 - lib/lisp/tests/hash-examples.nydp
@@ -138,6 +142,7 @@ files:
 - lib/lisp/tests/intersperse-examples.nydp
 - lib/lisp/tests/invocation-tests.nydp
 - lib/lisp/tests/isa-examples.nydp
+- lib/lisp/tests/k-examples.nydp
 - lib/lisp/tests/len-examples.nydp
 - lib/lisp/tests/list-gsub-examples.nydp
 - lib/lisp/tests/list-match-examples.nydp
@@ -147,6 +152,7 @@ files:
 - lib/lisp/tests/orequal-examples.nydp
 - lib/lisp/tests/parser-tests.nydp
 - lib/lisp/tests/plus-plus-examples.nydp
+- lib/lisp/tests/power-examples.nydp
 - lib/lisp/tests/pre-compile-examples.nydp
 - lib/lisp/tests/pretty-print-tests.nydp
 - lib/lisp/tests/push-examples.nydp
@@ -163,6 +169,7 @@ files:
 - lib/lisp/tests/tuples-examples.nydp
 - lib/lisp/tests/type-of-examples.nydp
 - lib/lisp/tests/unparse-tests.nydp
+- lib/lisp/tests/zip-examples.nydp
 - lib/nydp.rb
 - lib/nydp/assignment.rb
 - lib/nydp/builtin.rb
@@ -183,6 +190,10 @@ files:
 - lib/nydp/builtin/inspect.rb
 - lib/nydp/builtin/is_equal.rb
 - lib/nydp/builtin/less_than.rb
+- lib/nydp/builtin/math_ceiling.rb
+- lib/nydp/builtin/math_floor.rb
+- lib/nydp/builtin/math_power.rb
+- lib/nydp/builtin/math_round.rb
 - lib/nydp/builtin/minus.rb
 - lib/nydp/builtin/modulo.rb
 - lib/nydp/builtin/parse.rb
@@ -215,6 +226,7 @@ files:
 - lib/nydp/function_invocation.rb
 - lib/nydp/hash.rb
 - lib/nydp/helper.rb
+- lib/nydp/image_store.rb
 - lib/nydp/interpreted_function.rb
 - lib/nydp/lexical_context.rb
 - lib/nydp/lexical_context_builder.rb
@@ -250,6 +262,7 @@ files:
 - spec/symbol_spec.rb
 - spec/thread_local_spec.rb
 - spec/time_spec.rb
+- spec/tokeniser_spec.rb
 homepage: http://github.com/conanite/nydp
 licenses:
 - MIT
@@ -291,3 +304,4 @@ test_files:
 - spec/symbol_spec.rb
 - spec/thread_local_spec.rb
 - spec/time_spec.rb
+- spec/tokeniser_spec.rb