nydp 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 815a0a959a0678c7fc8a7e4ad5cd50fa0a5aa0fb
-  data.tar.gz: 23c872b0c3126bfc18c9859e617ba645751e38ad
+  metadata.gz: 878f0dba9573b146bf3bf438d5c8d7792f9fc1e9
+  data.tar.gz: 57c14a21f93ec56968f9f4e3bae5ee634eac9608
 SHA512:
-  metadata.gz: 2980ea82cc715d36febeaa27a008fef8e2eb507caad76a030ba46b52ddcb690b311c6313018c589790d9d49db3497fd0c044b2fe3ca284024dadd237fe5e5594
-  data.tar.gz: 3ba9d1749f05d877749af1ec35ee0a2cbdb8fa0ba818c194a8d0f3d773c674d1ea85b185a7eeea24e923781328ed4a61bcb03f38540088393d8dd9b9f9129b9c
+  metadata.gz: 2f8fa342fe36104a3d957bb3bd354b79f185948fc9779abd7c146dbe092065a29ad31cb4193ae8a8aeded94b4a4671c3075d05e9a112404dde554dbbe1887290
+  data.tar.gz: 6999b8761df3c3d19909d0341d208b08fb9793e926066838ab99329c6b87fece28dd085e56ba82970e96ebbd10a439137ce76b12f6513c853fd83f09eb7dbbff

data/lib/lisp/boot.nydp

@@ -23,7 +23,6 @@
 (assign cddr  (fn (arg) (cdr (cdr arg))))
 (assign   no  (fn (arg) (cond arg nil t)))
 (assign just  (fn (arg) arg))
