nydp 0.1.15 → 0.2.0

data/lib/nydp/function_invocation.rb

@@ -33,7 +33,7 @@ module Nydp
         f = vm.args.pop
         f.invoke_1 vm
       rescue Exception => e
-        handle e, f, Nydp.NIL
+        handle e, f, Nydp::NIL
       end
     end
 

data/lib/nydp/helper.rb

@@ -3,9 +3,9 @@ module Nydp
     ::Symbol   => ->(obj, ns) { Nydp::Symbol.mk(obj, ns)                            },
     Array      => ->(obj, ns) { Nydp::Pair.from_list obj.map { |o| Nydp.r2n o, ns } },
     String     => ->(obj, ns) { Nydp::StringAtom.new obj.to_s                       },
-    NilClass   => ->(obj, ns) { Nydp.NIL                                            },
-    FalseClass => ->(obj, ns) { Nydp.NIL                                            },
-    TrueClass  => ->(obj, ns) { Nydp.T                                              },
+    NilClass   => ->(obj, ns) { Nydp::NIL                                           },
+    FalseClass => ->(obj, ns) { Nydp::NIL                                           },
+    TrueClass  => ->(obj, ns) { Nydp::T                                             },
     ::Date     => ->(obj, ns) { Nydp::Date.new obj                                  },
   }
 
@@ -38,7 +38,7 @@ module Nydp
       expr.is_a?(Nydp::Pair)
     end
 
-    def cons a, b=Nydp.NIL
+    def cons a, b=Nydp::NIL
       Nydp::Pair.new a, b
     end
 
@@ -52,7 +52,7 @@ module Nydp
 
     def literal? expr
       case expr
-      when String, Float, Integer, Fixnum, Nydp.NIL, Nydp::Symbol, Nydp::StringAtom, Nydp::Truth, Nydp::Nil
+      when String, Float, Integer, Fixnum, Nydp::Symbol, Nydp::StringAtom, Nydp::Truth, Nydp::Nil
         true
       else
         false

data/lib/nydp/interpreted_function.rb

@@ -52,7 +52,7 @@ module Nydp
       if pair? names
         context.set names.car, values.car
         setup_context context, names.cdr, values.cdr
-      elsif Nydp.NIL.isnt? names
+      elsif Nydp::NIL.isnt? names
         context.set names, values
       end
     end
@@ -72,7 +72,7 @@ module Nydp
       instructions << Nydp::Compiler.compile(body_forms.car, bindings)
 
       rest = body_forms.cdr
-      if Nydp.NIL.is? rest
+      if Nydp::NIL.is? rest
         return Pair.from_list(instructions)
       else
         instructions << PopArg
@@ -84,7 +84,7 @@ module Nydp
       if pair? arg_list
         index_parameters arg_list.car, hsh
         index_parameters arg_list.cdr, hsh
-      elsif Nydp.NIL.isnt? arg_list
+      elsif Nydp::NIL.isnt? arg_list
         hsh[arg_list] = hsh.size
       end
     end

data/lib/nydp/lexical_context.rb

@@ -20,7 +20,7 @@ class Nydp::LexicalContext
   end
 
   def at_index index
-    values[index] || Nydp.NIL
+    values[index] || Nydp::NIL
   end
 
   def set name, value
@@ -31,7 +31,7 @@ class Nydp::LexicalContext
   def set_args_1 names, arg
     if pair? names
       set names.car, arg
-    elsif Nydp.NIL.isnt? names
+    elsif Nydp::NIL.isnt? names
       set names, cons(arg)
     end
   end
@@ -40,7 +40,7 @@ class Nydp::LexicalContext
     if pair? names
       set names.car, arg_0
       set_args_1 names.cdr, arg_1
-    elsif Nydp.NIL.isnt? names
+    elsif Nydp::NIL.isnt? names
       set names, cons(arg_0, cons(arg_1))
     end
   end
