Changeset: d38ad0793460 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d38ad0793460
Modified Files:
sql/server/sql_scan.c
Branch: triggers
Log Message:
add missing part of the merge with default
diffs (20 lines):
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -1113,7 +1113,15 @@ int scanner_symbol(mvc * c, int cur)
case '"':
return scanner_string(c, cur, false);
case '{':
- return scanner_body(c);
+ // if previous tokens like LANGUAGE IDENT
+ // TODO checking on IDENT only may not be enough
+ if (lc->yylast == IDENT)
+ return scanner_body(c);
+ lc->started = 1;
+ return scanner_token(lc, cur);
+ case '}':
+ lc->started = 1;
+ return scanner_token(lc, cur);
case '-':
lc->started = 1;
next = scanner_getc(lc);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
