nydp 0.0.10.1 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb185874a9dc692fc52b40620ef19385b49d644
-  data.tar.gz: 6e63e8ffcf047ee20894abde0b0bb9ed497ba6ca
+  metadata.gz: 6cb7040e607f04ac084dcf352dfe736d7c800d0b
+  data.tar.gz: 6c157638bebfa82f3b027ed38aa12dd1452b8396
 SHA512:
-  metadata.gz: a80c411a9b87d57de98530cb1729b4b10e9b406b09ca6a21a1fb7d0b40afa5323e9a2b545aa202faab76332b3eff0c32297677c3816f26a46e4715ef419ca1db
-  data.tar.gz: ddc4305e8078bfb08e78b1b9c8891788d5501a3c085ba03a970ca6d59408deea2c6984f04d8d6579daa9e44596da1001dceee45af95f03d3b0a4c5a9e2b1e21f
+  metadata.gz: 231c62ab18da966168e4f1320f36bf9c1df91d9597cb4d68fee07bfac9b3e8ea8092ae9b1161a747483bc1711edfaa3985edcd1eeec2b7f59cc49825e63b8642
+  data.tar.gz: 96ab3742b6e55da13118b92ad3837517f7710e7fad80708361ca1f5909c0be726ec58ad8a57f48eef5a49610530a865bd325dc19cb860410665bda145da97cfd

data/README.md

@@ -125,6 +125,27 @@ nydp > (pre-compile '(!eq? a b))
 ==> ((fn args (no (apply eq? args))) a b) ; equivalent to (no (eq? a b))
 ```
 
+Ampersand-syntax - for example `&foo`, expands to a function which performs a hash-lookup on its argument.
+
+```lisp
+
+nydp > (parse "&foo")
+((ampersand-syntax || foo))
+
+nydp > (pre-compile (parse "&foo"))
+((fn (obj) (hash-get obj (quote foo))))
+
+nydp > (assign hsh { foo 1 bar 2 })
+nydp > (&lastname (car german-composers))
+Bach
+
+nydp > (map &lastname german-composers)   ; ampersand-syntax creates a function you can pass around
+(Bach Beethoven Wagner Mozart)
+
+```
+
+As with all other syntax, you can of course override the `ampersand-syntax` macro to handle your special needs.
+
 Look for `SYMBOL_OPERATORS` in [parser.rb](lib/nydp/parser.rb) to see which syntax is recognised and in which order. The order of these definitions defines special-syntax-operator precedence.
 
 #### 3. Special list syntax

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

@@ -120,3 +120,5 @@
 
 (mac mapx (things x expr)
   `(map (fn (,x) ,expr) ,things))
+
+(def empty? (things) (eq? (len things) 0))

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

