Fixed some issues with compiler generation.

.bzrignore

@@ -15,3 +15,4 @@ javadoc
 SchemaCompile.jar
 examples/configForm/config-sheet.html
 examples/x3d/x3d_demo.x3d
+examples/x3d/X3DAST

CompilerGeneration.jrag

@@ -9,6 +9,16 @@
 import java.io.*;
 import java.util.*;
 
+aspect Misc {
+    private static String ASTNode.grammar = new String();
+    public static void ASTNode.setGrammar(String s) {
+	grammar = s;
+    }
+    public static String ASTNode.getGrammar() {
+	return grammar;
+    }
+}
+
 aspect AbsGrammarGeneration {
     void ASTNode.genAbsGrammar(PrintStream pStream) {
 		for (int i=0; i<getNumChild(); i++) {

GenCompiler.java

@@ -11,63 +11,69 @@ import java.io.File;
 import java.io.PrintStream;
 
 public class GenCompiler extends Parser {
-	public static void main(String args[]) {
+    public static void main(String args[]) {
 
         String dir = "examples/x3d";
         String outName = "x3d";
         String[] schema = new String[1];
+	String grammarName = new String();
         boolean first = true;
 
         for (int i=0; i<args.length; i++) {
             if (args[i].equals("-d")) {
                 dir = args[++i];
-            } else if (args[i].equals("-o")) {
-                outName = args[++i];
-            } else {
-                // OK, we suppose the remaing arg to be parsed.
-                schema[0] = args[i++];
-            }
-        }
+	    }
+	    if (args[i].equals("-g")) {
+		grammarName = args[++i];
+	    } else if (args[i].equals("-o")) {
+		outName = args[++i];
+	    } else {
+		// OK, we suppose the remaing arg to be parsed.
+		schema[0] = args[i++];
+	    }
+	}
 
+	Start ast = parse(schema);
 
-		Start ast = parse(schema);
+	ast.setGrammar(grammarName);
 
-		File siarasDir = new File(dir);
-		if (!siarasDir.isDirectory()) {
-			siarasDir.mkdir();
-		}
+	File siarasDir = new File(dir);
+	if (!siarasDir.isDirectory()) {
+	    siarasDir.mkdir();
+	}
 		
-		String fileName = null;
-        String common = dir+File.separator+outName;
-		try {
-			// Generate JastAdd abstract grammar
-			fileName = common+".ast";
-			PrintStream pStream = new PrintStream(new File(fileName));
-			ast.genAbsGrammar(pStream);
+	String fileName = null;
+	String common = dir+File.separator+outName;
+	try {
+	    // Generate JastAdd abstract grammar
+	    fileName = common+".ast";
+	    PrintStream pStream = new PrintStream(new File(fileName));
+	    ast.genAbsGrammar(pStream);
 
-			// Generate JavaCC input
-			fileName = common+".jjt";
-			pStream = new PrintStream(new File(fileName));
-			ast.genJavaCC(pStream);
+	    // Generate JavaCC input
+	    fileName = common+".jjt";
+	    pStream = new PrintStream(new File(fileName));
+	    ast.genJavaCC(pStream);
 
-			// Generate Parser.java
-			fileName = dir+"/Parser.java";
-			pStream = new PrintStream(new File(fileName));
-			ast.genParser(pStream);
+	    // Generate Parser.java
+	    fileName = dir+"/Parser.java";
+	    pStream = new PrintStream(new File(fileName));
+	    ast.genParser(pStream);
 
-			// Generate PrettyPrint.java
-			fileName = dir+"/PrettyPrint.java";
-			pStream = new PrintStream(new File(fileName));
-			ast.genPrettyPrint(pStream);
+	    // Generate PrettyPrint.java
+	    fileName = dir+"/PrettyPrint.java";
+	    pStream = new PrintStream(new File(fileName));
+	    ast.genPrettyPrint(pStream);
 
-			// Generate aspects
-			fileName = dir+"/GeneratedAspects.jrag";
-			pStream = new PrintStream(new File(fileName));
-			ast.genAspects(pStream);
+	    // Generate aspects
+	    fileName = dir+"/GeneratedAspects.jrag";
+	    pStream = new PrintStream(new File(fileName));
+	    ast.genAspects(pStream);
 
-		} catch (java.io.FileNotFoundException e) {
-			System.out.println("Could not create file: "+fileName);
-			e.printStackTrace();
-		}
+	} catch (java.io.FileNotFoundException e) {
+	    System.out.println("Could not create file: "+fileName);
+	    e.printStackTrace();
 	}
+    }
+
 }

JavaCCChunks.jrag

@@ -24,6 +24,7 @@ aspect JavaCCChunks {
 		pStream.println("} ");
 		pStream.println();
 		pStream.println("PARSER_BEGIN(XmlParser)");
+// 		pStream.println("    package "+getGrammar()+"AST;");
 		pStream.println("    package AST;");
 		pStream.println("    public class XmlParser {");
 		pStream.println("}");