nydp 0.1.9.1 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46921f478f559c5d78edc626c2620ba05406f071
-  data.tar.gz: 582c35f13517cdb8e897e6696c1873284304ec88
+  metadata.gz: 6eec33bbcb86a9efa22b6e3fe9be0ab2f792e54c
+  data.tar.gz: 61bf6dde8f734b52a82779be3b8127714cd4775c
 SHA512:
-  metadata.gz: 9f1a7ad0dcfedb16886cdb8c932f44486745cfba9cf80ff93fd3e4e1225c762fcb38902b689fcf3a68bce1c230cb1e47d14d95ff6c7d294879793c36a881e2ef
-  data.tar.gz: 91e528cd2bf04dae0ac591ca6ad93fe29c5c9f71f1751aa5692b6392d38161a19b4c869f49ec37e576db34589ccd3d7b5b582e8c73086a21fabe8eb4c185430d
+  metadata.gz: 47dd8b9bdd75f050da422385256417a2ed334c1b988dbb718c53f2be91905174af5390a37817b9938eddc09b67b056e718310932fa00375f622240607a33f06c
+  data.tar.gz: d947fab3747a487f5d99db30ae90186ee8b2424fb3370b8463567430afc94ff533c1ec51b7770ecf93aeed1ed919dcdbc5b28886e92487aa1547168187454252

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 lib/lisp/scratch
 .#*
+bm.txt

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

@@ -17,26 +17,26 @@
                          (assign times (+ elapsed times))
                          (p "  took: ~elapsed ms, ~(/ elapsed iterations) ms per iteration"))))
           (p "total ~(just times), average ~(/ times repeats) per run")
-          (p "================================================\n"))
-     nil)
+          (p "================================================\n")
+          "~desc : total ~(just times), average ~(/ times repeats) per run"))
 
-(let private-x 0
-     (let inc-x (fn () (assign private-x (+ 1 private-x)))
-          (def bm-zero-arg-call ()
-               (for i 0 400 (inc-x)))))
 
-(let private-y 0
-     (let inc-y (fn (n) (assign private-y (+ n private-y)))
-          (def bm-one-arg-call ()
-               (for i 0 400 (inc-y 10)))))
+(def bm-0-arg-times-call () (*))
+(def bm-1-arg-times-call () (* 23))
+(def bm-2-arg-times-call () (* 23 24))
+(def bm-3-arg-times-call () (* 23 24 25))
+(def bm-4-arg-times-call () (* 23 24 25 26))
 
-(let private-z 0
-     (let inc-z (fn (n m) (assign private-z (+ (* n m) private-z)))
-          (def bm-two-arg-call ()
-               (for i 0 400 (inc-z 2 5)))))
-
-(def rbs ()
-  (bm "pythag"        bm-pythag        10 100)
-  (bm "zero arg call" bm-zero-arg-call 10 500)
-  (bm "one arg call"  bm-one-arg-call  10 500)
-  (bm "two arg call"  bm-two-arg-call  10 500))
+(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)
+    (each s summary (p name " " s))))

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

@@ -42,19 +42,33 @@
 ))
 
 (examples-for +
-  ("adds integers"
-   (+ 11 22 33)
-   66)
+  ("adds nothing"   (+)           0)
+  ("adds 1 int"     (+ 42)       42)
+  ("adds 2 ints"    (+ 42 45)    87)
+  ("adds 3 ints"    (+ 11 22 33) 66)
 
-  ("adds floats"
-   (+ 14.80 (* 91.31 1.05))
-   110.6755))
+  ("adds 1 float"   (+ 4.2)         4.2)
+  ("adds 2 floats"  (+ 4.2 4.5)     8.7)
+  ("adds 3 floats"  (+ 1.1 2.2 3.3) 6.6))
 
 (examples-for -
-  ("subtracts integers"
-   (- 66 25)
-   41)
+  ("subtracts nothing"   (-)            0)
+  ("subtracts 1 int"     (- 42)       -42)
+  ("subtracts 2 ints"    (- 45 42)      3)
+  ("subtracts 3 ints"    (- 66 22 33)  11)
 
-  ("subtracts floats"
-   (- 6.25 4.125)
-   2.125))
+  ("subtracts 1 float"   (- 4.2)        -4.2)
+  ("subtracts 2 floats"  (- 4.2 4.7)    -0.5)
+  ("subtracts 3 floats"  (- 6.6 1.1 3.3) 2.2))
+
+(examples-for *
+  ("multiplies nothing"   (*)            1)
+  ("multiplies 1 int"     (* 42)        42)
+  ("multiplies 2 ints"    (* 5 42)     210)
+  ("multiplies 3 ints"    (* 2 3 5)     30)
+  ("multiplies 3 ints"    (* 2 3 5 7)  210)
+
+  ("multiplies 1 float"   (* 4.2)          4.2)
+  ("multiplies 2 floats"  (* 4.2 0.5)      2.1)
+  ("multiplies 3 floats"  (* 4.2 -2.5)   -10.5)
+  ("multiplies 4 floats"  (* 6.6 1.1 3.3) 23.958))

