nydp 0.1.13.2 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7374115cdd9df0c64b65aaf6321b23f5eac50ef
-  data.tar.gz: 9d108fd6697da14be302dec3da20926de83ff6a2
+  metadata.gz: 4934e2de2e4ae2558056bd67df1bfb85e8285d80
+  data.tar.gz: 591950ecbf8f0d76ef6e7afd79a48138bb7164b4
 SHA512:
-  metadata.gz: 46702e5f71b4cb0335773567020bb223839b5f50702583af33d6469fcfda6fe6a130b00d5b69cc9bf40cd344b8fb6a7b1ae628bfb539488dc0060711bef9d0af
-  data.tar.gz: 05028cdc5301c4670c053b95aead31e179784915c35096153e124e3d3d2405392767189dcbb4d15f8960599cc8ef2bbdb23be242bd9d2ff924173e5f66d13a97
+  metadata.gz: e3efdac8cdb5dfdc6cf6908e2d4950430769d888af64252a2153c05e06d25dff99a47be81d48e36478a1716327d2544ad78f76bff7a9a7f7e717b3ba564a4dda
+  data.tar.gz: 13cb1296116e684380b86b0f887b13ca2b22aef929ce933429ad74f5d49d40f151cd5095ecb96eb934e57d0c94755f3f9cc55eb9377f9b8dc749dd98f3d89cca

data/lib/lisp/core-010-precompile.nydp

@@ -1,18 +1,17 @@
 
-(assign mac-expand (fn (names macfn name body)
+(assign mac-expand (fn (names macfn expr)
   (cond macfn
         (pre-compile-with names
-                          (apply macfn body))
-        (cons name body))))
+                          (apply macfn (cdr expr)))
+        expr)))
 
 (assign macs (hash))
 
 (assign pre-compile-expr
-        (fn (names name body)
+        (fn (names expr)
             (mac-expand names
-                        (hash-get names name)
-                        name
-                        body)))
+                        (hash-get names (car expr))
+                        expr)))
 
 (assign pre-compile-each
         (fn (names args)
@@ -35,9 +34,7 @@
                   (cond (eq? (car arg) 'quote)
                         arg
                         (pre-compile-each names
-                                          (pre-compile-expr names
-                                                            (car arg)
-                                                            (cdr arg))))
+                                          (pre-compile-expr names arg)))
                   arg)))
 
 (assign pre-compile-debug

data/lib/lisp/core-060-benchmarking.nydp

@@ -34,13 +34,36 @@
                     (bm-complicated-0 * 3 (bm-complicated-0 + 3 6))
                     (bm-complicated-0 - 10 (bm-complicated-0 - 13 8))))
 
+(def bm-pre-compile-test ()
+  (for i 1 10
+       (pre-compile (dox-src rbs))))
+
+(def bm-hash-fill
+  (let h {}
+    (=h.aa 1) (=h.ab 2) (=h.ac 3) (=h.ba 4) (=h.bb 5) (=h.bc 6)
+    (=h.ca 1) (=h.cb 2) (=h.cc 3) (=h.ca 4) (=h.cb 5) (=h.cc 6)
+    (=h.da 1) (=h.db 2) (=h.dc 3) (=h.da 4) (=h.db 5) (=h.dc 6)
+    (=h.aa 1) (=h.ab 2) (=h.ac 3) (=h.ba 4) (=h.bb 5) (=h.bc 6)
+    (=h.ca 1) (=h.cb 2) (=h.cc 3) (=h.ca 4) (=h.cb 5) (=h.cc 6)
+    (=h.da 1) (=h.db 2) (=h.dc 3) (=h.da 4) (=h.db 5) (=h.dc 6)
+    (list (list h.aa h.ab h.ac h.ba h.bb h.bc)
+          (list h.aa h.ab h.ac h.ba h.bb h.bc)
+          (list h.ca h.cb h.cc h.ca h.cb h.cc)
+          (list h.da h.db h.dc h.da h.db h.dc)
+          (list h.aa h.ab h.ac h.ba h.bb h.bc)
+          (list h.ca h.cb h.cc h.ca h.cb h.cc)
+          (list h.da h.db h.dc h.da h.db h.dc)
+          (list h.da h.ab h.ac h.ba h.bb h.bc))))
+
 (def rbs (name)
   (let summary nil
-    (push (bm "pythag     "   bm-pythag          10    10) summary)
-    (push (bm "recursive  "   bm-complicated     10 20000) summary)
-    (push (bm "0 arg times"   bm-0-arg-times-call 5 40000) summary)
-    (push (bm "1 arg times"   bm-1-arg-times-call 5 40000) summary)
-    (push (bm "2 arg times"   bm-2-arg-times-call 5 40000) summary)
-    (push (bm "3 arg times"   bm-3-arg-times-call 5 40000) summary)
-    (push (bm "4 arg times"   bm-4-arg-times-call 5 40000) summary)
+    ;; (push (bm "pythag     "   bm-pythag            5     10) summary)
+    ;; (push (bm "recursive  "   bm-complicated       5   1000) summary)
+    ;; (push (bm "0 arg times"   bm-0-arg-times-call  5   1000) summary)
+    ;; (push (bm "1 arg times"   bm-1-arg-times-call  5   1000) summary)
+    ;; (push (bm "2 arg times"   bm-2-arg-times-call  5   1000) summary)
+    ;; (push (bm "3 arg times"   bm-3-arg-times-call  5   1000) summary)
+    ;; (push (bm "4 arg times"   bm-4-arg-times-call  5   1000) summary)
+    ;; (push (bm "pre-compile"   bm-pre-compile-test 10  10000) summary)
+    (push (bm "hashing"       bm-hash-fill 10  200000) summary)
     (each s summary (p name " " s))))

data/lib/lisp/tests/unparse-tests.nydp

