X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Foceani.mdc;h=dca205570c9af2c1ae704e0a58c04f01bdd96782;hp=e147baa1303ed29643c8f4b43c0c5c0bebd04fb8;hb=63e4b945b7fcf3c2ccbf7fee64bc08ae9f0aecf0;hpb=90e73c9514fc2dfbf7a88e7ce050f9b08a5c600a

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index e147baa..dca2055 100644
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -589,23 +589,17 @@ expected to return, and returns the type that it does return, either of
 which can be `NULL` signifying "unknown".  A `prop_err` flag set is
 passed by reference.  It has `Efail` set when an error is found, and
 `Eretry` when the type for some element is set via propagation.  If
-any expression cannot be evaluated immediately, `Enoconst` is set.
+any expression cannot be evaluated a compile time, `Eruntime` is set.
 If the expression can be copied, `Emaycopy` is set.
 
 If it remains unchanged at `0`, then no more propagation is needed.
 
 ###### ast
 
-	enum val_rules {Rnolabel = 1<<0, Rboolok = 1<<1, Rnoconstant = 1<<2};
-	enum prop_err {Efail = 1<<0, Eretry = 1<<1, Enoconst = 1<<2,
+	enum val_rules {Rboolok = 1<<1, Rnoconstant = 1<<2};
+	enum prop_err {Efail = 1<<0, Eretry = 1<<1, Eruntime = 1<<2,
 		       Emaycopy = 1<<3};
 
-###### format cases
-	case 'r':
-		if (rules & Rnolabel)
-			fputs(" (labels not permitted)", stderr);
-		break;
-
 ###### forward decls
 	static struct type *propagate_types(struct exec *prog, struct parse_context *c, enum prop_err *perr,
 	                                    struct type *type, int rules);
@@ -1065,8 +1059,6 @@ A separate function encoding these cases will simplify some code later.
 	{
 		if ((rules & Rboolok) && have == Tbool)
 			return 1;	// NOTEST
-		if ((rules & Rnolabel) && have == Tlabel)
-			return 0;	// NOTEST
 		if (!require || !have)
 			return 1;
 
@@ -1319,7 +1311,7 @@ executable.
 	{
 		struct val *val = cast(val, prog);
 		if (!type_compat(type, val->vtype, rules))
-			type_err(c, "error: expected %1%r found %2",
+			type_err(c, "error: expected %1 found %2",
 			           prog, type, rules, val->vtype);
 		return val->vtype;
 	}
@@ -1441,7 +1433,7 @@ match "case".
 		struct label *l = cast(label, prog);
 		l->value = label_lookup(c, l->name);
 		if (!type_compat(type, Tlabel, rules))
-			type_err(c, "error: expected %1%r found %2",
+			type_err(c, "error: expected %1 found %2",
 				 prog, type, rules, Tlabel);
 		return Tlabel;
 	}
@@ -2291,13 +2283,13 @@ correctly.
 				*perr |= Eretry;
 			}
 		} else if (!type_compat(type, v->type, rules)) {
-			type_err(c, "error: expected %1%r but variable '%v' is %2", prog,
+			type_err(c, "error: expected %1 but variable '%v' is %2", prog,
 			         type, rules, v->type);
 			type_err(c, "info: this is where '%v' was set to %1", v->where_set,
 			         v->type, rules, NULL);
 		}
 		if (!v->global || v->frame_pos < 0)
-			*perr |= Enoconst;
+			*perr |= Eruntime;
 		if (!type)
 			return v->type;
 		return type;
@@ -3673,7 +3665,7 @@ it in the "SimpleStatement Grammar" which will be described later.
 				 prog, NULL, 0, NULL);
 			return NULL;
 		}
-		*perr |= Enoconst;
+		*perr |= Eruntime;
 		v->var->type->check_args(c, perr, v->var->type, args);
 		if (v->var->type->function.inline_result)
 			*perr |= Emaycopy;
@@ -3790,8 +3782,8 @@ there.
 		struct type *t2;
 
 		propagate_types(b->left, c, perr, Tbool, 0);
-		t = propagate_types(b2->left, c, perr, type, Rnolabel);
-		t2 = propagate_types(b2->right, c, perr, type ?: t, Rnolabel);
+		t = propagate_types(b2->left, c, perr, type, 0);
+		t2 = propagate_types(b2->right, c, perr, type ?: t, 0);
 		return t ?: t2;
 	}
 
@@ -4073,11 +4065,11 @@ expression operator, and the `CMPop` non-terminal will match one of them.
 	case Eql:
 	case NEql:
 		/* Both must match but not be labels, result is Tbool */
-		t = propagate_types(b->left, c, perr, NULL, Rnolabel);
+		t = propagate_types(b->left, c, perr, NULL, 0);
 		if (t)
 			propagate_types(b->right, c, perr, t, 0);
 		else {
-			t = propagate_types(b->right, c, perr, NULL, Rnolabel);	// UNTESTED
+			t = propagate_types(b->right, c, perr, NULL, 0);	// UNTESTED
 			if (t)	// UNTESTED
 				t = propagate_types(b->left, c, perr, t, 0);	// UNTESTED
 		}
@@ -4594,7 +4586,7 @@ the common header for all reductions to use.
 				if (!type)
 					type = t;
 				else if (t != type)
-					type_err(c, "error: expected %1%r, found %2",
+					type_err(c, "error: expected %1, found %2",
 					         e->left, type, rules, t);
 			}
 		}
@@ -4671,7 +4663,7 @@ printed.
 		else
 			b = cast(binode, b->right);
 		while (b) {
-			propagate_types(b->left, c, perr, NULL, Rnolabel);
+			propagate_types(b->left, c, perr, NULL, 0);
 			b = cast(binode, b->right);
 		}
 		break;
@@ -4789,7 +4781,7 @@ be declared at any time.
 		 * result is Tnone
 		 */
 		t = propagate_types(b->left, c, perr, NULL,
-		                    Rnolabel | (b->op == Assign ? Rnoconstant : 0));
+		                    (b->op == Assign ? Rnoconstant : 0));
 		if (!b->right)
 			return Tnone;
 
@@ -4799,7 +4791,7 @@ be declared at any time.
 					type_err(c, "info: variable '%v' was set as %1 here.",
 					         cast(var, b->left)->var->where_set, t, rules, NULL);
 		} else {
-			t = propagate_types(b->right, c, perr, NULL, Rnolabel);
+			t = propagate_types(b->right, c, perr, NULL, 0);
 			if (t)
 				propagate_types(b->left, c, perr, t,
 				                (b->op == Assign ? Rnoconstant : 0));
@@ -5532,7 +5524,7 @@ constants.
 				} while (perr & Eretry);
 				if (perr & Efail)
 					c->parse_error += 1;
-				else if (!(perr & Enoconst)) {
+				else if (!(perr & Eruntime)) {
 					progress = some;
 					struct value res = interp_exec(
 						c, vb->right, &v->var->type);