nydp 0.1.15 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e6fd1dc5fc3149b5f11a0ebdde15b780b18961e
-  data.tar.gz: f0f7f42ba740494b00425e3c5200acc12b9483c9
+  metadata.gz: f7639157cc6f6e6959cec1491e180b71930204ae
+  data.tar.gz: 80357a5ba720caa3065845a575a154087d9ff25c
 SHA512:
-  metadata.gz: 20c231e32e8a611446082c2a3eb144ac5782226dcb15f44224a0a77813577d77bf538cf65f6d897f824f0d2c0e7a8a9f8e054c9d84d6b60b06781ede72d1cb1e
-  data.tar.gz: ba1e3bc4f43c7c10bd8e06bd0ce45e513413b75a8213f0365abcb6389114e42ddf1e0c7746fbe78fc0829c5e711b57726ce11d6c11594b6f83fc674d8b372252
+  metadata.gz: 8a0824e45483b39ca5cd26730753025ffc57a1a976a83ec4e16f10c62c217993f30ef85d892aec26c52e08fb36dc8be9e55f460ed10a492bb2955260eb5e0636
+  data.tar.gz: c8530f8e2afcce52d310d2b76bf09de29dc162fd97df159e4c4fd3a7ac1c35b1deb103972d00fd7d7027ded94d98a85683cee28f849329f20975a955f85dbc62

data/lib/lisp/core-015-documentation.nydp

@@ -37,6 +37,8 @@
        (cond (dox? name)
              (hash-get (car (dox-lookup name)) attr)))
 
