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

get 'x' not x in tokenNames 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9925]
This commit is contained in:
parrt 2012-01-28 11:28:42 -08:00
parent f4ecc75df5
commit 368b70d53c
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tool/src/org/antlr/v4/codegen/Target.java
View File

@ -232,21 +232,19 @@ public class Target {
* around the incoming literal. Just flip the quotes and replace
* double quotes with \"
*
* Note that we have decided to allow poeple to use '\"' without
* penalty, so we must build the target string in a loop as Utils.replae
* cannot handle both \" and " without a lot of messing around.
*
* Note that we have decided to allow people to use '\"' without
* penalty, so we must build the target string in a loop as Utils.replae
* cannot handle both \" and " without a lot of messing around.
*
*/
public String getTargetStringLiteralFromANTLRStringLiteral(
CodeGenerator generator,
String literal)
String literal, boolean addQuotes)
{
StringBuilder sb = new StringBuilder();
StringBuffer is = new StringBuffer(literal);
StringBuilder sb = new StringBuilder();
StringBuffer is = new StringBuffer(literal);
// Opening quote
//
sb.append('"');
if ( addQuotes ) sb.append('"');
for (int i = 1; i < is.length() -1; i++) {
if (is.charAt(i) == '\\') {
@ -272,30 +270,23 @@ public class Target {
default:
// Remove the escape by virtue of not adding it here
// Thus \' becomes ' and so on
//
break;
}
// Go past the \ character
//
i++;
} else {
// Chracters that don't need \ in ANTLR 'strings' but do in Java
//
// Characters that don't need \ in ANTLR 'strings' but do in Java
if (is.charAt(i) == '"') {
// We need to escape " in Java
//
sb.append('\\');
}
}
// Add in the next character, which may have been escaped
//
sb.append(is.charAt(i));
}
// Append closing " and return
//
sb.append('"');
if ( addQuotes ) sb.append('"');
return sb.toString();
}

7
tool/src/org/antlr/v4/codegen/model/Lexer.java
View File

@ -74,7 +74,12 @@ public class Lexer extends OutputModelObject {
if ( tokenNames[i]==null ) continue;
CodeGenerator gen = factory.getGenerator();
if ( tokenNames[i].charAt(0)=='\'' ) {
tokenNames[i] = gen.target.getTargetStringLiteralFromANTLRStringLiteral(gen, tokenNames[i]);
boolean addQuotes = false;
tokenNames[i] =
gen.target.getTargetStringLiteralFromANTLRStringLiteral(gen,
tokenNames[i],
addQuotes);
tokenNames[i] = "\"'"+tokenNames[i]+"'\"";
}
else {
tokenNames[i] = gen.target.getTargetStringLiteralFromString(tokenNames[i], true);

7
tool/src/org/antlr/v4/codegen/model/Parser.java
View File

@ -71,7 +71,12 @@ public class Parser extends OutputModelObject {
if ( tokenNames[i]==null ) continue;
CodeGenerator gen = factory.getGenerator();
if ( tokenNames[i].charAt(0)=='\'' ) {
tokenNames[i] = gen.target.getTargetStringLiteralFromANTLRStringLiteral(gen, tokenNames[i]);
boolean addQuotes = false;
tokenNames[i] =
gen.target.getTargetStringLiteralFromANTLRStringLiteral(gen,
tokenNames[i],
addQuotes);
tokenNames[i] = "\"'"+tokenNames[i]+"'\"";
}
else {
tokenNames[i] = gen.target.getTargetStringLiteralFromString(tokenNames[i], true);

3
tool/src/org/antlr/v4/codegen/model/SemPred.java
View File

@ -64,7 +64,8 @@ public class SemPred extends Action {
}
else {
msg = gen.target.getTargetStringLiteralFromANTLRStringLiteral(gen,
failNode.getText());
failNode.getText(),
true);
}
}
}