nydp 0.0.6 → 0.0.7

data/lib/nydp/parser.rb

@@ -39,6 +39,17 @@ module Nydp
       return Pair.from_list [pfx] + syms.map { |s| parse_symbol s }
     end
 
+    SYMBOL_OPERATORS =
+      [
+        [ /\!/,     "bang-syntax"       ],
+        [ /\./,     "dot-syntax"        ],
+        [ /\$/,     "dollar-syntax"     ],
+        [ /::/,     "colon-colon-syntax"],
+        [ /:/,      "colon-syntax"      ],
+        [ /->/,     "arrow-syntax"      ],
+        [ /[=][>]/, "rocket-syntax"     ],
+      ]
+
     def parse_symbol txt
       txt = txt.to_s
       case txt
@@ -46,31 +57,21 @@ module Nydp
         txt.to_f
       when /^[-+]?[0-9]+$/
         txt.to_i
-      when /^'(.+)$/
+      when /^'(.*)$/
         Pair.from_list [sym(:quote), parse_symbol($1)]
-      when /^`(.+)$/
+      when /^`(.*)$/
         Pair.from_list [sym(:quasiquote), parse_symbol($1)]
-      when /^,@(.+)$/
+      when /^,@(.*)$/
         Pair.from_list [sym(:"unquote-splicing"), parse_symbol($1)]
-      when /^,(.+)$/
+      when /^,(.*)$/
         Pair.from_list [sym(:unquote), parse_symbol($1)]
       when /^\.$/
         sym txt
       else
-        syms = txt.split /\./, -1
-        return split_sym syms, sym("dot-syntax") if syms.length > 1
-
-        syms = txt.split /::/, -1
-        return split_sym syms, sym("colon-colon-syntax") if syms.length > 1
-
-        syms = txt.split /:/, -1
-        return split_sym syms, sym("colon-syntax") if syms.length > 1
-
-        syms = txt.split /->/, -1
-        return split_sym syms, sym("arrow-syntax") if syms.length > 1
-
-        syms = txt.split(/=>/, -1)
-        return split_sym syms, sym("rocket-syntax") if syms.length > 1
+        SYMBOL_OPERATORS.each do |rgx, name|
+          syms = txt.split(rgx, -1)
+          return split_sym syms, sym(name) if syms.length > 1
+        end
 
         sym txt
       end

data/lib/nydp/runner.rb

@@ -47,9 +47,14 @@ module Nydp
     end
 
     def compile_and_eval expr
-      vm.thread Pair.new(Compiler.compile(expr, Nydp.NIL), Nydp.NIL)
-    rescue Exception => e
-      raise "failed to eval #{expr.inspect},\nerror was #{e.message}\nvm state is #{vm.error}"
+      result = vm.thread Pair.new(Compiler.compile(expr, Nydp.NIL), Nydp.NIL)
+      e = vm.unhandled_error
+      vm.unhandled_error = nil
+      if 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
@@ -78,7 +83,7 @@ module Nydp
     end
 
     def print val
-      @printer.puts val if @printer
+      @printer.puts val.inspect if @printer
     end
 
     def run

data/lib/nydp/string_atom.rb

@@ -5,13 +5,12 @@ module Nydp
       @string, @token = string, token
     end
 
-    def nydp_type ; :string ; end
-    def to_s      ;  string ; end
-    def to_ruby   ;  string ; end
-
-    def inspect
-      string.inspect
-    end
+    def nydp_type  ; :string        ; end
+    def to_s       ;  string        ; end
+    def to_ruby    ;  string        ; end
+    def eql? other ; self == other  ; end
+    def inspect    ; string.inspect ; end
+    def hash       ; string.hash    ; end
 
     def == other
       other.to_s == self.to_s

data/lib/nydp/symbol_lookup.rb

@@ -23,7 +23,8 @@ module Nydp
       while Nydp.NIL.isnt? bindings
         here = bindings.car
         if here.key? name
-          return new ContextSymbol.new(depth, name)
+          binding_index = here[name]
+          return new ContextSymbol.new(depth, name, binding_index)
         else
           depth += 1
           bindings = bindings.cdr

data/lib/nydp/tokeniser.rb

@@ -74,11 +74,17 @@ module Nydp
           tok = [:left_brace, list_prefix[0...-1]]
         elsif s.scan(/\)/)
           tok = [:right_paren]
+        elsif s.scan(/\}/)
+          tok = [:right_brace]
         elsif number = s.scan(/[-+]?[0-9]*\.[0-9]+([eE][-+]?[0-9]+)?/)
           tok = [:number, number.to_f]
         elsif integer = s.scan(/[-+]?[0-9]+/)
           tok = [:number, integer.to_i]
