subtle-lang 0.0.1 → 0.0.2

data/lib/subtle/evaluator.rb

@@ -39,6 +39,12 @@ module Subtle
               right.reduce do |fold, r|
                 eval type: :dyad, verb: verb, left: fold, right: r
               end
+            when "/:" # Map each over right
+              right.map do |r|
+                eval type: :monad, verb: verb, right: r
+              end
+            else
+              nie! t, "Invalid adverb #{adverb} on Monads."
             end
           else
             if Array === right
@@ -57,6 +63,14 @@ module Subtle
               right.map do |r|
                 r == 0 ? 1 : 0
               end
+            when "+"
+              if Array === right.first
+                right.transpose
+              else
+                right
+              end
+            when "|"
+              right.reverse
             else
               nie! "Verb #{verb} without Adverb not implemented as a Monad"
             end
@@ -100,16 +114,42 @@ module Subtle
                     " right one, but #{left.size} != #{right.size}."
                 end
 
-                left.zip(right).map do |x, y|
-                  x.send(verb, y)
+                # Both have another dimension
+                if Array === left.first && Array === right.first
+                  left.zip(right).map do |l, r|
+                    eval type: :dyad, verb: verb, left: l, right: r
+                  end
+                elsif Array === left.first || Array === right.first
+                  left.zip(right).map do |l, r|
+                    eval type: :dyad, verb: verb, left: l, right: r
+                  end
+                else
+                  left.zip(right).map do |l, r|
+                    l.send(verb, r)
+                  end
                 end
+
               elsif Array === left && Numeric === right
-                left.map do |l|
-                  l.send(verb, right)
+                # Multi-dimensional arrays
+                if Array === left.first
+                  left.map do |l|
+                    eval type: :dyad, verb: verb, left: l, right: right
+                  end
+                else
+                  left.map do |l|
+                    l.send(verb, right)
+                  end
                 end
               elsif Numeric === left && Array === right
-                right.map do |r|
-                  left.send(verb, r)
+                # Multi-dimensional arrays
+                if Array === right.first
+                  right.map do |r|
+                    eval type: :dyad, verb: verb, left: left, right: r
+                  end
+                else
+                  right.map do |r|
+                    left.send(verb, r)
+                  end
                 end
               else
                 nie! t
@@ -140,6 +180,14 @@ module Subtle
               else
                 nie! t
               end
+            when "!"
+              if Numeric === left && Array === right
+              else
+                ae! t, "Left must be Numeric and right must be an Array for" +
+                  " rotate (`!`) dyad. You passed in #{left.class} and" +
+                  " #{right.class}"
+              end
+              right.rotate(left)
             else
               nie! t, "Invalid verb #{verb}."
             end

data/lib/subtle/parser.rb

@@ -2,8 +2,8 @@ module Subtle
   class Parser < Parslet::Parser
     def initialize
       @monadic_verbs = %w{+ - *  / % ^ | & ~}
-      @monadic_adverbs = %w{/}
-      @dyadic_verbs = %w{+ - *  / % ^ | &}
+      @monadic_adverbs = %w{/: /}
+      @dyadic_verbs = %w{+ - *  / % ^ | & !}
       @dyadic_adverbs = %w{/: \:}
     end
 
@@ -16,7 +16,15 @@ module Subtle
     rule(:float)   { (minus.maybe >> digits >> str(".") >> digits).as(:float) >>
                      spaces? }
     rule(:atom)    { float | integer }
-    rule(:array)   { (atom >> spaces?).repeat(2).as(:array) >> spaces? }
+
+    rule :array do
+      atom_or_array = (array | (atom >> spaces?).repeat.as(:array)) >> spaces?
+
+      (str("(") >> spaces? >> atom_or_array >>
+       (str(";") >> spaces? >> atom_or_array).repeat >>
+       spaces? >> str(")") >> spaces?).as(:array) |
+      (atom >> spaces?).repeat(2).as(:array) >> spaces?
+    end
 
     rule :enumerate do
       (str("!") >> spaces? >> (float | integer).as(:last)).as(:enumerate)

data/lib/subtle/version.rb

@@ -1,3 +1,3 @@
 module Subtle
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/subtle/evaluator_spec.rb

@@ -33,6 +33,15 @@ describe Subtle::Evaluator do
         e "1 | 7 0 & 8 2 | 8 & 6 7 & 1", [7, 1]
       end
     end
+
+    describe "Rotate (`!`) (on left: Integer, right: Array)" do
+      e "2 ! 1 2 3", [3, 1, 2]
+      e "2 ! (1 2)", [1, 2]
+      e "2 ! (2 3; 4 5; 8)", [[8], [2, 3], [4, 5]]
+      e "-2 ! 1 2 3", [2, 3, 1]
+      e "-2 ! (1 2)", [1, 2]
+      e "-2 ! (2 3; 4 5; 8)", [[4, 5], [8], [2, 3]]
+    end
   end
 
   describe "Enumerate (`!`)" do
@@ -47,29 +56,41 @@ describe Subtle::Evaluator do
   end
 
   describe "Adverbs" do
-    describe "Map over each right (`/:`)" do
-      e "1 2 3 +/: 5 6", [[6, 7, 8], [7, 8, 9]]
-      e "1 2 3 -/: 0 1", [[1, 2, 3], [0, 1, 2]]
-      e "3 2 3 ^/: 2 3", [[9, 4, 9], [27, 8, 27]]
-      e "3 2 3 &/: 2 3", [[2, 2, 2], [3, 2, 3]]
-      e "1 2 3 |/: 0 3", [[1, 2, 3], [3, 3, 3]]
-    end
+    describe "on Dyads" do
+      describe "Map over each right (`/:`)" do
+        e "1 2 3 +/: 5 6", [[6, 7, 8], [7, 8, 9]]
+        e "1 2 3 -/: 0 1", [[1, 2, 3], [0, 1, 2]]
+        e "3 2 3 ^/: 2 3", [[9, 4, 9], [27, 8, 27]]
+        e "3 2 3 &/: 2 3", [[2, 2, 2], [3, 2, 3]]
+        e "1 2 3 |/: 0 3", [[1, 2, 3], [3, 3, 3]]
+      end
+
+      describe "Map over each left (`\:`)" do
+        e "1 2 3 +\\: 5 6", [[6, 7, 8], [7, 8, 9]].transpose
+        e "1 2 3 -\\: 0 1", [[1, 2, 3], [0, 1, 2]].transpose
+        e "3 2 3 ^\\: 2 3", [[9, 4, 9], [27, 8, 27]].transpose
+        e "3 2 3 &\\: 2 3", [[2, 2, 2], [3, 2, 3]].transpose
+        e "1 2 3 |\\: 0 3", [[1, 2, 3], [3, 3, 3]].transpose
+      end
 
-    describe "Map over each left (`\:`)" do
-      e "1 2 3 +\\: 5 6", [[6, 7, 8], [7, 8, 9]].transpose
-      e "1 2 3 -\\: 0 1", [[1, 2, 3], [0, 1, 2]].transpose
-      e "3 2 3 ^\\: 2 3", [[9, 4, 9], [27, 8, 27]].transpose
-      e "3 2 3 &\\: 2 3", [[2, 2, 2], [3, 2, 3]].transpose
-      e "1 2 3 |\\: 0 3", [[1, 2, 3], [3, 3, 3]].transpose
+      describe "Fold (`/`)" do
+        e "+/1 2 3", 6
+        # +/3 4 => 7; 1 2 + 7 => 8 9; +/8 9 => 17;
+        e "+/1 2 + +/3 4", 17
+        e "^/2 3 4", 4096
+        e "&/1 2 3", 1
+        e "|/1 2 3", 3
+      end
     end
 