data/lib/nydp/builtin.rb

@@ -5,16 +5,33 @@ module Nydp::Builtin
   module Base
     include Nydp::Helper
 
+    def builtin_invoke_1 vm             ; builtin_invoke vm, Nydp.NIL                     ; end
+    def builtin_invoke_2 vm, a          ; builtin_invoke vm, cons(a)                      ; end
+    def builtin_invoke_3 vm, a0, a1     ; builtin_invoke vm, cons(a0, cons(a1))           ; end
+    def builtin_invoke_4 vm, a0, a1, a2 ; builtin_invoke vm, cons(a0, cons(a1, cons(a2))) ; end
+
     def invoke_1 vm
-      invoke vm, Nydp.NIL
+      builtin_invoke_1 vm
+    rescue Exception => e
+      handle_error e, Nydp.NIL
     end
 
     def invoke_2 vm, arg
-      invoke vm, cons(arg)
+      builtin_invoke_2 vm, arg
+    rescue Exception => e
+      handle_error e, cons(arg)
     end
 
     def invoke_3 vm, arg_0, arg_1
-      invoke vm, cons(arg_0, cons(arg_1))
+      builtin_invoke_3 vm, arg_0, arg_1
+    rescue Exception => e
+      handle_error e, cons(arg_0, cons(arg_1))
+    end
+
+    def invoke_4 vm, arg_0, arg_1, arg_2
+      builtin_invoke_4 vm, arg_0, arg_1, arg_2
+    rescue Exception => e
+      handle_error e, cons(arg_0, cons(arg_1, cons(arg_2)))
     end
 
     def invoke vm, args

data/lib/nydp/builtin/minus.rb

@@ -1,6 +1,11 @@
 class Nydp::Builtin::Minus
   include Nydp::Builtin::Base
 
+  def invoke_1 vm             ; vm.push_arg 0             ; end
+  def invoke_2 vm, a          ; vm.push_arg -a            ; end
+  def invoke_3 vm, a0, a1     ; vm.push_arg(a0 - a1)      ; end
+  def invoke_4 vm, a0, a1, a2 ; vm.push_arg(a0 - a1 - a2) ; end
+
   def builtin_invoke vm, args
     vm.push_arg diff(args.cdr, args.car)
   end

data/lib/nydp/builtin/plus.rb

@@ -1,6 +1,11 @@
 class Nydp::Builtin::Plus
   include Nydp::Builtin::Base
 
+  def builtin_invoke_1 vm             ; vm.push_arg 0             ; end
+  def builtin_invoke_2 vm, a          ; vm.push_arg a             ; end
+  def builtin_invoke_3 vm, a0, a1     ; vm.push_arg(a0 + a1)      ; end
+  def builtin_invoke_4 vm, a0, a1, a2 ; vm.push_arg(a0 + a1 + a2) ; end
+
   def builtin_invoke vm, args
     vm.push_arg case args.car
                 when Nydp::Pair

data/lib/nydp/builtin/times.rb

@@ -1,6 +1,11 @@
 class Nydp::Builtin::Times
   include Nydp::Builtin::Base
 
+  def invoke_1 vm             ; vm.push_arg 1             ; end
+  def invoke_2 vm, a          ; vm.push_arg a             ; end
+  def invoke_3 vm, a0, a1     ; vm.push_arg(a0 * a1)      ; end
+  def invoke_4 vm, a0, a1, a2 ; vm.push_arg(a0 * a1 * a2) ; end
+
   def builtin_invoke vm, args
     vm.push_arg multiply(args, 1)
   end

data/lib/nydp/closure.rb

@@ -18,6 +18,10 @@ module Nydp
       ifn.invoke_3 vm, context, arg_0, arg_1
     end
 
