rattler 0.4.1 → 0.4.2

data/lib/rattler/back_end/parser_generator/optional_generator.rb

@@ -6,18 +6,16 @@ module Rattler::BackEnd::ParserGenerator
   class OptionalGenerator < ExprGenerator #:nodoc:
     include NestedSubGenerating
 
-    def gen_basic_nested(optional, scope={})
-      atomic_expr { gen_basic_top_level optional, scope }
-    end
-
-    def gen_basic_top_level(optional, scope={})
+    def gen_basic(optional, scope={})
       if optional.capturing?
-        @g.surround("(#{result_name} = ", ')') do
-          generate optional.child, :basic, scope
+        expr do
+          @g.surround("(#{result_name} = ", ')') do
+            generate optional.child, :basic, scope
+          end
+          @g << " ? [#{result_name}] : []"
         end
-        @g << " ? [#{result_name}] : []"
       else
-        gen_skip_top_level optional, scope
+        gen_skip optional, scope
       end
     end
 
@@ -29,52 +27,34 @@ module Rattler::BackEnd::ParserGenerator
       @g << 'false'
     end
 
-    def gen_dispatch_action_nested(optional, code, scope={})
-      atomic_block { gen_dispatch_action_top_level optional, code, scope }
-    end
-
-    def gen_dispatch_action_top_level(optional, code, scope={})
-      @g << "#{result_name} = "
-      generate optional.child, :basic, scope
-      @g.newline << code.bind(scope, "#{result_name} ? [#{result_name}] : []")
-    end
-
-    def gen_direct_action_nested(optional, code, scope={})
-      atomic_block { gen_direct_action_top_level optional, code, scope }
-    end
-
-    def gen_direct_action_top_level(optional, code, scope={})
-      @g << "#{result_name} = "
-      generate optional.child, :basic, scope
-      @g.newline <<
-        '(' << code.bind(scope, ["(#{result_name} ? [#{result_name}] : [])"]) << ')'
-    end
-
-    def gen_token_nested(optional, scope={})
-      atomic_block { gen_token_top_level optional, scope }
-    end
-
-    def gen_token_top_level(optional, scope={})
-      generate optional.child, :token, scope
-      @g << " || ''"
+    def gen_dispatch_action(optional, code, scope={})
+      expr :block do
+        @g << "#{result_name} = "
+        generate optional.child, :basic, scope
+        @g.newline << code.bind(scope, "#{result_name} ? [#{result_name}] : []")
+      end
     end
 
-    def gen_skip_nested(optional, scope={})
-      atomic_block { gen_skip_top_level optional, scope }
+    def gen_direct_action(optional, code, scope={})
+      expr :block do
+        @g << "#{result_name} = "
+        generate optional.child, :basic, scope
+        @g.newline <<
+          '(' << code.bind(scope, ["(#{result_name} ? [#{result_name}] : [])"]) << ')'
+      end
     end
 
-    def gen_skip_top_level(optional, scope={})
-      generate optional.child, :intermediate_skip, scope
-      @g.newline << 'true'
+    def gen_token(optional, scope={})
+      expr :block do
+        generate optional.child, :token, scope
+        @g << " || ''"
+      end
     end
 
-    private
-
-    def gen_capturing(optional, scope={})
-      if optional.capturing?
-        yield
-      else
-        gen_skip_top_level optional, scope
+    def gen_skip(optional, scope={})
+      expr :block do
+        generate optional.child, :intermediate_skip, scope
+        @g.newline << 'true'
       end
     end
 

data/lib/rattler/back_end/parser_generator/optional_generator.rbc

