Remove "to-lkt" option from interpreter

The interpreter should not do the job of the refactor tool. The "to-lkt"
option was removed and the tests that used it where updated accordingly.

Author: Killian Perlin

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/BaseLKQLChecker.java

@@ -130,8 +130,7 @@ protected LKQLOptions.Builder getBaseOptionsBuilder() {
             .projectFile(this.args.project)
             .rulesDir(this.args.rulesDirs)
             .ruleInstances(getRuleInstances())
-            .keepGoingOnMissingFile(this.args.keepGoingOnMissingFile)
-            .autoTranslateUnits(this.args.autoTranslateUnits);
+            .keepGoingOnMissingFile(this.args.keepGoingOnMissingFile);
     }
 
     /** Get the rule instances defined be the user through the LKQL checker command-line. */
@@ -188,12 +187,6 @@ public abstract static class Args implements Callable<Integer> {
         @CommandLine.Spec
         public picocli.CommandLine.Model.CommandSpec spec;
 
-        @CommandLine.Option(
-            names = { "--to-lkt" },
-            description = "List of units to auto translate to Lkt"
-        )
-        public List<String> autoTranslateUnits = new ArrayList<>();
-
         @CommandLine.Option(names = { "-v", "--verbose" }, description = "Enable the verbose mode")
         public boolean verbose;
 

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/LKQLLauncher.java

@@ -46,12 +46,6 @@ public static class LKQLRun implements Callable<Integer> {
         )
         public String charset = null;
 
-        @CommandLine.Option(
-            names = { "--to-lkt" },
-            description = "List of units to auto translate to Lkt"
-        )
-        public List<String> autoTranslateUnits = new ArrayList<>();
-
         @CommandLine.Option(names = { "-P", "--project" }, description = "Project file to use")
         public String project = null;
 
@@ -170,8 +164,7 @@ protected int executeScript(Context.Builder contextBuilder) {
             .runtime(this.args.RTS)
             .keepGoingOnMissingFile(this.args.keepGoingOnMissingFile)
             .files(this.args.files)
-            .charset(this.args.charset)
-            .autoTranslateUnits(this.args.autoTranslateUnits);
+            .charset(this.args.charset);
 
         // Finally, pass the options to the LKQL engine
         contextBuilder.option("lkql.options", optionsBuilder.build().toJson().toString());

lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLLanguage.java

@@ -19,7 +19,6 @@
 import com.adacore.lkql_jit.nodes.TopLevelList;
 import com.adacore.lkql_jit.nodes.root_nodes.TopLevelRootNode;
 import com.adacore.lkql_jit.options.LKQLOptions;
-import com.adacore.lkql_jit.options.Refactorings.LKQLToLkt;
 import com.adacore.lkql_jit.runtime.GlobalScope;
 import com.adacore.lkql_jit.runtime.values.LKQLNamespace;
 import com.adacore.lkql_jit.utils.Constants;
@@ -30,7 +29,6 @@
 import com.oracle.truffle.api.source.Source;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Scanner;
 import org.graalvm.options.OptionCategory;
 import org.graalvm.options.OptionDescriptors;
@@ -340,39 +338,9 @@ private LKQLNode translate(
     public LKQLNode translate(final Source source, String sourceName) {
         var firstLine = new Scanner(source.getReader()).nextLine();
         LangkitSupport.AnalysisContextInterface langkitCtx = null;
-        var baseName = source.getName().replaceFirst("[.][^.]+$", "");
         Source src;
 
-        if (getContext(null).getOptions().autoTranslateUnits().contains(baseName)) {
-            System.out.println("Translating " + source.getName() + " to lkt");
-            String newSrc = source.getCharacters().toString();
-            var lines = newSrc.split("\n");
-
-            if (firstLine.startsWith("# lkql version:")) {
-                if (firstLine.equals("# lkql version: 1")) {
-                    // Translate LKQL to Lkt (LKQL v2)
-                    newSrc = String.join("\n", Arrays.stream(lines).skip(1).toList());
-                } else {
-                    throw LKQLRuntimeException.fromMessage(
-                        "Invalid lkql version line for autoTranslateUnit unit"
-                    );
-                }
-            }
-
-            var lktSrc = LKQLToLkt.lkqlToLkt(sourceName, newSrc);
-
-            if (getContext(null).isVerbose()) {
-                System.out.println("Lkt source for " + sourceName);
-                System.out.println("=============================");
-                System.out.println(lktSrc);
-                System.out.println();
-            }
-
-            // Build a new source
-            src = Source.newBuilder(Constants.LKQL_ID, lktSrc, source.getName()).build();
-
-            langkitCtx = lktAnalysisContext;
-        } else if (firstLine.startsWith("# lkql version:")) {
+        if (firstLine.startsWith("# lkql version:")) {
             if (firstLine.equals("# lkql version: 1")) {
                 // lkql V1 uses lkql syntax
                 langkitCtx = lkqlAnalysisContext;

lkql_jit/options/src/main/java/com/adacore/lkql_jit/options/LKQLOptions.java

@@ -33,8 +33,7 @@ public record LKQLOptions(
     boolean keepGoingOnMissingFile,
     boolean showInstantiationChain,
     DiagnosticOutputMode diagnosticOutputMode,
-    AutoFixMode autoFixMode,
-    Set<String> autoTranslateUnits
+    AutoFixMode autoFixMode
 ) {
     // ----- Constructors -----
 
@@ -120,13 +119,7 @@ public static LKQLOptions fromJson(JSONObject jsonLKQLOptions) {
             jsonLKQLOptions.getBoolean("keepGoingOnMissingFile"),
             jsonLKQLOptions.getBoolean("showInstantiationChain"),
             DiagnosticOutputMode.valueOf(jsonLKQLOptions.getString("diagnosticOutputMode")),
-            AutoFixMode.valueOf(jsonLKQLOptions.getString("autoFixMode")),
-            jsonLKQLOptions
-                .getJSONArray("autoTranslateUnits")
-                .toList()
-                .stream()
-                .map(e -> (String) e)
-                .collect(Collectors.toSet())
+            AutoFixMode.valueOf(jsonLKQLOptions.getString("autoFixMode"))
         );
     }
 
@@ -164,8 +157,7 @@ public JSONObject toJson() {
             .put("keepGoingOnMissingFile", keepGoingOnMissingFile)
             .put("showInstantiationChain", showInstantiationChain)
             .put("diagnosticOutputMode", diagnosticOutputMode.toString())
-            .put("autoFixMode", autoFixMode.toString())
-            .put("autoTranslateUnits", new JSONArray(autoTranslateUnits));
+            .put("autoFixMode", autoFixMode.toString());
     }
 
     // ----- Inner classes -----
@@ -232,15 +224,9 @@ public static final class Builder {
         private boolean showInstantiationChain = false;
         private DiagnosticOutputMode diagnosticOutputMode = DiagnosticOutputMode.PRETTY;
         private AutoFixMode autoFixMode = AutoFixMode.DISPLAY;
-        private List<String> autoTranslateUnits = new ArrayList<>();
 
         // ----- Setters -----
 
-        public Builder autoTranslateUnits(List<String> autoTranslateUnits) {
-            this.autoTranslateUnits = autoTranslateUnits;
-            return this;
-        }
-
         public Builder engineMode(EngineMode em) {
             engineMode = em;
             return this;
@@ -363,8 +349,7 @@ public LKQLOptions build() {
                 keepGoingOnMissingFile,
                 showInstantiationChain,
                 diagnosticOutputMode,
-                autoFixMode,
-                new HashSet<>(autoTranslateUnits)
+                autoFixMode
             );
         }
     }

testsuite/drivers/interpreter_driver.py

@@ -16,6 +16,7 @@ class InterpreterDriver(BaseDriver):
         - input_sources: A list of Ada sources to run analyze with LKQL
         - lkql_path: A list of directories forwarded to the `LKQL_PATH`
             variable when the test is run.
+        - lkt_refactor: Should the test try refactor to Lkt syntax (default is False).
     """
 
     perf_supported = True
@@ -24,37 +25,51 @@ class InterpreterDriver(BaseDriver):
     def base_args(self):
         return self.lkql_exe
 
-    def run(self) -> None:
+    def build_args(self, script_path):
         # Build the process's arguments list
-        args = [*self.base_args(), "--script-path", "script.lkql"]
-
-        auto_rewrite_sources = self.test_env.get('to_lkt', None)
+        args = [*self.base_args(), '--script-path', script_path]
 
         input_sources = self.test_env.get('input_sources', None)
         project = self.test_env.get('project', None)
-        lkql_path = [
-            self.working_dir(d)
-            for d in self.test_env.get('lkql_path', [])
-        ]
 
         if project:
             args += ['-P', project]
 
         if input_sources:
             args += input_sources
 
-        # If auto_rewrite_sources are present, then we run the interpreter
-        # twice, once with rewrite, and once without, so that we can compare
-        # the results.
-        if auto_rewrite_sources:
-            self.output += "lkql to lkt\n"
-            self.output += "===========\n"
-            new_args = args + ["--to-lkt"] + auto_rewrite_sources
-            self.check_run(new_args)
+        return args
+
+
+    def run(self) -> None:
+
+        lkql_path = [
+            self.working_dir(d)
+            for d in self.test_env.get('lkql_path', [])
+        ]
+
+        # If lkt_refactor flag is set, then before we run the interpreter,
+        # we refactor the "script.lkql" file and run the interpreter on it.
+        # This way we can compare the results of the rewritten script
+        # with the original
+        if self.test_env.get('lkt_refactor', False):
+            self.output += 'lkql to lkt\n'
+            self.output += '===========\n'
+             
+            # Translate "script.lkql" to "refactored.lkt"
+            refactored_file_path = self.working_dir('refactored.lkql')
+            with open(refactored_file_path, 'w') as file:
+                file.write(self.shell(
+                    [*self.command_base, 'refactor', '-r', 'TO_LKQL_V2', 'script.lkql'],
+                    analyze_output=False
+                ).out)
+
+            # Run test on refactored script
+            self.check_run(self.build_args(refactored_file_path), lkql_path=os.pathsep.join(lkql_path))
 
-            self.output += "\n"
-            self.output += "lkql run\n"
-            self.output += "========\n"
+            self.output += '\n'
+            self.output += 'lkql run\n'
+            self.output += '========\n'
 
         # Run the interpreter
-        self.check_run(args, lkql_path=os.pathsep.join(lkql_path))
+        self.check_run(self.build_args('script.lkql'), lkql_path=os.pathsep.join(lkql_path))

testsuite/tests/interpreter/val_expr/test.out

@@ -1,6 +1,5 @@
 lkql to lkt
 ===========
-Translating script.lkql to lkt
 42
 
 lkql run

testsuite/tests/interpreter/val_expr/test.yaml

@@ -1,4 +1,3 @@
 driver: 'interpreter'
 project: 'default_project/default.gpr'
-to_lkt:
-  - script
+lkt_refactor: True