Tue May 27 16:33:36 CEST 2003

- Accept stdin/stdout as input/output file.

Thu May 29 13:58:25 CEST 2003

- ecpg should now be able to parse forward struct definition.

- Set ecpg version to 2.12.0.

- Set ecpg library to 3.4.2.

- Set pgtypes library to 1.0.0

identifier{letter}{letter_or_digit}*

array({letter_or_digit}|[\+\-\*\%\/\(\)])*

<incl>\<[^\>]+\>{space}*";"?{parse_include(); }

<incl>{dquote}{xdinside}{dquote}{space}*";"?{parse_include(); }

<incl>[^;\<\>\"]+";"{

parse_include();

#if0

/* got the include file name */

struct _yy_buffer *yb;

struct _include_path *ip;

char inc_file[MAXPGPATH];

unsigned int i;

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;

/*

* skip the ";" and trailing whitespace. Note that yytext contains

* at least one non-space character plus the ";"

*/

for ( i = strlen(yytext)-2;

i > 0 && isspace((unsigned char) yytext[i]);

i-- )

{}

yytext[i+1] = '\0';

yyin = NULL;

/* If file name is enclosed in '"' remove these and look only in '.' */

/* Informix does look into all include paths though, except filename starts with '/' */

if ((yytext[0] == '"' && yytext[i] == '"') && (compat != ECPG_COMPAT_INFORMIX || yytext[0] == '/'))

{

yytext[i] = '\0';

memmove(yytext, yytext+1, strlen(yytext));

strncpy(inc_file, yytext, sizeof(inc_file));

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");

}

}

}

else

{

if (yytext[0] == '"' && yytext[i] == '"')

{

yytext[i] = '\0';

memmove(yytext, yytext+1, strlen(yytext));

}

for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next)

{

if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH)

{

fprintf(stderr, "Error: Path %s/%s is too long in line %d, skipping.\n", ip->path, yytext, yylineno);

continue;

}

snprintf (inc_file, sizeof(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)

{

snprintf(errortext, sizeof(errortext), "Cannot open include file %s in line %d\n", yytext, yylineno);

mmerror(NO_INCLUDE_FILE, ET_FATAL, errortext);

}

input_filename = mm_strdup(inc_file);

yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE ));

yylineno = 1;

output_line_number();

BEGIN C;

#endif

}

<incl>[^;\<\>\"]+";"{parse_include(); }

<<EOF>>{

if (yy_buffer ==NULL) {

staticchar *ECPGstruct_sizeof =NULL;

staticchar *forward_name =NULL;

structECPGtype ecpg_no_indicator = {ECPGt_NO_INDICATOR,0L,NULL, {NULL}};

structvariable no_indicator = {"no_indicator", &ecpg_no_indicator,0,NULL};

enumECPGttypetype_enum;

enumECPGdtypedtype_enum;

structfetch_descdescriptor;

structsu_symbolstruct_union;

}

}

{

printf("MM: %s\n", $1);

if ($1[0] =='\"')

$$ =$1;

elseif (strcmp($1," ?") ==0)/* variable*/

{

char *name =$1;

structtypedefs *this = get_typedef(name);

$$.type_str = mm_strdup(this->name);

$$.type_enum =this->type->type_enum;

$$.type_dimension =this->type->type_dimension;

$$.type_index =this->type->type_index;

$$.type_sizeof =this->type->type_sizeof;

struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);

free(name);

char *name;

structtypedefs *this;

bool forward = (strcmp($1.symbol, forward_name) ==0 && strcmp($1.su,"struct") ==0);

name = cat2_str($1.su,$1.symbol);

if (!forward)

{

this = get_typedef(name);

$$.type_str = mm_strdup(this->name);

$$.type_enum =this->type->type_enum;

$$.type_dimension =this->type->type_dimension;

$$.type_index =this->type->type_index;

$$.type_sizeof =this->type->type_sizeof;

struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);

free(name);

}

{

$$.type_str = name;

$$.type_enum = ECPGt_long;

$$.type_dimension = make_str("-1");

$$.type_index = make_str("-1");

$$.type_sizeof = make_str("");

struct_member_list[struct_level] =NULL;

}

}

