Menus work for the basics

wwivbbs · Nov 10, 2020 · 40ce3a3 · 40ce3a3
1 parent 0c60f29
commit 40ce3a3
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 1,467 deletions.
diff --git a/bbs/CMakeLists.txt b/bbs/CMakeLists.txt
@@ -49,7 +49,6 @@ set(COMMON_SOURCES
  lpfunc.cpp
  oldmenu.cpp
  menuinterpretcommand.cpp
- menu_parser.cpp
  menuspec.cpp
  menusupp.cpp
  misccmd.cpp

diff --git a/bbs/application.cpp b/bbs/application.cpp
@@ -827,7 +827,7 @@ int Application::Run(int argc, char* argv[]) {
   }
   const auto menu_commands = cmdline.arg("menu_commands");
   if (!menu_commands.is_default()) {
-    wwiv::menus::PrintMenuCommands(menu_commands.as_string());
+    wwiv::bbs::menus::PrintMenuCommands(menu_commands.as_string());
     return 0;
   }
 

diff --git a/bbs/basic/wwiv.cpp b/bbs/basic/wwiv.cpp
@@ -19,7 +19,7 @@
 
 #include "bbs/basic/util.h"
 #include "bbs/interpret.h"
-#include "bbs/oldmenu.h"
+#include "bbs/menus/menucommands.h"
 #include "bbs/acs.h"
 #include "core/version.h"
 #include "deps/my_basic/core/my_basic.h"
@@ -47,14 +47,20 @@ bool RegisterNamespaceWWIV(mb_interpreter_t* basi) {
 
   mb_register_func(basi, "COMMAND", [](struct mb_interpreter_t* bas, void** l) -> int {
     mb_check(mb_attempt_open_bracket(bas, l));
-    char* arg = nullptr;
+    auto cmd = wwiv_mb_pop_string(bas, l);
+    if (!cmd) {
+      // command missing
+      return MB_FUNC_ERR;
+    }
+    std::string data;
     if (mb_has_arg(bas, l)) {
-      mb_check(mb_pop_string(bas, l, &arg));
+      if (const auto o =  wwiv_mb_pop_string(bas, l)) {
+        data = o.value();
+      }
     }
     mb_check(mb_attempt_close_bracket(bas, l));
-    if (arg) {
-      menus::InterpretCommand(nullptr, arg);
-    }
+
+    menus::InterpretCommand(nullptr, cmd.value(), data);
     return MB_FUNC_OK;
   });
 

diff --git a/bbs/menu_parser.cpp b/bbs/menu_parser.cpp
diff --git a/bbs/menu_parser.h b/bbs/menu_parser.h