antlr3 1.6.3 → 1.7.2

data/templates/ASTDbg.stg

@@ -2,39 +2,38 @@ group ASTDbg;
 
 @parserBody.additionalMembers() ::= <<
 def self.return_scope_members
-  super.push(:tree)
+  super.push( :tree )
 end
 
 attr_reader :adaptor
-def adaptor=(adaptor)
+def adaptor=( adaptor )
   @adaptor = 
-    adaptor.is_a?(ANTLR3::Debug::TreeAdaptor) ? adaptor : 
-      ANTLR3::Debug::TreeAdaptor.wrap(adaptor, @debug_listener)
+    adaptor.is_a?( ANTLR3::Debug::TreeAdaptor ) ? adaptor : 
+      ANTLR3::Debug::TreeAdaptor.wrap( adaptor, @debug_listener )
   <grammar.directDelegates:{g|<g:delegateName()>.adaptor = @adaptor}; separator="\n">
 end
 
 alias tree_adaptor adaptor
 alias tree_adaptor= adaptor=
-
 >>
 
 
 createListenerAndHandshake() ::= <<
-options[:debug_listener] ||= begin
-  port = options[:port]
-  log  = options[:log]
-  proxy = ANTLR3::Debug::EventSocketProxy.new(
-    self, :adaptor => adaptor,
-    :log => log, :port => port
+options[ :debug_listener ] ||= begin
+  port = options[ :port ]
+  log  = options[ :log ]
+  proxy = ANTLR3::Debug::EventSocketProxy.new( self, 
+    :adaptor => adaptor,
+    :log     => log, 
+    :port    => port
   )
   proxy.handshake
   proxy
 end
 >>
-@parserConstructor.init() ::= "self.adaptor = adaptor"
 
+@parserConstructor.init() ::= "self.adaptor = adaptor"
 
 @newDelegate.delegateOptions() ::= ", :adaptor => adaptor"
 
-
-@rewriteElement.pregen() ::= "@debug_listener.location(<e.line>, <e.pos>)"
+@rewriteElement.pregen() ::= "@debug_listener.location( <e.line>, <e.pos> )"

data/templates/ASTParser.stg

@@ -10,14 +10,14 @@ end
 >>
 
 @ruleBody.setErrorReturnValue() ::= <<
-return_value.tree = @adaptor.create_error_node!(@input, return_value.start, @input.look(-1), re)<\n>
+return_value.tree = @adaptor.create_error_node( @input, return_value.start, @input.look(-1), re )<\n>
 >>
 
 tokenRef(token,label,elementIndex,hetero) ::= <<
 <super.tokenRef(...)>
 <gatedAction({
 tree_for_<label> = <createNodeFromToken(...)>
-@adaptor.add_child(root_0, tree_for_<label>)
+@adaptor.add_child( root_0, tree_for_<label> )
 })>
 >>
 
@@ -27,36 +27,29 @@ tokenRefRuleRoot(token,label,elementIndex,hetero) ::= <<
 <super.tokenRef(...)>
 <gatedAction({
 tree_for_<label> = <createNodeFromToken(...)>
-root_0 = @adaptor.become_root(tree_for_<label>, root_0)
+root_0 = @adaptor.become_root( tree_for_<label>, root_0 )
 })>
 >>
 
-
-
 tokenRefBangAndListLabel(token,label,elementIndex,hetero) ::= <<
 <tokenRefBang(...)>
 <addToList(elem={<label; format="label">},...)>
 >>
 
-
-
 tokenRefAndListLabel(token,label,elementIndex,hetero) ::= <<
 <tokenRef(...)>
 <addToList(elem={<label; format="label">},...)>
 >>
+
 tokenRefRuleRootAndListLabel(token,label,hetero,elementIndex) ::= <<
 <tokenRefRuleRoot(...)>
 <addToList(elem={<label; format="label">},...)>
 >>
 
-
-
 matchSet(s,label,hetero,elementIndex,postmatchCode) ::= <<
-<super.matchSet(..., postmatchCode={<gatedAction({@adaptor.add_child(root_0, <createNodeFromToken(...)>)})>})>
+<super.matchSet(..., postmatchCode={<gatedAction({@adaptor.add_child( root_0, <createNodeFromToken(...)> )})>})>
 >>
 
-
-
 matchRuleBlockSet(s,label,hetero,elementIndex,postmatchCode,treeLevel="0") ::= <<
 <matchSet(...)>
 >>
@@ -68,7 +61,7 @@ matchSetRuleRoot(s,label,hetero,elementIndex,debug) ::= <<
 <if(label)>
 <label; format="label"> = @input.look<\n>
 <endif>
-<super.matchSet(..., postmatchCode={<gatedAction({root_0 = @adaptor.become_root(<createNodeFromToken(...)>, root_0)})>})>
+<super.matchSet(..., postmatchCode={<gatedAction({root_0 = @adaptor.become_root( <createNodeFromToken(...)>, root_0 )})>})>
 >>
 matchSetRuleRootAndListLabel(s,label,hetero,elementIndex,debug) ::= <<
 <matchSetRuleRoot(...)>
@@ -79,7 +72,7 @@ matchSetRuleRootAndListLabel(s,label,hetero,elementIndex,debug) ::= <<
 
 ruleRef(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
-<gatedAction({@adaptor.add_child(root_0, <label; format="label">.tree)})>
+<gatedAction({@adaptor.add_child( root_0, <label; format="label">.tree )})>
 >>
 
 
@@ -90,7 +83,7 @@ ruleRefBang(rule,label,elementIndex,args,scope) ::= "<super.ruleRef(...)>"
 
 ruleRefRuleRoot(rule,label,elementIndex,args,scope) ::= <<
 <super.ruleRef(...)>
-<gatedAction({root_0 = @adaptor.become_root(<label; format="label">.tree, root_0)})>
+<gatedAction({root_0 = @adaptor.become_root( <label; format="label">.tree, root_0 )})>
 >>
 
 
@@ -117,36 +110,34 @@ ruleRefRuleRootAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 wildcard(label,elementIndex) ::= <<
 <super.wildcard(...)>
 <gatedAction({
-tree_for_<label> = @adaptor.create_with_payload!(<label; format="label">)
-@adaptor.add_child(root_0, tree_for_<label>)
+tree_for_<label> = @adaptor.create_with_payload( <label; format="label"> )
+@adaptor.add_child( root_0, tree_for_<label> )
 })>
 >>
 
-
-
 wildcardBang(label,elementIndex) ::= "<super.wildcard(...)>"
 
 wildcardRuleRoot(label,elementIndex) ::= <<
 <super.wildcard(...)>
 <gatedAction({
-tree_for_<label> = @adaptor.create_with_payload!(<label; format="label">)
-root_0 = @adaptor.become_root(tree_for_<label>, root_0)
+tree_for_<label> = @adaptor.create_with_payload( <label; format="label"> )
+root_0 = @adaptor.become_root( tree_for_<label>, root_0 )
 })>
 >>
 
 createNodeFromToken(label,hetero) ::= <<
 <if(hetero)>
-<hetero; format="constantPath">.new(<label; format="label">)
+<hetero; format="constantPath">.new( <label; format="label"> )
 <else>
-@adaptor.create_with_payload!(<label; format="label">)
+@adaptor.create_with_payload( <label; format="label"> )
 <endif>
 >>
 
 ruleCleanUp() ::= <<
 <super.ruleCleanUp()>
 <gatedAction({
-return_value.tree = @adaptor.rule_post_processing(root_0)
-@adaptor.set_token_boundaries(return_value.tree, return_value.start, return_value.stop)
+return_value.tree = @adaptor.rule_post_processing( root_0 )
+@adaptor.set_token_boundaries( return_value.tree, return_value.start, return_value.stop )
 })>
 >>
 

data/templates/ASTTreeParser.stg

@@ -9,22 +9,17 @@ end
 <endif>
 >>
 
-
-
 ruleDeclarations() ::= <<
 <super.ruleDeclarations()>
-_first_0 = nil
-_last = nil<\n>
+_last = _first_0 = nil<\n>
 >>
 
-
-
 noRewrite(rewriteBlockLevel, treeLevel) ::= <<
 <gatedAction({
 <if(rewriteMode)>
 return_value.tree = _first_0
-if @adaptor.parent(return_value.tree) && @adaptor.flat_list?(@adaptor.parent(return_value.tree))
-  return_value.tree = @adaptor.parent(return_value.tree)
+if @adaptor.parent( return_value.tree ) && @adaptor.flat_list?( @adaptor.parent( return_value.tree ) )
+  return_value.tree = @adaptor.parent( return_value.tree )
 end
 <endif>
 })>
@@ -32,43 +27,40 @@ end
 
 tree(root, actionsAfterRoot, children, nullableChildList,
      enclosingTreeLevel, treeLevel) ::= <<
-_last = @input.look
-_save_last_<treeLevel> = _last
+_save_last_<treeLevel> = _last = @input.look
 _first_<treeLevel> = nil
 <if(!rewriteMode)>
-root_<treeLevel> = @adaptor.create_flat_list!<\n>
+root_<treeLevel> = @adaptor.create_flat_list<\n>
 <endif>
 <root:element()>
 <if(rewriteMode)>
 <gatedAction({
 <if(root.el.rule)>
-_first_<enclosingTreeLevel>.nil? and _first_<enclosingTreeLevel> = <root.el.label; format="label">.tree<\n>
+_first_<enclosingTreeLevel> ||= <root.el.label; format="label">.tree<\n>
 <else>
-_first_<enclosingTreeLevel>.nil? and _first_<enclosingTreeLevel> = <root.el.label; format="label"><\n>
+_first_<enclosingTreeLevel> ||= <root.el.label; format="label"><\n>
 <endif>
 })>
 <endif>
 <actionsAfterRoot:element()>
 <if(nullableChildList)>
 if @input.peek == DOWN
-  match(DOWN, nil)
+  match( DOWN, nil )
   <children:element()>
-  match(UP, nil)
-end
+  match( UP, nil )
+end<\n>
 <else>
-match(DOWN, nil)
+match( DOWN, nil )
 <children:element()>
-match(UP, nil)<\n>
+match( UP, nil )<\n>
 <endif>
 <if(!rewriteMode)>
-@adaptor.add_child(root_<enclosingTreeLevel>, root_<treeLevel>)<\n>
+@adaptor.add_child( root_<enclosingTreeLevel>, root_<treeLevel> )<\n>
 <endif>
 _last = _save_last_<treeLevel>
 
 >>
 
-
-
 tokenRefBang(token,label,elementIndex) ::= <<
 _last = @input.look
 <super.tokenRef(...)>
@@ -80,11 +72,11 @@ _last = @input.look
 <if(!rewriteMode)>
 <gatedAction({
 <if(hetero)>
-tree_for_<label> = <hetero; format="constantPath">.new(<label; format="label">)
+tree_for_<label> = <hetero; format="constantPath">.new( <label; format="label"> )
 <else>
-tree_for_<label> = @adaptor.copy_node(<label; format="label">)
+tree_for_<label> = @adaptor.copy_node( <label; format="label"> )
 <endif><\n>
-@adaptor.add_child(root_<treeLevel>, tree_for_<label>)
+@adaptor.add_child( root_<treeLevel>, tree_for_<label> )
 })>
 <else> <! rewrite mode !>
 <gatedAction({
@@ -106,31 +98,27 @@ _last = @input.look
 <if(!rewriteMode)>
 <gatedAction({
 <if(hetero)>
-tree_for_<label> = <hetero; format="constantPath">.new(<label; format="label">)
+tree_for_<label> = <hetero; format="constantPath">.new( <label; format="label"> )
 <else>
-tree_for_<label> = @adaptor.copy_node(<label; format="label">)
+tree_for_<label> = @adaptor.copy_node( <label; format="label"> )
 <endif><\n>
-root_<treeLevel> = @adaptor.become_root(tree_for_<label>, root_<treeLevel>)
+root_<treeLevel> = @adaptor.become_root( tree_for_<label>, root_<treeLevel> )
 })>
 <endif>
 >>
 
-
-
 tokenRefRuleRootAndListLabel(token,label,elementIndex,hetero) ::= <<
 <tokenRefRuleRoot(...)>
 <addToList(elem={<label; format="label">},...)>
 >>
 
-
-
 wildcard(token,label,elementIndex,hetero) ::= <<
 _last = @input.look
 <super.wildcard(...)>
 <if(!rewriteMode)>
 <gatedAction({
-tree_for_<label> = @adaptor.copy_tree(<label; format="label">)
-@adaptor.add_child(root_<treeLevel>, tree_for_<label>)
+tree_for_<label> = @adaptor.copy_tree( <label; format="label"> )
+@adaptor.add_child( root_<treeLevel>, tree_for_<label> )
 })>
 <else> <! rewrite mode !>
 <gatedAction({
@@ -145,11 +133,11 @@ _last = @input.look
 <if(!rewriteMode)>
 <gatedAction({
 <if(hetero)>
-tree_for_<label> = <hetero; format="constantPath">.new(<label; format="label">)
+tree_for_<label> = <hetero; format="constantPath">.new( <label; format="label"> )
 <else>
-tree_for_<label> = @adaptor.copy_node(<label; format="label">)
+tree_for_<label> = @adaptor.copy_node( <label; format="label"> )
 <endif><\n>
-@adaptor.add_child(root_<treeLevel>, tree_for_<label>)
+@adaptor.add_child( root_<treeLevel>, tree_for_<label> )
 })>
 <endif>
 })>
@@ -159,7 +147,7 @@ tree_for_<label> = @adaptor.copy_node(<label; format="label">)
 
 matchRuleBlockSet(s,label,hetero,elementIndex,postmatchCode,treeLevel="0") ::= <<
 <matchSet(...)>
-<noRewrite()> <! set return tree !>
+<noRewrite()>
 >>
 
 
@@ -174,79 +162,63 @@ matchSetRuleRoot(s,label,hetero,elementIndex,debug) ::= <<
 <if(!rewriteMode)>
 <gatedAction({
 <if(hetero)>
-tree_for_<label> = <hetero; format="constantPath">.new(<label; format="label">)
+tree_for_<label> = <hetero; format="constantPath">.new( <label; format="label"> )
 <else>
-tree_for_<label> = @adaptor.copy_node(<label; format="label">)
+tree_for_<label> = @adaptor.copy_node( <label; format="label"> )
 <endif><\n>
-root_<treeLevel> = @adaptor.become_root(tree_for_<label>, root_<treeLevel>)
+root_<treeLevel> = @adaptor.become_root( tree_for_<label>, root_<treeLevel> )
 })>
 <endif>
 })>
 >>
 
-
-
 ruleRef(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRef(...)>
 <gatedAction({
 <if(!rewriteMode)>
-@adaptor.add_child(root_<treeLevel>, <label; format="label">.tree)
-<else> <! rewrite mode !>
-_first_<treeLevel>.nil? and _first_<treeLevel> = <label; format="label">.tree<\n>
+@adaptor.add_child( root_<treeLevel>, <label; format="label">.tree )
+<else>
+_first_<treeLevel> ||= <label; format="label">.tree<\n>
 <endif>
 })>
 >>
 
-
-
 ruleRefAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRef(...)>
 <addToList(elem={<label; format="label">.tree},...)>
 >>
 
-
-
 ruleRefRuleRoot(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRef(...)>
 <if(!rewriteMode)>
 <gatedAction({
-root_<treeLevel> = @adaptor.become_root(<label; format="label">.tree, root_<treeLevel>)
+root_<treeLevel> = @adaptor.become_root( <label; format="label">.tree, root_<treeLevel> )
 })>
 <endif>
 >>
 
-
-
 ruleRefRuleRootAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 <ruleRefRuleRoot(...)>
 <addToList(elem={<label; format="label">.tree},...)>
 >>
 
-
-
 ruleRefTrack(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRefTrack(...)>
 >>
 
-
-
 ruleRefTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRefTrackAndListLabel(...)>
 >>
 
-
-
 ruleRefRuleRootTrack(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRefRootTrack(...)>
 >>
 
-
-
 ruleRefRuleRootTrackAndListLabel(rule,label,elementIndex,args,scope) ::= <<
 _last = @input.look
 <super.ruleRefRuleRootTrackAndListLabel(...)>
@@ -254,7 +226,7 @@ _last = @input.look
 
 createRewriteNodeFromElement(token,hetero,scope) ::= <<
 <if(hetero)>
-<hetero; format="constantPath">.new(stream_<token>.next_node)
+<hetero; format="constantPath">.new( stream_<token>.next_node )
 <else>
 stream_<token>.next_node
 <endif>
@@ -264,9 +236,7 @@ ruleCleanUp() ::= <<
 <super.ruleCleanUp()>
 <if(!rewriteMode)>
 <gatedAction({
-return_value.tree = @adaptor.rule_post_processing(root_0)
+return_value.tree = @adaptor.rule_post_processing( root_0 )
 })>
 <endif>
 >>
-
-

data/templates/Dbg.stg

@@ -156,17 +156,17 @@ element() ::= <<
 
 
 @dfaState.noViableAltException() ::= <<
-@debug_listener.recognition_exception(nvae)
-raise(nvae)
+nvae = NoViableAlternative( "<description>", <decisionNumber>, <stateNumber> )
+@debug_listener.recognition_exception( nvae )
+raise( nvae )<\n>
 >>
 
-
 @dfaStateSwitch.noViableAltException() ::= <<
-@debug_listener.recognition_exception nvae
-raise nvae
+nvae = NoViableAlternative( "<description>", <decisionNumber>, <stateNumber> )
+@debug_listener.recognition_exception( nvae )
+raise( nvae )<\n>
 >>
 
-
 dfaDecision(decisionNumber,description) ::= <<
 begin
   @state.cyclic_decision = true