nydp 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bdfc7b6cc359ea91871fc6ea2d46d454398e72
-  data.tar.gz: 8016a1174d6bbae50cded7bf9988ca50c5aefed9
+  metadata.gz: c06a0264cdd46d00dc6380d8e864fa5471742b9c
+  data.tar.gz: e154d0f6bf4bfdc48eb86daa8b28d41568683e6a
 SHA512:
-  metadata.gz: 3f85114925c5bcdda72ae5f76db10229527a9e30ec8b96ce71b39dbf24138e1dc5f8544652556ae3c6ae6344c7fa54310e073c9f10a4c94c261521c43149b23d
-  data.tar.gz: b771be6e0e3be575c490179144b0db49983361a80687f374fa2e00805a263070789fdfdec829077d3c8831e634f7e7f1a050e7c9b0aab67db6d6c4579984ccf4
+  metadata.gz: 695695ea3b5c9d70a13eec9d907d81b0b7e8f1fefe7d5a7f6d5e1e4b81c6e68b05ba938e7a1c5a6ed15ddb05b837a069e44b4f5c19fdbbad05541d3404f11856
+  data.tar.gz: b01929361f8ee8f8c19e00d6fcac70164b6e584b2f4ea890ae5b643ca03a3fda6a972ecb50cecdb34964ad5995ddb854e80c6c396e876b3027b0511bf52e065b

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

@@ -38,18 +38,6 @@
 (def string-pieces pieces
   (joinstr "" pieces))
 
-(def detect (f things)
-  ; if 'things is a list, return the first item in the list for which 'f returns non-nil
-  ; otherwise, return 'things if (f things) is non-nil
-  ; otherwise, nil
-  (if (pair? things)
-      (let it (car things)
-        (or
-         (and (f it) it)
-         (detect f (cdr things))))
-      (f things)
-      things))
-
 (def collect (f things)
   ; if 'things is a list, return all the items in the list for which 'f returns non-nil
   ; otherwise, return 'things if (f things) is non-nil
@@ -200,8 +188,33 @@
   ; 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))))
+  (fn args
+      (apply func
+             (joinlists args1
+                        args))))
+
+(def detect (f things)
+  ; if 'f is a function,
+  ;   if 'things is a list, return the first item in the list for which 'f returns non-nil
+  ;   otherwise, return 'things if (f things) is non-nil
+  ;   otherwise, nil
+  ; if 'f is not a function, self-invoke with a function checking for equality with f
+  ;
+  ; WARNING: if the detected thing is nil, returns t instead. A return value of nil
+  ; means the thing was not found ; non-nil means the thing was found, including when
+  ; the found thing is itself nil.
+  (if (isa 'fn f)
+      (rfnwith d (items things)
+                 (if (pair? items)
+                     (let it (car items)
+                       (or
+                        (and (f it)
+                             (or it t))
+                        (d:cdr items)))
+                     (f items)
+                     items))
+      (detect (curry eq? f)
+              things)))
 
 (def tuples (n things)
   ;; split things into a list of lists each n long

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

@@ -0,0 +1,4 @@
+(def include? (thing things)
+  ; alias for 'detect
+  ; true if thing is in things, nil otherwise
+  (detect thing things))

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

@@ -1,20 +1,22 @@
 (examples-for date
- ("creates a single date"          (to-string (date 1965 6 8))                                 "1965-06-08" )
- ("navigates to next day"          (let d (date 2004  3 11) (to-string d.tomorrow))            "2004-03-12" )
- ("navigates to previous day"      (let d (date 2006  6 22) (to-string d.yesterday))           "2006-06-21" )
- ("navigates to previous year"     (let d (date 1971 12 18) (to-string d.last-year))           "1970-12-18" )
- ("navigates to next year"         (let d (date 1974  1 11) (to-string d.next-year))           "1975-01-11" )
- ("navigates to previous month"    (let d (date 1971 12 18) (to-string d.last-month))          "1971-11-18" )
- ("navigates to next month"        (let d (date 1974  1 11) (to-string d.next-month))          "1974-02-11" )
- ("jumps a year to previous month" (let d (date 1974  1 11) (to-string d.last-month))          "1973-12-11" )
- ("navigates to previous week"     (let d (date 2008  2 16) (to-string d.last-week))           "2008-02-09" )
- ("navigates to next week"         (let d (date 1972 11 13) (to-string d.next-week))           "1972-11-20" )
- ("navigates to year start"        (let d (date 1972 11 13) (to-string d.beginning-of-year))   "1972-01-01" )
- ("navigates to year end"          (let d (date 1972 11 13) (to-string d.end-of-year))         "1972-12-31" )
- ("navigates to month start"       (let d (date 1971 11 18) (to-string d.beginning-of-month))  "1971-11-01" )
- ("navigates to month end"         (let d (date 1971 11 18) (to-string d.end-of-month))        "1971-11-30" )
- ("navigates to week start"        (let d (date 2015 11  6) (to-string d.beginning-of-week))   "2015-11-02" )
- ("navigates to week end"          (let d (date 2015 11  6) (to-string d.end-of-week))         "2015-11-08" )
+ ("creates a single date"            (to-string (date 1965 6 8))                                 "1965-06-08" )
+ ("navigates to next day"            (let d (date 2004  3 11) (to-string d.tomorrow))            "2004-03-12" )
+ ("navigates to previous day"        (let d (date 2006  6 22) (to-string d.yesterday))           "2006-06-21" )
+ ("navigates to previous year"       (let d (date 1971 12 18) (to-string d.last-year))           "1970-12-18" )
+ ("navigates to next year"           (let d (date 1974  1 11) (to-string d.next-year))           "1975-01-11" )
+ ("navigates to previous month"      (let d (date 1971 12 18) (to-string d.last-month))          "1971-11-18" )
+ ("navigates to next month"          (let d (date 1974  1 11) (to-string d.next-month))          "1974-02-11" )
+ ("jumps a year to previous month"   (let d (date 1974  1 11) (to-string d.last-month))          "1973-12-11" )
+ ("navigates to previous week"       (let d (date 2008  2 16) (to-string d.last-week))           "2008-02-09" )
+ ("navigates to next week"           (let d (date 1972 11 13) (to-string d.next-week))           "1972-11-20" )
+ ("navigates to year start"          (let d (date 1972 11 13) (to-string d.beginning-of-year))   "1972-01-01" )
+ ("navigates to year end"            (let d (date 1972 11 13) (to-string d.end-of-year))         "1972-12-31" )
+ ("navigates to month start"         (let d (date 1971 11 18) (to-string d.beginning-of-month))  "1971-11-01" )
+ ("navigates to month end"           (let d (date 1971 11 18) (to-string d.end-of-month))        "1971-11-30" )
+ ("navigates to week start"          (let d (date 2015 11  6) (to-string d.beginning-of-week))   "2015-11-02" )
+ ("navigates to week start from sun" (let d (date 2015 11  1) (to-string d.beginning-of-week))   "2015-10-26" )
+ ("navigates to week end from sun"   (let d (date 2015 11  1) (to-string d.end-of-week))         "2015-11-01" )
+ ("navigates to week end"            (let d (date 2015 11  6) (to-string d.end-of-week))         "2015-11-08" )
 
  ("can act as hash key"
   (with (h {} d (date 2015 11 8))

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

@@ -9,10 +9,13 @@
            (list "foo" "bar" "xx" "pp"))
    nil)
 
-  ;; kind of pointless
-  ("returns nil if nil is the matching item"
+  ("returns t if nil is the matching item (warning: anomalous behaviour)"
    (detect no (list "foo" "bar" nil "pp"))
-   nil)
+   t)
+
+  ("finds first non-nil item using x1"
+   (detect x1 (list nil nil "foo" "bar" nil "pp"))
+   "foo")
 
   ("returns item if it's an atom and matches"
    (detect (fn (x) (eq? (len x) 2)) "zz")
@@ -21,4 +24,24 @@
   ("returns nil if it's an atom and doesn't match"
    (detect (fn (x) (eq? (len x) 20))
            "zz")
+   nil)
+
+  ("nil for nil"
+   (detect nil nil)
+   nil)
+
+  ("true for nil in list containing nil"
+   (detect nil '(1 2 nil 3 4))
+   t)
+
+  ("nil for nil in list not containing nil"
+   (detect nil '(1 2 3 4 5))
+   nil)
+
+  ("true for 42 in list containing 42"
+   (detect 42 '(1 2 nil 3 42 4))
+   42)
+
+  ("nil for 42 in list not containing 42"
+   (detect 42 '(1 2 nil 3 (a b c) 4))
    nil))

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

@@ -9,6 +9,44 @@
      (cons (hash-keys h) (mapx (hash-keys h) k h.,k)))
    ((a "b" 3 b) 99 2 "foo" 98)))
 
+(examples-for hash-keys
+  ("returns nil for a number"  (hash-keys 1)          nil)
+  ("returns nil for nil"       (hash-keys nil)        nil)
+  ("returns nil for a string"  (hash-keys "hello")    nil)
+  ("returns nil for a symbol"  (hash-keys 'lipstick)  nil)
+
+  ("returns date operations"
+   (hash-keys (date 2015 11 18))
+   (beginning_of_month
+    beginning_of_week
+    beginning_of_year
+    day
+    end_of_month
+    end_of_week
+    end_of_year
+    friday?
+    last_month
+    last_week
+    last_year
+    monday?
+    month
+    next_month
+    next_week
+    next_year
+    saturday?
+    sunday?
+    thursday?
+    tomorrow
+    tuesday?
+    wednesday?
+    week_day
+    year
+    yesterday))
+
+  ("returns keys of a given hash"
+   (hash-keys {a 1 b 2 c { x 99 y 98 z 97 }})
+   (a b c)))
+
 (examples-for hash-key?
   ("detects key presence"
    (hash-key? { foo 1 bar 2 } 'foo)

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

@@ -0,0 +1,20 @@
+(examples-for include?
+  ("nil for nil"
+   (include? nil nil)
+   nil)
+
+  ("true for nil in list containing nil"
+   (include? nil '(1 2 nil 3 4))
+   t)
+
+  ("nil for nil in list not containing nil"
+   (include? nil '(1 2 3 4 5))
+   nil)
+
+  ("true for 42 in list containing 42"
+   (include? 42 '(1 2 nil 3 42 4))
+   42)
+
+  ("nil for 42 in list not containing 42"
+   (include? 42 '(1 2 nil 3 (a b c) 4))
+   nil))

data/lib/nydp/builtin/hash.rb

@@ -65,11 +65,12 @@ class Nydp::Builtin::HashKeys
   def initialize ns ; @ns = ns; end
   def builtin_invoke vm, args
     hash = args.car
-    case hash
-    when Nydp::Hash
+    if hash.is_a? Nydp::Hash
       vm.push_arg Nydp::Pair.from_list hash.keys
+    elsif hash.respond_to?(:keys)
+      vm.push_arg r2n(hash.keys.to_a.sort, ns)
     else
-      vm.push_arg r2n(hash.keys, ns)
+      vm.push_arg Nydp.NIL
     end
   end
 end

data/lib/nydp/date.rb

@@ -58,8 +58,8 @@ module Nydp
 
     def last_week          y, m, d, w ; ruby_date - 7                ; end
     def next_week          y, m, d, w ; ruby_date + 7                ; end
-    def beginning_of_week  y, m, d, w ; ruby_date + 1 - w            ; end
-    def end_of_week        y, m, d, w ; ruby_date + 7 - w            ; end
+    def beginning_of_week  y, m, d, w ; ruby_date - ((w - 1) % 7)    ; end
+    def end_of_week        y, m, d, w ; ruby_date + ((7 - w) % 7)    ; end
 
     def yesterday          y, m, d, w ; ruby_date - 1                ; end
     def tomorrow           y, m, d, w ; ruby_date + 1                ; end
@@ -68,7 +68,8 @@ module Nydp
       class_eval "def #{n} * ; ruby_date.#{n} ; end"
     end
 
-    def dispatch key, y, m, d, w ; self.send(key, y, m, d, w) if @@keys.include?(key) ; end
+    def keys                     ; @@keys                                           ; end
+    def dispatch key, y, m, d, w ; self.send(key, y, m, d, w) if keys.include?(key) ; end
 
     def [] key
       key = key.to_s.gsub(/-/, '_').to_sym

data/lib/nydp/truth.rb

@@ -11,7 +11,7 @@ module Nydp
     def car         ; self          ; end
     def cdr         ; self          ; end
     def size        ; 0             ; end
-    def is?   other ; (self.equal? other) ; end
+    def is?   other ; other.class == self.class ; end
     def isnt? other ; !is?(other)   ; end
     def to_s        ; ""            ; end
     def + other     ; other         ; end

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/lisp/core-070-prefix-list.nydp
 - lib/lisp/core-080-pretty-print.nydp
 - lib/lisp/core-090-hook.nydp
+- lib/lisp/core-100-utils.nydp
 - lib/lisp/tests/add-hook-examples.nydp
 - lib/lisp/tests/best-examples.nydp
 - lib/lisp/tests/boot-tests.nydp
@@ -115,6 +116,7 @@ files:
 - lib/lisp/tests/explain-mac-examples.nydp
 - lib/lisp/tests/foundation-test.nydp
 - lib/lisp/tests/hash-examples.nydp
+- lib/lisp/tests/include-examples.nydp
 - lib/lisp/tests/invocation-tests.nydp
 - lib/lisp/tests/isa-examples.nydp
 - lib/lisp/tests/len-examples.nydp