X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani.mdc;h=8fef86460ab64f08583b8ec2776d945bc302771b;hb=d67d447f79371573a26aee434133424a45caee93;hp=f36bbdb13593c6c306920bacd7d1d619513c2957;hpb=51ba21ffd913b8eb700699567567560f99a2aa9c;p=ocean

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index f36bbdb..8fef864 100644
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -1096,7 +1096,7 @@ list of in_scope names.
 
 			v = t->previous;
 			free_value(t->val);
-			if (t->min_depth == 0)
+			if (t->depth == 0)
 				// This is a global constant
 				free_exec(t->where_decl);
 			free(t);
@@ -1744,9 +1744,9 @@ make a copy of an array with controllable depth.
 
 ###### print binode cases
 	case Index:
-		print_exec(b->left, -1, 0);
+		print_exec(b->left, -1, bracket);
 		printf("[");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
 		printf("]");
 		break;
 
@@ -1930,7 +1930,7 @@ function will be needed.
 	case Xfieldref:
 	{
 		struct fieldref *f = cast(fieldref, e);
-		print_exec(f->left, -1, 0);
+		print_exec(f->left, -1, bracket);
 		printf(".%.*s", f->name.len, f->name.txt);
 		break;
 	}
@@ -2067,6 +2067,7 @@ function will be needed.
 			$0->f.type = $<3;
 			$0->f.init = val_init($3);
 		}$
+		| ERROR ${ tok_err(c, "Syntax error in struct field", &$1); }$
 
 ###### forward decls
 	static void structure_print_type(struct type *t, FILE *f);
@@ -2343,8 +2344,8 @@ link to find the primary instance.
 			/* This might be a label - allocate a var just in case */
 			v = var_decl(c, $1.txt);
 			if (v) {
-				v->val = val_prepare(Tlabel);
-				v->val.label = &v->val;
+				v->val = val_prepare(Tnone);
+				v->where_decl = $0;
 				v->where_set = $0;
 			}
 		}
@@ -2407,6 +2408,9 @@ link to find the primary instance.
 			         v->where_decl, NULL, 0, NULL);
 			return v->val.type;
 		}
