Changeset: 8328007fde38 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/8328007fde38 Modified Files: sql/server/sql_scan.c Branch: Mar2025 Log Message:
Do not recurse when parsing SQL comments. diffs (42 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 @@ -1218,7 +1218,7 @@ int scanner_symbol(mvc * c, int cur) cur = skip_c_comment(c); if (cur < 0) return EOF; - return tokenize(c, cur); + return ' '; } else { utf8_putchar(lc, next); return scanner_token(lc, cur); @@ -1237,7 +1237,7 @@ int scanner_symbol(mvc * c, int cur) case '#': if ((cur = skip_sql_comment(c)) == EOF) return cur; - return tokenize(c, cur); + return ' '; case '\'': if (lc->raw_string_mode || lc->next_string_is_raw) return scanner_string(c, cur, false); @@ -1263,7 +1263,7 @@ int scanner_symbol(mvc * c, int cur) lc->started = started; if ((cur = skip_sql_comment(c)) == EOF) return cur; - return tokenize(c, cur); + return ' '; } lc->started = 1; utf8_putchar(lc, next); @@ -1493,7 +1493,10 @@ tokenize(mvc * c, int cur) } return keyword_or_ident(c, cur); } else if (iswpunct(cur)) { - return scanner_symbol(c, cur); + cur = scanner_symbol(c, cur); + if (iswspace(cur)) + continue; + return cur; } if (cur == EOF) { if (lc->mode == LINE_1 || !lc->started ) _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org