rattler 0.4.1 → 0.4.2

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

@@ -4,58 +4,48 @@ module Rattler::BackEnd::ParserGenerator
   # @private
   module RepeatGenerating #:nodoc:
 
-    def gen_basic_nested(repeat, scope={})
-      atomic_block { gen_basic_top_level repeat, scope }
-    end
-
-    def gen_basic_top_level(repeat, scope={})
+    def gen_basic(repeat, scope={})
       if repeat.capturing?
-        gen_loop repeat, :basic_nested, scope
-        gen_result accumulator_name
+        expr :block do
+          gen_loop(repeat) { |child| gen_nested child, :basic, scope }
+          gen_result accumulator_name
+        end
       else
-        gen_skip_top_level repeat, scope
+        gen_skip repeat, scope
       end
     end
 
-    def gen_dispatch_action_nested(repeat, code, scope={})
-      atomic_block do
-        gen_dispatch_action_top_level repeat, code, scope
+    def gen_dispatch_action(repeat, code, scope={})
+      expr :block do
+        gen_loop repeat
+        gen_result code.bind(scope, "select_captures(#{accumulator_name})")
       end
     end
 
-    def gen_dispatch_action_top_level(repeat, code, scope={})
-      gen_loop repeat, :basic, scope
-      gen_result code.bind(scope, "select_captures(#{accumulator_name})")
-    end
-
-    def gen_direct_action_nested(repeat, code, scope={})
-      atomic_block { gen_direct_action_top_level repeat, code, scope }
-    end
-
-    def gen_direct_action_top_level(repeat, code, scope={})
-      gen_loop repeat, :basic, scope
-      gen_result('(' + code.bind(scope, ["select_captures(#{accumulator_name})"]) + ')')
-    end
-
-    def gen_token_nested(repeat, scope={})
-      atomic_block { gen_token_top_level repeat, scope }
-    end
-
-    def gen_token_top_level(repeat, scope={})
-      gen_loop repeat, :token, scope
-      gen_result "#{accumulator_name}.join"
+    def gen_direct_action(repeat, code, scope={})
+      expr :block do
+        gen_loop repeat
+        gen_result('(' + code.bind(scope, ["select_captures(#{accumulator_name})"]) + ')')
+      end
     end
 
-    def gen_skip_nested(repeat, scope={})
-      atomic_block { gen_skip_top_level repeat, scope }
+    def gen_token(repeat, scope={})
+      expr :block do
+        gen_loop(repeat) { |child| generate child, :token, scope }
+        gen_result "#{accumulator_name}.join"
+      end
     end
 
     private
 
-    def gen_loop(repeat, child_as = :basic, scope={})
+    def gen_loop(repeat, scope={})
       (@g << "#{accumulator_name} = []").newline
       @g << "while #{result_name} = "
-      generate repeat.child, child_as, scope
+      if block_given?
+        yield repeat.child
+      else
+        generate repeat.child, :basic, scope
+      end
       @g.block('') { @g << "#{accumulator_name} << #{result_name}" }.newline
     end
 

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

