bool 1.0.11 → 1.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7a81fff001d44fe102aece1bc1f9a8b2d269139
+  data.tar.gz: 4a42c9872223c8ed8c606313cf72ece4a0134f88
+SHA512:
+  metadata.gz: 7504f35d2fa18b75a34f582ff7618515c58a133f6116cd2c8d4117ceb57d43f302502211222ce08112a0ca6383e0387f52c223de99fae54c87f2d4286842326a
+  data.tar.gz: 2530972a524ca095e8c06efe1e415114ecca3b5b4bb76e409686549cb4324adcae80eef0c20d649c1b59f1fd4ccdd9e0f408b293fd1bc3b2e0faf5dd299ad423

data/ext/bool_ext/ast.h

@@ -57,3 +57,4 @@ Node* create_or(Node* left, Node* right);
 Node* create_not(Node* other);
 
 #endif
+

data/ext/bool_ext/ext.c

@@ -69,3 +69,4 @@ void Init_bool_ext() {
 
     rb_define_singleton_method(mBool, "parse", Bool_parse, 1);
 }
+

data/ext/bool_ext/parser.c

@@ -476,7 +476,7 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    50,    50,    54,    55,    56,    57,    58
+       0,    51,    51,    55,    56,    57,    58,    59
 };
 #endif
 
@@ -533,7 +533,7 @@ static const yytype_int8 yydefgoto[] =
 static const yytype_int8 yypact[] =
 {
       -1,    -3,    -1,    -1,     3,     7,    -3,     5,    -3,    -1,
-      -1,    -3,    -3,    -3
+      -1,    -3,    -3,     0
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -548,7 +548,7 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-       6,     7,     1,     8,     0,     2,     3,    12,    13,     9,
+       6,     7,     1,     8,     9,     2,     3,    12,    13,     9,
       10,     9,    10,    11
 };
 
@@ -558,9 +558,9 @@ static const yytype_uint8 yytable[] =
 #define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
-static const yytype_int8 yycheck[] =
+static const yytype_uint8 yycheck[] =
 {
-       2,     3,     3,     0,    -1,     6,     7,     9,    10,     4,
+       2,     3,     3,     0,     4,     6,     7,     9,    10,     4,
        5,     4,     5,     8
 };
 
@@ -1504,43 +1504,43 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1807 of yacc.c  */
-#line 50 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 51 "parser.y"
     { *node = (yyvsp[(1) - (1)].node); }
     break;
 
   case 3:
-/* Line 1807 of yacc.c  */
-#line 54 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 55 "parser.y"
     { (yyval.node) = create_var((yyvsp[(1) - (1)].value)); }
     break;
 
   case 4:
