use std submodule

Author: MESYETI

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "std"]
+	path = std
+	url = https://github.com/callisto-lang/std

README.md

@@ -8,6 +8,10 @@ dub build
 ```
 
 ## Try it
+Note: to use the example programs, you will need the `std` submodule in this repository,
+which you can get by cloning recursively or
+doing `git submodule update --init --remote --recursive`
+
 Currently whatever is being tested is in
 test.cal, compile it with these commands:
 ```

cores/rm86.cal

@@ -67,6 +67,16 @@ class Lexer {
 		}
 	}
 
+	void HandleColLine() {
+		if (code[i] == '\n') {
+			++ line;
+			col = 0;
+		}
+		else {
+			++ col;
+		}
+	}
+
 	void Lex() {
 		char[char] escapes = [
 			'n': '\n',
@@ -76,19 +86,13 @@ class Lexer {
 		];
 
 		for (i = 0; i < code.length; ++ i) {
-			if (code[i] == '\n') {
-				++ line;
-				col = 0;
-			}
-			else {
-				++ col;
-			}
-
 			if (inString) {
 				switch (code[i]) {
 					case '\\': {
 						++ i;
 
+						HandleColLine();
+
 						if (i >= code.length) {
 							Error("Unexpected EOF");
 						}
@@ -128,6 +132,8 @@ class Lexer {
 					}
 				}
 			}
+
+			HandleColLine();
 		}
 	}
 }