Decompile primary and secondary command infra

grunt-lucas · Sep 1, 2023 · be5fb62 · be5fb62
1 parent 407d6b8
commit be5fb62
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/include/types.h b/include/types.h
@@ -605,7 +605,7 @@ namespace porytiles {
 
 enum class TilesOutputPalette { TRUE_COLOR, GREYSCALE };
 
-enum class Subcommand { DECOMPILE, COMPILE_PRIMARY, COMPILE_SECONDARY };
+enum class Subcommand { DECOMPILE_PRIMARY, DECOMPILE_SECONDARY, COMPILE_PRIMARY, COMPILE_SECONDARY };
 
 enum class CompilerMode { PRIMARY, SECONDARY };
 

diff --git a/src/cli_parser.cpp b/src/cli_parser.cpp
@@ -29,7 +29,10 @@ void parseOptions(PtContext &ctx, int argc, char *const *argv)
   parseSubcommand(ctx, argc, argv);
 
   switch (ctx.subcommand) {
-  case Subcommand::DECOMPILE:
+  case Subcommand::DECOMPILE_PRIMARY:
+    throw std::runtime_error{"TODO : support decompile command"};
+    break;
+  case Subcommand::DECOMPILE_SECONDARY:
     throw std::runtime_error{"TODO : support decompile command"};
     break;
   case Subcommand::COMPILE_PRIMARY:
@@ -177,7 +180,10 @@ HELP_DESC + "\n" +
 VERBOSE_DESC + "\n" +
 VERSION_DESC + "\n"
 "COMMANDS\n"
-"    decompile\n"
+"    decompile-primary\n"
+"        Under construction.\n"
+"\n"
+"    decompile-secondary\n"
 "        Under construction.\n"
 "\n"
 "    compile-primary\n"
@@ -240,7 +246,8 @@ static void parseGlobalOptions(PtContext &ctx, int argc, char *const *argv)
 // |    SUBCOMMAND PARSING    |
 // ----------------------------
 
-const std::string DECOMPILE_COMMAND = "decompile";
+const std::string DECOMPILE_PRIMARY_COMMAND = "decompile-primary";
+const std::string DECOMPILE_SECONDARY_COMMAND = "decompile-secondary";
 const std::string COMPILE_PRIMARY_COMMAND = "compile-primary";
 const std::string COMPILE_SECONDARY_COMMAND = "compile-secondary";
 static void parseSubcommand(PtContext &ctx, int argc, char *const *argv)
@@ -250,8 +257,11 @@ static void parseSubcommand(PtContext &ctx, int argc, char *const *argv)
   }
 
   std::string subcommand = argv[optind++];
-  if (subcommand == DECOMPILE_COMMAND) {
-    ctx.subcommand = Subcommand::DECOMPILE;
+  if (subcommand == DECOMPILE_PRIMARY_COMMAND) {
+    ctx.subcommand = Subcommand::DECOMPILE_PRIMARY;
+  }
+  else if (subcommand == DECOMPILE_SECONDARY_COMMAND) {
+    ctx.subcommand = Subcommand::DECOMPILE_SECONDARY;
   }
   else if (subcommand == COMPILE_PRIMARY_COMMAND) {
     ctx.subcommand = Subcommand::COMPILE_PRIMARY;

diff --git a/src/driver.cpp b/src/driver.cpp
@@ -426,7 +426,8 @@ static void driveCompile(PtContext &ctx)
 void drive(PtContext &ctx)
 {
   switch (ctx.subcommand) {
-  case Subcommand::DECOMPILE:
+  case Subcommand::DECOMPILE_PRIMARY:
+  case Subcommand::DECOMPILE_SECONDARY:
     driveDecompile(ctx);
     break;
   case Subcommand::COMPILE_PRIMARY: