nydp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 031f54326dfa57ae2a067c931bd600bd9e2cc6c0
-  data.tar.gz: aa49dab4d81173e02e968958028c1cad2948079c
+  metadata.gz: 63983bd000bf898d3987e7878f25a16e0be94924
+  data.tar.gz: ec47cf4bf570c09a63d17a53008fe92671460cbc
 SHA512:
-  metadata.gz: e263b9ce4dff11cd6ac7e7d7ef5787ad553807eb1f2048bbd357973ddbbc910feaaf7c340c0bb8347f31d90e07c4e5b23af3992ed31cb8e61edef8e878c480b5
-  data.tar.gz: 0966de059bcf3658fe137c9a436bf817d84b5bc4ad443b8afd14e22fbecc7e392c23732d6a5a5db8862345bd5ba70b7ae09e87e67e0a910484792e1882e27eda
+  metadata.gz: 02e72f25772989690a4ba44cee9e5f054528d0d2202779674fd232fab1806bf24d2840bd0e6e1ce289875b6aac739cfdd94e7e4da86513d1020cecce1cc7ac62
+  data.tar.gz: 680159117248665c00a5166bf6d9e1a58247170d28d532215529f35f7a562add5464db10ee1bcbc617a38ee7eb3402777c484f27b388834c9da0aef68189947c

data/lib/lisp/core-030-syntax.nydp

