nydp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4074a517649b09d3911d3b593e19ff0f0bc6d66
-  data.tar.gz: cf2d6625885b45055f2e09601dc5914da308d5e2
+  metadata.gz: a7f1dacf6f22c7cd5db09de064fe3cdd11a76654
+  data.tar.gz: 530d35d6fc54b082edb788eec8ccb15078c09582
 SHA512:
-  metadata.gz: 722eb57b1b40efaed06e432f3d70e00e18cda57ccef51b404f755b4b35dab3456a68a3542bb2185e68a22c5c1b2463c0320b5a223fa6901c1240ad542c07a0f3
-  data.tar.gz: 4d5a6a702eb006751548d594515022f1c2e2f8b2697d45b95973db83abb2ad2d53d29d6495fbde9281f21c9ae98bf02e87b5b6c19e6ae9c053ad9152804f41d8
+  metadata.gz: 84db7216bd92545097e6b0dc3f827620c45b80261d3bbdfb18e7f0dfb70dca2b5d3078dfd07be3a0ef5fa107ad2363f9cc66e94a21b1a4b8b09a40c0cb87451a
+  data.tar.gz: 07c739e5165a3c857a43d8c2e04088562897dcede3283a9ae572620a09f24b6cf8836efcb84f8fcd0985a424c24db675c77acff178ed03a43692bd857877d82b

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

@@ -200,3 +200,19 @@
   ; for the old function
   (fn args2
       (apply func (joinlists args1 args2))))
+
+(def tuples (n things)
+  ;; split things into a list of lists each n long
+  (rfnwith _ (list things)
+           (if (no list)
+               nil
+               (cons (firstn n list) (_ (nthcdr n list))))))
+
+(def range (start stop)
+  ; return a list containing the range
+  ; of elements starting with 'start, up
+  ; to but not including 'stop
+  (if (< start stop)
+      (cons start
+            (range (+ start 1)
+                   stop))))

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

@@ -11,6 +11,8 @@
   ("<"               (inspect <               ) "builtin/<"               )
   ("eval"            (inspect eval            ) "builtin/eval"            )
   ("hash"            (inspect hash            ) "builtin/hash"            )
+  ("date"            (inspect date            ) "builtin/date"            )
+  ("today"           (inspect today           ) "builtin/today"           )
   ("error"           (inspect error           ) "builtin/error"           )
   ("apply"           (inspect apply           ) "builtin/apply"           )
   ("error"           (inspect error           ) "builtin/error"           )

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

@@ -0,0 +1,8 @@
+(examples-for range
+  ("produces a range of integers"
+   (range 10 20)
+   (10 11 12 13 14 15 16 17 18 19))
+
+  ("produces a range of dates"
+   (to-string:range (date 2015 11 20) (date 2015 11 25))
+   "(2015-11-20 2015-11-21 2015-11-22 2015-11-23 2015-11-24)"))

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

