fixes

Author: MESYETI

source/app.d

@@ -47,6 +47,7 @@ Flags:
   -al         - Prints assembly line numbers for Callisto nodes
   -os OS      - Sets the operating system for the backend (see below)
   -sc         - Stop after stack check
+  -scf        - Show functions in stack checker
   --help      - Shows this help text
 
 Backends and their operating systems:
@@ -94,6 +95,7 @@ int main(string[] args) {
 	string          os = "DEFAULT";
 	bool            onlyStackCheck = false;
 	bool            noStackCheck;
+	bool            stackCheckerFunctions = false;
 
 	// choose default backend
 	version (X86_64) {
@@ -299,6 +301,10 @@ int main(string[] args) {
 					noStackCheck = true;
 					break;
 				}
+				case "-scf": {
+					stackCheckerFunctions = true;
+					break;
+				}
 				case "--help": {
 					writeln(usage.strip());
 					return 0;
@@ -411,6 +417,9 @@ int main(string[] args) {
 		if (!noStackCheck) stackChecker.Evaluate(nodes);
 	}
 	catch (StackCheckerError) {
+		if (stackCheckerFunctions) {
+			stackChecker.DumpFunctions();
+		}
 		return 1;
 	}
 
@@ -423,7 +432,12 @@ int main(string[] args) {
 		}
 	}
 
+	if (stackCheckerFunctions) {
+		stackChecker.DumpFunctions();
+	}
+
 	if (onlyStackCheck) {
+		writeln("no errors");
 		return 0;
 	}
 

source/stackCheck.d

@@ -43,6 +43,8 @@ class StackChecker {
 				identifiers ~= format("%s.%s", key, member);
 			}
 		}
+
+		identifiers ~= ["true", "false"];
 	}
 
 	void ErrorNoThrow(Char, A...)(ErrorInfo error, in Char[] fmt, A args) {
@@ -186,6 +188,13 @@ class StackChecker {
 
 			stack = oldStack;
 		}
+
+		if (stack.length > blockStack) {
+			Pop(node, stack.length - blockStack);
+		}
+		else if (stack.length < blockStack) {
+			Push(node, blockStack - stack.length);
+		}
 	}
 
 	void EvaluateWhile(WhileNode node) {
@@ -304,7 +313,20 @@ class StackChecker {
 
 	void EvaluateNode(Node node) {
 		switch (node.type) {
-			case NodeType.Word:    EvaluateWord(cast(WordNode) node); break;
+			case NodeType.Word: {
+				auto wnode = cast(WordNode) node;
+
+				switch (wnode.name) {
+					case "return":   Pop(node, 1); break;
+					case "continue": break;
+					case "break":    break;
+					case "call":     Error(node.error, "Call is unsafe"); break;
+					case "throw":    Pop(node, 1); break;
+					case "error":    Error(node.error, "Error thrown by code"); break;
+					default:         EvaluateWord(wnode);
+				}
+				break;
+			}
 			case NodeType.Integer: Push(node, 1); break;
 			case NodeType.FuncDef: EvaluateFuncDef(cast(FuncDefNode) node); break;
 			case NodeType.Asm: {
@@ -332,4 +354,15 @@ class StackChecker {
 			EvaluateNode(node);
 		}
 	}
+
+	void DumpFunctions() {
+		size_t spaces = words.keys().fold!((a, e) => e.length > a.length? e : a).length;
+
+		foreach (key, value ; words) {
+			writefln(
+				"%s %s= %d -> %d", key, replicate([' '], spaces - key.length),
+				value.effect.pop, value.effect.push
+			);
+		}
+	}
 }