s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix template escape processing. Fixes #752.

Browse Source
This commit is contained in:
Tom Morris 2013-06-30 12:21:26 -04:00
parent a015b4e184
commit 5b6bc888f7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/com/google/refine/templating/Parser.java
View File

@ -48,12 +48,18 @@ public class Parser {
int start = 0, current = 0; int start = 0, current = 0;
while (current < s.length() - 1) { while (current < s.length() - 1) {
char c = s.charAt(current); char c = s.charAt(current);
char c2 = s.charAt(current + 1);
if (c == '\\') { if (c == '\\') {
current += 2; if (c2 == '\\' || c2 == '{' || c2 == '$') {
fragments.add(new StaticFragment(s.substring(start, current).concat(Character.toString(c2))));
start = current += 2;
} else {
// Invalid escape - just leave it in the template
current += 1;
}
continue; continue;
} }
char c2 = s.charAt(current + 1);
if (c == '$' && c2 == '{') { if (c == '$' && c2 == '{') {
int closeBrace = s.indexOf('}', current + 2); int closeBrace = s.indexOf('}', current + 2);
if (closeBrace > current + 1) { if (closeBrace > current + 1) {