merge

Author: MESYETI

examples/arrays.cal

@@ -3,10 +3,10 @@ include "std/io.cal"
 include "std/array.cal"
 
 let Array myArray
-[u16 1 2 3 4 5] myArray a<
+[u16 1 2 3 4 5] &myArray a<
 
-0 myArray a@ printdec 10 printch
-1 myArray a@ printdec 10 printch
+0 &myArray a@ printdec 10 printch
+1 &myArray a@ printdec 10 printch
 
-100 2 myArray a!
-2 myArray a@ printdec 10 printch
+100 2 &myArray a!
+2 &myArray a@ printdec 10 printch

examples/compare_strings.cal

@@ -10,10 +10,10 @@ let Array str2
 
 &str1 &str2 a= printdec new_line
 
-"Hi" str2 a<
+"Hi" &str2 a<
 &str1 &str2 a= printdec new_line
 
-"Greetings" str1 a<
+"Greetings" &str1 a<
 &str1 &str2 a= printdec new_line
 
 &str1 "Greetings" a= printdec new_line

examples/literals.cal

@@ -1,10 +1,6 @@
 include "cores/select.cal"
 include "std/io.cal"
 
-func new_line begin
-	13 printch 10 printch
-end
-
 # Hexadecimal - prints 16
 0x10 printdec new_line
 

examples/variables.cal

@@ -5,7 +5,7 @@ let cell myGlobal
 func myFunc begin
 	let cell myVar
 	'A' -> myVar
-	myVa printch
+	myVar printch
 end
 
 myFunc

examples/version.cal

@@ -1,22 +1,30 @@
 include "cores/select.cal"
 include "std/io.cal"
 
-# will execute on RM86 backend
+# Print a different message for each core
+
 version RM86
 	"Hello, RM86!\n" printstr
 end
 
-# will execute on Linux86 backend
-version Linux86
-	"Hello, Linux86!\n" printstr
+version x86_64
+	"Hello, x86_64!\n" printstr
+end
+
+version arm64
+	"Hello, arm64!\n" printstr
+end
+
+version UXN
+	"Hello, Uxn!\n" printstr
 end
 
-# won't execute unless you set the Foo version
+# Specify arbitrary versions to use them as compile-time flags
 version Foo
-	"Hello, Foo!\n" printstr
+	"Foo is enabled :D\n" printstr
 end
 
-# will execute because Foo isn't set
+# This one will run by default unless you set Foo
 version not Foo
-	"Hello, not Foo!\n" printstr
+	"Foo is not enabled :(\n" printstr
 end

examples/writeFile.cal

@@ -10,7 +10,7 @@ if &file @ -2 = then
 end
 
 let Array str
-"meow\n" str a<
+"meow\n" &str a<
 
 &file
 &str Array.elements + @

source/app.d

@@ -13,6 +13,7 @@ import callisto.preprocessor;
 import callisto.backends.lua;
 import callisto.backends.uxn;
 import callisto.backends.rm86;
+import callisto.backends.arm64;
 import callisto.backends.x86_64;
 
 const static string usage = "
@@ -45,6 +46,7 @@ Flags:
 Backends and their operating systems:
 	rm86   - Real mode x86, for bare-metal, dos
 	x86_64 - 64-bit x86, for bare-metal, linux
+	arm64  - 64-bit ARM, for linux
 	uxn    - Varvara/Uxn
 	lua    - Lua, uses subset CallistoScript
 
@@ -162,6 +164,10 @@ int main(string[] args) {
 							backend = new BackendX86_64();
 							break;
 						}
+						case "arm64": {
+							backend = new BackendARM64();
+							break;
+						}
 						case "uxn": {
 							backend = new BackendUXN();
 							break;