zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: improve wmkdepend parse error message

Browse Source 
- parsing error state only arises from a missing final newline
  in the file (which the dnl macro does not capture).
  Report with a warning instead of modifying the dnl macro since
  we generally wish to know about this anyhow.

- add missing newline to YEqn.H file.
This commit is contained in:
Mark Olesen
2018-04-25 14:37:59 +02:00
parent e6787bfa9a
commit ebfe46503f
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/chemFoam/YEqn.H
View File

@ -9,4 +9,4 @@
mesh.solver("Yi") mesh.solver("Yi")
); );
} }
} }

20
wmake/src/wmkdepend.cpp
View File

@ -43,7 +43,7 @@ Description
The FSM can be visualized (eg, in a browser) with the following command The FSM can be visualized (eg, in a browser) with the following command
ragel -V wmkdepend.cpp | dot -Tsvg -owmkdepend.svg ragel -pV wmkdepend.cpp | dot -Tsvg -owmkdepend.svg
Usage Usage
wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] filename wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] filename
@ -309,7 +309,7 @@ namespace Files
// Can use 'variable p xxx;' etc to change these names // Can use 'variable p xxx;' etc to change these names
#line 340 "wmkdepend.rl" #line 334 "wmkdepend.rl"
@ -325,7 +325,7 @@ static const int wmkdep_error = 0;
static const int wmkdep_en_main = 21; static const int wmkdep_en_main = 21;
#line 348 "wmkdepend.rl" #line 342 "wmkdepend.rl"
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@ -356,7 +356,7 @@ void processFile(const std::string& fileName)
act = 0; act = 0;
} }
#line 369 "wmkdepend.rl" #line 363 "wmkdepend.rl"
/* ^^^ FSM initialization here ^^^ */; /* ^^^ FSM initialization here ^^^ */;
// Local token start // Local token start
@ -420,11 +420,11 @@ tr0:
} }
goto st21; goto st21;
tr2: tr2:
#line 337 "wmkdepend.rl" #line 332 "wmkdepend.rl"
{te = p+1;} {te = p+1;}
goto st21; goto st21;
tr17: tr17:
#line 337 "wmkdepend.rl" #line 332 "wmkdepend.rl"
{{p = ((te))-1;}} {{p = ((te))-1;}}
goto st21; goto st21;
tr21: tr21:
@ -444,7 +444,7 @@ tr36:
{te = p;p--;} {te = p;p--;}
goto st21; goto st21;
tr37: tr37:
#line 337 "wmkdepend.rl" #line 332 "wmkdepend.rl"
{te = p;p--;} {te = p;p--;}
goto st21; goto st21;
tr38: tr38:
@ -820,15 +820,15 @@ cs = 0;
_out: {} _out: {}
} }
#line 412 "wmkdepend.rl" #line 406 "wmkdepend.rl"
/* ^^^ FSM execution here ^^^ */; /* ^^^ FSM execution here ^^^ */;
if (0 == cs) if (0 == cs)
{ {
// FSM failed before finding a token // Typically only arises when missing a trailing newline
std::cerr std::cerr
<< EXENAME ": parse error while scanning '" << EXENAME ": parse error while scanning '"
<< fileName << "'\n"; << fileName << "' ... perhaps missing a final newline\n";
break; break;
} }

12
wmake/src/wmkdepend.rl
View File

@ -41,7 +41,7 @@ Description
The FSM can be visualized (eg, in a browser) with the following command The FSM can be visualized (eg, in a browser) with the following command
ragel -V wmkdepend.cpp | dot -Tsvg -owmkdepend.svg ragel -pV wmkdepend.cpp | dot -Tsvg -owmkdepend.svg
Usage Usage
wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] filename wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] filename
@ -329,13 +329,7 @@ namespace Files
'//' dnl; # 1-line comment '//' dnl; # 1-line comment
'/*' any* :>> '*/'; # Multi-line comment '/*' any* :>> '*/'; # Multi-line comment
# String handling is currently unused
### # Single and double quoted strings
### 'L'? '"' ( /\\./ | [^"\\\n] )* '"'; # ' quoted - discard
### 'L'? "'" ( /\\./ | [^'\\\n] )* "'"; # " quoted - discard
dnl; # Discard all other lines dnl; # Discard all other lines
*|; *|;
}%% }%%
@ -413,10 +407,10 @@ void processFile(const std::string& fileName)
if (%%{write error;}%% == cs) if (%%{write error;}%% == cs)
{ {
// FSM failed before finding a token // Typically only arises when missing a trailing newline
std::cerr std::cerr
<< EXENAME ": parse error while scanning '" << EXENAME ": parse error while scanning '"
<< fileName << "'\n"; << fileName << "' ... perhaps missing a final newline\n";
break; break;
} }