@@ -49,7 +49,7 @@ class Nydp::LexicalContext
     if pair? names
       set names.car, arg_0
       set_args_2 names.cdr, arg_1, arg_2
-    elsif Nydp.NIL.isnt? names
+    elsif Nydp::NIL.isnt? names
       set names, cons(arg_0, cons(arg_1, cons(arg_2)))
     end
   end

data/lib/nydp/lexical_context_builder.rb

@@ -167,7 +167,7 @@ module Nydp::LexicalContextBuilder
       _set_args lc, @param_names, args
     end
     def _set_args lc, names, args
-      unless Nydp.NIL.is? names
+      unless Nydp::NIL.is? names
         lc.set names.car, args.car
         _set_args lc, names.cdr, args.cdr
       end
@@ -185,7 +185,7 @@ module Nydp::LexicalContextBuilder
       if pair? names
         lc.set names.car, args.car
         _set_args lc, names.cdr, args.cdr
-      elsif Nydp.NIL.isnt? names
+      elsif Nydp::NIL.isnt? names
         lc.set names, args
       end
     end

data/lib/nydp/pair.rb

@@ -27,7 +27,7 @@ class Nydp::Pair
     end
   end
 
-  def self.from_list list, last=Nydp.NIL, n=0
+  def self.from_list list, last=Nydp::NIL, n=0
     if n >= list.size
       last
     else
@@ -52,12 +52,12 @@ class Nydp::Pair
   end
 
   def proper?
-    Nydp.NIL.is?(cdr) || (cdr.is_a?(Nydp::Pair) && cdr.proper?)
+    Nydp::NIL.is?(cdr) || (cdr.is_a?(Nydp::Pair) && cdr.proper?)
   end
 
   def each &block
     yield car
-    cdr.each(&block) unless Nydp.NIL.is?(cdr)
+    cdr.each(&block) unless Nydp::NIL.is?(cdr)
   end
 
   def inspect
@@ -66,31 +66,31 @@ class Nydp::Pair
 
   def to_s
     if car.is_a?(Nydp::Symbol) && car.is?(:quote)
-      if Nydp.NIL.is? cdr.cdr
+      if Nydp::NIL.is? cdr.cdr
         "'#{cdr.car.to_s}"
       else
         "'#{cdr.to_s}"
       end
     elsif car.is_a?(Nydp::Symbol) && car.is?(:"brace-list")
-      if Nydp.NIL.is? cdr
+      if Nydp::NIL.is? cdr
         "{}"
       else
         "{ #{cdr.to_s_rest} }"
       end
     elsif car.is_a?(Nydp::Symbol) && car.is?(:quasiquote)
-      if Nydp.NIL.is? cdr.cdr
+      if Nydp::NIL.is? cdr.cdr
         "`#{cdr.car.to_s}"
       else
         "`#{cdr.to_s}"
       end
     elsif car.is_a?(Nydp::Symbol) && car.is?(:unquote)
-      if Nydp.NIL.is? cdr.cdr
+      if Nydp::NIL.is? cdr.cdr
         ",#{cdr.car.to_s}"
       else
         ",#{cdr.to_s}"
       end
     elsif car.is_a?(Nydp::Symbol) && car.is?(:"unquote-splicing")
-      if Nydp.NIL.is? cdr.cdr
+      if Nydp::NIL.is? cdr.cdr
         ",@#{cdr.car.to_s}"
       else
         ",@#{cdr.to_s}"
@@ -103,7 +103,7 @@ class Nydp::Pair
   def to_s_rest
     cdr_s = if cdr.is_a?(self.class)
               cdr.to_s_rest
-            elsif Nydp.NIL.is? cdr
+            elsif Nydp::NIL.is? cdr
               nil
             else
               ". #{cdr.to_s}"
@@ -115,7 +115,7 @@ class Nydp::Pair
   def inspect_rest
     cdr_s = if cdr.is_a?(self.class)
               cdr.inspect_rest
-            elsif cdr == Nydp.NIL
+            elsif cdr == Nydp::NIL
               nil
             else
               ". #{cdr.inspect}"
