X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani.mdc;h=04cae63a944360db4e963e1f43a622b05b785854;hb=20a0aeadef40b5d44f10e41b64be4d9a6df360e0;hp=c820d39153674dcc75fcb2fa5022e60c2624ffce;hpb=c9827dcb3cb79fe907633b8badd1e5fd918ca388;p=ocean

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index c820d39..04cae63 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) {
@@ -952,13 +953,13 @@ Each variable records a scope depth and is in one of four states:
   enclosed the declaration, and that has closed.
 
 - "conditionally in scope".  The "in scope" block and all parallel
-  scopes have closed, and no further mention of the name has been
-  seen.  This state includes a secondary nest depth which records the
-  outermost scope seen since the variable became conditionally in
-  scope.  If a use of the name is found, the variable becomes "in
-  scope" and that secondary depth becomes the recorded scope depth.
-  If the name is declared as a new variable, the old variable becomes
-  "out of scope" and the recorded scope depth stays unchanged.
+  scopes have closed, and no further mention of the name has been seen.
+  This state includes a secondary nest depth (`min_depth`) which records
+  the outermost scope seen since the variable became conditionally in
+  scope.  If a use of the name is found, the variable becomes "in scope"
+  and that secondary depth becomes the recorded scope depth.  If the
+  name is declared as a new variable, the old variable becomes "out of
+  scope" and the recorded scope depth stays unchanged.
 
 - "out of scope".  The variable is neither in scope nor conditionally
   in scope.  It is permanently out of scope now and can be removed from
@@ -1149,6 +1150,7 @@ all pending-scope variables become conditionally scoped.
 		     (v->scope == OutScope || v->name->var != v)
 		     ? (*vp =  v->in_scope, 0)
 		     : ( vp = &v->in_scope, 0)) {
+			v->min_depth = c->scope_depth;
 			if (v->name->var != v) {
 				/* This is still in scope, but we haven't just
 				 * closed the scope.
@@ -1207,7 +1209,6 @@ all pending-scope variables become conditionally scoped.
 					     v2 = v2->previous)
 						if (v2->type == Tlabel) {
 							v2->scope = CondScope;
-							v2->min_depth = c->scope_depth;
 						} else
 							v2->scope = OutScope;
 					break;
@@ -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("= ");