nydp 0.1.15 → 0.2.0

data/lib/nydp/builtin/inspect.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Inspect
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg Nydp::StringAtom.new(args.car.inspect)

data/lib/nydp/builtin/is_equal.rb

@@ -1,9 +1,14 @@
 class Nydp::Builtin::IsEqual
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
-  def builtin_invoke vm, args
-    vm.push_arg ((args.car == args.cdr.car) ? Nydp.T : Nydp.NIL)
-  end
+  def builtin_invoke_1 vm      ; raise "#{name} : requires at least two args"                    ; end
+  def builtin_invoke_2 vm, arg ; raise "#{name} : requires at least two args, got one: (#{arg})" ; end
 
-  def name ; "eq?" ; end
+  def builtin_invoke_3 vm, a0, a1     ; vm.push_arg ((a0 == a1)        ? Nydp::T : Nydp::NIL) ; end
+  def builtin_invoke_4 vm, a0, a1, a2 ; vm.push_arg (eq?([a0, a1, a2]) ? Nydp::T : Nydp::NIL) ; end
+  def builtin_invoke   vm, args       ; vm.push_arg (eq?(args.to_a)    ? Nydp::T : Nydp::NIL) ; end
+
+  def _eq?  arg, args ; args.all? { |a| a == arg }   ; end
+  def eq?        args ; _eq? args.first, args[1..-1] ; end
+  def name            ; "eq?"                        ; end
 end

data/lib/nydp/builtin/less_than.rb

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

data/lib/nydp/builtin/load_tests.rb

@@ -1,12 +1,8 @@
 class Nydp::Builtin::LoadTests
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @ns = ns
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    Nydp.loadall vm, @ns, Nydp.testfiles
-    vm.push_arg Nydp.NIL
+    Nydp.loadall vm, vm.ns, Nydp.testfiles
+    vm.push_arg Nydp::NIL
   end
 end

data/lib/nydp/builtin/millisecs.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Millisecs
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg (Time.now.to_f * 1000).to_i

data/lib/nydp/builtin/minus.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Minus
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def invoke_1 vm             ; vm.push_arg 0             ; end
   def invoke_2 vm, a          ; vm.push_arg -a            ; end
@@ -11,7 +11,7 @@ class Nydp::Builtin::Minus
   end
 
   def diff args, accum
-    if Nydp.NIL.is? args
+    if Nydp::NIL.is? args
       accum
     else
       diff(args.cdr, (accum - args.car))

data/lib/nydp/builtin/modulo.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Modulo
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def invoke_3 vm, a0, a1     ; vm.push_arg(a0 % a1)      ; end
 

data/lib/nydp/builtin/parse.rb

@@ -1,15 +1,12 @@
 class Nydp::Builtin::Parse
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @parser = Nydp::Parser.new(ns)
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
+    parser = Nydp::Parser.new(vm.ns)
     tokens = Nydp::Tokeniser.new Nydp::StringReader.new args.car.to_s
     exprs  = []
     while !tokens.finished
-      expr = @parser.expression(tokens)
+      expr = parser.expression(tokens)
       exprs << expr unless expr == nil
     end
     vm.push_arg Nydp::Pair.from_list exprs

data/lib/nydp/builtin/parse_in_string.rb

@@ -1,14 +1,11 @@
 class Nydp::Builtin::ParseInString
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @parser = Nydp::Parser.new(ns)
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
+    parser = Nydp::Parser.new(vm.ns)
     parsable = args.car.to_s
     tokens = Nydp::Tokeniser.new Nydp::StringReader.new parsable
-    expr = @parser.string(tokens, "", :eof)
+    expr = parser.string(tokens, "", :eof)
     vm.push_arg expr
   rescue Exception => e
     new_msg = "parse error: #{e.message.inspect} in\n#{Nydp.indent_text parsable}"

data/lib/nydp/builtin/plus.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Plus
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke_1 vm             ; vm.push_arg 0             ; end
   def builtin_invoke_2 vm, a          ; vm.push_arg a             ; end