@@ -1,15 +1,35 @@
+(def orf args
+  (cond args
+        (cond (car args)
+              (car args)
+              (apply orf
+                     (cdr args)))))
+
 (mac unless (arg . body)
   `(if (no ,arg) (do ,@body)))
 
-(def expand-colon-syntax (first rest)
-     (if (no rest)
-         `(apply ,first args)
-         `(,first ,(expand-colon-syntax (car rest) (cdr rest)))))
+(def expand-colon-syntax (names)
+  (if (no (cdr names))
+          `(apply ,(car names) args)
+          `(,(car names) ,(expand-colon-syntax (cdr names)))))
+
+(def default-colon-syntax (names)
+  `(fn args ,(expand-colon-syntax names)))
+
+(assign colon-syntax-overrides (hash))
+
+(mac def-colon-syntax (name var . body)
+  `(hash-set colon-syntax-overrides
+             ',name
+             (fn (,var) ,@body)))
+
+(def-colon-syntax || names
+  (error "Irregular ': syntax: got ~(inspect names) : not prefix-syntax : in ~(joinstr ":" names)"))
 
-(mac colon-syntax args
-  (if (eq? (car args) '||)
-      (error "Irregular ': syntax: got ~(inspect args) : not prefix-syntax : in ~(joinstr ":" (cons pfx rest))")
-      `(fn args ,(expand-colon-syntax (car args) (cdr args)))))
+(mac colon-syntax names
+  ((orf (hash-get colon-syntax-overrides (car names))
+        default-colon-syntax)
+   names))
 
 (mac bang-syntax (pfx . rest)
   (if (no (eq? pfx '||))

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

@@ -151,25 +151,26 @@
 (def dox-show-info (name what texts args src)
   ; show the given dox info
   ; 'info arg is a dox object from the dox system
-  (p)
-  (cond (eq? what 'mac) (p "Macro : ~name"    ))
-  (cond (eq? what 'def) (p "Function : ~name" ))
-  (p "args : ~(inspect args)")
-  (p (joinstr "\n" texts))
-  (p "")
-  (p "source")
-  (p "======")
-  (p (dox-show-src src))
-  (p))
+  "~(if (eq? what 'mac) "Macro"
+        (eq? what 'def) "Function"
+        what) : ~name
+
+args : ~(inspect args)
+
+~(joinstr "\n" texts)
+
+source
+======
+~(dox-show-src src)
+")
 
 (mac dox (name)
   ; show dox for the given name
   `(let infos (dox-lookup ',name)
-     (if (or (no infos)
-             (eq? (len infos) 0))
-         (p "No documentation for " ',name)
+     (if (no infos)
+         (p "No documentation for" ',name)
          (each info infos
-               (apply dox-show-info info)))))
+               (p:apply dox-show-info info)))))
 
 (def proper? (list)
   ; t if this is a proper list (last cdr is nil)
@@ -190,3 +191,24 @@
   (if (> n 0)
       (nthcdr (- n 1) (cdr things))
       things))
+
+(def joinlists (things . more-thingses)
+  ; return a new list which is the concatenation of all the given lists
+  ; 'things is a list
+  ; 'more-thingses is a list of lists
+  ; call like this: (joinlists '(a b c) '(x y z) '(1 2 3))
+  (if things
+      (cons (car things)
+            (apply joinlists
+                   (cdr things)
+                   more-thingses))
+      more-thingses
+      (apply joinlists more-thingses)))
+
+(def curry (func . args1)
+  ; return a new function which is the original function with
+  ; the given args1 already applied
+  ; arguments to the new function are whatever arguments remain
+  ; for the old function
+  (fn args2
+      (apply func (joinlists args1 args2))))

data/lib/lisp/core-080-pretty-print.nydp

@@ -21,7 +21,7 @@
   (if (eq? thing '||)
       ""
       (isa 'string thing)
-      (pp/escape-string-literal thing)
+      "\"~(pp/escape-string-literal thing)\""
       (inspect thing)))
 
 (mac pp/def (name args . body)
@@ -47,6 +47,7 @@
 (pp/def unquote-splicing (form indent) ",@~(pp/main (cadr form) indent)")
 (pp/def comment          (form indent) ";~(cadr form)\n")
 (pp/def prefix-list      (form indent) "~(cadr form)~(pp (caddr form))")
+(pp/def brace-list       (form indent) "{~(pp/inline (cdr form) indent)}")
 
 (pp/syntax
  colon-syntax ":"

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

@@ -0,0 +1,24 @@
+(def chicken-korma (a b c d e)
+  (list a b c d e))
+
+(register-test
+ '(suite "Curry Tests"
+         ("zero-params"
+          (let ck0 (curry chicken-korma)
+            (ck0 1 2 3 4 5))
+          (1 2 3 4 5))
+
+         ("one param"
+          (let ck0 (curry chicken-korma 'x)
+            (ck0 1 2 3 4))
+          (x 1 2 3 4))
+
+         ("two params"
+          (let ck0 (curry chicken-korma 'x 'y)
+            (ck0 1 2 3))
+          (x y 1 2 3))
+
+         ("three params"
+          (let ck0 (curry chicken-korma 'x 'y 'z)
+            (ck0 1 2))
+          (x y z 1 2))))

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

@@ -40,6 +40,26 @@
                                         (that)))
                  (("hello" "more details" "very rigourous") ((this) (that)))))
 
+         (suite "dox-show-info"
+                ("shows each item"
+                 (dox-show-info "bingo"
+                                'def
+                                '("there was a farmer had a dog" "and Bingo was his name-o")
+                                '(count)
+                                '(def bingo (count) (times count (bark))))
+                 "Function : bingo
+
+args : (count)
+
+there was a farmer had a dog
+and Bingo was his name-o
+
+source
+======
+(def bingo (count)
+    (times count (bark)))
+"))
+
          (suite "mac"
                 ("a documented macro"
                  (dox-lookup 'this-is-a-well-documented-macro)

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

@@ -38,6 +38,18 @@
 
 
     (suite "type-of"
+      ("returns 'fn for builtin function"
+        (type-of car)
+        fn)
+
+      ("returns 'fn for nydp-defined function"
+        (type-of register-test)
+        fn)
+
+      ("returns 'fn for inline function"
+        (type-of (fn (x) (p x)))
+        fn)
+
       ("returns 'string"
         (type-of "foobar")
         string)

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

@@ -1,5 +1,14 @@
 (register-test
  '(suite "List Tests"
+         (suite "joinlists"
+                ("joins one list to another"
+                 (joinlists '(a b c) '(x y z))
+                 (a b c x y z))
+
+                ("joins three lists"
+                 (joinlists '(a b c) '(x y z) '(1 2 3))
+                 (a b c x y z 1 2 3)))
+
          (suite "firstn"
                 ("returns no items for n = 0"
                  (firstn 0 '(a b c d))

data/lib/lisp/tests/pretty-print-tests.nydp

@@ -8,6 +8,10 @@
           (pp '(def pp (form) (pp/main form 0)))
           "(def pp (form)\n    (pp/main form 0))")
 
+         ("something with a plain string literal"
+          (pp '(def yoohoo (it) (wrangle "foobar" it)))
+          "(def yoohoo (it)\n    (wrangle \"foobar\" it))")
+
          ("combined with dox system"
           (pp:dox-src 'pp/find-breaks)
           "(def pp/find-breaks (form)
@@ -22,4 +26,6 @@
           (pp '(string-pieces "hello " (bang-syntax || (dot-syntax x y (ampersand-syntax foo bar))) " and welcome to " (prefix-list "%%" (a b c d)) " and friends!"))
           "\"hello ~~!x.y.foo&bar and welcome to ~~%%(a b c d) and friends!\"")
 
-))
+         ("brace list"
+          (pp '(&x {a 1 b "two" c 'three d ,four e (sub invocation) f {sub brace list} }))
+          "(&x {a 1 b \"two\" c 'three d ,four e (sub invocation) f {sub brace list}})")))

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

@@ -1,5 +1,18 @@
 (register-test
  '(suite "syntax tests"
+         (suite "colon-syntax"
+                ("expands to sequential function application"
+                 (pre-compile 'a:b)
+                 (fn args (a (apply b args))))
+
+                ("example with car:cdr"
+                 (car:cdr '(a b c))
+                 b)
+
+                ("dislikes no-prefix"
+                 (on-err err (pre-compile '(:foo 1 2 3)))
+                 "(\"Irregular ': syntax: got (|| foo) : not prefix-syntax : in :foo\")"))
+
          (suite "lambda shortcut"
                 ("one argument"
                  (map λa(len a.name)

data/lib/nydp/builtin.rb

@@ -40,8 +40,9 @@ module Nydp::Builtin
       cname
     end
 
-    def inspect ; "builtin/#{name}" ; end
-    def to_s    ; name              ; end
+    def inspect   ; "builtin/#{name}" ; end
+    def to_s      ; name              ; end
+    def nydp_type ; "fn"              ; end
   end
 end
 

data/lib/nydp/closure.rb

@@ -22,6 +22,7 @@ module Nydp
       ifn.invoke vm, context, arg_values
     end
 
+    def nydp_type ; "fn" ; end
     def to_s
       "(closure #{context.inspect} : #{ifn.to_s})"
     end

data/lib/nydp/interpreted_function.rb

@@ -82,7 +82,8 @@ module Nydp
       vm.push_arg Closure.new(self, vm.peek_context)
     end
 
-    def inspect; to_s; end
+    def nydp_type ; "fn" ; end
+    def inspect   ; to_s ; end
     def to_s
       "(fn #{arg_names.inspect} #{body.map { |b| b.inspect}.join(' ')})"
     end

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/nydp.gemspec

@@ -19,9 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-
+  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', '~> 2.9'
   spec.add_development_dependency 'rspec_numbering_formatter'
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - lib/lisp/core-080-pretty-print.nydp
 - lib/lisp/tests/boot-tests.nydp
 - lib/lisp/tests/builtin-tests.nydp
+- lib/lisp/tests/curry-tests.nydp
 - lib/lisp/tests/dox-tests.nydp
 - lib/lisp/tests/dynamic-scope-test.nydp
 - lib/lisp/tests/each-tests.nydp