-    describe "Fold (`/`)" do
-      e "+/1 2 3", 6
-      # +/3 4 => 7; 1 2 + 7 => 8 9; +/8 9 => 17;
-      e "+/1 2 + +/3 4", 17
-      e "^/2 3 4", 4096
-      e "&/1 2 3", 1
-      e "|/1 2 3", 3
+    describe "on Monads" do
+      describe "Map over each right (`/:`)" do
+        # Where (`&`), Not (`~`), Transpose (`+`) and Reverse (`|`)
+        e "&/: (0 2; 2 1)", [[1, 1], [0, 0, 1]]
+        e "~/: (0 1; 0 1)", [[1, 0], [1, 0]]
+        e "+/: ((1 2; 3 4); (5 6; 7 8))", [[[1, 3], [2, 4]], [[5, 7], [6, 8]]]
+        e "|/: (0 1; 0 2)", [[1, 0], [2, 0]]
+      end
     end
   end
 
@@ -82,11 +103,57 @@ describe Subtle::Evaluator do
     describe "Not (`~`)" do
       e "~1 0 -1 1 7 8 0 0", [0, 1, 0, 0, 0, 0, 1, 1]
     end
+
+    describe "Transpose (`+`)" do
+      e "+1 2 3", [1, 2, 3]
+      e "+(1 2; 3 4; 5 6)", [[1, 3, 5], [2, 4, 6]]
+    end
+
+    describe "Reverse (`|`)" do
+      e "|1 2", [2, 1]
+      e "|(1 2; 3; (6 7; 8))", [[[6, 7], [8]], [3], [1, 2]]
+    end
   end
+
+  describe "Multi-dimensional Arrays" do
+    describe "Declaring" do
+      e "(1 2; 3 4; 5 6.6 7)", [[1, 2], [3, 4], [5, 6.6, 7]]
+      e "(;;;)", [[], [], [], []]
+      e "(;;3 8;)", [[], [], [3, 8], []]
+      e "(1;2.2 3.3;(;;3 8;);)", [[1], [2.2, 3.3], [[], [], [3, 8], []], []]
+    end
+
+    describe "Dyads" do
+      describe "on Atoms and 2D/3D Arrays" do
+        e "1 + (;1 2; 3 4)", [[], [2, 3], [4, 5]]
+        e "2 ^ ((5 6; 0 1);1 2; 3 4)", [[[32, 64], [1, 2]], [2, 4], [8, 16]]
+        e "(;1 2; 3 4) - 1", [[], [0, 1], [2, 3]]
+        e "((5 6; 0 1);1 2; 3 4) ^ 2", [[[25, 36], [0, 1]], [1, 4], [9, 16]]
+      end
+
+      describe "on 1D/2D/3D Arrays with 2D/3D Arrays" do
+        e "(1 2; 3 4) + (2 3; 4 5)", [[3, 5], [7, 9]]
+        e "(1 2; 3 4) % (2 3; 4 5)", [[1, 2], [3, 4]]
+        e "((1 2); 5 6) + (3 1)", [[4, 5], [6, 7]]
+        e "(((2 4); (6 8)); ((2 4); (6 8))) + 1 2", [[[3, 5], [7, 9]],
+                                                     [[4, 6], [8, 10]]]
+        e "(((2 4); (6 8)); ((2 4); (6 8))) * (((2 4); (6 8)); ((2 4); (6 8)))",
+          [[[4, 16], [36, 64]], [[4, 16], [36, 64]]]
+        e "1 2 + (((2 4); (6 8)); ((2 4); (6 8)))", [[[3, 5], [7, 9]],
+                                                     [[4, 6], [8, 10]]]
+      end
+    end
+  end
+
   describe "Errors" do
     describe "on Arrays" do
       ae! "1 2 + 2 3 4"
       ae! "1 2 | 2 3 4"
     end
+
+    describe "on Rotate" do
+      ae! "1 2 ! 2 3"
+      ae! "2 ! 1"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subtle-lang
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet