nydp 0.1.13.1 → 0.1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f450a23c8998d99bc57a5c23a0c87c06566322
-  data.tar.gz: 3256bb897e0a2e6a4e7da105ff389dc422f37510
+  metadata.gz: c7374115cdd9df0c64b65aaf6321b23f5eac50ef
+  data.tar.gz: 9d108fd6697da14be302dec3da20926de83ff6a2
 SHA512:
-  metadata.gz: 0956fc389dbe051a444cfd2dbcf3de1f5b8990427fb567618cf51a4c0941bb1fc286dbf0cff3a6f70f41567ce86629b77e76f59735837269bb244bcda3c5985a
-  data.tar.gz: 7c72d7bfd3ee47c9e0f6d75ff86f9b679d1ec803db68cf899b46e3878f53ecd50d77bfbba40a942dcdf277245d431adbe121aa43cc89397c7a5d9165cdaf0d02
+  metadata.gz: 46702e5f71b4cb0335773567020bb223839b5f50702583af33d6469fcfda6fe6a130b00d5b69cc9bf40cd344b8fb6a7b1ae628bfb539488dc0060711bef9d0af
+  data.tar.gz: 05028cdc5301c4670c053b95aead31e179784915c35096153e124e3d3d2405392767189dcbb4d15f8960599cc8ef2bbdb23be242bd9d2ff924173e5f66d13a97

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

@@ -27,16 +27,20 @@
 (def bm-3-arg-times-call () (* 23 24 25))
 (def bm-4-arg-times-call () (* 23 24 25 26))
 
+(def bm-complicated-0 (a b c) (a (+ 1 b) (+ 1 c)))
+
+(def bm-complicated ()
+  (bm-complicated-0 +
+                    (bm-complicated-0 * 3 (bm-complicated-0 + 3 6))
+                    (bm-complicated-0 - 10 (bm-complicated-0 - 13 8))))
+
 (def rbs (name)
   (let summary nil
-    ;; (push (bm "pythag"         bm-pythag         10  20) summary)
-    ;; (push (bm "zero arg call"  bm-zero-arg-call  10 100) summary)
-    ;; (push (bm "one arg call"   bm-one-arg-call   10 100) summary)
-    ;; (push (bm "two arg call"   bm-two-arg-call   10 100) summary)
-    ;; (push (bm "three arg call" bm-three-arg-call 10 100) summary)
-    (push (bm "0 arg times"   bm-0-arg-times-call 10 10000) summary)
-    (push (bm "1 arg times"   bm-1-arg-times-call 10 10000) summary)
-    (push (bm "2 arg times"   bm-2-arg-times-call 10 10000) summary)
-    (push (bm "3 arg times"   bm-3-arg-times-call 10 10000) summary)
-    (push (bm "4 arg times"   bm-4-arg-times-call 10 10000) summary)
+    (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)
     (each s summary (p name " " s))))

data/lib/nydp/pair.rb

@@ -138,9 +138,4 @@ class Nydp::Pair
     end
     self
   end
-
-  def repush instructions, _
-    instructions.push self
-  end
-
 end

data/lib/nydp/truth.rb

@@ -22,14 +22,7 @@ module Nydp
     def inspect     ; "nil"         ; end
     def nydp_type   ; :nil          ; end
     def to_ruby     ; nil           ; end
-
-    def execute vm
-      vm.push_arg self
-    end
-
-    def repush _, contexts
-      contexts.pop
-    end
+    def execute vm  ; vm.push_arg self ; end
   end
 
   @@nil = Nil.new

data/lib/nydp/version.rb

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

data/lib/nydp/vm.rb

@@ -15,13 +15,16 @@ module Nydp
 
     def thread expr=nil
       instructions.push expr if expr
-      while instructions.length > 0
+      while instructions.first
         begin
-          self.current_context = contexts.last
-          ii = instructions.pop
-          i = ii.car
-          ii.cdr.repush instructions, contexts
-          i.execute(self)
+          thisi = instructions.pop
+          if thisi.cdr.is_a? Nydp::Nil
+            self.current_context = contexts.pop
+          else
+            self.current_context = contexts.last
+            instructions.push thisi.cdr
+          end
+          thisi.car.execute(self)
         rescue Exception => e
           handle_error e
         end

metadata

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