Initial soh_ap transpiler

README.md

@@ -25,7 +25,7 @@ RandoLogicScript -t soh -o out/soh/ src/
 Multiple transpilers can be specified, each with their own output directory:
 
 ```
-RandoLogicScript -t soh -o out/soh/ -t ap -o out/ap/ src/ extra.rls
+RandoLogicScript -t soh -o out/soh/ -t soh_ap -o out/ap/ src/ extra.rls
 ```
 
 Input paths can be individual `.rls` files or directories (which are recursively scanned for `.rls` files).
@@ -35,7 +35,7 @@ Input paths can be individual `.rls` files or directories (which are recursively
 | Name         | Target                 |
 | ------------ | ---------------------- |
 | `soh`        | C++ for Shipwright     |
-| `ap`         | Python for Archipelago |
+| `soh_ap`     | Python for Archipelago |
 
 ## Docs
 

console/CMakeLists.txt

@@ -2,14 +2,14 @@ add_executable(RandoLogicScript
     main.cpp
 )
 
-target_link_libraries(RandoLogicScript PRIVATE ast parser sema soh ap)
+target_link_libraries(RandoLogicScript PRIVATE ast parser sema soh soh_ap)
 
 if(BUILD_TESTING)
     rls_add_gtest(console_acceptance_tests
         tests/acceptance_soh_tests.cpp
         tests/acceptance_ap_tests.cpp
     )
-    target_link_libraries(console_acceptance_tests PRIVATE ast parser sema soh ap)
+    target_link_libraries(console_acceptance_tests PRIVATE ast parser sema soh soh_ap)
     target_compile_definitions(console_acceptance_tests PRIVATE
         RLS_REPO_ROOT="${CMAKE_SOURCE_DIR}"
     )

console/main.cpp

@@ -9,7 +9,7 @@
 #include "output.h"
 #include "parser.h"
 #include "sema.h"
-#include "ap.h"
+#include "soh_ap.h"
 #include "soh.h"
 
 namespace fs = std::filesystem;
@@ -24,7 +24,7 @@ static void printUsage(const char* program) {
         << "Options:\n"
         << "  -t, --transpiler <name> -o, --output <dir>\n"
         << "                            Transpiler and output directory pair (may be repeated).\n"
-        << "                            Available transpilers: soh, ap\n"
+        << "                            Available transpilers: soh, soh_ap\n"
         << "  -h, --help                Show this help message.\n";
 }
 
@@ -74,7 +74,7 @@ struct TranspilerConfig {
 };
 
 static bool runTranspiler(const TranspilerConfig& config, const rls::ast::Project& project) {
-    if (config.name != "soh" && config.name != "ap") {
+    if (config.name != "soh" && config.name != "soh_ap") {
         std::cerr << "error: unknown transpiler '" << config.name << "'\n";
         return false;
     }
@@ -93,8 +93,26 @@ static bool runTranspiler(const TranspilerConfig& config, const rls::ast::Projec
             std::cerr << "aborting due to SoH transpiler errors\n";
             return false;
         }
+    } else if (config.name == "soh_ap") {
+        rls::transpilers::soh_ap::SohApTranspiler transpiler(project);
+        transpiler.Transpile(writer);
+
+        // Surface constructs the RuleBuilder target cannot represent (negating a rule,
+        // a rule-conditioned ternary with no known complement, a runtime value combined
+        // with a rule). Abort rather than ship Python that raises at world-load.
+        bool hasErrors = false;
+        for (const auto& d : transpiler.Diagnostics()) {
+            printDiagnostic(d);
+            if (d.level == rls::ast::DiagnosticLevel::Error)
+                hasErrors = true;
+        }
+        if (hasErrors) {
+            std::cerr << "aborting: '" << config.name << "' could not represent some rules\n";
+            return false;
+        }
     } else {
-        rls::transpilers::ap::Transpile(project, writer);
+        std::cerr << "error: unknown transpiler '" << config.name << "'\n";
+        return false;
     }
 
     return true;

console/tests/acceptance_ap_tests.cpp

@@ -7,14 +7,14 @@ TEST(AcceptanceAp, ExamplesRlsMatchesGolden) {
 	const auto project = parseAndAnalyzeProject(repoPath("examples/rls"), errors);
 	ASSERT_TRUE(errors.empty()) << joinLines(errors);
 
-	TempDirectory outputDir("ap");
+	TempDirectory outputDir("soh_ap");
 	{
 		DirectoryWriter writer(outputDir.path());
-		rls::transpilers::ap::Transpile(project, writer);
+		rls::transpilers::soh_ap::SohApTranspiler(project).Transpile(writer);
 	}
 
 	expectDirectoryMatchesGolden(
 		outputDir.path(),
-		repoPath("examples/ap"),
-		R"(.\build\console\RandoLogicScript.exe -t ap -o .\examples\ap .\examples\rls)");
+		repoPath("examples/soh_ap"),
+		R"(.\build\console\RandoLogicScript.exe -t soh_ap -o .\examples\soh_ap .\examples\rls)");
 }

console/tests/acceptance_helpers.h

@@ -12,7 +12,7 @@
 #include <system_error>
 #include <vector>
 
-#include "ap.h"
+#include "soh_ap.h"
 #include "ast.h"
 #include "output.h"
 #include "parser.h"