@@ -125,7 +125,7 @@ class Nydp::Pair
   end
 
   def append thing
-    if Nydp.NIL.is? self.cdr
+    if Nydp::NIL.is? self.cdr
       self.cdr = thing
     elsif pair? self.cdr
       self.cdr.append thing

data/lib/nydp/runner.rb

@@ -48,7 +48,7 @@ module Nydp
 
     def compile_and_eval expr
       begin
-        vm.thread Pair.new(Compiler.compile(expr, Nydp.NIL), Nydp.NIL)
+        vm.thread Pair.new(Compiler.compile(expr, Nydp::NIL), Nydp::NIL)
       rescue Exception => e
         new_msg = "failed to eval #{expr.inspect}\nerror was #{Nydp.indent_text e.message}"
         raise e.class, new_msg, e.backtrace
@@ -92,7 +92,7 @@ module Nydp
     end
 
     def run
-      res = Nydp.NIL
+      res = Nydp::NIL
       while !@tokens.finished
         expr = @parser.expression(@tokens)
         unless expr.nil?

data/lib/nydp/symbol.rb

@@ -21,8 +21,8 @@ class Nydp::Symbol
 
   def self.mk name, ns
     name = name.to_sym
-    return Nydp.NIL if name == :nil
-    return Nydp.T   if name == :t
+    return Nydp::NIL if name == :nil
+    return Nydp::T   if name == :t
     sym = ns[name]
     unless sym
       sym = new(name)

data/lib/nydp/symbol_lookup.rb

@@ -20,7 +20,7 @@ module Nydp
 
     def self.build name, bindings
       depth = 0
-      while Nydp.NIL.isnt? bindings
+      while Nydp::NIL.isnt? bindings
         here = bindings.car
         if here.key? name
           binding_index = here[name]

data/lib/nydp/truth.rb

@@ -1,6 +1,9 @@
+require 'singleton'
+
 module Nydp
   class Truth
-    def init_with *; Nydp.T           ; end
+    include Singleton
+    def init_with *; Nydp::T          ; end
     def to_s       ; 't'              ; end
     def inspect    ; 't[nydp::Truth]' ; end
     def assign  *_ ; self             ; end
@@ -9,7 +12,8 @@ module Nydp
   end
 
   class Nil
-    def init_with * ; Nydp.NIL      ; end
+    include Singleton
+    def init_with * ; Nydp::NIL     ; end
     def car         ; self          ; end
     def cdr         ; self          ; end
     def size        ; 0             ; end
@@ -25,13 +29,6 @@ module Nydp
     def execute vm  ; vm.push_arg self ; end
   end
 
-  @@nil = Nil.new
-  @@t   = Truth.new
-
-  class Nil
-    def self.new ; raise "no" ; end
-  end
-
-  def self.NIL; @@nil; end
-  def self.T;   @@t;   end
+  NIL = Nil.instance
+  T   = Truth.instance
 end

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.15"
+  VERSION = "0.2.0"
 end

data/lib/nydp/vm.rb

@@ -1,16 +1,17 @@
 module Nydp
   class VM
     include Helper
-    attr_accessor :instructions, :args, :contexts, :current_context, :locals, :unhandled_error
+    attr_accessor :instructions, :args, :contexts, :current_context, :locals, :unhandled_error, :ns
 
     module Finally     ; end
     module HandleError ; end
 
-    def initialize
+    def initialize ns
       @instructions = []
       @args         = []
       @contexts     = []
       @locals       = Nydp::Hash.new
+      @ns           = ns
     end
 
     def thread expr=nil
@@ -67,7 +68,7 @@ module Nydp
     def args!        ; args.empty? ? (raise "illegal operation: no args") : args ; end
     def peek_arg     ; args!.last                                                ; end
 
-    def pop_args count, tail=Nydp.NIL
+    def pop_args count, tail=Nydp::NIL
       case count
       when 0
         tail