@@ -9,7 +9,7 @@ class Nydp::Builtin::Plus
   def builtin_invoke vm, args
     vm.push_arg case args.car
                 when Nydp::Pair
-                  sum(args, Nydp.NIL)
+                  sum(args, Nydp::NIL)
                 when String, Nydp::StringAtom
                   sum(args, Nydp::StringAtom.new(""))
                 else
@@ -18,7 +18,7 @@ class Nydp::Builtin::Plus
   end
 
   def sum args, accum
-    if Nydp.NIL.is? args
+    if Nydp::NIL.is? args
       accum
     else
       sum(args.cdr, (accum + args.car))

data/lib/nydp/builtin/pre_compile.rb

@@ -1,8 +1,8 @@
 class Nydp::Builtin::PreCompile
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    raise Nydp:Error.new("pre-compile: expects one arg, got #{args.inspect}") unless Nydp.NIL == args.cdr
+    raise Nydp:Error.new("pre-compile: expects one arg, got #{args.inspect}") unless Nydp::NIL == args.cdr
     vm.push_arg args.car
   end
 end

data/lib/nydp/builtin/puts.rb

@@ -1,8 +1,8 @@
 class Nydp::Builtin::Puts
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
-    if Nydp.NIL.is? args
+    if Nydp::NIL.is? args
       puts
     else
       s = args.map { |a| a.to_s }

data/lib/nydp/builtin/random_string.rb

@@ -1,11 +1,11 @@
 class Nydp::Builtin::RandomString
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
-  @@random_chars = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","Q","R","S","T","U","V","W","X","Y","Z","2","3","4","5","6","7","8","9"]
+  RANDOM_CHARS = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","Q","R","S","T","U","V","W","X","Y","Z","2","3","4","5","6","7","8","9"]
 
   def builtin_invoke vm, args
-    length = args.car unless Nydp.NIL.is?(args)
-    s = (0...(length || 10)).map { @@random_chars[rand(@@random_chars.size)] }.join
+    length = args.car unless Nydp::NIL.is?(args)
+    s = (0...(length || 10)).map { RANDOM_CHARS[rand(RANDOM_CHARS.size)] }.join
     vm.push_arg Nydp::StringAtom.new s
   end
 end

data/lib/nydp/builtin/sort.rb

@@ -1,6 +1,6 @@
 module Nydp
   class Builtin::Sort
-    include Builtin::Base
+    include Builtin::Base, Singleton
 
     def builtin_invoke vm, args
       vm.push_arg Pair.from_list to_array(args.car, []).sort

data/lib/nydp/builtin/sqrt.rb

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

data/lib/nydp/builtin/string_match.rb

@@ -1,22 +1,19 @@
 class Nydp::Builtin::StringMatch
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @match    = Nydp::Symbol.mk :match   , ns
-    @captures = Nydp::Symbol.mk :captures, ns
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
+    kmatch            = Nydp::Symbol.mk :match   , vm.ns
+    kcaptures         = Nydp::Symbol.mk :captures, vm.ns
     target            = args.car.to_s
     pattern           = Regexp.new(args.cdr.car.to_s)
     match             = pattern.match target
 
     if match
-      result            = Nydp::Hash.new
-      result[@match]    = Nydp::StringAtom.new match.to_s
-      result[@captures] = Nydp::Pair.from_list match.captures.map { |cap| Nydp::StringAtom.new cap.to_s }
+      result             = Nydp::Hash.new
+      result[kmatch]     = Nydp::StringAtom.new match.to_s
+      result[kcaptures]  = Nydp::Pair.from_list match.captures.map { |cap| Nydp::StringAtom.new cap.to_s }
     else
-      result            = Nydp.NIL
+      result             = Nydp::NIL
     end
 
     vm.push_arg result

data/lib/nydp/builtin/string_replace.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::StringReplace
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     to_remove = Regexp.new args.car.to_s

data/lib/nydp/builtin/string_split.rb

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

data/lib/nydp/builtin/sym.rb

@@ -1,9 +1,5 @@
 class Nydp::Builtin::Sym
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @ns = ns
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     arg = args.car
@@ -11,7 +7,7 @@ class Nydp::Builtin::Sym
           when Nydp::Symbol
             arg
           else
-            Nydp::Symbol.mk arg.to_s.to_sym, @ns
+            Nydp::Symbol.mk arg.to_s.to_sym, vm.ns
           end
     vm.push_arg val
   end

data/lib/nydp/builtin/thread_locals.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::ThreadLocals
-  include Nydp::Helper, Nydp::Builtin::Base
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     vm.push_arg vm.locals

data/lib/nydp/builtin/time.rb

@@ -0,0 +1,52 @@
+
+class Nydp::Builtin::Time
+  include Nydp::Helper, Nydp::Builtin::Base, Singleton
+
+  def builtin_invoke_1 vm
+    vm.push_arg ::Time.now
+  end
+
+  # either an offset in seconds from now, or a Date to convert to a time, or a Time to subtract and return offset in seconds from now
+  # when Numeric : return now + offset in seconds from now
+  # when Nydp::Date : convert date to time
+  # when Time : calculate and return now - Time offset in seconds
+  def builtin_invoke_2 vm, arg
+    case arg
+    when Numeric # relative time in seconds
+      vm.push_arg(Time.now + arg)
+    when Nydp::Date
+      vm.push_arg arg.to_ruby.to_time
+    when ::Time
+      vm.push_arg ::Time.now - arg
+    else
+      raise Nydp::Error.new "time : expected a number or a date or a time, got #{arg.inspect}"
+    end
+  end
+
+  # first arg is a Time
+  # if second arg is numeric, add to first arg
+  # if second arg is a Time, subtract from first arg
+  def builtin_invoke_3 vm, a0, a1
+    case a1
+    when Numeric # relative time in seconds
+      vm.push_arg(a0 + a1)
+    when ::Time
+      vm.push_arg a0 - a1
+    else
+      raise Nydp::Error.new "time : expected a number or a date, got #{a1.inspect}"
+    end
+  end
+
+  def builtin_invoke vm, args
+    # assume ruby Time constructor args y mo d h mi s ms
+    y  = args.car
+    mo = args.cdr.car
+    d  = args.cdr.cdr.car
+    h  = args.cdr.cdr.cdr.car             if args.size > 3
+    mi = args.cdr.cdr.cdr.cdr.car         if args.size > 4
+    s  = args.cdr.cdr.cdr.cdr.cdr.car     if args.size > 5
+    ms = args.cdr.cdr.cdr.cdr.cdr.cdr.car if args.size > 6
+
+    vm.push_arg(Time.new(y,mo,d,h,mi,s,ms))
+  end
+end

data/lib/nydp/builtin/times.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::Times
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   def invoke_1 vm             ; vm.push_arg 1             ; end
   def invoke_2 vm, a          ; vm.push_arg a             ; end
@@ -11,7 +11,7 @@ class Nydp::Builtin::Times
   end
 
   def multiply args, accum
-    if Nydp.NIL.is? args
+    if Nydp::NIL.is? args
       accum
     else
       multiply(args.cdr, (accum * args.car))

data/lib/nydp/builtin/to_string.rb

@@ -1,6 +1,6 @@
 module Nydp::Builtin
   class ToString
-    include Nydp::Builtin::Base
+    include Nydp::Builtin::Base, Singleton
 
     def builtin_invoke vm, args
       arg = args.car
@@ -15,7 +15,7 @@ module Nydp::Builtin
   end
 
   class StringLength
-    include Nydp::Builtin::Base
+    include Nydp::Builtin::Base, Singleton
 
     def builtin_invoke vm, args
       arg = args.car

data/lib/nydp/builtin/type_of.rb