+		if (v->val.type == Tnone && v->where_decl == prog)
+			type_err(c, "error: variable used but not declared: %v",
+			         prog, NULL, 0, NULL);
 		if (v->val.type == NULL) {
 			if (type && *ok != 0) {
 				v->val = val_prepare(type);
@@ -2468,8 +2472,11 @@ room for ambiguity, so a full conditional expression is allowed in there.
 
 ###### Grammar
 
+	$LEFT if $$ifelse
+	## expr precedence
+
 	$*exec
-	Expression -> BoolExpr if Expression else Expression ${ {
+	Expression -> Expression if Expression else Expression $$ifelse ${ {
 			struct binode *b1 = new(binode);
 			struct binode *b2 = new(binode);
 			b1->op = CondExpr;
@@ -2480,17 +2487,19 @@ room for ambiguity, so a full conditional expression is allowed in there.
 			b2->right = $<5;
 			$0 = b1;
 		} }$
-		| BoolExpr ${ $0 = $<1; }$
+		## expression grammar
 
 ###### print binode cases
 
 	case CondExpr:
 		b2 = cast(binode, b->right);
-		print_exec(b2->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b2->left, -1, bracket);
 		printf(" if ");
-		print_exec(b->left, -1, 0);
+		print_exec(b->left, -1, bracket);
 		printf(" else ");
-		print_exec(b2->right, -1, 0);
+		print_exec(b2->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 
 ###### propagate binode cases
@@ -2536,73 +2545,83 @@ if the result would make a difference.
 	OrElse,
 	Not,
 
-###### Grammar
+###### expr precedence
+	$LEFT or
+	$LEFT and
+	$LEFT not
 
-	$*exec
-	BoolExpr -> BoolExpr or BTerm ${ {
+###### expression grammar
+		| Expression or Expression ${ {
 			struct binode *b = new(binode);
 			b->op = Or;
 			b->left = $<1;
 			b->right = $<3;
 			$0 = b;
 		} }$
-		| BoolExpr or else BTerm ${ {
+		| Expression or else Expression ${ {
 			struct binode *b = new(binode);
 			b->op = OrElse;
 			b->left = $<1;
 			b->right = $<4;
 			$0 = b;
 		} }$
-		| BTerm ${ $0 = $<1; }$
 
-	BTerm -> BTerm and BFact ${ {
+		| Expression and Expression ${ {
 			struct binode *b = new(binode);
 			b->op = And;
 			b->left = $<1;
 			b->right = $<3;
 			$0 = b;
 		} }$
-		| BTerm and then BFact ${ {
+		| Expression and then Expression ${ {
 			struct binode *b = new(binode);
 			b->op = AndThen;
 			b->left = $<1;
 			b->right = $<4;
 			$0 = b;
 		} }$
-		| BFact ${ $0 = $<1; }$
 
-	BFact -> not BFact ${ {
+		| not Expression ${ {
 			struct binode *b = new(binode);
 			b->op = Not;
 			b->right = $<2;
 			$0 = b;
 		} }$
-		## other BFact
 
 ###### print binode cases
 	case And:
-		print_exec(b->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, -1, bracket);
 		printf(" and ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 	case AndThen:
-		print_exec(b->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, -1, bracket);
 		printf(" and then ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 	case Or:
-		print_exec(b->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, -1, bracket);
 		printf(" or ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 	case OrElse:
-		print_exec(b->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, -1, bracket);
 		printf(" or else ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 	case Not:
+		if (bracket) printf("(");
 		printf("not ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 
 ###### propagate binode cases
@@ -2675,15 +2694,17 @@ expression operator.
 	Eql,
 	NEql,
 
-###### other BFact
-	| Expr CMPop Expr ${ {
+###### expr precedence
+	$LEFT < > <= >= == != CMPop
+
+###### expression grammar
+	| Expression CMPop Expression ${ {
 		struct binode *b = new(binode);
 		b->op = $2.op;
 		b->left = $<1;
 		b->right = $<3;
 		$0 = b;
 	} }$
-	| Expr ${ $0 = $<1; }$
 
 ###### Grammar
 
@@ -2703,7 +2724,8 @@ expression operator.
 	case GtrEq:
 	case Eql:
 	case NEql:
-		print_exec(b->left, -1, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, -1, bracket);
 		switch(b->op) {
 		case Less:   printf(" < "); break;
 		case LessEq: printf(" <= "); break;
@@ -2713,7 +2735,8 @@ expression operator.
 		case NEql:   printf(" != "); break;
 		default: abort();		// NOTEST
 		}
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
+		if (bracket) printf(")");
 		break;
 
 ###### propagate binode cases
@@ -2783,34 +2806,35 @@ precedence is handled better I might be able to discard this.
 	Absolute, Negate,
 	Bracket,
 
-###### Grammar
+###### expr precedence
+	$LEFT + - Eop
+	$LEFT * / % ++ Top
+	$LEFT Uop
 
-	$*exec
-	Expr -> Expr Eop Term ${ {
+###### expression grammar
+		| Expression Eop Expression ${ {
 			struct binode *b = new(binode);
 			b->op = $2.op;
 			b->left = $<1;
 			b->right = $<3;
 			$0 = b;
 		} }$
-		| Term ${ $0 = $<1; }$
 
-	Term -> Term Top Factor ${ {
+		| Expression Top Expression ${ {
 			struct binode *b = new(binode);
 			b->op = $2.op;
 			b->left = $<1;
 			b->right = $<3;
 			$0 = b;
 		} }$
-		| Factor ${ $0 = $<1; }$
 
-	Factor -> ( Expression ) ${ {
+		| ( Expression ) ${ {
 			struct binode *b = new_pos(binode, $1);
 			b->op = Bracket;
 			b->right = $<2;
 			$0 = b;
 		} }$
-		| Uop Factor ${ {
+		| Uop Expression ${ {
 			struct binode *b = new(binode);
 			b->op = $1.op;
 			b->right = $<2;
@@ -2838,7 +2862,8 @@ precedence is handled better I might be able to discard this.
 	case Divide:
 	case Concat:
 	case Rem:
-		print_exec(b->left, indent, 0);
+		if (bracket) printf("(");
+		print_exec(b->left, indent, bracket);
 		switch(b->op) {
 		case Plus:   fputs(" + ", stdout); break;
 		case Minus:  fputs(" - ", stdout); break;
@@ -2848,19 +2873,24 @@ precedence is handled better I might be able to discard this.
 		case Concat: fputs(" ++ ", stdout); break;
 		default: abort();	// NOTEST
 		}			// NOTEST
-		print_exec(b->right, indent, 0);
+		print_exec(b->right, indent, bracket);
+		if (bracket) printf(")");
 		break;
 	case Absolute:
+		if (bracket) printf("(");
 		printf("+");
-		print_exec(b->right, indent, 0);
+		print_exec(b->right, indent, bracket);
+		if (bracket) printf(")");
 		break;
 	case Negate:
+		if (bracket) printf("(");
 		printf("-");
-		print_exec(b->right, indent, 0);
+		print_exec(b->right, indent, bracket);
+		if (bracket) printf(")");
 		break;
 	case Bracket:
 		printf("(");
-		print_exec(b->right, indent, 0);
+		print_exec(b->right, indent, bracket);
 		printf(")");
 		break;
 
@@ -3074,6 +3104,7 @@ is in-place.
 		| SimpleStatements ; ${ $0 = $<1; }$
 
 	SimpleStatement -> pass ${ $0 = NULL; }$
+		| ERROR ${ tok_err(c, "Syntax error in statement", &$1); }$
 		## SimpleStatement Grammar
 
 ###### print binode cases
@@ -3083,10 +3114,10 @@ is in-place.
 			if (b->left == NULL)
 				printf("pass");
 			else
-				print_exec(b->left, indent, 0);
+				print_exec(b->left, indent, bracket);
 			if (b->right) {
 				printf("; ");
-				print_exec(b->right, indent, 0);
+				print_exec(b->right, indent, bracket);
 			}
 		} else {
 			// block, one per line
@@ -3189,7 +3220,7 @@ same solution.
 		while (b) {
 			if (b->left) {
 				printf(" ");
-				print_exec(b->left, -1, 0);
+				print_exec(b->left, -1, bracket);
 				if (b->right)
 					printf(",");
 			}
@@ -3275,9 +3306,9 @@ it is declared, and error will be raised as the name is created as
 
 	case Assign:
 		do_indent(indent, "");
-		print_exec(b->left, indent, 0);
+		print_exec(b->left, indent, bracket);
 		printf(" = ");
-		print_exec(b->right, indent, 0);
+		print_exec(b->right, indent, bracket);
 		if (indent >= 0)
 			printf("\n");
 		break;
@@ -3286,7 +3317,7 @@ it is declared, and error will be raised as the name is created as
 		{
 		struct variable *v = cast(var, b->left)->var;
 		do_indent(indent, "");
-		print_exec(b->left, indent, 0);
+		print_exec(b->left, indent, bracket);
 		if (cast(var, b->left)->var->constant) {
 			if (v->where_decl == v->where_set) {
 				printf("::");
@@ -3304,7 +3335,7 @@ it is declared, and error will be raised as the name is created as
 		}
 		if (b->right) {
 			printf("= ");
-			print_exec(b->right, indent, 0);
+			print_exec(b->right, indent, bracket);
 		}
 		if (indent >= 0)
 			printf("\n");
@@ -3385,13 +3416,21 @@ function.
 		$0 = new_pos(binode, $1);
 		$0->op = Use;
 		$0->right = $<2;
+		if ($0->right->type == Xvar) {
+			struct var *v = cast(var, $0->right);
+			if (v->var->val.type == Tnone) {
+				/* Convert this to a label */
+				v->var->val = val_prepare(Tlabel);
+				v->var->val.label = &v->var->val;
+			}
+		}
 	}$
 
 ###### print binode cases
 
 	case Use:
 		do_indent(indent, "use ");
-		print_exec(b->right, -1, 0);
+		print_exec(b->right, -1, bracket);
 		if (indent >= 0)
 			printf("\n");
 		break;
@@ -3917,6 +3956,10 @@ various declarations in the parse context.
 		| DeclareProgram
 		| DeclareStruct
 		| NEWLINE
+		| ERROR NEWLINE ${
+			tok_err(c,
+			        "error: unhandled parse error", &$1);
+		}$
 
 	## top level grammar
 
@@ -3990,6 +4033,7 @@ searching through for the Nth constant for decreasing N.
 			v->val = interp_exec($5);
 		}
 	} }$
+	| ERROR NEWLINE ${ tok_err(c, "Syntax error in constant", &$1); }$
 
 ###### print const decls
 	{
@@ -4058,11 +4102,7 @@ analysis is a bit more interesting at this level.
 		$0->left = reorder_bilist($<3);
 		$0->right = $<4;
 		var_block_close(c, CloseSequential);
-		if (c->scope_stack) abort();
-		}$
-		| ERROR ${
-			tok_err(c,
-			        "error: unhandled parse error", &$1);
+		if (c->scope_stack && !c->parse_error) abort();
 		}$
 
 	Varlist -> Varlist ArgDecl ${