1 files changed, 18 insertions, 6 deletions
diff --git a/source/core.cpp b/source/core.cpp
index c97203e..0b520e8 100644
--- a/source/core.cpp
+++ b/source/core.cpp
@@ -19,6 +19,7 @@
 #include "state.hpp"
 
 #include <cctype>
+#include <cstring>
 
 void jump(FuncList ip)
 {
@@ -82,13 +83,12 @@ void align()
     HERE = aligned(HERE);
 }
 
-void word()
+static void word(int ch)
 {
-    // Skip leading whitespace.
     int k;
     do {
         k = key();
-    } while (isspace(k));
+    } while (k == ch);
 
     // Collect the word's text.
     char *ptr;
@@ -101,7 +101,7 @@ void word()
             break;
 
         k = key();
-    } while (!isspace(k));
+    } while (k != ch);
     addkey(k);
 
     // Add a null terminator.
@@ -110,12 +110,24 @@ void word()
     ++HERE;
 }
 
+void wordword()
+{
+    auto here = (char *)HERE;
+    ++HERE;
+
+    word(*SP);
+
+    here[0] = strlen(here + 1);
+    HERE = (Cell)here;
+    *SP = HERE;
+}
+
 void colon()
 {
     // Collect (and store) the word's name.
     align();
     auto name = HERE;
-    word();
+    word(' ');
     align();
 
     // Build the Word structure.
@@ -159,7 +171,7 @@ void tick()
 {
     // Get the name to look up.
     auto name = (char *)HERE;
-    word();
+    word(' ');
 
     // Look up the name and push the result.
     int len = HERE - (Cell)name - 1;