kalculator 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4fd757c1bc075fe247ba612bf8e3670d6fc03711c332fa297d881513deda678
-  data.tar.gz: 1a6a5a2d27345d274d8559ea2b0c8a3cc3551db9012da35123f3ad0ce140c22d
+  metadata.gz: 9d38e426af60ed279a79b3764e035b3564623f702590337f28958aff8ea5ef1c
+  data.tar.gz: 6409234b6be3c95af8c79071f49363d277b15a7a707e6ea1bcf7056d15b0fcda
 SHA512:
-  metadata.gz: 28573ad987c775b85a49c31cd74d2bd13b7344c66f8c7d937d1db80a286fd6d3c9ecbb149ef50d7ffc44ce0e4bf516b3f1f935c0edf0e7c4b1b773061a4e7dd1
-  data.tar.gz: d34ab516d686fcb3428e901625c07b00cd30bd9d67eb43d124b44358e04cc2a3de1abb0dd2adfd89eb9bfcec7f0870227fc5fe28717d07cdaca0b599fc7df36d
+  metadata.gz: 676a268b7e66af2752dde9ea44de1c3e56074399220cfe696d89fec1ae85d790723682e4a9a11a2ba56f4013da79d6dd106903b185578e2d76df4ead8166d624
+  data.tar.gz: ecdd4b0f06b52a320c7d80fbbfd56c778d2ad9c498a71028a3a45cc78040b66fa8e82d426d14f3a2ddcb379804f924b9af9964173d1b78ad7f93f083a3ff3d2e

data/lib/kalculator/evaluator.rb

@@ -56,13 +56,16 @@ class Kalculator
       boolean
     end
 
-    def contains(_, string, substring)
-      string = evaluate(string)
-      substring = evaluate(substring)
-      unless string.is_a?(String) && substring.is_a?(String)
-        raise TypeError, "contains only works with strings, got #{string.inspect} and #{substring.inspect}"
+    def contains(_, collection, item)
+      collection = evaluate(collection)
+      item = evaluate(item)
+      if collection.is_a?(Array)
+        collection.include?(item)
+      elsif collection.is_a?(String) && item.is_a?(String)
+        collection.include?(item)
+      else
+        raise TypeError, "contains only works with strings or lists, got #{collection.inspect} and #{item.inspect}"
       end
-      string.include?(substring)
     end
 
     def if(_, condition, true_clause, false_clause)
@@ -73,6 +76,10 @@ class Kalculator
       end
     end
 
+    def list(_, expressions)
+      expressions.map{|expression| evaluate(expression) }
+    end
+
     def number(_, number)
       number
     end

data/lib/kalculator/lexer.rb

@@ -1,23 +1,25 @@
 class Kalculator
   class Lexer < RLTK::Lexer
     rule(/\s/)
-    rule(/\(/)       { :LPAREN }
-    rule(/\)/)       { :RPAREN }
-    rule(/,/)        { :COMMA  }
-    rule(/\+/)       { :PLUS   }
-    rule(/-/)        { :SUB    }
-    rule(/\*/)       { :MUL    }
-    rule(/\//)       { :DIV    }
-    rule(/>/)        { :GT     }
-    rule(/>=/)       { :GTE    }
-    rule(/</)        { :LT     }
-    rule(/<=/)       { :LTE    }
-    rule(/==/)       { :EQ     }
-    rule(/AND/)      { :AND    }
-    rule(/OR/)       { :OR     }
-    rule(/\d+/)      { |t| [:NUMBER, t.to_i] }
-    rule(/\.\d+/)    { |t| [:NUMBER, t.to_f] }
-    rule(/\d+\.\d+/) { |t| [:NUMBER, t.to_f] }
+    rule(/\(/)       { :LPAREN   }
+    rule(/\)/)       { :RPAREN   }
+    rule(/\[/)       { :LBRACKET }
+    rule(/\]/)       { :RBRACKET }
+    rule(/,/)        { :COMMA    }
+    rule(/\+/)       { :PLUS     }
+    rule(/-/)        { :SUB      }
+    rule(/\*/)       { :MUL      }
+    rule(/\//)       { :DIV      }
+    rule(/>/)        { :GT       }
+    rule(/>=/)       { :GTE      }
+    rule(/</)        { :LT       }
+    rule(/<=/)       { :LTE      }
+    rule(/==/)       { :EQ       }
+    rule(/AND/)      { :AND      }
+    rule(/OR/)       { :OR       }
+    rule(/\-?\d+/)      { |t| [:NUMBER, t.to_i] }
+    rule(/\-?\.\d+/)    { |t| [:NUMBER, t.to_f] }
+    rule(/\-?\d+\.\d+/) { |t| [:NUMBER, t.to_f] }
     rule(/contains/) { |t| :CONTAINS }
     rule(/if/)       { |t| :IF }
     rule(/sum/)      { |t| :SUM }

data/lib/kalculator/parser.rb

@@ -7,8 +7,8 @@ class Kalculator
     #Left     600 '.'.
 
     production(:expression) do
-      clause('CONTAINS LPAREN expression COMMA expression RPAREN') do |_, _, string, _, substring, _|
-        [:contains, string, substring]
+      clause('CONTAINS LPAREN expression COMMA expression RPAREN') do |_, _, collection, _, item, _|
+        [:contains, collection, item]
       end
       clause('IF LPAREN expression COMMA expression COMMA expression RPAREN') do |_, _, condition, _, true_clause, _, false_clause, _|
         [:if, condition, true_clause, false_clause]
@@ -17,6 +17,7 @@ class Kalculator
         [:sum, e0]
       end
       clause('LPAREN expression RPAREN') { |_, expression, _| expression }
+      clause('LBRACKET expressions RBRACKET') { |_, expressions, _| [:list, expressions] }
 
       clause('NUMBER') { |n| [:number, n] }
       clause('STRING') { |s| [:string, s] }
@@ -39,6 +40,11 @@ class Kalculator
       clause('expression DIV expression')  { |e0, _, e1| [:/, e0, e1] }
     end
 
+    production(:expressions) do
+      clause('expression') { |expression| [expression] }
+      clause('expression COMMA expressions') { |expression, _, expressions| [expression].concat(expressions) }
+    end
+
     finalize()
   end
 end

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk