concise wordwrap

5 files changed, 9 insertions, 10 deletions

diff --git a/source/core.cpp b/source/core.cpp
index cc7c267..5842ad8 100644
--- a/source/core.cpp
+++ b/source/core.cpp
@@ -30,7 +30,7 @@ void jump(FuncList ip)
 // LITERAL's run-time semantics: push the given value onto the stack.
 static auto literall = WordWrap<[] {
     push((Cell)*++IP);
-}>();
+}>;
 
 void compileliteral()
 {
diff --git a/source/core.hpp b/source/core.hpp
index 4e4c1e6..8b220e4 100644
--- a/source/core.hpp
+++ b/source/core.hpp
@@ -33,7 +33,7 @@ constexpr auto fexit = WordWrap<[] {
     extern FuncList IP;
     extern Cell rpop();
     IP = reinterpret_cast<FuncList>(rpop());
-}>();
+}>;
 
 void jump(FuncList ip); /** Jumps to the given instruction pointer. */
 void compileliteral();  /** Compiles LITERAL into the current definition. */
diff --git a/source/state.cpp b/source/state.cpp
index 5daa772..03ad95d 100644
--- a/source/state.cpp
+++ b/source/state.cpp
@@ -24,6 +24,7 @@
 FuncList IP = nullptr;
 std::array<Cell, DictSize> DICT;
 
+Cell& BASE   = DICT[DIdxBase];
 Cell& HERE   = DICT[DIdxHere];
 Cell& LATEST = DICT[DIdxLatest];
 Cell& STATE  = DICT[DIdxState];
diff --git a/source/state.hpp b/source/state.hpp
index 8bdc5dc..b6e5bcf 100644
--- a/source/state.hpp
+++ b/source/state.hpp
@@ -22,7 +22,7 @@
 
 constexpr Addr DS = 16; /** Data stack size */
 constexpr Addr RS = 16; /** Return stack size */
-constexpr auto DictSize = 4096u; /** Dictionary size */
+constexpr auto DictSize = 2048u; /** Dictionary size */
 
 constexpr Addr DIdxBase   = 0;
 constexpr Addr DIdxHere   = 1;
@@ -39,6 +39,7 @@ constexpr Addr DIdxBegin  = DIdxInBuf + 80 * sizeof(char);
  */
 extern std::array<Cell, DictSize> DICT;
 
+extern Cell& BASE;
 extern Cell& HERE;   /** Linked to HERE's storage in DICT. */
 extern Cell& LATEST; /** Linked to LATEST's storage in DICT. */
 extern Cell& STATE;  /** Linked to STATE's storage in DICT. */
diff --git a/source/types.hpp b/source/types.hpp
index fd0b81e..9627a47 100644
--- a/source/types.hpp
+++ b/source/types.hpp
@@ -100,13 +100,10 @@ struct WordSet
  * and used for a word's definition.
  */
 template<auto... funcs>
-auto WordWrap = [] {
-    constexpr static Func list[1] = {
-        +[] { (funcs(), ...); }
-    };
-
-    return list;
-};
+constexpr auto WordWrap = []() noexcept {
+    constexpr static auto wrapper = +[] { (funcs(), ...); };
+    return &wrapper;
+}();
 
 enum class Error : int {
     none = 1,