bool 1.0.14 → 1.0.15

data/ext/bool_ext/parser.h

@@ -40,19 +40,14 @@
 extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 2058 of yacc.c  */
-#line 10 "parser.y"
-
+/* Line 2065 of yacc.c  */
+#line 9 "parser.y"
 
 #include "ast.h"
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
 
 
-/* Line 2058 of yacc.c  */
-#line 56 "parser.h"
+/* Line 2065 of yacc.c  */
+#line 51 "parser.h"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -74,15 +69,15 @@ typedef void* yyscan_t;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2058 of yacc.c  */
-#line 30 "parser.y"
+/* Line 2065 of yacc.c  */
+#line 21 "parser.y"
 
-    char* value;
+    Token* token;
     Node* node;
 
 
-/* Line 2058 of yacc.c  */
-#line 86 "parser.h"
+/* Line 2065 of yacc.c  */
+#line 81 "parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -102,7 +97,8 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
-
+extern YYSTYPE yylval;
+extern YYLTYPE yylloc;
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -111,7 +107,7 @@ int yyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int yyparse (Node** node, yyscan_t scanner);
+int yyparse (Node** node);
 #else
 int yyparse ();
 #endif

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: ruby
 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,9 +68,9 @@ files:
 - ext/bool_ext/ext.c
 - ext/bool_ext/lexer.c
 - ext/bool_ext/parser.c
-- ext/bool_ext/parser.h
 - ext/bool_ext/ast.h
 - ext/bool_ext/lexer.h
+- ext/bool_ext/parser.h
 - ext/bool_ext/unused.h
 homepage: 
 licenses: []
@@ -91,7 +91,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