+    def invoke_4 vm, arg_0, arg_1, arg_2
+      ifn.invoke_4 vm, context, arg_0, arg_1, arg_2
+    end
+
     def invoke vm, arg_values
       ifn.invoke vm, context, arg_values
     end

data/lib/nydp/function_invocation.rb

@@ -58,6 +58,18 @@ module Nydp
       end
     end
 
+    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
+        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)))
+      end
+    end
+
     class Invocation_N < Invocation::Base
       def initialize arg_count, source_expression
         super source_expression
@@ -85,6 +97,8 @@ module Nydp
                           Invocation::Invocation_2.new(expression)
                         when 3
                           Invocation::Invocation_3.new(expression)
+                        when 4
+                          Invocation::Invocation_4.new(expression)
                         else
                           Invocation::Invocation_N.new(expression.size, expression)
                         end

data/lib/nydp/interpreted_function.rb

@@ -31,6 +31,12 @@ module Nydp
       vm.push_instructions self.body, 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
+    end
+
     def invoke vm, parent_context, arg_values
       lc = LexicalContext.new parent_context
       set_args lc, arg_values

data/lib/nydp/lexical_context.rb

@@ -45,6 +45,15 @@ class Nydp::LexicalContext
     end
   end
 
+  def set_args_3 names, arg_0, arg_1, arg_2
+    if pair? names
+      set names.car, arg_0
+      set_args_2 names.cdr, arg_1, arg_2
+    elsif Nydp.NIL.isnt? names
+      set names, cons(arg_0, cons(arg_1, cons(arg_2)))
+    end
+  end
+
   def set_index index, value
     values[index] = value
   end

data/lib/nydp/lexical_context_builder.rb

@@ -2,17 +2,19 @@ module Nydp::LexicalContextBuilder
   extend Nydp::Helper
 
   module B_0
-    def initialize_names _        ; end
-    def set_args_1 lc, a          ; end
-    def set_args_2 lc, a_0, a_1   ; end
-    def set_args   lc, args       ; end
+    def initialize_names _           ; end
+    def set_args_1 lc, a             ; end
+    def set_args_2 lc, a_0, a_1      ; end
+    def set_args_3 lc, a_0, a_1, a_2 ; end
+    def set_args   lc, args          ; end
   end
 
   module B_1
-    def initialize_names names      ; @param_name = names.car                      ; end
-    def set_args_1 lc, arg          ; lc.set @param_name, arg                      ; end
-    def set_args_2 lc, arg_0, arg_1 ; lc.set @param_name, arg_0                    ; end
-    def set_args   lc, args         ; lc.set @param_name, args.car                 ; end
+    def initialize_names names             ; @param_name = names.car      ; end
+    def set_args_1 lc, arg                 ; lc.set @param_name, arg      ; end
+    def set_args_2 lc, arg_0, arg_1        ; lc.set @param_name, arg_0    ; end
+    def set_args_3 lc, arg_0, arg_1, arg_2 ; lc.set @param_name, arg_0    ; end
+    def set_args   lc, args                ; lc.set @param_name, args.car ; end
   end
 
   module B_2
@@ -27,18 +29,48 @@ module Nydp::LexicalContextBuilder
       lc.set @param_name_0, arg_0
       lc.set @param_name_1, arg_1
     end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+    end
     def set_args lc, args
       lc.set @param_name_0, args.car
       lc.set @param_name_1, args.cdr.car
     end
   end
 
+  module B_3
+    def initialize_names names
+      @param_name_0 = names.car
+      @param_name_1 = names.cdr.car
+      @param_name_2 = names.cdr.cdr.car
+    end
+    def set_args_1 lc, arg
+      lc.set @param_name_0, arg
+    end
+    def set_args_2 lc, arg_0, arg_1
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+    end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+      lc.set @param_name_2, arg_2
+    end
+    def set_args lc, args
+      lc.set @param_name_0, args.car
+      lc.set @param_name_1, args.cdr.car
+      lc.set @param_name_2, args.cdr.cdr.car
+    end
+  end
+
   module B_0_Rest
     include Nydp::Helper
