X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani.mdc;h=af24d9becd86326c48633e66cd0718a5510479da;hp=1be7c673c010a31c9737fcfb959abc4861afb956;hb=d7e32bb049504f5e931f09ac041470f496c58b2c;hpb=8f1b75648081b69f4ff47263faea1843efdca6aa

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index 1be7c67..af24d9b 100644
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -242,18 +242,19 @@ structures can be used.
 			fprintf(stderr, "oceani: no main function found.\n");
 			context.parse_error = 1;
 		}
+		if (context.prog && !context.parse_error) {
+			if (!analyse_prog(context.prog, &context)) {
+				fprintf(stderr, "oceani: type error in program - not running.\n");
+				context.parse_error = 1;
+			}
+		}
 		if (context.prog && doprint) {
 			## print const decls
 			## print type decls
 			print_exec(context.prog, 0, brackets);
 		}
-		if (context.prog && doexec && !context.parse_error) {
-			if (!analyse_prog(context.prog, &context)) {
-				fprintf(stderr, "oceani: type error in program - not running.\n");
-				exit(1);
-			}
+		if (context.prog && doexec && !context.parse_error)
 			interp_prog(&context, context.prog, argc - optind, argv+optind);
-		}
 		free_exec(context.prog);
 
 		while (s) {
@@ -3582,19 +3583,17 @@ it is declared, and error will be raised as the name is created as
 		do_indent(indent, "");
 		print_exec(b->left, indent, bracket);
 		if (cast(var, b->left)->var->constant) {
+			printf("::");
 			if (v->where_decl == v->where_set) {
-				printf("::");
 				type_print(v->type, stdout);
 				printf(" ");
-			} else
-				printf(" ::");
+			}
 		} else {
+			printf(":");
 			if (v->where_decl == v->where_set) {
-				printf(":");
 				type_print(v->type, stdout);
 				printf(" ");
-			} else
-				printf(" :");
+			}
 		}
 		if (b->right) {
 			printf("= ");
@@ -4503,13 +4502,16 @@ analysis is a bit more interesting at this level.
 			}
 			al = cast(binode, al->right);
 		}
-		v = interp_exec(c, p->right, &vtype);
+		v = interp_exec(c, p, &vtype);
 		free_value(vtype, &v);
 	}
 
 ###### interp binode cases
-	case List:
-	case Func: abort();	// NOTEST
+	case List: abort();	// NOTEST
+
+	case Func:
+		rv = interp_exec(c, b->right, &rvtype);
+		break;
 
 ## And now to test it out.