data/spec/date_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Nydp::Date do
 
-  let(:ns) { { }           }
-  let(:vm) { Nydp::VM.new  }
+  let(:ns) { { }               }
+  let(:vm) { Nydp::VM.new(ns)  }
 
   it "converts ruby Date to Nydp::Date" do
     rd = Date.parse "2015-06-08"
@@ -16,13 +16,21 @@ describe Nydp::Date do
   end
 
   it "creates a new date" do
-    df = Nydp::Builtin::Date.new
-    df.invoke vm, pair_list([2015, 11, 18])
+    df = Nydp::Builtin::Date.instance
+    df.invoke_4 vm, 2015, 11, 18
     nd = vm.args.pop
     expect(nd).to be_a Nydp::Date
     expect(nd.ruby_date).to eq Date.parse("2015-11-18")
   end
 
+  it "returns today" do
+    df = Nydp::Builtin::Date.instance
+    df.invoke_1 vm
+    nd = vm.args.pop
+    expect(nd).to be_a Nydp::Date
+    expect(nd.ruby_date).to eq Date.today
+  end
+
   it "returns date components" do
     rd = Date.parse "2015-06-08"
     nd = Nydp.r2n rd, ns
@@ -37,7 +45,7 @@ describe Nydp::Date do
     let(:d1) { Nydp.r2n (Date.today + 6), ns }
 
     it "works with builtin minus" do
-      minus = Nydp::Builtin::Minus.new
+      minus = Nydp::Builtin::Minus.instance
 
       minus.invoke vm, pair_list([d1, d0])
       diff = vm.args.pop
@@ -48,58 +56,58 @@ describe Nydp::Date do
 
     describe "'>" do
       it "works with builtin greater-than when true" do
-        f = Nydp::Builtin::GreaterThan.new
+        f = Nydp::Builtin::GreaterThan.instance
 
         f.invoke vm, pair_list([d1, d0])
 
-        expect(vm.args.pop).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp::T
       end
 
       it "compares with nil" do
-        f = Nydp::Builtin::GreaterThan.new
+        f = Nydp::Builtin::GreaterThan.instance
 
-        f.invoke vm, pair_list([d1, Nydp.NIL])
+        f.invoke vm, pair_list([d1, Nydp::NIL])
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
 
       it "works with builtin greater-than when false" do
-        f = Nydp::Builtin::GreaterThan.new
+        f = Nydp::Builtin::GreaterThan.instance
 
         f.invoke vm, pair_list([d0, d1])
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
 
     describe "'<" do
       it "works with builtin less-than when true" do
-        f = Nydp::Builtin::LessThan.new
+        f = Nydp::Builtin::LessThan.instance
 
         f.invoke vm, pair_list([d0, d1])
 
-        expect(vm.args.pop).to eq Nydp.T
+        expect(vm.args.pop).to eq Nydp::T
       end
 
       it "works with builtin less-than when false" do
-        f = Nydp::Builtin::LessThan.new
+        f = Nydp::Builtin::LessThan.instance
 
         f.invoke vm, pair_list([d1, d0])
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
 
       it "compares with nil" do
-        f = Nydp::Builtin::LessThan.new
+        f = Nydp::Builtin::LessThan.instance
 
-        f.invoke vm, pair_list([d1, Nydp.NIL])
+        f.invoke vm, pair_list([d1, Nydp::NIL])
 
-        expect(vm.args.pop).to eq Nydp.NIL
+        expect(vm.args.pop).to eq Nydp::NIL
       end
     end
 
     it "works with builtin plus" do
-      plus = Nydp::Builtin::Plus.new
+      plus = Nydp::Builtin::Plus.instance
 
       plus.invoke vm, pair_list([d0, 5])
       sum = vm.args.pop

data/spec/error_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Nydp::VM do
   let(:ns) { { } }
-  let(:vm) { Nydp::VM.new }
+  let(:vm) { Nydp::VM.new(ns) }
 
   def run txt
     Nydp.setup ns