@@ -0,0 +1,40 @@
+(register-test '(suite "Builtin Tests"
+  ("car"             (inspect car             ) "builtin/car"             )
+  ("cdr"             (inspect cdr             ) "builtin/cdr"             )
+  ("cdr-set"         (inspect cdr-set         ) "builtin/cdr-set"         )
+  ("cons"            (inspect cons            ) "builtin/cons"            )
+  ("+"               (inspect +               ) "builtin/+"               )
+  ("-"               (inspect -               ) "builtin/-"               )
+  ("*"               (inspect *               ) "builtin/*"               )
+  ("/"               (inspect /               ) "builtin//"               )
+  (">"               (inspect >               ) "builtin/>"               )
+  ("<"               (inspect <               ) "builtin/<"               )
+  ("eval"            (inspect eval            ) "builtin/eval"            )
+  ("hash"            (inspect hash            ) "builtin/hash"            )
+  ("error"           (inspect error           ) "builtin/error"           )
+  ("apply"           (inspect apply           ) "builtin/apply"           )
+  ("error"           (inspect error           ) "builtin/error"           )
+  ("parse"           (inspect parse           ) "builtin/parse"           )
+  ("p"               (inspect p               ) "builtin/p"               )
+  ("sqrt"            (inspect sqrt            ) "builtin/sqrt"            )
+  ("sym"             (inspect sym             ) "builtin/sym"             )
+  ("ensuring"        (inspect ensuring        ) "builtin/ensuring"        )
+  ("inspect"         (inspect inspect         ) "builtin/inspect"         )
+  ("comment"         (inspect comment         ) "builtin/comment"         )
+  ("millisecs"       (inspect millisecs       ) "builtin/millisecs"       )
+  ("load-tests"      (inspect load-tests      ) "builtin/load-tests"      )
+  ("handle-error"    (inspect handle-error    ) "builtin/handle-error"    )
+  ("parse-in-string" (inspect parse-in-string ) "builtin/parse-in-string" )
+  ("random-string"   (inspect random-string   ) "builtin/random-string"   )
+  ("to-string"       (inspect to-string       ) "builtin/to-string"       )
+  ("string-length"   (inspect string-length   ) "builtin/string-length"   )
+  ("string-replace"  (inspect string-replace  ) "builtin/string-replace"  )
+  ("string-split"    (inspect string-split    ) "builtin/string-split"    )
+  ("thread-locals"   (inspect thread-locals   ) "builtin/thread-locals"   )
+  ("eq?"             (inspect eq?             ) "builtin/eq?"             )
+  ("hash-get"        (inspect hash-get        ) "builtin/hash-get"        )
+  ("hash-set"        (inspect hash-set        ) "builtin/hash-set"        )
+  ("hash-keys"       (inspect hash-keys       ) "builtin/hash-keys"       )
+  ("hash-merge"      (inspect hash-merge      ) "builtin/hash-merge"      )
+  ("vm-info"         (inspect vm-info         ) "builtin/vm-info"         )
+))

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

@@ -15,11 +15,36 @@
         (string-replace "and" "or" "a and b and c and d")
         "a or b or c or d"))
 
+    (suite "regexp"
+      ("replace with regexp"
+       (string-replace "and|or" "x" "a and b or c and d")
+       "a x b x c x d")
+
+      ("match with regexp"
+       (let m (string-match "a and b and c and d" "and")
+         (list m.match m.captures))
+       ("and" nil))
+
+      ("match with regexp and capturing groups"
+       (let m (string-match "  foo\b    bar" "(^\\s+)")
+         (list m.match m.captures))
+       ("  " ("  ")))
+      )
+
+
     (suite "type-of"
       ("returns 'string"
         (type-of "foobar")
         string)
 
+      ("returns 'hash for new hash"
+        (type-of (hash))
+        hash)
+
+      ("returns 'hash for hash literal"
+        (type-of { a 1 b 2})
+        hash)
+
       ("returns 'number for an integer"
         (type-of 42)
         number)

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

@@ -54,6 +54,10 @@
       (parse-in-string (joinstr "" (list "hello, " '~ "(world), take me to your " '~ "dealer please")))
       (string-pieces "hello, " (world) ", take me to your " dealer " please"))
 
+    ("parses a plain string of html text with interpolations"
+      (parse-in-string "<div id='content_item_~~{id}'><label>~~{data-name-1}</label> ~~{data-text-1}</div>")
+      (string-pieces "<div id='content_item_" (brace-list id) "'><label>" (brace-list data-name-1) "</label> " (brace-list data-text-1) "</div>"))
+
     ("ignores standalone interpolation symbol"
       (parse-in-string (joinstr "" (list "hello " '~ " world")))
       "hello \~ world")

data/lib/nydp/builtin.rb

@@ -5,14 +5,23 @@ module Nydp::Builtin
   module Base
     def invoke vm, args
       builtin_invoke vm, args
+    rescue Nydp::Error => ne
+      raise ne
     rescue Exception => e
-      new_msg = "Invoking #{self.class.name}\nwith args #{args}\nraised\n#{Nydp.indent_text e.message}"
+      new_msg = "Called #{self.inspect}\nwith args #{args.inspect}\nraised\n#{Nydp.indent_text e.message}"
       raise $!, new_msg, $!.backtrace
     end
-  end
 
-  def inspect ; self.class.name ; end
-  def to_s    ; self.class.name ; end
+    def name
+      cname = self.class.name.split("::").last
+      cname = cname.gsub(/([a-z])([A-Z])/) { |m| "#{m[0]}-#{m[1].downcase}" }
+      cname = cname.gsub(/^([A-Z])/) { |m|  m.downcase }
+      cname
+    end
+
+    def inspect ; "builtin/#{name}" ; end
+    def to_s    ; name              ; end
+  end
 end
 
 Dir[File.join(File.dirname(__FILE__), "builtin", "**/*.rb")].each {|f|

data/lib/nydp/builtin/apply.rb

@@ -1,7 +1,7 @@
 class Nydp::Builtin::Apply
-  include Nydp::Helper
+  include Nydp::Helper, Nydp::Builtin::Base
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     args.car.invoke vm, apply_args(args.cdr)
   end
 

data/lib/nydp/builtin/car.rb

@@ -1,8 +1,7 @@
 class Nydp::Builtin::Car
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg args.car.car
   end
-
-  def to_s; "car"; end
-  def inspect; "builtin:car"; end
 end

data/lib/nydp/builtin/cdr.rb

@@ -1,8 +1,7 @@
 class Nydp::Builtin::Cdr
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg args.car.cdr
   end
-
-  def to_s; "cdr"; end
-  def inspect; "builtin:cdr"; end
 end

data/lib/nydp/builtin/cdr_set.rb

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

data/lib/nydp/builtin/comment.rb

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

data/lib/nydp/builtin/cons.rb

@@ -1,13 +1,16 @@
 module Nydp::Builtin
   class Cons
-    def invoke vm, args
+    include Nydp::Builtin::Base
+
+    def builtin_invoke vm, args
       vm.push_arg Nydp::Pair.new(args.car, args.cdr.car)
     end
   end
 
   class IsPair
-    include Nydp::Helper
-    def invoke vm, args
+    include Nydp::Helper, Nydp::Builtin::Base
+
+    def builtin_invoke vm, args
       arg = args.car
       result = pair?(arg) ? Nydp.T : Nydp.NIL
       vm.push_arg result

data/lib/nydp/builtin/divide.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::Divide
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg divide(args.cdr, args.car)
   end
 
@@ -10,4 +12,6 @@ class Nydp::Builtin::Divide
       divide(args.cdr, (accum / args.car))
     end
   end
+
+  def name ; "/" ; end
 end

data/lib/nydp/builtin/ensuring.rb

@@ -1,7 +1,7 @@
 require "nydp/vm"
 
 class Nydp::Builtin::Ensuring
-  include Nydp::Helper
+  include Nydp::Helper, Nydp::Builtin::Base
 
   class InvokeProtection
     include Nydp::VM::Finally
@@ -16,7 +16,7 @@ class Nydp::Builtin::Ensuring
     end
   end
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     fn_ensure = args.car
     fn_tricky = args.cdr.car
 

data/lib/nydp/builtin/error.rb

@@ -1,5 +1,9 @@
 class Nydp::Builtin::Error
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  # override #invoke on nydp/builtin/base because
+  # we don't want to inherit error handling
+  def builtin_invoke vm, args
     raise Nydp::Error.new(args.inspect)
   end
 end

data/lib/nydp/builtin/eval.rb

@@ -1,18 +1,12 @@
 class Nydp::Builtin::Eval
+  include Nydp::Builtin::Base
+
   def initialize ns
     @ns = ns
   end
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     evaluator = Nydp::Evaluator.new Nydp::VM.new, @ns
     vm.push_arg evaluator.evaluate args.car
   end
-
-  def to_s
-    "eval"
-  end
-
-  def inspect
-    "Nydp::Builtin::Eval"
-  end
 end

data/lib/nydp/builtin/greater_than.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::GreaterThan
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg (greater_than(args.car, args.cdr) ? Nydp.T : Nydp.NIL)
   end
 
@@ -7,4 +9,6 @@ class Nydp::Builtin::GreaterThan
     return true if Nydp.NIL.is? args
     (arg > args.car) && greater_than(args.car, args.cdr)
   end
+
+  def name ; ">" ; end
 end

data/lib/nydp/builtin/handle_error.rb

@@ -1,7 +1,7 @@
 require "nydp/vm"
 
 class Nydp::Builtin::HandleError
-  include Nydp::Helper
+  include Nydp::Helper, Nydp::Builtin::Base
 
   class CatchError
     include Nydp::Helper, Nydp::VM::HandleError
@@ -27,7 +27,8 @@ class Nydp::Builtin::HandleError
     end
   end
 
-  def invoke vm, args
+
+  def builtin_invoke vm, args
     fn_handle = args.car
     fn_tricky = args.cdr.car
 

data/lib/nydp/builtin/inspect.rb

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

data/lib/nydp/builtin/is_equal.rb

@@ -1,5 +1,9 @@
 class Nydp::Builtin::IsEqual
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg ((args.car == args.cdr.car) ? Nydp.T : Nydp.NIL)
   end
+
+  def name ; "eq?" ; end
 end

data/lib/nydp/builtin/less_than.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::LessThan
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg (less_than(args.car, args.cdr) ? Nydp.T : Nydp.NIL)
   end
 
@@ -7,4 +9,6 @@ class Nydp::Builtin::LessThan
     return true if Nydp.NIL.is? args
     (arg < args.car) && less_than(args.car, args.cdr)
   end
+
+  def name ; "<" ; end
 end

data/lib/nydp/builtin/load_tests.rb

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

data/lib/nydp/builtin/millisecs.rb

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

data/lib/nydp/builtin/minus.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::Minus
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg diff(args.cdr, args.car)
   end
 
@@ -10,4 +12,6 @@ class Nydp::Builtin::Minus
       diff(args.cdr, (accum - args.car))
     end
   end
+
+  def name ; "-" ; end
 end

data/lib/nydp/builtin/parse.rb

@@ -1,9 +1,11 @@
 class Nydp::Builtin::Parse
+  include Nydp::Builtin::Base
+
   def initialize ns
     @parser = Nydp::Parser.new(ns)
   end
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     tokens = Nydp::Tokeniser.new Nydp::StringReader.new args.car.to_s
     exprs  = []
     while !tokens.finished

data/lib/nydp/builtin/parse_in_string.rb

@@ -1,9 +1,11 @@
 class Nydp::Builtin::ParseInString
+  include Nydp::Builtin::Base
+
   def initialize ns
     @parser = Nydp::Parser.new(ns)
   end
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     tokens = Nydp::Tokeniser.new Nydp::StringReader.new args.car.to_s
     expr = @parser.string(tokens, "", :eof)
     vm.push_arg expr

data/lib/nydp/builtin/plus.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::Plus
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg sum(args, origin(args.car))
   end
 
@@ -22,7 +24,5 @@ class Nydp::Builtin::Plus
     end
   end
 
-  def to_s
-    "Builtin:+"
-  end
+  def name ; "+" ; end
 end

data/lib/nydp/builtin/pre_compile.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::PreCompile
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg args.car
   end
 end

data/lib/nydp/builtin/puts.rb

@@ -1,7 +1,11 @@
 class Nydp::Builtin::Puts
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     s = args.map { |a| a.to_s }
     puts s.join ' '
     vm.push_arg args.car
   end
+
+  def name ; "p" ; end
 end

data/lib/nydp/builtin/quit.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::Quit
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     exit
   end
 end

data/lib/nydp/builtin/random_string.rb

@@ -1,7 +1,9 @@
 class Nydp::Builtin::RandomString
+  include Nydp::Builtin::Base
+
   @@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 invoke vm, args
+  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
     vm.push_arg Nydp::StringAtom.new s

data/lib/nydp/builtin/sqrt.rb

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

data/lib/nydp/builtin/string_match.rb

@@ -0,0 +1,24 @@
+class Nydp::Builtin::StringMatch
+  include Nydp::Builtin::Base
+
+  def initialize ns
+    @match    = Nydp::Symbol.mk :match   , ns
+    @captures = Nydp::Symbol.mk :captures, ns
+  end
+
+  def builtin_invoke vm, args
+    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 }
+    else
+      result            = Nydp.NIL
+    end
+
+    vm.push_arg result
+  end
+end

data/lib/nydp/builtin/string_replace.rb

@@ -1,14 +1,12 @@
 class Nydp::Builtin::StringReplace
-  def invoke vm, args
-    to_remove = args.car.to_s
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
+    to_remove = Regexp.new args.car.to_s
     to_insert = args.cdr.car.to_s
     target    = args.cdr.cdr.car.to_s
     result    = target.to_s.gsub to_remove, to_insert
 
     vm.push_arg Nydp::StringAtom.new result
   end
-
-  def to_s
-    "Builtin:string-replace"
-  end
 end

data/lib/nydp/builtin/string_split.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::StringSplit
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     target    = args.car.to_s
     separator = args.cdr.car.to_s
     result    = target.split separator
@@ -7,8 +9,4 @@ class Nydp::Builtin::StringSplit
 
     vm.push_arg Nydp::Pair.from_list list
   end
-
-  def to_s
-    "Builtin:string-split"
-  end
 end

data/lib/nydp/builtin/{to_sym.rb → sym.rb}

@@ -1,8 +1,11 @@
-class Nydp::Builtin::ToSym
+class Nydp::Builtin::Sym
+  include Nydp::Builtin::Base
+
   def initialize ns
     @ns = ns
   end
-  def invoke vm, args
+
+  def builtin_invoke vm, args
     arg = args.car
     val = case arg.class
           when Nydp::Symbol

data/lib/nydp/builtin/thread_locals.rb

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

data/lib/nydp/builtin/times.rb

@@ -1,5 +1,7 @@
 class Nydp::Builtin::Times
-  def invoke vm, args
+  include Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
     vm.push_arg multiply(args, 1)
   end
 
@@ -10,4 +12,6 @@ class Nydp::Builtin::Times
       multiply(args.cdr, (accum * args.car))
     end
   end
+
+  def name ; "*" ; end
 end

data/lib/nydp/builtin/to_string.rb

@@ -1,25 +1,31 @@
-class Nydp::Builtin::ToString
-  def invoke vm, args
-    arg = args.car
-    val = case arg.class
-          when Nydp::StringAtom
-            arg
-          else
-            Nydp::StringAtom.new arg.to_s
-          end
-    vm.push_arg val
+module Nydp::Builtin
+  class ToString
+    include Nydp::Builtin::Base
+
+    def builtin_invoke vm, args
+      arg = args.car
+      val = case arg.class
+            when Nydp::StringAtom
+              arg
+            else
+              Nydp::StringAtom.new arg.to_s
+            end
+      vm.push_arg val
+    end
   end
-end
 
-class Nydp::Builtin::StringLength
-  def invoke vm, args
-    arg = args.car
-    val = case arg
-          when Nydp::StringAtom
-            arg.length
-          else
-            0
-          end
-    vm.push_arg val
+  class StringLength
+    include Nydp::Builtin::Base
+
+    def builtin_invoke vm, args
+      arg = args.car
+      val = case arg
+            when Nydp::StringAtom
+              arg.length
+            else
+              0
+            end
+      vm.push_arg val
+    end
   end
 end

data/lib/nydp/builtin/today.rb

@@ -1,7 +1,7 @@
 class Nydp::Builtin::Today
-  include Nydp::Helper
+  include Nydp::Helper, Nydp::Builtin::Base
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     vm.push_arg(Nydp::Date.new Date.today)
   end
 end

data/lib/nydp/builtin/type_of.rb

@@ -1,9 +1,11 @@
 class Nydp::Builtin::TypeOf
+  include Nydp::Builtin::Base
+
   def initialize ns
     @ns = ns
   end
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     arg = args.car
     typename = if arg.respond_to?(:nydp_type)
                  arg.nydp_type.to_sym

data/lib/nydp/builtin/vm_info.rb

@@ -1,10 +1,12 @@
 class Nydp::Builtin::VmInfo
+  include Nydp::Builtin::Base
+
   VMINFO_NS    = { }
   CONTEXTS     = Nydp::Symbol.mk :contexts,     VMINFO_NS
   INSTRUCTIONS = Nydp::Symbol.mk :instructions, VMINFO_NS
   ARGS         = Nydp::Symbol.mk :args,         VMINFO_NS
 
-  def invoke vm, args
+  def builtin_invoke vm, args
     context_count     = Nydp::Pair.new CONTEXTS,     vm.contexts.size
     instruction_count = Nydp::Pair.new INSTRUCTIONS, vm.instructions.size
     arg_count         = Nydp::Pair.new ARGS,         vm.args.size

data/lib/nydp/core.rb

@@ -31,17 +31,17 @@ module Nydp
       Symbol.mk(:>,     ns).assign(Nydp::Builtin::GreaterThan.new)
       Symbol.mk(:<,     ns).assign(Nydp::Builtin::LessThan.new)
       Symbol.mk(:eval,  ns).assign(Nydp::Builtin::Eval.new(ns))
+      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(:error, ns).assign(Nydp::Builtin::Error.new)
-      Symbol.mk(:quit,  ns).assign(Nydp::Builtin::Quit.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(:sqrt,  ns).assign Nydp::Builtin::Sqrt.new
       Symbol.mk(:t,     ns).assign Nydp.T
-      Symbol.mk(:sym,   ns).assign Nydp::Builtin::ToSym.new(ns)
+      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)
@@ -53,6 +53,7 @@ module Nydp
       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("thread-locals"  , ns).assign(Nydp::Builtin::ThreadLocals.new)
       Symbol.mk("type-of",      ns).assign(Nydp::Builtin::TypeOf.new(ns))

data/lib/nydp/hash.rb

@@ -1,6 +1,7 @@
 class Nydp::Hash < ::Hash
   include Nydp::Helper
 
+  def nydp_type ; :hash   ; end
   def to_ruby
     @_ruby_hash ||= Hash.new { |h, k|
       self[case k

data/lib/nydp/symbol.rb

@@ -12,13 +12,9 @@ class Nydp::Symbol
     (str == "") || (str == nil) || (str =~ /\s/)
   end
 
-  def is? nm
-    self.name == nm.to_sym
-  end
-
   def value context=nil
     raise "unbound symbol: #{self.inspect}" if @value == nil
-    @value || Nydp.NIL
+    @value
   end
 
   def self.mk name, ns
@@ -33,9 +29,8 @@ class Nydp::Symbol
     sym
   end
 
-  def self.find name, ns
-    ns[name.to_sym]
-  end
+
+  def self.find name, ns ; ns[name.to_sym] ;  end
 
   def nydp_type  ; :symbol        ; end
   def inspect    ; @inspection    ; end
@@ -44,6 +39,8 @@ class Nydp::Symbol
   def to_ruby    ; to_sym         ; end
   def hash       ; name.hash      ; end
   def eql? other ; self == other  ; end
+  def is? nm     ; self.name == nm.to_sym   ; end
+  def <=> other  ; self.name <=> other.name ; end
 
   def == other
     other.is_a?(Nydp::Symbol) && (self.name == other.name)

data/lib/nydp/tokeniser.rb

@@ -84,7 +84,7 @@ module Nydp
           tok = [:sym_open_delim, open_sym]
         elsif list_prefix = s.scan(/[^\s()]*\(/)
           tok = [:left_paren, list_prefix[0...-1]]
-        elsif list_prefix = s.scan(/[^\s()]*\{/)
+        elsif list_prefix = s.scan(/[^\s()\}\{]*\{/)
           tok = [:left_brace, list_prefix[0...-1]]
         elsif s.scan(/\)/)
           tok = [:right_paren]

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.0.10.1"
+  VERSION = "0.0.11"
 end

data/lib/nydp/vm.rb

@@ -26,10 +26,18 @@ module Nydp
           handle_error e
         end
       end
-      raise unhandled_error if unhandled_error
+      raise_unhandled_error
       pop_arg
     end
 
+    def raise_unhandled_error
+      if unhandled_error
+        e = unhandled_error
+        self.unhandled_error = nil
+        raise e
+      end
+    end
+
     def handle_error ex
       @unhandled_error = ex
 

data/spec/embedded_spec.rb

@@ -102,4 +102,8 @@ describe Nydp::Parser do
     expect(actual).to eq expected
   end
 
+  it "parses a string that looks like html with little bits of embedded code in it" do
+    parsed = parse_string "<div id='item_~{id}'><label>~{data-label-1}</label> ~{data-content-1}</div>", '', :eof
+    expect(parsed.inspect).to eq '(string-pieces "<div id=\'item_" (brace-list id) "\'><label>" (brace-list data-label-1) "</label> " (brace-list data-content-1) "</div>")'
+  end
 end

data/spec/error_spec.rb

@@ -14,6 +14,18 @@ describe Nydp::VM do
       proc = Proc.new { run "dflkjdgjeirgjeoi" }
       msg  = "failed to eval dflkjdgjeirgjeoi\nerror was   unbound symbol: dflkjdgjeirgjeoi"
       expect(proc).to raise_error RuntimeError, msg
+      expect(vm.unhandled_error).to eq nil
+    end
+
+    it "recovers quickly from an error" do
+      begin
+        run "dflkjdgjeirgjeoi"
+      rescue
+      end
+
+      expect(vm.unhandled_error).to eq nil
+
+      expect(run "(+ 2 3 4)").to eq 9
     end
   end
 end

data/spec/literal_spec.rb

@@ -18,4 +18,12 @@ describe Nydp::Literal do
       expect(Nydp.NIL.to_ruby).to eq nil
     end
   end
+
+  describe "false" do
+    it "is stored in toplevel namespace" do
+      Nydp::Core.new.setup ns
+      nydp_false = Nydp::Symbol.mk :false, ns
+      expect(nydp_false.value).to eq false
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.0.10.1
+  version: 0.0.11
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/lisp/core-04-utils.nydp
 - lib/lisp/core-05-test-runner.nydp
 - lib/lisp/tests/boot-tests.nydp
+- lib/lisp/tests/builtin-tests.nydp
 - lib/lisp/tests/dynamic-scope-test.nydp
 - lib/lisp/tests/error-tests.nydp
 - lib/lisp/tests/foundation-test.nydp
@@ -125,12 +126,13 @@ files:
 - lib/nydp/builtin/quit.rb
 - lib/nydp/builtin/random_string.rb
 - lib/nydp/builtin/sqrt.rb
+- lib/nydp/builtin/string_match.rb
 - lib/nydp/builtin/string_replace.rb
 - lib/nydp/builtin/string_split.rb
+- lib/nydp/builtin/sym.rb
 - lib/nydp/builtin/thread_locals.rb
 - lib/nydp/builtin/times.rb
 - lib/nydp/builtin/to_string.rb
-- lib/nydp/builtin/to_sym.rb
 - lib/nydp/builtin/today.rb
 - lib/nydp/builtin/type_of.rb
 - lib/nydp/builtin/vm_info.rb