Added more tokens. Generate correct package names.

CompilerGeneration.jrag

@@ -425,7 +425,7 @@ aspect Misc {
 		if (problemNames.contains(s)) {
 			s = "_" + s;
 		}
-		s = s.replace("-","_");
+		s = s.replace("-","_").replace(":","");
 		return s;
 	}
 
@@ -766,9 +766,9 @@ aspect ParserGen {
 		pStream.println("import java.io.InputStreamReader;");
 		pStream.println("import java.io.Reader;");
 		pStream.println("");
-		pStream.println("import AST.XmlParser;");
-		pStream.println("import AST.ParseException;");
-		pStream.println("import AST.Start;");
+		pStream.println("import "+getGrammar()+"AST.XmlParser;");
+		pStream.println("import "+getGrammar()+"AST.ParseException;");
+		pStream.println("import "+getGrammar()+"AST.Start;");
 		pStream.println("");
 		pStream.println("public class Parser {");
 		pStream.println();
@@ -802,7 +802,7 @@ aspect ParserGen {
 	}
 
 	public void Start.genPrettyPrint(PrintStream pStream) {
-        pStream.println("import AST.Start;");
+        pStream.println("import "+getGrammar()+"AST.Start;");
 		pStream.println();
         pStream.println("public class PrettyPrint extends Parser {");
         pStream.println("        public static void main(String args[]) {");

JavaCCChunks.jrag

@@ -25,7 +25,7 @@ aspect JavaCCChunks {
 		pStream.println();
 		pStream.println("PARSER_BEGIN(XmlParser)");
 // 		pStream.println("    package "+getGrammar()+"AST;");
-		pStream.println("    package AST;");
+		pStream.println("    package "+getGrammar()+"AST;");
 		pStream.println("    public class XmlParser {");
 		pStream.println("}");
 		pStream.println("PARSER_END(XmlParser)");
@@ -174,6 +174,9 @@ aspect JavaCCChunks {
 		pStream.println("    | < RBRACE               : \"}\"    >");
 		pStream.println("    | < LBRACKET             : \"[\"    >");
 		pStream.println("    | < RBRACKET             : \"]\"    >");
+		pStream.println("    | < LPAR                 : \"(\"    >");
+		pStream.println("    | < RPAR                 : \")\"    >");
+		pStream.println("    | < DOT                  : \".\"    >");
 		pStream.println("    | < SEMICOLON            : \";\"    >");
 		pStream.println("    | < LTSLASH              : \"</\"    > : DEFAULT");
 		pStream.println("    | < LTBANG               : \"<!\"    > : DEFAULT");