Merge branch 'master' of https://github.com/GassaFM/interpr

.gitignore

@@ -0,0 +1,2 @@
+.dub
+*.exe

dub.sdl

@@ -0,0 +1,6 @@
+name "interpr"
+description "Interpreter for Pr, toy programming language for learning parallel algorithms."
+authors "Ivan Kazmenko"
+homepage "https://github.com/GassaFM/interpr"
+license "MIT"
+targetType "executable"

source/parser.d

@@ -441,7 +441,8 @@ final class StatementParser
 		if (!t.empty)
 		{
 			line = t.front;
-			if (line.tokens.front == "else")
+			if (line.indent == prevIndent &&
+			    line.tokens.front == "else")
 			{
 				t.popFront ();
 				line.tokens.consume ("else", line);
@@ -556,6 +557,11 @@ final class StatementParser
 
 	FunctionBlock parseFunctionBlock (string prevIndent)
 	{
+		if (t.empty)
+		{
+			enforce (!t.empty, "program is empty");
+		}
+
 		auto line = t.front;
 		check (line.indent == prevIndent, line,
 		    "indent does not match");

source/runner.d

@@ -203,7 +203,8 @@ class Runner
 			return 0;
 		}
 
-		assert (false);
+		throw new Exception ("call of non-existing function: " ~
+		    call.name);
 	}
 
 	long evalExpression (Expression e)