@@ -3,4 +3,6 @@
   ("quote"             (to-string '(quote a))            "'a"           )
   ("quasiquote"        (to-string '(quasiquote a))       "`a"           )
   ("unquote-splicing"  (to-string '(unquote-splicing a)) ",@a"          )
+  ("brace-list"        (to-string '(brace-list a))       "{ a }"        )
+  ("brace-list"        (to-string '(brace-list a b))     "{ a b }"      )
   ("brace-list"        (to-string '(brace-list a b c d)) "{ a b c d }"  ))

data/lib/nydp/assignment.rb

@@ -5,7 +5,7 @@ module Nydp
     end
 
     def execute vm
-      @name.assign vm.peek_arg, vm.peek_context
+      @name.assign vm.peek_arg, vm.current_context
     end
 
     def to_s
@@ -36,7 +36,8 @@ module Nydp
     def inspect; to_s ; end
 
     def execute vm
-      vm.push_instructions @instructions, vm.peek_context
+      vm.instructions.push @instructions
+      vm.contexts.push vm.current_context
     end
   end
 end

data/lib/nydp/builtin/ensuring.rb

@@ -21,7 +21,8 @@ class Nydp::Builtin::Ensuring
     fn_tricky = args.cdr.car
 
     protection_instructions = Nydp::Pair.from_list [InvokeProtection.new(fn_ensure), Nydp::PopArg]
-    vm.push_instructions protection_instructions, vm.peek_context
+    vm.instructions.push protection_instructions
+    vm.contexts.push vm.current_context
 
     fn_tricky.invoke vm, Nydp.NIL
   end

data/lib/nydp/builtin/handle_error.rb

@@ -33,7 +33,8 @@ class Nydp::Builtin::HandleError
     fn_tricky = args.cdr.car
 
     catcher_instructions = Nydp::Pair.from_list [CatchError.new(fn_handle, vm.args.size)]
-    vm.push_instructions catcher_instructions, vm.peek_context
+    vm.instructions.push catcher_instructions
+    vm.contexts.push vm.current_context
 
     fn_tricky.invoke vm, Nydp.NIL
   end

data/lib/nydp/cond.rb

@@ -8,9 +8,9 @@ module Nydp
     end
 
     def execute vm
-      arg = vm.pop_arg
-      truth = !Nydp.NIL.is?(arg)
-      vm.push_instructions (truth ? when_true : when_false), vm.peek_context
+      truth = !Nydp.NIL.is?(vm.args.pop)
+      vm.instructions.push (truth ? when_true : when_false)
+      vm.contexts.push vm.current_context
     end
 
     def inspect
@@ -31,8 +31,10 @@ module Nydp
     end
 
     def execute vm
-      vm.push_instructions conditional, vm.peek_context
-      vm.push_instructions condition,   vm.peek_context
+      vm.instructions.push conditional
+      vm.contexts.push vm.current_context
+      vm.instructions.push condition
+      vm.contexts.push vm.current_context
     end
 
     def inspect

data/lib/nydp/function_invocation.rb

@@ -30,7 +30,7 @@ module Nydp
 
     class Invocation_1 < Invocation::Base
       def execute vm
-        f = vm.pop_arg
+        f = vm.args.pop
         f.invoke_1 vm
       rescue Exception => e
         handle e, f, Nydp.NIL
@@ -39,8 +39,9 @@ module Nydp
 
     class Invocation_2 < Invocation::Base
       def execute vm
-        arg = vm.pop_arg
-        f   = vm.pop_arg
+        arg = vm.args.pop
+        f = vm.args.pop
+
         f.invoke_2 vm, arg
       rescue Exception => e
         handle e, f, cons(arg)
@@ -49,9 +50,9 @@ module Nydp
 
     class Invocation_3 < Invocation::Base
       def execute vm
-        arg_1 = vm.pop_arg
-        arg_0 = vm.pop_arg
-        f   = vm.pop_arg
+        arg_1 = vm.args.pop
+        arg_0 = vm.args.pop
+        f   = vm.args.pop
         f.invoke_3 vm, arg_0, arg_1
       rescue Exception => e
         handle e, f, cons(arg_0, cons(arg_1))
@@ -60,10 +61,10 @@ module Nydp
 
     class Invocation_4 < Invocation::Base
       def execute vm
-        arg_2 = vm.pop_arg
-        arg_1 = vm.pop_arg
-        arg_0 = vm.pop_arg
-        f   = vm.pop_arg
+        arg_2 = vm.args.pop
+        arg_1 = vm.args.pop
+        arg_0 = vm.args.pop
+        f   = vm.args.pop
         f.invoke_4 vm, arg_0, arg_1, arg_2
       rescue Exception => e
         handle e, f, cons(arg_0, cons(arg_1, cons(arg_2)))
@@ -87,6 +88,7 @@ module Nydp
 
   class FunctionInvocation
     extend Helper
+    attr_accessor :function_instruction, :argument_instructions
 
     def self.build expression, bindings
       compiled   = Compiler.compile_each(expression, bindings)
@@ -110,8 +112,10 @@ module Nydp
     end
 
     def execute vm
-      vm.push_instructions @function_instruction,  vm.peek_context
-      vm.push_instructions @argument_instructions, vm.peek_context
+      vm.instructions.push function_instruction
+      vm.contexts    .push vm.current_context
+      vm.instructions.push argument_instructions
+      vm.contexts    .push vm.current_context
     end
 
     def inspect ; @source.inspect ; end

data/lib/nydp/interpreted_function.rb

@@ -4,7 +4,7 @@ require 'nydp/closure'
 
 module Nydp
   class PopArg
-    def self.execute vm ; vm.pop_arg ; end
+    def self.execute vm ; vm.args.pop ; end
     def self.to_s       ; ""         ; end
     def self.inspect    ; "#pop_arg" ; end
   end
@@ -16,31 +16,36 @@ module Nydp
     attr_accessor :arg_names, :body, :context_builder
 
     def invoke_1 vm, parent_context
-      vm.push_instructions self.body, LexicalContext.new(parent_context)
+      vm.instructions.push self.body
+      vm.contexts.push LexicalContext.new(parent_context)
     end
 
     def invoke_2 vm, parent_context, arg
       lc = LexicalContext.new parent_context
       set_args_1 lc, arg
-      vm.push_instructions self.body, lc
+      vm.instructions.push self.body
+      vm.contexts.push lc
     end
 
     def invoke_3 vm, parent_context, arg_0, arg_1
       lc = LexicalContext.new parent_context
       set_args_2 lc, arg_0, arg_1
-      vm.push_instructions self.body, lc
+      vm.instructions.push self.body
+      vm.contexts.push lc
     end
 
     def invoke_4 vm, parent_context, arg_0, arg_1, arg_2
       lc = LexicalContext.new parent_context
       set_args_3 lc, arg_0, arg_1, arg_2
-      vm.push_instructions self.body, lc
+      vm.instructions.push self.body
+      vm.contexts.push lc
     end
 
     def invoke vm, parent_context, arg_values
       lc = LexicalContext.new parent_context
       set_args lc, arg_values
-      vm.push_instructions self.body, lc
+      vm.instructions.push self.body
+      vm.contexts.push lc
     end
 
     def setup_context context, names, values
@@ -85,7 +90,7 @@ module Nydp
     end
 
     def execute vm
-      vm.push_arg Closure.new(self, vm.peek_context)
+      vm.push_arg Closure.new(self, vm.current_context)
     end
 
     def nydp_type ; "fn" ; end

data/lib/nydp/pair.rb

@@ -8,10 +8,6 @@ class Nydp::Pair
     @car, @cdr = car, cdr
   end
 
-  def self.mk a, b
-    new a, b
-  end
-
   def nydp_type ; :pair   ; end
   def caar      ; car.car ; end
   def cadr      ; cdr.car ; end
@@ -35,7 +31,7 @@ class Nydp::Pair
     if n >= list.size
       last
     else
-      mk list[n], from_list(list, last, n+1)
+      new list[n], from_list(list, last, n+1)
     end
   end
 
@@ -76,7 +72,7 @@ class Nydp::Pair
         "'#{cdr.to_s}"
       end
     elsif car.is_a?(Nydp::Symbol) && car.is?(:"brace-list")
-      if Nydp.NIL.is? cdr.cdr
+      if Nydp.NIL.is? cdr
         "{}"
       else
         "{ #{cdr.to_s_rest} }"

data/lib/nydp/symbol.rb

@@ -1,11 +1,13 @@
 class Nydp::Symbol
   EMPTY = :""
   attr_accessor :name
+  attr_reader   :hash
 
   def initialize name
     @name = name.to_sym
     @inspection = name.to_s
     @inspection = "|#{name}|" if untidy(@inspection)
+    @hash       = name.hash
   end
 
   def untidy str
@@ -37,7 +39,6 @@ class Nydp::Symbol
   def to_s       ; name.to_s      ; end
   def to_sym     ; name           ; end
   def to_ruby    ; to_sym         ; end
-  def hash       ; name.hash      ; end
   def eql? other ; self == other  ; end
   def is? nm     ; self.name == nm.to_sym   ; end
   def > other    ; self.name > other.name   ; end

data/lib/nydp/symbol_lookup.rb

@@ -11,7 +11,7 @@ module Nydp
     end
 
     def execute vm
-      vm.push_arg expression.value vm.peek_context
+      vm.push_arg expression.value vm.current_context
     end
 
     def assign value, context=nil

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.13.2"
+  VERSION = "0.1.14"
 end

data/lib/nydp/vm.rb

@@ -30,7 +30,7 @@ module Nydp
         end
       end
       raise_unhandled_error
-      pop_arg
+      args.pop
     end
 
     def raise_unhandled_error
@@ -58,28 +58,21 @@ module Nydp
       end
 
       while protecti.length > 0
-        push_instructions protecti.pop, protectc.pop
+        instructions.push protecti.pop
+        contexts.push protectc.pop
       end
     end
 
-    def peek_context ; current_context                                           ; end
-    def pop_context  ; contexts.pop                                              ; end
     def push_arg a   ; args.push a                                               ; end
     def args!        ; args.empty? ? (raise "illegal operation: no args") : args ; end
     def peek_arg     ; args!.last                                                ; end
-    def pop_arg      ; args!.pop                                                 ; end
-
-    def push_instructions ii, ctx
-      instructions.push ii
-      contexts.push ctx
-    end
 
     def pop_args count, tail=Nydp.NIL
       case count
       when 0
         tail
       else
-        pop_args(count - 1, cons(pop_arg, tail))
+        pop_args(count - 1, cons(args.pop, tail))
       end
     end
 

data/spec/date_spec.rb

@@ -18,7 +18,7 @@ describe Nydp::Date do
   it "creates a new date" do
     df = Nydp::Builtin::Date.new
     df.invoke vm, pair_list([2015, 11, 18])
-    nd = vm.pop_arg
+    nd = vm.args.pop
     expect(nd).to be_a Nydp::Date
     expect(nd.ruby_date).to eq Date.parse("2015-11-18")
   end
@@ -40,7 +40,7 @@ describe Nydp::Date do
       minus = Nydp::Builtin::Minus.new
 
       minus.invoke vm, pair_list([d1, d0])
-      diff = vm.pop_arg
+      diff = vm.args.pop
 
       expect(d0).to be_a Nydp::Date
       expect(diff).to eq 6
@@ -52,7 +52,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d1, d0])
 
-        expect(vm.pop_arg).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp.T
       end
 
       it "compares with nil" do
@@ -60,7 +60,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d1, Nydp.NIL])
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
 
       it "works with builtin greater-than when false" do
@@ -68,7 +68,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d0, d1])
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
 
@@ -78,7 +78,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d0, d1])
 
-        expect(vm.pop_arg).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp.T
       end
 
       it "works with builtin less-than when false" do
@@ -86,7 +86,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d1, d0])
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
 
       it "compares with nil" do
@@ -94,7 +94,7 @@ describe Nydp::Date do
 
         f.invoke vm, pair_list([d1, Nydp.NIL])
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
 
@@ -102,7 +102,7 @@ describe Nydp::Date do
       plus = Nydp::Builtin::Plus.new
 
       plus.invoke vm, pair_list([d0, 5])
-      sum = vm.pop_arg
+      sum = vm.args.pop
 
       expect(d0) .to be_a Nydp::Date
       expect(sum).to be_a Nydp::Date

data/spec/foreign_hash_spec.rb

@@ -17,7 +17,7 @@ describe Nydp::Hash do
         expect(ahash[:keysym].class).to eq String
         expect(ahash.keys).          to eq [:keysym]
 
-        expect(vm.pop_arg).to eq v
+        expect(vm.args.pop).to eq v
       end
     end
 
@@ -29,7 +29,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp::StringAtom.new("avalue")
+        expect(vm.args.pop).to eq Nydp::StringAtom.new("avalue")
       end
 
       it "converts ruby nil to nydp value" do
@@ -38,7 +38,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
 
       it "converts ruby true to nydp value" do
@@ -48,7 +48,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp.T
       end
     end
 
@@ -60,7 +60,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp.T
       end
 
       it "returns nil when key is absent" do
@@ -69,7 +69,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
 
@@ -81,7 +81,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashKeys.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq pair_list [sym("k0"), sym("k1")]
+        expect(vm.args.pop).to eq pair_list [sym("k0"), sym("k1")]
       end
     end
   end

data/spec/hash_non_hash_behaviour_spec.rb

@@ -12,7 +12,7 @@ describe Nydp::Hash do
         args   = [ ahash, k ]
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
-        expect(vm.pop_arg).to eq 123
+        expect(vm.args.pop).to eq 123
       end
 
       it "converts ruby value to nydp value" do
@@ -20,7 +20,7 @@ describe Nydp::Hash do
         args   = [ ahash, k ]
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
-        expect(vm.pop_arg).to eq Nydp::StringAtom.new("hello there")
+        expect(vm.args.pop).to eq Nydp::StringAtom.new("hello there")
       end
 
       it "converts string keys to method names" do
@@ -28,7 +28,7 @@ describe Nydp::Hash do
         args   = [ ahash, k ]
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
-        expect(vm.pop_arg).to eq Nydp::StringAtom.new("hello there")
+        expect(vm.args.pop).to eq Nydp::StringAtom.new("hello there")
       end
 
       it "returns nil for unavailable methods" do
@@ -36,7 +36,7 @@ describe Nydp::Hash do
         args   = [ ahash, k ]
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
   end

data/spec/hash_spec.rb

@@ -63,7 +63,7 @@ describe Nydp::Hash do
     describe "new hash" do
       it "returns a new Nydp hash" do
         Nydp::Builtin::Hash.new.invoke vm, Nydp.NIL
-        h = vm.pop_arg
+        h = vm.args.pop
         expect(h).to be_a Nydp::Hash
       end
     end
@@ -78,7 +78,7 @@ describe Nydp::Hash do
 
         expect(h.keys).    to eq [k]
         expect(h[k]).      to eq v
-        expect(vm.pop_arg).to eq v
+        expect(vm.args.pop).to eq v
       end
     end
 
@@ -91,7 +91,7 @@ describe Nydp::Hash do
 
         args = Nydp::Pair.from_list([h, k])
         Nydp::Builtin::HashGet.new(ns).invoke vm, args
-        expect(vm.pop_arg).to eq v
+        expect(vm.args.pop).to eq v
       end
     end
 
@@ -104,7 +104,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list([h, k])
 
-        expect(vm.pop_arg).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp.T
       end
 
       it "returns nil when key is absent" do
@@ -113,7 +113,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashKeyPresent.new(ns).invoke vm, pair_list([h, k])
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
 
@@ -125,7 +125,7 @@ describe Nydp::Hash do
 
         args = Nydp::Pair.from_list([h])
         Nydp::Builtin::HashKeys.new(ns).invoke vm, args
-        expect(vm.pop_arg).to eq pair_list [sym("k0"), sym("k1")]
+        expect(vm.args.pop).to eq pair_list [sym("k0"), sym("k1")]
       end
     end
   end
@@ -141,7 +141,7 @@ describe Nydp::Hash do
         Nydp::Builtin::HashSet.new.invoke vm, args
 
         expect(ahash).     to eq Nydp.NIL
-        expect(vm.pop_arg).to eq v
+        expect(vm.args.pop).to eq v
       end
     end
 
@@ -152,7 +152,7 @@ describe Nydp::Hash do
 
         Nydp::Builtin::HashGet.new(ns).invoke vm, pair_list(args)
 
-        expect(vm.pop_arg).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp.NIL
       end
     end
   end

data/spec/pair_spec.rb

@@ -55,7 +55,7 @@ describe Nydp::Pair do
   end
 
   it "should create a new pair" do
-    p = Nydp::Pair.mk :a, :b
+    p = Nydp::Pair.new :a, :b
     expect(p.car).to eq :a
     expect(p.cdr).to eq :b
   end

data/spec/string_atom_spec.rb

@@ -32,7 +32,7 @@ describe Nydp::StringAtom do
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.pop_arg).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp.T
   end
 
   it "works with builtin greater-than when false" do
@@ -40,7 +40,7 @@ describe Nydp::StringAtom do
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.pop_arg).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp.NIL
   end
 
   it "works with builtin less-than when true" do
@@ -48,7 +48,7 @@ describe Nydp::StringAtom do
 
     f.invoke vm, pair_list([bar, foo])
 
-    expect(vm.pop_arg).to eq Nydp.T
+    expect(vm.args.pop).to eq Nydp.T
   end
 
   it "works with builtin less-than when false" do
@@ -56,6 +56,6 @@ describe Nydp::StringAtom do
 
     f.invoke vm, pair_list([foo, bar])
 
-    expect(vm.pop_arg).to eq Nydp.NIL
+    expect(vm.args.pop).to eq Nydp.NIL
   end
 end

data/spec/symbol_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.1.13.2
+  version: 0.1.14
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler