bool 1.0.16 → 1.0.17

data/ext/bool_ext/parser.h

@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
+/* A Bison parser, made by GNU Bison 3.0.  */
 
 /* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,13 +26,13 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
 #ifndef YY_YY_PARSER_H_INCLUDED
 # define YY_YY_PARSER_H_INCLUDED
-/* Enabling traces.  */
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
@@ -40,77 +40,60 @@
 extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 2065 of yacc.c  */
-#line 9 "parser.y"
+#line 9 "parser.y" /* yacc.c:1915  */
 
 #include "ast.h"
 
+#line 48 "parser.h" /* yacc.c:1915  */
 
-/* Line 2065 of yacc.c  */
-#line 51 "parser.h"
-
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TOKEN_VAR = 258,
-     TOKEN_AND = 259,
-     TOKEN_OR = 260,
-     TOKEN_NOT = 261,
-     TOKEN_LPAREN = 262,
-     TOKEN_RPAREN = 263,
-     UNOT = 264
-   };
+  enum yytokentype
+  {
+    TOKEN_VAR = 258,
+    TOKEN_AND = 259,
+    TOKEN_OR = 260,
+    TOKEN_NOT = 261,
+    TOKEN_LPAREN = 262,
+    TOKEN_RPAREN = 263,
+    UNOT = 264
+  };
 #endif
 
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
 {
-/* Line 2065 of yacc.c  */
-#line 21 "parser.y"
+#line 21 "parser.y" /* yacc.c:1915  */
 
     Token* token;
     Node* node;
 
-
-/* Line 2065 of yacc.c  */
-#line 81 "parser.h"
-} YYSTYPE;
+#line 75 "parser.h" /* yacc.c:1915  */
+};
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
+/* Location type.  */
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE
+typedef struct YYLTYPE YYLTYPE;
+struct YYLTYPE
 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;
-} YYLTYPE;
-# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+};
 # define YYLTYPE_IS_DECLARED 1
 # 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);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
 int yyparse (Node** node);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 #endif /* !YY_YY_PARSER_H_INCLUDED  */

data/lib/bool.rb

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

data/lib/bool/ast.rb

@@ -3,10 +3,10 @@ module Bool
     # AST classes defined in bool_ext.jar
   else
     class Token
-      attr_reader :value, :first_line, :last_line, :first_column, :last_column
+      attr_reader :value, :first_line, :first_column, :last_line, :last_column
 
-      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
+      def initialize(value, first_line, first_column, last_line, last_column)
+        @value, @first_line, @first_column, @last_line, @last_column = value, first_line, first_column, last_line, last_column
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bool
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.1
 description: 
 email: 
 executables: []
@@ -96,3 +96,4 @@ signing_key:
 specification_version: 4
 summary: Boolean expression evaluator
 test_files: []
+has_rdoc: