nydp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb1c4582106367e04bc3ac5163db7401782331c
-  data.tar.gz: 3c8be4535a704cdbe02674796f4068d6f079880c
+  metadata.gz: c5371b4420aa7a746eccbe2b573c4272d7dfba14
+  data.tar.gz: a3984911b5b429111b2d05edfb0dbe8e7255f09b
 SHA512:
-  metadata.gz: 7523046a3da0fb43634736645674566d77c10a3178b911765d849503c9b66cdb32e9b17810365795bddc7f2bf5fe655d24c1e2f10b6253054987cdfdbe5a6a16
-  data.tar.gz: 82f1f13fb1e3badf6f80c8a9ca6077019b01c0f8e571c61b1e1ade4ba1c640c4c8945f9e3d77442d69e77382e5ecee60587d51b9010ff03ec10ee4bb422664c8
+  metadata.gz: 2f34a901a9f99c8225bbe8b4301d7399e6cde7b54f10d8d46d22763309271ab8baaea9829de021ab0d35eaaf949a45ff805795b29ad6ea5d44595f4f4fea4ff5
+  data.tar.gz: 00f4189ec6bbeeb721b3431a59bb6bc819f239eaecd499f49ba38b49f42d29ffc8609b3cd370eb976a6897cccc4442c97b94457eed6cede53cf72db09fe85f54

data/lib/lisp/boot.nydp

@@ -235,6 +235,9 @@
               (flatten (zip (map (fn (_) txt) (cdr joinables))
                             (map to-string (cdr joinables)))))))
 
