X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Fparsergen.mdc;h=d30275e4e4d383a22905acd1e415c72d89fc56de;hb=f8c00ecff941f5f86b4d54dd73cac3680684a11e;hp=2fdbf453c8114746843e5b3f95ee2ab07b570932;hpb=f5e50e504ef5724ed7d9f13c411fff28d2b17a1e;p=ocean

diff --git a/csrc/parsergen.mdc b/csrc/parsergen.mdc
index 2fdbf45..d30275e 100644
--- a/csrc/parsergen.mdc
+++ b/csrc/parsergen.mdc
@@ -277,6 +277,9 @@ declares how it associates.  This level is stored in each symbol
 listed and may be inherited by any production which uses the symbol.  A
 production inherits from the last symbol which has a precedence.
 
+The symbols on the first precedence line have the lowest precedence.
+Subsequent lines introduce symbols with higher precedence.
+
 ###### grammar fields
 	struct text current_type;
 	int type_isref;
@@ -1287,12 +1290,11 @@ When itemsets are created we assign a precedence to the itemset from
 the complete item, if there is one.  We ignore the possibility of
 there being two and don't (currently) handle precedence in such
 grammars.  When completing a grammar we ignore any item where DOT is
-followed by a terminal with a precedence lower (numerically higher)
-than that for the itemset.  Unless the terminal has right
-associativity, we also ignore items where the terminal has the same
-precedence.  The result is that unwanted items are still in the
-itemset, but the terminal doesn't get into the go to set, so the item
-is ineffective.
+followed by a terminal with a precedence lower than that for the
+itemset.  Unless the terminal has right associativity, we also ignore
+items where the terminal has the same precedence.  The result is that
+unwanted items are still in the itemset, but the terminal doesn't get
+into the go to set, so the item is ineffective.
 
 ###### complete itemset
 	for (i = 0; i < is->items.cnt; i++) {
@@ -1311,7 +1313,7 @@ is ineffective.
 			continue;
 		s = pr->body[bs];
 		if (s->precedence && is->precedence &&
-		    is->precedence < s->precedence)
+		    is->precedence > s->precedence)
 			/* This terminal has a low precedence and
 			 * shouldn't be shifted
 			 */
@@ -1404,8 +1406,7 @@ with a pre-existing itemset).
 			pos = symset_find(&newitemset, pr->head->num);
 			if (bp + 1 == pr->body_size &&
 			    pr->precedence > 0 &&
-			    (precedence == 0 ||
-			     pr->precedence < precedence)) {
+			    pr->precedence > precedence) {
 				// new itemset is reducible and has a precedence.
 				precedence = pr->precedence;
 				assoc = pr->assoc;
@@ -1799,14 +1800,20 @@ counted, and are reported as non-critical.  This will not affect a
 				int p = item_prod(itm);
 				int bp = item_index(itm);
 				struct production *pr = g->productions[p];
+				struct symbol *s;
 
-				if (bp < pr->body_size &&
-				    pr->body[bp]->type == Terminal) {
-					/* shiftable */
-					int sym = pr->body[bp]->num;
-					if (symset_find(&shifts, sym) < 0)
-						symset_add(&shifts, sym, itm);
-				}
+				if (bp >= pr->body_size ||
+				    pr->body[bp]->type != Terminal)
+					/* not shiftable */
+					continue;
+
+				s = pr->body[bp];
+				if (s->precedence && is->precedence)
+					/* Precedence resolves this, so no conflict */
+					continue;
+
+				if (symset_find(&shifts, s->num) < 0)
+					symset_add(&shifts, s->num, itm);
 			}
 			/* Now look for reductions and conflicts */
 			for (j = 0; j < is->items.cnt; j++) {
@@ -1872,13 +1879,14 @@ pieces of code provided in the grammar file, so they are generated first.
 
 ###### parser_generate
 
-	static void gen_parser(FILE *f, struct grammar *g, char *file, char *name)
+	static void gen_parser(FILE *f, struct grammar *g, char *file, char *name,
+		               struct code_node *pre_reduce)
 	{
 		gen_known(f, g);
 		gen_non_term(f, g);
 		gen_goto(f, g);
 		gen_states(f, g);
-		gen_reduce(f, g, file);
+		gen_reduce(f, g, file, pre_reduce);
 		gen_free(f, g);
 
 		fprintf(f, "#line 0 \"gen_parser\"\n");
@@ -1899,7 +1907,9 @@ pieces of code provided in the grammar file, so they are generated first.
 ### Known words table
 
 The known words table is simply an array of terminal symbols.
-The table of nonterminals used for tracing is a similar array.
+The table of nonterminals used for tracing is a similar array.  We
+include virtual symbols in the table of non_terminals to keep the
+numbers right.
 
 ###### functions
 
@@ -1924,7 +1934,7 @@ The table of nonterminals used for tracing is a similar array.
 		for (i = TK_reserved;
 		     i < g->num_syms;
 		     i++)
-			if (g->symtab[i]->type == Nonterminal)
+			if (g->symtab[i]->type != Terminal)
 				fprintf(f, "\t\"%.*s\",\n", g->symtab[i]->name.len,
 					g->symtab[i]->name.txt);
 		fprintf(f, "};\n\n");
@@ -2102,24 +2112,31 @@ automatically freed.  This is equivalent to assigning `NULL` to the pointer.
 		fputs("\n", f);
 		for (i = 0; i < p->body_size; i++) {
 			if (p->body[i]->struct_name.txt &&
-			    p->body[i]->isref &&
-			    used[i])
+			    used[i]) {
 				// assume this has been copied out
-				fprintf(f, "\t\t*(void**)body[%d] = NULL;\n", i);
+				if (p->body[i]->isref)
+					fprintf(f, "\t\t*(void**)body[%d] = NULL;\n", i);
+				else
+					fprintf(f, "\t\tmemset(body[%d], 0, sizeof(struct %.*s));\n", i, p->body[i]->struct_name.len, p->body[i]->struct_name.txt);
+			}
 		}
 		free(used);
 	}
 
 ###### functions
 
