Here's my next patch to bring ecpg to version 1.1. It now correctly

handles all transaction commands and the exec sql include command.

Michael Meskes

src/interfaces/ecpg/preproc/pgc.l

@@ -1,15 +1,28 @@
 /* Copyright comment! */
 %{
 #include <sys/types.h>
+#include <limits.h>
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 #include "type.h"
 #include "y.tab.h"
 
 #include "extern.h"
 
+struct _yy_buffer { YY_BUFFER_STATE 	buffer;
+		    long		lineno;
+		    char	      * filename;
+		    struct _yy_buffer * next;
+		  } *yy_buffer = NULL;
+
 #define dbg(arg)       if (debugging) fprintf(stderr, "DEBUG, %d: %s\n", yylineno, #arg);
 %}
 %option yylineno
-%s C SQL
+%s C SQL incl
 ccomment	\/\*([^*]|\*[^/]|\*\*[^/])*\*\/
 ws	([ \t\n][ \t\n]*|{ccomment})*
 letter	[A-Za-z_]
@@ -19,6 +32,7 @@ symbol	{letter}({letter}|{digit})*
 label	({letter}|{digit})*
 string	'[^']*'
 
+abort	[aA][bB][oO][rR][tT]
 begin	[bB][eE][gG][iI][nN]
 commit  [cC][oO][mM][mM][iI][tT]
 connect [cC][oO][nN][nN][eE][cC][tT]
@@ -46,21 +60,23 @@ sql	[sS][qQ][lL]
 sqlerror [sS][qQ][lL][eE][rR][rR][oO][rR]
 sqlprint [sS][qQ][lL][pP][rR][iI][nN][tT]
 stop	[sS][tT][oO][pP]
+transaction [tT][rR][aA][nN][sS][aA][cC][tT][iI][oO][nN]
 to    	[tT][oO]
 varchar	[vV][aA][rR][cC][hH][aA][rR]
 varchar2	[vV][aA][rR][cC][hH][aA][rR]2
 whenever [wW][hH][eE][nN][eE][vV][eE][rR]
 work    [wW][oO][rR][kK]
+vacuum	[vV][aA][cC][uU][uU][mM]
 %%
 <C>{exec}{ws}{sql}	{ BEGIN SQL; dbg(SQL_START); return SQL_START; }
 <SQL>";"		{ BEGIN C; dbg(SQL_SEMI); return SQL_SEMI; }
+<SQL>{abort}		{ dbg(SQL_ABORT); return SQL_ABORT; }
 <SQL>{begin}		{ dbg(SQL_BEGIN); return SQL_BEGIN; }
 <SQL>{end}		{ dbg(SQL_END); return SQL_END; }
 <SQL>{declare}		{ dbg(SQL_DECLARE); return SQL_DECLARE; }
 <SQL>{execute}		{ dbg(SQL_EXECUTE); return SQL_EXECUTE; }
 <SQL>{immediate}	{ dbg(SQL_IMMEDIATE); return SQL_IMMEDIATE; }
 <SQL>{section}		{ dbg(SQL_SECTION); return SQL_SECTION; }
-<SQL>{include}		{ dbg(SQL_INCLUDE); return SQL_INCLUDE; }
 <SQL>{connect}		{ dbg(SQL_CONNECT); return SQL_CONNECT; }
 <SQL>{open}		{ dbg(SQL_OPEN); return SQL_OPEN; }
 <SQL>{commit}		{ dbg(SQL_COMMIT); return SQL_COMMIT; }
@@ -80,7 +96,62 @@ work    [wW][oO][rR][kK]
 <SQL>{stop}		{ dbg(SQL_STOP); return SQL_STOP; }
 <SQL>{do}		{ dbg(SQL_DO); return SQL_DO; }
 <SQL>{from}		{ dbg(SQL_FROM); return SQL_FROM; }
-			  
+<SQL>{transaction}	{ dbg(SQL_TRANSACTION); return SQL_TRANSACTION; }
+<SQL>{vacuum}		{ dbg(SQL_VACUUM); return SQL_VACUUM; }
+
+
+<C>{exec}{ws}{sql}{ws}{include}	{ BEGIN(incl); }
+<incl>{ws}		/* eat the whitespace */
+<incl>[^ \t\n]+ 	{ /* got the include file name */
+			  struct _yy_buffer *yb;
+			  struct _include_path *ip;
+			  char inc_file[PATH_MAX];
+
+			  yb = mm_alloc(sizeof(struct _yy_buffer));
+
+			  yb->buffer =  YY_CURRENT_BUFFER;
+			  yb->lineno = yylineno;
+			  yb->filename = input_filename;
+			  yb->next = yy_buffer;
+
+			  yy_buffer = yb;
+
+			  if (yytext[strlen(yytext) - 1] == ';')
+				yytext[strlen(yytext) - 1] = '\0';
+
+			  yyin = NULL;
+			  for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)
+			  {
+				if (strlen(ip->path) + strlen(yytext) + 3 > PATH_MAX)
+				{
+					fprintf(stderr, "Path %s/%s is too long, skipping.\n", ip->path, yytext);
+					continue;
+				}
+			  	sprintf (inc_file, "%s/%s", ip->path, yytext);
+		          	yyin = fopen( inc_file, "r" );
+			  	if (!yyin)
+				{
+					if (strcmp(inc_file + strlen(inc_file) - 2, ".h"))
+					{
+						strcat(inc_file, ".h");
+						yyin = fopen( inc_file, "r" );
+					}
+
+				}
+			  }
+			  if (!yyin)
+			  {
+				fprintf(stderr, "Cannot open include file %s\n", yytext);
+				exit(1); 
+			  }
+
+			  input_filename = strdup(inc_file);
+			  yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ));
+			  yylineno = 0;
+
+			  BEGIN C;
+			}
+<incl>";"		{ BEGIN C; }
 {length}		{ dbg(S_LENGTH); return S_LENGTH; }
 			  
 {varchar}		{ dbg(S_VARCHAR); return S_VARCHAR; }
@@ -154,6 +225,28 @@ struct			{ dbg(S_STRUCT); return S_STRUCT; }
 
 {ws}			{ ECHO; }
 .			{ dbg(.); return S_ANYTHING; }
+<<EOF>>			{ if (yy_buffer == NULL)
+				yyterminate();
+			  else
+			  {
+				struct _yy_buffer *yb = yy_buffer;
+
+				if (yyin != NULL)
+					fclose(yyin);
+
+				yy_delete_buffer( YY_CURRENT_BUFFER );
+				yy_switch_to_buffer(yy_buffer->buffer);
+
+				yylineno = yy_buffer->lineno;
+
+				free(input_filename);
+				input_filename = yy_buffer->filename;
+
+				yy_buffer = yy_buffer->next;
+				free(yb);
+			  }
+			}
+
 %%
 void
 lex_init(void)