.

2 files changed, 3 insertions, 21 deletions

diff --git a/mu-init.subx b/mu-init.subx
index ddae2bae..26accb8a 100644
--- a/mu-init.subx
+++ b/mu-init.subx
@@ -15,16 +15,6 @@ Entry:
   #
 #?   (main 0 0 Primary-bus-secondary-drive)
   (set-cursor-position 0 0x30 2)
-  (test-tokenize-number)
-  (test-tokenize-negative-number)
-  (test-tokenize-quote)
-  (test-tokenize-backquote)
-  (test-tokenize-unquote)
-  (test-tokenize-unquote-splice)
-  (test-tokenize-dotted-list)
-  (test-tokenize-stream-literal)
-  (test-tokenize-stream-literal-in-tree)
-  (test-tokenize-indent)
   (test-infix)
 #?   # always first run tests
 #?   (run-tests)
diff --git a/shell/infix.mu b/shell/infix.mu
index a0e81ff2..e7982d0e 100644
--- a/shell/infix.mu
+++ b/shell/infix.mu
@@ -247,6 +247,8 @@ fn test-infix {
   check-infix "abc", "abc", "F - test-infix/regular-symbol"
   check-infix "-3", "-3", "F - test-infix/negative-integer-literal"
   check-infix "[a b+c]", "[a b+c]", "F - test-infix/string-literal"
+  check-infix "$", "$", "F - test-infix/dollar-sym"
+  check-infix "$$", "$$", "F - test-infix/dollar-sym-2"
   check-infix "$a", "$a", "F - test-infix/dollar-var"
   check-infix "$+", "$+", "F - test-infix/dollar-operator"
   check-infix "(+)", "+", "F - test-infix/operator-without-args"
@@ -316,19 +318,9 @@ fn operator-symbol? _x: (addr cell) -> _/eax: boolean {
   return result
 }
 
-fn non-operator-grapheme? g: grapheme -> _/eax: boolean {
-  var operator?/eax: boolean <- operator-grapheme? g
-  compare operator?, 0/false
-  {
-    break-if-=
-    return 0/false
-  }
-  return 1/true
-}
-
 # just a short list of operator graphemes for now
 fn operator-grapheme? g: grapheme -> _/eax: boolean {
-  # '$' is special and can be in either a symbol or operator
+  # '$' is special and can be in either a symbol or operator; here we treat it as a symbol
   compare g, 0x25/percent
   {
     break-if-!=