libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug about arrays

Browse Source
This commit is contained in:
Thomas Schmitt 2007-10-23 16:06:17 +00:00
parent cb68f7e0b7
commit bc5bb95dba
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libcevap/cgen.c
View File

@ -337,7 +337,10 @@ int flag;
pointer_level= Ctyp_get_pointer_level(ct,0); pointer_level= Ctyp_get_pointer_level(ct,0);
for(i=0;i<pointer_level;i++) for(i=0;i<pointer_level;i++)
fprintf(fp,"*"); fprintf(fp,"*");
fprintf(fp,"%s;\n",ct->name); fprintf(fp,"%s",ct->name);
if(ct->array_size>0)
fprintf(fp,"[%lu]",ct->array_size);
fprintf(fp,";\n");
} }
fprintf(fp,"\n"); fprintf(fp,"\n");
fprintf(fp,"};\n"); fprintf(fp,"};\n");
@ -438,7 +441,7 @@ int flag;
fp= cgen->fp; fp= cgen->fp;
fprintf(fp,"\n"); fprintf(fp,"\n");
fprintf(fp,"/*\n"); fprintf(fp,"/*\n");
fprintf(fp," cc -g -o %s.c\n",cgen->classname); fprintf(fp," cc -g -c %s.c\n",cgen->classname);
fprintf(fp,"*/\n"); fprintf(fp,"*/\n");
Cgen_write_datestr(cgen,0); Cgen_write_datestr(cgen,0);
fprintf(fp,"\n"); fprintf(fp,"\n");
@ -548,6 +551,18 @@ int flag;
} }
fprintf(fp,"{\n"); fprintf(fp,"{\n");
fprintf(fp," struct %s *o;\n",cgen->structname); fprintf(fp," struct %s *o;\n",cgen->structname);
/* Is an array index i needed ? */
for(ct= cgen->elements; ct!=NULL; ct= ct->next) {
if(ct->is_comment || ct->no_initializer)
continue;
if(ct->array_size>0)
if(strcmp(ct->dtype,"char")!=0) {
fprintf(fp," int i;\n");
break;
}
}
fprintf(fp,"\n"); fprintf(fp,"\n");
if(cgen->gen_for_stic) if(cgen->gen_for_stic)
fprintf(fp," *objpt= o= TSOB_FELD(struct %s,1);\n",cgen->structname); fprintf(fp," *objpt= o= TSOB_FELD(struct %s,1);\n",cgen->structname);
@ -568,15 +583,11 @@ int flag;
if(strcmp(ct->dtype,"char")==0) { if(strcmp(ct->dtype,"char")==0) {
fprintf(fp," o->%s[0]= 0;\n;",ct->name); fprintf(fp," o->%s[0]= 0;\n;",ct->name);
} else if(pointer_level>0) { } else if(pointer_level>0) {
fprintf(fp," { int i;"); fprintf(fp," for(i=0;i<%lu;i++)\n",array_size);
fprintf(fp," for(i=0;i<array_size;i++)\n;");
fprintf(fp," o->%s[i]= NULL;\n",ct->name); fprintf(fp," o->%s[i]= NULL;\n",ct->name);
fprintf(fp," }");
} else { } else {
fprintf(fp," { int i;"); fprintf(fp," for(i=0;i<%lu;i++)\n",array_size);
fprintf(fp," for(i=0;i<array_size;i++)\n;");
fprintf(fp," o->%s[i]= 0;\n",ct->name); fprintf(fp," o->%s[i]= 0;\n",ct->name);
fprintf(fp," }");
} }
} else if(pointer_level>0) { } else if(pointer_level>0) {
fprintf(fp," o->%s= NULL;\n",ct->name); fprintf(fp," o->%s= NULL;\n",ct->name);
@ -882,6 +893,7 @@ int flag;
fprintf(fp,"int idx;\n"); fprintf(fp,"int idx;\n");
fprintf(fp,"int flag;\n"); fprintf(fp,"int flag;\n");
} }
if(ct->management==4)
fprintf(fp,"/* Note: idx==-1 fetches the last item of the list */\n"); fprintf(fp,"/* Note: idx==-1 fetches the last item of the list */\n");
fprintf(fp,"{\n"); fprintf(fp,"{\n");
if(ct->management==4) { if(ct->management==4) {
@ -1082,7 +1094,6 @@ after_setter:;
fprintf(fp," *pt= npt;\n"); fprintf(fp," *pt= npt;\n");
fprintf(fp," }\n"); fprintf(fp," }\n");
fprintf(fp," return(*pt!=NULL);\n"); fprintf(fp," return(*pt!=NULL);\n");
fprintf(fp," ;\n");
fprintf(fp,"}\n"); fprintf(fp,"}\n");
fprintf(fp,"\n"); fprintf(fp,"\n");
} }

2
libcevap/ctyp.c
View File

@ -312,7 +312,7 @@ no_name:;
if(bpt!=NULL) { if(bpt!=NULL) {
if(strchr(bpt,']')!=NULL) if(strchr(bpt,']')!=NULL)
*strchr(bpt,']')= 0; *strchr(bpt,']')= 0;
sscanf(bpt,"%lu",&(o->array_size)); sscanf(bpt+1,"%lu",&(o->array_size));
*bpt= 0; *bpt= 0;
} }
if(Sregex_string(&(o->name),cpt,0)<=0) if(Sregex_string(&(o->name),cpt,0)<=0)