complete rewrite of eval/exec patch
diff --git a/example/example18.ref b/example/example18.ref
index 81f1049..db350bd 100644
--- a/example/example18.ref
+++ b/example/example18.ref
@@ -1,15 +1,13 @@
-exec test
-Hello World!
-exec passed
+eval_statements test
+eval_statements passed
 eval test
 eval passed
-exec_statement test
-exec_statement passed
-exec_file test
-exec_file passed
-exec failure test
-exec failure test passed
-exec_file failure test
-exec_file failure test passed
+eval_single_statement test
+eval_single_statement passed
+eval_file test
+eval_file passed
 eval failure test
 eval failure test passed
+eval_file failure test
+eval_file failure test passed
+Hello World!