luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivlpp: Slight rearrangement of do_include() 

The ordering of the logic was a little strange before.
Also, there were unnecessary operations, like the assert
and the include_dir[0]=0 business.

Signed-off-by: Michael Witten <mfwitten@mit.edu>
This commit is contained in:
Michael Witten 2008-02-15 21:53:06 -05:00 committed by Stephen Williams
parent 105885402f
commit 2bd13964cd
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ivlpp/lexor.lex
View File

@ -1183,44 +1183,44 @@ static void do_include()
/* Add the current path to the start of the include_dir list. */ /* Add the current path to the start of the include_dir list. */
strcpy(path, istack->path); strcpy(path, istack->path);
cp = strrchr(path, '/'); cp = strrchr(path, '/');
if (cp == 0) start = 1; /* A base file so already in [1] */ if (cp == 0)
else *cp = '\0'; start = 1; /* A base file so already in [1] */
/* We do not need a strdup here since the path is read before else {
* it is overridden. If the search order is changed add a *cp = '\0';
* strdup here and a free before the include_dir[0] = 0 below.
*/ /* We do not need a strdup here since the path is read before
include_dir[0] = path; * it is overridden. If the search order is changed add a
* strdup here and a free below.
*/
include_dir[0] = path;
}
standby->file = 0; standby->file = 0;
for (idx = start ; idx < include_cnt ; idx += 1) { for (idx = start ; idx < include_cnt ; idx += 1) {
sprintf(path, "%s/%s", include_dir[idx], standby->path); sprintf(path, "%s/%s", include_dir[idx], standby->path);
standby->file = fopen(path, "r"); standby->file = fopen(path, "r");
if (standby->file) { if (standby->file) {
standby->path = strdup(path);
if(depend_file) { if(depend_file)
fprintf(depend_file, "%s\n", path); fprintf(depend_file, "%s\n", path);
}
break; if (line_direct_flag)
fprintf(yyout, "\n`line %u \"%s\" 1\n", istack->lineno+1, path);
standby->path = strdup(path);
standby->next = istack;
istack->yybs = YY_CURRENT_BUFFER;
istack = standby;
standby = 0;
yy_switch_to_buffer(yy_create_buffer(istack->file, YY_BUF_SIZE));
return;
} }
} }
include_dir[0] = 0;
} }
if (standby->file == 0) { fprintf(stderr, "%s:%u: Include file %s not found\n", istack->path, istack->lineno, standby->path);
fprintf(stderr, "%s:%u: Include file %s not found\n", exit(1);
istack->path, istack->lineno, standby->path);
exit(1);
}
assert(standby->file);
standby->next = istack;
istack->yybs = YY_CURRENT_BUFFER;
istack = standby;
standby = 0;
yy_switch_to_buffer(yy_create_buffer(istack->file, YY_BUF_SIZE));
if (line_direct_flag && istack->path)
fprintf(yyout, "\n`line %u \"%s\" 1\n",
istack->lineno+1, istack->path);
} }
/* walk the include stack until we find an entry with a valid pathname, /* walk the include stack until we find an entry with a valid pathname,