From cc0df2d401d09eb0ea833ebe8e1b7125c4b25d62 Mon Sep 17 00:00:00 2001
From: Thomas Walker Lynch <xtujpz@reasoningtechnology.com>
Date: Tue, 10 Sep 2024 11:11:32 +0000
Subject: [PATCH] moving files to 'primary' or 'synthesized'

---
 developer/deprecated/Hibou_build.gradle       | 106 ++++++++
 developer/deprecated/build.gradle             |  91 +++++++
 developer/deprecated/make                     |   2 +-
 developer/deprecated/makefile-project.mk      | 246 +++++++++++++-----
 developer/deprecated/makefile-tool.mk         |  44 +++-
 developer/deprecated/makefile-top.mk          |  61 +++--
 developer/executor/ANTLR_OUT_FL               |   2 +-
 developer/executor/build.gradle               |  71 +++++
 developer/executor/env_build                  |   5 +-
 developer/executor/{make => gradle}           |   2 +-
 developer/executor/makefile-project.mk        | 239 -----------------
 developer/executor/makefile-tool.mk           |  62 -----
 developer/executor/makefile-top.mk            |  62 -----
 .../javac/{ => primary}/ANTLR_OUT_FL.java     |   6 +-
 .../javac/{ => primary}/Arithmetic_Echo.java  |   0
 .../Arithmetic_Echo_PrintVisitor.java         |   0
 .../{ => primary}/Arithmetic_Echo__Test.java  |   0
 developer/javac/primary/Arithmetic_Swap.java  |  69 +++++
 .../javac/primary/Arithmetic_SwapVisitor.java |  50 ++++
 .../Arithmetic_SyntaxAnnotate.java            |   0
 ...rithmetic_SyntaxAnnotate_PrintVisitor.java |   0
 .../Arithmetic_SyntaxAnnotate__Test.java      |   0
 .../javac/{ => primary}/RuleNameList.java     |   0
 .../javac/{ => primary}/RuleNameListRegx.java |   0
 .../javac/{ => primary}/StringUtils.java      |   0
 .../Synthesize_SyntaxAnnotate.java            |   0
 ...ynthesize_SyntaxAnnotate_PrintVisitor.java |   0
 ...ize_SyntaxAnnotate_PrintVisitorMethod.java |   0
 developer/javac/{ => primary}/TestBench.java  |   0
 .../Arithmetic2_SyntaxAnnotate.java           |   0
 ...ithmetic2_SyntaxAnnotate_PrintVisitor.java |   0
 developer/ologist/#emacs.txt#                 |  30 +++
 developer/ologist/emacs.txt                   |  21 ++
 executor/env_dev                              |  17 +-
 executor/install                              |   8 +
 ologist/directory_structure.md                |  54 ++++
 settings.gradle                               |   3 +
 37 files changed, 791 insertions(+), 460 deletions(-)
 create mode 100644 developer/deprecated/Hibou_build.gradle
 create mode 100644 developer/deprecated/build.gradle
 create mode 100644 developer/executor/build.gradle
 rename developer/executor/{make => gradle} (82%)
 delete mode 100644 developer/executor/makefile-project.mk
 delete mode 100644 developer/executor/makefile-tool.mk
 delete mode 100644 developer/executor/makefile-top.mk
 rename developer/javac/{ => primary}/ANTLR_OUT_FL.java (97%)
 rename developer/javac/{ => primary}/Arithmetic_Echo.java (100%)
 rename developer/javac/{ => primary}/Arithmetic_Echo_PrintVisitor.java (100%)
 rename developer/javac/{ => primary}/Arithmetic_Echo__Test.java (100%)
 create mode 100644 developer/javac/primary/Arithmetic_Swap.java
 create mode 100644 developer/javac/primary/Arithmetic_SwapVisitor.java
 rename developer/javac/{ => primary}/Arithmetic_SyntaxAnnotate.java (100%)
 rename developer/javac/{ => primary}/Arithmetic_SyntaxAnnotate_PrintVisitor.java (100%)
 rename developer/javac/{ => primary}/Arithmetic_SyntaxAnnotate__Test.java (100%)
 rename developer/javac/{ => primary}/RuleNameList.java (100%)
 rename developer/javac/{ => primary}/RuleNameListRegx.java (100%)
 rename developer/javac/{ => primary}/StringUtils.java (100%)
 rename developer/javac/{ => primary}/Synthesize_SyntaxAnnotate.java (100%)
 rename developer/javac/{ => primary}/Synthesize_SyntaxAnnotate_PrintVisitor.java (100%)
 rename developer/javac/{ => primary}/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java (100%)
 rename developer/javac/{ => primary}/TestBench.java (100%)
 rename developer/javac/{ => synthesized}/Arithmetic2_SyntaxAnnotate.java (100%)
 rename developer/javac/{ => synthesized}/Arithmetic2_SyntaxAnnotate_PrintVisitor.java (100%)
 create mode 100644 developer/ologist/#emacs.txt#
 create mode 100644 settings.gradle

diff --git a/developer/deprecated/Hibou_build.gradle b/developer/deprecated/Hibou_build.gradle
new file mode 100644
index 0000000..ca38ddd
--- /dev/null
+++ b/developer/deprecated/Hibou_build.gradle
@@ -0,0 +1,106 @@
+task setup {
+  doLast {
+    def dirs = [
+      "$(ANTLR_IN_PRIMARY_DIR)",
+      "$(JAVA_COMP_IN_DIR)",
+      "$(JAVA_COMP_IN_PRIMARY_DIR)",
+      "$(JAVA_COMP_IN_ANTLR_DIR)",
+      "$(JAVA_COMP_IN_SYN_DIR)",
+      "$(JVM_IN_DIR)",
+      "$(EXECUTOR_IN_DIR)",
+      "test",
+      "deprecated",
+      "experiment",
+      "ologist",
+      "temporary"
+    ]
+    dirs.each { dir ->
+      if (!file(dir).exists()) {
+        mkdir dir
+      }
+    }
+  }
+}
+
+def compileJava(source, target) {
+  tasks.create(name: "compile${source}", type: Exec) {
+    commandLine '$(JAVA_COMP)', '-d', '$(JAVA_COMP_OUT_DIR)', '-sourcepath', '$(JAVA_COMP_IN_DL)', source
+    doLast {
+      println "Compiled ${source} to ${target}"
+    }
+  }
+}
+
+def createJar(source, target) {
+  tasks.create(name: "jar${source}", type: Exec) {
+    commandLine '$(JAVA_ARCHIVE)', 'cf', target, '-C', '$(JAVA_COMP_OUT_DIR)', source
+    doLast {
+      println "Created ${target}"
+    }
+  }
+}
+
+def createWrapper(source, target) {
+  tasks.create(name: "wrapper${source}", type: Exec) {
+    doLast {
+      def script = new File(target)
+      script.text = "#!/usr/bin/env bash\n$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:${JVM_IN_DP}/${source}.jar ${source} \$@"
+      script.setExecutable(true)
+      println "Created program ${target}"
+    }
+  }
+}
+
+task ANTLR_OUT_FL {
+  dependsOn setup
+  doLast {
+    println "Building ANTLR_OUT_FL..."
+    // Add specific build steps for ANTLR_OUT_FL here
+  }
+}
+
+task all {
+  dependsOn ANTLR_OUT_FL
+  doLast {
+    println "Building all targets..."
+  }
+}
+
+task clean {
+  doLast {
+    println "Use the command `clean <option>` instead of make."
+  }
+}
+
+task version {
+  doLast {
+    println "ANTLR_JAR is '${notdir(ANTLR_JAR)}'"
+    exec {
+      commandLine '$(JAVA_COMP)', '--version'
+    }
+    exec {
+      commandLine '$(JAVA_ARCHIVE)', '--version'
+    }
+    exec {
+      commandLine 'make', '-v'
+    }
+    println "makefile 0.4"
+  }
+}
+
+task nothing {
+  doLast {
+    // useful for distinguishing between make syntax errors and build errors
+  }
+}
+
+tasks.withType(Exec) {
+  doFirst {
+    println "Executing $name"
+  }
+}
+
+// Example usage
+compileJava('$(JAVA_COMP_IN_PRIMARY_DIR)/Example.java', '$(JAVA_COMP_OUT_DIR)/Example.class')
+createJar('Example.class', '$(JAVA_COMP_OUT_DIR)/Example.jar')
+createWrapper('Example', '$(EXECUTOR_IN_DIR)/Example')
diff --git a/developer/deprecated/build.gradle b/developer/deprecated/build.gradle
new file mode 100644
index 0000000..b5ab4a6
--- /dev/null
+++ b/developer/deprecated/build.gradle
@@ -0,0 +1,91 @@
+task setup {
+  doLast {
+    def dirs = ["$(ANTLR_IN_PRIMARY_DIR)", "$(JAVA_COMP_IN_PRIMARY_DIR)", "$(JVM_IN_DIR)", "$(EXECUTOR_IN_DIR)", "test", "deprecated", "experiment", "ologist", "temporary"]
+    dirs.each { dir ->
+      mkdir dir
+    }
+  }
+}
+
+task tool(type: Exec) {
+  dependsOn setup
+  commandLine '$(BIN_MAKE)', '-f', '$(EXECUTOR_IN_DIR)/makefile-tool.mk', '-$(MAKEFLAGS)', 'all'
+}
+
+task project(type: Exec) {
+  dependsOn tool
+  commandLine '$(BIN_MAKE)', '-f', '$(EXECUTOR_IN_DIR)/makefile-project.mk', '-$(MAKEFLAGS)', 'all'
+}
+
+task clean {
+  doLast {
+    println "Use the command `clean <option>` instead of make."
+  }
+}
+
+task version {
+  doLast {
+    println "ANTLR_JAR is '${notdir(ANTLR_JAR)}'"
+    exec {
+      commandLine '$(JAVA_COMP)', '--version'
+    }
+    exec {
+      commandLine '$(JAVA_ARCHIVE)', '--version'
+    }
+    exec {
+      commandLine 'make', '-v'
+    }
+    println "makefile 0.4"
+  }
+}
+
+task all {
+  dependsOn project
+}
+
+task nothing {
+  doLast {
+    // useful for distinguishing between make syntax errors and build errors
+  }
+}
+
+tasks.withType(Exec) {
+  doFirst {
+    println "Executing $name"
+  }
+}
+
+
+----------------------
+// Function to compile .java files to .class files
+def compileJava(source, target) {
+  tasks.create(name: "compile${source}", type: Exec) {
+    commandLine '$(JAVA_COMP)', '-d', '$(JAVA_COMP_OUT_DIR)', '-sourcepath', '$(JAVA_COMP_IN_DL)', source
+    doLast {
+      println "Compiled ${source} to ${target}"
+    }
+  }
+}
+
+// Function to create .jar files from .class files
+def createJar(source, target) {
+  tasks.create(name: "jar${source}", type: Exec) {
+    commandLine '$(JAVA_ARCHIVE)', 'cf', target, '-C', '$(JAVA_COMP_OUT_DIR)', source
+    doLast {
+      println "Created ${target}"
+    }
+  }
+}
+
+// Function to create wrapper scripts from .jar files
+def createWrapper(source, target) {
+  tasks.create(name: "wrapper${source}", type: Exec) {
+    doLast {
+      def script = new File(target)
+      script.text = "#!/usr/bin/env bash\n$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:${JVM_IN_DP}/${source}.jar ${source} \$@"
+      script.setExecutable(true)
+      println "Created program ${target}"
+    }
+  }
+}
+  
diff --git a/developer/deprecated/make b/developer/deprecated/make
index a556a0f..714a070 100755
--- a/developer/deprecated/make
+++ b/developer/deprecated/make
@@ -12,4 +12,4 @@ cd "$DEVELOPER_HOME"
 # in case there have been edits to the environment
 source "${EXECUTOR_IN_DIR}"/env_build
 
