@@ -180,22 +180,22 @@ dump_variables(struct arguments * list)
180
180
181
181
%token <tagname> SQL_START SQL_SEMI SQL_STRING SQL_INTO
182
182
%token <tagname> SQL_BEGIN SQL_END SQL_DECLARE SQL_SECTION SQL_INCLUDE
183
- %token <tagname> SQL_CONNECT SQL_OPEN
184
- %token <tagname> SQL_COMMIT SQL_ROLLBACK
183
+ %token <tagname> SQL_CONNECT SQL_OPEN SQL_EXECUTE SQL_IMMEDIATE
184
+ %token <tagname> SQL_COMMIT SQL_ROLLBACK SQL_RELEASE SQL_WORK
185
185
186
186
%token <tagname> S_SYMBOL S_LENGTH S_ANYTHING
187
187
%token <tagname> S_VARCHAR S_VARCHAR2
188
188
%token <tagname> S_EXTERN S_STATIC S_AUTO S_CONST S_REGISTER S_STRUCT
189
189
%token <tagname> S_UNSIGNED S_SIGNED
190
190
%token <tagname> S_LONG S_SHORT S_INT S_CHAR S_FLOAT S_DOUBLE S_BOOL
191
- %token <tagname> ' [' ' ]' ' ;' ' ,' ' {' ' }'
191
+ %token <tagname> ' [' ' ]' ' ;' ' ,' ' {' ' }' ' = ' ' * '
192
192
193
193
%type <type> type type_detailed varchar_type simple_type array_type struct_type
194
194
%type <symbolname> symbol
195
- %type <tagname> maybe_storage_clause varchar_tag
195
+ %type <tagname> maybe_storage_clause varchar_tag db_name
196
196
%type <type_enum> simple_tag
197
197
%type <indexsize> index length
198
- %type <tagname> canything sqlanything both_anything
198
+ %type <tagname> canything sqlanything both_anything vartext commit_release
199
199
200
200
201
201
%%
@@ -210,6 +210,7 @@ statement : sqldeclaration
210
210
| sqlopen
211
211
| sqlcommit
212
212
| sqlrollback
213
+ | sqlexecute
213
214
| sqlstatement
214
215
| cthing
215
216
| blockstart
@@ -222,17 +223,18 @@ sqldeclaration : sql_startdeclare
222
223
sql_startdeclare :SQL_START SQL_BEGIN SQL_DECLARE SQL_SECTION SQL_SEMI {
223
224
fprintf (yyout," /* exec sql begin declare section */\n " );
224
225
output_line_number ();
225
- };
226
+ }
227
+
226
228
sql_enddeclare :SQL_START SQL_END SQL_DECLARE SQL_SECTION SQL_SEMI {
227
229
fprintf (yyout," /* exec sql end declare section */\n " );
228
230
output_line_number ();
229
- };
231
+ }
230
232
231
233
variable_declarations :/* empty*/
232
- | variable_declarations variable_declaration ;
234
+ | variable_declarations variable_declaration ;
233
235
234
236
/* Here is where we can enter support for typedef.*/
235
- variable_declaration :type ' ;' {
237
+ variable_declaration :type initializer ' ;' {
236
238
/* don't worry about our list when we're working on a struct*/
237
239
if (struct_level ==0 )
238
240
{
@@ -242,6 +244,12 @@ variable_declaration : type ';'{
242
244
fprintf (yyout," ;" );
243
245
}
244
246
247
+ initializer :/* empty*/
248
+ | ' =' {fwrite(yytext, yyleng,1 , yyout);}vartext ;
249
+
250
+ vartext :both_anything {fwrite(yytext, yyleng,1 , yyout);}
251
+ | vartext both_anything {fwrite(yytext, yyleng,1 , yyout);}
252
+
245
253
symbol :S_SYMBOL {
246
254
char * name = (char *)malloc(yyleng +1 );
247
255
@@ -255,10 +263,14 @@ type : maybe_storage_clause type_detailed { $<type>$ = $<type>2; };
255
263
type_detailed :varchar_type { $<type>$ = $<type>1 ; }
256
264
| simple_type { $<type>$ = $<type>1 ; }
257
265
| array_type {$<type>$ = $<type>1 ; }
266
+ | pointer_type {$<type>$ = $<type>1 ; }
258
267
| struct_type {$<type>$ = $<type>1 ; };
259
268
260
269
varchar_type :varchar_tag symbol index {
261
- fprintf (yyout," struct varchar_%s { int len; char arr[%d]; } %s" , $<symbolname>2 , $<indexsize>3 , $<symbolname>2 );
270
+ if ($<indexsize>3 >0 )
271
+ fprintf (yyout," struct varchar_%s { int len; char arr[%d]; } %s" , $<symbolname>2 , $<indexsize>3 , $<symbolname>2 );
272
+ else
273
+ fprintf (yyout," struct varchar_%s { int len; char arr[%d]; } %s" , $<symbolname>2 , $<indexsize>3 , $<symbolname>2 );
262
274
if (struct_level ==0 )
263
275
{
264
276
$<type>$.name = $<symbolname>2 ;
@@ -283,7 +295,10 @@ simple_type : simple_tag symbol {
283
295
}
284
296
285
297
array_type :simple_tag symbol index {
286
- fprintf (yyout," %s %s [%d]" , ECPGtype_name($<type_enum>1 ), $<symbolname>2, $<indexsize>3);
298
+ if ($<indexsize>3 >0 )
299
+ fprintf (yyout," %s %s [%d]" , ECPGtype_name($<type_enum>1 ), $<symbolname>2, $<indexsize>3);
300
+ else
301
+ fprintf (yyout," %s %s []" , ECPGtype_name($<type_enum>1 ), $<symbolname>2);
287
302
if (struct_level ==0 )
288
303
{
289
304
$<type>$.name = $<symbolname>2 ;
@@ -293,6 +308,17 @@ array_type : simple_tag symbol index {
293
308
ECPGmake_record_member ($<symbolname>2 , ECPGmake_array_type(ECPGmake_simple_type($<type_enum>1 ), $<indexsize>3), &(record_member_list[struct_level-1 ]));
294
309
}
295
310
311
+ pointer_type :simple_tag ' *' symbol {
312
+ fprintf (yyout," %s * %s" , ECPGtype_name($<type_enum>1 ), $<symbolname>3);
313
+ if (struct_level ==0 )
314
+ {
315
+ $<type>$.name = $<symbolname>3 ;
316
+ $<type>$.typ = ECPGmake_array_type(ECPGmake_simple_type($<type_enum>1 ),0 );
317
+ }
318
+ else
319
+ ECPGmake_record_member ($<symbolname>3 , ECPGmake_array_type(ECPGmake_simple_type($<type_enum>1 ), 0), &(record_member_list[struct_level-1 ]));
320
+ }
321
+
296
322
s_struct :S_STRUCT symbol {
297
323
struct_level++;
298
324
fprintf (yyout," struct %s {" , $<symbolname>2 );
@@ -330,9 +356,8 @@ maybe_storage_clause : S_EXTERN { fwrite(yytext, yyleng, 1, yyout); }
330
356
| S_AUTO { fwrite(yytext, yyleng,1 , yyout); }
331
357
| /* empty*/ { };
332
358
333
- index :' [' length ' ]' {
334
- $<indexsize>$ = $<indexsize>2 ;
335
- };
359
+ index :' [' length ' ]' { $<indexsize>$ = $<indexsize>2 ; }
360
+ | ' [' ' ]' { $<indexsize>$ =0 ; }
336
361
337
362
length :S_LENGTH { $<indexsize>$ = atoi(yytext); }
338
363
@@ -342,9 +367,24 @@ sqlinclude : SQL_START SQL_INCLUDE { fprintf(yyout, "#include \""); }
342
367
filename :cthing
343
368
| filename cthing ;
344
369
345
- sqlconnect :SQL_START SQL_CONNECT { fprintf(yyout," ECPGconnect(\" " ); }
346
- SQL_STRING { fwrite(yytext +1 , yyleng -2 ,1 , yyout); }
347
- SQL_SEMI { fprintf(yyout," \" );" ); output_line_number(); };
370
+ sqlconnect :SQL_START SQL_CONNECT { fprintf(yyout," ECPGconnect(" ); }
371
+ db_name
372
+ SQL_SEMI { fprintf(yyout," );" ); output_line_number();}
373
+
374
+ db_name :SQL_STRING { fprintf(yyout," \" " ); fwrite(yytext +1 , yyleng -2 ,1 , yyout); fprintf(yyout," \" " ); }
375
+ | ' :' symbol {/* check if we have a char variabnle*/
376
+ struct variable *p = find_variable($<symbolname>2 );
377
+ enum ECPGttype typ = p->type->typ;
378
+
379
+ /* if array see what's inside*/
380
+ if (typ == ECPGt_array)
381
+ typ = p->type->u.element->typ;
382
+
383
+ if (typ != ECPGt_char && typ != ECPGt_unsigned_char)
384
+ yyerror (" invalid datatype" );
385
+
386
+ fprintf (yyout," %s" , $<symbolname>2 );
387
+ }
348
388
349
389
/* Open is an open cursor. Removed.*/
350
390
sqlopen :SQL_START SQL_OPEN sqlgarbage SQL_SEMI { output_line_number(); };
@@ -353,21 +393,37 @@ sqlgarbage : /* Empty */
353
393
| sqlgarbage sqlanything ;
354
394
355
395
356
- sqlcommit :SQL_START SQL_COMMIT SQL_SEMI {
396
+ sqlcommit :SQL_START commit_release SQL_SEMI {
357
397
fprintf (yyout," ECPGcommit(__LINE__);" );
358
398
output_line_number ();
359
- };
399
+ }
400
+
401
+ commit_release :SQL_COMMIT
402
+ | SQL_COMMIT SQL_RELEASE
403
+ | SQL_COMMIT SQL_WORK SQL_RELEASE ;
404
+
360
405
sqlrollback :SQL_START SQL_ROLLBACK SQL_SEMI {
361
406
fprintf (yyout," ECPGrollback(__LINE__);" );
362
407
output_line_number ();
363
408
};
364
409
410
+ sqlexecute :SQL_START {/* Reset stack*/
411
+ reset_variables ();
412
+ fprintf (yyout," ECPGdo(__LINE__,\" " );
413
+ }SQL_EXECUTE SQL_IMMEDIATE sqlstatement_words SQL_SEMI {
414
+ /* Dump*/
415
+ fprintf (yyout," \" ," );
416
+ dump_variables (argsinsert);
417
+ fprintf (yyout," ECPGt_EOIT," );
418
+ dump_variables (argsresult);
419
+ fprintf (yyout," ECPGt_EORT );" );
420
+ output_line_number ();
421
+ };
422
+
365
423
sqlstatement :SQL_START {/* Reset stack*/
366
424
reset_variables ();
367
425
fprintf (yyout," ECPGdo(__LINE__,\" " );
368
- }
369
- sqlstatement_words
370
- SQL_SEMI {
426
+ }sqlstatement_words SQL_SEMI {
371
427
/* Dump*/
372
428
fprintf (yyout," \" ," );
373
429
dump_variables (argsinsert);
@@ -416,15 +472,15 @@ canything : both_anything
416
472
sqlanything :both_anything ;
417
473
418
474
both_anything :S_LENGTH | S_VARCHAR | S_VARCHAR2
419
- | S_LONG | S_SHORT | S_INT | S_CHAR | S_FLOAT | S_DOUBLE | S_BOOL
475
+ | S_LONG | S_SHORT | S_INT | S_CHAR | S_FLOAT | S_DOUBLE | S_BOOL
420
476
| SQL_OPEN | SQL_CONNECT
421
477
| SQL_STRING
422
478
| SQL_BEGIN | SQL_END
423
479
| SQL_DECLARE | SQL_SECTION
424
480
| SQL_INCLUDE
425
481
| S_SYMBOL
426
482
| S_STATIC | S_EXTERN | S_AUTO | S_CONST | S_REGISTER | S_STRUCT
427
- | ' [' | ' ]' | ' ,'
483
+ | ' [' | ' ]' | ' ,' | ' = ' | ' * '
428
484
| S_ANYTHING ;
429
485
430
486
blockstart :' {' {