-(assign pargs (fn args (apply p args) (last args)))
 
 (assign mac-expand (fn (macfn name body)
   (cond macfn
@@ -32,12 +31,6 @@
 
 (assign macs (hash))
 
-(assign debug-pre-compile
-        (fn (arg)
-            (assign *debug-pre-compile* arg)))
-
-(assign *debug-pre-compile* nil)
-
 (assign pre-compile-expr
         (fn (name body)
             (mac-expand (hash-get macs name) name body)))
@@ -51,18 +44,27 @@
                         args))))
 
 (assign pre-compile-msg
-        (fn args
-            (cond *debug-pre-compile* (apply p args))
-            (last args)))
+        (fn (src compiled)
+            (pre-compile-msg "pre-compile" src "\n  -> " compiled)
+            compiled))
+
+(assign pre-compile-raw
+        (fn (arg)
+            (cond (pair? arg)
+                  (cond (eq? (car arg) 'quote)
+                        arg
+                        (pre-compile-each (pre-compile-expr (car arg) (cdr arg))))
+                  arg)))
 
-(assign pre-compile
+(assign pre-compile-debug
         (fn (arg)
-            (pre-compile-msg "pre-compile" arg "\n  -> "
-                             (cond (pair? arg)
-                                   (cond (eq? (car arg) 'quote)
-                                         arg
-                                         (pre-compile-each (pre-compile-expr (car arg) (cdr arg))))
-                                   arg))))
+            (pre-compile-msg arg (pre-compile-raw arg))))
+
+(assign debug-pre-compile
+        (fn (arg)
+            (assign pre-compile (cond arg pre-compile-debug pre-compile-raw))))
+
+(debug-pre-compile nil)
 
 (hash-set macs 'def
           (fn (name args . body)
@@ -151,6 +153,9 @@
                        `(cond ,(car args) ,(cadr args)))
                  (car args))))
 
+(mac unless (arg . body)
+  `(if (no ,arg) (do ,@body)))
+
 (def expand-colon-syntax (first rest)
      (if (no rest)
          `(apply ,first args)
@@ -351,7 +356,7 @@
 (def dot-syntax-assignment (names value-expr)
   (let rnames (rev names)
     `(hash-set ,(build-hash-getters (rev (cdr rnames)) nil)
-               ',(car rnames)
+               ,(build-hash-get-key:car rnames)
                ,value-expr)))
 
 (mac = (name value)

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

@@ -31,6 +31,31 @@
 
 (register-test
  '(suite "Boot Tests"
+         (suite "conditionals"
+               ("single-expr 'if is just the expr"
+                (pre-compile '(if a))
+                a)
+
+               ("two-expr 'if expands to 'cond"
+                (pre-compile '(if a b))
+                (cond a b))
+
+               ("three-expr 'if expands to 'cond"
+                (pre-compile '(if a b c))
+                (cond a b c))
+
+               ("four-expr 'if expands to nested 'cond"
+                (pre-compile '(if a b c d))
+                (cond a b (cond c d)))
+
+               ("five-expr 'if expands to nested 'cond"
+                (pre-compile '(if a b c d e))
+                (cond a b (cond c d e)))
+
+               ("'unless expands to 'if"
+                (pre-compile '(unless x y z))
+                (cond (no x) ((fn () y z)))))
+
          (suite "hashtables"
                 ("build a hash table from brace-list syntax"
                  (let hsh { foo 1 bar 2 }
@@ -111,7 +136,8 @@
                 (suite "mapx"
                   ("provides a convenient simplification for 'map"
                     (mapx '(1 2 3 4) n (* n 2))
-                    (2 4 6 8)))
+                    (2 4 6 8))))
+
 
          (suite "pre-compile"
                 (suite "bang-syntax"

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

@@ -88,6 +88,10 @@
      (pre-compile '(= a.b 42))
      (hash-set a 'b 42))
 
+    ("hash assignment with unquote"
+     (pre-compile '(= a.,b 42))
+     (hash-set a b 42))
+
     ("recursive hash assignment"
      (pre-compile '(= a.b.c.d 42))
      (hash-set (hash-get (hash-get a 'b) 'c) 'd 42))

data/lib/nydp.rb

@@ -24,12 +24,16 @@ module Nydp
   end
 
   def self.apply_function ns, function_name, *args
-    function = Nydp::Symbol.mk(function_name, ns).value
-    args     = Nydp::Pair.from_list args
+    function = r2n(function_name.to_sym, ns).value
+    args     = r2n args, ns
     vm       = VM.new
 
     function.invoke vm, args
-    return vm.pop_arg
+    vm.thread
+  end
+
+  def self.eval_src ns, src_txt
+    Nydp::Runner.new(VM.new, ns, Nydp::StringReader.new(src_txt)).run
   end
 
   def self.repl

data/lib/nydp/builtin/error.rb

@@ -1,6 +1,5 @@
 class Nydp::Builtin::Error
   def invoke vm, args
-    s = args.map { |a| a.to_s }
-    raise Nydp::Error.new("#{args.inspect}\n\n#{vm.error}")
+    raise Nydp::Error.new(args.inspect)
   end
 end

data/lib/nydp/date.rb

@@ -17,6 +17,7 @@ module Nydp
     end
 
     def to_s      ; ruby_date.to_s    ; end
+    def to_ruby   ; ruby_date         ; end
     def inspect   ; ruby_date.inspect ; end
     def nydp_type ; :date             ; end
 

data/lib/nydp/interpreted_function.rb

@@ -73,7 +73,7 @@ module Nydp
 
     def inspect; to_s; end
     def to_s
-      "(fn #{arg_names.to_s} #{body.map { |b| b.inspect}.join(' ')})"
+      "(fn #{arg_names.inspect} #{body.map { |b| b.inspect}.join(' ')})"
     end
   end
 end

data/lib/nydp/runner.rb

@@ -47,14 +47,12 @@ module Nydp
     end
 
     def compile_and_eval expr
-      result = vm.thread Pair.new(Compiler.compile(expr, Nydp.NIL), Nydp.NIL)
-      e = vm.unhandled_error
-      vm.unhandled_error = nil
-      if e
+      begin
+        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
       end
-      result
     end
 
     def quote expr
@@ -86,6 +84,13 @@ module Nydp
       @printer.puts val.inspect if @printer
     end
 
+    def handle_run_error e
+      puts e.message
+      e.backtrace.each do |b|
+        puts b
+      end
+    end
+
     def run
       res = Nydp.NIL
       while !@tokens.finished
@@ -94,14 +99,17 @@ module Nydp
           begin
             print(res = evaluate(expr))
           rescue Exception => e
-            puts e.message
-            e.backtrace.each do |b|
-              puts b
-            end
+            handle_run_error e
           end
         end
       end
       res
     end
   end
+
+  class ExplodeRunner < Runner
+    def handle_run_error e
+      raise e
+    end
+  end
 end

data/lib/nydp/symbol.rb

@@ -21,7 +21,6 @@ class Nydp::Symbol
     @value || Nydp.NIL
   end
 
-
   def self.mk name, ns
     name = name.to_sym
     return Nydp.NIL if name == :nil

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/nydp/vm.rb

@@ -10,11 +10,11 @@ module Nydp
       @instructions = []
       @args         = []
       @contexts     = []
-      @locals       = { }
+      @locals       = Nydp::Hash.new
     end
 
-    def thread expr
-      instructions.push expr
+    def thread expr=nil
+      instructions.push expr if expr
       while instructions.length > 0
         begin
           self.current_context = contexts.last
@@ -26,6 +26,7 @@ module Nydp
           handle_error e
         end
       end
+      raise unhandled_error if unhandled_error
       pop_arg
     end
 
@@ -50,11 +51,12 @@ module Nydp
       end
     end
 
-    def peek_context;  current_context;      end
-    def pop_context;   contexts.pop;         end
-    def push_arg a;    args.push a;          end
-    def peek_arg;      args.last;            end
-    def pop_arg;       args.pop;             end
+    def peek_context ; current_context                                           ; end
+    def pop_context  ; contexts.pop                                              ; end
+    def push_arg a   ; args.push a                                               ; end
+    def args!        ; args.empty? ? (raise "illegal operation: no args") : args ; end
+    def peek_arg     ; args!.last                                                ; end
+    def pop_arg      ; args!.pop                                                 ; end
 
     def push_instructions ii, ctx
       instructions.push ii

data/spec/date_spec.rb

@@ -11,6 +11,7 @@ describe Nydp::Date do
     expect(nd).        to be_a Nydp::Date
     expect(nd.to_s).   to eq "2015-06-08"
     expect(nd.inspect).to eq "#<Date: 2015-06-08 ((2457182j,0s,0n),+0s,2299161j)>"
+    expect(nd.to_ruby).to eq Date.parse("2015-06-08")
   end
 
   it "returns date components" do

data/spec/error_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Nydp::VM do
+  let(:ns) { { } }
+  let(:vm) { Nydp::VM.new }
+
+  def run txt
+    Nydp.setup ns
+    Nydp::ExplodeRunner.new(vm, ns, Nydp::StringReader.new(txt)).run
+  end
+
+  describe "unhandled_error" do
+    it "raises a helpful error" do
+      proc = Proc.new { run "dflkjdgjeirgjeoi" }
+      msg  = "failed to eval dflkjdgjeirgjeoi\nerror was   unbound symbol: dflkjdgjeirgjeoi"
+      expect(proc).to raise_error RuntimeError, msg
+    end
+  end
+end

data/spec/nydp_spec.rb

@@ -6,7 +6,7 @@ describe Nydp do
 
   def run txt
     Nydp.setup ns
-    Nydp::Runner.new(vm, ns, Nydp::StringReader.new(txt)).run
+    Nydp.eval_src ns, txt
   end
 
   it "should make a symbol from a string" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - nydp.gemspec
 - spec/date_spec.rb
 - spec/embedded_spec.rb
+- spec/error_spec.rb
 - spec/hash_spec.rb
 - spec/literal_spec.rb
 - spec/nydp_spec.rb
@@ -197,6 +198,7 @@ summary: A civilised yet somewhat dangerous kind of Lisp for a new generation
 test_files:
 - spec/date_spec.rb
 - spec/embedded_spec.rb
+- spec/error_spec.rb
 - spec/hash_spec.rb
 - spec/literal_spec.rb
 - spec/nydp_spec.rb