boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Refactored Boost Jam's internal yyline() Jamfile parsing function a bit so it no longer uses one unneeded goto that was making the code much harder to read.

Browse Source 
[SVN r48533]
This commit is contained in:
Jurko Gospodnetić
2008-09-02 10:58:03 +00:00
parent 5de4d38337
commit a3e53d37aa
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/engine/scan.c
View File

@@ -129,33 +129,33 @@ int yyline()
/* If we are reading from an internal string list, go to the next string. */
if ( i->strings )
{
if ( !*i->strings )
goto next;
++i->line;
i->string = *(i->strings++);
return *i->string++;
if ( *i->strings )
{
++i->line;
i->string = *(i->strings++);
return *i->string++;
}
}
/* If necessary, open the file. */
if ( !i->file )
else
{
FILE * f = stdin;
if ( strcmp( i->fname, "-" ) && !( f = fopen( i->fname, "r" ) ) )
perror( i->fname );
i->file = f;
}
/* If necessary, open the file. */
if ( !i->file )
{
FILE * f = stdin;
if ( strcmp( i->fname, "-" ) && !( f = fopen( i->fname, "r" ) ) )
perror( i->fname );
i->file = f;
}
/* If there is another line in this file, start it. */
if ( i->file && fgets( i->buf, sizeof( i->buf ), i->file ) )
{
++i->line;
i->string = i->buf;
return *i->string++;
/* If there is another line in this file, start it. */
if ( i->file && fgets( i->buf, sizeof( i->buf ), i->file ) )
{
++i->line;
i->string = i->buf;
return *i->string++;
}
}
next:
/* This include is done. Free it up and return EOF so yyparse() returns to
* parse_file().
*/