mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Michael Meskes 2000-03-03 09:56:03 +00:00
parent 85b2875a3a
commit 3a81a1a462
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/sgml/ecpg.sgml
View File

@ -2,7 +2,7 @@
<DocInfo> <DocInfo>
<AuthorGroup> <AuthorGroup>
<Author> <Author>
<FirstName>Linux</FirstName> <FirstName>Linus</FirstName>
<Surname>Tolke</Surname> <Surname>Tolke</Surname>
</Author> </Author>
<Author> <Author>

4
src/interfaces/ecpg/ChangeLog
View File

@ -848,5 +848,9 @@ Thu Mar 2 17:42:16 CET 2000
- Print error message if an indicator array is given for input - Print error message if an indicator array is given for input
variables. variables.
Fri Mar 3 10:47:06 CET 2000
- Fixed handling of double quote in C code.
- Set library version to 3.1.0. - Set library version to 3.1.0.
- Set ecpg version to 2.7.0. - Set ecpg version to 2.7.0.

33
src/interfaces/ecpg/preproc/pgc.l
View File

@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.51 2000/02/22 19:57:10 meskes Exp $ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.52 2000/03/03 09:56:03 meskes Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -51,7 +51,7 @@ static int literalalloc; /* current allocated buffer size */
#define startlit() (literalbuf[0] = '\0', literallen = 0) #define startlit() (literalbuf[0] = '\0', literallen = 0)
static void addlit(char *ytext, int yleng); static void addlit(char *ytext, int yleng);
int before_comment; int state_before;
struct _yy_buffer { YY_BUFFER_STATE buffer; struct _yy_buffer { YY_BUFFER_STATE buffer;
long lineno; long lineno;
@ -268,12 +268,12 @@ cppline {space}*#(.*\\{line_end})*.*
{xcline} { ECHO; } {xcline} { ECHO; }
{xcstart} { {xcstart} {
before_comment = YYSTATE; state_before = YYSTATE;
ECHO; ECHO;
BEGIN(xc); BEGIN(xc);
} }
<xc>{xcstop} { ECHO; BEGIN(before_comment); } <xc>{xcstop} { ECHO; BEGIN(state_before); }
<xc>{xcinside} { ECHO; } <xc>{xcinside} { ECHO; }
@ -314,12 +314,13 @@ cppline {space}*#(.*\\{line_end})*.*
return ICONST; return ICONST;
} }
<SQL>{xqstart} { {xqstart} {
state_before == YYSTATE;
BEGIN(xq); BEGIN(xq);
startlit(); startlit();
} }
<xq>{xqstop} { <xq>{xqstop} {
BEGIN(SQL); BEGIN(state_before);
yylval.str = mm_strdup(literalbuf); yylval.str = mm_strdup(literalbuf);
return SCONST; return SCONST;
} }
@ -328,33 +329,23 @@ cppline {space}*#(.*\\{line_end})*.*
<xq>{xqliteral} { <xq>{xqliteral} {
addlit(yytext, yyleng); addlit(yytext, yyleng);
} }
<xq>{xqcat} { /* ignore */ <xq>{xqcat} {
/* ignore */
} }
<SQL>{xdstart} { {xdstart} {
state_before = YYSTATE;
BEGIN(xd); BEGIN(xd);
startlit(); startlit();
} }
<xd>{xdstop} { <xd>{xdstop} {
BEGIN(SQL); BEGIN(state_before);
yylval.str = mm_strdup(literalbuf); yylval.str = mm_strdup(literalbuf);
return CSTRING; return CSTRING;
} }
<xd>{xdinside} { <xd>{xdinside} {
addlit(yytext, yyleng); addlit(yytext, yyleng);
} }
{xdstart} {
BEGIN(xdc);
startlit();
}
<xdc>{xdstop} {
BEGIN(C);
yylval.str = mm_strdup(literalbuf);
return CSTRING;
}
<xdc>{xdcinside} {
addlit(yytext, yyleng);
}
<SQL>{typecast} { return TYPECAST; } <SQL>{typecast} { return TYPECAST; }
<SQL>{self} { /* <SQL>{self} { /*
* We may find a ';' inside a structure * We may find a ';' inside a structure

3
src/interfaces/ecpg/preproc/preproc.y
View File

@ -5086,6 +5086,7 @@ c_anything: IDENT { $$ = $1; }
| CSTRING { $$ = make3_str(make_str("\""), $1, make_str("\"")); } | CSTRING { $$ = make3_str(make_str("\""), $1, make_str("\"")); }
| Iconst { $$ = $1; } | Iconst { $$ = $1; }
| Fconst { $$ = $1; } | Fconst { $$ = $1; }
| Sconst { $$ = $1; }
| '*' { $$ = make_str("*"); } | '*' { $$ = make_str("*"); }
| '+' { $$ = make_str("+"); } | '+' { $$ = make_str("+"); }
| '-' { $$ = make_str("-"); } | '-' { $$ = make_str("-"); }
@ -5112,8 +5113,6 @@ c_anything: IDENT { $$ = $1; }
| VARCHAR { $$ = make_str("varchar"); } | VARCHAR { $$ = make_str("varchar"); }
| '[' { $$ = make_str("["); } | '[' { $$ = make_str("["); }
| ']' { $$ = make_str("]"); } | ']' { $$ = make_str("]"); }
/* | '(' { $$ = make_str("("); }
| ')' { $$ = make_str(")"); }*/
| '=' { $$ = make_str("="); } | '=' { $$ = make_str("="); }
blockstart : '{' { blockstart : '{' {