1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix select '1--2'; for PEter.

Browse Source
This commit is contained in:
Bruce Momjian 2000-06-30 18:03:40 +00:00
parent a164213219
commit 2f131ca588
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/bin/psql/mainloop.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.31 2000/06/29 16:27:57 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.32 2000/06/30 18:03:40 momjian Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "mainloop.h" #include "mainloop.h"
@ -44,7 +44,7 @@ MainLoop(FILE *source)
bool success; bool success;
volatile char in_quote; /* == 0 for no in_quote */ volatile char in_quote; /* == 0 for no in_quote */
volatile bool xcomment; /* in extended comment */ volatile bool in_xcomment; /* in extended comment */
volatile int paren_level; volatile int paren_level;
unsigned int query_start; unsigned int query_start;
volatile int count_eof = 0; volatile int count_eof = 0;
@ -80,7 +80,7 @@ MainLoop(FILE *source)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
xcomment = false; in_xcomment = false;
in_quote = 0; in_quote = 0;
paren_level = 0; paren_level = 0;
slashCmdStatus = CMD_UNKNOWN; /* set default */ slashCmdStatus = CMD_UNKNOWN; /* set default */
@ -123,7 +123,7 @@ MainLoop(FILE *source)
resetPQExpBuffer(query_buf); resetPQExpBuffer(query_buf);
/* reset parsing state */ /* reset parsing state */
xcomment = false; in_xcomment = false;
in_quote = 0; in_quote = 0;
paren_level = 0; paren_level = 0;
count_eof = 0; count_eof = 0;
@ -147,7 +147,7 @@ MainLoop(FILE *source)
line = xstrdup(query_buf->data); line = xstrdup(query_buf->data);
resetPQExpBuffer(query_buf); resetPQExpBuffer(query_buf);
/* reset parsing state since we are rescanning whole line */ /* reset parsing state since we are rescanning whole line */
xcomment = false; in_xcomment = false;
in_quote = 0; in_quote = 0;
paren_level = 0; paren_level = 0;
slashCmdStatus = CMD_UNKNOWN; slashCmdStatus = CMD_UNKNOWN;
@ -168,7 +168,7 @@ MainLoop(FILE *source)
prompt_status = PROMPT_SINGLEQUOTE; prompt_status = PROMPT_SINGLEQUOTE;
else if (in_quote && in_quote == '"') else if (in_quote && in_quote == '"')
prompt_status = PROMPT_DOUBLEQUOTE; prompt_status = PROMPT_DOUBLEQUOTE;
else if (xcomment) else if (in_xcomment)
prompt_status = PROMPT_COMMENT; prompt_status = PROMPT_COMMENT;
else if (paren_level) else if (paren_level)
prompt_status = PROMPT_PAREN; prompt_status = PROMPT_PAREN;
@ -296,23 +296,44 @@ MainLoop(FILE *source)
bslash_count = 0; bslash_count = 0;
rescan: rescan:
/* start of extended comment? */ /*
if (line[i] == '/' && line[i + thislen] == '*') * It is important to place the in_* test routines
* before the in_* detection routines.
* i.e. we have to test if we are in a quote before
* testing for comments. bjm 2000-06-30
*/
/* in quote? */
if (in_quote)
{ {
xcomment = true; /* end of quote */
ADVANCE_1; if (line[i] == in_quote && bslash_count % 2 == 0)
in_quote = '\0';
} }
/* in extended comment? */ /* in extended comment? */
else if (xcomment) else if (in_xcomment)
{ {
if (line[i] == '*' && line[i + thislen] == '/') if (line[i] == '*' && line[i + thislen] == '/')
{ {
xcomment = false; in_xcomment = false;
ADVANCE_1; ADVANCE_1;
} }
} }
/* start of extended comment? */
else if (line[i] == '/' && line[i + thislen] == '*')
{
in_xcomment = true;
ADVANCE_1;
}
/* start of quote */
else if (!was_bslash &&
(line[i] == '\'' || line[i] == '"'))
in_quote = line[i];
/* single-line comment? truncate line */ /* single-line comment? truncate line */
else if (line[i] == '-' && line[i + thislen] == '-') else if (line[i] == '-' && line[i + thislen] == '-')
{ {
@ -320,19 +341,6 @@ MainLoop(FILE *source)
break; break;
} }
/* in quote? */
else if (in_quote)
{
/* end of quote */
if (line[i] == in_quote && bslash_count % 2 == 0)
in_quote = '\0';
}
/* start of quote */
else if (!was_bslash &&
(line[i] == '\'' || line[i] == '"'))
in_quote = line[i];
/* count nested parentheses */ /* count nested parentheses */
else if (line[i] == '(') else if (line[i] == '(')
paren_level++; paren_level++;