From 866f553346eb6d6ea0b52f1c7216702c4467f2c8 Mon Sep 17 00:00:00 2001
From: n loewen <nick@nloewen.com>
Date: Tue, 29 Aug 2023 21:26:36 -0400
Subject: [PATCH] assembler - Add feature: Allow binary numbers with prefix
 '0b' and hex numbers with prefix '0x'

---
 src/assembler.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assembler.js b/src/assembler.js
index 1ec4981..484546d 100755
--- a/src/assembler.js
+++ b/src/assembler.js
@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 const { logMemory } = require('./logging.js');
-const { num2hex } = require('./conversions.js');
+const { num2hex, hex2num, bin2num } = require('./conversions.js');
 const DBG = require('./dbg.js');
 
 const CFG = require('./machine.config.js');
@@ -111,6 +111,8 @@ function preparseSourceCode(source) {
  **/
 function decodeNumericOp(arg) {
   if (arg.startsWith("$")) return hex2num(arg.replace("$", ""));
+  if (arg.startsWith("0x")) return hex2num(arg.replace("0x", ""));
+  if (arg.startsWith("0b")) return bin2num(arg.replace("0b", ""));
   return parseInt(arg);
 }
 
@@ -399,8 +401,6 @@ function stripWhitespaceFromEnds(line) {
   return line;
 }
 
-function hex2num(hex) { return parseInt(hex, 16) };
-
 
 /** MAIN **/