feat: allow addition of char types

nawetimebomb · Oct 8, 2024 · 61e3351 · 61e3351
1 parent 6390167
commit 61e3351
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/compiler/frontend.go b/compiler/frontend.go
@@ -593,10 +593,6 @@ func parseToken(token Token) {
 			code.value = v.value
 			emit(code)
 		}
-	case TOKEN_VAR:
-		newVar, newOffset := newVariable(token, frontend.current.localMemorySize)
-		frontend.current.variables = append(frontend.current.variables, newVar)
-		frontend.current.localMemorySize = newOffset
 
 	// TYPE CASTING
 	case TOKEN_DTYPE_BOOL:
@@ -619,6 +615,10 @@ func parseToken(token Token) {
 	// Definition
 	case TOKEN_CONST:
 		registerConstant(token)
+	case TOKEN_VAR:
+		newVar, newOffset := newVariable(token, frontend.current.localMemorySize)
+		frontend.current.variables = append(frontend.current.variables, newVar)
+		frontend.current.localMemorySize = newOffset
 
 	// Intrinsics
 	case TOKEN_ARGC:

diff --git a/compiler/validate.go b/compiler/validate.go
@@ -307,6 +307,8 @@ func ValidateRun() {
 				assertArgumentType(dtArray(a, b), dtArray(DATA_ANY, DATA_INT), code, loc)
 				if a == DATA_INT && b == DATA_INT {
 					tc.push(DATA_INT)
+				} else if a == DATA_CHAR || b == DATA_CHAR {
+					tc.push(DATA_CHAR)
 				} else {
 					tc.push(DATA_PTR)
 				}

diff --git a/libs/strings.sk b/libs/strings.sk
@@ -70,17 +70,17 @@ fn itoa (int ptr)
   const BUFFER_CAP 20
   var buffer ptr &buffer !
   var number int &number !
-  "00000000000000000000" buffer !
+  "--------------------" buffer !
   buffer @ ptr &buffer !
   48 buffer !
 
   number 0 != if
   	0 BUFFER_CAP <= until
-  	  0 buffer I + c!
+      0 buffer I + c!
   	I -- loop
 
     0 number len 1 - <= until
-      '0' number 10 % + char buffer I + c!
+      '0' number 10 % + buffer I + c!
       number 10 / &number !
     I -- loop
   fi