subtle-lang 0.0.3 → 0.0.4

data/lib/subtle/evaluator.rb

@@ -6,12 +6,10 @@ module Subtle
       @transform = Transform.new
     end
 
-    def eval(string_or_tree)
-      if String === string_or_tree
-        parsed = @parser.parse string_or_tree
+    def eval(t)
+      if String === t
+        parsed = @parser.parse t
         t = @transform.apply parsed
-      else
-        t = string_or_tree
       end
 
       if Hash === t
@@ -19,12 +17,9 @@ module Subtle
 
         case type
         when :assignment
-          identifier = t[:identifier]
-          right      = try_eval t[:right]
-          @state[identifier] = right
+          @state[t[:identifier]] = try_eval t[:right]
         when :deassignment
-          identifier = t[:identifier]
-          @state[identifier]
+          @state[t[:identifier]]
         when :function
           t[:function]
         when :function_call
@@ -64,15 +59,7 @@ module Subtle
           verb = "**" if verb == "^"
 
           if adverb
-            if Array === right
-              if right.size < 2
-                ae! t, "Need Array of size atleast 2 for a monadic adverb." +
-                  " Your Array had #{right.size} items."
-              end
-            else
-              ae! t, "Can only apply monadic adverb on Arrays." +
-                " You passed in #{right.class}."
-            end
+            right = [right] unless Array === right
             case adverb
             when "//:"
               right.map do |r|
@@ -86,36 +73,47 @@ module Subtle
               right.map do |r|
                 eval type: :monad, verb: verb, right: r
               end
+            when "\\" # Scan
+              [right.shift].tap do |scan|
+                right.each do |r|
+                  scan << eval({type: :dyad, verb: verb, left: scan.last,
+                                right: r})
+                end
+              end
             else
-              nie! t, "Invalid adverb #{adverb} on Monads."
+              ae! t, "Invalid adverb #{adverb} on Monads."
             end
           else
             if Array === right
-            else
-              ae! t, "Can only apply monadic verb on Arrays." +
-                " You passed in #{right.class}."
-            end
-            case verb
-            when "&"
-              [].tap do |ret|
-                right.each_with_index do |r, i|
-                  r.times { ret << i }
+              case verb
+              when "&"
+                [].tap do |ret|
+                  right.each_with_index do |r, i|
+                    r.times { ret << i }
+                  end
                 end
+              when "~"
+                right.map do |r|
+                  r == 0 ? 1 : 0
+                end
+              when "+"
+                if Array === right.first
+                  right.transpose
+                else
+                  right
+                end
+              when "|"
+                right.reverse
               end
-            when "~"
-              right.map do |r|
-                r == 0 ? 1 : 0
-              end
-            when "+"
-              if Array === right.first
-                right.transpose
-              else
+            elsif Numeric === right
+              case verb
+              when "&"
+                right.times.map { 0 }
+              when "~"
+                right == 0 ? 1 : 0
+              when "+", "|"
                 right
               end
-            when "|"
-              right.reverse
-            else
-              nie! "Verb #{verb} without Adverb not implemented as a Monad"
             end
           end
         when :dyad
@@ -125,55 +123,67 @@ module Subtle
           verb   = t[:verb]
           adverb = t[:adverb]
 
-          # `^` in Subtle is `**` in Ruby.
+          # `^` in Subtle is `**` in Ruby,
           verb = "**" if verb == "^"
+          # `=` is `==`,
+          verb = "==" if verb == "="
+          # `&` is `min` and `|` is `max.
+          verb = "min" if verb == "&"
+          verb = "max" if verb == "|"
 
           if adverb
             case adverb
             when "/:" # Map each over right
               right.map do |r|
-                eval({ type: :dyad, left: left, verb: verb, right: r })
+                eval type: :dyad, left: left, verb: verb, right: r
               end
             when "\\:" # Map each over left
               left.map do |l|
-                eval({ type: :dyad, left: l, verb: verb, right: right })
+                eval type: :dyad, left: l, verb: verb, right: right
               end
             else
-              nie! t, "Invalid Adverb #{adverb}"
+              ae! t, "Invalid Adverb #{adverb}"
             end
           else
             case verb
-            when "+", "-", "*", "/", "%", "**"
+            when "+", "-", "*", "/", "%", "**", "==", "<", ">"
               if Numeric === left && Numeric === right
