kalculator 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd2684ec05188a764da05fae5593566ab7122191864da22ae2296b89d8e1185
-  data.tar.gz: d4f25af127744abcfe43f13281169374cd678ec9964c96b0f365bbf8de69762c
+  metadata.gz: 9f7ebb299d556d90d2850064b9a43ba651c76e68f0517987600a7f9a05692fc6
+  data.tar.gz: 7736da10b84c6ef664c2ec29d67848f1247a11272e61400c0bca7e33e8f4ac2e
 SHA512:
-  metadata.gz: b361d425d87505bab75a23f84a9e8073b90a551d3aeffe33b39cae270dbb49a7925ea9bc90c66e553bc9c2bf6acc092732bc93998e7c1228f7b2c47a873308e8
-  data.tar.gz: d2bf943a2fa7e5a9693cb52bbb4ccce40f267b3b90c97fdc99050c890eb03e93395269f04f9ab752560e43667cc362c1c02abb677eb8bc4bd7c11241d231a756
+  metadata.gz: 94d5a135534cac641fa0ddc8308fc3b23d3d116eb068923573eef1257e1c4f124fa8c948301637157d696f729277965ffb06c36660ae4a191c4429406954f40f
+  data.tar.gz: b69f39bf645389c8ece99cc4e701c0da81dc470ed5a10f9045090b41b06656644d33f6127f17efdf55917c9ca70044353072492c445a3c2438d046c4c49bf613

data/lib/kalculator/evaluator.rb

@@ -90,6 +90,22 @@ class Kalculator
       expressions.map{|expression| evaluate(expression) }
     end
 
+    def max(_, left, right)
+      left = evaluate(left)
+      right = evaluate(right)
+      raise TypeError, "max only works with numbers, got #{left.inspect}" unless left.is_a?(Numeric)
+      raise TypeError, "max only works with numbers, got #{right.inspect}" unless right.is_a?(Numeric)
+      [left, right].max
+    end
+
+    def min(_, left, right)
+      left = evaluate(left)
+      right = evaluate(right)
+      raise TypeError, "min only works with numbers, got #{left.inspect}" unless left.is_a?(Numeric)
+      raise TypeError, "min only works with numbers, got #{right.inspect}" unless right.is_a?(Numeric)
+      [left, right].min
+    end
+
     def not(_, expression)
       bool = evaluate(expression)
       raise TypeError, "! only works with booleans, got #{bool.inspect}" unless bool === true || bool === false

data/lib/kalculator/lexer.rb

@@ -25,6 +25,8 @@ class Kalculator
     rule(/contains/) { |t| :CONTAINS }
     rule(/count/)    { |t| :COUNT }
     rule(/if/)       { |t| :IF }
+    rule(/max/)      { |t| :MAX }
+    rule(/min/)      { |t| :MIN }
     rule(/sum/)      { |t| :SUM }
     rule(/true/)     { |t| :TRUE }
     rule(/false/)    { |t| :FALSE }

data/lib/kalculator/parser.rb

@@ -19,6 +19,8 @@ class Kalculator
       clause('COUNT LPAREN expression RPAREN') do |_, _, e0, _|
         [:count, e0]
       end
+      clause('MAX LPAREN expression COMMA expression RPAREN') { |_, _, left, _, right, _| [:max, left, right] }
+      clause('MIN LPAREN expression COMMA expression RPAREN') { |_, _, left, _, right, _| [:min, left, right] }
       clause('LPAREN expression RPAREN') { |_, expression, _| expression }
       clause('LBRACKET expressions RBRACKET') { |_, expressions, _| [:list, expressions] }
 

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

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