Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2dee828

Browse files
committed
Remove plpgsql's separate lexer (finally!), in favor of using the core lexer
directly. This was a lot of trouble, but should be worth it in terms ofnot having to keep the plpgsql lexer in step with core anymore. In additionthe handling of keywords is significantly better-structured, allowing us tode-reserve a number of words that plpgsql formerly treated as reserved.
1 parent60cd1f1 commit2dee828

File tree

18 files changed

+1041
-1050
lines changed

18 files changed

+1041
-1050
lines changed

‎src/backend/parser/scan.l‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* Portions Copyright (c) 1994, Regents of the University of California
2525
*
2626
* IDENTIFICATION
27-
* $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.163 2009/11/09 18:38:48 tgl Exp $
27+
* $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.164 2009/11/12 00:13:00 tgl Exp $
2828
*
2929
*-------------------------------------------------------------------------
3030
*/
@@ -85,6 +85,7 @@ static void addlitchar(unsigned char ychar, core_yyscan_t yyscanner);
8585
staticchar *litbufdup(core_yyscan_t yyscanner);
8686
staticchar *litbuf_udeescape(unsignedchar escape,core_yyscan_t yyscanner);
8787
staticunsignedcharunescape_single_char(unsignedchar c,core_yyscan_t yyscanner);
88+
staticintprocess_integer_literal(constchar *token, YYSTYPE *lval);
8889
staticboolis_utf16_surrogate_first(pg_wchar c);
8990
staticboolis_utf16_surrogate_second(pg_wchar c);
9091
static pg_wcharsurrogate_pair_to_codepoint(pg_wchar first, pg_wchar second);
@@ -339,12 +340,15 @@ operator{op_chars}+
339340
* instead we pass it separately to parser. there it gets
340341
* coerced via doNegate() -- Leon aug 20 1999
341342
*
343+
* {decimalfail} is used because we would like "1..10" to lex as 1, dot_dot, 10.
344+
*
342345
* {realfail1} and {realfail2} are added to prevent the need for scanner
343346
* backup when the {real} rule fails to match completely.
344347
*/
345348

346349
integer{digit}+
347350
decimal(({digit}*\.{digit}+)|({digit}+\.{digit}*))
351+
decimalfail{digit}+\.\.
348352
real({integer}|{decimal})[Ee][-+]?{digit}+
349353
realfail1({integer}|{decimal})[Ee]
350354
realfail2({integer}|{decimal})[Ee][-+]
@@ -846,31 +850,20 @@ other.
846850
}
847851

848852
{integer}{
849-
long val;
850-
char* endptr;
851-
852853
SET_YYLLOC();
853-
errno =0;
854-
val =strtol(yytext, &endptr,10);
855-
if (*endptr !='\0' || errno == ERANGE
856-
#ifdef HAVE_LONG_INT_64
857-
/* if long > 32 bits, check for overflow of int4 */
858-
|| val != (long) ((int32) val)
859-
#endif
860-
)
861-
{
862-
/* integer too large, treat it as a float */
863-
yylval->str =pstrdup(yytext);
864-
return FCONST;
865-
}
866-
yylval->ival = val;
867-
return ICONST;
854+
returnprocess_integer_literal(yytext, yylval);
868855
}
869856
{decimal}{
870857
SET_YYLLOC();
871858
yylval->str =pstrdup(yytext);
872859
return FCONST;
873860
}
861+
{decimalfail}{
862+
/* throw back the .., and treat as integer */
863+
yyless(yyleng-2);
864+
SET_YYLLOC();
865+
returnprocess_integer_literal(yytext, yylval);
866+
}
874867
{real}{
875868
SET_YYLLOC();
876869
yylval->str =pstrdup(yytext);
@@ -1121,6 +1114,29 @@ litbufdup(core_yyscan_t yyscanner)
11211114
returnnew;
11221115
}
11231116

