X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=blobdiff_plain;f=csrc%2Fparsergen.mdc;h=3f36df9a6873c3c94f2f127d8a0ca6419e50603c;hp=803d9b6e87e0d21ac7029617bd7b8fa79c292cff;hb=850a39a0a761e0af89c15253f075ecd9e9ecc6ee;hpb=86e54542650f7f72a04c70618e07091f905398c8

diff --git a/csrc/parsergen.mdc b/csrc/parsergen.mdc
index 803d9b6..3f36df9 100644
--- a/csrc/parsergen.mdc
+++ b/csrc/parsergen.mdc
@@ -636,6 +636,11 @@ to produce errors that the parser is better positioned to handle.
 			} else if (tk.num == TK_mark
 			           && text_is(tk.txt, "$*")) {
 				err = dollar_line(state, g, 1);
+			} else if (tk.num == TK_mark
+				   && text_is(tk.txt, "//")) {
+				while (tk.num != TK_newline &&
+				       tk.num != TK_eof)
+					tk = token_next(state);
 			} else {
 				err = "Unrecognised token at start of line.";
 			}
@@ -1911,7 +1916,6 @@ pieces of code provided in the grammar file, so they are generated first.
 		fprintf(f, "\tstruct token_state *tokens;\n");
 		fprintf(f, "\tconfig->words_marks = known;\n");
 		fprintf(f, "\tconfig->known_count = sizeof(known)/sizeof(known[0]);\n");
-		fprintf(f, "\tconfig->ignored |= (1 << TK_line_comment) | (1 << TK_block_comment);\n");
 		fprintf(f, "\ttokens = token_open(code, config);\n");
 		fprintf(f, "\tvoid *rv = parser_run(tokens, states, do_reduce, do_free, trace, non_term, config);\n");
 		fprintf(f, "\ttoken_close(tokens);\n");
@@ -3105,7 +3109,6 @@ an error.
 		struct section *s;
 		struct token_config config = {
 			.ignored = (1 << TK_line_comment)
-			         | (1 << TK_block_comment)
 			         | (1 << TK_in)
 			         | (1 << TK_out),
 			.number_chars = ".,_+-",
@@ -3127,7 +3130,7 @@ an error.
 # calc: grammar
 
 	$LEFT + -
-	$LEFT * /
+	$LEFT * / //
 
 	Session -> Session Line
 		| Line
@@ -3155,6 +3158,16 @@ an error.
 		| Expression - Expression ${ mpq_init($0.val); mpq_sub($0.val, $1.val, $3.val); }$
 		| Expression * Expression ${ mpq_init($0.val); mpq_mul($0.val, $1.val, $3.val); }$
 		| Expression / Expression ${ mpq_init($0.val); mpq_div($0.val, $1.val, $3.val); }$
+		| Expression // Expression ${ {
+			mpz_t z0, z1, z2;
+			mpq_init($0.val);
+			mpz_init(z0); mpz_init(z1); mpz_init(z2);
+			mpz_tdiv_q(z1, mpq_numref($1.val), mpq_denref($1.val));
+			mpz_tdiv_q(z2, mpq_numref($3.val), mpq_denref($3.val));
+			mpz_tdiv_q(z0, z1, z2);
+			mpq_set_z($0.val, z0);
+			mpz_clear(z0); mpz_clear(z1); mpz_clear(z2);
+		} }$
 		| NUMBER ${ if (number_parse($0.val, $0.tail, $1.txt) == 0) mpq_init($0.val); }$
 		| ( Expression ) ${ mpq_init($0.val); mpq_set($0.val, $2.val); }$
 
@@ -3167,4 +3180,6 @@ an error.
 	10 * 9 / 2
 	1 * 1000 + 2 * 100 + 3 * 10 + 4 * 1
 
+	355//113
+
 	error