;

{

char *name =$1;

structtypedefs *this = get_typedef(name);

$$.type_str = mm_strdup(this->name);

$$.type_enum =this->type->type_enum;

$$.type_dimension =this->type->type_dimension;

$$.type_index =this->type->type_index;

$$.type_sizeof =this->type->type_sizeof;

struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);

free(name);

char *name;

structtypedefs *this;

bool forward = (strcmp($1.symbol, forward_name) ==0 && strcmp($1.su,"struct") ==0);

name = cat2_str($1.su,$1.symbol);

if (!forward)

{

this = get_typedef(name);

$$.type_str = mm_strdup(this->name);

$$.type_enum =this->type->type_enum;

$$.type_dimension =this->type->type_dimension;

$$.type_index =this->type->type_index;

$$.type_sizeof =this->type->type_sizeof;

struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list);

free(name);

}

{

$$.type_str = name;

$$.type_enum = ECPGt_long;

$$.type_dimension = make_str("-1");

$$.type_index = make_str("-1");

$$.type_sizeof = make_str("");

struct_member_list[struct_level] =NULL;

}

}

;

struct_member_list[struct_level++] =NULL;

if (struct_level >= STRUCT_DEPTH)

mmerror(PARSE_ERROR, ET_ERROR,"Too many levels in nested structure/union definition");

forward_name = mm_strdup($1.symbol);

}

{

ECPGfree_struct_member(struct_member_list[struct_level]);

struct_member_list[struct_level] =NULL;

free(actual_storage[struct_level--]);

if (strncmp($1,"struct",sizeof("struct")-1) ==0)

if (strncmp($1.su,"struct",sizeof("struct")-1) ==0)

$$.type_enum = ECPGt_struct;

$$.type_enum = ECPGt_union;

$$.type_str = mm_strdup($1);

$$.type_sizeof = cat_str(4,$1, make_str("{"),$4, make_str("}"));

$$.type_str = cat2_str($1.su,$1.symbol);

$$.type_sizeof = cat_str(4, mm_strdup($$.type_str), make_str("{"),$4, make_str("}"));

free(forward_name);

forward_name =NULL;

}

;

s_struct_union_symbol:SQL_STRUCTsymbol

{

$$ = cat2_str(make_str("struct"),$2);

ECPGstruct_sizeof = cat_str(3, make_str("sizeof("), strdup($$), make_str(")"));

$$.su = make_str("struct");

$$.symbol =$2;

ECPGstruct_sizeof = cat_str(3, make_str("sizeof("), cat2_str(mm_strdup($$.su), mm_strdup($$.symbol)), make_str(")"));

}

{

$$ = cat2_str(make_str("union"),$2);

$$.su = make_str("union");

$$.symbol =$2;

}

;

caseECPGt_array:

if (indicator_set&&ind_type->type!=ECPGt_array)

mmerror(INDICATOR_NOT_ARRAY,ET_FATAL,"Indicator for array/pointer has to be array/pointer.\n");

switch (type->u.element->type)

{

caseECPGt_array:

mmerror(PARSE_ERROR,ET_ERROR,"No nested arrays allowed (except strings)");/* array of array */

break;

caseECPGt_struct:

caseECPGt_union:

/* If var_array_element is not equal * NULL, we have to use the * <var_array_element>th entry and not * the whole array */if (var_array_element==NULL)

ECPGdump_a_struct(o,name,ind_name,type->size,

if (var_array_element==NULL)

ECPGdump_a_struct(o,name,

ind_name,

type->size,

type->u.element,

(ind_type->type==ECPGt_NO_INDICATOR) ?ind_type :ind_type->u.element,

NULL,prefix,ind_prefix);

char*str;

};

{

char*su;

char*symbol;

};

{

enumECPGttypetype_enum;