bool 1.0.14-java → 1.0.15-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6525d665c03b835411b27c11fcee59715f7c7bf
-  data.tar.gz: ae27b0e0560f4e5a6300b3d08f04cf5f016043cf
+  metadata.gz: 5342f4b1b2dc7581b554c8d34f81d1b6a1983ce2
+  data.tar.gz: 6d382073a0589287a004c01a168758d091376511
 SHA512:
-  metadata.gz: 5b824781a4d2875e8677aa5a30ef281925a01ba49223f26bb3b60c7bf8ce6831e003b7e62216decde2c56017a9060749822392f5d131e3ea2db2348bc3896561
-  data.tar.gz: 5ddeb11b2d0e2380119a3cd0940ddfa20ec308a5fae7f84508b1616f2574364c8aeaedfff353e413b951e88bbd025506af6559e2f0f6e5cefec234062fef2dbd
+  metadata.gz: 4c3184884662028e84bed61bf4f46070b8b6165fdbb90f3f37d93416bef0766c90ede6e3000f242ea54d766db8a8912621e9abb8afc7211f1fc4b0d0660483e5
+  data.tar.gz: c784bb5129c6c4143574cfeee2fa1bc56dbb47846225f1f180e3864873e84b83e39fe0130c3cabc6e2c5c5b3bf948911d5970ddb48120fa8454219857261a03b

data/lib/bool.rb

@@ -7,11 +7,11 @@ require 'bool/renderer'
 
 module Bool
   class SyntaxError < StandardError
-    attr_reader :first_line, :last_line, :first_column, :last_column
+    attr_reader :token
 
-    def initialize(message, first_line, last_line, first_column, last_column)
+    def initialize(message, token)
       super(message)
-      @first_line, @last_line, @first_column, @last_column = first_line, last_line, first_column, last_column
+      @token = token
     end
   end
 
@@ -19,9 +19,9 @@ module Bool
     def parse(source)
       lexer = Java::Bool::Lexer.new(source)
       parser = Java::Bool::Parser.new(lexer)
-      parser.parseExpr()
+      parser.buildAst()
     rescue => e
-      raise SyntaxError.new(e.message, e.line, e.line, e.column, e.column)
+      raise SyntaxError.new(e.message, e.token)
     end
     module_function(:parse)
   else

data/lib/bool/ast.rb

@@ -2,22 +2,33 @@ module Bool
   if RUBY_PLATFORM =~ /java/
     # AST classes defined in bool_ext.jar
   else
-    class Var
-      attr_reader :name
+    class Token
+      attr_reader :value, :first_line, :last_line, :first_column, :last_column
 
-      def initialize(name)
-        @name = name
+      def initialize(value, first_line, last_line, first_column, last_column)
+        @value, @first_line, @last_line, @first_column, @last_column = value, first_line, last_line, first_column, last_column
       end
+    end
+
+    class Node
+      attr_reader :token
+
+      def initialize(token)
+        @token = token
+      end
+    end
 
+    class Var < Node
       def accept(visitor, arg)
         visitor.visit_var(self, arg)
       end
     end
 
-    class And
+    class And < Node
       attr_reader :left, :right
 
-      def initialize(left, right)
+      def initialize(token, left, right)
+        super(token)
         @left, @right = left, right
       end
 
@@ -26,10 +37,11 @@ module Bool
       end
     end
 
-    class Or
+    class Or < Node
       attr_reader :left, :right
 
-      def initialize(left, right)
+      def initialize(token, left, right)
+        super(token)
         @left, @right = left, right
       end
 
@@ -38,10 +50,11 @@ module Bool
       end
     end
 
-    class Not
+    class Not < Node
       attr_reader :operand
 
-      def initialize(operand)
+      def initialize(token, operand)
+        super(token)
         @operand = operand
       end
 

data/lib/bool/evaluator.rb

@@ -9,7 +9,7 @@ module Bool
 
     else
       def visit_var(node, vars)
-        !!vars.index(node.name)
+        !!vars.index(node.token.value)
       end
 
       def visit_and(node, vars)

data/lib/bool/renderer.rb

@@ -9,19 +9,19 @@ module Bool
 
     else
       def visit_var(node, vars)
-        node.name
+        node.token.value
       end
 
       def visit_and(node, vars)
-        "(" + render(node.left) + " && " + render(node.right) + ")"
+        "(#{render(node.left)} #{node.token.value} #{render(node.right)})"
       end
 
       def visit_or(node, vars)
-        "(" + render(node.left) + " || " + render(node.right) + ")"
+        "(#{render(node.left)} #{node.token.value} #{render(node.right)})"
       end
 
       def visit_not(node, vars)
-        "!" + render(node.operand)
+        "#{node.token.value}#{render(node.operand)}"
       end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bool
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: java
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Boolean expression evaluator