shen-ruby 0.10.0 → 0.11.0

data/shen/release/test_programs/yacc.shen

@@ -1,132 +1,132 @@
-(defcc <sent>
-<np> <vp>;) 
-
-(defcc <det>
-the; a;) 
-
-(defcc <np>
-<det> <n>;
-<name1>;) 
-
-(defcc <n>
-cat; dog;)  
-
-(defcc <name1>
- X := X	where (element? X [(protect Bill) (protect Ben)]);) 
-
-(defcc <vp>
-<vtrans> <np>;) 
-
-(defcc <vtrans>
-likes; chases;)
-
-(defcc <des>
-[<ds>] [<es>] := (append <ds> <es>);) 
-
-(defcc <ds>
-  d <ds>; 
-  d;) 
-
-(defcc <es>
-  e <es>; 
-  e;)
-
-(defcc <sent'>
-<np> <vp> := (question <np> <vp>);) 
-
-(define question
-NP VP -> (append [is it true that your father] VP [?]))
-
-(defcc <as->bs>
-  a <a->bs> := [b | <a->bs>];
-  a := [b];) 
-
-(defcc <find-digit>
-  <digit> <morestuff> := <digit>;
-  <digit> := <digit>;
-  X <find-digit> := <find-digit>;) 
-
-(defcc <morestuff>
-  X <morestuff>; 
-  X;) 
-
-(defcc <digit>
-0; 1; 2; 3; 4; 5; 6; 7; 8; 9;)
-
-(defcc <find-digit'>
-  <digit> <morestuff>;
-  <digit> := <digit>;
-  X <find-digit'> := <find-digit'>;) 
-
-(defcc <asbscs>
-  <as> <bs> <cs>;) 
-
-(defcc <as>
-  a <as>; 
-  a;) 
-
-(defcc <bs>
-b <bs>; 
-b; 
-<e>;) 
-
-(defcc <cs>
-c <cs>; 
-c;) 
-
-(defcc <asbs'cs>
-  <as> <bs'> <cs>;)
-
-(defcc <bs'>
-b <bs'>; 
-b; 
-<e>;)
-
-(defcc <find-digit''>
-  <digit''> <morestuff> := <digit''>;
-  <digit''> := <digit''>;
-  X <find-digit''> := <find-digit''>;) 
-
-(defcc <digit''>
-  X := X  where (element? X [0 1 2 3 4 5 6 7 8 9]);) 
-
-(defcc <anbncn>
-<as> <bs> <cs> := (appendall [<as> <bs> <cs>]) 
-                       where (equal-length? [<as> <bs> <cs>]);) 
-
-(defcc <as>
-a <as>; 
-a;) 
-
-(defcc <bs>
-b <bs>; 
-b;) 
-
-(defcc <cs>
-c <cs>; 
-c;) 
-
-(define equal-length?
-[] -> true
-[L] -> true
-[L1 L2 | Ls] -> (and (= (length L1) (length L2)) (equal-length? [L2 | Ls])))
-
-(define appendall
-[] -> []
-[L | Ls] -> (append L (appendall Ls))) 
-
-(defcc <a*s>
-   [a] := a;)
-   
- (defcc <b*>
-  [b] b;)
-  
- (defcc <c*>
-   [<c*>] := [<c*>];
-   c;)
-   
- (defcc <d*>
-    [<d*>] <d*> := [[<d*>] | <d*>];
-    d <d*> := [d | <d*>];
-    d := [d];)
-
+(defcc <sent>
+<np> <vp>;) 
+
+(defcc <det>
+the; a;) 
+
+(defcc <np>
+<det> <n>;
+<name1>;) 
+
+(defcc <n>
+cat; dog;)  
+
+(defcc <name1>
+ X := X	where (element? X [(protect Bill) (protect Ben)]);) 
+
+(defcc <vp>
+<vtrans> <np>;) 
+
+(defcc <vtrans>
+likes; chases;)
+
+(defcc <des>
+[<ds>] [<es>] := (append <ds> <es>);) 
+
+(defcc <ds>
+  d <ds>; 
+  d;) 
+
+(defcc <es>
+  e <es>; 
+  e;)
+
+(defcc <sent'>
+<np> <vp> := (question <np> <vp>);) 
+
+(define question
+NP VP -> (append [is it true that your father] VP [?]))
+
+(defcc <as->bs>
+  a <a->bs> := [b | <a->bs>];
+  a := [b];) 
+
+(defcc <find-digit>
+  <digit> <morestuff> := <digit>;
+  <digit> := <digit>;
+  X <find-digit> := <find-digit>;) 
+
+(defcc <morestuff>
+  X <morestuff>; 
+  X;) 
+
+(defcc <digit>
+0; 1; 2; 3; 4; 5; 6; 7; 8; 9;)
+
+(defcc <find-digit'>
+  <digit> <morestuff>;
+  <digit> := <digit>;
+  X <find-digit'> := <find-digit'>;) 
+
+(defcc <asbscs>
+  <as> <bs> <cs>;) 
+
+(defcc <as>
+  a <as>; 
+  a;) 
+
+(defcc <bs>
+b <bs>; 
+b; 
+<e>;) 
+
+(defcc <cs>
+c <cs>; 
+c;) 
+
+(defcc <asbs'cs>
+  <as> <bs'> <cs>;)
+
+(defcc <bs'>
+b <bs'>; 
+b; 
+<e>;)
+
+(defcc <find-digit''>
+  <digit''> <morestuff> := <digit''>;
+  <digit''> := <digit''>;
+  X <find-digit''> := <find-digit''>;) 
+
+(defcc <digit''>
+  X := X  where (element? X [0 1 2 3 4 5 6 7 8 9]);) 
+
+(defcc <anbncn>
+<as> <bs> <cs> := (appendall [<as> <bs> <cs>]) 
+                       where (equal-length? [<as> <bs> <cs>]);) 
+
+(defcc <as>
+a <as>; 
+a;) 
+
+(defcc <bs>
+b <bs>; 
+b;) 
+
+(defcc <cs>
+c <cs>; 
+c;) 
+
+(define equal-length?
+[] -> true
+[L] -> true
+[L1 L2 | Ls] -> (and (= (length L1) (length L2)) (equal-length? [L2 | Ls])))
+
+(define appendall
+[] -> []
+[L | Ls] -> (append L (appendall Ls))) 
+
+(defcc <a*s>
+   [a] := a;)
+   
+ (defcc <b*>
+  [b] b;)
+  
+ (defcc <c*>
+   [<c*>] := [<c*>];
+   c;)
+   
+ (defcc <d*>
+    [<d*>] <d*> := [[<d*>] | <d*>];
+    d <d*> := [d | <d*>];
+    d := [d];)
+

data/spec/shen_ruby/converters_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Ruby <-> Shen type converters' do
+  before :all do
+    @shen = ShenRuby::Shen.new
+  end
+
+  def eval_shen(str)
+    @shen.eval_string(str)
+  end
+
+  def expect_shen(str)
+    expect(eval_shen(str))
+  end
+
+  describe 'ShenRuby.array_to_list' do
+    it 'returns a Shen list containing the elements of the array' do
+      @shen.set(:"test-list", ShenRuby.array_to_list([1, 2, 3]))
+      expect_shen(<<-EOS).to be true
+        (= (value test-list) [1 2 3])
+      EOS
+    end
+  end
+
+  describe 'ShenRuby.list_to_array' do
+    it 'returns a Ruby array containing the elements of the list' do
+      l = eval_shen('[1 2 3]')
+      expect(ShenRuby.list_to_array(l)).to eq([1, 2, 3])
+    end
+  end
+
+  describe 'ShenRuby.array_to_vector' do
+    it 'returns a Shen list containing the elements of the array' do
+      @shen.set(:"test-vector", ShenRuby.array_to_vector([1, 2, 3]))
+      expect_shen(<<-EOS).to be true
+        (= (value test-vector)
+           (vector-> (vector-> (vector-> (vector 3) 1 1) 2 2) 3 3))
+      EOS
+    end
+  end
+
+  describe 'ShenRuby.vector_to_array' do
+    it 'returns a Ruby array containing the elements of the vector' do
+      v = eval_shen('(vector-> (vector-> (vector-> (vector 3) 1 1) 2 2) 3 3)')
+      expect(ShenRuby.vector_to_array(v)).to eq([1, 2, 3])
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
-require 'kl'
-require 'stringio'
+require 'shen_ruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shen-ruby
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Greg Spurrier
@@ -9,22 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: klam
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 3.1.0
 description: ShenRuby is a port of the Shen programming language to Ruby. It currently
   supports Shen version 16.
 email:
@@ -34,9 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - MIT_LICENSE.txt
@@ -44,41 +84,8 @@ files:
 - 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
-- lib/kl/cons.rb
-- lib/kl/empty_list.rb
-- lib/kl/environment.rb
-- lib/kl/error.rb
-- lib/kl/internal_error.rb
-- lib/kl/lexer.rb
-- lib/kl/primitives/arithmetic.rb
-- lib/kl/primitives/assignments.rb
-- lib/kl/primitives/booleans.rb
-- lib/kl/primitives/error_handling.rb
-- lib/kl/primitives/extensions.rb
-- lib/kl/primitives/generic_functions.rb
-- lib/kl/primitives/lists.rb
-- lib/kl/primitives/streams.rb
-- lib/kl/primitives/strings.rb
-- lib/kl/primitives/symbols.rb
-- lib/kl/primitives/time.rb
-- lib/kl/primitives/vectors.rb
-- lib/kl/reader.rb
 - lib/shen_ruby.rb
+- lib/shen_ruby/converters.rb
 - lib/shen_ruby/version.rb
 - shen-ruby.gemspec
 - shen/README.txt
@@ -158,13 +165,7 @@ files:
 - shen/release/test_programs/types.shen
 - shen/release/test_programs/whist.shen
 - shen/release/test_programs/yacc.shen
-- spec/kl/cons_spec.rb
-- spec/kl/environment_spec.rb
-- spec/kl/interop_spec.rb
-- spec/kl/lexer_spec.rb
-- spec/kl/primitives/generic_functions_spec.rb
-- spec/kl/primitives/symbols_spec.rb
-- spec/kl/reader_spec.rb
+- spec/shen_ruby/converters_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gregspurrier/shen-ruby
 licenses:
@@ -177,26 +178,20 @@ require_paths:
 - shen/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ShenRuby is a Ruby port of the Shen programming language
 test_files:
-- spec/kl/cons_spec.rb
-- spec/kl/environment_spec.rb
-- spec/kl/interop_spec.rb
-- spec/kl/lexer_spec.rb
-- spec/kl/primitives/generic_functions_spec.rb
-- spec/kl/primitives/symbols_spec.rb
-- spec/kl/reader_spec.rb
+- spec/shen_ruby/converters_spec.rb
 - spec/spec_helper.rb