-    def initialize_names names      ; @param_name = names                          ; end
-    def set_args_1 lc, arg          ; lc.set @param_name, cons(arg)                ; end
-    def set_args_2 lc, arg_0, arg_1 ; lc.set @param_name, cons(arg_0, cons(arg_1)) ; end
-    def set_args   lc, args         ; lc.set @param_name, args                     ; end
+    def initialize_names names             ; @param_name = names                                       ; end
+    def set_args_1 lc, arg                 ; lc.set @param_name, cons(arg)                             ; end
+    def set_args_2 lc, arg_0, arg_1        ; lc.set @param_name, cons(arg_0, cons(arg_1))              ; end
+    def set_args_3 lc, arg_0, arg_1, arg_2 ; lc.set @param_name, cons(arg_0, cons(arg_1, cons(arg_2))) ; end
+    def set_args   lc, args                ; lc.set @param_name, args                                  ; end
   end
 
   module B_1_Rest
@@ -54,6 +86,10 @@ module Nydp::LexicalContextBuilder
       lc.set @param_name_0, arg_0
       lc.set @param_name_1, cons(arg_1)
     end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, cons(arg_1, cons(arg_2))
+    end
     def set_args lc, args
       lc.set @param_name_0, args.car
       lc.set @param_name_1, args.cdr
@@ -73,6 +109,11 @@ module Nydp::LexicalContextBuilder
       lc.set @param_name_0, arg_0
       lc.set @param_name_1, arg_1
     end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+      lc.set @param_name_2, cons(arg_2)
+    end
     def set_args lc, args
       lc.set @param_name_0, args.car
       lc.set @param_name_1, args.cdr.car
@@ -80,6 +121,32 @@ module Nydp::LexicalContextBuilder
     end
   end
 
+  module B_3_Rest
+    def initialize_names names
+      @param_name_0 = names.car
+      @param_name_1 = names.cdr.car
+      @param_name_2 = names.cdr.cdr
+    end
+    def set_args_1 lc, arg
+      lc.set @param_name_0, arg
+    end
+    def set_args_2 lc, arg_0, arg_1
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+    end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_name_0, arg_0
+      lc.set @param_name_1, arg_1
+      lc.set @param_name_2, arg_2
+    end
+    def set_args lc, args
+      lc.set @param_name_0, args.car
+      lc.set @param_name_1, args.cdr.car
+      lc.set @param_name_2, args.cdr.cdr.car
+      lc.set @param_name_3, args.cdr.cdr.cdr
+    end
+  end
+
   module B_X
     def initialize_names names
       @param_names = names
@@ -91,6 +158,11 @@ module Nydp::LexicalContextBuilder
       lc.set @param_names.car,     arg_0
       lc.set @param_names.cdr.car, arg_1
     end
+    def set_args_3 lc, arg_0, arg_1, arg_2
+      lc.set @param_names.car,         arg_0
+      lc.set @param_names.cdr.car,     arg_1
+      lc.set @param_names.cdr.cdr.car, arg_2
+    end
     def set_args lc, args
       _set_args lc, @param_names, args
     end
@@ -104,10 +176,11 @@ module Nydp::LexicalContextBuilder
 
   module B_X_Rest
     include Nydp::Helper
-    def initialize_names names      ; @param_names = names                        ; end
-    def set_args_1 lc, arg          ; set_args lc, cons(arg)                ; end
-    def set_args_2 lc, arg_0, arg_1 ; set_args lc, cons(arg_0, cons(arg_1)) ; end
-    def set_args lc, args           ; _set_args lc, @param_names, args            ; end
+    def initialize_names names             ; @param_names = names                               ; end
+    def set_args_1 lc, arg                 ; set_args lc, cons(arg)                             ; end
+    def set_args_2 lc, arg_0, arg_1        ; set_args lc, cons(arg_0, cons(arg_1))              ; end
+    def set_args_3 lc, arg_0, arg_1, arg_2 ; set_args lc, cons(arg_0, cons(arg_1, cons(arg_2))) ; end
+    def set_args lc, args                  ; _set_args lc, @param_names, args                   ; end
     def _set_args lc, names, args
       if pair? names
         lc.set names.car, args.car
@@ -121,7 +194,7 @@ module Nydp::LexicalContextBuilder
   def self.select arg_names
     if pair? arg_names
       size = pair?(arg_names) ? arg_names.size : 0
-      class_name = "B_#{size > 2 ? "X" : size}#{arg_names.proper? ? "" : "_Rest"}"
+      class_name = "B_#{size > 3 ? "X" : size}#{arg_names.proper? ? "" : "_Rest"}"
     else
       class_name = "B_0_Rest"
     end

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.9.1"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.1.9.1
+  version: 0.1.10
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler