rattler 0.4.1 → 0.4.2

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

@@ -16,22 +16,19 @@ module Rattler::BackEnd::ParserGenerator
       generate label.child, :dispatch_action, code, scope
     end
 
-    def gen_direct_action_nested(label, code, scope={})
-      atomic_block { gen_direct_action_top_level label, code, scope }
-    end
-
-    def gen_direct_action_top_level(label, code, scope={})
-      scope = gen_capturing label.child, scope, label.label
-      (@g << ' &&').newline << '(' << code.bind(scope, [result_name]) << ')'
+    def gen_direct_action(label, code, scope={})
+      expr :block do
+        scope = gen_capturing label.child, scope, label.label
+        (@g << ' &&').newline
+        @g.surround('(', ')') { @g << code.bind(scope, direct_action_args) }
+      end
     end
 
     private
 
     def gen_capturing(child, scope, label)
       if child.capturing?
-        @g.surround("(#{result_name} = ", ')') do
-          generate child, :basic_nested, scope
-        end
+        gen_capture { gen_nested child, :basic, scope }
         scope.merge(label => result_name)
       else
         generate child, :intermediate, scope

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

@@ -0,0 +1,1401 @@
+!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
+14
+LabelGenerator
+x
+13
+ExprGenerator
+n
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+14
+LabelGenerator
+i
+89
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+15
+5
+45
+3
+4
+47
+49
+2
+1
+15
+5
+45
+5
+6
+47
+49
+2
+1
+15
+99
+7
+7
+7
+8
+65
+67
+49
+9
+0
+49
+10
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+9
+0
+49
+10
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+9
+0
+49
+10
+4
+15
+5
+48
+15
+15
+99
+7
+16
+7
+17
+65
+67
+49
+9
+0
+49
+10
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+18
+x
+20
+PredicatePropogating
+n
+x
+7
+include
+x
+16
+TokenPropogating
+n
+x
+15
+SkipPropogating
+n
+x
+9
+gen_basic
+M
+1
+n
+n
+x
+9
+gen_basic
+i
+29
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+5
+20
+0
+49
+2
+0
+7
+3
+20
+1
+47
+49
+4
+3
+11
+I
+6
+I
+2
+I
+1
+I
+2
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+child
+x
+5
+basic
+x
+8
+generate
+p
+5
+I
+-1
+I
+b
+I
+e
+I
+c
+I
+1d
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+2
+x
+5
+label
+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
+31
+23
+2
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+2
+15
+5
+20
+0
+49
+2
+0
+7
+3
+20
+1
+20
+2
+47
+49
+4
+4
+11
+I
+8
+I
+3
+I
+2
+I
+3
+n
+p
+5
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+child
+x
+15
+dispatch_action
+x
+8
+generate
+p
+5
+I
+-1
+I
+f
+I
+e
+I
+10
+I
+1f
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+3
+x
+5
+label
+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
+50
+5
+21
+1
+0
+49
+0
+0
+21
+1
+2
+21
+1
+0
+49
+1
+0
+47
+49
+2
+3
+22
+1
+2
+15
+39
+3
+7
+4
+64
+49
+5
+1
+49
+6
+0
+15
+39
+3
+7
+7
+64
+7
+8
+64
+56
+9
+50
+10
+2
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+11
+x
+5
+child
+x
+5
+label
+x
+13
+gen_capturing
+x
+2
+@g
+s
+3
+ &&
+x
+2
+<<
+x
+7
+newline
+s
+1
+(
+s
+1
+)
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+17
+gen_direct_action
+i
+18
+39
+0
+21
+2
+1
+21
+2
+2
+5
+48
+1
+49
+2
+2
+49
+3
+1
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+4
+x
+2
+@g
+x
+18
+direct_action_args
+x
+4
+bind
+x
+2
+<<
+p
+3
+I
+0
+I
+17
+I
+12
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0
+x
+8
+surround
+p
+7
+I
+0
+I
+15
+I
+18
+I
+16
+I
+24
+I
+17
+I
+32
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0
+x
+4
+expr
+p
+5
+I
+-1
+I
+13
+I
+e
+I
+14
+I
+18
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+3
+x
+5
+label
+x
+4
+code
+x
+5
+scope
+x
+7
+private
+x
+13
+gen_capturing
+M
+1
+n
+n
+x
+13
+gen_capturing
+i
+54
+20
+0
+49
+0
+0
+9
+39
+5
+56
+1
+47
+50
+2
+0
+15
+20
+1
+44
+43
+3
+79
+49
+4
+1
+13
+20
+2
+5
+48
+5
+49
+6
+2
+15
+49
+7
+1
+8
+53
+5
+20
+0
+7
+8
+20
+1
+47
+49
+9
+3
+15
+20
+1
+11
+I
+8
+I
+3
+I
+3
+I
+3
+n
+p
+10
+x
+10
+capturing?
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+13
+gen_capturing
+i
+14
+5
+21
+1
+0
+7
+0
+21
+1
+1
+47
+49
+1
+3
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+2
+x
+5
+basic
+x
+10
+gen_nested
+p
+3
+I
+0
+I
+1f
+I
+e
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0
+x
+11
+gen_capture
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+11
+result_name
+x
+3
+[]=
+x
+5
+merge
+x
+12
+intermediate
+x
+8
+generate
+p
+13
+I
+-1
+I
+1d
+I
+0
+I
+1e
+I
+7
+I
+1f
+I
+f
+I
+20
+I
+27
+I
+22
+I
+33
+I
+23
+I
+36
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+3
+x
+5
+child
+x
+5
+scope
+x
+5
+label
+p
+17
+I
+2
+I
+7
+I
+b
+I
+8
+I
+14
+I
+9
+I
+1d
+I
+b
+I
+2b
+I
+f
+I
+39
+I
+13
+I
+47
+I
+1b
+I
+4b
+I
+1d
+I
+59
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0
+x
+13
+attach_method
+x
+20
+NestedLabelGenerator
+n
+M
+1
+n
+n
+x
+20
+NestedLabelGenerator
+i
+20
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+15
+5
+45
+3
+4
+47
+49
+2
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+6
+Nested
+n
+x
+7
+include
+x
+19
+NestedSubGenerating
+n
+p
+5
+I
+2
+I
+2b
+I
+b
+I
+2c
+I
+14
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_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
+20
+NestedLabelGenerator
+n
+x
+3
+new
+p
+5
+I
+-1
+I
+2f
+I
+0
+I
+30
+I
+b
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+1
+x
+4
+args
+n
+x
+22
+TopLevelLabelGenerator
+n
+M
+1
+n
+n
+x
+22
+TopLevelLabelGenerator
+i
+20
+5
+66
+5
+45
+0
+1
+47
+49
+2
+1
+15
+5
+45
+3
+4
+47
+49
+2
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+8
+TopLevel
+n
+x
+7
+include
+x
+21
+TopLevelSubGenerating
+n
+p
+5
+I
+2
+I
+35
+I
+b
+I
+36
+I
+14
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_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
+22
+TopLevelLabelGenerator
+n
+x
+3
+new
+p
+5
+I
+-1
+I
+39
+I
+0
+I
+3a
+I
+b
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+1
+x
+4
+args
+n
+p
+11
+I
+2
+I
+6
+I
+1f
+I
+2a
+I
+3c
+I
+2f
+I
+49
+I
+34
+I
+66
+I
+39
+I
+73
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+29
+x
+102
+/home/jarhart/Dropbox/Workspaces/Ruby/rattler/lib/rattler/back_end/parser_generator/label_generator.rb
+p
+0