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

Print `include comment after included text. 

The inline comment text that appears after an `include directive
should appear after the included text not before.
This commit is contained in:
Cary R 2008-11-03 11:29:34 -08:00 committed by Stephen Williams
parent ddb2c60701
commit 95ea159e75
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ivlpp/lexor.lex
View File

@ -78,6 +78,9 @@ struct include_stack_t
YY_BUFFER_STATE yybs; YY_BUFFER_STATE yybs;
struct include_stack_t* next; struct include_stack_t* next;
/* A single line comment can be associated with this include. */
char* comment;
}; };
static void emit_pathline(struct include_stack_t* isp); static void emit_pathline(struct include_stack_t* isp);
@ -295,9 +298,10 @@ keywords (include|define|undef|ifdef|ifndef|else|elseif|endif)
/* Catch single-line comments that share the line with an include /* Catch single-line comments that share the line with an include
* directive. And while I'm at it, I might as well preserve the * directive. And while I'm at it, I might as well preserve the
* comment in the output stream. * comment in the output stream. This will be printed after the
* file has been included.
*/ */
<PPINCLUDE>"//"[^\r\n]* { ECHO; } <PPINCLUDE>"//"[^\r\n]* { standby->comment = strdup(yytext); }
/* These finish the include directive (EOF or EOL) so I revert the /* These finish the include directive (EOF or EOL) so I revert the
* lexor state and execute the inclusion. * lexor state and execute the inclusion.
@ -1418,6 +1422,7 @@ static void include_filename()
standby->path = strdup(yytext+1); standby->path = strdup(yytext+1);
standby->path[strlen(standby->path)-1] = 0; standby->path[strlen(standby->path)-1] = 0;
standby->lineno = 0; standby->lineno = 0;
standby->comment = NULL;
} }
static void do_include() static void do_include()
@ -1530,6 +1535,17 @@ static int load_next_input()
/* Delete the current input buffers, and free the cell. */ /* Delete the current input buffers, and free the cell. */
yy_delete_buffer(YY_CURRENT_BUFFER); yy_delete_buffer(YY_CURRENT_BUFFER);
/* If there was a comment for this include print it before we
* return to the previous input stream. This technically belongs
* to the previous stream, but it should not create any problems
* since it is only a comment.
*/
if (isp->comment) {
fprintf(yyout, "%s\n", isp->comment);
free(isp->comment);
isp->comment = NULL;
}
if (isp->file) if (isp->file)
{ {
free(isp->path); free(isp->path);
@ -1726,6 +1742,7 @@ void reset_lexor(FILE* out, char* paths[])
isp->ebs = 0; isp->ebs = 0;
isp->lineno = 0; isp->lineno = 0;
isp->stringify_flag = 0; isp->stringify_flag = 0;
isp->comment = NULL;
if (isp->file == 0) if (isp->file == 0)
{ {
@ -1756,6 +1773,7 @@ void reset_lexor(FILE* out, char* paths[])
isp->next = 0; isp->next = 0;
isp->lineno = 0; isp->lineno = 0;
isp->stringify_flag = 0; isp->stringify_flag = 0;
isp->comment = NULL;
if (tail) if (tail)
tail->next = isp; tail->next = isp;