shen-ruby 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc8006d7f3fac61a20da31b9abe918d51ccfc56
-  data.tar.gz: bb145ab8f07ab6ede1cb1eef9ff9ea5aa219d31a
+  metadata.gz: ef53ec1dece12e1268ad947755b50ac7f0dde4b7
+  data.tar.gz: 1f72b4134912bb154027f240c1ef3fa5f65472ae
 SHA512:
-  metadata.gz: 9a3c09ebb9aaf85a1df12b949ea8d820f3924aa7034dad4c425af651d1e898323e2c725e067ded89e81e441abe7d7624e37a53f9e8438af52df30044f0dd3b3f
-  data.tar.gz: 57339d8ecf2d9cc0e2bcc2e452235e15eb9ce70f4d36244a880cd79cc55706ade719bcc54ef1a9ee9f064964ac77ae63e7fd1ee7da69b38c380ad3eb453e1821
+  metadata.gz: 5eef86bddefaf28ffa148243ab05c2818bd9fd52365cc7653c5b17d0b7fc5e46acc0e84ce7112bb5333c54584ce4b164db0ac0d42366183e496c4850198d6f3f
+  data.tar.gz: 86e6189fed2c9860123fdf61728bb1b6e0f58a151911f696fad067a5ec16bdf5773ecc84bdb42ca3a6baa6a6cb5168d34426c16297392ca31a562e584488d2bb

data/HISTORY.md

@@ -1,11 +1,15 @@
 # ShenRuby Release History
 
-## 0.12.0 - January 31, 2014
+## 0.12.1 - February 1, 2015
+### Breaking Changes
+- The arity of block arguments to Ruby methods no longer needs to be specified. Now all block arguments are denoted by a `&` followed by the function to pass as the block. Any usages of the old syntax, e.g. `&2`, must be updated to `&`.
+
+## 0.12.0 - January 31, 2015
 ### Features
 - Shen -> Ruby interop
   - See README.md for details
 
-## 0.11.0 - January 15, 2014
+## 0.11.0 - January 15, 2015
 ### Features
 - KLambda implementation switched to [Klam](https://github.com/gregspurrier/klam). This has many implications, including:
   - Significant performance increase. E.g., the Shen Test Suite now runs 2.5 times faster than with ShenRuby 0.10.0.

data/README.md

@@ -14,7 +14,7 @@ ShenRuby 0.1.0 began to satisfy the first goal by providing a Shen REPL accessib
 ## Installation
 NOTE: ShenRuby requires Ruby 1.9 language features. It is tested with Ruby 2.0.0, 2.1.5, and 2.2.0. It has been lightly tested with JRuby 1.7.17. It is functional with Ruby 1.9.3, however its fixed stack size prevents it from passing the Shen Test Suite (see [Setting Stack Size](setting-stack-size) below).
 
-ShenRuby 0.12.0 is the current release. To install it as a gem, use the following command:
+ShenRuby 0.12.1 is the current release. To install it as a gem, use the following command:
 
     gem install shen-ruby
 
@@ -29,7 +29,7 @@ Once the gem has been installed, the Shen REPL can be launched via the `srrepl`
     released under the Shen license
     www.shenlanguage.org, version 16
     running under Ruby, implementation: ruby 2.2.0
-    port 0.12.0 ported by Greg Spurrier
+    port 0.12.1 ported by Greg Spurrier
 
 
     (0-)
@@ -162,7 +162,7 @@ Many Ruby methods take a `Hash` object as their final parameter. Ruby provides a
 As in Ruby, the key-arrow-value triples must be the final normal arguments to the method.
 
 #### Block Parameters
-In addition to normal arguments, Ruby methods may also accept blocks. A block argument in ShenRuby is denoted by `&n`--where `n` is the arity of the block expected by the method--followed by a function. Arities from 0 to 5 are supported. If the arity is one, `&` may be used instead of `&1`. The arity marker and the block function must be the last two elements of the argument list.
+In addition to normal arguments, Ruby methods may also accept blocks. A block argument in ShenRuby is denoted by the symbol `&` followed by a function. These must be the final two elements in the method's argument list.
 
 For example, to print each character of a string on a separate line using Shen's `pr` and `nl` system functions:
 
@@ -170,7 +170,7 @@ For example, to print each character of a string on a separate line using Shen's
 
 Or, to sum the elements of a list using Ruby's `Enumerable#reduce`:
 
-    (rb.reduce [1 2 3] &2 +)
+    (rb.reduce [1 2 3] & +)
 
 This use of `reduce` is possible because Shen's list and vector types are enumerable in ShenRuby.
 

data/lib/shen_ruby/rb.shen

@@ -43,8 +43,8 @@
 \\\\ Parsing of method argument lists
 
 (defcc <method-invocation>
-  Receiver Method <normal-args> <block-args> :=
-    [rb-send-block Receiver Method | (append <block-args> <normal-args>)];
+  Receiver Method <normal-args> <block-arg> :=
+    [rb-send-block Receiver Method <block-arg> | <normal-args>];
   Receiver Method <normal-args> :=
     [rb-send Receiver Method | <normal-args>];)
 
@@ -71,17 +71,11 @@
                             (and (symbol? Sym)
                                  (= (hdstr (str Sym)) "&"))));)
 
-(defcc <block-args>
-  <arity-marker> Expr := [<arity-marker> Expr];)
-
-(defcc <arity-marker>
-  X := 1 where (= X (intern "&"));
-  X := 0 where (= X (intern "&0"));
-  X := 1 where (= X (intern "&1"));
-  X := 2 where (= X (intern "&2"));
-  X := 3 where (= X (intern "&3"));
-  X := 4 where (= X (intern "&4"));
-  X := 5 where (= X (intern "&5"));)
+(defcc <block-arg>
+  <block-marker> Expr := Expr;)
+
+(defcc <block-marker>
+  X := X where (= X (intern "&"));)
 
 (define make-hash-constructor
   Pairs -> (let Temp (gensym (protect Hash))

data/lib/shen_ruby/shen_ruby.shen

@@ -2,7 +2,7 @@
 
 \\ Convert a Ruby Enumerable to a Shen vector
 (define rb-to-l
-  Enum -> (reverse (rb.reduce Enum [] &2 (/. L X (cons X L))))
+  Enum -> (reverse (rb.reduce Enum [] & (/. L X (cons X L))))
           where (rb.kind_of? Enum rb.#Enumerable)
   X -> (error (make-string "'~A' is not a Ruby Enumerable" X)))
 

data/lib/shen_ruby/version.rb

@@ -1,3 +1,3 @@
 module ShenRuby
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/shen-ruby.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version     = ">= 1.9.3"
 
-  s.add_runtime_dependency 'klam', '0.0.5', '0.0.5'
+  s.add_runtime_dependency 'klam', '0.0.6', '0.0.6'
 
   s.add_development_dependency 'rake', '~> 10.4.2', '>= 10.4.2'
   s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'

data/spec/shen_ruby/interop_spec.rb

@@ -71,22 +71,22 @@ describe 'Shen -> Ruby interop', :type => :functional do
       end
 
       it 'supports arities other than 1' do
-        expect_shen('(rb.reduce [1 2 3] &2 (/. A X (+ A X)))').to eq(6)
-        expect_shen('(rb.reduce [1 2 3] &2 +)').to eq(6)
-        expect_shen('(rb.reduce [1 2 3] &2 (function +))').to eq(6)
+        expect_shen('(rb.reduce [1 2 3] & (/. A X (+ A X)))').to eq(6)
+        expect_shen('(rb.reduce [1 2 3] & +)').to eq(6)
+        expect_shen('(rb.reduce [1 2 3] & (function +))').to eq(6)
       end
     end
   end
 
   describe "Shen's list type" do
     it 'implements Enumerable' do
-      expect_shen('(rb.reduce [1 2 3] &2 +)').to eq(6)
+      expect_shen('(rb.reduce [1 2 3] & +)').to eq(6)
     end
   end
 
   describe "Shen's vector type" do
     it 'implements Enumerable' do
-      expect_shen('(rb.reduce (@v 1 2 3 <>) &2 +)').to eq(6)
+      expect_shen('(rb.reduce (@v 1 2 3 <>) & +)').to eq(6)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shen-ruby
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Greg Spurrier
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement