From: Thomas Walker Lynch <xtujpz@reasoningtechnology.com>
Date: Tue, 30 Jul 2024 09:25:52 +0000 (+0000)
Subject: .
X-Git-Url: https://git.reasoningtechnology.com/style/static/gitweb.css?a=commitdiff_plain;h=08162e4c5af21ca5102534d5e12d64a40a54a3a1;p=GQL-to-Cypher

.
---

diff --git a/developer/javac/gql/EchoParser.java b/developer/javac/gql/EchoParser.java
deleted file mode 100644
index df55995..0000000
--- a/developer/javac/gql/EchoParser.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package gql;
-
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.tree.*;
-
-public class EchoParser {
-    public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            System.err.println("Usage: java gql.EchoParser <input-file>");
-            System.exit(1);
-        }
-
-        CharStream input = CharStreams.fromFileName(args[0]);
-        GQLLexer lexer = new GQLLexer(input);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-        GQLParser parser = new GQLParser(tokens);
-
-        ParseTree tree = parser.root(); // Adjust to match your grammar's start rule
-        System.out.println(tree.toStringTree(parser));
-    }
-}
diff --git a/developer/makefile b/developer/makefile
index 90ec3ae..45334b8 100644
--- a/developer/makefile
+++ b/developer/makefile
@@ -1,7 +1,7 @@
 
 # FL = File List
 
-Island        =    land    island    # value has embedded and trailing spaces
+ISLAND        =    land    island    # value has embedded and trailing spaces
 
 ANTLR_JAR     = ../tool/executor/antlr-4.9.2-complete.jar
 
@@ -55,7 +55,7 @@ version:
 
 .PHONY: setup
 setup:
-	mkdir -p $(JAVA_IN_DIR)/gql
+	mkdir -p $(JAVA_IN_DIR)
 	mkdir -p $(JVM_IN_DIR)
 	mkdir -p $(ANTLR_OUT_DIR)
 
diff --git a/developer/makefile2 b/developer/makefile2
deleted file mode 100644
index d54068f..0000000
--- a/developer/makefile2
+++ /dev/null
@@ -1,60 +0,0 @@
-JAVAC         = $(JAVA_HOME)/bin/javac
-JAR           = $(JAVA_HOME)/bin/jar
-ANTLR_JAR     = ../tool/executor/antlr-4.9.2-complete.jar
-JAVA_DIR      = javac
-JVM_DIR       = jvm
-ANTLR_DIR     = ANTLR
-ANTLR_GEN_DIR = javac/antlr
-
-# Source files
-JAVA_SOURCES   = $(wildcard $(JAVA_DIR)/*.java)
-ANTLR_GRAMMARS = $(wildcard $(ANTLR_DIR)/*.g4)
-
-# Generated ANTLR Java files
-ANTLR_GENERATED_SOURCES = $(patsubst $(ANTLR_DIR)/%.g4,$(ANTLR_GEN_DIR)/%.java,$(notdir $(ANTLR_GRAMMARS)))
-
-.PHONY: all
-all: setup $(ANTLR_GENERATED_SOURCES) $(JAVA_SOURCES:.java=.class) $(JVM_DIR)/GQLEchoParser.jar
-
-.PHONY: variable
-variable:
-	$(info JAVAC is '$(JAVAC)')
-	$(info JAR is '$(JAR)')
-	$(info ANTLR_JAR is '$(ANTLR_JAR)')
-	$(info JAVA_DIR is '$(JAVA_DIR)')
-	$(info JVM_DIR is '$(JVM_DIR)')
-	$(info ANTLR_DIR is '$(ANTLR_DIR)')
-	$(info ANTLR_GEN_DIR is '$(ANTLR_GEN_DIR)')
-	$(info JAVA_SOURCES is '$(JAVA_SOURCES)')
-	$(info ANTLR_GRAMMARS is '$(ANTLR_GRAMMARS)')
-	$(info ANTLR_GENERATED_SOURCES is '$(ANTLR_GENERATED_SOURCES)')
-
-.PHONY: version
-version:
-	@ $(JAVAC) --version
-	@ $(JAR) --version
-	@ echo $(ANTLR_JAR)
-	@ make -v | head -n 1
-
-.PHONY: setup
-setup:
-	mkdir -p $(JVM_DIR)
-	mkdir -p $(JAVA_DIR)/gql
-	mkdir -p $(ANTLR_GEN_DIR)
-
-.PHONY: clean
-clean:
-	rm -rf $(JVM_DIR)/*
-	rm -rf $(ANTLR_GEN_DIR)/*.java
-
-# Compile ANTLR grammars
-$(ANTLR_GEN_DIR)/%.java: $(ANTLR_DIR)/%.g4
-	java -jar $(ANTLR_JAR) -Dlanguage=Java -o $(@D) $<
-
-# Compile Java sources
-$(JVM_DIR)/%.class: $(JAVA_DIR)/gql/%.java $(ANTLR_GENERATED_SOURCES)
-	$(JAVAC) -d $(JVM_DIR) -cp $(ANTLR_JAR) $<
-
-# Create jar file
-$(JVM_DIR)/GQLEchoParser.jar: $(patsubst $(JAVA_DIR)/gql/%.java,$(JVM_DIR)/%.class,$(JAVA_SOURCES))
-	$(JAR) cvf $@ -C $(JVM_DIR) .