Simplify handling of generated package names in templates

src/main/java/org/sablecc/sablecc/GenAlts.java

@@ -46,7 +46,7 @@ public class GenAlts extends DepthFirstAdapter
     }
 
     pkgDir = new File(ast_ids.astIds.pkgDir, "node");
-    pkgName = ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node";
+    pkgName = ast_ids.astIds.pkgNameDot + "node";
 
     if(!pkgDir.exists())
     {
@@ -139,9 +139,7 @@ public class GenAlts extends DepthFirstAdapter
           macros.apply(file, "AlternativeHeaderList", new String[] {});
       }
 
-      macros.apply(file, "AlternativeHeader2", new String[] {
-              ast_ids.astIds.pkgName.equals("") ? "analysis" : ast_ids.astIds.pkgName + ".analysis",
-              name, currentProd});
+      macros.apply(file, "AlternativeHeader2", new String[] {ast_ids.astIds.pkgNameDot, name, currentProd});
 
       for(ElemInfo info : elemList)
       {

src/main/java/org/sablecc/sablecc/GenAnalyses.java

@@ -48,7 +48,7 @@ public class GenAnalyses extends DepthFirstAdapter
     }
 
     pkgDir = new File(ast_ids.astIds.pkgDir, "analysis");
-    pkgName = ast_ids.astIds.pkgName.equals("") ? "analysis" : ast_ids.astIds.pkgName + ".analysis";
+    pkgName = ast_ids.astIds.pkgNameDot + "analysis";
 
     if(!pkgDir.exists())
     {
@@ -152,8 +152,7 @@ public class GenAnalyses extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "Analysis.java"))))
     {
-      macros.apply(file, "AnalysisHeader", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node"});
+      macros.apply(file, "AnalysisHeader", new String[] {pkgName, ast_ids.astIds.pkgNameDot});
 
       if(mainProduction != null)
       {
@@ -187,8 +186,7 @@ public class GenAnalyses extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "AnalysisAdapter.java"))))
     {
-      macros.apply(file, "AnalysisAdapterHeader", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node"});
+      macros.apply(file, "AnalysisAdapterHeader", new String[] {pkgName, ast_ids.astIds.pkgNameDot});
 
       if(mainProduction != null)
       {
@@ -220,9 +218,7 @@ public class GenAnalyses extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "DepthFirstAdapter.java"))))
     {
-      macros.apply(file, "DepthFirstAdapterHeader", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node",
-                   mainProduction});
+      macros.apply(file, "DepthFirstAdapterHeader", new String[] {pkgName, ast_ids.astIds.pkgNameDot, mainProduction});
 
       for(AltInfo info : altList)
       {
@@ -271,9 +267,7 @@ public class GenAnalyses extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "ReversedDepthFirstAdapter.java"))))
     {
-      macros.apply(file, "ReversedDepthFirstAdapterHeader", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node",
-                   mainProduction});
+      macros.apply(file, "ReversedDepthFirstAdapterHeader", new String[] {pkgName, ast_ids.astIds.pkgNameDot, mainProduction});
 
       for(AltInfo info : altList)
       {

src/main/java/org/sablecc/sablecc/GenLexer.java

@@ -50,7 +50,7 @@ public class GenLexer extends AnalysisAdapter
     }
 
     pkgDir = new File(ids.pkgDir, "lexer");
-    pkgName = ids.pkgName.equals("") ? "lexer" : ids.pkgName + ".lexer";
+    pkgName = ids.pkgNameDot + "lexer";
 
     if(!pkgDir.exists())
     {
@@ -134,9 +134,7 @@ public class GenLexer extends AnalysisAdapter
         startState = ids.stateList.getFirst();
       }
 
-      macros.apply(file, "LexerHeader", new String[] {pkgName,
-                   ids.pkgName.equals("") ? "node" : ids.pkgName + ".node",
-                   startState});
+      macros.apply(file, "LexerHeader", new String[] {pkgName, ids.pkgNameDot, startState});
 
       for(ListIterator<String> i = ids.tokenList.listIterator(); i.hasNext();)
       {

src/main/java/org/sablecc/sablecc/GenParser.java

@@ -116,7 +116,7 @@ public class GenParser extends DepthFirstAdapter
     }
 
     pkgDir = new File(ids.pkgDir, "parser");
