merge changes from

antlr#41
https://github.com/stephengaito/antlr3

Author: Rad87

runtime/C/src/antlr3commontree.c

@@ -528,7 +528,7 @@ getParent				(pANTLR3_BASE_TREE tree)
 static void					
 setParent				(pANTLR3_BASE_TREE tree, pANTLR3_BASE_TREE parent)
 {
-	((pANTLR3_COMMON_TREE)(tree->super))->parent = parent == NULL ? NULL : ((pANTLR3_COMMON_TREE)(parent->super))->parent;
+	((pANTLR3_COMMON_TREE)(tree->super))->parent = parent == NULL ? NULL : ((pANTLR3_COMMON_TREE)(parent->super));
 }
 
 static void    				

tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg

@@ -209,7 +209,7 @@ ADAPTOR->addChild(ADAPTOR, root_<treeLevel>, <label>_tree);
 
 matchRuleBlockSet(s,label,terminalOptions,elementIndex,postmatchCode,treeLevel="0") ::= <<
 <matchSet(...)>
-<noRewrite()> <! set return tree !>
+<noRewrite(...)> <! set return tree !>
 >>
 
 matchSetBang(s,label,terminalOptions,elementIndex,postmatchCode) ::= <<
@@ -319,7 +319,7 @@ if ( <actions.(actionScope).synpredgate> ) {<\n>
 }
 <endif>
 <ruleDescriptor.allTokenRefsInAltsWithRewrites
-    :{if (stream_<it> != NULL) stream_<it>->free(stream_<it>);}; separator="\n">
+    :{it | if (stream_<it> != NULL) stream_<it>->free(stream_<it>);}; separator="\n">
 <ruleDescriptor.allRuleRefsInAltsWithRewrites
-    :{if (stream_<it> != NULL) stream_<it>->free(stream_<it>);}; separator="\n">
+    :{it | if (stream_<it> != NULL) stream_<it>->free(stream_<it>);}; separator="\n">
 >>

tool/src/main/resources/org/antlr/codegen/templates/C/C.stg

@@ -2132,7 +2132,9 @@ else
 <if(LEXER)>
     LRECOVER();
 <else>
+<! use following code to make it recover inline;
     RECOVERFROMMISMATCHEDSET(&FOLLOW_set_in_<ruleName><elementIndex>);
+!>
 <endif>
     goto rule<ruleDescriptor.name>Ex;
 }<\n>
@@ -2143,7 +2145,10 @@ CONSTRUCTEX();
 EXCEPTION->type         = ANTLR3_MISMATCHED_SET_EXCEPTION;
 EXCEPTION->name         = (void *)ANTLR3_MISMATCHED_SET_NAME;
 <if(PARSER)>
+EXCEPTION->expectingSet = NULL;
+<! use following code to make it recover inline;
 EXCEPTION->expectingSet = &FOLLOW_set_in_<ruleName><elementIndex>;
+!>
 <endif>
 >>
 
@@ -2510,7 +2515,7 @@ static const ANTLR3_INT32 dfa<dfa.decisionNumber>_T<i0>[] =
  */
 static const ANTLR3_INT32 * const dfa<dfa.decisionNumber>_transitions[] =
 {
-    <dfa.transitionEdgeTables:{xref|dfa<dfa.decisionNumber>_T<xref>}; separator=", ", wrap="\n", null="_empty">
+    <dfa.transitionEdgeTables:{xref|dfa<dfa.decisionNumber>_T<xref>}; separator=", ", wrap="\n", null="NULL">
 };
 
 <if(dfa.specialStateSTs)>