forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

clean up, added tree parser err handler 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9178]
This commit is contained in:
parrt 2011-10-23 14:04:58 -08:00
parent 11b61d979d
commit 2cbd522320
20 changed files with 293 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
runtime/Java/src/org/antlr/v4/runtime/DefaultANTLRTreeGrammarErrorStrategy.java Normal file
View File

@ -0,0 +1,77 @@
/*
[The "BSD license"]
Copyright (c) 2011 Terence Parr
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.runtime;
import org.antlr.v4.runtime.tree.*;
import org.antlr.v4.runtime.tree.gui.TreeViewer;
public class DefaultANTLRTreeGrammarErrorStrategy implements ANTLRErrorStrategy {
@Override
public void beginErrorCondition(BaseRecognizer recognizer) {
}
@Override
public void reportError(BaseRecognizer recognizer, RecognitionException e)
throws RecognitionException
{
Object root = ((TreeParser)recognizer).getInputStream().getTreeSource();
if ( root instanceof Tree ) {
TreeViewer viewer = new TreeViewer(recognizer, (Tree)root);
viewer.open();
// TODO: highlight error node
}
recognizer.notifyListeners(e.offendingToken, e.getMessage(), e);
}
@Override
public Object recoverInline(BaseRecognizer recognizer) throws RecognitionException {
throw new InputMismatchException(recognizer);
}
@Override
public void recover(BaseRecognizer recognizer) {
throw new RecognitionException(recognizer,
recognizer.getInputStream(),
recognizer._ctx);
}
@Override
public void sync(BaseRecognizer recognizer) {
}
@Override
public boolean inErrorRecoveryMode(BaseRecognizer recognizer) {
return false;
}
@Override
public void endErrorCondition(BaseRecognizer recognizer) {
}
}

54
runtime/Java/src/org/antlr/v4/runtime/NoViableTreeGrammarAltException.java Normal file
View File

@ -0,0 +1,54 @@
/*
[The "BSD license"]
Copyright (c) 2011 Terence Parr
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.runtime;
import org.antlr.v4.runtime.atn.ATNConfig;
import org.antlr.v4.runtime.misc.OrderedHashSet;
import org.antlr.v4.runtime.tree.ASTNodeStream;
public class NoViableTreeGrammarAltException extends NoViableAltException {
protected Object startNode;
protected Object offendingNode;
public NoViableTreeGrammarAltException(BaseRecognizer recognizer) {
super(recognizer);
}
public NoViableTreeGrammarAltException(BaseRecognizer recognizer,
ASTNodeStream input,
Object startNode,
Object offendingNode,
OrderedHashSet<ATNConfig> deadEndConfigs,
RuleContext ctx) {
super(recognizer, input, null, null, deadEndConfigs, ctx);
this.startNode = startNode;
this.offendingNode = offendingNode;
}
}

47
runtime/Java/src/org/antlr/v4/runtime/ObjectStream.java Normal file
View File

@ -0,0 +1,47 @@
/*
[The "BSD license"]
Copyright (c) 2011 Terence Parr
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.runtime;
/** A stream of either tokens or tree nodes */
public interface ObjectStream extends IntStream {
/** Get an object at absolute index i; 0..n-1.
* This is only valid if the underlying stream implementation buffers
* all of the incoming objects.
*/
public Object get(int i);
/** Get Object at current input pointer + i ahead where i=1 is next Object.
* i<0 indicates Objects in the past. So -1 is previous Object and -2 is
* two Objects ago. LT(0) is undefined. For i>=n, return an
* object representing EOF. Return null for LT(0) and any index that
* results in an absolute index that is negative.
*/
Object LT(int k);
}

2
runtime/Java/src/org/antlr/v4/runtime/TokenStream.java
View File

@ -30,7 +30,7 @@
package org.antlr.v4.runtime;
/** A stream of tokens accessing tokens from a TokenSource */
public interface TokenStream extends IntStream {
public interface TokenStream extends ObjectStream {
/** Get Token at current input pointer + i ahead where i=1 is next Token.
* i<0 indicates tokens in the past. So -1 is previous token and -2 is
* two tokens ago. LT(0) is undefined. For i>=n, return Token.EOFToken.

52
runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
View File

@ -30,10 +30,9 @@
package org.antlr.v4.runtime.atn;
import org.antlr.v4.runtime.*;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.dfa.DFAState;
import org.antlr.v4.runtime.dfa.*;
import org.antlr.v4.runtime.misc.OrderedHashSet;
import org.antlr.v4.runtime.tree.ASTNodeStream;
import org.antlr.v4.runtime.tree.*;
import org.stringtemplate.v4.misc.MultiMap;
import java.util.*;
@ -82,7 +81,7 @@ public class ParserATNSimulator extends ATNSimulator {
// System.out.println(dot.getDOT(atn.rules.get(1), parser.getRuleNames()));
}
public int adaptivePredict(TokenStream input, int decision, RuleContext outerContext) {
public int adaptivePredict(ObjectStream input, int decision, RuleContext outerContext) {
predict_calls++;
DFA dfa = decisionToDFA[decision];
if ( dfa==null || dfa.s0==null ) {
@ -105,7 +104,7 @@ public class ParserATNSimulator extends ATNSimulator {
}
}
public int predictATN(DFA dfa, TokenStream input,
public int predictATN(DFA dfa, ObjectStream input,
RuleContext outerContext,
boolean useContext)
{
@ -141,7 +140,7 @@ public class ParserATNSimulator extends ATNSimulator {
}
// doesn't create DFA when matching
public int matchATN(TokenStream input, ATNState startState) {
public int matchATN(ObjectStream input, ATNState startState) {
DFA dfa = new DFA(startState);
if ( outerContext==null ) outerContext = RuleContext.EMPTY;
RuleContext ctx = RuleContext.EMPTY;
@ -149,7 +148,7 @@ public class ParserATNSimulator extends ATNSimulator {
return execATN(input, dfa, input.index(), s0_closure, false);
}
public int execDFA(TokenStream input, DFA dfa, DFAState s0, RuleContext outerContext) {
public int execDFA(ObjectStream input, DFA dfa, DFAState s0, RuleContext outerContext) {
// dump(dfa);
if ( outerContext==null ) outerContext = RuleContext.EMPTY;
this.outerContext = outerContext;
@ -222,12 +221,7 @@ public class ParserATNSimulator extends ATNSimulator {
}
DFAState target = s.edges[t+1];
if ( target == ERROR ) {
NoViableAltException nvae =
new NoViableAltException(parser, input,
input.get(startIndex),
input.LT(1),
s.configs, outerContext);
throw nvae;
return throwNoViableAlt(input, outerContext, s.configs, startIndex);
}
s = target;
input.consume();
@ -242,7 +236,7 @@ public class ParserATNSimulator extends ATNSimulator {
return prevAcceptState.prediction;
}
public String getInputString(TokenStream input, int start) {
public String getInputString(ObjectStream input, int start) {
if ( input instanceof TokenStream ) {
return ((TokenStream)input).toString(start,input.index());
}
@ -252,7 +246,7 @@ public class ParserATNSimulator extends ATNSimulator {
return "n/a";
}
public int execATN(TokenStream input,
public int execATN(ObjectStream input,
DFA dfa,
int startIndex,
OrderedHashSet<ATNConfig> s0,
@ -378,12 +372,7 @@ public class ParserATNSimulator extends ATNSimulator {
if ( prevAccept==null ) {
// System.out.println("no viable token at input "+ getLookaheadName(input) +", index "+input.index());
NoViableAltException nvae =
new NoViableAltException(parser, input,
input.get(startIndex),
input.LT(1),
closure, outerContext);
throw nvae;
throwNoViableAlt(input, outerContext, closure, startIndex);
}
if ( debug ) System.out.println("PREDICT " + prevAccept + " index " + prevAccept.alt);
@ -411,7 +400,7 @@ public class ParserATNSimulator extends ATNSimulator {
return exitAlt;
}
public int retryWithContext(TokenStream input,
public int retryWithContext(ObjectStream input,
DFA dfa,
int startIndex,
RuleContext originalContext,
@ -829,7 +818,7 @@ public class ParserATNSimulator extends ATNSimulator {
return String.valueOf(t);
}
public String getLookaheadName(TokenStream input) {
public String getLookaheadName(ObjectStream input) {
return getTokenName(input.LA(1));
}
@ -854,4 +843,21 @@ public class ParserATNSimulator extends ATNSimulator {
System.err.println(c.toString(parser, true)+":"+trans);
}
}
public int throwNoViableAlt(ObjectStream input, RuleContext outerContext,
OrderedHashSet<ATNConfig> configs, int startIndex)
{
if ( parser instanceof TreeParser) {
throw new NoViableTreeGrammarAltException(parser, (ASTNodeStream)input,
input.get(startIndex),
input.LT(1),
configs, outerContext);
}
else {
throw new NoViableAltException(parser, input,
(Token)input.get(startIndex),
(Token)input.LT(1),
configs, outerContext);
}
}
}

6
runtime/Java/src/org/antlr/v4/runtime/tree/ASTNodeStream.java
View File

@ -32,12 +32,12 @@ package org.antlr.v4.runtime.tree;
import org.antlr.v4.runtime.*;
/** A stream of tree nodes, accessing nodes from a tree of some kind */
public interface ASTNodeStream extends IntStream {
public interface ASTNodeStream extends ObjectStream {
/** Get a tree node at an absolute index i; 0..n-1.
* If you don't want to buffer up nodes, then this method makes no
* sense for you.
*/
public Object get(int i);
Object get(int i);
/** Get tree node at current input pointer + i ahead where i=1 is next node.
* i<0 indicates nodes in the past. So LT(-1) is previous node, but
@ -50,7 +50,7 @@ public interface ASTNodeStream extends IntStream {
* returns a tree node instead of a token. Makes code gen identical
* for both parser and tree grammars. :)
*/
public Object LT(int k);
Object LT(int k);
/** Where is this stream pulling nodes from? This is not the name, but
* the object that provides node objects.

44
runtime/Java/src/org/antlr/v4/runtime/tree/BaseAST.java
View File

@ -32,8 +32,7 @@ package org.antlr.v4.runtime.tree;
import org.antlr.v4.runtime.BaseRecognizer;
import org.antlr.v4.runtime.tree.gui.TreeViewer;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
/** A generic AST implementation with no payload. You must subclass to
* actually have any user data. ANTLR v3 uses a list of children approach
@ -263,25 +262,26 @@ public abstract class BaseAST implements AST {
* root nodes.
*/
public String toStringTree() {
if ( children==null || children.size()==0 ) {
return this.toString();
}
StringBuffer buf = new StringBuffer();
if ( !isNil() ) {
buf.append("(");
buf.append(this.toString());
buf.append(' ');
}
for (int i = 0; children!=null && i < children.size(); i++) {
AST t = children.get(i);
if ( i>0 ) {
buf.append(' ');
}
buf.append(t.toStringTree());
}
if ( !isNil() ) {
buf.append(")");
}
return buf.toString();
return Trees.toStringTree(this, null);
// if ( children==null || children.size()==0 ) {
// return this.toString();
// }
// StringBuffer buf = new StringBuffer();
// if ( !isNil() ) {
// buf.append("(");
// buf.append(this.toString());
// buf.append(' ');
// }
// for (int i = 0; children!=null && i < children.size(); i++) {
// AST t = children.get(i);
// if ( i>0 ) {
// buf.append(' ');
// }
// buf.append(t.toStringTree());
// }
// if ( !isNil() ) {
// buf.append(")");
// }
// return buf.toString();
}
}

4
runtime/Java/src/org/antlr/v4/runtime/tree/TreeParser.java
View File

@ -31,8 +31,7 @@ package org.antlr.v4.runtime.tree;
import org.antlr.v4.runtime.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.*;
/** A parser for a stream of tree nodes. "tree grammars" result in a subclass
* of this. All the error reporting and recovery is shared with Parser via
@ -54,6 +53,7 @@ public class TreeParser extends BaseRecognizer {
public TreeParser(ASTNodeStream input) {
super(input);
_errHandler = new DefaultANTLRTreeGrammarErrorStrategy();
}
public void reset() {

17
runtime/Java/src/org/antlr/v4/runtime/tree/Trees.java
View File

@ -75,18 +75,26 @@ public class Trees {
public static String toStringTree(Tree t, BaseRecognizer recog) {
if ( t.getChildCount()==0 ) return getNodeText(t, recog);
StringBuilder buf = new StringBuilder();
buf.append("(");
buf.append(getNodeText(t, recog));
buf.append(' ');
boolean nilRoot = t instanceof AST && ((AST)t).isNil();
if ( !nilRoot ) {
buf.append("(");
buf.append(getNodeText(t, recog));
buf.append(' ');
}
for (int i = 0; i<t.getChildCount(); i++) {
if ( i>0 ) buf.append(' ');
buf.append(toStringTree(t.getChild(i), recog));
}
buf.append(")");
if ( !nilRoot ) {
buf.append(")");
}
return buf.toString();
}
public static String getNodeText(Tree t, BaseRecognizer recog) {
if ( t instanceof AST ) {
return t.toString();
}
if ( recog!=null ) {
if ( t instanceof ParseTree.RuleNode ) {
int ruleIndex = ((ParseTree.RuleNode)t).getRuleContext().getRuleIndex();
@ -101,6 +109,7 @@ public class Trees {
return tok.getText();
}
}
// not AST and no recog for rule names
Object payload = t.getPayload();
if ( payload instanceof Token ) {
return ((Token)payload).getText();

4
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -369,7 +369,7 @@ case <i>:
default :
<error>
}
setState(<choice.stateNumber>); <! loopback/exit decision !>
setState(<choice.loopBackStateNumber>); <! loopback/exit decision !>
_errHandler.sync(this);
_alt<choice.uniqueID> = _interp.adaptivePredict(_input,<choice.decision>,_ctx);
} while ( _alt<choice.uniqueID>!=<choice.exitAlt> && _alt<choice.uniqueID>!=-1 );
@ -483,7 +483,7 @@ RulePropertyRef_st(r) ::= "(_localctx.<r.label>!=null?_localctx.<r.label>.st:nu
ThisRulePropertyRef_start(r) ::= "_localctx.start"
ThisRulePropertyRef_stop(r) ::= "_localctx.stop"
ThisRulePropertyRef_tree(r) ::= "_localctx.tree"
ThisRulePropertyRef_text(r) ::= "((TokenStream)_input).toString(_localctx.start, _input.LT(-1))"
ThisRulePropertyRef_text(r) ::= "_input.toString(_localctx.start, _input.LT(-1))"
ThisRulePropertyRef_st(r) ::= "_localctx.st"
/*

1
tool/src/org/antlr/v4/codegen/model/Loop.java
View File

@ -35,6 +35,7 @@ import org.antlr.v4.tool.ast.GrammarAST;
import java.util.List;
public class Loop extends Choice {
public int blockStartStateNumber;
public int loopBackStateNumber;
public int exitAlt;
public Loop(OutputModelFactory factory,

13
tool/src/org/antlr/v4/codegen/model/PlusBlock.java
View File

@ -39,14 +39,17 @@ public class PlusBlock extends Loop {
@ModelElement public ThrowNoViableAlt error;
public PlusBlock(OutputModelFactory factory,
GrammarAST ebnfRootAST,
GrammarAST plusRoot,
List<CodeBlockForAlt> alts)
{
super(factory, ebnfRootAST, alts);
PlusLoopbackState loop = ((PlusBlockStartState)ebnfRootAST.atnState).loopBackState;
super(factory, plusRoot, alts);
PlusBlockStartState blkStart = (PlusBlockStartState)plusRoot.atnState;
PlusLoopbackState loop = ((PlusBlockStartState)plusRoot.atnState).loopBackState;
stateNumber = blkStart.loopBackState.stateNumber;
blockStartStateNumber = blkStart.stateNumber;
loopBackStateNumber = loop.stateNumber;
stateNumber = loop.stateNumber;
this.error = new ThrowNoViableAlt(factory, ebnfRootAST, null);
this.error = new ThrowNoViableAlt(factory, plusRoot, null);
decision = loop.decision;
exitAlt = alts.size()+1;
}

4
tool/test/org/antlr/v4/test/TestActionSplitter.java
View File

@ -19,8 +19,8 @@ public class TestActionSplitter extends BaseTest {
"$ID.text = \"test\";", "['$ID.text = \"test\";'<19>]",
"$a.line == $b.line", "['$a.line'<13>, ' == '<22>, '$b.line'<13>]",
"$r.tree", "['$r.tree'<13>]",
"foo $a::n bar", "['foo '<22>, '$a::n'<9>, ' bar'<22>]",
"$rule::x;", "['$rule::x'<9>, ';'<22>]",
"foo $a::n bar", "['foo '<22>, '$a::n'<12>, ' bar'<22>]",
"$rule::x;", "['$rule::x'<12>, ';'<22>]",
"$field::x = $field.st;", "['$field::x = $field.st;'<17>]",
"$foo.get(\"ick\");", "['$foo'<6>, '.get(\"ick\");'<22>]",
};

10
tool/test/org/antlr/v4/test/TestActionTranslation.java
View File

@ -142,15 +142,15 @@ public class TestActionTranslation extends BaseTest {
@Test public void testRefToTextAttributeForCurrentRule() throws Exception {
String action = "$a.text; $text";
String expected =
"(_localctx._ra!=null?((TokenStream)_input).toString(_localctx._ra.start,_localctx._ra.stop):" +
"null); ((TokenStream)_input).toString(_localctx.start, _input.LT(-1))";
"(_localctx._ra!=null?_input.toString(_localctx._ra.start,_localctx._ra.stop):" +
"null); _input.toString(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "init", action, expected);
expected =
"((TokenStream)_input).toString(_localctx.start, _input.LT(-1)); ((TokenStream)_input).toString(_localctx.start, _input.LT(-1))";
"_input.toString(_localctx.start, _input.LT(-1)); _input.toString(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "inline", action, expected);
expected =
"(_localctx._ra!=null?((TokenStream)_input).toString(_localctx._ra.start,_localctx._ra.stop):null);" +
" ((TokenStream)_input).toString(_localctx.start, _input.LT(-1))";
"(_localctx._ra!=null?_input.toString(_localctx._ra.start,_localctx._ra.stop):null);" +
" _input.toString(_localctx.start, _input.LT(-1))";
testActions(attributeTemplate, "finally", action, expected);
}

6
tool/test/org/antlr/v4/test/TestAttributeChecks.java
View File

@ -36,7 +36,6 @@ public class TestAttributeChecks extends BaseTest {
"$lab.e", "",
"$ids", "",
"$a", "error(33): A.g:4:8: missing attribute access on rule reference a in $a\n",
"$c", "error(29): A.g:4:8: unknown attribute reference c in $c\n",
"$a.q", "error(31): A.g:4:10: unknown attribute q for rule a in $a.q\n",
};
@ -59,10 +58,7 @@ public class TestAttributeChecks extends BaseTest {
};
String[] bad_inlineChecks = {
"$a", "error(33): A.g:6:4: missing attribute access on rule reference a in $a\n",
"$b", "error(33): A.g:6:4: missing attribute access on rule reference b in $b\n",
"$lab", "error(33): A.g:6:4: missing attribute access on rule reference lab in $lab\n",
"$c", "error(33): A.g:6:4: missing attribute access on rule reference c in $c\n", // no scope
"$q", "error(29): A.g:6:4: unknown attribute reference q in $q\n",
"$q.y", "error(29): A.g:6:4: unknown attribute reference q in $q.y\n",
"$q = 3", "error(29): A.g:6:4: unknown attribute reference q in $q\n",
@ -89,7 +85,6 @@ public class TestAttributeChecks extends BaseTest {
"$ids", "",
"$lab", "error(33): A.g:9:14: missing attribute access on rule reference lab in $lab\n",
"$a", "error(33): A.g:9:14: missing attribute access on rule reference a in $a\n",
"$q", "error(29): A.g:9:14: unknown attribute reference q in $q\n",
"$q.y", "error(29): A.g:9:14: unknown attribute reference q in $q.y\n",
"$q = 3", "error(29): A.g:9:14: unknown attribute reference q in $q\n",
@ -99,7 +94,6 @@ public class TestAttributeChecks extends BaseTest {
"error(29): A.g:9:19: unknown attribute reference blort in $blort\n",
"$a.ick", "error(31): A.g:9:16: unknown attribute ick for rule a in $a.ick\n",
"$a.ick = 3;", "error(31): A.g:9:16: unknown attribute ick for rule a in $a.ick = 3;\n",
"$b", "error(29): A.g:9:14: unknown attribute reference b in $b\n",
"$b.e", "error(29): A.g:9:14: unknown attribute reference b in $b.e\n", // can't see rule refs outside alts
"$b.d", "error(29): A.g:9:14: unknown attribute reference b in $b.d\n",
"$c.text", "error(29): A.g:9:14: unknown attribute reference c in $c.text\n",

5
tool/test/org/antlr/v4/test/TestHeteroAST.java
View File

@ -27,12 +27,13 @@
*/
package org.antlr.v4.test;
import org.junit.Test;
import org.junit.*;
/** Test hetero trees in parsers and tree parsers */
public class TestHeteroAST extends BaseTest {
@Ignore public class TestHeteroAST extends BaseTest {
protected boolean debug = false;
// TODO: make these work!
// PARSERS -- AUTO AST
@Test public void testToken() throws Exception {

16
tool/test/org/antlr/v4/test/TestParseTrees.java
View File

@ -7,7 +7,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" :r=a ;\n" +
"a : 'x' {System.out.println(getRuleInvocationStack());} ;\n";
@ -20,7 +20,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" :r=a ;\n" +
"a : 'x' 'y'\n" +
@ -34,7 +34,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" :r=a ;\n" +
"a : 'x' | 'y'\n" +
@ -48,7 +48,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" :r=a ;\n" +
"a : ('x' | 'y')* 'z'\n" +
@ -62,7 +62,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" : r=a ;\n" +
"a : b 'x'\n" +
@ -79,7 +79,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" : r=a ;\n" +
"a : 'x' 'y'\n" +
@ -94,7 +94,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" : r=a ;\n" +
"a : 'x' | 'y'\n" +
@ -109,7 +109,7 @@ public class TestParseTrees extends BaseTest {
String grammar =
"grammar T;\n" +
"s\n" +
"@init {setBuildParseTrees(true);}\n" +
"@init {setBuildParseTree(true);}\n" +
"@after {System.out.println($r.toStringTree(this));}\n" +
" : r=a ;\n" +
"a : 'x' 'y'* '!'\n" +

23
tool/test/org/antlr/v4/test/TestRewriteAST.java
View File

@ -1335,7 +1335,7 @@ public class TestRewriteAST extends BaseTest {
"WS : (' '|'\\n') {$channel=HIDDEN;} ;\n";
String found = execParser("foo.g", grammar, "fooParser", "fooLexer",
"decl", "x=1;", debug);
assertEquals("line 1:0 mismatched input 'x' expecting set null\n", this.stderrDuringParse);
assertEquals("line 1:0 mismatched input 'x' expecting set {'int', 'float'}\n", this.stderrDuringParse);
assertEquals("(EXPR <error: x> x 1)\n", found); // tree gets invented ID token
}
@ -1403,25 +1403,4 @@ public class TestRewriteAST extends BaseTest {
assertEquals("<missing ID> 34\n", found);
}
@Test
public void testNoViableAltGivesErrorNode() throws Exception {
String grammar =
"grammar foo;\n" +
"options {output=AST;}\n" +
"a : b -> b | c -> c;\n" +
"b : ID -> ID ;\n" +
"c : INT -> INT ;\n" +
"ID : 'a'..'z'+ ;\n" +
"S : '*' ;\n" +
"INT : '0'..'9'+;\n" +
"WS : (' '|'\\n') {$channel=HIDDEN;} ;\n";
String found = execParser("foo.g", grammar, "fooParser", "fooLexer",
"a", "*", debug);
// finds an error at the first token, 34, and re-syncs.
// re-synchronizing does not consume a token because 34 follows
// ref to rule b (start of c). It then matches 34 in c.
assertEquals("line 1:0 no viable alternative at input '*'\n", this.stderrDuringParse);
assertEquals("<unexpected: [@0,0:0='*',<6>,1:0], resync=*>\n", found);
}
}

3
tool/test/org/antlr/v4/test/TestRewriteTemplates.java
View File

@ -27,8 +27,9 @@
*/
package org.antlr.v4.test;
import org.junit.Test;
import org.junit.*;
@Ignore
public class TestRewriteTemplates extends BaseTest {
protected boolean debug = false;

26
tool/test/org/antlr/v4/test/TestSets.java
View File

@ -42,7 +42,7 @@ public class TestSets extends BaseTest {
// from a nonfragment rule does not set the overall token.
String grammar =
"grammar P;\n" +
"a : C {System.out.println(input);} ;\n" +
"a : C {System.out.println(_input);} ;\n" +
"fragment A : '1' | '2';\n" +
"fragment B : '3' '4';\n" +
"C : A | B;\n";
@ -72,7 +72,7 @@ public class TestSets extends BaseTest {
@Test public void testParserNotToken() throws Exception {
String grammar =
"grammar T;\n" +
"a : ~'x' 'z' {System.out.println(input);} ;\n";
"a : ~'x' 'z' {System.out.println(_input);} ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "zz", debug);
assertEquals("zz\n", found);
@ -90,7 +90,7 @@ public class TestSets extends BaseTest {
@Test public void testRuleAsSet() throws Exception {
String grammar =
"grammar T;\n" +
"a @after {System.out.println(input);} : 'a' | 'b' |'c' ;\n";
"a @after {System.out.println(_input);} : 'a' | 'b' |'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "b", debug);
assertEquals("b\n", found);
@ -119,7 +119,7 @@ public class TestSets extends BaseTest {
@Test public void testOptionalSingleElement() throws Exception {
String grammar =
"grammar T;\n" +
"a : A? 'c' {System.out.println(input);} ;\n" +
"a : A? 'c' {System.out.println(_input);} ;\n" +
"A : 'b' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "bc", debug);
@ -129,7 +129,7 @@ public class TestSets extends BaseTest {
@Test public void testOptionalLexerSingleElement() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : 'b'? 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "bc", debug);
@ -139,7 +139,7 @@ public class TestSets extends BaseTest {
@Test public void testStarLexerSingleElement() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : 'b'* 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "bbbbc", debug);
@ -152,7 +152,7 @@ public class TestSets extends BaseTest {
@Test public void testPlusLexerSingleElement() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : 'b'+ 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "bbbbc", debug);
@ -162,7 +162,7 @@ public class TestSets extends BaseTest {
@Test public void testOptionalSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : ('a'|'b')? 'c' {System.out.println(input);} ;\n";
"a : ('a'|'b')? 'c' {System.out.println(_input);} ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "ac", debug);
assertEquals("ac\n", found);
@ -171,7 +171,7 @@ public class TestSets extends BaseTest {
@Test public void testStarSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : ('a'|'b')* 'c' {System.out.println(input);} ;\n";
"a : ('a'|'b')* 'c' {System.out.println(_input);} ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "abaac", debug);
assertEquals("abaac\n", found);
@ -180,7 +180,7 @@ public class TestSets extends BaseTest {
@Test public void testPlusSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : ('a'|'b')+ 'c' {System.out.println(input);} ;\n";
"a : ('a'|'b')+ 'c' {System.out.println(_input);} ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "abaac", debug);
assertEquals("abaac\n", found);
@ -189,7 +189,7 @@ public class TestSets extends BaseTest {
@Test public void testLexerOptionalSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : ('a'|'b')? 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "ac", debug);
@ -199,7 +199,7 @@ public class TestSets extends BaseTest {
@Test public void testLexerStarSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : ('a'|'b')* 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "abaac", debug);
@ -209,7 +209,7 @@ public class TestSets extends BaseTest {
@Test public void testLexerPlusSet() throws Exception {
String grammar =
"grammar T;\n" +
"a : A {System.out.println(input);} ;\n" +
"a : A {System.out.println(_input);} ;\n" +
"A : ('a'|'b')+ 'c' ;\n";
String found = execParser("T.g", grammar, "TParser", "TLexer",
"a", "abaac", debug);