nydp 0.1.15 → 0.2.0

data/spec/foreign_hash_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Nydp::Hash do
-  let(:vm) { Nydp::VM.new }
+  let(:vm) { Nydp::VM.new(ns) }
 
   describe "foreign hashes" do
     let(:ahash) { Hash.new }
@@ -11,7 +11,7 @@ describe Nydp::Hash do
         k    = Nydp::Symbol.mk "keysym", ns
         v    = Nydp::StringAtom.new "foobar"
         args = pair_list [ahash, k, v]
-        Nydp::Builtin::HashSet.new.invoke vm, args
+        Nydp::Builtin::HashSet.instance.invoke vm, args
 
         expect(ahash[:keysym]).      to eq "foobar"
         expect(ahash[:keysym].class).to eq String
@@ -27,7 +27,7 @@ describe Nydp::Hash do
         k              = sym("keysym")
         args           = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
 
         expect(vm.args.pop).to eq Nydp::StringAtom.new("avalue")
       end
@@ -36,9 +36,9 @@ describe Nydp::Hash do
         k              = sym("keysym")
         args           = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
 
       it "converts ruby true to nydp value" do
@@ -46,9 +46,9 @@ describe Nydp::Hash do
         k              = sym("keysym")
         args           = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
 
-        expect(vm.args.pop).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp::T
       end
     end
 
@@ -58,18 +58,18 @@ describe Nydp::Hash do
         k             = sym("simon")
         args          = [ ahash, k ]
 
-        Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashKeyPresent.instance.invoke vm, pair_list(args)
 
-        expect(vm.args.pop).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp::T
       end
 
       it "returns nil when key is absent" do
         k             = sym("simon")
         args          = [ ahash, k ]
 
-        Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashKeyPresent.instance.invoke vm, pair_list(args)
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
 
@@ -79,7 +79,7 @@ describe Nydp::Hash do
         ahash[:k1] = 84
         args       = [ahash]
 
-        Nydp::Builtin::HashKeys.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashKeys.instance.invoke vm, pair_list(args)
 
         expect(vm.args.pop).to eq pair_list [sym("k0"), sym("k1")]
       end

data/spec/hash_non_hash_behaviour_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Nydp::Hash do
-  let(:vm) { Nydp::VM.new }
+  let(:vm) { Nydp::VM.new(ns) }
 
   describe "friendly non-hashes" do
     let(:ahash) { TestThing.new 123, "hello there", "private" }
@@ -11,7 +11,7 @@ describe Nydp::Hash do
         k      = Nydp::Symbol.mk "a", ns
         args   = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
         expect(vm.args.pop).to eq 123
       end
 
@@ -19,7 +19,7 @@ describe Nydp::Hash do
         k      = Nydp::Symbol.mk "b", ns
         args   = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
         expect(vm.args.pop).to eq Nydp::StringAtom.new("hello there")
       end
 
@@ -27,7 +27,7 @@ describe Nydp::Hash do
         k      = Nydp::StringAtom.new "b"
         args   = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
         expect(vm.args.pop).to eq Nydp::StringAtom.new("hello there")
       end
 
@@ -35,8 +35,8 @@ describe Nydp::Hash do
         k      = Nydp::Symbol.mk "c", ns
         args   = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
-        expect(vm.args.pop).to eq Nydp.NIL
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
   end
@@ -51,7 +51,7 @@ describe Nydp::Hash do
         args = pair_list [ahash, k, v]
 
         begin
-          Nydp::Builtin::HashSet.new.invoke vm, args
+          Nydp::Builtin::HashSet.instance.invoke vm, args
         rescue Exception => e
           error = e
         end
@@ -70,7 +70,7 @@ raised
         args   = [ ahash, k ]
 
         begin
-          Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+          Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
         rescue Exception => e
           error = e
         end

data/spec/hash_spec.rb

@@ -15,7 +15,7 @@ describe Nydp::Hash do
     def _nydp_safe_methods ; %i{ a b } ; end
   end
 
-  let(:vm) { Nydp::VM.new }
+  let(:vm) { Nydp::VM.new(ns) }
 
   describe "#to_ruby" do
     it "converts ruby symbol key to nydp symbol key" do
@@ -62,7 +62,7 @@ describe Nydp::Hash do
   describe "nydp hashes" do
     describe "new hash" do
       it "returns a new Nydp hash" do
-        Nydp::Builtin::Hash.new.invoke vm, Nydp.NIL
+        Nydp::Builtin::Hash.instance.invoke vm, Nydp::NIL
         h = vm.args.pop
         expect(h).to be_a Nydp::Hash
       end
@@ -74,7 +74,7 @@ describe Nydp::Hash do
         k    = sym "keysym"
         v    = 42
         args = Nydp::Pair.from_list([h, k, v])