@@ -0,0 +1,1549 @@
+!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
+28
+5
+66
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+16
+RepeatGenerating
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+16
+RepeatGenerating
+i
+90
+5
+66
+99
+7
+0
+7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+4
+7
+5
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+6
+7
+7
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+8
+7
+9
+65
+67
+49
+2
+0
+49
+3
+4
+15
+5
+48
+10
+15
+99
+7
+11
+7
+12
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+15
+x
+9
+gen_basic
+M
+1
+n
+n
+x
+9
+gen_basic
+i
+42
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+20
+0
+49
+2
+0
+9
+32
+5
+7
+3
+56
+4
+47
+50
+5
+1
+8
+41
+5
+20
+0
+20
+1
+47
+49
+6
+2
+11
+I
+5
+I
+2
+I
+1
+I
+2
+n
+p
+7
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+10
+capturing?
+x
+5
+block
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_basic
+i
+20
+5
+21
+1
+0
+56
+0
+47
+50
+1
+1
+15
+5
+5
+48
+2
+47
+49
+3
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+4
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_basic
+i
+17
+57
+19
+0
+15
+5
+20
+0
+7
+0
+21
+2
+1
+47
+49
+1
+3
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+2
+x
+5
+basic
+x
+10
+gen_nested
+p
+3
+I
+0
+I
+a
+I
+11
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+1
+x
+5
+child
+x
+8
+gen_loop
+x
+16
+accumulator_name
+x
+10
+gen_result
+p
+5
+I
+0
+I
+a
+I
+b
+I
+b
+I
+14
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+4
+expr
+x
+8
+gen_skip
+p
+9
+I
+-1
+I
+7
+I
+e
+I
+8
+I
+15
+I
+9
+I
+20
+I
+e
+I
+2a
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+2
+x
+6
+repeat
+x
+5
+scope
+x
+17
+method_visibility
+x
+15
+add_defn_method
+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
+36
+5
+21
+1
+0
+47
+49
+0
+1
+15
+5
+21
+1
+1
+21
+1
+2
+7
+1
+5
+48
+2
+47
+101
+3
+7
+4
+63
+3
+49
+5
+2
+47
+49
+6
+1
+11
+I
+7
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+7
+x
+8
+gen_loop
+s
+16
+select_captures(
+x
+16
+accumulator_name
+x
+4
+to_s
+s
+1
+)
+x
+4
+bind
+x
+10
+gen_result
+p
+5
+I
+0
+I
+14
+I
+9
+I
+15
+I
+24
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+12
+I
+e
+I
+13
+I
+18
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+3
+x
+6
+repeat
+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
+48
+5
+21
+1
+0
+47
+49
+0
+1
+15
+5
+7
+1
+64
+21
+1
+1
+21
+1
+2
+7
+2
+5
+48
+3
+47
+101
+4
+7
+5
+63
+3
+35
+1
+49
+6
+2
+81
+7
+7
+5
+64
+81
+7
+47
+49
+8
+1
+11
+I
+8
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+9
+x
+8
+gen_loop
+s
+1
+(
+s
+16
+select_captures(
+x
+16
+accumulator_name
+x
+4
+to_s
+s
+1
+)
+x
+4
+bind
+x
+1
++
+x
+10
+gen_result
+p
+5
+I
+0
+I
+1b
+I
+9
+I
+1c
+I
+30
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+19
+I
+e
+I
+1a
+I
+18
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+3
+x
+6
+repeat
+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
+27
+5
+21
+1
+0
+56
+0
+47
+50
+1
+1
+15
+5
+5
+48
+2
+47
+101
+3
+7
+4
+63
+2
+47
+49
+5
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+6
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+9
+gen_token
+i
+17
+57
+19
+0
+15
+5
+20
+0
+7
+0
+21
+2
+1
+47
+49
+1
+3
+11
+I
+6
+I
+1
+I
+1
+I
+1
+n
+p
+2
+x
+5
+token
+x
+8
+generate
+p
+3
+I
+0
+I
+22
+I
+11
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+1
+x
+5
+child
+x
+8
+gen_loop
+x
+16
+accumulator_name
+x
+4
+to_s
+s
+5
+.join
+x
+10
+gen_result
+p
+5
+I
+0
+I
+22
+I
+b
+I
+23
+I
+1b
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+20
+I
+e
+I
+21
+I
+18
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+2
+x
+6
+repeat
+x
+5
+scope
+x
+7
+private
+x
+8
+gen_loop
+M
+1
+n
+n
+x
+8
+gen_loop
+i
+92
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+39
+2
+5
+48
+3
+47
+101
+4
+7
+5
+63
+2
+49
+6
+1
+49
+7
+0
+15
+39
+2
+7
+8
+5
+48
+9
+47
+101
+4
+7
+10
+63
+3
+49
+6
+1
+15
+94
+9
+63
+20
+0
+49
+11
+0
+60
+1
+8
+77
+5
+20
+0
+49
+11
+0
+7
+12
+20
+1
+47
+49
+13
+3
+15
+39
+2
+7
+14
+64
+56
+15
+50
+16
+1
+49
+7
+0
+11
+I
+6
+I
+2
+I
+1
+I
+2
+n
+p
+17
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+2
+@g
+x
+16
+accumulator_name
+x
+4
+to_s
+s
+5
+ = []
+x
+2
+<<
+x
+7
+newline
+s
+6
+while 
+x
+11
+result_name
+s
+3
+ = 
+x
+5
+child
+x
+5
+basic
+x
+8
+generate
+s
+0
+
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+8
+gen_loop
+i
+22
+39
+0
+5
+48
+1
+47
+101
+2
+7
+3
+5
+48
+4
+47
+101
+2
+63
+3
+49
+5
+1
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+6
+x
+2
+@g
+x
+16
+accumulator_name
+x
+4
+to_s
+s
+4
+ << 
+x
+11
+result_name
+x
+2
+<<
+p
+3
+I
+0
+I
+31
+I
+16
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+5
+block
+p
+15
+I
+-1
+I
+29
+I
+e
+I
+2a
+I
+21
+I
+2b
+I
+33
+I
+2c
+I
+36
+I
+2d
+I
+3f
+I
+2f
+I
+4e
+I
+31
+I
+5c
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+2
+x
+6
+repeat
+x
+5
+scope
+x
+16
+accumulator_name
+M
+1
+n
+n
+x
+16
+accumulator_name
+i
+11
+7
+0
+5
+48
+1
+47
+101
+2
+63
+2
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+s
+1
+a
+x
+12
+repeat_level
+x
+4
+to_s
+p
+5
+I
+-1
+I
+34
+I
+0
+I
+35
+I
+b
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+p
+15
+I
+2
+I
+7
+I
+10
+I
+12
+I
+1e
+I
+19
+I
+2c
+I
+20
+I
+3a
+I
+27
+I
+3e
+I
+29
+I
+4c
+I
+34
+I
+5a
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+5
+I
+1c
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+29
+x
+104
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/repeat_generating.rb
+p
+0