-${BIN_MAKE} --no-builtin-rules -f "${EXECUTOR_IN_DIR}"/makefile-top.mk $@
+${BIN_MAKE} --no-print-directory -f "${EXECUTOR_IN_DIR}"/makefile-top.mk $@
diff --git a/developer/deprecated/makefile-project.mk b/developer/deprecated/makefile-project.mk
index ea61056..ea8a0f3 100644
--- a/developer/deprecated/makefile-project.mk
+++ b/developer/deprecated/makefile-project.mk
@@ -1,126 +1,250 @@
+#--------------------------------------------------------------------------------
+# Project build
+#
+# GNU makefile
+
+# turn off implicit rules, because they can do unexpected things.
+.SUFFIXES:
+MAKEFLAGS += -r
+
+# `make` considers that PHONY targets do not correspond to files (other
+# targets do and the files have their dates checked). This declaration renders
+# innocuous the "feature" where `make` always tries to make its own
+# makefiles. There is no command line switch to turn this "feature" off.
+.PHONY: $(MAKEFILE_LIST)
+
+# 'make' has a "feature" where it deletes what it determines to be intermediate
+# files. There is no command line switch to turn this "feature" off. Combine
+# this "feature" with implicit rules and have loads of fun.
+.PRECIOUS: $(MAKEFILE_LIST)
+
+#$(info makefile: $(MAKEFILE_LIST))
+#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
+
+# for recursive make without leaving this makefile
+REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
+
 #================================================================================
 # Custom make targets
 #
-$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
 
 all: $(EXECUTOR_IN_FPL)
 
-PrintRuleNameList: $(EXECUTOR_IN_DIR)/PrintRuleNameList
 
+#-----------------------------------------------
+# These do not require antlr generated java files
+
+RuleNameListRegx: $(EXECUTOR_IN_DIR)/RuleNameListRegx
+RuleNameList: $(EXECUTOR_IN_DIR)/RuleNameList
+
+Synthesize_SyntaxAnnotate_PrintVisitorMethod:\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
+  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate_PrintVisitorMethod
+Synthesize_SyntaxAnnotate_PrintVisitor:\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java\
+  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate_PrintVisitor
+
+Synthesize_SyntaxAnnotate:\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
+  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate
 
 #-----------------------------------------------
 # Arithmetic
 
-ANTLR_OUT_Arithmetic_FL := $(shell ANTLR_OUT_FL Arithmetic.g4 -visitor -no-listener -no-tokens)
-ANTLR_OUT_Arithmetic_FPL := $(addprefix $(ANTLR_OUT_DIR)/, $(ANTLR_OUT_Arithmetic_FL))
-Arithmetic_Echo: $(ANTLR_OUT_Arithmetic_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
+ANTLR_OUT_Arithmetic_FPL:= $(shell ANTLR_OUT_FL Arithmetic -path $(ANTLR_OUT_DIR))
+#$(info ANTLR_OUT_Arithmetic_FPL: $(ANTLR_OUT_Arithmetic_FPL))
+Arithmetic_Echo:\
+  $(ANTLR_OUT_Arithmetic_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo
+
+Arithmetic_Echo__Test:\
+  $(ANTLR_OUT_Arithmetic_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
 	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
 	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
 	  exit 1; \
 	fi
-	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo
-
-# Arithmetic_Echo__Test: $(ANTLR_OUT_Arithmetic_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
-# 	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-# 	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-# 	  exit 1; \
-# 	fi
-# 	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo__Test
-
-# Arithmetic_Syntax: $(ANTLR_OUT_Arithmetic_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Syntax_PrintVisitor.java
-# 	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-# 	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-# 	  exit 1; \
-# 	fi
-# 	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Syntax
-
-# Arithmetic_Syntax__Test: $(ANTLR_OUT_Arithmetic_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Syntax_PrintVisitor.java
-# 	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-# 	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-# 	  exit 1; \
-# 	fi
-# 	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Syntax__Test
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo__Test
+
+Arithmetic_SyntaxAnnotate:\
+  $(ANTLR_OUT_Arithmetic_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_SyntaxAnnotate_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_SyntaxAnnotate
+
+Arithmetic_SyntaxAnnotate__Test:\
+  $(ANTLR_OUT_Arithmetic_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_SyntaxAnnotate_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_SyntaxAnnotate__Test
+
+Arithmetic_Swap:\
+  $(ANTLR_OUT_Arithmetic_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_SwapVisitor.java\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Swap
 
 #-----------------------------------------------
-#  GQL_20240412
+# Arithmetic2
+# 
+
+ANTLR_OUT_Arithmetic2_FPL:= $(shell ANTLR_OUT_FL Arithmetic2 -path $(ANTLR_OUT_DIR))
+Arithmetic2_SyntaxAnnotate:\
+  $(ANTLR_OUT_Arithmetic2_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic2_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic2_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic2_SyntaxAnnotate
+
+Arithmetic2_SyntaxAnnotate__Test:\
+  $(ANTLR_OUT_Arithmetic2_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_Arithmetic2_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_Arithmetic2_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic2_SyntaxAnnotate__Test
+
+#-----------------------------------------------
+# Parsing/Analyzing ANTLR grammars
+#
+
+ANTLR_OUT_ANTLRv4_FPL:= $(shell ANTLR_OUT_FL ANTLRv4 -path $(ANTLR_OUT_DIR))
+ANTLRv4_SyntaxAnnotate:\
+  $(ANTLR_OUT_ANTLRv4_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/ANTLRv4_SyntaxAnnotate_PrintVisitor.java
+	@if [ -z "$(ANTLR_OUT_ANTLRv4_FPL)" ]; then \
+	  echo "variable ANTLR_OUT_ANTLRv4_FPL empty."; \
+	  exit 1; \
+	fi
+	$(REMAKE) $(EXECUTOR_IN_DIR)/ANTLRv4_SyntaxAnnotate
 
-ANTLR_OUT_GQL_20240412_FL := $(shell ANTLR_OUT_FL GQL_20240412.g4 -visitor -no-listener -no-tokens)
-ANTLR_OUT_GQL_20240412_FPL := $(addprefix $(ANTLR_OUT_DIR)/, $(ANTLR_OUT_GQL_20240412_FL))
 
-GQL_20240412_Syntax: $(ANTLR_OUT_GQL_20240412_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_Syntax_PrintVisitor.java
+#-----------------------------------------------
+#  GQL_20240412
+
+ANTLR_OUT_GQL_20240412_FPL := $(shell ANTLR_OUT_FL GQL_20240412 -path $(ANTLR_OUT_DIR))
+GQL_20240412_SyntaxAnnotate:\
+  $(ANTLR_OUT_GQL_20240412_FPL)\
+  $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_SyntaxAnnotate_PrintVisitor.java
 	@if [ -z "$(ANTLR_OUT_GQL_20240412_FPL)" ]; then \
 	  echo "variable ANTLR_OUT_GQL_20240412_FPL empty."; \
 	  exit 1; \
 	fi
-	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_Syntax
+	$(REMAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_SyntaxAnnotate
 
-GQL_20240412_Syntax__Test: $(ANTLR_OUT_GQL_20240412_FPL) $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_Syntax_PrintVisitor.java
+GQL_20240412_SyntaxAnnotate__Test: \
+  $(ANTLR_OUT_GQL_20240412_FPL) \
+  $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_SyntaxAnnotate_PrintVisitor.java
 	@if [ -z "$(ANTLR_OUT_GQL_20240412_FPL)" ]; then \
 	  echo "variable ANTLR_OUT_GQL_20240412_FPL empty."; \
 	  exit 1; \
 	fi
-	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_Syntax__Test
+	$(REMAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_SyntaxAnnotate__Test
+
 
 TerminalToCategory: 
-	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/TerminalToCategory
+	$(REMAKE) $(EXECUTOR_IN_DIR)/TerminalToCategory
 
 GrammarSplitter: 
-	$(BIN_MAKE) $(EXECUTOR_IN_DIR)/GrammarSplitter
+	$(REMAKE) $(EXECUTOR_IN_DIR)/GrammarSplitter
 
 #-----------------------------------------------
 # Compile all the .java files.
 
 java: $(JAVA_COMP_OUT_FPL)
 
-#-----------------------------------------------
-# Clean is program, not a target
-
-# Default clean target
-.PHONY: clean
-clean:
-	@echo "Use the clean script from the $(EXECUTOR_IN_DIR) directory instead of \`make clean\`"
-	@$(EXECUTOR_IN_DIR)/clean
-
-#-----------------------------------------------
-# useful for distinguishing between initial make error messages and message
-# generated by rules firing
-
-nothing:
-	@:
 
 #================================================================================
 # generic targets, aka recipes
 #
 
+# this section is not parallel make friendly
+# $(ANTLR_OUT_DIR)/%Lexer.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+# $(ANTLR_OUT_DIR)/%Parser.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+# $(ANTLR_OUT_DIR)/%BaseListener.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+# $(ANTLR_OUT_DIR)/%Listener.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+# $(ANTLR_OUT_DIR)/%BaseVisitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+# $(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+
+#--------------------
+# for a single `<name>.g4` grammar file
+
 $(ANTLR_OUT_DIR)/%Lexer.java \
-$(ANTLR_OUT_DIR)/%Lexer.tokens \
 $(ANTLR_OUT_DIR)/%Parser.java \
-$(ANTLR_OUT_DIR)/%Parser.tokens \
 $(ANTLR_OUT_DIR)/%BaseListener.java \
 $(ANTLR_OUT_DIR)/%Listener.java \
 $(ANTLR_OUT_DIR)/%BaseVisitor.java \
-$(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_FPL)
-	@echo "making grammar from:" $<
+$(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
+	@echo "copiling grammar from:" $<
+	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
+
+#--------------------
+# For separate `<mame>Lexer.g4` and `<name>Parser.g4` files.
+# `make` prefers shorter pattern matches, so this should work.
+#
+
+$(ANTLR_OUT_DIR)/LexerAdaptor.java: $(ANTLR_IN_PRIMARY_DIR)/LexerAdaptor.java
+	cp $(ANTLR_IN_PRIMARY_DIR)/LexerAdaptor.java $(ANTLR_OUT_DIR)
+
+$(ANTLR_OUT_DIR)/%Lexer.java: $(ANTLR_IN_PRIMARY_DIR)/%Lexer.g4 $(ANTLR_OUT_DIR)/LexerAdaptor.java
+	@echo "making lexer grammar from:" $<
 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
 
-# Rule to build .class files from .java files
+# Rule for all generated files from Parser.g4
+$(ANTLR_OUT_DIR)/%Parser.java \
+$(ANTLR_OUT_DIR)/%BaseListener.java \
+$(ANTLR_OUT_DIR)/%Listener.java \
+$(ANTLR_OUT_DIR)/%BaseVisitor.java \
+$(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%Parser.g4
+	@echo "making other grammar files from:" $<
+	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -lib $(ANTLR_OUT_DIR) -o $(ANTLR_OUT_DIR_PARENT) $<
+
+#---------------------
+
+# make .class file from .java file
 $(JAVA_COMP_OUT_DIR)/%.class: $(JAVA_COMP_IN_PRIMARY_DIR)/%.java
 	@echo "Compiling $<..."
 	$(JAVA_COMP) -d $(JAVA_COMP_OUT_DIR) -sourcepath $(JAVA_COMP_IN_DL) $<
 	@echo "Created $@"
 
-# Without this, GNU make inserts an 'rm -rf' not on the recipe and deletes the .jar files
-# after making them.  Why make why?
+# Without this, `make` sees .jar files as intermediate and deletes them.
 .PRECIOUS: $(JAVA_COMP_OUT_DIR)/%.jar
-# Rule to build .jar files from .class files
+
+# make .jar from .class file
 $(JAVA_COMP_OUT_DIR)/%.jar: $(JAVA_COMP_OUT_DIR)/%.class
 	@echo "Building $*..."
 	$(JAVA_ARCHIVE) cf $@ -C $(JAVA_COMP_OUT_DIR) $*.class
 	@echo "Created $@"
 
+#make the wrapper script from the .jar file
 $(EXECUTOR_IN_DIR)/%: $(JVM_IN_DIR)/%.jar
-	@echo "Creating script for $*..."
+	@echo "Creating program for $*..."
 	@echo "#!/usr/bin/env bash" > $(EXECUTOR_IN_DIR)/$*
 	@echo "$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:$(JVM_IN_DP)/$*.jar $*" \$$\@ >> $(EXECUTOR_IN_DIR)/$*
 	chmod +x $(EXECUTOR_IN_DIR)/$*
-	@echo "Created script $(EXECUTOR_IN_DIR)/$*"
+	@echo "Created program $(EXECUTOR_IN_DIR)/$*"
diff --git a/developer/deprecated/makefile-tool.mk b/developer/deprecated/makefile-tool.mk
index 4ee0f48..e43278b 100644
--- a/developer/deprecated/makefile-tool.mk
+++ b/developer/deprecated/makefile-tool.mk
@@ -1,35 +1,61 @@
+#================================================================================
+# Build the tools that are needed for building the project.
+#
+# GNU makefile
+
+# turn off implicit rules, because they can do unexpected things.
+.SUFFIXES:
+MAKEFLAGS += -r
+
+# `make` considers that PHONY targets do not correspond to files (other
+# targets do and the files have their dates checked). This declaration renders
+# innocuous the "feature" where `make` always tries to make its own
+# makefiles. There is no command line switch to turn this "feature" off.
+.PHONY: $(MAKEFILE_LIST)
+
+# 'make' has a "feature" where it deletes what it determines to be intermediate
+# files. There is no command line switch to turn this "feature" off. Combine
+# this "feature" with implicit rules and have loads of fun.
+.PRECIOUS: $(MAKEFILE_LIST)
+
+#$(info makefile: $(MAKEFILE_LIST))
+#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
+
+# for recursive make without leaving this makefile
+REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
+
 #================================================================================
 # Custom make targets
 #
+.PHONY: all ANTLR_OUT_FL
 
 all: ANTLR_OUT_FL
 
 ANTLR_OUT_FL: $(EXECUTOR_IN_DIR)/ANTLR_OUT_FL
 
-
-
 #================================================================================
 # generic targets, aka recipes
 #
 
-# Rule to build .class files from .java files
+# Without this, `make` sees .jar files as intermediate and deletes them.
+.PRECIOUS: $(JAVA_COMP_OUT_DIR)/%.jar
+
+# make .class file from .java file
 $(JAVA_COMP_OUT_DIR)/%.class: $(JAVA_COMP_IN_PRIMARY_DIR)/%.java
 	@echo "Compiling $<..."
 	$(JAVA_COMP) -d $(JAVA_COMP_OUT_DIR) -sourcepath $(JAVA_COMP_IN_DL) $<
 	@echo "Created $@"
 
-# Without this, GNU make inserts an 'rm -rf' not on the recipe and deletes the .jar files
-# after making them.  Why make why?
-.PRECIOUS: $(JAVA_COMP_OUT_DIR)/%.jar
-# Rule to build .jar files from .class files
+# make .jar from .class file
 $(JAVA_COMP_OUT_DIR)/%.jar: $(JAVA_COMP_OUT_DIR)/%.class
 	@echo "Building $*..."
 	$(JAVA_ARCHIVE) cf $@ -C $(JAVA_COMP_OUT_DIR) $*.class
 	@echo "Created $@"
 
+#make the wrapper script from the .jar file
 $(EXECUTOR_IN_DIR)/%: $(JVM_IN_DIR)/%.jar
-	@echo "Creating script for $*..."
+	@echo "Creating program for $*..."
 	@echo "#!/usr/bin/env bash" > $(EXECUTOR_IN_DIR)/$*
 	@echo "$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:$(JVM_IN_DP)/$*.jar $*" \$$\@ >> $(EXECUTOR_IN_DIR)/$*
 	chmod +x $(EXECUTOR_IN_DIR)/$*
-	@echo "Created script $(EXECUTOR_IN_DIR)/$*"
+	@echo "Created program $(EXECUTOR_IN_DIR)/$*"
diff --git a/developer/deprecated/makefile-top.mk b/developer/deprecated/makefile-top.mk
index b4fef26..0642609 100644
--- a/developer/deprecated/makefile-top.mk
+++ b/developer/deprecated/makefile-top.mk
@@ -1,9 +1,39 @@
-$(info top_MAKECMDGOALS: $(MAKECMDGOALS))
+#================================================================================
+# top level makefile calls makefile-tool and makefile-project
+#
+# GNU makefile
 
-.PHONY: all version clean setup tools project
+# turn off implicit rules, because they can do unexpected things.
+.SUFFIXES:
+MAKEFLAGS += -r
 
-# The 'all' target now depends on 'tools' and 'project'
-all: setup tools project
+# `make` considers that PHONY targets do not correspond to files (other
+# targets do and the files have their dates checked). This declaration renders
+# innocuous the "feature" where `make` always tries to make its own
+# makefiles. There is no command line switch to turn this "feature" off.
+.PHONY: $(MAKEFILE_LIST)
+
+# 'make' has a "feature" where it deletes what it determines to be intermediate
+# files. There is no command line switch to turn this "feature" off. Combine
+# this "feature" with implicit rules and have loads of fun.
+.PRECIOUS: $(MAKEFILE_LIST)
+
+#$(info makefile: $(MAKEFILE_LIST))
+#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
+
+# for recursive make without leaving this makefile
+REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
+
+#================================================================================
+# Custom make targets
+#
+.PHONY: all nothing version clean setup
+
+all: project-all
+
+# useful for distinguishing between make syntax errors and build errors
+nothing:
+	@:
 
 version:
 	$(info ANTLR_JAR is '$(notdir $(ANTLR_JAR))')
@@ -14,20 +44,19 @@ version:
 
 # `clean` is program independent of `make`
 clean:
-	@echo "Use the clean script from the $(EXECUTOR_IN_DIR) directory instead of \`make clean\`"
-	@$(EXECUTOR_IN_DIR)/clean
+	@echo "Use the command `clean <option>` instead of make.`"
 
 setup:
-	mkdir -p $(ANTLR_IN_PRIMARY_DIR) $(JAVA_COMP_IN_PRIMARY_DIR) $(JVM_IN_DIR)
-	mkdir -p $(EXECUTOR_IN_DIR) test deprecated experiment documentation temporary
+	mkdir -p $(ANTLR_IN_PRIMARY_DIR) $(JAVA_COMP_IN_PRIMARY_DIR) $(JVM_IN_DIR) $(EXECUTOR_IN_DIR) test deprecated experiment ologist temporary
+
+# Ensure tools are built before building the project programs
+tool-%: setup
+	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-tool.mk -$(MAKEFLAGS) $*
 
-# Ensure tools like ANTLR_OUT_FL are built before building the project programs
-tools: setup
-	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-tool.mk -$(MAKEFLAGS)
+project-%: tool-all
+	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-project.mk -$(MAKEFLAGS) $*
 
-project: tools
-	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-project.mk -$(MAKEFLAGS)
+# delegate other targets to the project
+%: project-%
+	@:
 
-# all other targets are sent to makefile-project
-%: tools
-	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-project.mk -$(MAKEFLAGS) $@
diff --git a/developer/executor/ANTLR_OUT_FL b/developer/executor/ANTLR_OUT_FL
index c01acc3..c1ba0df 100755
--- a/developer/executor/ANTLR_OUT_FL
+++ b/developer/executor/ANTLR_OUT_FL
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-/var/user_data/Thomas-developer/GQL_to_Cypher/tool/jdk-22.0.1+8/bin/java -cp :/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm/ANTLR_OUT_FL.jar ANTLR_OUT_FL $@
+/var/user_data/Thomas-developer/GQL_to_Cypher/tool/jdk-22.0.1+8/bin/java -cp :/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:/var/user_data/Thomas-developer/GQL_to_Cypher/developer/jvm:/var/user_data/Thomas-developer/GQL_to_Cypher/tool/executor/antlr-4.11.1-complete.jar:jvm:jvm/ANTLR_OUT_FL.jar ANTLR_OUT_FL $@
diff --git a/developer/executor/build.gradle b/developer/executor/build.gradle
new file mode 100644
index 0000000..e53add0
--- /dev/null
+++ b/developer/executor/build.gradle
@@ -0,0 +1,71 @@
+task setup {
+  doLast {
+    def dirs = [
+      "$(ANTLR_IN_PRIMARY_DIR)"
+      ,"$(JAVA_COMP_IN_DIR)"
+      ,"$(JAVA_COMP_IN_PRIMARY_DIR)"
+      ,"$(JAVA_COMP_IN_ANTLR_DIR)"
+      ,"$(JAVA_COMP_IN_SYN_DIR)"
+      ,"$(JVM_IN_DIR)"
+      ,"$(EXECUTOR_IN_DIR)"
+      ,"test"
+      ,"deprecated"
+      ,"experiment"
+      ,"ologist"
+      ,"temporary"
+    ]
+    dirs.each { dir ->
+      if (!file(dir).exists()) {
+        mkdir dir
+      }
+    }
+  }
+}
+
+task tool(type: Exec) {
+  dependsOn setup
+  commandLine '$(BIN_MAKE)', '-f', '$(EXECUTOR_IN_DIR)/makefile-tool.mk', '-$(MAKEFLAGS)', 'all'
+}
+
+task project(type: Exec) {
+  dependsOn tool
+  commandLine '$(BIN_MAKE)', '-f', '$(EXECUTOR_IN_DIR)/makefile-project.mk', '-$(MAKEFLAGS)', 'all'
+}
+
+task clean {
+  doLast {
+    println "Use the command `clean <option>` instead of make."
+  }
+}
+
+task version {
+  doLast {
+    println "ANTLR_JAR is '${notdir(ANTLR_JAR)}'"
+    exec {
+      commandLine '$(JAVA_COMP)', '--version'
+    }
+    exec {
+      commandLine '$(JAVA_ARCHIVE)', '--version'
+    }
+    exec {
+      commandLine 'make', '-v'
+    }
+    println "makefile 0.4"
+  }
+}
+
+task all {
+  dependsOn project
+}
+
+task nothing {
+  doLast {
+    // useful for distinguishing between make syntax errors and build errors
+  }
+}
+
+tasks.withType(Exec) {
+  doFirst {
+    println "Executing $name"
+  }
+}
diff --git a/developer/executor/env_build b/developer/executor/env_build
index d4852b8..ba97b07 100755
--- a/developer/executor/env_build
+++ b/developer/executor/env_build
@@ -55,6 +55,7 @@ export EXECUTOR_IN_FL="\
   Arithmetic2_SyntaxAnnotate\
   Arithmetic2_SyntaxAnnotate__Test\
   ANTLRv4_SyntaxAnnotate\
+  Arithmetic_Swap\
   "
 
 # where make will put the programs
@@ -73,8 +74,10 @@ export ANTLR_OUT_DIR="javac/ANTLR"
 export ANTLR_OUT_DIR_PARENT="javac"
 
 # JAVA directories
-export JAVA_COMP_IN_PRIMARY_DIR="javac"
+export JAVA_COMP_IN_DIR="javac"
+export JAVA_COMP_IN_PRIMARY_DIR="javac/primary"
 export JAVA_COMP_IN_ANTLR_DIR="${ANTLR_OUT_DIR}"
+export JAVA_COMP_IN_SYN_DIR="javac/synthesized"
 export JAVA_COMP_IN_DL="${JAVA_COMP_IN_PRIMARY_DIR}:${JAVA_COMP_IN_ANTLR_DIR}"
 export JAVA_COMP_OUT_DIR="jvm"
 
diff --git a/developer/executor/make b/developer/executor/gradle
similarity index 82%
rename from developer/executor/make
rename to developer/executor/gradle
index 714a070..9bd00ef 100755
--- a/developer/executor/make
+++ b/developer/executor/gradle
@@ -12,4 +12,4 @@ cd "$DEVELOPER_HOME"
 # in case there have been edits to the environment
 source "${EXECUTOR_IN_DIR}"/env_build
 
-${BIN_MAKE} --no-print-directory -f "${EXECUTOR_IN_DIR}"/makefile-top.mk $@
+"${GRADLE_HOME}"/bin/gradle -b "${EXECUTOR_IN_DIR}"/build.gradle "$@"
diff --git a/developer/executor/makefile-project.mk b/developer/executor/makefile-project.mk
deleted file mode 100644
index 277884e..0000000
--- a/developer/executor/makefile-project.mk
+++ /dev/null
@@ -1,239 +0,0 @@
-#--------------------------------------------------------------------------------
-# Project build
-#
-# GNU makefile
-
-# turn off implicit rules, because they can do unexpected things.
-.SUFFIXES:
-MAKEFLAGS += -r
-
-# `make` considers that PHONY targets do not correspond to files (other
-# targets do and the files have their dates checked). This declaration renders
-# innocuous the "feature" where `make` always tries to make its own
-# makefiles. There is no command line switch to turn this "feature" off.
-.PHONY: $(MAKEFILE_LIST)
-
-# 'make' has a "feature" where it deletes what it determines to be intermediate
-# files. There is no command line switch to turn this "feature" off. Combine
-# this "feature" with implicit rules and have loads of fun.
-.PRECIOUS: $(MAKEFILE_LIST)
-
-#$(info makefile: $(MAKEFILE_LIST))
-#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
-
-# for recursive make without leaving this makefile
-REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
-
-#================================================================================
-# Custom make targets
-#
-
-all: $(EXECUTOR_IN_FPL)
-
-
-#-----------------------------------------------
-# These do not require antlr generated java files
-
-RuleNameListRegx: $(EXECUTOR_IN_DIR)/RuleNameListRegx
-RuleNameList: $(EXECUTOR_IN_DIR)/RuleNameList
-
-Synthesize_SyntaxAnnotate_PrintVisitorMethod:\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
-  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate_PrintVisitorMethod
-Synthesize_SyntaxAnnotate_PrintVisitor:\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java\
-  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate_PrintVisitor
-
-Synthesize_SyntaxAnnotate:\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/StringUtils.java\
-  $(EXECUTOR_IN_DIR)/Synthesize_SyntaxAnnotate
-
-#-----------------------------------------------
-# Arithmetic
-
-ANTLR_OUT_Arithmetic_FPL:= $(shell ANTLR_OUT_FL Arithmetic -path $(ANTLR_OUT_DIR))
-#$(info ANTLR_OUT_Arithmetic_FPL: $(ANTLR_OUT_Arithmetic_FPL))
-Arithmetic_Echo:\
-  $(ANTLR_OUT_Arithmetic_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo
-
-Arithmetic_Echo__Test:\
-  $(ANTLR_OUT_Arithmetic_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_Echo_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_Echo__Test
-
-Arithmetic_SyntaxAnnotate:\
-  $(ANTLR_OUT_Arithmetic_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_SyntaxAnnotate
-
-Arithmetic_SyntaxAnnotate__Test:\
-  $(ANTLR_OUT_Arithmetic_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic_SyntaxAnnotate__Test
-
-#-----------------------------------------------
-# Arithmetic2
-# 
-
-ANTLR_OUT_Arithmetic2_FPL:= $(shell ANTLR_OUT_FL Arithmetic2 -path $(ANTLR_OUT_DIR))
-Arithmetic2_SyntaxAnnotate:\
-  $(ANTLR_OUT_Arithmetic2_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic2_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic2_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic2_SyntaxAnnotate
-
-Arithmetic2_SyntaxAnnotate__Test:\
-  $(ANTLR_OUT_Arithmetic2_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_Arithmetic2_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_Arithmetic2_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/Arithmetic2_SyntaxAnnotate__Test
-
-#-----------------------------------------------
-# Parsing/Analyzing ANTLR grammars
-#
-
-ANTLR_OUT_ANTLRv4_FPL:= $(shell ANTLR_OUT_FL ANTLRv4 -path $(ANTLR_OUT_DIR))
-ANTLRv4_SyntaxAnnotate:\
-  $(ANTLR_OUT_ANTLRv4_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/ANTLRv4_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_ANTLRv4_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_ANTLRv4_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/ANTLRv4_SyntaxAnnotate
-
-
-#-----------------------------------------------
-#  GQL_20240412
-
-ANTLR_OUT_GQL_20240412_FPL := $(shell ANTLR_OUT_FL GQL_20240412 -path $(ANTLR_OUT_DIR))
-GQL_20240412_SyntaxAnnotate:\
-  $(ANTLR_OUT_GQL_20240412_FPL)\
-  $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_GQL_20240412_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_GQL_20240412_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_SyntaxAnnotate
-
-GQL_20240412_SyntaxAnnotate__Test: \
-  $(ANTLR_OUT_GQL_20240412_FPL) \
-  $(JAVA_COMP_IN_PRIMARY_DIR)/GQL_20240412_SyntaxAnnotate_PrintVisitor.java
-	@if [ -z "$(ANTLR_OUT_GQL_20240412_FPL)" ]; then \
-	  echo "variable ANTLR_OUT_GQL_20240412_FPL empty."; \
-	  exit 1; \
-	fi
-	$(REMAKE) $(EXECUTOR_IN_DIR)/GQL_20240412_SyntaxAnnotate__Test
-
-
-TerminalToCategory: 
-	$(REMAKE) $(EXECUTOR_IN_DIR)/TerminalToCategory
-
-GrammarSplitter: 
-	$(REMAKE) $(EXECUTOR_IN_DIR)/GrammarSplitter
-
-#-----------------------------------------------
-# Compile all the .java files.
-
-java: $(JAVA_COMP_OUT_FPL)
-
-
-#================================================================================
-# generic targets, aka recipes
-#
-
-# this section is not parallel make friendly
-# $(ANTLR_OUT_DIR)/%Lexer.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-# $(ANTLR_OUT_DIR)/%Parser.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-# $(ANTLR_OUT_DIR)/%BaseListener.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-# $(ANTLR_OUT_DIR)/%Listener.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-# $(ANTLR_OUT_DIR)/%BaseVisitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-# $(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-# 	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-
-#--------------------
-# for a single `<name>.g4` grammar file
-$(ANTLR_OUT_DIR)/%Lexer.java \
-$(ANTLR_OUT_DIR)/%Parser.java \
-$(ANTLR_OUT_DIR)/%BaseListener.java \
-$(ANTLR_OUT_DIR)/%Listener.java \
-$(ANTLR_OUT_DIR)/%BaseVisitor.java \
-$(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%.g4
-	@echo "copiling grammar from:" $<
-	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-
-#--------------------
-# For separate `<mame>Lexer.g4` and `<name>Parser.g4` files.
-# `make` prefers shorter pattern matches, so this should work.
-#
-
-$(ANTLR_OUT_DIR)/LexerAdaptor.java: $(ANTLR_IN_PRIMARY_DIR)/LexerAdaptor.java
-	cp $(ANTLR_IN_PRIMARY_DIR)/LexerAdaptor.java $(ANTLR_OUT_DIR)
-
-$(ANTLR_OUT_DIR)/%Lexer.java: $(ANTLR_IN_PRIMARY_DIR)/%Lexer.g4 $(ANTLR_OUT_DIR)/LexerAdaptor.java
-	@echo "making lexer grammar from:" $<
-	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -o $(ANTLR_OUT_DIR_PARENT) $<
-
-# Rule for all generated files from Parser.g4
-$(ANTLR_OUT_DIR)/%Parser.java \
-$(ANTLR_OUT_DIR)/%BaseListener.java \
-$(ANTLR_OUT_DIR)/%Listener.java \
-$(ANTLR_OUT_DIR)/%BaseVisitor.java \
-$(ANTLR_OUT_DIR)/%Visitor.java: $(ANTLR_IN_PRIMARY_DIR)/%Parser.g4
-	@echo "making other grammar files from:" $<
-	$(JAVA_INTERP) -jar $(ANTLR_JAR) -Dlanguage=Java -visitor -lib $(ANTLR_OUT_DIR) -o $(ANTLR_OUT_DIR_PARENT) $<
-
-#--------------------------------------------------------------------------------
-
-# Rule to build .class files from .java files
-$(JAVA_COMP_OUT_DIR)/%.class: $(JAVA_COMP_IN_PRIMARY_DIR)/%.java
-	@echo "Compiling $<..."
-	$(JAVA_COMP) -d $(JAVA_COMP_OUT_DIR) -sourcepath $(JAVA_COMP_IN_DL) $<
-	@echo "Created $@"
-
-# Without this, GNU make inserts an 'rm -rf' not on the recipe and deletes the .jar files
-# after making them.  Why make why?
-.PRECIOUS: $(JAVA_COMP_OUT_DIR)/%.jar
-# Rule to build .jar files from .class files
-$(JAVA_COMP_OUT_DIR)/%.jar: $(JAVA_COMP_OUT_DIR)/%.class
-	@echo "Building $*..."
-	$(JAVA_ARCHIVE) cf $@ -C $(JAVA_COMP_OUT_DIR) $*.class
-	@echo "Created $@"
-
-#--------------------
-$(EXECUTOR_IN_DIR)/%: $(JVM_IN_DIR)/%.jar
-	@echo "Creating program for $*..."
-	@echo "#!/usr/bin/env bash" > $(EXECUTOR_IN_DIR)/$*
-	@echo "$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:$(JVM_IN_DP)/$*.jar $*" \$$\@ >> $(EXECUTOR_IN_DIR)/$*
-	chmod +x $(EXECUTOR_IN_DIR)/$*
-	@echo "Created program $(EXECUTOR_IN_DIR)/$*"
diff --git a/developer/executor/makefile-tool.mk b/developer/executor/makefile-tool.mk
deleted file mode 100644
index 1e7e88c..0000000
--- a/developer/executor/makefile-tool.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#================================================================================
-# Build the tools that are needed for building the project.
-#
-# GNU makefile
-
-# turn off implicit rules, because they can do unexpected things.
-.SUFFIXES:
-MAKEFLAGS += -r
-
-# `make` considers that PHONY targets do not correspond to files (other
-# targets do and the files have their dates checked). This declaration renders
-# innocuous the "feature" where `make` always tries to make its own
-# makefiles. There is no command line switch to turn this "feature" off.
-.PHONY: $(MAKEFILE_LIST)
-
-# 'make' has a "feature" where it deletes what it determines to be intermediate
-# files. There is no command line switch to turn this "feature" off. Combine
-# this "feature" with implicit rules and have loads of fun.
-.PRECIOUS: $(MAKEFILE_LIST)
-
-#$(info makefile: $(MAKEFILE_LIST))
-#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
-
-# for recursive make without leaving this makefile
-REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
-
-#================================================================================
-# Custom make targets
-#
-.PHONY: tool
-
-all: ANTLR_OUT_FL
-
-ANTLR_OUT_FL: $(EXECUTOR_IN_DIR)/ANTLR_OUT_FL
-
-
-
-#================================================================================
-# generic targets, aka recipes
-#
-
-# Rule to build .class files from .java files
-$(JAVA_COMP_OUT_DIR)/%.class: $(JAVA_COMP_IN_PRIMARY_DIR)/%.java
-	@echo "Compiling $<..."
-	$(JAVA_COMP) -d $(JAVA_COMP_OUT_DIR) -sourcepath $(JAVA_COMP_IN_DL) $<
-	@echo "Created $@"
-
-# Without this, GNU make inserts an 'rm -rf' not on the recipe and deletes the .jar files
-# after making them.  Why make why?
-.PRECIOUS: $(JAVA_COMP_OUT_DIR)/%.jar
-# Rule to build .jar files from .class files
-$(JAVA_COMP_OUT_DIR)/%.jar: $(JAVA_COMP_OUT_DIR)/%.class
-	@echo "Building $*..."
-	$(JAVA_ARCHIVE) cf $@ -C $(JAVA_COMP_OUT_DIR) $*.class
-	@echo "Created $@"
-
-$(EXECUTOR_IN_DIR)/%: $(JVM_IN_DIR)/%.jar
-	@echo "Creating script for $*..."
-	@echo "#!/usr/bin/env bash" > $(EXECUTOR_IN_DIR)/$*
-	@echo "$(JAVA_INTERP) -cp ${CLASSPATH}:${JVM_IN_DP}:$(JVM_IN_DP)/$*.jar $*" \$$\@ >> $(EXECUTOR_IN_DIR)/$*
-	chmod +x $(EXECUTOR_IN_DIR)/$*
-	@echo "Created script $(EXECUTOR_IN_DIR)/$*"
diff --git a/developer/executor/makefile-top.mk b/developer/executor/makefile-top.mk
deleted file mode 100644
index 0642609..0000000
--- a/developer/executor/makefile-top.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#================================================================================
-# top level makefile calls makefile-tool and makefile-project
-#
-# GNU makefile
-
-# turn off implicit rules, because they can do unexpected things.
-.SUFFIXES:
-MAKEFLAGS += -r
-
-# `make` considers that PHONY targets do not correspond to files (other
-# targets do and the files have their dates checked). This declaration renders
-# innocuous the "feature" where `make` always tries to make its own
-# makefiles. There is no command line switch to turn this "feature" off.
-.PHONY: $(MAKEFILE_LIST)
-
-# 'make' has a "feature" where it deletes what it determines to be intermediate
-# files. There is no command line switch to turn this "feature" off. Combine
-# this "feature" with implicit rules and have loads of fun.
-.PRECIOUS: $(MAKEFILE_LIST)
-
-#$(info makefile: $(MAKEFILE_LIST))
-#$(info project_MAKECMDGOALS: $(MAKECMDGOALS))
-
-# for recursive make without leaving this makefile
-REMAKE = $(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE_LIST)
-
-#================================================================================
-# Custom make targets
-#
-.PHONY: all nothing version clean setup
-
-all: project-all
-
-# useful for distinguishing between make syntax errors and build errors
-nothing:
-	@:
-
-version:
-	$(info ANTLR_JAR is '$(notdir $(ANTLR_JAR))')
-	@ $(JAVA_COMP) --version
-	@ $(JAVA_ARCHIVE) --version
-	@ make -v | head -n 1
-	@ echo "makefile 0.4"
-
-# `clean` is program independent of `make`
-clean:
-	@echo "Use the command `clean <option>` instead of make.`"
-
-setup:
-	mkdir -p $(ANTLR_IN_PRIMARY_DIR) $(JAVA_COMP_IN_PRIMARY_DIR) $(JVM_IN_DIR) $(EXECUTOR_IN_DIR) test deprecated experiment ologist temporary
-
-# Ensure tools are built before building the project programs
-tool-%: setup
-	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-tool.mk -$(MAKEFLAGS) $*
-
-project-%: tool-all
-	$(BIN_MAKE) -f $(EXECUTOR_IN_DIR)/makefile-project.mk -$(MAKEFLAGS) $*
-
-# delegate other targets to the project
-%: project-%
-	@:
-
diff --git a/developer/javac/ANTLR_OUT_FL.java b/developer/javac/primary/ANTLR_OUT_FL.java
similarity index 97%
rename from developer/javac/ANTLR_OUT_FL.java
rename to developer/javac/primary/ANTLR_OUT_FL.java
index 365212f..f852af5 100644
--- a/developer/javac/ANTLR_OUT_FL.java
+++ b/developer/javac/primary/ANTLR_OUT_FL.java
@@ -84,11 +84,7 @@ public class ANTLR_OUT_FL {
     }
     if(version){
       System.out.println("version 0.1");
-      if(error){
-        System.exit(1);
-      }else{
-        System.exit(0);
-      }        
+      System.exit(error ? 1 : 0);
     }
     if (argList.size() != 1) {
       System.err.println("Expected exactly one non-option argument.");
diff --git a/developer/javac/Arithmetic_Echo.java b/developer/javac/primary/Arithmetic_Echo.java
similarity index 100%
rename from developer/javac/Arithmetic_Echo.java
rename to developer/javac/primary/Arithmetic_Echo.java
diff --git a/developer/javac/Arithmetic_Echo_PrintVisitor.java b/developer/javac/primary/Arithmetic_Echo_PrintVisitor.java
similarity index 100%
rename from developer/javac/Arithmetic_Echo_PrintVisitor.java
rename to developer/javac/primary/Arithmetic_Echo_PrintVisitor.java
diff --git a/developer/javac/Arithmetic_Echo__Test.java b/developer/javac/primary/Arithmetic_Echo__Test.java
similarity index 100%
rename from developer/javac/Arithmetic_Echo__Test.java
rename to developer/javac/primary/Arithmetic_Echo__Test.java
diff --git a/developer/javac/primary/Arithmetic_Swap.java b/developer/javac/primary/Arithmetic_Swap.java
new file mode 100644
index 0000000..58e1caf
--- /dev/null
+++ b/developer/javac/primary/Arithmetic_Swap.java
@@ -0,0 +1,69 @@
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.tree.*;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Arithmetic_Swap {
+  private static final String USAGE_MESSAGE =
+    "Usage: Arithmetic_Swap [-version] <source-file-path>";
+
+  public static void main(String[] args) throws IOException {
+    if (args.length == 0) {
+      System.err.println(USAGE_MESSAGE);
+      System.exit(1);
+    }
+    boolean error = false;
+    boolean version = false;
+    List<String> argList = new ArrayList<>();
+    for (String arg : args) {
+      if (arg.startsWith("-")) {
+        switch (arg) {
+        case "-version":
+          version = true;
+          break;
+        default:
+          System.err.println("Unrecognized option: " + arg);
+          error = true;
+        }
+      } else {
+        argList.add(arg);
+      }
+    }
+    if (version) {
+      System.out.println("version 0.1");
+      System.exit(error ? 1 : 0);
+    }
+    if (argList.size() != 1) {
+      System.err.println("Expected exactly one non-option argument.");
+      error = true;
+    }
+    if (error) {
+      System.err.println(USAGE_MESSAGE);
+      System.exit(1);
+    }
+
+    String inputFile = argList.get(0);
+    String input = Files.readString(Paths.get(inputFile));
+
+    try {
+      ArithmeticLexer lexer = new ArithmeticLexer(CharStreams.fromString(input));
+      CommonTokenStream tokens = new CommonTokenStream(lexer);
+      ArithmeticParser parser = new ArithmeticParser(tokens);
+      
+      ParseTree tree = parser.program();
+
+      Arithmetic_SwapVisitor swapVisitor = new Arithmetic_SwapVisitor();
+      ParseTree transformedTree = swapVisitor.visit(tree);
+
+      Arithmetic_Echo_PrintVisitor printVisitor = new Arithmetic_Echo_PrintVisitor(parser.getRuleNames());
+      String output = printVisitor.visit(transformedTree);
+
+      System.out.println(output);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/developer/javac/primary/Arithmetic_SwapVisitor.java b/developer/javac/primary/Arithmetic_SwapVisitor.java
new file mode 100644
index 0000000..f108735
--- /dev/null
+++ b/developer/javac/primary/Arithmetic_SwapVisitor.java
@@ -0,0 +1,50 @@
+import org.antlr.v4.runtime.tree.*;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
+
+public class Arithmetic_SwapVisitor extends AbstractParseTreeVisitor<ParseTree> {
+
+    @Override
+    public ParseTree visit(ParseTree tree) {
+        if (tree instanceof ParserRuleContext) {
+            ParserRuleContext ctx = (ParserRuleContext) tree;
+            ParserRuleContext newCtx = new ParserRuleContext();
+
+            // Recursively visit all children and add them to the new context
+            for (int i = 0; i < ctx.getChildCount(); i++) {
+                ParseTree child = ctx.getChild(i);
+                ParseTree visitedChild = this.visit(child);
+                
+                // Add child if it's a valid type
+                if (visitedChild instanceof ParserRuleContext) {
+                    newCtx.addChild((ParserRuleContext) visitedChild);
+                } else if (visitedChild instanceof TerminalNode) {
+                    newCtx.addChild((TerminalNode) visitedChild);
+                }
+            }
+            return newCtx;
+        } else if (tree instanceof TerminalNode) {
+            TerminalNode node = (TerminalNode) tree;
+            // Swap operators based on text
+            switch (node.getText()) {
+                case "+":
+                    return createTerminalNode(node, ArithmeticParser.MINUS); // Swap + with -
+                case "-":
+                    return createTerminalNode(node, ArithmeticParser.PLUS);  // Swap - with +
+                case "*":
+                    return createTerminalNode(node, ArithmeticParser.DIVIDE); // Swap * with /
+                case "/":
+                    return createTerminalNode(node, ArithmeticParser.MULTIPLY); // Swap / with *
+                default:
+                    return node; // Return node as is for non-operator tokens
+            }
+        }
+        return null;
+    }
+
+    // Helper method to create a new TerminalNode with the swapped token
+    private TerminalNode createTerminalNode(TerminalNode oldNode, int newTokenType) {
+        Token newToken = new CommonToken(newTokenType, oldNode.getText());
+        return new TerminalNodeImpl(newToken);
+    }
+}
diff --git a/developer/javac/Arithmetic_SyntaxAnnotate.java b/developer/javac/primary/Arithmetic_SyntaxAnnotate.java
similarity index 100%
rename from developer/javac/Arithmetic_SyntaxAnnotate.java
rename to developer/javac/primary/Arithmetic_SyntaxAnnotate.java
diff --git a/developer/javac/Arithmetic_SyntaxAnnotate_PrintVisitor.java b/developer/javac/primary/Arithmetic_SyntaxAnnotate_PrintVisitor.java
similarity index 100%
rename from developer/javac/Arithmetic_SyntaxAnnotate_PrintVisitor.java
rename to developer/javac/primary/Arithmetic_SyntaxAnnotate_PrintVisitor.java
diff --git a/developer/javac/Arithmetic_SyntaxAnnotate__Test.java b/developer/javac/primary/Arithmetic_SyntaxAnnotate__Test.java
similarity index 100%
rename from developer/javac/Arithmetic_SyntaxAnnotate__Test.java
rename to developer/javac/primary/Arithmetic_SyntaxAnnotate__Test.java
diff --git a/developer/javac/RuleNameList.java b/developer/javac/primary/RuleNameList.java
similarity index 100%
rename from developer/javac/RuleNameList.java
rename to developer/javac/primary/RuleNameList.java
diff --git a/developer/javac/RuleNameListRegx.java b/developer/javac/primary/RuleNameListRegx.java
similarity index 100%
rename from developer/javac/RuleNameListRegx.java
rename to developer/javac/primary/RuleNameListRegx.java
diff --git a/developer/javac/StringUtils.java b/developer/javac/primary/StringUtils.java
similarity index 100%
rename from developer/javac/StringUtils.java
rename to developer/javac/primary/StringUtils.java
diff --git a/developer/javac/Synthesize_SyntaxAnnotate.java b/developer/javac/primary/Synthesize_SyntaxAnnotate.java
similarity index 100%
rename from developer/javac/Synthesize_SyntaxAnnotate.java
rename to developer/javac/primary/Synthesize_SyntaxAnnotate.java
diff --git a/developer/javac/Synthesize_SyntaxAnnotate_PrintVisitor.java b/developer/javac/primary/Synthesize_SyntaxAnnotate_PrintVisitor.java
similarity index 100%
rename from developer/javac/Synthesize_SyntaxAnnotate_PrintVisitor.java
rename to developer/javac/primary/Synthesize_SyntaxAnnotate_PrintVisitor.java
diff --git a/developer/javac/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java b/developer/javac/primary/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java
similarity index 100%
rename from developer/javac/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java
rename to developer/javac/primary/Synthesize_SyntaxAnnotate_PrintVisitorMethod.java
diff --git a/developer/javac/TestBench.java b/developer/javac/primary/TestBench.java
similarity index 100%
rename from developer/javac/TestBench.java
rename to developer/javac/primary/TestBench.java
diff --git a/developer/javac/Arithmetic2_SyntaxAnnotate.java b/developer/javac/synthesized/Arithmetic2_SyntaxAnnotate.java
similarity index 100%
rename from developer/javac/Arithmetic2_SyntaxAnnotate.java
rename to developer/javac/synthesized/Arithmetic2_SyntaxAnnotate.java
diff --git a/developer/javac/Arithmetic2_SyntaxAnnotate_PrintVisitor.java b/developer/javac/synthesized/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
similarity index 100%
rename from developer/javac/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
rename to developer/javac/synthesized/Arithmetic2_SyntaxAnnotate_PrintVisitor.java
diff --git a/developer/ologist/#emacs.txt# b/developer/ologist/#emacs.txt#
new file mode 100644
index 0000000..7eaf367
--- /dev/null
+++ b/developer/ologist/#emacs.txt#
@@ -0,0 +1,30 @@
+
+
+antlr-mode.el -> .emacs.d
+(autoload 'antlr-mode "antlr-mode" "Major mode for editing ANTLR grammars." t)
+(add-to-list 'auto-mode-alist '("\\.g4\\'" . antlr-mode))
+
+un M-x package-install gradle-mode.
+(require 'gradle-mode)
+(gradle-mode 1)
+
+C-c C-g b to run gradle build
+C-c C-g t to run gradle test
+C-c C-g s to run a single test
+C-c C-g d to run a Gradle command with the daemon
+
+Run M-x package-install RET groovy-mode RET.
+(require 'groovy-mode)
+(add-to-list 'auto-mode-alist '("\\.gradle\\'" . groovy-mode))
+
+(electric-indent-mode 1)
+Run M-x package-install RET auto-indent-mode RET.
+
+(require 'auto-indent-mode)
+(auto-indent-global-mode)
+
+
+(defun my-groovy-mode-hook ()
+  (setq groovy-indent-offset 2))  ;; Set indentation level to 2 spaces
+
+(add-hook 'groovy-mode-hook 'my-groovy-mode-hook)
\ No newline at end of file
diff --git a/developer/ologist/emacs.txt b/developer/ologist/emacs.txt
index d296f71..c7b6404 100644
--- a/developer/ologist/emacs.txt
+++ b/developer/ologist/emacs.txt
@@ -1,3 +1,24 @@
+
+
 antlr-mode.el -> .emacs.d
 (autoload 'antlr-mode "antlr-mode" "Major mode for editing ANTLR grammars." t)
 (add-to-list 'auto-mode-alist '("\\.g4\\'" . antlr-mode))
+
+un M-x package-install gradle-mode.
+(require 'gradle-mode)
+(gradle-mode 1)
+
+C-c C-g b to run gradle build
+C-c C-g t to run gradle test
+C-c C-g s to run a single test
+C-c C-g d to run a Gradle command with the daemon
+
+Run M-x package-install RET groovy-mode RET.
+(require 'groovy-mode)
+(add-to-list 'auto-mode-alist '("\\.gradle\\'" . groovy-mode))
+
+(electric-indent-mode 1)
+Run M-x package-install RET auto-indent-mode RET.
+
+(require 'auto-indent-mode)
+(auto-indent-global-mode)
diff --git a/executor/env_dev b/executor/env_dev
index c326b81..20983a4 100644
--- a/executor/env_dev
+++ b/executor/env_dev
@@ -12,11 +12,22 @@ if [ -z "$REPO_HOME" ]; then
   source "${script_path}/env_base"
 fi
 
+export DEVELOPER_HOME="$REPO_HOME/developer"
+
 export JAVA_HOME="$REPO_HOME/tool/jdk-22.0.1+8"
+export GRADLE_HOME="$REPO_HOME/tool/gradle-8.10-rc-1"
 export ANTLR_JAR="$REPO_HOME/tool/executor/antlr-4.11.1-complete.jar"
-export DEVELOPER_HOME="$REPO_HOME/developer"
 
-export PATH="$DEVELOPER_HOME"/executor:"$REPO_HOME"/tool/executor:"$JAVA_HOME"/bin:"$PATH"
+export PATH=\
+"$DEVELOPER_HOME"/executor\
+:"$REPO_HOME"/tool/executor\
+:"$JAVA_HOME"/bin\
+:"$GRADLE_HOME"/bin\
+:"$PATH"
+
+export GRADLE_OPTS="--settings-file $REPO_HOME/settings.gradle"
+
+
 cd "$DEVELOPER_HOME"
 
 # This is helpful so that cut and paste from the makefile to the shell can be used for testing.
@@ -24,3 +35,5 @@ cd "$DEVELOPER_HOME"
 source "$DEVELOPER_HOME"/executor/env_build
 
 echo "${BASH_SOURCE[0]}" "complete"
+
+#  LocalWords:  gradle antlr jdk REPO
diff --git a/executor/install b/executor/install
index 3720ce6..005f7c6 100755
--- a/executor/install
+++ b/executor/install
@@ -14,3 +14,11 @@ fi
 ln -sfn "$REPO_HOME/tool/executor" "$REPO_HOME/tool/bin"
 
 echo "All installations complete. Java and ANTLR have been installed successfully."
+
+# https://gradle.org/install/
+# export PATH=$PATH:../gradle-8.10/bin
+#
+# gradle download: https://services.gradle.org/distributions/ -> tool/upstream
+# cd tool
+# unzip -d . upstream/gradle-8.10-rc-1-all.zip 
+# export PATH=$PATH:../gradle-8.10/bin -> env_dev
diff --git a/ologist/directory_structure.md b/ologist/directory_structure.md
index 8755bcb..36d4e9f 100644
--- a/ologist/directory_structure.md
+++ b/ologist/directory_structure.md
@@ -100,6 +100,60 @@ coordinating with other team members who want hidden files. Hence, a general
 solution that solves all these issues is to alias `ls` to `ls -a`, which is done
 in the environment initialization file for the project.
 
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+Each project has a virtual environment.  So, for the GQL project, gradle is
+installed under .../GQL_to_Cypher/tools.  `gradle` is found under
+`..GQL_to_Cypher/tool/gradle-8.10-rc-1/bin/` and the `env_dev` script sets the
+paths to make it accessible (analogous to Python virtual environment
+`activate`).
+
+`.git` is under the `.../GQL_to_Cypher` directory, so the 'project' directory is
+`.../GQL_to_Cypher`.
+
+All development is done under `.../GQL_to_Cypher/developer` directory.  There
+are no files under that directory, instead all files go into subdirectories.
+The current (being replaced) makefile is under
+`.../GQL_to_Cypher/devloper/executor` There is a bash script that is found first
+in the path that wraps the call to `make` and provides customizing options.
+
+Where does the `settings.gradle` file go?  Where does the `build.gradle` file
+go?  Perhaps `gradle` will also need a script that provides options to wrap the
+`gradle` call?
+
+-->
+
+GQL_to_Cypher/
+├── settings.gradle
+├── build.gradle
+├── developer/
+│   ├── executor/
+│   │   ├── build.gradle
+│   │   └── other-subdirectories/
+│   └── other-subdirectories/
+├── tools/
+│   └── gradle-8.10-rc-1/
+│       └── bin/
+└── other-directories/
+
+
+--->
+
+gradle-wrapper.sh
+
+#!/usr/bin/env bash
+
+# Source the environment setup script
+source .../GQL_to_Cypher/tools/env_dev  # this should probably be env_build
+
+# Call gradle with any additional options
+.../GQL_to_Cypher/tools/gradle-8.10-rc-1/bin/gradle "$@"
+
+./gradle-wrapper.sh build
+
+
 
 <!--  LocalWords:  lector
  -->
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..bd233ed
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,3 @@
+
+rootProject.name = 'GQL_to_Cypher'
+
-- 
2.20.1