Swap store/restore syntax to align for Forth, Porth

lib/std.msh

@@ -2,13 +2,13 @@
 
 # each (list quote --)
 def each 
-    over len @each-len # Get total length
-    0 @each-idx # index
+    over len each-len! # Get total length
+    0 each-idx! # index
     (
-        [(each-idx! each-len! >=) (break)] if
-        over each-idx! nth # Get current item
+        [(@each-idx @each-len >=) (break)] if
+        over @each-idx nth # Get current item
         over x # Copy over quote, execute
-        each-idx! 1 + @each-idx # inc index
+        @each-idx 1 + each-idx! # inc index
     ) loop
 
     # Drop list and quote, total length, index
@@ -17,21 +17,21 @@ end
 
 # map (list quote -- list)
 def map 
-    over len @map-len # Get total length
-    0 @map-idx # Index
-    [] @map-accum # Accumulator
+    over len map-len! # Get total length
+    0 map-idx! # Index
+    [] map-accum! # Accumulator
     (
-        [(map-idx! map-len! >=) (break)] if
-        over map-idx! nth # Get current item
+        [(@map-idx @map-len >=) (break)] if
+        over @map-idx nth # Get current item
         over x # Copy over quote, execute
 
         # list quote new-item
-        map-accum! append drop # Append to accumulator
-        map-idx! 1 + @map-idx # inc index
+        @map-accum append drop # Append to accumulator
+        @map-idx 1 + map-idx! # inc index
     ) loop
 
     # Drop list and quote, push accumulator
-    drop drop map-accum!
+    drop drop @map-accum
 end
 
 

mshell-go/Evaluator.go

@@ -876,13 +876,14 @@ MainLoop:
 				}
 			} else if t.Type == VARSTORE {
 				obj, err := stack.Pop()
+                varName := t.Lexeme[0:len(t.Lexeme)-1] // Remove the trailing !
 				if err != nil {
-					return FailWithMessage(fmt.Sprintf("%d:%d: Nothing on stack to store into variable %s.\n", t.Line, t.Column, t.Lexeme[1:]))
+					return FailWithMessage(fmt.Sprintf("%d:%d: Nothing on stack to store into variable %s.\n", t.Line, t.Column, varName))
 				}
 
-				state.Variables[t.Lexeme[1:]] = obj
+				state.Variables[varName] = obj
 			} else if t.Type == VARRETRIEVE {
-				name := t.Lexeme[:len(t.Lexeme)-1]
+				name := t.Lexeme[1:] // Remove the leading @
 				obj, found_mshell_variable := state.Variables[name]
 				if found_mshell_variable {
 					stack.Push(obj)

mshell-go/Lexer.go

@@ -534,10 +534,10 @@ func (l *Lexer) parseLiteralOrNumber() Token {
 		return l.makeToken(FALSE)
 	default:
 		if strings.HasSuffix(literal, "!") {
-			return l.makeToken(VARRETRIEVE)
+			return l.makeToken(VARSTORE)
 		}
 		if strings.HasPrefix(literal, "@") {
-			return l.makeToken(VARSTORE)
+			return l.makeToken(VARRETRIEVE)
 		}
 		if _, err := strconv.Atoi(literal); err == nil {
 			return l.makeToken(INTEGER)

mshell/tests/env_test.msh

@@ -1,2 +1,2 @@
-"Hello, World!" @MSHELL_VAR MSHELL_VAR export
+"Hello, World!" MSHELL_VAR! MSHELL_VAR export
 [./env_test.sh];

mshell/tests/or_equal_to_comparers.msh

@@ -1,15 +1,15 @@
 0
 (
     [(dup 10 >=) (break)] if
-    dup @a
-    [echo a!];
+    dup a!
+    [echo @a];
     1 +
 ) loop
 
 [echo "Now go backwards"];
 (
     [(dup 0 <=) (break)] if
-    dup @a
-    [echo a!];
+    dup a!
+    [echo @a];
     1 -
 ) loop

mshell/tests/tilde.msh

@@ -1,2 +1,2 @@
-"/home/myuser" @HOME HOME export
+"/home/myuser" HOME! HOME export
 [echo ~/repos/];

mshell/tests/variables.msh

@@ -1,2 +1,2 @@
-10 @a
-[echo a!];
+10 a!
+[echo @a];

mshell/tests/while_read.msh

@@ -1,5 +1,5 @@
 1
 (
     read  [(not) (break)] if
-    @linetext @num "Line " num! str ": " + + linetext! + [echo] append ; num! 1 +
+    linetext! num! "Line " @num str ": " + + @linetext + [echo] append ; @num 1 +
 ) "stdin_for_test.txt" < loop