Minor changes.

Signed-off-by: mmazas <[email protected]>

Author: mmazas

src/main/java/org/javacc/cpp/NodeFiles.java

@@ -89,7 +89,7 @@ private static void generateNodeHeader(final JJTreeContext context) {
     final CodeGeneratorSettings optionMap = CodeGeneratorSettings.of(Options.getOptions());
     optionMap.set("PARSER_NAME", JJTreeGlobals.parserName);
     optionMap.set("VISITOR_RETURN_TYPE", NodeFiles.getVisitorReturnType());
-    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorArgumentType());
+    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorDataType());
     optionMap.set(
         "VISITOR_RETURN_TYPE_VOID",
         Boolean.valueOf(NodeFiles.getVisitorReturnType().equals("void")));
@@ -118,7 +118,7 @@ private static void generateSimpleNode(final JJTreeContext context) {
     final CodeGeneratorSettings optionMap = CodeGeneratorSettings.of(Options.getOptions());
     optionMap.set(Options.NUO__PARSER_NAME, JJTreeGlobals.parserName);
     optionMap.set("VISITOR_RETURN_TYPE", NodeFiles.getVisitorReturnType());
-    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorArgumentType());
+    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorDataType());
     optionMap.set(
         "VISITOR_RETURN_TYPE_VOID",
         Boolean.valueOf(NodeFiles.getVisitorReturnType().equals("void")));
@@ -150,7 +150,7 @@ private static void generateOneTree(
     final CodeGeneratorSettings optionMap = CodeGeneratorSettings.of(Options.getOptions());
     optionMap.set("PARSER_NAME", JJTreeGlobals.parserName);
     optionMap.set("VISITOR_RETURN_TYPE", NodeFiles.getVisitorReturnType());
-    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorArgumentType());
+    optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorDataType());
     optionMap.set(
         "VISITOR_RETURN_TYPE_VOID",
         Boolean.valueOf(NodeFiles.getVisitorReturnType().equals("void")));
@@ -204,7 +204,7 @@ private static void generateMultiTree(final JJTreeContext context) {
       final File file =
           new File(
               //              new File(
-              context.treeOptions().getASTNodeDirectory(),
+              context.treeOptions().getNodeDirectory(),
               //                  context.treeOptions().getNodePackage()),
               node + ".cc");
       if (file.exists()) {
@@ -214,7 +214,7 @@ private static void generateMultiTree(final JJTreeContext context) {
       final CodeGeneratorSettings optionMap = CodeGeneratorSettings.of(Options.getOptions());
       optionMap.set(Options.NUO__PARSER_NAME, JJTreeGlobals.parserName);
       optionMap.set("VISITOR_RETURN_TYPE", NodeFiles.getVisitorReturnType());
-      optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorArgumentType());
+      optionMap.set("VISITOR_DATA_TYPE", NodeFiles.getVisitorDataType());
       optionMap.set(
           "VISITOR_RETURN_TYPE_VOID",
           Boolean.valueOf(NodeFiles.getVisitorReturnType().equals("void")));
@@ -318,9 +318,13 @@ private static String getVisitMethodName(final String className) {
     return sb.toString();
   }
 
-  private static String getVisitorArgumentType() {
+  private static String getVisitorDataType() {
     final String ret = Options.stringValue("VISITOR_DATA_TYPE");
-    return (ret == null) || ret.equals("") || ret.equals("Object") ? "void *" : ret;
+    return (ret == null || ret.equals("") || ret.equals("Object")) ? "void*" : ret;
+  }
+
+  private static boolean getVisitorDataTypeIsPointer() {
+    return Options.booleanValue("VISITOR_DATA_TYPE_IS_POINTER");
   }
 
   private static String getVisitorReturnType() {
@@ -368,7 +372,7 @@ private static void generateVisitorInterface(
     ccb.println("class " + name);
     ccb.println("{");
 
-    String argumentType = NodeFiles.getVisitorArgumentType();
+    String argumentType = NodeFiles.getVisitorDataType();
     final String returnType = NodeFiles.getVisitorReturnType();
     if (!context.treeOptions().getVisitorDataType().equals("")) {
       argumentType = context.treeOptions().getVisitorDataType();
@@ -411,7 +415,7 @@ private static void generateDefaultVisitor(
 
     ccb.println("class " + className + " : public " + NodeFiles.visitorClass() + " {");
 
-    final String argumentType = NodeFiles.getVisitorArgumentType();
+    final String argumentType = NodeFiles.getVisitorDataType();
     final String ret = NodeFiles.getVisitorReturnType();
 
     ccb.println("public:");

src/main/resources/templates/cpp/MultiNode.cc.template

@@ -44,7 +44,7 @@ namespace ${NAMESPACE_OPEN}
   ${NODE_TYPE}::~${NODE_TYPE}() {}
 
 #if VISITOR
-  /** Accept the visitor. **/
+  /** Accept the visitor. */
   ${VISITOR_RETURN_TYPE} ${NODE_TYPE}::jjtAccept(${PARSER_NAME}Visitor *visitor, ${VISITOR_DATA_TYPE:-void *} data) const {
 #if !VISITOR_RETURN_TYPE_VOID
     return 

src/main/resources/templates/cpp/MultiNode.h.template

@@ -50,7 +50,7 @@ public:
   virtual ~${NODE_TYPE}();
 
 #if VISITOR
-  /** Accept the visitor. **/
+  /** Accept the visitor. */
   virtual ${VISITOR_RETURN_TYPE} jjtAccept(${PARSER_NAME}Visitor* visitor, ${VISITOR_DATA_TYPE:-void*} data) const ;
 #fi
 };