shen-ruby 0.12.1 → 0.13.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];)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shen-ruby
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Greg Spurrier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: klam
@@ -66,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: ShenRuby is a port of the Shen programming language to Ruby. It currently
-  supports Shen version 16.
+  supports Shen version 17.
 email:
 - greg@sourcematters.org
 executables:
@@ -87,40 +87,27 @@ files:
 - lib/shen_ruby.rb
 - lib/shen_ruby/converters.rb
 - lib/shen_ruby/rb.shen
+- lib/shen_ruby/shen.rb
 - lib/shen_ruby/shen_ruby.shen
 - lib/shen_ruby/version.rb
 - shen-ruby.gemspec
 - shen/README.txt
-- shen/lib/shen_ruby/shen.rb
-- shen/license.txt
-- shen/release/benchmarks/N_queens.shen
-- shen/release/benchmarks/README.shen
-- shen/release/benchmarks/benchmarks.shen
-- shen/release/benchmarks/bigprog
-- shen/release/benchmarks/einstein.shen
-- shen/release/benchmarks/heatwave.gif
-- shen/release/benchmarks/interpreter.shen
-- shen/release/benchmarks/jnk.shen
-- shen/release/benchmarks/picture.jpg
-- shen/release/benchmarks/plato.jpg
-- shen/release/benchmarks/powerset.shen
-- shen/release/benchmarks/prime.shen
-- shen/release/benchmarks/short.shen
-- shen/release/benchmarks/text.txt
-- shen/release/k_lambda/core.kl
-- shen/release/k_lambda/declarations.kl
-- shen/release/k_lambda/load.kl
-- shen/release/k_lambda/macros.kl
-- shen/release/k_lambda/prolog.kl
-- shen/release/k_lambda/reader.kl
-- shen/release/k_lambda/sequent.kl
-- shen/release/k_lambda/sys.kl
-- shen/release/k_lambda/t-star.kl
-- shen/release/k_lambda/toplevel.kl
-- shen/release/k_lambda/track.kl
-- shen/release/k_lambda/types.kl
-- shen/release/k_lambda/writer.kl
-- shen/release/k_lambda/yacc.kl
+- shen/release/BSD
+- shen/release/klambda/core.kl
+- shen/release/klambda/declarations.kl
+- shen/release/klambda/load.kl
+- shen/release/klambda/macros.kl
+- shen/release/klambda/prolog.kl
+- shen/release/klambda/reader.kl
+- shen/release/klambda/sequent.kl
+- shen/release/klambda/sys.kl
+- shen/release/klambda/t-star.kl
+- shen/release/klambda/toplevel.kl
+- shen/release/klambda/track.kl
+- shen/release/klambda/types.kl
+- shen/release/klambda/writer.kl
+- shen/release/klambda/yacc.kl
+- shen/release/license.pdf
 - shen/release/test_programs/Chap13/problems.txt
 - shen/release/test_programs/README.shen
 - shen/release/test_programs/TinyLispFunctions.txt
@@ -172,13 +159,12 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/gregspurrier/shen-ruby
 licenses:
-- Shen License
+- BSD/MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
-- shen/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/shen/lib/shen_ruby/shen.rb

@@ -1,160 +0,0 @@
-############################################################################
-# License
-# -------
-# The user is free to produce commercial applications with the
-# software, to distribute these applications in source or binary form,
-# and to charge monies for them as he sees fit and in concordance with
-# the laws of the land subject to the following license.
-#
-# 1. The license applies to all the software and all derived software
-# and must appear on such.
-#
-# 2. It is illegal to distribute the software without this license
-# attached to it and use of the software implies agreement with the
-# license as such. It is illegal for anyone who is not the copyright
-# holder to tamper with or change the license.
-#
-# 3. Neither the names of Lambda Associates or the copyright holder
-# may be used to endorse or promote products built using the software
-# without specific prior written permission from the copyright holder.
-#
-# 4. That possession of this license does not confer on the copyright
-# holder any special contractual obligation towards the user. That in
-# no event shall the copyright holder 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) arising in any way
-# out of the use of the software, even if advised of the possibility
-# of such damage.
-#
-# 5. It is permitted for the user to change the software, for the
-# purpose of improving performance, correcting an error, or porting to
-# a new platform, and distribute the modified version of Shen
-# (hereafter the modified version) provided the resulting program
-# conforms in all respects to the Shen standard and is issued under
-# that title. The user must make it clear with his distribution that
-# he/she is the author of the changes and what these changes are and
-# why.
-#
-# 6. Derived versions of this software in whatever form are subject to
-# the same restrictions. In particular it is not permitted to make
-# derived copies of this software which do not conform to the Shen
-# standard or appear under a different title.
-#
-# 7. It is permitted to distribute versions of Shen which incorporate
-# libraries, graphics or other facilities which are not part of the
-# Shen standard.
-#
-# For an explication of this license see
-# http://www.lambdassociates.org/News/june11/license.htm which
-# explains this license in full.
-#
-############################################################################
-#
-# This file was written by Greg Spurrier as part of the ShenRuby
-# project. It is essentially a shell into which the K Lambda sources
-# of Shen are loaded at runtime as part of object initialization to
-# produce a working Shen environment. It is thefore a derivative work
-# of the Shen sources and is subject to the Shen License.
-#
-############################################################################
-
-module ShenRuby
-  # Instances of the ShenRuby::Shen class provide a Shen environment
-  # running within a Klam environment
-  class Shen < Klam::Environment
-    def initialize
-      super
-
-      # Set the global variables
-      set("*language*".to_sym, "Ruby")
-      set("*implementation*".to_sym, "#{::RUBY_ENGINE} #{::RUBY_VERSION}")
-      set("*release*".to_sym, ::RUBY_VERSION)
-      set("*port*".to_sym, ::ShenRuby::VERSION)
-      set("*porters*".to_sym, "Greg Spurrier")
-      set("*home-directory*".to_sym, ::Dir.pwd)
-      set("*stinput*".to_sym, ::STDIN)
-      set("*stoutput*".to_sym, ::STDOUT)
-
-      # Load the K Lambda files
-      kl_root = ::File.expand_path('../../../release/k_lambda', __FILE__)
-      %w(toplevel core sys).each do |kl_filename|
-        ::ShenRuby::Shen.load_file(self, ::File.join(kl_root, kl_filename + ".kl"))
-      end
-
-      # Overrides
-      class << self
-        # Give a way to bail out
-        def quit
-          ::Kernel.exit(0)
-        end
-
-        # Add a way to evaluate strings, intended for use with Ruby interop.
-        # Returns the result of the last expression evaluated.
-        def eval_string(s)
-          forms = __send__(:"read-from-string", s)
-          result = nil
-          while forms
-            result = eval(head(forms))
-            forms = tail(forms)
-          end
-          result
-        end
-        alias_method :"eval-string", :eval_string
-
-        # The performance of `element?` is critical
-        def element?(x, l)
-          while l
-            return true if l.hd == x
-            l = l.tl
-          end
-          return false
-        rescue => e
-          __send(:"shen.sys-error", :element?)
-        end
-
-        def vector(n)
-          v = ::Klam::Absvector.new(n + 1, :"shen.fail!")
-          v[0] = n
-          v
-        end
-      end
-
-      # Load the rest of the K Lambda files
-      %w(sequent yacc
-         reader prolog track load writer
-         macros declarations types t-star
-        ).each do |kl_filename|
-        ::ShenRuby::Shen.load_file(self, ::File.join(kl_root, kl_filename + ".kl"))
-      end
-
-      # Give type signatures to the new functions added above
-      declare :quit, cons(:"-->", cons(:unit, nil))
-      declare :eval_string, cons(:string, cons(:"-->", cons(:unit, nil)))
-      declare :"eval-string", cons(:string, cons(:"-->", cons(:unit, nil)))
-
-      systemf :"rb-const"
-      systemf :"rb-send"
-      systemf :"rb-send-block"
-
-      old_hush = value(:"*hush*")
-      set :"*hush*", true
-      load ::File.expand_path('../../../../lib/shen_ruby/rb.shen', __FILE__)
-      load ::File.expand_path('../../../../lib/shen_ruby/shen_ruby.shen', __FILE__)
-      set :"*hush*", old_hush
-    end
-
-    class << self
-      def load_file(env, path)
-        ::File.open(path, 'r') do |file|
-          reader = ::Klam::Reader.new(file)
-          while form = reader.next
-            env.__send__(:"eval-kl", form)
-          end
-        end
-      end
-    end
-  end
-end