u. um*

3 files changed, 12 insertions, 3 deletions

diff --git a/libalee/corewords.cpp b/libalee/corewords.cpp
index f22772c..136619c 100644
--- a/libalee/corewords.cpp
+++ b/libalee/corewords.cpp
@@ -222,6 +222,14 @@ execute:
         find(state, word);
         }
         break;
+    case 34: // um*
+        cell = state.pop();
+        dcell = static_cast<DoubleCell>(
+            static_cast<Addr>(state.pop()) *
+            static_cast<Addr>(cell));
+        state.push(dcell);
+        state.push(dcell >> (sizeof(Cell) * 8));
+        break;
     default:
         state.push(index - WordCount);
         break;
diff --git a/libalee/corewords.hpp b/libalee/corewords.hpp
index 684b94b..c08c4cd 100644
--- a/libalee/corewords.hpp
+++ b/libalee/corewords.hpp
@@ -31,7 +31,7 @@ void user_sys(State&);
 class CoreWords
 {
 public:
-    constexpr static std::size_t WordCount = 34;
+    constexpr static std::size_t WordCount = 35;
     constexpr static int Semicolon = 26;
 
     /**
@@ -53,7 +53,8 @@ public:
         "<\0&\0|\0^\0"
         "<<\0>>\0:\0_'\0execute\0"
         "exit\0;\0_jmp0\0_jmp\0"
-        "depth\0_rdepth\0_in\0_ev\0find\0";
+        "depth\0_rdepth\0_in\0_ev\0find\0"
+        "um*\0";
 };
 
 #endif // ALEEFORTH_COREWORDS_HPP
diff --git a/libalee/parser.cpp b/libalee/parser.cpp
index 9981b3e..464bc2f 100644
--- a/libalee/parser.cpp
+++ b/libalee/parser.cpp
@@ -95,7 +95,7 @@ Error Parser::parseNumber(State& state, Word word)
             result += c - '0';
         } else if (isalpha(c) && base > 10) {
             result *= base;
-            result += 10 + (c > 'a' ? c - 'a' : c - 'A');
+            result += 10 + c - (isupper(c) ? 'A' : 'a');
         } else {
             return Error::noword;
         }