Skip to content

Commit 4a13f33

Browse files
starseekerstarseeker
committed
Merge brlcad commits for step though 54859
1 parent 3181202 commit 4a13f33

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

‎src/express/expparse.y‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ enumeration_type ::= TOK_ENUMERATION TOK_OF nested_id_list(A).
875875
/* 1st visibility */
876876
DICT_define(CURRENT_SCOPE->symbol_table, x->symbol.name,
877877
(Generic)x, &x->symbol, OBJ_EXPRESSION);
878-
DICTdefine(PREVIOUS_SCOPE->symbol_table, x->symbol.name,
878+
DICTdefine(PREVIOUS_SCOPE->enum_table, x->symbol.name,
879879
(Generic)x, &x->symbol, OBJ_EXPRESSION);
880880
SYMBOL_destroy(tmp);
881881
} LISTod;
@@ -2466,6 +2466,8 @@ while_control(A) ::= TOK_WHILE expression(B).
24662466
fprintf(stderr, "Last token (type %d) had value %x\n", yymajor, yyminor.yy0.val);
24672467
}
24682468

2469+
%stack_size 200
2470+
24692471
%stack_overflow {
24702472
fprintf(stderr, "Express parser experienced stack overflow.\n");
24712473
fprintf(stderr, "Last token had value %x\n", yypMinor->yy0.val);

‎src/express/generated/expparse.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void parserInitState()
188188
yyexpresult->symbol.filename = yyexpresult->u.express->filename;
189189
yyexpresult->symbol.line = 1;
190190
}
191-
#line 2474 "expparse.y"
191+
#line 2476 "expparse.y"
192192

193193
static void
194194
yyerror(const char *yytext, char *string)
@@ -291,7 +291,7 @@ typedef union {
291291
Statement yy522;
292292
} YYMINORTYPE;
293293
#ifndef YYSTACKDEPTH
294-
#define YYSTACKDEPTH 100
294+
#define YYSTACKDEPTH 200
295295
#endif
296296
#define ParseARG_SDECL parse_data_t parseData ;
297297
#define ParseARG_PDECL , parse_data_t parseData
@@ -1841,7 +1841,7 @@ static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){
18411841
while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser);
18421842
/* Here code is inserted which will execute if the parser
18431843
** stack every overflows */
1844-
#line 2469 "expparse.y"
1844+
#line 2471 "expparse.y"
18451845

18461846
fprintf(stderr, "Express parser experienced stack overflow.\n");
18471847
fprintf(stderr, "Last token had value %x\n", yypMinor->yy0.val);
@@ -2884,7 +2884,7 @@ static void yy_reduce(
28842884
/* 1st visibility */
28852885
DICT_define(CURRENT_SCOPE->symbol_table, x->symbol.name,
28862886
(Generic)x, &x->symbol, OBJ_EXPRESSION);
2887-
DICTdefine(PREVIOUS_SCOPE->symbol_table, x->symbol.name,
2887+
DICTdefine(PREVIOUS_SCOPE->enum_table, x->symbol.name,
28882888
(Generic)x, &x->symbol, OBJ_EXPRESSION);
28892889
SYMBOL_destroy(tmp);
28902890
} LISTod;

‎src/express/generated/verification_info.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set(baseline_perplex_version "1.0.0")
55
set(baseline_lempar_c_md5 be967611b8e05f74bddd7f2214e2bbb0)
66
set(baseline_perplex_template_c_md5 a01d5673b979cc6b5740812e1a65df86)
77
set(baseline_expscan_l_md5 1dd32f5ae123f358c9a27759f25d519b)
8-
set(baseline_expparse_y_md5 31d665302035889af06c56baf4f14b2b)
8+
set(baseline_expparse_y_md5 bcabaab46e304f762c8a94e02150a29c)
99
set(baseline_expscan_c_md5 dbe513399f365f4323acb03fd476ddf4)
1010
set(baseline_expscan_h_md5 57d55bbf95d84846e735e307f7032bcd)
11-
set(baseline_expparse_c_md5 accfb4ba75d4d3f65ab93935e91d9b95)
11+
set(baseline_expparse_c_md5 d226e4990b59879bb5c32f39a2e9751f)
1212
set(baseline_expparse_h_md5 3760ebbc81cef310ca47796d55edc3d5)

‎src/fedex_plus/classes.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,10 @@ void LIBstructor_print( Entity entity, FILE * file, Schema schema ) {
15521552
fprintf( file, "\n" );
15531553
list = ENTITYget_supertypes( entity );
15541554
if( ! LISTempty( list ) ) {
1555+
if( LISTget_length( list ) > 1) {
1556+
fprintf( file, " int attrFlags[3];\n" );
1557+
}
1558+
15551559
LISTdo( list, e, Entity )
15561560
/* if there\'s no super class yet,
15571561
or the super class doesn\'t have any attributes
@@ -1576,7 +1580,6 @@ void LIBstructor_print( Entity entity, FILE * file, Schema schema ) {
15761580
" diamond shaped hierarchies for each additional parent at this\n" );
15771581
fprintf( file,
15781582
" level. You currently must hand edit this for it to work. */\n" );
1579-
fprintf( file, " int attrFlags[3]; // e.g.\n" );
15801583
fprintf( file, " attrFlags[0] = 1; // add parents attrs\n" );
15811584
fprintf( file,
15821585
" attrFlags[1] = 0; // add parent of parents attrs\n" );
@@ -1768,6 +1771,10 @@ void LIBstructor_print_w_args( Entity entity, FILE * file, Schema schema ) {
17681771
fprintf( file, "\n" );
17691772
list = ENTITYget_supertypes( entity );
17701773
if( ! LISTempty( list ) ) {
1774+
if( LISTget_length( list ) > 1) {
1775+
fprintf( file, " int attrFlags[3];\n" );
1776+
}
1777+
17711778
LISTdo( list, e, Entity )
17721779
/* if there\'s no super class yet,
17731780
or the super class doesn\'t have any attributes
@@ -1790,7 +1797,6 @@ void LIBstructor_print_w_args( Entity entity, FILE * file, Schema schema ) {
17901797
" diamond shaped hierarchies for each additional parent at this\n" );
17911798
fprintf( file,
17921799
" level. You currently must hand edit this for it to work. */\n" );
1793-
fprintf( file, " int attrFlags[3]; // e.g.\n" );
17941800
fprintf( file, " attrFlags[0] = 1; // add parents attrs\n" );
17951801
fprintf( file,
17961802
" attrFlags[1] = 1; // add parent of parents attrs\n" );

0 commit comments

Comments
 (0)