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

ignore :: in C++ arg declarations; add test.

This commit is contained in:
parrt 2016-11-16 12:34:14 -08:00
parent 5aae2edb24
commit 4f3c7738f3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tool-testsuite/test/org/antlr/v4/test/tool/TestScopeParsing.java
View File

@ -61,6 +61,9 @@ public class TestScopeParsing extends BaseJavaTest {
"char *[3] foo = {1,2,3}", "foo:char *[3]={1,2,3}", // not valid C really, C is "type name" however so this is cool (this was broken in 4.5 anyway)
"String[] headers", "headers:String[]",
// C++
"std::vector<std::string> x", "x:std::vector<std::string>", // yuck. Don't choose :: as the : of a declaration
// python/ruby style
"i", "i",
"i,j", "i, j",

8
tool/src/org/antlr/v4/parse/ScopeParser.java
View File

@ -103,12 +103,14 @@ public class ScopeParser {
String declarator = decl.a.substring(0, rightEdgeOfDeclarator + 1);
Pair<Integer, Integer> p;
if (decl.a.indexOf(':') != -1) {
// declarator has type appear after the name
String text = decl.a;
text = text.replaceAll("::","");
if ( text.contains(":") ) {
// declarator has type appearing after the name like "x:T"
p = _parsePostfixDecl(attr, declarator, action, g);
}
else {
// declarator has type appear before the name
// declarator has type appearing before the name like "T x"
p = _parsePrefixDecl(attr, declarator, action, g);
}
int idStart = p.a;