Skip to content

Old fixes for C target generation templates and runtime source code #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephengaito wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Old fixes for C target generation templates and runtime source code #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71df80c
C.stg template in antlr v3.4 as released has all references to FOLLOW…
stephengaito Apr 7, 2012
adc5e54
C.stg template in antlr v3.4 as released uses NULL for null entries i…
stephengaito Apr 7, 2012
4f38a64
fix for Anonymous template missing single argument in the creation of…
stephengaito Apr 8, 2012
888b90b
fix for noRewrite template invocation missing arguments in ASTTreePar…
stephengaito Apr 8, 2012
314fd5e
fix for C target antlr3commontree::setParent -- currently it sets the…
stephengaito Apr 25, 2012
d3ce23e
Merge remote-tracking branch 'upstream/master'
stephengaito Sep 21, 2012
be0dd19
added Stephen Gaito's signature to the contributors.txt to allow futu…
stephengaito Sep 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ YYYY/MM/DD, github id, Full name, email
2012/08/08, Zannick, Benjamin S Wolf, [email protected]
2012/09/15, martint, Martin Traverso, [email protected]
2012/09/16, qmx, Douglas Campos, [email protected]
2012/09/17, ksgokul, Gokulakannan Somasundaram, [email protected]
2012/09/17, ksgokul, Gokulakannan Somasundaram, [email protected]
2012/0921, stephengaito, Stephen Gaito, [email protected]
2 changes: 1 addition & 1 deletion runtime/C/src/antlr3commontree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,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
Expand Down
6 changes: 3 additions & 3 deletions tool/src/main/resources/org/antlr/codegen/templates/C/ASTTreeParser.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ::= <<
Expand Down Expand Up @@ -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">
>>
7 changes: 6 additions & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/C/C.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
>>

Expand Down Expand Up @@ -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)>
Expand Down