Changeset: 6266e4bb0a02 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6266e4bb0a02
Modified Files:
monetdb5/mal/mal_parser.c
Branch: default
Log Message:
Merged with Jul2017
diffs (18 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1712,8 +1712,13 @@ part2: /* consume <operator><term> part
}
part3:
skipSpace(cntxt);
- if (currChar(cntxt) != ';')
+ if (currChar(cntxt) != ';') {
parseError(cntxt, "';' expected\n");
+ skipToEnd(cntxt);
+ pushInstruction(curBlk, curInstr);
+ return;
+ }
+ skipToEnd(cntxt);
pushInstruction(curBlk, curInstr);
if (cntrl == RETURNsymbol && !(curInstr->token == ASSIGNsymbol ||
getModuleId(curInstr) != 0))
parseError(cntxt, "return assignment expected\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