@@ -1,9 +1,5 @@
 class Nydp::Builtin::TypeOf
-  include Nydp::Builtin::Base
-
-  def initialize ns
-    @ns = ns
-  end
+  include Nydp::Builtin::Base, Singleton
 
   def builtin_invoke vm, args
     arg = args.car
@@ -15,8 +11,8 @@ class Nydp::Builtin::TypeOf
                  "ruby/#{arg.class.name}".to_sym
                end
 
-    type = Nydp::Symbol.mk(typename, @ns)
+    type = Nydp::Symbol.mk(typename, vm.ns)
 
-    vm.push_arg(type || Nydp.NIL)
+    vm.push_arg(type || Nydp::NIL)
   end
 end

data/lib/nydp/builtin/vm_info.rb

@@ -1,5 +1,5 @@
 class Nydp::Builtin::VmInfo
-  include Nydp::Builtin::Base
+  include Nydp::Builtin::Base, Singleton
 
   VMINFO_NS    = { }
   CONTEXTS     = Nydp::Symbol.mk :contexts,     VMINFO_NS

data/lib/nydp/compiler.rb

@@ -24,11 +24,11 @@ module Nydp
     end
 
     def self.maybe_cons a, b
-      Nydp.NIL.is?(a) ? b : cons(a, b)
+      Nydp::NIL.is?(a) ? b : cons(a, b)
     end
 
     def self.compile_each expr, bindings
-      if Nydp.NIL.is?(expr)
+      if Nydp::NIL.is?(expr)
         expr
       elsif pair?(expr)
         maybe_cons compile(expr.car, bindings), compile_each(expr.cdr, bindings)

data/lib/nydp/cond.rb

@@ -8,7 +8,7 @@ module Nydp
     end
 
     def execute vm
-      truth = !Nydp.NIL.is?(vm.args.pop)
+      truth = !Nydp::NIL.is?(vm.args.pop)
       vm.instructions.push (truth ? when_true : when_false)
       vm.contexts.push vm.current_context
     end

data/lib/nydp/core.rb

@@ -21,55 +21,55 @@ module Nydp
     end
 
     def setup ns
-      Symbol.mk(:cons,  ns).assign(Nydp::Builtin::Cons.new)
-      Symbol.mk(:car,   ns).assign(Nydp::Builtin::Car.new)
-      Symbol.mk(:cdr,   ns).assign(Nydp::Builtin::Cdr.new)
-      Symbol.mk(:+,     ns).assign(Nydp::Builtin::Plus.new)
-      Symbol.mk(:-,     ns).assign(Nydp::Builtin::Minus.new)
-      Symbol.mk(:*,     ns).assign(Nydp::Builtin::Times.new)
-      Symbol.mk(:/,     ns).assign(Nydp::Builtin::Divide.new)
-      Symbol.mk(:>,     ns).assign(Nydp::Builtin::GreaterThan.new)
-      Symbol.mk(:<,     ns).assign(Nydp::Builtin::LessThan.new)
-      Symbol.mk(:mod,   ns).assign(Nydp::Builtin::Modulo.new)
-      Symbol.mk(:eval,  ns).assign(Nydp::Builtin::Eval.new(ns))
+      Symbol.mk(:cons,  ns).assign(Nydp::Builtin::Cons.instance)
+      Symbol.mk(:car,   ns).assign(Nydp::Builtin::Car.instance)
+      Symbol.mk(:cdr,   ns).assign(Nydp::Builtin::Cdr.instance)
+      Symbol.mk(:+,     ns).assign(Nydp::Builtin::Plus.instance)
+      Symbol.mk(:-,     ns).assign(Nydp::Builtin::Minus.instance)
+      Symbol.mk(:*,     ns).assign(Nydp::Builtin::Times.instance)
+      Symbol.mk(:/,     ns).assign(Nydp::Builtin::Divide.instance)
+      Symbol.mk(:>,     ns).assign(Nydp::Builtin::GreaterThan.instance)
+      Symbol.mk(:<,     ns).assign(Nydp::Builtin::LessThan.instance)
+      Symbol.mk(:mod,   ns).assign(Nydp::Builtin::Modulo.instance)
+      Symbol.mk(:eval,  ns).assign(Nydp::Builtin::Eval.instance)
       Symbol.mk(:false, ns).assign(false)