-                left.send(verb, right)
+                ret = left.send(verb, right)
+                if %w{== < >}.include?(verb)
+                  ret ? 1 : 0
+                else
+                  ret
+                end
               elsif Array === left && Array === right
                 if left.size != right.size
                   ae! t, "Size of left array must be the same as the size of" +
                     " right one, but #{left.size} != #{right.size}."
                 end
 
-                # Both have another dimension
-                if Array === left.first && Array === right.first
-                  left.zip(right).map do |l, r|
+                left.zip(right).map do |l, r|
+                  if Array === l || Array === 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|
-                    (try_eval l).send(verb, try_eval(r))
+                  else
+                    ret = (try_eval l).send(verb, try_eval(r))
+                    if %w{== < >}.include?(verb)
+                      ret ? 1 : 0
+                    else
+                      ret
+                    end
                   end
                 end
-
               elsif Array === left && Numeric === right
                 left.map do |l|
                   # Multi-dimensional arrays
                   if Array === l
                     eval type: :dyad, verb: verb, left: l, right: right
                   else
-                    (try_eval l).send(verb, right)
+                    ret = (try_eval l).send(verb, right)
+                    if %w{== < >}.include?(verb)
+                      ret ? 1 : 0
+                    else
+                      ret
+                    end
                   end
                 end
               elsif Numeric === left && Array === right
@@ -182,17 +192,19 @@ module Subtle
                   if Array === r
                     eval type: :dyad, verb: verb, left: left, right: r
                   else
-                    left.send(verb, r)
+                    ret = left.send(verb, r)
+                    if %w{== < >}.include?(verb)
+                      ret ? 1 : 0
+                    else
+                      ret
+                    end
                   end
                 end
               else
-                nie! t, "Left and Array must be Numeric or Arrays." +
+                ae! t, "Left and Array must be Numeric or Arrays." +
                   " You passed in #{left.class} and #{right.class}."
               end
-            when "&", "|"
-              verb = "min" if verb == "&"
-              verb = "max" if verb == "|"
-
+            when "max", "min"
               if Numeric === left && Numeric === right
                 [left, right].send(verb)
               elsif Array === left && Array === right
@@ -200,31 +212,38 @@ module Subtle
                   ae! t, "Size of left array must be the same as the size of" +
                     " right one, but #{left.size} != #{right.size}."
                 end
-
-                left.zip(right).map do |x, y|
-                  [x, y].send(verb)
+                left.zip(right).map do |l, r|
+                  eval type: :dyad, verb: verb, left: l, right: r
                 end
               elsif Array === left && Numeric === right
                 left.map do |l|
-                  [l, right].send(verb)
+                  if Array === l
+                    eval type: :dyad, verb: verb, left: l, right: right
+                  else
+                    [l, right].send(verb)
+                  end
                 end
               elsif Numeric === left && Array === right
                 right.map do |r|
-                  [left, r].send(verb)
+                  if Array === r
+                    eval type: :dyad, verb: verb, left: left, right: r
+                  else
+                    [left, r].send(verb)
+                  end
                 end
               else
-                nie! t
+                ae! t
               end
             when "!"
               if Numeric === left && Array === right
+                right.rotate(left)
               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}."
+              ae! t, "Invalid verb #{verb}."
             end
           end
         when :enumerate
@@ -232,11 +251,11 @@ module Subtle
           if Numeric === last
             (0...last.floor).to_a
           else
-            nie! t, "`last` must be Numeric for type: :enumerate. You passed" +
+            ae! t, "`last` must be Numeric for type: :enumerate. You passed" +
               " in #{last.class}."
           end
         else
-          nie! t, "Type #{t[:type].inspect} not implemented."
+          ae! t, "Type #{t[:type].inspect} not implemented."
         end
       else
         t
@@ -250,9 +269,5 @@ module Subtle
     def ae!(tree, message = "")
       raise ArgumentError.new message << "\n" << tree.to_yaml
     end
-
-    def nie!(tree, message = "")
-      raise NotImplementedError.new message << "\n" << tree.to_yaml
-    end
   end
 end

data/lib/subtle/parser.rb

@@ -1,9 +1,9 @@
 module Subtle
   class Parser < Parslet::Parser
     def initialize
-      @monadic_verbs = %w{+ - *  / % ^ | & ~}
-      @monadic_adverbs = %w{//: /: /}
-      @dyadic_verbs = %w{+ - *  / % ^ | & !}
+      @monadic_verbs = %w{+ - * / % ^ | & ~}
+      @monadic_adverbs = %w{//: /: / \\}
+      @dyadic_verbs = %w{+ - * / % ^ | & ! = < >}
       @dyadic_adverbs = %w{/: \:}
       @function_adverbs = %w{/:}
     end
@@ -17,14 +17,13 @@ module Subtle
     rule(:float)        { (minus.maybe >> digits >> str(".") >> digits).
                           as(:float) >> spaces? }
     rule(:identifier)   { (match["a-zA-Z"] >> match["a-zA-Z0-9_"].repeat).
-                          as(:identifier) }
-    rule(:assignment)   { (identifier >> spaces? >> str(":") >> spaces? >>
+                          as(:identifier) >> spaces? }
+    rule(:assignment)   { (identifier >> str(":") >> spaces? >>
                            word.as(:right)).as(:assignment) >> spaces? }
-    rule(:deassignment) { identifier.as(:deassignment) >> spaces? }
+    rule(:deassignment) { identifier.as(:deassignment) }
 
     rule(:function) do
-      str("{") >> spaces? >> word.as(:function) >> spaces? >> str("}") >>
-      spaces?
+      str("{") >> spaces? >> word.as(:function) >> str("}") >> spaces?
     end
 
     rule :function_adverb do
@@ -39,7 +38,7 @@ module Subtle
 
     rule(:variable_call) do
       (identifier >> spaces? >> function_adverb.maybe >>
-       (assignment | dyad | noun).as(:arguments)).as(:variable_call)
+       (assignment | dyad | noun).as(:arguments)).as(:variable_call) >> spaces?
     end
 
     rule(:atom) do
@@ -48,7 +47,7 @@ module Subtle
     end
 
     rule :array do
-      atom_or_array = (array | (atom >> spaces?).repeat.as(:array)) >> spaces?
+      atom_or_array = (array | (atom >> spaces?).repeat.as(:array))
 
       (str("(") >> spaces? >> atom_or_array >>
        (str(";") >> spaces? >> atom_or_array).repeat >>
@@ -57,7 +56,7 @@ module Subtle
     end
 
     rule :enumerate do
-      (str("!") >> spaces? >> (word).as(:last)).as(:enumerate)
+      (str("!") >> spaces? >> (word).as(:last)).as(:enumerate) >> spaces?
     end
 
     rule(:noun)    { enumerate | array | atom }
@@ -82,11 +81,12 @@ module Subtle
 
     rule :dyad do
       (noun.as(:left) >> dyadic_verb >> dyadic_adverb.maybe >>
-       word.as(:right)).as(:dyad)
+       word.as(:right)).as(:dyad) >> spaces?
     end
 
     rule :monad do
-      (monadic_verb >> monadic_adverb.maybe >> word.as(:right)).as(:monad)
+      (monadic_verb >> monadic_adverb.maybe >> word.as(:right)).as(:monad) >>
+      spaces?
     end
 
     rule :word do

data/lib/subtle/version.rb

@@ -1,3 +1,3 @@
 module Subtle
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/subtle/evaluator_spec.rb

@@ -27,10 +27,13 @@ describe Subtle::Evaluator do
       describe "on Arrays" do
         e "1 12 & 7 8", [1, 8]
         e "1 12 | 7 8", [7, 12]
+        e "(1; 0 1 1 0 0; 1) & (1; 0 1 0 1 0; 1)", [1, [0, 1, 0, 0, 0], 1]
       end
 
       describe "on Atoms and Arrays" do
         e "1 | 7 0 & 8 2 | 8 & 6 7 & 1", [7, 1]
+        e "1 | (0; 1 0; 0 1 0; (1 0 1 2))", [1, [1, 1], [1, 1, 1], [1, 1, 1, 2]]
+        e "(0; 1 0; 0 1 0; (1 0 1 2)) | 1", [1, [1, 1], [1, 1, 1], [1, 1, 1, 2]]
       end
     end
 
@@ -42,6 +45,26 @@ describe Subtle::Evaluator do
       e "-2 ! (1 2)", [1, 2]
       e "-2 ! (2 3; 4 5; 8)", [[4, 5], 8, [2, 3]]
     end
+
+    describe "Comparison (`=`, `<`, `>`)" do
+      describe "on Atoms" do
+        e "1 > 3", 0
+        e "7 < 8", 1
+        e "7 = 7", 1
+      end
+
+      describe "on Arrays" do
+        e "1 12 < 7 8", [1, 0]
+        e "1 12 > 7 8", [0, 1]
+        e "1 12 1 = 7 8 1", [0, 0, 1]
+      end
+
+      describe "on Atoms and Arrays" do
+        e "1 2 > 3", [0, 0]
+        e "7 < 8 0", [1, 0]
+        e "7 = 7 7", [1, 1]
+      end
+    end
   end
 
   describe "Enumerate (`!`)" do
@@ -87,35 +110,80 @@ describe Subtle::Evaluator do
     describe "on Monads" do
       describe "Map over each right (`/:`)" do
         # Where (`&`), Not (`~`), Transpose (`+`) and Reverse (`|`)
+        e "&/: 2", [[0, 0]]
+        e "&/: 2 1", [[0, 0], [0]]
         e "&/: (0 2; 2 1)", [[1, 1], [0, 0, 1]]
+
+        e "~/: 1", [0]
+        e "~/: 0 1", [1, 0]
         e "~/: (0 1; 0 1)", [[1, 0], [1, 0]]
+
+        e "+/: 1", [1]
+        e "+/: 1 2 3", [1, 2, 3]
         e "+/: ((1 2; 3 4); (5 6; 7 8))", [[[1, 3], [2, 4]], [[5, 7], [6, 8]]]
+
+        e "|/: 1", [1]
+        e "|/: 1 2", [1, 2]
         e "|/: (0 1; 0 2)", [[1, 0], [2, 0]]
       end
 
       describe "Map over and fold (`//:`)" do
+        e "+//: 1", [1]
+        e "+//: 1 2", [1, 2]
+        e "+//: (1; 2; 3 4)", [1, 2, 7]
         e "+//: (2 4; 3 1)", [6, 4]
         e "+//:+(2 4; 3 1)", [5, 5]
       end
+
+      describe "Scan (`\`)" do
+        e "+\\2", [2]
+        e "-\\2", [2]
+        e "*\\2", [2]
+        e "/\\2", [2]
+        e "%\\2", [2]
+        e "^\\2", [2]
+
+        e "+\\1 2 3 4 5", [1, 3, 6, 10, 15]
+        e "-\\1 2 3 4 5", [1, -1, -4, -8, -13]
+        e "*\\1 2 3 4 5", [1, 2, 6, 24, 120]
+        e "/\\8 4 3 2", [8, 2, 0, 0]
+        e "%\\8 6 3 1", [8, 2, 2, 0]
+        e "^\\2 1 3 4", [2, 2, 8, 4096]
+
+        e "+\\(1 2; 3 4; 5)", [[1, 2], [4, 6], [9, 11]]
+        e "-\\(1 2; 3 4; 5)", [[1, 2], [-2, -2], [-7, -7]]
+        e "*\\(1 2; 3 4; 5)", [[1, 2], [3, 8], [15, 40]]
+        e "/\\(8 4; 3; 2)", [[8, 4], [2, 1], [1, 0]]
+        e "%\\(8 6; 3; 1)", [[8, 6], [2, 0], [0, 0]]
+        e "^\\(2 1; 3; 4)", [[2, 1], [8, 1], [4096, 1]]
+      end
     end
   end
 
   describe "Monads" do
     describe "Where (`&`)" do
+      e "&1", [0]
+      e "&2", [0, 0]
       e "&1 0 1", [0, 2]
       e "&1 3 2", [0, 1, 1, 1, 2, 2]
     end
 
     describe "Not (`~`)" do
+      e "~0", 1
+      e "~1", 0
+      e "~4", 0
       e "~1 0 -1 1 7 8 0 0", [0, 1, 0, 0, 0, 0, 1, 1]
     end
 
     describe "Transpose (`+`)" do
+      e "+0", 0
+      e "+1", 1
       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", 1
       e "|1 2", [2, 1]
       e "|(1 2; 3; (6 7; 8))", [[[6, 7], 8], 3, [1, 2]]
     end
@@ -136,6 +204,7 @@ describe Subtle::Evaluator do
         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]]
+        e "(1; 2 3; 4 5) + (1; 2 3; 4 5)", [2, [4, 6], [8, 10]]
       end
 
       describe "on 1D/2D/3D Arrays with 2D/3D Arrays" do
@@ -216,5 +285,9 @@ describe Subtle::Evaluator do
       ae! "1 2 ! 2 3"
       ae! "2 ! 1"
     end
+
+    describe "on Scan adverb" do
+      ae! "+\\(1 2; 3; 4 5 6)"
+    end
   end
 end

metadata

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