shen-ruby 0.3.1 → 0.4.0

data/shen/release/test_programs/README.shen

@@ -9,7 +9,7 @@ following.
 
   *\
 
-(package test-harness- [report reset ok passed failed]
+(package test-harness [report reset ok passed failed]
 
 (define reset
   -> (set *passed* (set *failed* 0)))

data/shen/release/test_programs/classes-typed.shen

@@ -1,7 +1,7 @@
 (declare defclass [symbol --> [list [symbol * symbol]] --> symbol])
 
 (define defclass
-   Class ClassDef -> (let Attributes (map fst ClassDef)
+   Class ClassDef -> (let Attributes (map (function fst) ClassDef)
                           Types (record-attribute-types Class ClassDef)
                           Assoc (map (/. Attribute [Attribute | fail]) Attributes)
                           ClassDef [[class | Class] | Assoc]

data/shen/release/test_programs/interpreter.shen

@@ -101,9 +101,9 @@
 
 (define normal_form
   {l_formula --> l_formula}
-   X -> (fix ==> X))                 
+   X -> (fix ==>> X))                 
     
-(define ==>
+(define ==>>
    {l_formula --> l_formula}
    [= X Y] -> (let X* (normal_form X) 
                    (let Y* (normal_form Y) 

data/shen/release/test_programs/metaprog.shen

@@ -10,7 +10,7 @@
   [_ Output] -> Output)
 
 (define generate_parser
-  Grammar -> (map compile_rules (group_rules (parenthesise_rules Grammar))))
+  Grammar -> (map (/. X (compile_rules X)) (group_rules (parenthesise_rules Grammar))))
 
 (define parenthesise_rules
   [S --> | Rest] -> (parenthesise_rules1 [S -->] Rest))
@@ -76,7 +76,7 @@
 (define generate_code_for_lex
   Rules -> (eval (append [define (get_characteristic_non_terminal Rules)
                                    (protect X) -> [fail]  where [= (protect X) [fail]]
-                                   | (mapapp gcfl_help Rules)]
+                                   | (mapapp (function gcfl_help) Rules)]
                                    [(protect X) -> [fail]])))
 
 (define gcfl_help

data/shen/release/test_programs/prolog.shen

@@ -0,0 +1,79 @@
+(defprolog f
+     a <--;)   
+
+(defprolog g
+  a <-- ! (f b);
+  X <-- (f a);) 
+
+(defprolog mem
+  X [X | _] <--;
+  X [Y | Z] <-- (mem X Z);)  
+
+(defprolog app 
+  [] X X <--;
+  [X | Y] W [X | Z] <-- (app Y W Z);) 
+
+(defprolog rev
+  [] [] <--;
+  [X | Y] Z <-- (rev Y W) (app W [X] Z);) 
+ 
+(defprolog enjoys
+  willi X <-- (likes mark X);
+  mark chocolate <--;
+  mark tea <--;) enjoys
+ 
+(defprolog fads
+  X <-- (findall Y [enjoys X Y] Friends) (return Friends);) fads
+    
+(defprolog prop
+  A C <-- (proph [[~  C] | A]);) prop
+
+(defprolog proph
+  A <-- (mem [~ P] A) (mem P A) !;
+       A <-- (consistent A) ! (when false);
+       (mode [[P & Q] | A] -) <-- ! (proph [P Q | A]);
+       (mode [[P <=> Q] | A] -) <-- ! (proph [[P => Q] [Q => P] | A]);
+       (mode [[P => Q] | A] -) <-- ! (proph [[[~ P] v Q] | A]);
+       (mode [[~ [P v Q]] | A] -)  <-- ! (proph [[~ P] [~ Q] | A]);
+       (mode [[~ [P & Q]] | A] -) <-- ! (proph [[[~ P] v [~ Q]] | A]);
+       (mode [[~ [P => Q]] | A] -) <-- ! (proph [P [~ Q] | A]);
+       (mode [[~ [P <=> Q]] | A] -) <-- ! (proph [[~ [[P => Q] v [~ [Q => P]]]] | A]);
+       (mode [[P & Q] | A] -) <-- !  (proph [P Q | A]);
+       (mode [[P v Q] | A] -) <-- !  (proph [P | A]) ! (proph [Q | A]);
+       (mode [P | Ps] -) <-- (app Ps [P] Qs) ! (proph Qs);) 
+
+      (defprolog consistent
+         [] <--;
+         [P | Ps] <-- (when (symbol? P)) ! (consistent Ps);
+         [[~ P] | Ps] <-- (when (symbol? P)) ! (consistent Ps);) 
+
+      (defprolog app
+         [] X X <--;
+         (mode [X | Y] -) W [X | Z] <-- (app Y W Z);) 
+
+      (defprolog mem
+         X (mode [X | _] -) <--;
+         X (mode [_ | Y] -) <-- (mem X Y);) 
+
+      (defprolog mapit
+         _  []  [] <--;
+         Pred [X | Y] [W | Z] <-- (call [Pred X W])  (mapit Pred Y Z);) 
+
+       (defprolog consit
+         X [1 X] <--;) 
+
+        (defprolog different
+          X Y <--  (~ [identical X Y]);) 
+
+        (defprolog ~
+          P <-- (call P) ! (when false);
+          _ <--;) 
+
+        (defprolog likes
+           john  X <-- (tall X)  (pretty X);) 
+
+        (defprolog tall
+           mary <--;) 
+
+        (defprolog pretty
+           mary <--;) 

data/shen/release/test_programs/structures-typed.shen

@@ -1,7 +1,7 @@
 (define defstruct
   Name Slots 
-  -> (let Attributes (map fst Slots)
-          Types (map snd Slots)
+  -> (let Attributes (map (function fst) Slots)
+          Types (map (function snd) Slots)
           Selectors (selectors Name Attributes)
           Constructor (constructor Name Attributes)
           Recognisor (recognisor Name)

data/shen/release/test_programs/tests.shen

@@ -1,84 +1,23 @@
 (maxinferences 10000000000)
 
 (report prolog-tests
-   (defprolog f
-     a <--;)   f 
+   (load "prolog.shen") loaded 
    (prolog? (f a)) true
-   (defprolog g
-     a <-- ! (f b);
-     X <-- (f a);) g
-    (prolog? (g a)) false
-    (prolog? (g b)) true
-   (defprolog mem
-      X [X | _] <--;
-      X [Y | Z] <-- (mem X Z);)  mem
-    (prolog? (mem 1 [X | 2]) (return X)) 1
-    (defprolog app 
-      [] X X <--;
-      [X | Y] W [X | Z] <-- (app Y W Z);) app
-    (defprolog rev
-      [] [] <--;
-      [X | Y] Z <-- (rev Y W) (app W [X] Z);) rev
-     (prolog? (rev [1 2] X) (return X)) [2 1]
-     (load "einstein.shen") loaded
-     (prolog? (einsteins_riddle X) (return X)) german 
-     (defprolog enjoys
-        willi X <-- (likes mark X);
-        mark chocolate <--;
-        mark tea <--;) enjoys
-     (prolog? (enjoys mark X) (return X)) chocolate  
-     (defprolog fads
-       X <-- (findall Y [enjoys X Y] Friends) (return Friends);) fads
-     (prolog? (fads mark)) [tea chocolate]
-     (defprolog prop
-        A C <-- (proph [[~  C] | A]);) prop
-     (defprolog proph
-       A <-- (mem [~ P] A) (mem P A) !;
-       A <-- (consistent A) ! (when false);
-       (mode [[P & Q] | A] -) <-- ! (proph [P Q | A]);
-       (mode [[P <=> Q] | A] -) <-- ! (proph [[P => Q] [Q => P] | A]);
-       (mode [[P => Q] | A] -) <-- ! (proph [[[~ P] v Q] | A]);
-       (mode [[~ [P v Q]] | A] -)  <-- ! (proph [[~ P] [~ Q] | A]);
-       (mode [[~ [P & Q]] | A] -) <-- ! (proph [[[~ P] v [~ Q]] | A]);
-       (mode [[~ [P => Q]] | A] -) <-- ! (proph [P [~ Q] | A]);
-       (mode [[~ [P <=> Q]] | A] -) <-- ! (proph [[~ [[P => Q] v [~ [Q => P]]]] | A]);
-       (mode [[P & Q] | A] -) <-- !  (proph [P Q | A]);
-       (mode [[P v Q] | A] -) <-- !  (proph [P | A]) ! (proph [Q | A]);
-       (mode [P | Ps] -) <-- (app Ps [P] Qs) ! (proph Qs);) proph
-      (defprolog consistent
-         [] <--;
-         [P | Ps] <-- (when (symbol? P)) ! (consistent Ps);
-         [[~ P] | Ps] <-- (when (symbol? P)) ! (consistent Ps);) consistent
-      (defprolog app
-         [] X X <--;
-         (mode [X | Y] -) W [X | Z] <-- (app Y W Z);) app
-      (defprolog mem
-         X (mode [X | _] -) <--;
-         X (mode [_ | Y] -) <-- (mem X Y);) mem 
-      (prolog? (prop [] [p <=> p]))  true 
-      (defprolog mapit
-         _  []  [] <--;
-         Pred [X | Y] [W | Z] <-- (call [Pred X W])  (mapit Pred Y Z);) mapit
-       (defprolog consit
-         X [1 X] <--;) consit
-        (prolog? (mapit consit [1 2 3] Out) (return Out)) 
-                 [[1 1] [1 2] [1 3]] 
-        (defprolog different
-          X Y <--  (~ [identical X Y]);) different
-        (defprolog ~
-          P <-- (call P) ! (when false);
-          _ <--;) ~
-        (prolog? (different a b)) true 
-        (prolog? (different a a)) false 
-        (defprolog likes
-           john  X <-- (tall X)  (pretty X);) likes
-        (defprolog tall
-           mary <--;) tall
-        (defprolog pretty
-           mary <--;) pretty
-        (prolog? (likes john Who) (return Who)) mary 
-        (load "parse.prl") loaded
-        (prolog? (pparse ["the" + ["boy" + "jumps"]] 
+   (prolog? (g a)) false
+   (prolog? (g b)) true
+   (prolog? (mem 1 [X | 2]) (return X)) 1
+   (prolog? (rev [1 2] X) (return X)) [2 1]
+   (load "einstein.shen") loaded
+   (prolog? (einsteins_riddle X) (return X)) german 
+   (prolog? (enjoys mark X) (return X)) chocolate  
+   (prolog? (fads mark)) [tea chocolate]
+   (prolog? (prop [] [p <=> p]))  true 
+   (prolog? (mapit consit [1 2 3] Out) (return Out)) [[1 1] [1 2] [1 3]] 
+   (prolog? (different a b)) true 
+   (prolog? (different a a)) false 
+   (prolog? (likes john Who) (return Who)) mary 
+   (load "parse.prl") loaded
+   (prolog? (pparse ["the" + ["boy" + "jumps"]] 
                         [[s = [np + vp]] 
                           [np = [det + n]]
                           [det = "the"]
@@ -223,7 +162,7 @@
  (report "yacc"
    (load "yacc.shen") loaded
    (compile <sent> [the cat likes the dog]) [the cat likes the dog]
-   (compile <sent> [the cat likes the canary]) (fail)
+   (compile <sent> [the cat likes the canary] (/. E (fail))) (fail)
    (compile <asbscs> [a a a b b c])  [a a a b b c]
    (compile <find-digit> [a v f g 6 y u]) [6]
    (compile <vp> [chases the cat]) [chases the cat]
@@ -231,7 +170,7 @@
    (compile <sent'> [the cat likes the dog]) [is it true that your father likes the dog ?]
    (compile <as> [a a a]) [a a a]
    (compile <find-digit'> [a v f g 6 y u]) [6 y u]
-   (compile <asbs'cs> [a v f g 6 y u]) (fail)
+   (compile <asbs'cs> [a v f g 6 y u] (/. E (fail))) (fail)
    (compile <find-digit''> [a v f g 6 y u]) 6
    (compile <anbncn> [a a a b b b c c c]) [a a a b b b c c c] )
       
@@ -291,4 +230,4 @@
    (load "TinyLispFunctions.txt") loaded
    (tc -) false ) 
 
-(reset)
+(reset)

data/shen/release/test_programs/yacc.shen

@@ -12,7 +12,7 @@ the; a;)
 cat; dog;)  
 
 (defcc <name1>
- -*- := (if (element? -*- [(protect Bill) (protect Ben)]) -*- (fail));) 
+ X := X	where (element? X [(protect Bill) (protect Ben)]);) 
 
 (defcc <vp>
 <vtrans> <np>;) 
@@ -44,19 +44,19 @@ NP VP -> (append [is it true that your father] VP [?]))
 (defcc <find-digit>
   <digit> <morestuff> := <digit>;
   <digit> := <digit>;
-  -*- <find-digit> := <find-digit>;) 
+  X <find-digit> := <find-digit>;) 
 
 (defcc <morestuff>
-  -*- <morestuff>; 
-  -*-;) 
+  X <morestuff>; 
+  X;) 
 
 (defcc <digit>
 0; 1; 2; 3; 4; 5; 6; 7; 8; 9;)
 
 (defcc <find-digit'>
-  <digit> <morestuff> := -s-;
-  <digit> := -s-;
-  -*- <find-digit'> := <find-digit'>;) 
+  <digit> <morestuff>;
+  <digit> := <digit>;
+  X <find-digit'> := <find-digit'>;) 
 
 (defcc <asbscs>
   <as> <bs> <cs>;) 
@@ -85,18 +85,14 @@ b;
 (defcc <find-digit''>
   <digit''> <morestuff> := <digit''>;
   <digit''> := <digit''>;
-  -*- <find-digit''> := <find-digit''>;) 
+  X <find-digit''> := <find-digit''>;) 
 
 (defcc <digit''>
--*- := (one_of -*- [0 1 2 3 4 5 6 7 8 9]);) 
-
-(define one_of
-X Y -> (if (element? X Y) X (fail)))
+  X := X  where (element? X [0 1 2 3 4 5 6 7 8 9]);) 
 
 (defcc <anbncn>
-<as> <bs> <cs> := (if (equal-length? [<as> <bs> <cs>]) 
-                      (appendall [<as> <bs> <cs>]) 
-                      (fail));) 
+<as> <bs> <cs> := (appendall [<as> <bs> <cs>]) 
+                       where (equal-length? [<as> <bs> <cs>]);) 
 
 (defcc <as>
 a <as>; 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shen-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -29,7 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.12'
 description: ShenRuby is a port of the Shen programming language to Ruby. It currently
-  supports Shen version 8.0.
+  supports Shen version 9.0.
 email:
 - greg@sourcematters.org
 executables:
@@ -39,18 +39,26 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - MIT_LICENSE.txt
 - README.md
+- Rakefile
 - bin/shen_test_suite.rb
 - bin/srrepl
 - k_lambda_spec/atom_spec.rb
+- k_lambda_spec/primitives/arithmetic_spec.rb
+- k_lambda_spec/primitives/assignments_spec.rb
 - k_lambda_spec/primitives/boolean_operations_spec.rb
 - k_lambda_spec/primitives/generic_functions_spec.rb
+- k_lambda_spec/primitives/lists_spec.rb
+- k_lambda_spec/primitives/strings_spec.rb
+- k_lambda_spec/primitives/symbols_spec.rb
+- k_lambda_spec/primitives/vectors_spec.rb
 - k_lambda_spec/spec_helper.rb
 - k_lambda_spec/support/shared_examples.rb
+- k_lambda_spec/tail_recursion_spec.rb
 - lib/kl.rb
 - lib/kl/absvector.rb
 - lib/kl/compiler.rb
@@ -83,7 +91,6 @@ files:
 - shen/release/benchmarks/README.shen
 - shen/release/benchmarks/benchmarks.shen
 - shen/release/benchmarks/bigprog
-- shen/release/benchmarks/br.shen
 - shen/release/benchmarks/einstein.shen
 - shen/release/benchmarks/heatwave.gif
 - shen/release/benchmarks/interpreter.shen
@@ -135,6 +142,7 @@ files:
 - shen/release/test_programs/parser.shen
 - shen/release/test_programs/powerset.shen
 - shen/release/test_programs/prime.shen
+- shen/release/test_programs/prolog.shen
 - shen/release/test_programs/proof_assistant.shen
 - shen/release/test_programs/proplog_version_1.shen
 - shen/release/test_programs/proplog_version_2.shen
@@ -182,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ShenRuby is a Ruby port of the Shen programming language

data/Gemfile.lock

@@ -1,20 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.8.3)
-    diff-lcs (1.1.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.1)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest (~> 4.8.3)
-  rspec (~> 2.12.0)

data/shen/release/benchmarks/br.shen

@@ -1,13 +0,0 @@
-(defcc <br> 
-    40 <br> 41 <br$> := ok;
-    <item> <br> := ok;
-    <e> := ok;) 
-
-(defcc <br$> 
-    <br> := ok;) 
-
-(defcc <item> 
-    -*- := (if (element? -*- [40 41]) 
-            (fail) 
-            ok);) 
-