Changes to nql syntax

gabynaiman · Sep 19, 2019 · 95d4fc0 · 95d4fc0
1 parent 4ca05a6
commit 95d4fc0
Show file tree

Hide file tree

Showing 5 changed files with 322 additions and 513 deletions.
diff --git a/lib/rasti/db/nql/nodes.rb b/lib/rasti/db/nql/nodes.rb
@@ -14,13 +14,7 @@ class Conjunction < Treetop::Runtime::SyntaxNode
       class ParenthesisSentence < Treetop::Runtime::SyntaxNode
       end
 
-      class ComparisonWithText < Treetop::Runtime::SyntaxNode
-      end
-
-      class ComparisonWithQuantity < Treetop::Runtime::SyntaxNode
-      end
-
-      class ComparisonWithBoolean < Treetop::Runtime::SyntaxNode
+      class Comparison < Treetop::Runtime::SyntaxNode
       end
 
       class Field < Treetop::Runtime::SyntaxNode
@@ -36,18 +30,43 @@ class TimeZone < Treetop::Runtime::SyntaxNode
       end
 
       class LiteralStringConstant < Treetop::Runtime::SyntaxNode
+
+        def value
+          string.text_value
+        end
+
       end
 
       class StringConstant < Treetop::Runtime::SyntaxNode
+
+        def value
+          text_value
+        end
+
       end
 
       class TrueConstant < Treetop::Runtime::SyntaxNode
+
+        def value
+          true
+        end
+
       end
 
       class FalseConstant < Treetop::Runtime::SyntaxNode
+
+        def value
+          false
+        end
+
       end
 
       class FloatConstant < Treetop::Runtime::SyntaxNode
+
+        def value
+          text_value.to_f
+        end
+
       end
 
       class IntegerConstant < Treetop::Runtime::SyntaxNode