1117+
staticint
1118+
process_integer_literal(constchar *token, YYSTYPE *lval)
1119+
{
1120+
longval;
1121+
char *endptr;
1122+
1123+
errno =0;
1124+
val =strtol(token, &endptr,10);
1125+
if (*endptr !='\0' || errno == ERANGE
1126+
#ifdef HAVE_LONG_INT_64
1127+
/* if long > 32 bits, check for overflow of int4 */
1128+
|| val != (long) ((int32) val)
1129+
#endif
1130+
)
1131+
{
1132+
/* integer too large, treat it as a float */
1133+
lval->str =pstrdup(token);
1134+
return FCONST;
1135+
}
1136+
lval->ival = val;
1137+
return ICONST;
1138+
}
1139+
11241140
staticint
11251141
hexval(unsignedchar c)
11261142
{

‎src/backend/parser/scansup.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.37 2009/01/01 17:23:46 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.38 2009/11/12 00:13:00 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -197,7 +197,6 @@ bool
197197
scanner_isspace(charch)
198198
{
199199
/* This must match scan.l's list of {space} characters */
200-
/* and plpgsql's scan.l as well */
201200
if (ch==' '||
202201
ch=='\t'||
203202
ch=='\n'||

‎src/bin/psql/psqlscan.l‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* Portions Copyright (c) 1994, Regents of the University of California
3434
*
3535
* IDENTIFICATION
36-
* $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.29 2009/09/27 03:27:24 tgl Exp $
36+
* $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.30 2009/11/12 00:13:00 tgl Exp $
3737
*
3838
*-------------------------------------------------------------------------
3939
*/
@@ -364,12 +364,15 @@ operator{op_chars}+
364364
* instead we pass it separately to parser. there it gets
365365
* coerced via doNegate() -- Leon aug 20 1999
366366
*
367+
* {decimalfail} is used because we would like "1..10" to lex as 1, dot_dot, 10.
368+
*
367369
* {realfail1} and {realfail2} are added to prevent the need for scanner
368370
* backup when the {real} rule fails to match completely.
369371
*/
370372

371373
integer{digit}+
372374
decimal(({digit}*\.{digit}+)|({digit}+\.{digit}*))
375+
decimalfail{digit}+\.\.
373376
real({integer}|{decimal})[Ee][-+]?{digit}+
374377
realfail1({integer}|{decimal})[Ee]
375378
realfail2({integer}|{decimal})[Ee][-+]
@@ -776,6 +779,11 @@ other.
776779
{decimal}{
777780
ECHO;
778781
}
782+
{decimalfail}{
783+
/* throw back the .., and treat as integer */
784+
yyless(yyleng-2);
785+
ECHO;
786+
}
779787
{real}{
780788
ECHO;
781789
}

‎src/pl/plpgsql/src/.cvsignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
pl_gram.c
22
pl_gram.h
3-
pl_scan.c

‎src/pl/plpgsql/src/Makefile‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the plpgsql shared object
44
#
5-
# $PostgreSQL: pgsql/src/pl/plpgsql/src/Makefile,v 1.34 2009/08/28 20:26:19 petere Exp $
5+
# $PostgreSQL: pgsql/src/pl/plpgsql/src/Makefile,v 1.35 2009/11/12 00:13:00 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -17,7 +17,7 @@ override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
1717
SHLIB_LINK =$(filter -lintl,$(LIBS))
1818
rpath =
1919

20-
OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
20+
OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o pl_scanner.o
2121

2222
all: all-lib
2323

@@ -33,10 +33,7 @@ uninstall: uninstall-lib
3333

3434

3535
# Force these dependencies to be known even without dependency info built:
36-
pl_gram.opl_handler.opl_comp.opl_exec.opl_funcs.o: plpgsql.h pl_gram.h
37-
38-
# pl_scan is compiled as part of pl_gram
39-
pl_gram.o: pl_scan.c
36+
pl_gram.opl_handler.opl_comp.opl_exec.opl_funcs.opl_scanner.o: plpgsql.h pl_gram.h
4037

4138
# See notes in src/backend/parser/Makefile about the following two rules
4239

@@ -49,23 +46,12 @@ else
4946
@$(missing) bison $< $@
5047
endif
5148

52-
# Because we use %option case-insensitive, flex's results could vary
53-
# depending on what the compile-time locale setting is. Hence, force
54-
# it to see LC_CTYPE=C to ensure consistent build results.
55-
56-
pl_scan.c: scan.l
57-
ifdefFLEX
58-
LC_CTYPE=C $(FLEX) $(FLEXFLAGS) -o'$@' $<
59-
else
60-
@$(missing) flex $< $@
61-
endif
62-
63-
distprep: pl_scan.c pl_gram.h pl_gram.c
49+
distprep: pl_gram.h pl_gram.c
6450

65-
# pl_gram.c, pl_gram.h,andpl_scan.c are in the distribution tarball,
51+
# pl_gram.candpl_gram.h are in the distribution tarball,
6652
# so they are not cleaned here.
6753
cleandistclean: clean-lib
6854
rm -f$(OBJS)
6955

7056
maintainer-clean: clean
71-
rm -f pl_gram.c pl_gram.h pl_scan.c
57+
rm -f pl_gram.c pl_gram.h

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp