nendo 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52fb34bae2c7e139b4c7c4e588691c4e8f50710c
-  data.tar.gz: 91d2520addf241347ce2d8cac4ed0d7a0a800f88
+  metadata.gz: b9e43ea541a6bbdca2625d687abf0dae79d296a5
+  data.tar.gz: 01ae070b1e0f5feb02d5630967458b6f884f8a8f
 SHA512:
-  metadata.gz: 7e2ebca8704036e2440a2527988044a523a194a9aa17cc79c2b40af5888af74f58f6e071a14a5c64bb83fbefd6642603459d4e5d523448a0773c786ea415f315
-  data.tar.gz: 5ac568cdf1e22ffc86945bd2f5d76f9dd2828216622a5f4c6bf16c2950a8ffaefb83c676c0497dc0946d3b07e073e00e290355be8aa821246ab2a814d4afeba1
+  metadata.gz: 956fceccaefa4f7095a93e60940940bacfb7a131d02a952f4e6ac9ea0151e613abfc9e56a3dc0398e4e28263290241d71e2dc14b7d82d7f70183227a3a0c83e9
+  data.tar.gz: b5ae4669f881a267931485675063379a270b15731935bfa18847654fe59928240f5085393fbbf5ade76add5e2111cd522814acb6b93eb57055a21f798fa56c4f

data/Rakefile

@@ -54,23 +54,19 @@ task :test    => [:test1, :test2] do
 end
 
 task :test1 do
-  sh "ruby -I ./lib `which rspec` -b   ./test/nendo_spec.rb         "
-  sh "ruby -I ./lib `which rspec` -b   ./test/nendo_spec_2.rb         "
-  sh "ruby -I ./lib `which rspec` -b   ./test/nendo_spec_3.rb         "
-  sh "ruby -I ./lib `which rspec` -b   ./test/syntax_spec.rb        "
-  sh "ruby -I ./lib `which rspec` -b   ./test/testframework_spec.rb "
-  sh "ruby -I ./lib ./bin/nendo ./test/srfi-1-test.nnd"
+  sh "rspec -I ./lib -b "
+  sh "ruby -I ./lib ./bin/nendo ./spec/srfi-1-test.nnd"
 end
 
 task :test2 do
   sh "/bin/rm -f test.record"
   sh "echo "" > test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/textlib-test.nnd              >> test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/nendo-util-test.nnd           >> test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/json-test.nnd                 >> test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/srfi-2-test.nnd               >> test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/srfi-26-test.nnd              >> test.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/util-list-test.nnd            >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/textlib-test.nnd              >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/nendo-util-test.nnd           >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/json-test.nnd                 >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/srfi-2-test.nnd               >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/srfi-26-test.nnd              >> test.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/util-list-test.nnd            >> test.log"
   sh "cat test.record"
   sh "grep ' 0 failed, ' test.record  > /dev/null"
 end
@@ -78,8 +74,8 @@ end
 task :test3 do
   sh "/bin/rm -f test.record"
   sh "echo "" > test3.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/match-test.nnd                | tee -a test3.log"
-  sh "ruby -I ./lib ./bin/nendo ./test/util-combinations-test.nnd    | tee -a test3.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/match-test.nnd                | tee -a test3.log"
+  sh "ruby -I ./lib ./bin/nendo ./spec/util-combinations-test.nnd    | tee -a test3.log"
   sh "cat test.record"
   sh "grep ' 0 failed, ' test.record > /dev/null"
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
-:minor: 6
-:patch: 8
+:minor: 7
+:patch: 0

data/lib/nendo/init.nnd

@@ -169,7 +169,7 @@
     (string-join str-lst "")))
 
 (define (string=? a b)
-  (eq? a b))
+  (equal? a b))
 
 ;; ----------------------------------------
 ;; basic forms

data/lib/nendo/init.nndc

@@ -2204,9 +2204,9 @@ trampCall(
     trampCall(
           Proc.new { |_a,_b| 
               begin
-                  delayCall( '_eq_QUMARK',  'eq?',
+                  delayCall( '_equal_QUMARK',  'equal?',
                       begin
-                          trampCall(@_eq_QUMARK)
+                          trampCall(@_equal_QUMARK)
                       end                    ,
                   [
                         begin

data/lib/nendo/ruby/builtin_functions.rb

@@ -58,7 +58,7 @@ module Nendo
       a = a.intern if a.class == ParsedSymbol
       b = b.intern if b.class == ParsedSymbol
       if a.is_a? String  and  b.is_a? String
-        a === b
+        a == b
       elsif a.class != b.class
         false
       elsif a.is_a? Cell
@@ -68,7 +68,7 @@ module Nendo
       elsif a.is_a? Proc
         a == b
       else
-        (a === b)
+        (a == b)
       end
     end
 
@@ -276,7 +276,7 @@ module Nendo
         (0..num-1).to_a.to_list
       end
     end
-    def __EQMARK(      a,b )        _eq_QUMARK( a, b ) end
+    def __EQMARK(      a,b )        _equal_QUMARK( a, b ) end
     def __GTMARK(      a,b )        a >   b end
     def __GTMARK_EQMARK(      a,b ) a >=  b end
     def __LTMARK(      a,b )        a <   b end
@@ -284,7 +284,7 @@ module Nendo
     def _eq_QUMARK(      a,b )
       a = a.intern if a.class == ParsedSymbol
       b = b.intern if b.class == ParsedSymbol
-      a ==  b
+      a.equal?( b )
     end
     def _gt_QUMARK(      a,b )      a >   b end
     def _ge_QUMARK(      a,b )      a >=  b end
@@ -293,7 +293,7 @@ module Nendo
     def _eqv_QUMARK(     a,b )
       a = a.intern if a.class == ParsedSymbol
       b = b.intern if b.class == ParsedSymbol
-      a === b
+      a == b
     end
     def _car(      cell )          cell.car end
     def _cdr(      cell )

data/lib/nendo/ruby/core.rb

@@ -42,7 +42,7 @@ module Nendo
     end
 
     def self.version
-      "0.6.8"  ##NENDO-VERSION
+      "0.7.0"  ##NENDO-VERSION
     end
 
     attr_reader :evaluator

data/lib/nendo/ruby/types.rb

@@ -197,7 +197,7 @@ module Nendo
 
     def ==(other)
       if other.is_a? LispKeyword
-        self.key == other.key
+        self.key.intern == other.key.intern
       else
         false
       end
@@ -207,6 +207,10 @@ module Nendo
       self.==(other)
     end
 
+    def equal?(other)
+      self.==(other)
+    end
+
     def to_s
       self.key.to_s
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nendo
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Kiyoka Nishiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies: []
 description: Nendo is a programming language written in Ruby.
 email: kiyoka@sumibi.org
@@ -18,7 +18,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gemtest"
+- .gemtest
 - COPYING
 - History.txt
 - README.md
@@ -82,44 +82,29 @@ files:
 - lib/nendo/util/list.nndc
 - lib/nendo/util/match.nnd
 - lib/nendo/util/match.nndc
-- test/json-test.nnd
-- test/match-test.nnd
-- test/nendo-util-test.nnd
-- test/nendo_spec.rb
-- test/nendo_spec_2.rb
-- test/nendo_spec_3.rb
-- test/rspec_formatter_for_emacs.rb
-- test/srfi-1-test.nnd
-- test/srfi-2-test.nnd
-- test/srfi-26-test.nnd
-- test/syntax_spec.rb
-- test/testframework_spec.rb
-- test/textlib-test.nnd
-- test/util-combinations-test.nnd
-- test/util-list-test.nnd
 homepage: http://github.com/kiyoka/nendo
 licenses:
 - New BSD
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "-x"
+- -x
 - match.nndc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Nendo is a dialect of Lisp.

data/test/json-test.nnd

@@ -1,178 +0,0 @@
-;;-*- mode: nendo; syntax: scheme -*-
-;;;
-;;; json-test.nnd - test of json.nnd
-;;;  
-;;;   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
-;;;   
-;;;   Redistribution and use in source and binary forms, with or without
-;;;   modification, are permitted provided that the following conditions
-;;;   are met:
-;;;   
-;;;   1. Redistributions of source code must retain the above copyright
-;;;      notice, this list of conditions and the following disclaimer.
-;;;  
-;;;   2. Redistributions in binary form must reproduce the above copyright
-;;;      notice, this list of conditions and the following disclaimer in the
-;;;      documentation and/or other materials provided with the distribution.
-;;;  
-;;;   3. Neither the name of the authors nor the names of its contributors
-;;;      may be used to endorse or promote products derived from this
-;;;      software without specific prior written permission.
-;;;  
-;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-;;;  
-;;;  $Id: 
-;;;
-(use nendo.test)
-(use rfc.json)
-
-(test-start "json")
-
-;;===================================================================
-
-;;-------------------------------------------------------------------
-(test-section "json parser")
-
-(test* "string (1)"
-       '#( "str" )
-       (parse-json-string "[\"str\"]"))
-
-(test* "string (2)"
-       '#( "Ã" )
-       (parse-json-string "[\"Ã\"]"))
-
-(test* "string (3)"
-       '#( "Ã" "€" )
-       (parse-json-string "[ \"\\u00c3\", \"\\u20ac\" ]"))
-
-(test* "string (4)"
-       '#(nil)
-       (parse-json-string "[null]"))
-
-(test* "string (4)"
-       '#(nil)
-       (parse-json-string "[null]"))
-
-(test* "string (5)"
-       '#(#t)
-       (parse-json-string "[true]"))
-
-(test* "string (6)"
-       '#(#f)
-       (parse-json-string "[false]"))
-
-
-(test* "simple object (1)"
-       '()
-       (parse-json-string "{}"))
-(test* "simple object (2)"
-       '()
-       (parse-json-string " {   }   "))
-(test* "simple object (3)"
-       '(("a" . 23))
-       (parse-json-string "{ \"a\": 23  } "))
-(test* "simple object (4)"
-       '(("a" . 23) ("b" . 45))
-       (parse-json-string "{ \"a\": 23 , \"b\": 45  } "))
-
-(test* "arrays (1)"
-       '#(1 2 3)
-       (parse-json-string "[1,2,3]"))
-(test* "arrays (2)"
-       '#(#() #(#() #()))
-       (parse-json-string "[[],[[],[]]]"))
-(test* "arrays (3)"
-       '#(#(4)
-          #(#(5) #(6)))
-       (parse-json-string "[[4],[[5],[6]]]"))
-
-
-(define testdata-json-string
-  (string-join
-   '("["
-     "  { \"a\": 1, "
-     "    \"b\": 2, "
-     "    \"c\": { \"c1\": 10,"
-     "             \"c2\": 20 },"
-     "    \"d\": [ \"vec1\", \"vec2\", \"vec3\" ]"
-     "  },"
-     "  { \"true\"  : true , "
-     "    \"false\" : false , "
-     "    \"null\"  : null "
-     "  }"
-     "]")))
-
-(define testdata-lisp-object
-  '#(
-     (("a" . 1)
-      ("b" . 2)
-      ("c" . (
-              ("c1" . 10)
-              ("c2" . 20)))
-      ("d" . #("vec1" "vec2" "vec3")))
-     (("true"  . true)
-      ("false" . false)
-      ("null"  . nil))))
-
-
-(test* "array and hash (1)"
-       (write-to-string testdata-lisp-object)
-       (write-to-string (parse-json-string testdata-json-string)))
-
-
-(let1 sio (StringIO.new "{\"a\":23,\"b\":45}")
-  (test* "write to IO"
-         '(("a" . 23) ("b" . 45))
-         (parse-json sio)))
-
-
-
-;;-------------------------------------------------------------------
-(test-section "json constructor")
-
-(test* "string (1)"
-       "[\"str\"]"
-       (construct-json-string '#( "str" )))
-
-(test* "arrays (1)"
-       "[1,2,3]"
-       (construct-json-string '#(1 2 3)))
-(test* "arrays (2)"
-       "[[],[[],[]]]"
-       (construct-json-string '#(#() #(#() #()))))
-
-(test* "simple object (1)"
-       "{}"
-       (construct-json-string '()))
-(test* "simple object (2)"
-       "{\"a\":23}"
-       (construct-json-string '(("a" . 23))))
-(test* "simple object (3)"
-       "{\"a\":23,\"b\":45}"
-       (construct-json-string '(("a" . 23) ("b" . 45))))
-
-(test* "array and hash (1)"
-       (testdata-json-string.gsub #/[ ]/ "")
-       (construct-json-string testdata-lisp-object))
-
-(let1 sio (StringIO.new)
-  (test* "write to IO"
-         "{\"a\":23,\"b\":45}"
-         (begin
-           (construct-json '(("a" . 23) ("b" . 45)) sio)
-           (sio.rewind)
-           (sio.read))))
-
-
-;;===================================================================
-(test-end)

data/test/match-test.nnd

@@ -1,186 +0,0 @@
-;;-*- mode: nendo; syntax: scheme -*-;;
-;;
-;; match-test.nnd - test suite for util.match
-;;  
-;;   This file ported from chibi-scheme 0.3 by Alex Shinn.
-;;
-
-(use nendo.test)
-(use util.match)
-;;(use util.match-expanded)
-
-(test-start "match")
-(test-section "match")
-
-(define-syntax match-test*
-  (syntax-rules ()
-    ((_ title code result)
-     (test* title result code))))
-
-(define-syntax pending*
-  (syntax-rules ()
-    ((_ title code result)
-     (printf "(pending) [%s]\n" title))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; run tests
-(match-test* "any" (match 'any (_ 'ok)) 'ok)
-(match-test* "symbol" (match 'ok (x x)) 'ok)
-(match-test* "number" (match 28 (28 'ok)) 'ok)
-(match-test* "string" (match "good" ("bad" 'fail) ("good" 'ok)) 'ok)
-(match-test* "literal symbol" (match 'good ('bad 'fail) ('good 'ok)) 'ok)
-(match-test* "null" (match '() (() 'ok)) 'ok)
-(match-test* "pair" (match '(ok) ((x) x)) 'ok)
-(match-test* "vector" (match '#(ok) (#(x) x)) 'ok)
-(match-test* "any doubled" (match '(1 2) ((_ _) 'ok)) 'ok)
-(match-test* "and empty" (match '(o k) ((and) 'ok)) 'ok)
-(match-test* "and single" (match 'ok ((and x) x)) 'ok)
-(match-test* "and double" (match 'ok ((and (? symbol?) y) 'ok)) 'ok)
-(match-test* "or empty" (match '(o k) ((or) 'fail) (else 'ok)) 'ok)
-(match-test* "or single" (match 'ok ((or x) 'ok)) 'ok)
-(match-test* "or double" (match 'ok ((or (? symbol? y) y) y)) 'ok)
-(match-test* "not" (match 28 ((not (a . b)) 'ok)) 'ok)
-(match-test* "pred" (match 28 ((? number?) 'ok)) 'ok)
-(match-test* "named pred" (match 28 ((? number? x) (+ x 1))) 29)
-(match-test* "duplicate symbols pass" (match '(ok . ok) ((x . x) x)) 'ok)
-(match-test* "duplicate symbols fail" (match '(ok . bad) ((x . x) 'bad) (else 'ok)) 'ok)
-(match-test* "duplicate symbols samth" (match '(ok . ok) ((x . 'bad) x) (('ok . x) x)) 'ok)
-
-(match-test* "ellipses"
-            (match '((a . 1) (b . 2) (c . 3))
-              (((x . y) ___) (list x y)))
-            '((a b c) (1 2 3)))
-
-(match-test* "real ellipses"
-            (match '((a . 1) (b . 2) (c . 3))
-              (((x . y) ...) (list x y)))
-            '((a b c) (1 2 3)))
-
-(match-test* "vector ellipses"
-            (match '#(1 2 3 (a . 1) (b . 2) (c . 3))
-              (#(a b c (hd . tl) ...) (list a b c hd tl)))
-            '(1 2 3 (a b c) (1 2 3)))
-
-(match-test* "pred ellipses"
-            (match '(1 2 3)
-              (((? odd? n) ___) n)
-              (((? number? n) ___) n))
-            '(1 2 3))
-
-(match-test* "failure continuation"
-            (match '(1 2)
-              ((a . b) (=> next) (if (even? a) 'fail (next)))
-              ((a . b) 'ok))
-            'ok)
-
-(match-test* "let"
-            (match-let ((x 'ok) (y '(o k)))
-              y)
-            '(o k))
-
-(match-test* "let*"
-            (match-let* ((x 'f) (y 'o) ((z w) (list y x)))
-              (list x y z w))
-            '(f o o f))
-
-(match-test* "getter car"
-            (match '(1 . 2) (((get! a) . b) (list (a) b)))
-            '(1 2))
-
-(match-test* "getter cdr"
-            (match '(1 . 2) ((a . (get! b)) (list a (b))))
-            '(1 2))
-
-(match-test* "getter vector"
-            (match '#(1 2 3) (#((get! a) b c) (list (a) b c)))
-            '(1 2 3))
-
-(match-test* "setter car"
-            (let ((x (cons 1 2)))
-              (match x (((set! a) . b) (a 3)))
-              x)
-            '(3 . 2))
-
-(match-test* "setter cdr"
-            (let ((x (cons 1 2)))
-              (match x ((a . (set! b)) (b 3)))
-              x)
-            '(1 . 3))
-
-(match-test* "setter vector"
-            (let ((x (vector 1 2 3)))
-              (match x (#(a (set! b) c) (b 0)))
-              x)
-            '#(1 0 3))
-
-(match-test* "single tail"
-            (match '((a . 1) (b . 2) (c . 3))
-              (((x . y) ... last) (list x y last)))
-            '((a b) (1 2) (c . 3)))
-
-(match-test* "single tail 2"
-            (match '((a . 1) (b . 2) 3)
-              (((x . y) ... last) (list x y last)))
-            '((a b) (1 2) 3))
-
-(match-test* "multiple tail"
-            (match '((a . 1) (b . 2) (c . 3) (d . 4) (e . 5))
-              (((x . y) ... u v w) (list x y u v w)))
-            '((a b) (1 2) (c . 3) (d . 4) (e . 5)))
-
-(match-test* "Riastradh quasiquote"
-            (match '(1 2 3) (`(1 ,b ,c) (list b c)))
-            '(2 3))
-
-(match-test* "trivial tree search"
-            (match '(1 2 3) ((_ *** (a b c)) (list a b c)))
-            '(1 2 3))
-
-(match-test* "simple tree search"
-            (match '(x (1 2 3)) ((_ *** (a b c)) (list a b c)))
-            '(1 2 3))
-
-(match-test* "deep tree search"
-            (match '(x (x (x (1 2 3)))) ((_ *** (a b c)) (list a b c)))
-            '(1 2 3))
-
-(match-test* "non-tail tree search"
-            (match '(x (x (x a b c (1 2 3) d e f))) ((_ *** (a b c)) (list a b c)))
-            '(1 2 3))
-
-(match-test* "restricted tree search"
-            (match '(x (x (x a b c (1 2 3) d e f))) (('x *** (a b c)) (list a b c)))
-            '(1 2 3))
-
-(match-test* "fail restricted tree search"
-            (match '(x (y (x a b c (1 2 3) d e f)))
-              (('x *** (a b c)) (list a b c))
-              (else #f))
-            #f)
-
-;; /home2/home/kiyoka/work/github/nendo/lib/nendo.rb:2317: stack level too deep (SystemStackError)
-(match-test* "sxml tree search"
-    (match '(p (ul (li a (b c) (a (^ (href . "http://synthcode.com/")) "synthcode") d e f)))
-      (((or 'p 'ul 'li 'b) *** ('a ('^ attrs ...) text ...))
-       (list attrs text))
-      (else #f))
-  '(((href . "http://synthcode.com/")) ("synthcode")))
-
-;; /home2/home/kiyoka/work/github/nendo/lib/nendo.rb:2317: stack level too deep (SystemStackError)
-(match-test*  "failed sxml tree search"
-    (match '(p (ol (li a (b c) (a (^ (href . "http://synthcode.com/")) "synthcode") d e f)))
-      (((or 'p 'ul 'li 'b) *** ('a ('^ attrs ...) text ...))
-       (list attrs text))
-      (else #f))
-  #f)
-
-;; ./test/match-test.nnd:192: Error: undefined variable _tag (NameError)
-(match-test* "collect tree search"
-    (match '(p (ul (li a (b c) (a (^ (href . "http://synthcode.com/")) "synthcode") d e f)))
-      (((and tag (or 'p 'ul 'li 'b)) *** ('a ('^ attrs ...) text ...))
-       (list tag attrs text))
-      (else #f))
-  '((p ul li) ((href . "http://synthcode.com/")) ("synthcode")))
-
-(test-end)