-    pkgName = ids.pkgName.equals("") ? "parser" : ids.pkgName + ".parser";
+    pkgName = ids.pkgNameDot + "parser";
 
     if(!pkgDir.exists())
     {
@@ -374,10 +374,7 @@ public class GenParser extends DepthFirstAdapter
       Symbol[] nonterminals = Symbol.nonterminals();
       Production[] productions = Production.productions();
 
-      macros.apply(file, "ParserHeader", new String[] {pkgName,
-                   ids.pkgName.equals("") ? "lexer" : ids.pkgName + ".lexer",
-                   ids.pkgName.equals("") ? "node" : ids.pkgName + ".node",
-      });
+      macros.apply(file, "ParserHeader", new String[] {pkgName, ids.pkgNameDot});
 
       if(activateFilter && !grammarHasTransformations)
       {
@@ -735,9 +732,7 @@ public class GenParser extends DepthFirstAdapter
     {
       Symbol[] terminals = Symbol.terminals();
 
-      macros.apply(file, "TokenIndexHeader", new String[] {pkgName,
-                   ids.pkgName.equals("") ? "node" : ids.pkgName + ".node",
-                   ids.pkgName.equals("") ? "analysis" : ids.pkgName + ".analysis"});
+      macros.apply(file, "TokenIndexHeader", new String[] {pkgName, ids.pkgNameDot});
 
       for(int i = 0; i < (terminals.length - 2); i++)
       {
@@ -757,8 +752,7 @@ public class GenParser extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "ParserException.java"))))
     {
-      macros.apply(file, "ParserException", new String[] {pkgName,
-                   ids.pkgName.equals("") ? "node" : ids.pkgName + ".node"});
+      macros.apply(file, "ParserException", new String[] {pkgName, ids.pkgNameDot});
     }
     catch(IOException e)
     {

src/main/java/org/sablecc/sablecc/GenProds.java

@@ -39,7 +39,7 @@ public class GenProds extends DepthFirstAdapter
     }
 
     pkgDir = new File(ast_ids.astIds.pkgDir, "node");
-    pkgName = ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node";
+    pkgName = ast_ids.astIds.pkgNameDot + "node";
 
     if(!pkgDir.exists())
     {

src/main/java/org/sablecc/sablecc/GenTokens.java

@@ -43,7 +43,7 @@ public class GenTokens extends DepthFirstAdapter
     }
 
     pkgDir = new File(ids.pkgDir, "node");
-    pkgName = ids.pkgName.equals("") ? "node" : ids.pkgName + ".node";
+    pkgName = ids.pkgNameDot + "node";
 
     if(!pkgDir.exists())
     {
@@ -101,17 +101,13 @@ public class GenTokens extends DepthFirstAdapter
       {
         ids.fixedTokens.put(node, false);
 
-        macros.apply(file, "VariableTextToken", new String[] { pkgName,
-                     ids.pkgName.equals("") ? "analysis" : ids.pkgName + ".analysis",
-                     name});
+        macros.apply(file, "VariableTextToken", new String[] {pkgName, ids.pkgNameDot, name});
       }
       else
       {
         ids.fixedTokens.put(node, true);
 
-        macros.apply(file, "FixedTextToken", new String[] { pkgName,
-                     ids.pkgName.equals("") ? "analysis" : ids.pkgName + ".analysis",
-                     name, processText(text)});
+        macros.apply(file, "FixedTextToken", new String[] {pkgName, ids.pkgNameDot, name, processText(text)});
 
         ids.errorNames.put(node, "'" + text + "'");
       }

src/main/java/org/sablecc/sablecc/GenUtils.java

@@ -41,7 +41,7 @@ public class GenUtils extends DepthFirstAdapter
     }
 
     pkgDir = new File(ast_ids.astIds.pkgDir, "node");
