From fd3a2af950a4d658e5cdb9c69b29dfa03d74add4 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <andersn@control.lth.se>
Date: Thu, 20 Nov 2014 13:29:28 +0100
Subject: [PATCH] Added several more tokens that can occur in strings
---
.gitignore | 8 ++++++++
JavaCCChunks.jrag | 11 ++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..333ee82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+Dumper.class
+GenCompiler.class
+Parser.class
+PrettyPrint.class
+AST
+SchemaCompile.jar
+SchemaCompiler.jar
+*~
diff --git a/JavaCCChunks.jrag b/JavaCCChunks.jrag
index 1a6f1b0..b31b340 100644
--- a/JavaCCChunks.jrag
+++ b/JavaCCChunks.jrag
@@ -18,9 +18,9 @@ aspect JavaCCChunks {
pStream.println(" NODE_PREFIX = \"\";");
pStream.println(" JAVA_UNICODE_ESCAPE = true;");
pStream.println(" STATIC = false;");
-// pStream.println(" DEBUG_PARSER = true;");
-// pStream.println(" DEBUG_LOOKAHEAD = true;");
-// pStream.println(" DEBUG_TOKEN_MANAGER = true;");
+ pStream.println("// DEBUG_PARSER = true;");
+ pStream.println("// DEBUG_LOOKAHEAD = true;");
+ pStream.println("// DEBUG_TOKEN_MANAGER = true;");
pStream.println("} ");
pStream.println();
pStream.println("PARSER_BEGIN(XmlParser)");
@@ -132,11 +132,13 @@ aspect JavaCCChunks {
pStream.println(" \"\\u0024\",");
pStream.println(" \"\\u0041\"-\"\\u005a\",");
pStream.println(" \"\\u005f\",");
+ pStream.println(" \"-\",\":\",");
pStream.println(" \"\\u0061\"-\"\\u007a\",");
pStream.println(" \"\\u00c0\"-\"\\u00d6\",");
pStream.println(" \"\\u00d8\"-\"\\u00f6\",");
pStream.println(" \"\\u00f8\"-\"\\u00ff\",");
pStream.println(" \"\\u0100\"-\"\\u1fff\",");
+ pStream.println(" \"\\u2013\"-\"\\u20ac\",");
pStream.println(" \"\\u3040\"-\"\\u318f\",");
pStream.println(" \"\\u3300\"-\"\\u337f\",");
pStream.println(" \"\\u3400\"-\"\\u3d2d\",");
@@ -177,7 +179,10 @@ aspect JavaCCChunks {
pStream.println(" | < LPAR : \"(\" >");
pStream.println(" | < RPAR : \")\" >");
pStream.println(" | < DOT : \".\" >");
+ pStream.println(" | < COMMA : \",\" >");
pStream.println(" | < SEMICOLON : \";\" >");
+ pStream.println(" | < AMPERSAND : \"&\" >");
+ pStream.println(" | < SLASH : \"/\" >");
pStream.println(" | < LTSLASH : \"</\" > : DEFAULT");
pStream.println(" | < LTBANG : \"<!\" > : DEFAULT");
pStream.println(" | < LT : \"<\" > : DEFAULT");
--
GitLab