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

Commitc9576ca

Browse files
author
Michael Meskes
committed
*** empty log message ***
1 parent92008a2 commitc9576ca

File tree

6 files changed

+164
-66
lines changed

6 files changed

+164
-66
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,5 +875,14 @@ Sun Mar 19 11:03:13 CET 2000
875875
Thu Mar 23 08:13:39 CET 2000
876876

877877
- Synced preproc.y and keyword.c.
878+
879+
Wed Mar 29 09:03:26 CEST 2000
880+
881+
- Fixed string parsing bug in pgc.l.
882+
883+
Thu Mar 30 11:11:13 CEST 2000
884+
885+
- Synced preproc.y with gram.y.
886+
- Fixed comment parsing bug.
878887
- Set library version to 3.1.0.
879888
- Set ecpg version to 2.7.0.

‎src/interfaces/ecpg/lib/Makefile.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.64 2000/03/09 09:17:10 meskes Exp $
9+
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.65 2000/03/30 11:41:34 meskes Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -36,11 +36,6 @@ include $(SRCDIR)/Makefile.shlib
3636

3737
install: install-lib$(install-shlib-dep)
3838

39-
# Handmade dependencies in case make depend not done
40-
ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
41-
typename.o : typename.c ../include/ecpgtype.h
42-
43-
4439
.PHONY: clean
4540

4641
clean: clean-shlib

‎src/interfaces/ecpg/preproc/Makefile.in

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PATCHLEVEL=0
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION)\
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\
10-
-DINCLUDE_PATH=\"$(HEADERDIR)\"
10+
-DINCLUDE_PATH=\"$(HEADERDIR)\"
1111

1212
OBJS=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\
1313
keywords.o c_keywords.o ../lib/typename.o descriptor.o variable.o
@@ -35,7 +35,7 @@ pgc.c: pgc.l
3535
mv lex.yy.c pgc.c
3636

3737
clean:
38-
rm -f*.o core a.out ecpg$(X)*~*.output
38+
rm -f*.o core a.out ecpg$(X)*~*.output*.tab.c
3939
# And the garbage that might have been left behind by partial build:
4040
rm -f y.tab.c y.tab.h lex.yy.c
4141
# make clean does not remove preproc.c, preproc.h, pgc.c since we want
@@ -47,10 +47,9 @@ install: all
4747
uninstall:
4848
rm -f$(BINDIR)/ecpg
4949

50-
preproc.o: preproc.h ../include/ecpgtype.h keywords.c c_keywords.c ecpg_keywords.c
51-
type.o: ../include/ecpgtype.h
52-
pgc.o: ../include/ecpgtype.h keywords.c c_keywords.c ecpg_keywords.c preproc.h
53-
keywords.o: ../include/ecpgtype.h preproc.h
54-
c_keywords.o: ../include/ecpgtype.h preproc.h
55-
ecpg_keywords.o: ../include/ecpgtype.h preproc.h
50+
dependdep: preproc.c pgc.c
51+
$(CC) -MM$(CFLAGS)*.c>depend
5652

53+
ifeq (depend,$(wildcard depend))
54+
include depend
55+
endif

‎src/interfaces/ecpg/preproc/pgc.l

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.56 2000/03/18 18:03:10 tgl Exp $
15+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.57 2000/03/30 11:41:40 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -279,10 +279,10 @@ cppline{space}*#(.*\\{line_end})*.*
279279

280280
{xcstart}{
281281
state_before = YYSTATE;
282-
ECHO;
283282
BEGIN(xc);
284283
/* Put back any characters past slash-star; see above */
285284
yyless(2);
285+
fputs("/*", yyout);
286286
}
287287

288288
<xc>{xcstop}{ ECHO;BEGIN(state_before); }
@@ -354,20 +354,28 @@ cppline{space}*#(.*\\{line_end})*.*
354354

355355
<xq><<EOF>> {mmerror(ET_ERROR,"Unterminated quoted string"); }
356356

357-
{xdstart}{
357+
<SQL>{xdstart}{
358358
state_before = YYSTATE;
359359
BEGIN(xd);
360360
startlit();
361361
}
362-
<xd>{xdstop}{
362+
<xd,xdc>{xdstop}{
363363
BEGIN(state_before);
364364
yylval.str =mm_strdup(literalbuf);
365365
return CSTRING;
366366
}
367367
<xd>{xdinside}{
368368
addlit(yytext, yyleng);
369369
}
370-
<xd><<EOF>> {mmerror(ET_ERROR,"Unterminated quoted identifier"); }
370+
<xd,xdc><<EOF>> {mmerror(ET_ERROR,"Unterminated quoted identifier"); }
371+
{xdstart}{
372+
state_before = YYSTATE;
373+
BEGIN(xdc);
374+
startlit();
375+
}
376+
<xdc>{xdcinside}{
377+
addlit(yytext, yyleng);
378+
}
371379
<SQL>{typecast}{return TYPECAST; }
372380
<SQL>{self}{/*
373381
* We may find a ';' inside a structure

0 commit comments

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