database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-14 08:21:07 +03:00
Code Activity

Make sure that -- comments extend to the end of the line. This fixes the

Browse Source 
misscanning of this construct:

SELECT ''hello world''
-- SELECT ''goodbye world''
::text;
This commit is contained in:
Peter Eisentraut
2003-10-09 19:13:23 +00:00
parent 034b065a66
commit 172b125578
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/parser/scan.l
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.110 2003/08/04 02:40:02 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.111 2003/10/09 19:13:23 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -129,7 +129,7 @@ xhcat {quote}{whitespace_with_newline}{quote}
xnstart [nN]{quote} xnstart [nN]{quote}
/* Extended quote /* Extended quote
* xqdouble implements SQL92 embedded quote * xqdouble implements embedded quote
* xqcat allows strings to cross input lines * xqcat allows strings to cross input lines
*/ */
quote ' quote '
@ -166,8 +166,7 @@ xdinside [^"]+
* 2. In the operator rule, check for slash-star within the operator, and * 2. In the operator rule, check for slash-star within the operator, and
* if found throw it back with yyless(). This handles the plus-slash-star * if found throw it back with yyless(). This handles the plus-slash-star
* problem. * problem.
* SQL92-style comments, which start with dash-dash, have similar interactions * Dash-dash comments have similar interactions with the operator rule.
* with the operator rule.
*/ */
xcstart \/\*{op_chars}* xcstart \/\*{op_chars}*
xcstop \*+\/ xcstop \*+\/
@ -210,8 +209,8 @@ param \${integer}
* In order to make the world safe for Windows and Mac clients as well as * In order to make the world safe for Windows and Mac clients as well as
* Unix ones, we accept either \n or \r as a newline. A DOS-style \r\n * Unix ones, we accept either \n or \r as a newline. A DOS-style \r\n
* sequence will be seen as two successive newlines, but that doesn't cause * sequence will be seen as two successive newlines, but that doesn't cause
* any problems. SQL92-style comments, which start with -- and extend to the * any problems. Comments that start with -- and extend to the next
* next newline, are treated as equivalent to a single whitespace character. * newline are treated as equivalent to a single whitespace character.
* *
* NOTE a fine point: if there is no newline following --, we will absorb * NOTE a fine point: if there is no newline following --, we will absorb
* everything to the end of the input as a comment. This is correct. Older * everything to the end of the input as a comment. This is correct. Older
@ -231,21 +230,22 @@ comment ("--"{non_newline}*)
whitespace ({space}+|{comment}) whitespace ({space}+|{comment})
/* /*
* SQL92 requires at least one newline in the whitespace separating * SQL requires at least one newline in the whitespace separating
* string literals that are to be concatenated. Silly, but who are we * string literals that are to be concatenated. Silly, but who are we
* to argue? Note that {whitespace_with_newline} should not have * after * to argue? Note that {whitespace_with_newline} should not have * after
* it, whereas {whitespace} should generally have a * after it... * it, whereas {whitespace} should generally have a * after it...
*/ */
special_whitespace ({space}+|{comment}{newline})
horiz_whitespace ({horiz_space}|{comment}) horiz_whitespace ({horiz_space}|{comment})
whitespace_with_newline ({horiz_whitespace}*{newline}{whitespace}*) whitespace_with_newline ({horiz_whitespace}*{newline}{special_whitespace}*)
other . other .
/* /*
* Quoted strings must allow some special characters such as single-quote * Quoted strings must allow some special characters such as single-quote
* and newline. * and newline.
* Embedded single-quotes are implemented both in the SQL92-standard * Embedded single-quotes are implemented both in the SQL standard
* style of two adjacent single quotes "''" and in the Postgres/Java style * style of two adjacent single quotes "''" and in the Postgres/Java style
* of escaped-quote "\'". * of escaped-quote "\'".
* Other embedded escaped characters are matched explicitly and the leading * Other embedded escaped characters are matched explicitly and the leading
@ -448,12 +448,12 @@ other .
nchars = slashstar - yytext; nchars = slashstar - yytext;
/* /*
* For SQL92 compatibility, '+' and '-' cannot be the * For SQL compatibility, '+' and '-' cannot be the
* last char of a multi-char operator unless the operator * last char of a multi-char operator unless the operator
* contains chars that are not in SQL92 operators. * contains chars that are not in SQL operators.
* The idea is to lex '=-' as two operators, but not * The idea is to lex '=-' as two operators, but not
* to forbid operator names like '?-' that could not be * to forbid operator names like '?-' that could not be
* sequences of SQL92 operators. * sequences of SQL operators.
*/ */
while (nchars > 1 && while (nchars > 1 &&
(yytext[nchars-1] == '+' || (yytext[nchars-1] == '+' ||
@ -547,7 +547,7 @@ other .
* if necessary. * if necessary.
* *
* Note: here we use a locale-dependent case conversion, * Note: here we use a locale-dependent case conversion,
* which seems appropriate under SQL99 rules, whereas * which seems appropriate under standard SQL rules, whereas
* the keyword comparison was NOT locale-dependent. * the keyword comparison was NOT locale-dependent.
*/ */
ident = pstrdup(yytext); ident = pstrdup(yytext);