nydp 0.2.1 → 0.2.2

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

@@ -34,6 +34,14 @@
    (map (fn (x) (* x x)) '(1 2 3))
    (1 4 9))
 
+  ("applies the function to a singleton argument"
+   (map (fn (x) (* x x)) 19)
+   361)
+
+  ("preserves dotted lists"
+   (map (fn (x) (* x x)) '(1 2 3 4 . 5))
+   (1 4 9 16 . 25))
+
   ("maps a string join function over a list of strings"
    (test-foo "x" "y")
    ("a0 w0 x w0 y" "a0 w1 x w1 y" "a0 w2 x w2 y" "a0 w3 x w3 y"))

data/lib/lisp/tests/intersperse-examples.nydp

@@ -0,0 +1,57 @@
+(examples-for intersperse
+  ("returns nil for nothing"
+   (intersperse 42)
+   nil)
+
+  ("returns nil for nil"
+   (intersperse 42 nil)
+   nil)
+
+  ("returns a singleton thing"
+   (intersperse 42 'a)
+   a)
+
+  ("returns a singleton list"
+   (intersperse 42 '(a))
+   (a))
+
+  ("returns list with argument between each element"
+   (intersperse 42 '(a b))
+   (a 42 b))
+
+  ("returns longer list with argument between each element"
+   (intersperse 42 '(a b c d e))
+   (a 42 b 42 c 42 d 42 e))
+
+  ("returns list with non-atomic argument between each element"
+   (intersperse '(+ +) '(a b c))
+   (a (+ +) b (+ +) c))
+
+  ("returns improper list with argument between each element"
+   (intersperse 'oo '(a b c . d))
+   (a oo b oo c oo . d)))
+
+(examples-for intersperse-splicing
+  ("returns nil for nothing"
+   (intersperse-splicing 42)
+   nil)
+
+  ("returns nil for nil"
+   (intersperse-splicing 42 nil)
+   nil)
+
+  ("returns a singleton list"
+   (intersperse-splicing 42 '((a)))
+   (a))
+
+  ("returns list with argument between each element"
+   (intersperse-splicing 42 '((a) (b)))
+   (a 42 b))
+
+  ("returns longer list with argument between each element"
+   (intersperse-splicing 42 '((a b) (c d) (e)))
+   (a b 42 c d 42 e))
+
+  ("returns list with non-atomic argument between each element"
+   (intersperse-splicing '(+ +) '((a b) (c d) (e f g)))
+   (a b (+ +) c d (+ +) e f g)))

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

@@ -16,8 +16,12 @@
 (def tst-3-n (a b c . n)      "success a: ~a b: ~b c: ~c . n: ~(inspect n)"              )
 (def tst-4   (a b c d)        "success a: ~a b: ~b c: ~c d: ~d"                          )
 (def tst-4-n (a b c d . n)    "success a: ~a b: ~b c: ~c d: ~d . n: ~(inspect n)"        )
-(def tst-5   (a b c d e)      "success a: ~a b: ~b c: ~c d: ~d e: ~e"                    )
-(def tst-5-n (a b c d e . n)  "success a: ~a b: ~b c: ~c d: ~d e: ~e . n: ~(inspect n)"  )
+(def tst-5   (a b c d e)          "success a: ~a b: ~b c: ~c d: ~d e: ~e"                    )
+(def tst-5-n (a b c d e . n)      "success a: ~a b: ~b c: ~c d: ~d e: ~e . n: ~(inspect n)"  )
+(def tst-6   (a b c d e f)        "success a: ~a b: ~b c: ~c d: ~d e: ~e f: ~f"                    )
+(def tst-6-n (a b c d e f . n)    "success a: ~a b: ~b c: ~c d: ~d e: ~e f: ~f . n: ~(inspect n)"  )
+(def tst-7   (a b c d e f g)      "success a: ~a b: ~b c: ~c d: ~d e: ~e f: ~f g: ~g"                    )
+(def tst-7-n (a b c d e f g . n)  "success a: ~a b: ~b c: ~c d: ~d e: ~e f: ~f g: ~g . n: ~(inspect n)"  )
 
 (register-test
  '(suite "Invocation Tests"
@@ -94,12 +98,14 @@
                 ("five args"   (tst-4 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4" ))
 
          (suite "four params and rest param"
-                ("no args"     (tst-4-n)             "success a:  b:  c:  d:  . n: nil"     )
-                ("one arg"     (tst-4-n 1)           "success a: 1 b:  c:  d:  . n: nil"    )
-                ("two args"    (tst-4-n 1 2)         "success a: 1 b: 2 c:  d:  . n: nil"   )
-                ("three args"  (tst-4-n 1 2 3)       "success a: 1 b: 2 c: 3 d:  . n: nil"  )
-                ("four args"   (tst-4-n 1 2 3 4)     "success a: 1 b: 2 c: 3 d: 4 . n: nil" )
-                ("five args"   (tst-4-n 1 2 3 4 5)   "success a: 1 b: 2 c: 3 d: 4 . n: (5)" ))
+                ("no args"     (tst-4-n)               "success a:  b:  c:  d:  . n: nil"         )
+                ("one arg"     (tst-4-n 1)             "success a: 1 b:  c:  d:  . n: nil"        )
+                ("two args"    (tst-4-n 1 2)           "success a: 1 b: 2 c:  d:  . n: nil"       )
+                ("three args"  (tst-4-n 1 2 3)         "success a: 1 b: 2 c: 3 d:  . n: nil"      )
+                ("four args"   (tst-4-n 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 . n: nil"     )
+                ("five args"   (tst-4-n 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 . n: (5)"     )
+                ("six args"    (tst-4-n 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 . n: (5 6)"   )
+                ("seven args"  (tst-4-n 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 . n: (5 6 7)" ))
 
          (suite "five params"
                 ("no args"     (tst-5)               "success a:  b:  c:  d:  e: "      )
@@ -107,7 +113,9 @@
                 ("two args"    (tst-5 1 2)           "success a: 1 b: 2 c:  d:  e: "    )
                 ("three args"  (tst-5 1 2 3)         "success a: 1 b: 2 c: 3 d:  e: "   )
                 ("four args"   (tst-5 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 e: "  )
-                ("five args"   (tst-5 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5" ))
+                ("five args"   (tst-5 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5" )
+                ("six args"    (tst-5 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5" )
+                ("seven args"  (tst-5 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5" ))
 
          (suite "five params and rest param"
                 ("no args"     (tst-5-n)             "success a:  b:  c:  d:  e:  . n: nil"      )
@@ -115,5 +123,47 @@
                 ("two args"    (tst-5-n 1 2)         "success a: 1 b: 2 c:  d:  e:  . n: nil"    )
                 ("three args"  (tst-5-n 1 2 3)       "success a: 1 b: 2 c: 3 d:  e:  . n: nil"   )
                 ("four args"   (tst-5-n 1 2 3 4)     "success a: 1 b: 2 c: 3 d: 4 e:  . n: nil"  )
-                ("five args"   (tst-5-n 1 2 3 4 5)   "success a: 1 b: 2 c: 3 d: 4 e: 5 . n: nil" ))
+                ("five args"   (tst-5-n 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5 . n: nil"   )
+                ("six args"    (tst-5-n 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5 . n: (6)"   )
+                ("seven args"  (tst-5-n 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5 . n: (6 7)" ))
+
+         (suite "six params"
+                ("no args"     (tst-6)               "success a:  b:  c:  d:  e:  f: "        )
+                ("one arg"     (tst-6 1)             "success a: 1 b:  c:  d:  e:  f: "       )
+                ("two args"    (tst-6 1 2)           "success a: 1 b: 2 c:  d:  e:  f: "      )
+                ("three args"  (tst-6 1 2 3)         "success a: 1 b: 2 c: 3 d:  e:  f: "     )
+                ("four args"   (tst-6 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 e:  f: "    )
+                ("five args"   (tst-6 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5 f: "   )
+                ("six args"    (tst-6 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6"  )
+                ("seven args"  (tst-6 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6"  ))
+
+         (suite "six params and rest param"
+                ("no args"     (tst-6-n)               "success a:  b:  c:  d:  e:  f:  . n: nil"      )
+                ("one arg"     (tst-6-n 1)             "success a: 1 b:  c:  d:  e:  f:  . n: nil"     )
+                ("two args"    (tst-6-n 1 2)           "success a: 1 b: 2 c:  d:  e:  f:  . n: nil"    )
+                ("three args"  (tst-6-n 1 2 3)         "success a: 1 b: 2 c: 3 d:  e:  f:  . n: nil"   )
+                ("four args"   (tst-6-n 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 e:  f:  . n: nil"  )
+                ("five args"   (tst-6-n 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5 f:  . n: nil" )
+                ("six args"    (tst-6-n 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 . n: nil" )
+                ("seven args"  (tst-6-n 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 . n: (7)" ))
+
+         (suite "seven params"
+                ("no args"     (tst-7)               "success a:  b:  c:  d:  e:  f:  g: "         )
+                ("one arg"     (tst-7 1)             "success a: 1 b:  c:  d:  e:  f:  g: "        )
+                ("two args"    (tst-7 1 2)           "success a: 1 b: 2 c:  d:  e:  f:  g: "       )
+                ("three args"  (tst-7 1 2 3)         "success a: 1 b: 2 c: 3 d:  e:  f:  g: "      )
+                ("four args"   (tst-7 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 e:  f:  g: "     )
+                ("five args"   (tst-7 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5 f:  g: "    )
+                ("six args"    (tst-7 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 g: "   )
+                ("seven args"  (tst-7 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 g: 7"  ))
+
+         (suite "seven params and rest param"
+                ("no args"     (tst-7-n)               "success a:  b:  c:  d:  e:  f:  g:  . n: nil"        )
+                ("one arg"     (tst-7-n 1)             "success a: 1 b:  c:  d:  e:  f:  g:  . n: nil"       )
+                ("two args"    (tst-7-n 1 2)           "success a: 1 b: 2 c:  d:  e:  f:  g:  . n: nil"      )
+                ("three args"  (tst-7-n 1 2 3)         "success a: 1 b: 2 c: 3 d:  e:  f:  g:  . n: nil"     )
+                ("four args"   (tst-7-n 1 2 3 4)       "success a: 1 b: 2 c: 3 d: 4 e:  f:  g:  . n: nil"    )
+                ("five args"   (tst-7-n 1 2 3 4 5)     "success a: 1 b: 2 c: 3 d: 4 e: 5 f:  g:  . n: nil"   )
+                ("six args"    (tst-7-n 1 2 3 4 5 6)   "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 g:  . n: nil"  )
+                ("seven args"  (tst-7-n 1 2 3 4 5 6 7) "success a: 1 b: 2 c: 3 d: 4 e: 5 f: 6 g: 7 . n: nil" ))
          ))

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

@@ -37,7 +37,7 @@
    (joinlists '(a b c) '(x y z) '(1 2 3))
    (a b c x y z 1 2 3))
 
-  ("joins three lists without recusing"
+  ("joins three lists without recursing"
    (joinlists '(a b c) '(x (y1 y2 y3) z) '(1 2 (3 3 3)))
    (a b c x (y1 y2 y3) z 1 2 (3 3 3))))
 
@@ -119,3 +119,16 @@
   ("nil for a very improper list"
    (proper? '(a b . (c . d)))
    nil))
+
+(examples-for list-slices
+  ("just the list if small"
+   (list-slices '(a b c d e) 12)
+   ((a b c d e)))
+
+  ("exactly three lists"
+   (list-slices '(a b c d e f g h i) 3)
+   ((a b c) (d e f) (g h i)))
+
+  ("three lists and an extra big"
+   (list-slices '(a b c d e f g h i j k) 3)
+   ((a b c) (d e f) (g h i) (j k))))

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

@@ -1,34 +1,293 @@
+(examples-for pp/breaker
+  ("breaks 'if forms"
+   (pp/breaker '(if a b c d e))
+   ((if a) (b) (c) (d) (e)))
+
+  ("breaks 'let forms"
+   (pp/breaker '(let a b c d))
+   ((let a b) (c) (d)))
+
+  ("breaks 'def forms"
+   (pp/breaker '(def yoyo (x y) a b))
+   ((def yoyo (x y)) (a) (b))))
+
+(examples-for pp/dotify
+  ("nothing"
+   (pp/dotify nil)
+   nil)
+
+  ("atom"
+   (inspect:pp/dotify 'a)
+   "a")
+
+  ("plain list"
+   (inspect:pp/dotify '(a b c))
+   "(a b c)")
+
+  ("dotted list"
+   (map inspect (pp/dotify '(a b c . d)))
+   ("a" "b" "c" "." "d"))
+
+  ("nested dotted list"
+   (inspect:pp/dotify '(def foo (a b c . d)
+                         (a (fn (x y . z) (d z) ))))
+   "(def foo (a b c . d) (a (fn (x y . z) (d z))))"))
+
+(examples-for pp/indent
+  ("nothing"
+   (pp/indent nil (list " "))
+   (" "))
+
+  ("number"
+   (pp/indent 22 (list " "))
+   ("   " " "))
+
+  ("string"
+   (pp/indent "forty-two" (list " "))
+   ("          " " "))
+
+  ("symbol"
+   (pp/indent 'forty-two (list " "))
+   ("          " " "))
+
+  ("list"
+   (pp/indent '(fn (x) (blow x)) (list " "))
+   (" ")))
+
+(examples-for pp/cleanup
+  ("empty"
+   (pp/cleanup "")
+   "")
+
+  ("atom"
+   (pp/cleanup "foo")
+   "foo")
+
+  ("already clean"
+   (pp/cleanup "foo\nbar")
+   "foo
+bar")
+
+  ("removes trailing whitespace on each line"
+   (pp/cleanup "foo  \nbar   \ntoto    ")
+   "foo
+bar
+toto")
+
+  ("removes trailing whitespace on each line but preserves leading whitespace"
+   (pp/cleanup "foo  \n  bar   \n   toto    ")
+   "foo
+  bar
+   toto"))
+
+(examples-for pp/unsyntax
+  ("nil"
+   (to-string:pp/unsyntax nil)
+   "")
+
+  ("atom"
+   (to-string:pp/unsyntax 42)
+   "42")
+
+  ("list"
+   (to-string:pp/unsyntax '(for a 1 10 (p 'hello 'world)))
+   "(for a 1 10 (p 'hello 'world))")
+
+  ("list with embedded syntax"
+   (to-string:pp/unsyntax '(for (colon-syntax a b) 1 10 ((dot-syntax p q) 'hello 'world)))
+   "(for a:b 1 10 (p.q 'hello 'world))")
+
+  ("percent-syntax"
+   (to-string:pp/unsyntax '(percent-syntax this that))
+   "this%that")
+
+  ("prefix percent-syntax"
+   (to-string:pp/unsyntax '(percent-syntax || that))
+   "%that")
+
+  ("postfix percent-syntax"
+   (to-string:pp/unsyntax '(percent-syntax this ||))
+   "this%")
+
+  ("postfix multiple percent-syntax"
+   (to-string:pp/unsyntax '(percent-syntax this that || another))
+   "this%that%%another")
+
+  ("nested syntax"
+   (to-string:pp/unsyntax '(percent-syntax this (ampersand-syntax x y) that))
+   "this%x&y%that"))
+
+(examples-for pp/split-form
+  ("first item"
+   (pp/split-form '(a b c d) 1)
+   ((a) (b) (c) (d)))
+
+  ("first two items"
+   (pp/split-form '(a b c d e) 2)
+   ((a b) (c) (d) (e)))
+
+  ("first three items"
+   (pp/split-form '(a b c d e f) 3)
+   ((a b c) (d) (e) (f))))
+
+(examples-for pp/flatly
+  ("nil"
+   (pp/flatly nil)
+   "nil")
+
+  ("number"
+   (pp/flatly 22)
+   "22")
+
+  ("symbol"
+   (pp/flatly 'qwerty)
+   "qwerty")
+
+  ("list"
+   (pp/flatly '(a b c d 21 22 23 'quoting) )
+   "(a b c d 21 22 23 'quoting)")
+
+  ("macro example"
+   (pp/flatly '(mac johnny (foo bar) `(this ,foo ,@(map twisty bar))))
+   "(mac johnny (foo bar) `(this ,foo ,@(map twisty bar)))"))
+
 (examples-for pp
+  ("a quote"
+   (pp '(quote a))
+   "'a")
+
+  ("unquote"
+   (pp '(unquote a))
+   ",a")
+
+  ("unquote-splicing"
+   (pp '(unquote-splicing a))
+   ",@a")
+
+  ("quasiquote"
+   (pp '(quasiquote a))
+   "`a")
+
+  ("quote unquote"
+   (pp '(quote (unquote a)))
+   "',a")
+
   ("a macro invocation"
    (pp '(mac pp/def (name args . body) `(hash-set pp/special-forms ',name (fn ,args ,@body))))
-   "(mac pp/def (name args body)\n    `(hash-set pp/special-forms ',name (fn ,args ,@body)))")
+   "(mac pp/def (name args . body)
+     `(hash-set pp/special-forms
+                ',name
+                (fn ,args ,@body)))")
 
   ("a 'def invocation"
    (pp '(def pp (form) (pp/main form 0)))
-   "(def pp (form)\n    (pp/main form 0))")
+   "(def pp (form) (pp/main form 0))")
+
+  ("a longer 'def invocation"
+   (pp '(def pp (form)
+          (pp/main form 0)
+          (pp/again form 1)
+          (pp/more (jump:skip form) 2)))
+   "(def pp (form)
+     (pp/main form 0)
+     (pp/again form 1)
+     (pp/more (jump:skip form) 2))")
+
+  ("a 'def with a dotted argument list"
+   (pp '(def afun (a b c . others)
+          (afun a b c (a (car others) (b (cdr others))))))
+   "(def afun (a b c . others)
+     (afun a
+           b
+           c
+           (a (car others) (b (cdr others)))))")
 
   ("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)
-    (if (eq? 'if (car form))
-      (let if-args (cdr form)
-        (cons (list 'if (car if-args)) (map list (cdr if-args))))
-      (or
-        (pp/find-breaks/mac form)
-        (list form))))")
+   "(def yoohoo (it) (wrangle \"foobar\" it))")
+
+  ("a 'let form"
+   (pp '(let acc nil
+            (rfnwith flattenize (x things)
+                     (if (pair? x)
+                         (eachr flattenize x)
+                         (push x acc)))
+            acc))
+   "(let acc nil
+     (rfnwith flattenize (x things)
+              (if (pair? x)
+                  (eachr flattenize x)
+                  (push x acc)))
+     acc)")
+
+
+  ("a real-life example from utils"
+   (pp '(def flatten (things)
+          (let acc nil
+            (rfnwith flattenize (x things)
+                     (if (pair? x)
+                         (eachr flattenize x)
+                         (push x acc)))
+            acc)))
+   "(def flatten (things)
+     (let acc nil
+          (rfnwith flattenize (x things)
+                   (if (pair? x)
+                       (eachr flattenize x)
+                       (push x acc)))
+          acc))")
+
+  ("a real-life example from utils"
+   (pp '(def list-slices (things slice-size)
+          ; slice 'things into a list of lists each with maximum 'slice-size items
+          (chapter pagination list-management)
+          (if (< (len things) slice-size)
+              (cons things nil)
+              (cons (firstn slice-size things)
+                    (list-slices (nthcdr slice-size things)
+                                 slice-size)))))
+   "(def list-slices (things slice-size)
+     ; slice 'things into a list of lists each with maximum 'slice-size items
+     (chapter pagination list-management)
+     (if (< (len things) slice-size)
+         (cons things nil)
+         (cons (firstn slice-size things)
+               (list-slices (nthcdr slice-size things)
+                            slice-size))))")
+
+  ("a real-life example from test-runner"
+   (pp '(def run-all-tests (verbose)
+          ; runs all tests that have been registered with 'register-test
+          (with (passed 0 failed 0)
+                (with (f-pass (fn nil (assign passed (+ 1 passed)))
+                              f-fail (fn nil (assign failed (+ 1 failed))))
+                      (run-tests `(suite "all tests" ,@all-tests) f-pass f-fail verbose)
+                      (p "passed: " passed)
+                      (p "failed: " failed)
+                      (/ passed (+ passed failed))))))
+   "(def run-all-tests (verbose)
+     ; runs all tests that have been registered with 'register-test
+     (with (passed 0 failed 0)
+           (with (f-pass (fn nil (assign passed (+ 1 passed)))
+                  f-fail (fn nil (assign failed (+ 1 failed))))
+                 (run-tests `(suite \"all tests\" ,@all-tests)
+                            f-pass
+                            f-fail
+                            verbose)
+                 (p \"passed: \" passed)
+                 (p \"failed: \" failed)
+                 (/ passed (+ passed failed)))))")
+
+
 
   ("special syntax"
    (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!\"")
 
-  ("perent-syntax"
+  ("percent-syntax"
    (pp '(percent-syntax || (dot-syntax x y)))
    "%x.y")
 
   ("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}})"))
+   "(&x { a 1 b \"two\" c 'three d ,four e (sub invocation) f { sub brace list } })"))