-	static void gen_reduce(FILE *f, struct grammar *g, char *file)
+	static void gen_reduce(FILE *f, struct grammar *g, char *file,
+	                       struct code_node *code)
 	{
 		int i;
-		fprintf(f, "#line 0 \"gen_reduce\"\n");
+		fprintf(f, "#line 1 \"gen_reduce\"\n");
 		fprintf(f, "static int do_reduce(int prod, void **body, struct token_config *config, void *ret)\n");
 		fprintf(f, "{\n");
 		fprintf(f, "\tint ret_size = 0;\n");
+		if (code)
+			code_node_print(f, code, file);
 
+		fprintf(f, "#line 4 \"gen_reduce\"\n");
 		fprintf(f, "\tswitch(prod) {\n");
 		for (i = 0; i < g->production_count; i++) {
 			struct production *p = g->productions[i];
@@ -2316,6 +2333,7 @@ parser with neither. "grammar" must be provided.
 	struct code_node *hdr = NULL;
 	struct code_node *code = NULL;
 	struct code_node *gram = NULL;
+	struct code_node *pre_reduce = NULL;
 	for (s = table; s; s = s->next) {
 		struct text sec = s->section;
 		if (tag && !strip_tag(&sec, tag))
@@ -2326,6 +2344,8 @@ parser with neither. "grammar" must be provided.
 			code = s->code;
 		else if (text_is(sec, "grammar"))
 			gram = s->code;
+		else if (text_is(sec, "reduce"))
+			pre_reduce = s->code;
 		else {
 			fprintf(stderr, "Unknown content section: %.*s\n",
 			        s->section.len, s->section.txt);
@@ -2397,7 +2417,7 @@ file with the code section (if any) and the parser tables and function.
 		if (f) {
 			if (code)
 				code_node_print(f, code, infile);
-			gen_parser(f, g, infile, name);
+			gen_parser(f, g, infile, name, pre_reduce);
 			fclose(f);
 		} else {
 			fprintf(stderr, "Cannot create %s.c\n",
@@ -3079,8 +3099,8 @@ an error.
 
 # calc: grammar
 
-	$LEFT * /
 	$LEFT + -
+	$LEFT * /
 
 	Session -> Session Line
 		| Line