diff options
| -rw-r--r-- | src/bin/pgbench/exprscan.l | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/bin/pgbench/exprscan.l b/src/bin/pgbench/exprscan.l index dc1367bbdbc..c3eb5f9c6ba 100644 --- a/src/bin/pgbench/exprscan.l +++ b/src/bin/pgbench/exprscan.l @@ -67,7 +67,7 @@ nonspace [^ \t\r\f\v\n] newline [\n] /* Line continuation marker */ -continuation \\{newline} +continuation \\\r?{newline} /* Exclusive states */ %x EXPR @@ -104,8 +104,12 @@ continuation \\{newline} * a continuation marker just after a word: */ {nonspace}+{continuation} { - /* Found "word\\\n", emit and return just "word" */ - psqlscan_emit(cur_state, yytext, yyleng - 2); + /* Found "word\\\r?\n", emit and return just "word" */ + int wordlen = yyleng - 2; + if (yytext[wordlen] == '\r') + wordlen--; + Assert(yytext[wordlen] == '\\'); + psqlscan_emit(cur_state, yytext, wordlen); return 1; } |