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

Merge pull request #1311 from sebkur/allow_path_in_token_vocab 

Allow paths as tokenVocab option
This commit is contained in:
Terence Parr 2016-11-19 15:30:19 -08:00 committed by GitHub
parent 144baa9ade 961f087d7a
commit 10ce5d2625
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tool/src/org/antlr/v4/Tool.java
View File

@ -521,6 +521,19 @@ public class Tool {
// Make grammars depend on any tokenVocab options // Make grammars depend on any tokenVocab options
if ( tokenVocabNode!=null ) { if ( tokenVocabNode!=null ) {
String vocabName = tokenVocabNode.getText(); String vocabName = tokenVocabNode.getText();
// Strip quote characters if any
int len = vocabName.length();
int firstChar = vocabName.charAt(0);
int lastChar = vocabName.charAt(len - 1);
if (len >= 2 && firstChar == '\'' && lastChar == '\'') {
vocabName = vocabName.substring(1, len-1);
}
// If the name contains a path delimited by forward slashes,
// use only the part after the last slash as the name
int lastSlash = vocabName.lastIndexOf('/');
if (lastSlash >= 0) {
vocabName = vocabName.substring(lastSlash + 1);
}
g.addEdge(grammarName, vocabName); g.addEdge(grammarName, vocabName);
} }
// add cycle to graph so we always process a grammar if no error // add cycle to graph so we always process a grammar if no error