M lib/min_lang.nim → lib/min_lang.nim

@@ -163,6 +163,8 @@ var symbol: string
       if not q1.isQuotation:
         q1 = @[q1].newVal
       symbol = sym.getString
+      if not symbol.match "^[a-zA-Z0-9+._-][a-zA-Z0-9/!?+*._-]*$":
+        raiseInvalid("Symbol identifier '$1' contains invalid characters." % symbol)
       i.debug "[define] " & symbol & " = " & $q1
       #let p = proc(i: In) =
       #  i.push q1.qVal
@@ -745,5 +747,38 @@ i.push("load-symbol".newSym)
 
     .sigil("*") do (i: In):
       i.push("seal".newSym)
+
+    .symbol(":") do (i: In):
+      i.push("define".newSym)
+
+    .symbol("@") do (i: In):
+      i.push("bind".newSym)
+
+    .symbol("!") do (i: In):
+      i.push("system".newSym)
+
+    .symbol("&") do (i: In):
+      i.push("run".newSym)
+
+    .symbol("$") do (i: In):
+      i.push("getenv".newSym)
+
+    .symbol("^") do (i: In):
+      i.push("call".newSym)
+
+    .symbol("%") do (i: In):
+      i.push("interpolate".newSym)
+
+    .symbol("'") do (i: In):
+      i.push("quote".newSym)
+
+    .symbol("->") do (i: In):
+      i.push("unquote".newSym)
+
+    .symbol("=>") do (i: In):
+      i.push("scope".newSym)
+
+    .symbol("=~") do (i: In):
+      i.push("regex".newSym)
 
     .finalize()

M prelude.min → prelude.min

@@ -9,8 +9,6 @@ 'fs        import
 'crypto    import
 
 ; Aliases
-'define       ::
-'bind         :@
 'exit         :quit
 '==           :eq
 '!=           :noteq
@@ -19,24 +17,15 @@ '<            :lt
 '>=           :gte
 '<=           :lte
 'puts         :echo
-'system       :!
-'run          :&
-'getenv       :$
-'call         :^
-'interpolate  :%
 'pop          :zap
 'quote        :unit
-'quote        :'
 'unquote      :i
 'unquote      :apply
-'unquote      :->
-'scope        :=>
 'filter       :select
 'cons         :prepend
 'size         :length
-'regex        :=~
 
-(': '@ 'quit 'eq 'noteq 'gt 'lt 'gte 'lte 'echo '! '& '$ '^ '% 'zap 'unit '' 'i 'apply '-> '=> 'select 'prepend 'length '=~) 'seal foreach
+('quit 'eq 'noteq 'gt 'lt 'gte 'lte 'echo 'zap 'unit 'i 'apply 'select 'prepend 'length) 'seal foreach
 
 ; Mathematical Operators
 (1 +)           :succ