bool 1.0.14-x86-mingw32 → 1.0.15-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f365bbde23267a870cb7f05c696787293a88b96
-  data.tar.gz: 940ab326bdcb11bef45de6d42be4d1bc011d3699
+  metadata.gz: 2df0ea05c2e275a61f5341860764c7e9387d18d2
+  data.tar.gz: fb5c0739fb9e9c92efc563f812426f6b77f7bdef
 SHA512:
-  metadata.gz: 4f2a9b8f313932c408b8ee20d89f788bd87dc703d49fbe7b0fe74333e567ed64fad26e153e255c992ebc8a414a0977558399f1fa826a8dfa02750e351244403a
-  data.tar.gz: 17499c9ce63ebf61498da90b1d34b8c8c17e3a1a69ab628dd6aa127400a88fee7fe907052290dceb1c0ae637f8f52d2ec9911dd3175c9e7df604a881483c708b
+  metadata.gz: 259fb206d764d09eddec8db7d6fd23c5c76d038ad4cdd5a6ca714650cb1d6d01389fa7f67a5beb41f023b4f4e2daa991c2956cc89c4a6a5ab979ee4f3f664737
+  data.tar.gz: 385849b9ce8af844d542299f172618c4a13729c2dc4580564f33c031bce1316b5bac0e03f7a6424216e7356d8c23e19983889f9781ab6faf7efc4ea5c2dcdce0

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: x86-mingw32
 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