kalculator 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0089994743a43b5b8ad0b502bfc53758e08ed86f43f521f7e3df5c2d3d6508
-  data.tar.gz: 2946da73cce1290a9be9fd632af0bfc47b617838e847450196cf869e6d7b6e0e
+  metadata.gz: cdb02709346e7a946c7e7149213895a4fa44d4184600c11576925cf344047c4f
+  data.tar.gz: a86e405f4af81894477182f841e0036a6b69350e677dfdda5d7828c03044f9fd
 SHA512:
-  metadata.gz: 28286114fd1e503f677099ffb567c1ab4eb899f7a4c2ec1d115fe073424a90d527d1f6416e673538a63afb6ed4e81b78e0ec8ae89763441a4f2f2f6fb1b26e8b
-  data.tar.gz: 12aeacb74451dad37bd06567b92cf4cd585dac83be897325f756a7d74365d297d736a3c06c54643242282ffe55bab455cdcbf6888138effbaaf0403e6ff2a550
+  metadata.gz: d8eda4a0a651bfe1861cd74e2ba67e1e6d6fa0da0bd5b404f90f3822d150dafecdb24c259c6f1db3071125dfa594284556c0760a3531f3dd5019dc92c4990ffa
+  data.tar.gz: b2a69ca1b2e3865e438d12b2bd8db88157076b843d197d2daec164a4077b6157ac2afefe04802f935e510a50ec4c8251605d9ae19f4c6e6a2482cc26ff10a2d3

data/lib/kalculator/evaluator.rb

@@ -124,6 +124,10 @@ class Kalculator
       !bool
     end
 
+    def null(_, _)
+      nil
+    end
+
     def number(_, number)
       number
     end

data/lib/kalculator/lexer.rb

@@ -16,6 +16,8 @@ class Kalculator
     rule(/<=/)       { :LTE      }
     rule(/==/)       { :EQ       }
     rule(/!=/)       { :NEQ      }
+    rule(/and/)      { :AND      }
+    rule(/or/)       { :OR       }
     rule(/AND/)      { :AND      }
     rule(/OR/)       { :OR       }
     rule(/!/)        { :BANG     }
@@ -35,6 +37,10 @@ class Kalculator
     rule(/sum/)      { |t| :SUM }
     rule(/true/)     { |t| :TRUE }
     rule(/false/)    { |t| :FALSE }
+    rule(/null/)     { |t| :NULL }
+    rule(/TRUE/)     { |t| :TRUE }
+    rule(/FALSE/)    { |t| :FALSE }
+    rule(/NULL/)     { |t| :NULL }
     rule(/"[^"]*"/)  { |t| [:STRING, t[1..-2]] }
     rule(/[A-Za-z][A-Za-z0-9\._]*/) { |t| [:IDENT, t] }
   end

data/lib/kalculator/parser.rb

@@ -36,6 +36,7 @@ class Kalculator
       clause('IDENT') { |n| [:variable, n] }
       clause('TRUE') { |n| [:boolean, true] }
       clause('FALSE') { |n| [:boolean, false] }
+      clause('NULL') { |n| [:null, nil] }
 
       clause('expression GT expression') { |e0, _, e1| [:>, e0, e1] }
       clause('expression GTE expression') { |e0, _, e1| [:>=, e0, e1] }

data/lib/kalculator/version.rb

@@ -1,3 +1,3 @@
 class Kalculator
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalculator
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Michael Ries
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rltk