@@ -0,0 +1,2025 @@
+!RBIX
+3105615304195158506
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+41
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+7
+2
+45
+3
+4
+43
+5
+49
+6
+2
+13
+99
+12
+7
+7
+12
+7
+8
+12
+65
+12
+49
+9
+4
+15
+49
+7
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+10
+s
+33
+rattler/back_end/parser_generator
+x
+7
+require
+x
+15
+ParserGenerator
+x
+7
+Rattler
+n
+x
+7
+BackEnd
+x
+17
+open_module_under
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+15
+ParserGenerator
+i
+115
+5
+66
+99
+7
+0
+45
+1
+2
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+99
+7
+7
+45
+0
+8
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+9
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+99
+7
+10
+7
+11
+65
+45
+0
+12
+49
+6
+4
+15
+99
+7
+13
+45
+0
+14
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+15
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+99
+7
+16
+7
+17
+65
+45
+0
+18
+49
+6
+4
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+19
+x
+17
+OptionalGenerator
+x
+13
+ExprGenerator
+n
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+17
+OptionalGenerator
+i
+109
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+15
+99
+7
+3
+7
+4
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+7
+7
+8
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+9
+7
+10
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+5
+0
+49
+6
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+19
+x
+19
+NestedSubGenerating
+n
+x
+7
+include
+x
+9
+gen_basic
+M
+1
+n
+n
+x
+9
+gen_basic
+i
+40
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+20
+0
+49
+2
+0
+9
+30
+5
+56
+3
+47
+50
+4
+0
+8
+39
+5
+20
+0
+20
+1
+47
+49
+5
+2
+11
+I
+5
+I
+2
+I
+1
+I
+2
+n
+p
+6
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+10
+capturing?
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_basic
+i
+41
+39
+0
+7
+1
+5
+48
+2
+47
+101
+3
+7
+4
+63
+3
+7
+5
+64
+56
+6
+50
+7
+2
+15
+39
+0
+7
+8
+5
+48
+2
+47
+101
+3
+7
+9
+63
+3
+49
+10
+1
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+11
+x
+2
+@g
+s
+1
+(
+x
+11
+result_name
+x
+4
+to_s
+s
+3
+ = 
+s
+1
+)
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_basic
+i
+17
+5
+21
+2
+0
+49
+0
+0
+7
+1
+21
+2
+1
+47
+49
+2
+3
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+3
+x
+5
+child
+x
+5
+basic
+x
+8
+generate
+p
+3
+I
+0
+I
+d
+I
+11
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+8
+surround
+s
+4
+ ? [
+s
+6
+] : []
+x
+2
+<<
+p
+5
+I
+0
+I
+c
+I
+17
+I
+f
+I
+29
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+4
+expr
+x
+8
+gen_skip
+p
+9
+I
+-1
+I
+9
+I
+e
+I
+a
+I
+15
+I
+b
+I
+1e
+I
+12
+I
+28
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+2
+x
+8
+optional
+x
+5
+scope
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+10
+gen_assert
+M
+1
+n
+n
+x
+10
+gen_assert
+i
+23
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+39
+2
+7
+3
+64
+49
+4
+1
+11
+I
+4
+I
+2
+I
+1
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+2
+@g
+s
+4
+true
+x
+2
+<<
+p
+5
+I
+-1
+I
+16
+I
+e
+I
+17
+I
+17
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+2
+x
+8
+optional
+x
+5
+scope
+x
+12
+gen_disallow
+M
+1
+n
+n
+x
+12
+gen_disallow
+i
+23
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+39
+2
+7
+3
+64
+49
+4
+1
+11
+I
+4
+I
+2
+I
+1
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+2
+@g
+s
+5
+false
+x
+2
+<<
+p
+5
+I
+-1
+I
+1a
+I
+e
+I
+1b
+I
+17
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+2
+x
+8
+optional
+x
+5
+scope
+x
+19
+gen_dispatch_action
+M
+1
+n
+n
+x
+19
+gen_dispatch_action
+i
+24
+23
+2
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+2
+15
+5
+7
+2
+56
+3
+47
+50
+4
+1
+11
+I
+6
+I
+3
+I
+2
+I
+3
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+block
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+19
+gen_dispatch_action
+i
+69
+39
+0
+5
+48
+1
+47
+101
+2
+7
+3
+63
+2
+49
+4
+1
+15
+5
+21
+1
+0
+49
+5
+0
+7
+6
+21
+1
+2
+47
+49
+7
+3
+15
+39
+0
+49
+8
+0
+21
+1
+1
+21
+1
+2
+5
+48
+1
+47
+101
+2
+7
+9
+5
+48
+1
+47
+101
+2
+7
+10
+63
+4
+49
+11
+2
+49
+4
+1
+11
+I
+8
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+12
+x
+2
+@g
+x
+11
+result_name
+x
+4
+to_s
+s
+3
+ = 
+x
+2
+<<
+x
+5
+child
+x
+5
+basic
+x
+8
+generate
+x
+7
+newline
+s
+4
+ ? [
+s
+6
+] : []
+x
+4
+bind
+p
+7
+I
+0
+I
+20
+I
+10
+I
+21
+I
+21
+I
+22
+I
+45
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+1e
+I
+e
+I
+1f
+I
+18
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+3
+x
+8
+optional
+x
+4
+code
+x
+5
+scope
+x
+17
+gen_direct_action
+M
+1
+n
+n
+x
+17
+gen_direct_action
+i
+24
+23
+2
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+2
+15
+5
+7
+2
+56
+3
+47
+50
+4
+1
+11
+I
+6
+I
+3
+I
+2
+I
+3
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+block
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+17
+gen_direct_action
+i
+85
+39
+0
+5
+48
+1
+47
+101
+2
+7
+3
+63
+2
+49
+4
+1
+15
+5
+21
+1
+0
+49
+5
+0
+7
+6
+21
+1
+2
+47
+49
+7
+3
+15
+39
+0
+49
+8
+0
+7
+9
+64
+49
+4
+1
+21
+1
+1
+21
+1
+2
+7
+9
+5
+48
+1
+47
+101
+2
+7
+10
+5
+48
+1
+47
+101
+2
+7
+11
+63
+5
+35
+1
+49
+12
+2
+49
+4
+1
+7
+13
+64
+49
+4
+1
+11
+I
+9
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+14
+x
+2
+@g
+x
+11
+result_name
+x
+4
+to_s
+s
+3
+ = 
+x
+2
+<<
+x
+5
+child
+x
+5
+basic
+x
+8
+generate
+x
+7
+newline
+s
+1
+(
+s
+4
+ ? [
+s
+7
+] : [])
+x
+4
+bind
+s
+1
+)
+p
+19
+I
+0
+I
+28
+I
+10
+I
+29
+I
+21
+I
+2a
+I
+26
+I
+2b
+I
+29
+I
+2a
+I
+2c
+I
+2b
+I
+4b
+I
+2a
+I
+4e
+I
+2b
+I
+51
+I
+2a
+I
+55
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+26
+I
+e
+I
+27
+I
+18
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+3
+x
+8
+optional
+x
+4
+code
+x
+5
+scope
+x
+9
+gen_token
+M
+1
+n
+n
+x
+9
+gen_token
+i
+24
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+5
+7
+2
+56
+3
+47
+50
+4
+1
+11
+I
+5
+I
+2
+I
+1
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+block
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_token
+i
+26
+5
+21
+1
+0
+49
+0
+0
+7
+1
+21
+1
+1
+47
+49
+2
+3
+15
+39
+3
+7
+4
+64
+49
+5
+1
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+6
+x
+5
+child
+x
+5
+token
+x
+8
+generate
+x
+2
+@g
+s
+6
+ || ''
+x
+2
+<<
+p
+5
+I
+0
+I
+31
+I
+11
+I
+32
+I
+1a
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+2f
+I
+e
+I
+30
+I
+18
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+2
+x
+8
+optional
+x
+5
+scope
+x
+8
+gen_skip
+M
+1
+n
+n
+x
+8
+gen_skip
+i
+24
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+5
+7
+2
+56
+3
+47
+50
+4
+1
+11
+I
+5
+I
+2
+I
+1
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+block
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+8
+gen_skip
+i
+29
+5
+21
+1
+0
+49
+0
+0
+7
+1
+21
+1
+1
+47
+49
+2
+3
+15
+39
+3
+49
+4
+0
+7
+5
+64
+49
+6
+1
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+7
+x
+5
+child
+x
+17
+intermediate_skip
+x
+8
+generate
+x
+2
+@g
+x
+7
+newline
+s
+4
+true
+x
+2
+<<
+p
+5
+I
+0
+I
+38
+I
+11
+I
+39
+I
+1d
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+36
+I
+e
+I
+37
+I
+18
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+2
+x
+8
+optional
+x
+5
+scope
+p
+17
+I
+2
+I
+7
+I
+b
+I
+9
+I
+19
+I
+16
+I
+27
+I
+1a
+I
+35
+I
+1e
+I
+43
+I
+26
+I
+51
+I
+2f
+I
+5f
+I
+36
+I
+6d
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+13
+attach_method
+x
+23
+NestedOptionalGenerator
+n
+M
+1
+n
+n
+x
+23
+NestedOptionalGenerator
+i
+11
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+6
+Nested
+n
+x
+7
+include
+p
+3
+I
+2
+I
+41
+I
+b
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+6
+nested
+M
+1
+n
+n
+x
+6
+nested
+i
+11
+45
+0
+1
+20
+0
+36
+1
+51
+2
+0
+11
+I
+4
+I
+1
+I
+0
+I
+0
+I
+0
+p
+3
+x
+23
+NestedOptionalGenerator
+n
+x
+3
+new
+p
+5
+I
+-1
+I
+44
+I
+0
+I
+45
+I
+b
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+1
+x
+4
+args
+n
+x
+25
+TopLevelOptionalGenerator
+n
+M
+1
+n
+n
+x
+25
+TopLevelOptionalGenerator
+i
+11
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+8
+TopLevel
+n
+x
+7
+include
+p
+3
+I
+2
+I
+4a
+I
+b
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+9
+top_level
+M
+1
+n
+n
+x
+9
+top_level
+i
+11
+45
+0
+1
+20
+0
+36
+1
+51
+2
+0
+11
+I
+4
+I
+1
+I
+0
+I
+0
+I
+0
+p
+3
+x
+25
+TopLevelOptionalGenerator
+n
+x
+3
+new
+p
+5
+I
+-1
+I
+4d
+I
+0
+I
+4e
+I
+b
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+1
+x
+4
+args
+n
+p
+11
+I
+2
+I
+6
+I
+1f
+I
+40
+I
+3c
+I
+44
+I
+49
+I
+49
+I
+66
+I
+4d
+I
+73
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+29
+x
+105
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/optional_generator.rb
+p
+0