Lipsticks

Signed-off-by: yamacir-kit <[email protected]>
yamacir-kit · Jun 11, 2022 · 62ab16c · 62ab16c
1 parent 01efeb0
commit 62ab16c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -103,9 +103,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name        | Description
 |:-------------------|:--
-| `all` (default)    | Build shared-library `libmeevax.0.4.57.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.4.58.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.4.57_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.4.58_amd64.deb`.
 | `install`          | Copy files into `/usr/local` __(1)__.
 | `install.deb`      | `all` + `package` + `sudo apt install <meevax>.deb`
 | `safe-install.deb` | `all` + `test` + `package` + `sudo apt install <meevax>.deb`
@@ -120,7 +120,7 @@ __(1)__ Meevax installed by `make install` cannot be uninstalled by the system's
 ## Usage
 
 ```
-Meevax Lisp System, version 0.4.57
+Meevax Lisp System, version 0.4.58
 
 Usage: meevax [OPTION...] [FILE...]
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.57
+0.4.58
diff --git a/include/meevax/kernel/configurator.hpp b/include/meevax/kernel/configurator.hpp
@@ -49,7 +49,7 @@ inline namespace kernel
   public:
     static inline auto batch       = false;
     static inline auto debug       = false;
-    static inline auto interactive = false;
+    static inline auto interactive = true;
     static inline auto trace       = false;
     static inline auto verbose     = false;
 
@@ -198,11 +198,7 @@ inline namespace kernel
     {
       static std::regex const pattern { R"(--(\w[-\w]+)(=(.*))?|-([\w]+))" };
 
-      if (std::empty(args))
-      {
-        interactive = true;
-      }
-      else for (auto current_option = std::begin(args); current_option != std::end(args); ++current_option) [&]()
+      for (auto current_option = std::begin(args); current_option != std::end(args); ++current_option) [&]()
       {
         std::smatch analysis {};
 
@@ -214,7 +210,7 @@ inline namespace kernel
         // std::cout << header("")          << "analysis[3] = " << analysis[3] << std::endl;
         // std::cout << header("")          << "analysis[4] = " << analysis[4] << std::endl;
 
-        if (auto const current_short_options = analysis.str(4); not current_short_options.empty())
+        if (auto const& current_short_options = analysis.str(4); not current_short_options.empty())
         {
           for (auto current_short_option = std::cbegin(current_short_options); current_short_option != std::cend(current_short_options); ++current_short_option)
           {
@@ -239,7 +235,8 @@ inline namespace kernel
             }
             else
             {
-              throw error(make<string>(cat, "unknown short-option -", *current_short_option));
+              throw error(make<string>("unknown short-option"),
+                          make<symbol>(*current_short_option));
             }
           }
         }
@@ -266,11 +263,13 @@ inline namespace kernel
           }
           else
           {
-            throw error(make<string>(cat, "unknown long-option: ", *current_option));
+            throw error(make<string>("unknown long-option"),
+                        make<symbol>(*current_option));
           }
         }
         else
         {
+          interactive = false;
           return load(*current_option);
         }
 

diff --git a/src/kernel/environment.cpp b/src/kernel/environment.cpp
@@ -90,11 +90,6 @@ inline namespace kernel
       define(binding.as<absolute>().symbol(),
              binding.as<absolute>().load());
     }
-
-    if (interactive)
-    {
-      print(faint("; ", length(bindings), " identifiers imported."));
-    }
   }
 
   auto environment::define(const_reference name, const_reference value) -> void