-        elsif atom = s.scan(/[^\s()"{}]+/)
+        elsif atom = s.scan(/[^\s()"{}\|]+\|/)
+          atom = atom[0...-1]
+          rest = next_string_fragment("|", /\|/, nil) || Nydp::StringFragmentToken.new("", "")
+          tok = [:symbol, "#{atom}#{rest.string}"]
+        elsif atom = s.scan(/[^\s()"{}\|]+/)
           tok = [:symbol, atom]
         else
           s.getch

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/nydp/vm.rb

@@ -1,7 +1,10 @@
 module Nydp
   class VM
     include Helper
-    attr_accessor :instructions, :args, :contexts, :current_context, :locals
+    attr_accessor :instructions, :args, :contexts, :current_context, :locals, :unhandled_error
+
+    module Finally     ; end
+    module HandleError ; end
 
     def initialize
       @instructions = []
@@ -13,15 +16,40 @@ module Nydp
     def thread expr
       instructions.push expr
       while instructions.length > 0
-        self.current_context = contexts.last
-        ii = instructions.pop
-        i = ii.car
-        ii.cdr.repush instructions, contexts
-        i.execute(self)
+        begin
+          self.current_context = contexts.last
+          ii = instructions.pop
+          i = ii.car
+          ii.cdr.repush instructions, contexts
+          i.execute(self)
+        rescue Exception => e
+          handle_error e
+        end
       end
       pop_arg
     end
 
+    def handle_error ex
+      @unhandled_error = ex
+
+      protecti = []
+      protectc = []
+
+      while (instructions.length > 0) && !(instructions.last.car.is_a? HandleError)
+        if instructions.last.car.is_a? Finally
+          protecti << instructions.last
+          protectc << contexts.last
+        end
+
+        instructions.pop
+        contexts.pop
+      end
+
+      while protecti.length > 0
+        push_instructions protecti.pop, protectc.pop
+      end
+    end
+
     def peek_context;  current_context;      end
     def pop_context;   contexts.pop;         end
     def push_arg a;    args.push a;          end
@@ -42,7 +70,7 @@ module Nydp
       end
     end
 
-    def error
+    def vm_info
       msg = ""
       msg << "\n"
       msg << "\ninstruction stack"
@@ -59,11 +87,6 @@ module Nydp
       end
       msg << "\n"
       msg << "\n"
-
-      instructions = []
-      contexts     = []
-      args = [Nydp.NIL]
-
       msg
     end
   end

data/nydp.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Nydp::VERSION
   spec.authors       = ["Conan Dalton"]
   spec.email         = ["conan@conandalton.net"]
-  spec.description   = %q{Not Your Daddy's Parentheses}
-  spec.summary       = %q{A new lisp for a new age}
+  spec.description   = %q{ NYDP : Not Your Daddy's Parentheses (a kind of Lisp)                 }
+  spec.summary       = %q{ A civilised yet somewhat dangerous kind of Lisp for a new generation }
   spec.homepage      = "http://github.com/conanite/nydp"
   spec.license       = "MIT"
 

data/spec/parser_spec.rb

@@ -56,6 +56,16 @@ describe Nydp::Parser do
     expect(parse "(|foo bar| || |\" hello, there, silly billy!\"|)").to eq pair_list([s0, s1, s2])
   end
 
+  it "should parse untidy symbols with special syntax" do
+    quote_foo_bar = parse "'|foo bar|"
+    expect(quote_foo_bar).to eq pair_list([quote, sym("foo bar")])
+  end
+
+  it "should parse empty symbol with special syntax" do
+    quote_empty = parse "'||"
+    expect(quote_empty).to eq pair_list([quote, sym("")])
+  end
+
   it "should parse numbers expression" do
     expect(parse "(1 2 3)").to eq pair_list([1, 2, 3])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Not Your Daddy's Parentheses
+description: " NYDP : Not Your Daddy's Parentheses (a kind of Lisp)                 "
 email:
 - conan@conandalton.net
 executables:
@@ -75,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -83,11 +84,14 @@ files:
 - Rakefile
 - bin/nydp
 - bin/nydp-tests
+- lib/lisp/bm.nydp
 - lib/lisp/boot.nydp
 - lib/lisp/test-runner.nydp
 - lib/lisp/tests/boot-tests.nydp
 - lib/lisp/tests/dynamic-scope-test.nydp
+- lib/lisp/tests/error-tests.nydp
 - lib/lisp/tests/foundation-test.nydp
+- lib/lisp/tests/parser-tests.nydp
 - lib/nydp.rb
 - lib/nydp/assignment.rb
 - lib/nydp/builtin.rb
@@ -102,6 +106,7 @@ files:
 - lib/nydp/builtin/error.rb
 - lib/nydp/builtin/eval.rb
 - lib/nydp/builtin/greater_than.rb
+- lib/nydp/builtin/handle_error.rb
 - lib/nydp/builtin/hash.rb
 - lib/nydp/builtin/inspect.rb
 - lib/nydp/builtin/is_equal.rb
@@ -110,11 +115,13 @@ files:
 - lib/nydp/builtin/millisecs.rb
 - lib/nydp/builtin/minus.rb
 - lib/nydp/builtin/parse.rb
+- lib/nydp/builtin/parse_in_string.rb
 - lib/nydp/builtin/plus.rb
 - lib/nydp/builtin/pre_compile.rb
 - lib/nydp/builtin/puts.rb
 - lib/nydp/builtin/quit.rb
 - lib/nydp/builtin/random_string.rb
+- lib/nydp/builtin/sqrt.rb
 - lib/nydp/builtin/string_replace.rb
 - lib/nydp/builtin/string_split.rb
 - lib/nydp/builtin/thread_locals.rb
@@ -183,7 +190,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A new lisp for a new age
+summary: A civilised yet somewhat dangerous kind of Lisp for a new generation
 test_files:
 - spec/embedded_spec.rb
 - spec/hash_spec.rb