-        Nydp::Builtin::HashSet.new.invoke vm, args
+        Nydp::Builtin::HashSet.instance.invoke vm, args
 
         expect(h.keys).    to eq [k]
         expect(h[k]).      to eq v
@@ -90,7 +90,7 @@ describe Nydp::Hash do
         h[k] = v
 
         args = Nydp::Pair.from_list([h, k])
-        Nydp::Builtin::HashGet.new(ns).invoke vm, args
+        Nydp::Builtin::HashGet.instance.invoke vm, args
         expect(vm.args.pop).to eq v
       end
     end
@@ -102,18 +102,18 @@ describe Nydp::Hash do
         v    = 42
         h[k] = v
 
-        Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list([h, k])
+        Nydp::Builtin::HashKeyPresent.instance.invoke vm, pair_list([h, k])
 
-        expect(vm.args.pop).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp::T
       end
 
       it "returns nil when key is absent" do
         h    = Nydp::Hash.new
         k    = sym "benjamin"
 
-        Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list([h, k])
+        Nydp::Builtin::HashKeyPresent.instance.invoke vm, pair_list([h, k])
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
 
@@ -124,23 +124,23 @@ describe Nydp::Hash do
         h[sym "k1"] = 84
 
         args = Nydp::Pair.from_list([h])
-        Nydp::Builtin::HashKeys.new(ns).invoke vm, args
+        Nydp::Builtin::HashKeys.instance.invoke vm, args
         expect(vm.args.pop).to eq pair_list [sym("k0"), sym("k1")]
       end
     end
   end
 
   describe "get/set nil" do
-    let(:ahash) { Nydp.NIL }
+    let(:ahash) { Nydp::NIL }
 
     describe "hash set" do
       it "does nothing, returns its value" do
         k    = Nydp::Symbol.mk "keysym", ns
         v    = Nydp::StringAtom.new "foobar"
         args = pair_list [ahash, k, v]
-        Nydp::Builtin::HashSet.new.invoke vm, args
+        Nydp::Builtin::HashSet.instance.invoke vm, args
 
-        expect(ahash).     to eq Nydp.NIL
+        expect(ahash).     to eq Nydp::NIL
         expect(vm.args.pop).to eq v
       end
     end
@@ -150,9 +150,9 @@ describe Nydp::Hash do
         k    = Nydp::Symbol.mk "keysym", ns
         args           = [ ahash, k ]
 
-        Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
+        Nydp::Builtin::HashGet.instance.invoke vm, pair_list(args)
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
   end

data/spec/literal_spec.rb

@@ -9,13 +9,13 @@ describe Nydp::Literal do
 
   describe "t" do
     it "is #true in ruby" do
-      expect(Nydp.T.to_ruby).to eq true
+      expect(Nydp::T.to_ruby).to eq true
     end
   end
 
   describe "nil" do
     it "is #nil in ruby" do
-      expect(Nydp.NIL.to_ruby).to eq nil
+      expect(Nydp::NIL.to_ruby).to eq nil
     end
   end
 

data/spec/nydp_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Nydp do
-  let(:parser)                { Nydp::Parser.new(ns) }
-  let(:vm)                    { Nydp::VM.new }
+  let(:parser) { Nydp::Parser.new(ns) }
+  let(:vm)     { Nydp::VM.new(ns)     }
 
   def run txt
     Nydp.setup ns
@@ -46,10 +46,10 @@ describe Nydp do
   end
 
   it "should compare integers" do
-    expect(run "(> 13 17)").to eq Nydp.NIL
-    expect(run "(> 29 23)").to eq Nydp.T
-    expect(run "(< 13 17)").to eq Nydp.T
-    expect(run "(< 29 23)").to eq Nydp.NIL
+    expect(run "(> 13 17)").to eq Nydp::NIL
+    expect(run "(> 29 23)").to eq Nydp::T
+    expect(run "(< 13 17)").to eq Nydp::T
+    expect(run "(< 29 23)").to eq Nydp::NIL
   end
 
   it "should execute an inline list function" do

data/spec/pair_spec.rb

@@ -22,10 +22,10 @@ describe Nydp::Pair do
     end
 
     it "should be true for nested empty lists" do
-      e1 = Nydp::Pair.new(Nydp.NIL, Nydp.NIL)
-      e2 = Nydp::Pair.new(Nydp.NIL, Nydp.NIL)
-      e3 = Nydp::Pair.new(Nydp.NIL, Nydp.NIL)
-      e4 = Nydp::Pair.new(Nydp.NIL, Nydp.NIL)
+      e1 = Nydp::Pair.new(Nydp::NIL, Nydp::NIL)
+      e2 = Nydp::Pair.new(Nydp::NIL, Nydp::NIL)
+      e3 = Nydp::Pair.new(Nydp::NIL, Nydp::NIL)
+      e4 = Nydp::Pair.new(Nydp::NIL, Nydp::NIL)
       expect(Nydp::Pair.new(e1, e2)).to eq Nydp::Pair.new(e3, e4)
     end
 
@@ -70,11 +70,11 @@ describe Nydp::Pair do
     p = p.cdr
     expect(p.car).to eq :d
     p = p.cdr
-    expect(p.car).to eq Nydp.NIL
-    expect(p.cdr).to eq Nydp.NIL
+    expect(p.car).to eq Nydp::NIL
+    expect(p.cdr).to eq Nydp::NIL
     p = p.cdr
-    expect(p.car).to eq Nydp.NIL
-    expect(p.cdr).to eq Nydp.NIL
+    expect(p.car).to eq Nydp::NIL
+    expect(p.cdr).to eq Nydp::NIL
   end
 
   it "should convert to a ruby list" do

data/spec/parser_spec.rb

@@ -43,7 +43,7 @@ describe Nydp::Parser do
   end
 
   it "should parse an empty expression" do
-    expect(parse "()").to eq Nydp.NIL
+    expect(parse "()").to eq Nydp::NIL
   end
 
   it "should parse a lisp expression" do

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ module SpecHelper
     Nydp::Parser.new(ns).expression(Nydp::Tokeniser.new reader)
   end
 
-  def pair_list xs, last=Nydp.NIL
+  def pair_list xs, last=Nydp::NIL
     Nydp::Pair.from_list xs, last
   end
 

data/spec/string_atom_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Nydp::StringAtom do
   let(:bar) { Nydp::StringAtom.new "BAR" }
   let(:foo) { Nydp::StringAtom.new "FOO" }
-  let(:vm)  { Nydp::VM.new               }
+  let(:vm)  { Nydp::VM.new(ns)           }
 
   it "is not equal to a symbol with the same represenation" do
     string = Nydp::StringAtom.new "harrypotter"
@@ -28,34 +28,34 @@ describe Nydp::StringAtom do
   end
 
   it "works with builtin greater-than when true" do
-    f = Nydp::Builtin::GreaterThan.new
+    f = Nydp::Builtin::GreaterThan.instance
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.args.pop).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp::T
   end
 
   it "works with builtin greater-than when false" do
-    f = Nydp::Builtin::GreaterThan.new
+    f = Nydp::Builtin::GreaterThan.instance
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.args.pop).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp::NIL
   end
 
   it "works with builtin less-than when true" do
-    f = Nydp::Builtin::LessThan.new
+    f = Nydp::Builtin::LessThan.instance
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.args.pop).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp::T
   end
 
   it "works with builtin less-than when false" do
-    f = Nydp::Builtin::LessThan.new
+    f = Nydp::Builtin::LessThan.instance
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.args.pop).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp::NIL
   end
 end

data/spec/string_token_spec.rb

@@ -14,6 +14,6 @@ describe Nydp::StringFragmentToken do
 
   it "is not equal to nil" do
     t1 = Nydp::StringFragmentToken.new "foo", "bar"
-    expect(t1).not_to eq Nydp.NIL
+    expect(t1).not_to eq Nydp::NIL
   end
 end

data/spec/symbol_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Nydp::Symbol do
   let(:bar) { Nydp::Symbol.mk :BAR, ns }
   let(:foo) { Nydp::Symbol.mk :FOO, ns }
-  let(:vm)  { Nydp::VM.new             }
+  let(:vm)  { Nydp::VM.new(ns)         }
 
   it "returns a ruby symbol in #to_ruby" do
     sym = Nydp::Symbol.mk :foo, ns
@@ -43,35 +43,35 @@ describe Nydp::Symbol do
   end
 
   it "works with builtin greater-than when true" do
-    f = Nydp::Builtin::GreaterThan.new
+    f = Nydp::Builtin::GreaterThan.instance
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.args.pop).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp::T
   end
 
   it "works with builtin greater-than when false" do
-    f = Nydp::Builtin::GreaterThan.new
+    f = Nydp::Builtin::GreaterThan.instance
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.args.pop).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp::NIL
   end
 
   it "works with builtin less-than when true" do
-    f = Nydp::Builtin::LessThan.new
+    f = Nydp::Builtin::LessThan.instance
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.args.pop).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp::T
   end
 
   it "works with builtin less-than when false" do
-    f = Nydp::Builtin::LessThan.new
+    f = Nydp::Builtin::LessThan.instance
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.args.pop).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp::NIL
   end
 
 end