-    pkgName = ast_ids.astIds.pkgName.equals("") ? "node" : ast_ids.astIds.pkgName + ".node";
+    pkgName = ast_ids.astIds.pkgNameDot + "node";
 
     if(!pkgDir.exists())
     {
@@ -92,8 +92,7 @@ public class GenUtils extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "Start.java"))))
     {
-      macros.apply(file, "Start", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "analysis" : ast_ids.astIds.pkgName + ".analysis",
+      macros.apply(file, "Start", new String[] {pkgName, ast_ids.astIds.pkgNameDot,
                    mainProduction, GenAlts.nodeName(mainProduction)});
     }
     catch(IOException e)
@@ -107,8 +106,7 @@ public class GenUtils extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "EOF.java"))))
     {
-      macros.apply(file, "EOF", new String[] {pkgName,
-                                              ast_ids.astIds.pkgName.equals("") ? "analysis" : ast_ids.astIds.pkgName + ".analysis"});
+      macros.apply(file, "EOF", new String[] {pkgName, ast_ids.astIds.pkgNameDot});
     }
     catch(IOException e)
     {
@@ -121,8 +119,7 @@ public class GenUtils extends DepthFirstAdapter
   {
     try(BufferedWriter file = new BufferedWriter(new FileWriter(new File(pkgDir, "Node.java"))))
     {
-      macros.apply(file, "Node", new String[] {pkgName,
-                   ast_ids.astIds.pkgName.equals("") ? "analysis" : ast_ids.astIds.pkgName + ".analysis"});
+      macros.apply(file, "Node", new String[] {pkgName});
     }
     catch(IOException e)
     {

src/main/java/org/sablecc/sablecc/ResolveIds.java

@@ -46,6 +46,8 @@ public class ResolveIds extends DepthFirstAdapter
   public final LinkedList<String> stateList = new LinkedList<>();
   public File pkgDir;
   public String pkgName = "";
+  // pkgNameDot has a dot appended if non-empty.
+  public String pkgNameDot = "";
 
   private boolean processingStates;
   private boolean processingIgnTokens;
@@ -75,6 +77,8 @@ public class ResolveIds extends DepthFirstAdapter
         pkgDir = new File(pkgDir, temp[i].getText());
       }
 
+      pkgNameDot = pkgName + ".";
+
       if(!pkgDir.exists())
       {
         if(!pkgDir.mkdirs())

src/main/java/org/sablecc/sablecc/node/EOF.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class EOF extends Token
 {
     public EOF()

src/main/java/org/sablecc/sablecc/node/TAbstract.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TAbstract extends Token
 {
     public TAbstract()

src/main/java/org/sablecc/sablecc/node/TArrow.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TArrow extends Token
 {
     public TArrow()

src/main/java/org/sablecc/sablecc/node/TBar.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TBar extends Token
 {
     public TBar()

src/main/java/org/sablecc/sablecc/node/TBlank.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TBlank extends Token
 {
     public TBlank(String text)

src/main/java/org/sablecc/sablecc/node/TChar.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TChar extends Token
 {
     public TChar(String text)

src/main/java/org/sablecc/sablecc/node/TColon.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TColon extends Token
 {
     public TColon()

src/main/java/org/sablecc/sablecc/node/TComma.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TComma extends Token
 {
     public TComma()

src/main/java/org/sablecc/sablecc/node/TComment.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TComment extends Token
 {
     public TComment(String text)

src/main/java/org/sablecc/sablecc/node/TDDot.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TDDot extends Token
 {
     public TDDot()

src/main/java/org/sablecc/sablecc/node/TDecChar.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TDecChar extends Token
 {
     public TDecChar(String text)

src/main/java/org/sablecc/sablecc/node/TDot.java

@@ -4,7 +4,6 @@ package org.sablecc.sablecc.node;
 
 import org.sablecc.sablecc.analysis.*;
 
-
 public final class TDot extends Token
 {
     public TDot()