-/* Line 1807 of yacc.c  */
-#line 55 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 56 "parser.y"
     { (yyval.node) = create_and((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
     break;
 
   case 5:
-/* Line 1807 of yacc.c  */
-#line 56 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 57 "parser.y"
     { (yyval.node) = create_or((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); }
     break;
 
   case 6:
-/* Line 1807 of yacc.c  */
-#line 57 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 58 "parser.y"
     { (yyval.node) = create_not((yyvsp[(2) - (2)].node)); }
     break;
 
   case 7:
-/* Line 1807 of yacc.c  */
-#line 58 "parser.y"
+/* Line 1792 of yacc.c  */
+#line 59 "parser.y"
     { (yyval.node) = (yyvsp[(2) - (3)].node); }
     break;
 
 
-/* Line 1807 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 1545 "parser.c"
       default: break;
     }
@@ -1780,6 +1780,6 @@ yyreturn:
 
 
 /* Line 2055 of yacc.c  */
-#line 61 "parser.y"
+#line 62 "parser.y"
 
 

data/ext/bool_ext/parser.h

@@ -40,7 +40,7 @@
 extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 10 "parser.y"
 
 
@@ -51,7 +51,7 @@ typedef void* yyscan_t;
 #endif
 
 
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 56 "parser.h"
 
 /* Tokens.  */
@@ -74,14 +74,14 @@ typedef void* yyscan_t;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 30 "parser.y"
 
     char* value;
     Node* node;
 
 
-/* Line 2065 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 86 "parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1

data/ext/bool_ext/unused.h

@@ -3,4 +3,5 @@
 
 #define UNUSED(x) (void)(x)
 
-#endif
+#endif
+

data/lib/bool.rb

@@ -3,6 +3,7 @@
 require 'bool_ext'
 require 'bool/ast'
 require 'bool/evaluator'
+require 'bool/renderer'
 
 module Bool
   class SyntaxError < StandardError

data/lib/bool/ast.rb

@@ -9,8 +9,8 @@ module Bool
         @name = name
       end
 
-      def describe_to(visitor, arg)
-        visitor.var(self, arg)
+      def accept(visitor, arg)
+        visitor.visit_var(self, arg)
       end
     end
 
@@ -21,8 +21,8 @@ module Bool
         @left, @right = left, right
       end
 
-      def describe_to(visitor, arg)
-        visitor.and(self, arg)
+      def accept(visitor, arg)
+        visitor.visit_and(self, arg)
       end
     end
 
@@ -33,20 +33,20 @@ module Bool
         @left, @right = left, right
       end
 
-      def describe_to(visitor, arg)
-        visitor.or(self, arg)
+      def accept(visitor, arg)
+        visitor.visit_or(self, arg)
       end
     end
 
     class Not
-      attr_reader :other
+      attr_reader :operand
 
-      def initialize(other)
-        @other = other
+      def initialize(operand)
+        @operand = operand
       end
 
-      def describe_to(visitor, arg)
-        visitor.not(self, arg)
+      def accept(visitor, arg)
+        visitor.visit_not(self, arg)
       end
     end
   end

data/lib/bool/evaluator.rb

@@ -8,26 +8,26 @@ module Bool
       end
 
     else
-      def var(node, vars)
+      def visit_var(node, vars)
         !!vars.index(node.name)
       end
 
-      def and(node, vars)
+      def visit_and(node, vars)
         evaluate(node.left, vars) && evaluate(node.right, vars)
       end
 
-      def or(node, vars)
+      def visit_or(node, vars)
         evaluate(node.left, vars) || evaluate(node.right, vars)
       end
 
-      def not(node, vars)
-        !evaluate(node.other, vars)
+      def visit_not(node, vars)
+        !evaluate(node.operand, vars)
       end
 
-      private
+    private
 
       def evaluate(node, vars)
-        node.describe_to(self, vars)
+        node.accept(self, vars)
       end
     end
   end

data/lib/bool/renderer.rb

@@ -0,0 +1,35 @@
+module Bool
+  class Renderer
+    if RUBY_PLATFORM =~ /java/
+      require 'bool_ext'
+
+      def self.new
+        Java::Bool::Renderer.new
+      end
+
+    else
+      def visit_var(node, vars)
+        node.name
+      end
+
+      def visit_and(node, vars)
+        "(" + render(node.left) + " && " + render(node.right) + ")"
+      end
+
+      def visit_or(node, vars)
+        "(" + render(node.left) + " || " + render(node.right) + ")"
+      end
+
+      def visit_not(node, vars)
+        "!" + render(node.operand)
+      end
+
+    private
+
+      def render(node)
+        node.accept(self, nil)
+      end
+    end
+  end
+end
+

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bool
 version: !ruby/object:Gem::Version
-  version: 1.0.11
-  prerelease: 
+  version: 1.0.13
 platform: ruby
 authors:
 - Aslak Hellesøy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0.pre
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0.pre
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 description: 
 email: 
 executables: []
@@ -68,44 +61,38 @@ extra_rdoc_files: []
 files:
 - lib/bool/ast.rb
 - lib/bool/evaluator.rb
+- lib/bool/renderer.rb
 - lib/bool.rb
 - ext/bool_ext/extconf.rb
 - ext/bool_ext/ast.c
 - 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: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4061533046418235951
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4061533046418235951
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Boolean expression evaluator
 test_files: []