@@ -0,0 +1,16 @@
+(examples-for tuples
+  ("returns nil for nil"
+   (tuples 3 nil)
+   nil)
+
+  ("returns single list for fewer than n items"
+   (tuples 4 '(a b) )
+   ((a b nil nil)))
+
+  ("returns exactly one list for exactly n items"
+   (tuples 5 '(a b c d e) )
+   ((a b c d e)))
+
+  ("returns the given list split into sublist each having n items"
+   (tuples 3 '(a b c d e f g) )
+   ((a b c) (d e f) (g nil nil))))

data/lib/nydp/builtin/plus.rb

@@ -2,7 +2,14 @@ class Nydp::Builtin::Plus
   include Nydp::Builtin::Base
 
   def builtin_invoke vm, args
-    vm.push_arg sum(args, origin(args.car))
+    vm.push_arg case args.car
+                when Fixnum, Nydp::Date
+                  sum(args.cdr, args.car)
+                when Nydp::Pair
+                  sum(args, Nydp.NIL)
+                when String, Nydp::StringAtom
+                  sum(args, Nydp::StringAtom.new(""))
+                end
   end
 
   def sum args, accum
@@ -13,16 +20,5 @@ class Nydp::Builtin::Plus
     end
   end
 
-  def origin obj
-    case obj
-    when Fixnum
-      0
-    when Nydp::Pair
-      Nydp.NIL
-    when String, Nydp::StringAtom
-      Nydp::StringAtom.new ""
-    end
-  end
-
   def name ; "+" ; end
 end

data/lib/nydp/builtin/today.rb

@@ -5,3 +5,14 @@ class Nydp::Builtin::Today
     vm.push_arg(Nydp::Date.new Date.today)
   end
 end
+
+class Nydp::Builtin::Date
+  include Nydp::Helper, Nydp::Builtin::Base
+
+  def builtin_invoke vm, args
+    y = args.car
+    m = args.cdr.car
+    d = args.cdr.cdr.car
+    vm.push_arg(Nydp::Date.new Date.new(y,m,d))
+  end
+end

data/lib/nydp/core.rb

@@ -34,6 +34,7 @@ module Nydp
       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(:date,  ns).assign(Nydp::Builtin::Date.new)
       Symbol.mk(:error, ns).assign(Nydp::Builtin::Error.new)
       Symbol.mk(:parse, ns).assign(Nydp::Builtin::Parse.new(ns))
       Symbol.mk(:p,     ns).assign(Nydp::Builtin::Puts.new)
@@ -55,6 +56,7 @@ module Nydp
       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("today"          , ns).assign(Nydp::Builtin::Today.new)
       Symbol.mk("thread-locals"  , ns).assign(Nydp::Builtin::ThreadLocals.new)
       Symbol.mk("type-of",      ns).assign(Nydp::Builtin::TypeOf.new(ns))
       Symbol.mk(:"eq?",         ns).assign(Nydp::Builtin::IsEqual.new)

data/lib/nydp/date.rb

@@ -20,6 +20,10 @@ module Nydp
     def to_ruby   ; ruby_date         ; end
     def inspect   ; ruby_date.inspect ; end
     def nydp_type ; :date             ; end
+    def - other   ; r2n(ruby_date - other.ruby_date, nil) ; end
+    def + int     ; r2n(ruby_date + int            , nil) ; end
+    def > other   ; ruby_date > other.ruby_date           ; end
+    def < other   ; ruby_date < other.ruby_date           ; end
 
     @@keys = Set.new %i{
       year       month      week_day           day

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/date_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Nydp::Date do
 
-  let(:ns) { { } }
+  let(:ns) { { }           }
+  let(:vm) { Nydp::VM.new  }
 
   it "converts ruby Date to Nydp::Date" do
     rd = Date.parse "2015-06-08"
@@ -14,6 +15,14 @@ describe Nydp::Date do
     expect(nd.to_ruby).to eq Date.parse("2015-06-08")
   end
 
+  it "creates a new date" do
+    df = Nydp::Builtin::Date.new
+    df.invoke vm, pair_list([2015, 11, 18])
+    nd = vm.pop_arg
+    expect(nd).to be_a Nydp::Date
+    expect(nd.ruby_date).to eq Date.parse("2015-11-18")
+  end
+
   it "returns date components" do
     rd = Date.parse "2015-06-08"
     nd = Nydp.r2n rd, ns
@@ -23,6 +32,64 @@ describe Nydp::Date do
     expect(nd[:day]).  to eq 8
   end
 
+  describe "date maths" do
+    let(:d0) { Nydp.r2n Date.today, ns       }
+    let(:d1) { Nydp.r2n (Date.today + 6), ns }
+
+    it "works with builtin minus" do
+      minus = Nydp::Builtin::Minus.new
+
+      minus.invoke vm, pair_list([d1, d0])
+      diff = vm.pop_arg
+
+      expect(d0).to be_a Nydp::Date
+      expect(diff).to eq 6
+    end
+
+    it "works with builtin greater-than when true" do
+      f = Nydp::Builtin::GreaterThan.new
+
+      f.invoke vm, pair_list([d1, d0])
+
+      expect(vm.pop_arg).to eq Nydp.T
+    end
+
+    it "works with builtin greater-than when false" do
+      f = Nydp::Builtin::GreaterThan.new
+
+      f.invoke vm, pair_list([d0, d1])
+
+      expect(vm.pop_arg).to eq Nydp.NIL
+    end
+
+    it "works with builtin less-than when true" do
+      f = Nydp::Builtin::LessThan.new
+
+      f.invoke vm, pair_list([d0, d1])
+
+      expect(vm.pop_arg).to eq Nydp.T
+    end
+
+    it "works with builtin less-than when false" do
+      f = Nydp::Builtin::LessThan.new
+
+      f.invoke vm, pair_list([d1, d0])
+
+      expect(vm.pop_arg).to eq Nydp.NIL
+    end
+
+    it "works with builtin plus" do
+      plus = Nydp::Builtin::Plus.new
+
+      plus.invoke vm, pair_list([d0, 5])
+      sum = vm.pop_arg
+
+      expect(d0) .to be_a Nydp::Date
+      expect(sum).to be_a Nydp::Date
+      expect(sum.ruby_date).to eq(Date.today + 5)
+    end
+  end
+
   it "returns relative dates by year" do
     rd = Date.parse "2015-06-08"
     nd = Nydp.r2n rd, ns

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,9 +117,11 @@ files:
 - lib/lisp/tests/parser-tests.nydp
 - lib/lisp/tests/pretty-print-tests.nydp
 - lib/lisp/tests/quasiquote-examples.nydp
+- lib/lisp/tests/range-examples.nydp
 - lib/lisp/tests/rfnwith-tests.nydp
 - lib/lisp/tests/string-tests.nydp
 - lib/lisp/tests/syntax-tests.nydp
+- lib/lisp/tests/tuples-examples.nydp
 - lib/lisp/tests/type-of-examples.nydp
 - lib/lisp/tests/unparse-tests.nydp
 - lib/nydp.rb