1 files changed, 43 insertions, 55 deletions
diff --git a/src/primitives/eval.d b/src/primitives/eval.d
index 8b080e2..08d8fb9 100644
--- a/src/primitives/eval.d
+++ b/src/primitives/eval.d
@@ -1,65 +1,53 @@
 module src.primitives.eval;
 
-import src.primitives.impl;
+import std.variant;
 
-bool evaluate(int value) {
-	return drop_mode;
-}
+import src.stack;
+import src.primitives.core;
+import conditional = src.primitives.conditional;
+
+bool evaluate_primitive(string word) {
+	switch ( word ) {
+		case     "§"     : definition_start;           break;
+		case     "$"     : binary_op_variable_bind;    break;
+		case     "@"     : unary_op_variable_resolve;  break;
+		case     "if"    : conditional.eval_if;        break;
+		case     "then"  : conditional.eval_then;      break;
+		case     "else"  : conditional.eval_else;      break;
+		case     "+"     : binary_op_add;              break;
+		case     "*"     : binary_op_multiply;         break;
+		case     "/"     : binary_op_divide;           break;
+		case     "%"     : binary_op_modulo;           break;
+		case     "."     : unary_op_io_print;          break;
+		case     "pop"   : unary_op_stack_pop;         break;
+		case     "dup"   : unary_op_stack_dup;         break;
+		case     "swp"   : binary_op_stack_swp;        break;
+		case     "true"  : integral_value_bool(true);  break;
+		case     "false" : integral_value_bool(false); break;
+		case     "<"     : binary_cond_lt;             break;
+		case     "="     : binary_cond_eq;             break;
+		default          : return false;
+	}
 
-bool evaluate(bool value) {
-	return drop_mode;
+	return true;
 }
 
-bool evaluate(string word) {
-	if ( drop_mode ) {
-		switch ( word ) {
-			case "then":
-				return n_ary_conditional_then;
-			case "else":
-				return n_ary_conditional_else;
-			default:
-				return true;
-		}
+bool evaluate(Token token) {
+	if ( conditional.drop(token) ) {
+		return true;
+	} else {
+		return token.visit!(
+			(int    value) => false,
+			(bool   value) => false,
+			(string word ) => evaluate_primitive(word)
+		);
 	}
+}
 
-	switch ( word ) {
-		case "§":
-			return definition_start;
-		case "$":
-			return binary_op_variable_bind;
-		case "@":
-			return unary_op_variable_resolve;
-		case "if":
-			return unary_conditional_if;
-		case "then":
-			return n_ary_conditional_then;
-		case "else":
-			return n_ary_conditional_else;
-		case "+":
-			return binary_op_add;
-		case "*":
-			return binary_op_multiply;
-		case "/":
-			return binary_op_divide;
-		case "%":
-			return binary_op_modulo;
-		case ".":
-			return unary_op_io_print;
-		case "pop":
-			return unary_op_stack_pop;
-		case "dup":
-			return unary_op_stack_dup;
-		case "swp":
-			return binary_op_stack_swp;
-		case "true":
-			return integral_value_bool(true);
-		case "false":
-			return integral_value_bool(false);
-		case "<":
-			return binary_cond_lt;
-		case "=":
-			return binary_cond_eq;
-		default:
-			return false;
+Stack!Token result() {
+	if ( conditional.dischargeable ) {
+		return conditional.discharge;
+	} else {
+		return Stack!Token();
 	}
 }