+     (def dox-chapter-names () (hash-keys chapters      ))
+     (def dox-chapter   (name) (hash-get chapters name  ))
      (def dox-what-is?  (name) (dox-get-attr name 'what ))
      (def dox-src       (name) (dox-get-attr name 'src  ))
      (def dox-examples  (name) (hash-get examples name  ))
@@ -84,7 +86,8 @@
                     'mac
                     ',(map car (hash-get body-forms 'comment))
                     ',args
-                    '(mac ,name ,args ,@(hash-get body-forms nil)))))
+                    '(mac ,name ,args ,@(hash-get body-forms nil))
+                    ',(map car (hash-get body-forms 'chapter)))))
 
 (hash-set macs 'mac
           (fn (name args . body)
@@ -94,13 +97,15 @@
              'mac
              '("define a new global macro")
              '(name args . body)
-             '`(hash-set macs ',name (fn ,ooargs ,@body)))
+             '`(hash-set macs ',name (fn ,ooargs ,@body))
+             '(nydp-core))
 
 (dox-add-doc 'do
              'mac
              '("perform a series of operations")
              'args
-             '`((fn nil ,@args)))
+             '`((fn nil ,@args))
+             '(nydp-core))
 
 (mac def-assign args `(assign ,@args))
 
@@ -111,8 +116,10 @@
                     'def
                     ',(map car (hash-get body-forms 'comment))
                     ',args
-                    '(def ,name ,args ,@(hash-get body-forms nil)))))
+                    '(def ,name ,args ,@(hash-get body-forms nil))
+                    ',(map car (hash-get body-forms 'chapter)))))
 
 (mac def (name args . body)
   ; define a new function in the global namespace
+  (chapter nydp-core)
   (define-def-expr name args (filter-forms (build-def-hash (hash)) body)))

data/lib/lisp/core-040-utils.nydp

@@ -1,3 +1,6 @@
+(def today ()
+  ; return a date for the current day
+  (date))
 
 (def eachr (f things)
      (when things

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

@@ -12,7 +12,6 @@
   ("eval"            (inspect eval            ) "builtin/eval"            )
   ("hash"            (inspect hash            ) "builtin/hash"            )
   ("date"            (inspect date            ) "builtin/date"            )
-  ("today"           (inspect today           ) "builtin/today"           )
   ("error"           (inspect error           ) "builtin/error"           )
   ("apply"           (inspect apply           ) "builtin/apply"           )
   ("error"           (inspect error           ) "builtin/error"           )
@@ -32,6 +31,7 @@
   ("string-length"   (inspect string-length   ) "builtin/string-length"   )
   ("string-replace"  (inspect string-replace  ) "builtin/string-replace"  )
   ("string-split"    (inspect string-split    ) "builtin/string-split"    )
+  ("time"            (inspect time            ) "builtin/time"            )
   ("thread-locals"   (inspect thread-locals   ) "builtin/thread-locals"   )
   ("eq?"             (inspect eq?             ) "builtin/eq?"             )
   ("hash-get"        (inspect hash-get        ) "builtin/hash-get"        )

data/lib/lisp/tests/foundation-test.nydp

@@ -16,6 +16,46 @@
    (eq? '|| '||)
    t)
 
+  ("true for two identical numbers"
+   (eq? 42 42)
+   t)
+
+  ("true for three identical numbers"
+   (eq? 42 42 42)
+   t)
+
+  ("true for four identical numbers"
+   (eq? 42 42 42 42)
+   t)
+
+  ("true for five identical numbers"
+   (eq? 42 42 42 42 42)
+   t)
+
+  ("true for six identical numbers"
+   (eq? 42 42 42 42 42 42)
+   t)
+
+  ("false for one different number in six"
+   (eq? 42 42 42 42 42 -3)
+   nil)
+
+  ("false for one different number in five"
+   (eq? 42 42 42 -3 42)
+   nil)
+
+  ("false for one different number in four"
+   (eq? 42 -3 42 42)
+   nil)
+
+  ("false for one different number in three"
+   (eq? -3 42 42)
+   nil)
+
+  ("false for two different numbers"
+   (eq? -3 42)
+   nil)
+
   ("nil for two different symbols"
    (eq? 'foo 'bar)
    nil))

data/lib/lisp/tests/time-examples.nydp

@@ -0,0 +1,21 @@
+(examples-for time
+ ("creates a single date"            (to-string (time 1965 6 8))                            "1965-06-08 00:00:00 +0100" )
+ ("adds ten seconds"                 (to-string (time (time 2004  3 12 14 30) 10))          "2004-03-12 14:30:10 +0100" )
+ ("'+ adds seconds"                  (to-string (+ (time 2004  3 12 14 30) 29))             "2004-03-12 14:30:29 +0100" )
+ ("subtracts times"                  (time (time 2004  3 12 14 32) (time 2004  3 12 14 30)) 120.0 )
+ ("'- subtracts times"               (- (time 2004  3 12 14 36) (time 2004  3 12 14 26))    600.0 )
+
+ ("can act as hash key"
+  (with (h {} d (time 1971 11 18 14 57))
+    (hash-set h d "on this day")
+    (to-string (hash-get h (time 1971 11 18 14 57))))
+  "on this day")
+
+ ("equals itself"              (eq? (time 2004 3 12) (time 2004 3 12))  t  )
+ ("does not equal another"     (eq? (time 2004 3 12) (time 2006 6 21))  nil)
+ ("does not equal nil"         (eq? (time 2004 3 12) nil             )  nil)
+ ("nil does not equal a time"  (eq? nil (time 2004 3 12)             )  nil)
+
+ ("returns its year"      (&year  (date (time 1999 12 31 13 29 52)))     1999)
+ ("returns its month"     (&month (date (time 1999 12 31 13 29 52)))       12)
+ ("returns its day"       (&day   (date (time 1999 12 31 13 29 52)))       31))

data/lib/nydp.rb

@@ -8,7 +8,7 @@ module Nydp
   def self.testfiles;       PLUGINS.map(&:testfiles).flatten    ; end
   def self.plugin_names   ; PLUGINS.map(&:name)                 ; end
   def self.loadall ns, files
-    vm = VM.new
+    vm = VM.new(ns)
     files.each { |f|
       reader = Nydp::StreamReader.new(File.new(f))
       Nydp::Runner.new(vm, ns, reader).run
@@ -27,29 +27,31 @@ module Nydp
   def self.apply_function ns, function_name, *args
     function = r2n(function_name.to_sym, ns).value
     args     = r2n args, ns
-    vm       = VM.new
+    vm       = VM.new(ns)
 
     function.invoke vm, args
     vm.thread
   end
 
-  def self.reader                    txt ; Nydp::StringReader.new txt                  ; end
-  def self.eval_src          ns, src_txt ; eval_with Nydp::Runner, ns, src_txt         ; end
-  def self.eval_src!         ns, src_txt ; eval_with Nydp::ExplodeRunner, ns, src_txt  ; end
-  def self.eval_with runner, ns, src_txt ; runner.new(VM.new, ns, reader(src_txt)).run ; end
+  def self.reader                    txt ; Nydp::StringReader.new txt                      ; end
+  def self.eval_src          ns, src_txt ; eval_with Nydp::Runner, ns, src_txt             ; end
+  def self.eval_src!         ns, src_txt ; eval_with Nydp::ExplodeRunner, ns, src_txt      ; end
+  def self.eval_with runner, ns, src_txt ; runner.new(VM.new(ns), ns, reader(src_txt)).run ; end
 
   def self.repl
     puts "welcome to nydp"
     puts "^D to exit"
     reader = Nydp::ReadlineReader.new $stdin, "nydp > "
-    Nydp::Runner.new(VM.new, build_nydp, reader, $stdout).run
+    ns     = build_nydp
+    Nydp::Runner.new(VM.new(ns), ns, reader, $stdout).run
   end
 
   def self.tests *options
     verbose = options.include?(:verbose) ? "t" : "nil"
     puts "welcome to nydp : running tests"
     reader = Nydp::StringReader.new "(run-all-tests #{verbose})"
-    Nydp::Runner.new(VM.new, build_nydp, reader).run
+    ns     = build_nydp
+    Nydp::Runner.new(VM.new(ns), ns, reader).run
   end
 
 end

data/lib/nydp/builtin.rb

@@ -5,7 +5,8 @@ module Nydp::Builtin
   module Base
     include Nydp::Helper
 
-    def builtin_invoke_1 vm             ; builtin_invoke vm, Nydp.NIL                     ; end
+    def builtin_invoke   vm, args       ; raise "#{self.class.name} : please implement #builtin_invoke" ; end
+    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
@@ -13,7 +14,7 @@ module Nydp::Builtin
     def invoke_1 vm
       builtin_invoke_1 vm
     rescue Exception => e
-      handle_error e, Nydp.NIL
+      handle_error e, Nydp::NIL
     end
 
     def invoke_2 vm, arg

data/lib/nydp/builtin/apply.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Apply
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     args.car.invoke vm, apply_args(args.cdr)
@@ -10,7 +10,7 @@ class Nydp::Builtin::Apply
   def apply_args args
     raise "Apply: expected a list : got #{args.inspect}" unless pair? args
     raise "Apply: improper list : cdr is ruby nil" if args.cdr.nil?
-    return args.car if Nydp.NIL.is? args.cdr
+    return args.car if Nydp::NIL.is? args.cdr
     cons args.car, apply_args(args.cdr)
   end
 end

data/lib/nydp/builtin/car.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Car
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg args.car.car

data/lib/nydp/builtin/cdr.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Cdr
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg args.car.cdr

data/lib/nydp/builtin/cdr_set.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::CdrSet
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     pair = args.car

data/lib/nydp/builtin/comment.rb

@@ -1,7 +1,7 @@
 class Nydp::Builtin::Comment
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    vm.push_arg Nydp.NIL
+    vm.push_arg Nydp::NIL
   end
 end

data/lib/nydp/builtin/cons.rb

@@ -1,6 +1,6 @@
 module Nydp::Builtin
   class Cons
-    include Nydp::Builtin::Base
+    include Nydp::Builtin::Base, Singleton
 
     def builtin_invoke vm, args
       vm.push_arg Nydp::Pair.new(args.car, args.cdr.car)

data/lib/nydp/builtin/date.rb

@@ -0,0 +1,20 @@
+class Nydp::Builtin::Date
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
+
+  def builtin_invoke_1 vm
+    vm.push_arg(Nydp::Date.new Date.today)
+  end
+
+  # it's a Time object (or any object that responds to #to_date)
+  def builtin_invoke_2 vm, arg
+    vm.push_arg(Nydp::Date.new arg.to_date)
+  end
+
+  def builtin_invoke_3 vm, a0, a1
+    raise Nydp::Error.new "Date, got 2 args (#{a0} #{a1}), expected 0 or 1 or 3 args"
+  end
+
+  def builtin_invoke_4 vm, y, m, d
+    vm.push_arg(Nydp::Date.new Date.new(y,m,d))
+  end
+end

data/lib/nydp/builtin/divide.rb

@@ -1,12 +1,12 @@
 class Nydp::Builtin::Divide
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg divide(args.cdr, args.car)
   end
 
   def divide args, accum
-    if Nydp.NIL.is? args
+    if Nydp::NIL.is? args
       accum
     else
       divide(args.cdr, (accum / args.car))

data/lib/nydp/builtin/ensuring.rb

@@ -1,7 +1,7 @@
 require "nydp/vm"
 
 class Nydp::Builtin::Ensuring
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   class InvokeProtection
     include Nydp::VM::Finally
@@ -12,7 +12,7 @@ class Nydp::Builtin::Ensuring
     end
 
     def execute vm
-      protection.invoke vm, Nydp.NIL
+      protection.invoke vm, Nydp::NIL
     end
   end
 
@@ -24,6 +24,6 @@ class Nydp::Builtin::Ensuring
     vm.instructions.push protection_instructions
     vm.contexts.push vm.current_context
 
-    fn_tricky.invoke vm, Nydp.NIL
+    fn_tricky.invoke vm, Nydp::NIL
   end
 end

data/lib/nydp/builtin/error.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Error
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   # override #invoke on nydp/builtin/base because
   # we don't want to inherit error handling

data/lib/nydp/builtin/eval.rb

@@ -1,12 +1,8 @@
 class Nydp::Builtin::Eval
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @ns = ns
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    evaluator = Nydp::Evaluator.new Nydp::VM.new, @ns
+    evaluator = Nydp::Evaluator.new Nydp::VM.new(vm.ns), vm.ns
     vm.push_arg evaluator.evaluate args.car
   end
 end

data/lib/nydp/builtin/greater_than.rb

@@ -1,12 +1,12 @@
 class Nydp::Builtin::GreaterThan
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    vm.push_arg (greater_than(args.car, args.cdr) ? Nydp.T : Nydp.NIL)
+    vm.push_arg (greater_than(args.car, args.cdr) ? Nydp::T : Nydp::NIL)
   end
 
   def greater_than arg, args
-    return true if Nydp.NIL.is? args
+    return true if Nydp::NIL.is? args
     (arg > args.car) && greater_than(args.car, args.cdr)
   end
 

data/lib/nydp/builtin/handle_error.rb

@@ -1,7 +1,7 @@
 require "nydp/vm"
 
 class Nydp::Builtin::HandleError
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   class CatchError
     include Nydp::Helper, Nydp::VM::HandleError
@@ -36,6 +36,6 @@ class Nydp::Builtin::HandleError
     vm.instructions.push catcher_instructions
     vm.contexts.push vm.current_context
 
-    fn_tricky.invoke vm, Nydp.NIL
+    fn_tricky.invoke vm, Nydp::NIL
   end
 end

data/lib/nydp/builtin/hash.rb

@@ -1,27 +1,25 @@
 require "nydp/hash"
 
 class Nydp::Builtin::Hash
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
   def builtin_invoke vm, args
     vm.push_arg(Nydp::Hash.new)
   end
 end
 
 class Nydp::Builtin::HashGet
-  include Nydp::Helper, Nydp::Builtin::Base
-  attr_accessor :ns
-  def initialize ns ; @ns = ns; end
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
   def builtin_invoke vm, args
     hsh = args.car
     key = args.cdr.car
     case hsh
     when Nydp::Hash
-      vm.push_arg(hsh[key] || Nydp.NIL)
-    when NilClass, Nydp.NIL
-      vm.push_arg Nydp.NIL
+      vm.push_arg(hsh[key] || Nydp::NIL)
+    when NilClass, Nydp::NIL
+      vm.push_arg Nydp::NIL
     else
       v = hsh.respond_to?(:[]) ? hsh[n2r key] : ruby_call(hsh, key)
-      vm.push_arg(r2n v, ns)
+      vm.push_arg(r2n v, vm.ns)
     end
   end
 
@@ -38,7 +36,7 @@ class Nydp::Builtin::HashGet
 end
 
 class Nydp::Builtin::HashSet
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
   def builtin_invoke vm, args
     hash = args.car
     key = args.cdr.car
@@ -46,7 +44,7 @@ class Nydp::Builtin::HashSet
     case hash
     when Nydp::Hash
       hash[key] = value
-    when NilClass, Nydp.NIL
+    when NilClass, Nydp::NIL
       nil
     else
       if hash.respond_to?(:[]=)
@@ -60,25 +58,21 @@ class Nydp::Builtin::HashSet
 end
 
 class Nydp::Builtin::HashKeys
-  include Nydp::Helper, Nydp::Builtin::Base
-  attr_accessor :ns
-  def initialize ns ; @ns = ns; end
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
   def builtin_invoke vm, args
     hash = args.car
     if hash.is_a? Nydp::Hash
       vm.push_arg Nydp::Pair.from_list hash.keys
     elsif hash.respond_to?(:keys)
-      vm.push_arg r2n(hash.keys.to_a.sort, ns)
+      vm.push_arg r2n(hash.keys.to_a.sort, vm.ns)
     else
-      vm.push_arg Nydp.NIL
+      vm.push_arg Nydp::NIL
     end
   end
 end
 
 class Nydp::Builtin::HashKeyPresent
-  include Nydp::Helper, Nydp::Builtin::Base
-  attr_accessor :ns
-  def initialize ns ; @ns = ns; end
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
   def builtin_invoke vm, args
     hash = args.car
     key  = args.cdr.car
@@ -88,13 +82,13 @@ class Nydp::Builtin::HashKeyPresent
             else
               hash.key? n2r key
             end
-    vm.push_arg(truth ? Nydp.T : Nydp.NIL)
+    vm.push_arg(truth ? Nydp::T : Nydp::NIL)
   end
   def name ; "hash-key?" ; end
 end
 
 class Nydp::Builtin::HashMerge
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     hash_0 = args.car