+(def string-pieces pieces
+  (joinstr "" pieces))
+
 (let uniq-counter 0
      (def uniq (prefix)
           (sym (joinstr "-"
@@ -274,18 +277,19 @@
               (iso (car x) (car y))
               (iso (cdr x) (cdr y)))))
 
-(def isa   (type   obj) (eq? (type-of obj) type))
-(def sym? (arg) (isa 'symbol arg))
-(mac just (arg) arg)
-(def quotify (arg) `(quote ,arg))
+(def isa     (type obj) (eq? (type-of obj) type))
+(def sym?    (arg)      (isa 'symbol arg))
+(def string? (arg)      (isa 'string arg))
+(mac just    (arg)      arg)
+(def quotify (arg)      `(quote ,arg))
 
 (def caris (obj things)
      (and (isa 'pair things)
           (eq? (car things)  obj)))
 
 (def len (xs)
-  (if (pair? xs)
-      (+ 1 (len (cdr xs)))
+  (if (pair? xs)   (+ 1 (len (cdr xs)))
+      (string? xs) (string-length xs)
       0))
 
 (def build-keyword-args (pairs)
@@ -316,6 +320,9 @@
       (build-hash-getters (cdr names) `(hash-get ,acc ',(car names)))
       acc))
 
+(def build-hash-lookup-from (root names)
+  (build-hash-getters (cons root names) nil))
+
 (mac hash-lookup (names)
   (build-hash-getters names nil))
 
@@ -345,9 +352,11 @@
             ,@(map (fn (m) `(hash-set ,hash ,(brace-list-hash-key (car m)) ,(cadr m))) mappings)
             ,hash))))
 
+(mac brace-list-mono (arg) arg)
+
 (mac brace-list args
   (if (no (cdr args))
-      (car args)
+      `(brace-list-mono ,(car args))
       (brace-list-build-hash args)))
 
 (mac on-err (handler . body)

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

@@ -53,6 +53,11 @@
                            (list "hello world" (hash-get hsh "hello world") "yesterday" (hash-get hsh "yesterday"))))
                  ("hello world" 10 "yesterday" 11)))
 
+         (suite "strings"
+                ("length"
+                 (len "foo-bar")
+                 7))
+
          (suite "list management"
                 ("'pair breaks a list into pairs"
                  (pairs '(1 a 2 b 3 c))

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

@@ -52,4 +52,22 @@
 
     ("parses a plain string with interpolations"
       (parse-in-string (joinstr "" (list "hello, " '~ "(world), take me to your " '~ "dealer please")))
-      (string-pieces "hello, " (world) ", take me to your " dealer " please")))))
+      (string-pieces "hello, " (world) ", take me to your " dealer " please"))
+
+    ("ignores standalone interpolation symbol"
+      (parse-in-string (joinstr "" (list "hello " '~ " world")))
+      "hello \~ world")
+
+    ("ignores backslash-escaped interpolation symbol"
+      (len "hello \~world")
+      12)
+
+    ("ignores escaped interpolation symbol"
+      (parse-in-string (joinstr "" (list "hello " '~ '~ "world")))
+      "hello \~world")
+
+    ("really ignores standalone interpolation symbol"
+      (len (parse-in-string (joinstr "" (list "hello " '~ " world"))))
+      13)
+
+)))

data/lib/nydp/builtin/to_string.rb

@@ -11,16 +11,15 @@ class Nydp::Builtin::ToString
   end
 end
 
-class Nydp::Builtin::StringPieces
-  def to_string first, rest
-    if Nydp.NIL.is? rest
-      first.to_s
-    else
-      "#{first.to_s}#{to_string rest.car, rest.cdr}"
-    end
-  end
-
+class Nydp::Builtin::StringLength
   def invoke vm, args
-    vm.push_arg Nydp::StringAtom.new to_string(args.car, args.cdr)
+    arg = args.car
+    val = case arg
+          when Nydp::StringAtom
+            arg.length
+          else
+            0
+          end
+    vm.push_arg val
   end
 end

data/lib/nydp/core.rb

@@ -53,7 +53,7 @@ module Nydp
       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-pieces"  , ns).assign(Nydp::Builtin::StringPieces.new)
+      Symbol.mk("string-length"  , ns).assign(Nydp::Builtin::StringLength.new)
       Symbol.mk("string-replace" , ns).assign(Nydp::Builtin::StringReplace.new)
       Symbol.mk("string-split"   , ns).assign(Nydp::Builtin::StringSplit.new  )
       Symbol.mk("thread-locals"  , ns).assign(Nydp::Builtin::ThreadLocals.new)

data/lib/nydp/helper.rb

@@ -13,6 +13,8 @@ module Nydp
   end
 
   def self.r2n ruby_obj, ns
+    return ruby_obj._nydp_wrapper if ruby_obj.respond_to? :_nydp_wrapper
+
     rklass = ruby_obj.class
     R2NHELPERS.each do |hklass, proc|
       if rklass <= hklass

data/lib/nydp/parser.rb

@@ -113,14 +113,15 @@ module Nydp
     end
 
     INTERPOLATION_SIGN = /~/
+    INTERPOLATION_ESCAPES = { /~\s/ => true, /~~/ => "~" }
 
     def string token_stream, open_delimiter, close_delimiter
       fragments = [sym(:"string-pieces")]
-      string_token = token_stream.next_string_fragment(open_delimiter, close_delimiter, INTERPOLATION_SIGN)
+      string_token = token_stream.next_string_fragment(open_delimiter, close_delimiter, INTERPOLATION_SIGN, INTERPOLATION_ESCAPES)
       fragments << Nydp::StringAtom.new(string_token.string, string_token)
       while !(string_token.is_a? StringFragmentCloseToken)
         fragments << expression(token_stream)
-        string_token = token_stream.next_string_fragment('', close_delimiter, INTERPOLATION_SIGN)
+        string_token = token_stream.next_string_fragment('', close_delimiter, INTERPOLATION_SIGN, INTERPOLATION_ESCAPES)
         fragments << Nydp::StringAtom.new(string_token.string, string_token)
       end
 

data/lib/nydp/string_atom.rb

@@ -11,6 +11,7 @@ module Nydp
     def eql? other ; self == other  ; end
     def inspect    ; string.inspect ; end
     def hash       ; string.hash    ; end
+    def length     ; string.length  ; end
 
     def == other
       other.to_s == self.to_s

data/lib/nydp/tokeniser.rb

@@ -25,7 +25,7 @@ module Nydp
       scanner.scan(delim)
     end
 
-    def next_string_fragment open_delimiter, close_delimiter, interpolation_sign
+    def next_string_fragment open_delimiter, close_delimiter, interpolation_sign, interpolation_escapes={ }
       s = @scanner
       rep = "#{open_delimiter}"
       string = ""
@@ -42,9 +42,23 @@ module Nydp
         elsif closer = close_delimiter?(s, close_delimiter)
           rep << closer
           return StringFragmentCloseToken.new(string, rep)
-        elsif interpolation_sign && (start_interpolation = s.scan(interpolation_sign))
-          rep << start_interpolation
-          return StringFragmentToken.new(string, rep)
+        elsif interpolation_sign
+          escaped = false
+          interpolation_escapes.each do |esc, repl|
+            if !escaped && (escape = s.scan esc)
+              string << ((repl == true) ? escape : repl)
+              rep    << escape
+              escaped = true
+            end
+          end
+          if !escaped && (start_interpolation = s.scan(interpolation_sign))
+            rep << start_interpolation
+            return StringFragmentToken.new(string, rep)
+          else
+            ch = s.getch
+            string << ch
+            rep    << ch
+          end
         else
           ch = s.getch
           string << ch

data/lib/nydp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler