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

V0.8: Remork previous patch to use the correct method

This commit is contained in:
Cary R 2008-06-25 14:41:03 -07:00 committed by Stephen Williams
parent 6df10a082b
commit cf01d1a75f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ivlpp/lexor.lex
View File

@ -93,7 +93,7 @@ static void ifdef_enter(void)
cur = (struct ifdef_stack_t*) cur = (struct ifdef_stack_t*)
calloc(1, sizeof(struct ifdef_stack_t)); calloc(1, sizeof(struct ifdef_stack_t));
cur->path = strdup(istack->path); if (istack->path) cur->path = strdup(istack->path);
cur->lineno = istack->lineno; cur->lineno = istack->lineno;
cur->next = ifdef_stack; cur->next = ifdef_stack;
ifdef_stack = cur; ifdef_stack = cur;
@ -108,7 +108,10 @@ static void ifdef_leave(void)
cur = ifdef_stack; cur = ifdef_stack;
ifdef_stack = cur->next; ifdef_stack = cur->next;
if (strcmp(istack->path,cur->path) != 0) { /* If either path is from a non-file context e.g.(macro expansion)
* we assume that the non-file part is from this file. */
if (istack->path != NULL && cur->path != NULL &&
strcmp(istack->path,cur->path) != 0) {
fprintf(stderr, "%s:%u: warning: " fprintf(stderr, "%s:%u: warning: "
"This `endif matches an ifdef in another file.\n", "This `endif matches an ifdef in another file.\n",
istack->path, istack->lineno); istack->path, istack->lineno);
@ -459,8 +462,6 @@ static void def_match()
calloc(1, sizeof(struct include_stack_t)); calloc(1, sizeof(struct include_stack_t));
isp->str = cur->value; isp->str = cur->value;
isp->next = istack; isp->next = istack;
isp->path = istack->path;
isp->lineno = istack->lineno;
istack->yybs = YY_CURRENT_BUFFER; istack->yybs = YY_CURRENT_BUFFER;
istack = isp; istack = isp;
yy_switch_to_buffer(yy_create_buffer(istack->file, YY_BUF_SIZE)); yy_switch_to_buffer(yy_create_buffer(istack->file, YY_BUF_SIZE));