-      Symbol.mk(:hash,  ns).assign(Nydp::Builtin::Hash.new)
-      Symbol.mk(:apply, ns).assign(Nydp::Builtin::Apply.new)
-      Symbol.mk(:date,  ns).assign(Nydp::Builtin::Date.new)
-      Symbol.mk(:error, ns).assign(Nydp::Builtin::Error.new)
-      Symbol.mk(:parse, ns).assign(Nydp::Builtin::Parse.new(ns))
-      Symbol.mk(:p,     ns).assign(Nydp::Builtin::Puts.new)
-      Symbol.mk(:PI,    ns).assign Literal.new(3.1415)
-      Symbol.mk(:nil,   ns).assign Nydp.NIL
-      Symbol.mk(:sort,  ns).assign Nydp::Builtin::Sort.new
-      Symbol.mk(:sqrt,  ns).assign Nydp::Builtin::Sqrt.new
-      Symbol.mk(:t,     ns).assign Nydp.T
-      Symbol.mk(:sym,   ns).assign Nydp::Builtin::Sym.new(ns)
-      Symbol.mk(:ensuring,      ns).assign(Nydp::Builtin::Ensuring.new)
-      Symbol.mk(:inspect,       ns).assign(Nydp::Builtin::Inspect.new)
-      Symbol.mk(:comment,       ns).assign(Nydp::Builtin::Comment.new)
-      Symbol.mk(:millisecs,     ns).assign(Nydp::Builtin::Millisecs.new)
-      Symbol.mk("load-tests",   ns).assign(Nydp::Builtin::LoadTests.new(ns))
-      Symbol.mk("handle-error"   , ns).assign(Nydp::Builtin::HandleError.new)
-      Symbol.mk("parse-in-string", ns).assign(Nydp::Builtin::ParseInString.new(ns))
-      Symbol.mk("random-string"  , ns).assign(Nydp::Builtin::RandomString.new)
-      Symbol.mk("to-string"      , ns).assign(Nydp::Builtin::ToString.new)
-      Symbol.mk("string-length"  , ns).assign(Nydp::Builtin::StringLength.new)
-      Symbol.mk("string-replace" , ns).assign(Nydp::Builtin::StringReplace.new)
-      Symbol.mk("string-match"   , ns).assign(Nydp::Builtin::StringMatch.new(ns))
-      Symbol.mk("string-split"   , ns).assign(Nydp::Builtin::StringSplit.new  )
-      Symbol.mk("today"          , ns).assign(Nydp::Builtin::Today.new)
-      Symbol.mk("thread-locals"  , ns).assign(Nydp::Builtin::ThreadLocals.new)
-      Symbol.mk("type-of",      ns).assign(Nydp::Builtin::TypeOf.new(ns))
-      Symbol.mk(:"eq?",         ns).assign(Nydp::Builtin::IsEqual.new)
-      Symbol.mk(:"cdr-set",     ns).assign(Nydp::Builtin::CdrSet.new)
-      Symbol.mk(:"hash-get",    ns).assign(Nydp::Builtin::HashGet.new ns)
-      Symbol.mk(:"hash-set",    ns).assign(Nydp::Builtin::HashSet.new)
-      Symbol.mk(:"hash-keys",   ns).assign(Nydp::Builtin::HashKeys.new(ns))
-      Symbol.mk(:"hash-key?",   ns).assign(Nydp::Builtin::HashKeyPresent.new(ns))
-      Symbol.mk(:"hash-merge",  ns).assign(Nydp::Builtin::HashMerge.new)
-      Symbol.mk(:"vm-info",     ns).assign Nydp::Builtin::VmInfo.new
-      Symbol.mk(:"pre-compile", ns).assign Nydp::Builtin::PreCompile.new
+      Symbol.mk(:hash,  ns).assign(Nydp::Builtin::Hash.instance)
+      Symbol.mk(:apply, ns).assign(Nydp::Builtin::Apply.instance)
+      Symbol.mk(:date,  ns).assign(Nydp::Builtin::Date.instance)
+      Symbol.mk(:error, ns).assign(Nydp::Builtin::Error.instance)
+      Symbol.mk(:parse, ns).assign(Nydp::Builtin::Parse.instance)
+      Symbol.mk(:p,     ns).assign(Nydp::Builtin::Puts.instance)
+      Symbol.mk(:PI,    ns).assign 3.1415
+      Symbol.mk(:nil,   ns).assign Nydp::NIL
+      Symbol.mk(:sort,  ns).assign Nydp::Builtin::Sort.instance
+      Symbol.mk(:sqrt,  ns).assign Nydp::Builtin::Sqrt.instance
+      Symbol.mk(:t,     ns).assign Nydp::T
+      Symbol.mk(:sym,   ns).assign Nydp::Builtin::Sym.instance
+      Symbol.mk(:ensuring,      ns).assign(Nydp::Builtin::Ensuring.instance)
+      Symbol.mk(:inspect,       ns).assign(Nydp::Builtin::Inspect.instance)
+      Symbol.mk(:comment,       ns).assign(Nydp::Builtin::Comment.instance)
+      Symbol.mk(:millisecs,     ns).assign(Nydp::Builtin::Millisecs.instance)
+      Symbol.mk("load-tests",   ns).assign(Nydp::Builtin::LoadTests.instance)
+      Symbol.mk("handle-error"   , ns).assign(Nydp::Builtin::HandleError.instance)
+      Symbol.mk("parse-in-string", ns).assign(Nydp::Builtin::ParseInString.instance)
+      Symbol.mk("random-string"  , ns).assign(Nydp::Builtin::RandomString.instance)
+      Symbol.mk("to-string"      , ns).assign(Nydp::Builtin::ToString.instance)
+      Symbol.mk("string-length"  , ns).assign(Nydp::Builtin::StringLength.instance)
+      Symbol.mk("string-replace" , ns).assign(Nydp::Builtin::StringReplace.instance)
+      Symbol.mk("string-match"   , ns).assign(Nydp::Builtin::StringMatch.instance)
+      Symbol.mk("string-split"   , ns).assign(Nydp::Builtin::StringSplit.instance)
+      Symbol.mk("time"           , ns).assign(Nydp::Builtin::Time.instance)
+      Symbol.mk("thread-locals"  , ns).assign(Nydp::Builtin::ThreadLocals.instance)
+      Symbol.mk("type-of",      ns).assign(Nydp::Builtin::TypeOf.instance)
+      Symbol.mk(:"eq?",         ns).assign(Nydp::Builtin::IsEqual.instance)
+      Symbol.mk(:"cdr-set",     ns).assign(Nydp::Builtin::CdrSet.instance)
+      Symbol.mk(:"hash-get",    ns).assign(Nydp::Builtin::HashGet.instance)
+      Symbol.mk(:"hash-set",    ns).assign(Nydp::Builtin::HashSet.instance)
+      Symbol.mk(:"hash-keys",   ns).assign(Nydp::Builtin::HashKeys.instance)
+      Symbol.mk(:"hash-key?",   ns).assign(Nydp::Builtin::HashKeyPresent.instance)
+      Symbol.mk(:"hash-merge",  ns).assign(Nydp::Builtin::HashMerge.instance)
+      Symbol.mk(:"vm-info",     ns).assign Nydp::Builtin::VmInfo.instance
+      Symbol.mk(:"pre-compile", ns).assign Nydp::Builtin::PreCompile.instance
     end
   end
 end