Pre-merge clean-up

This commit is contained in:
Dominik Christ 2015-05-15 10:21:28 +01:00
parent 66632c794e
commit b339fb500a
2 changed files with 18 additions and 16 deletions

View file

@ -82,3 +82,5 @@ Contents:
Niklas Wikstrom Niklas Wikstrom
Vanja Skuric Vanja Skuric
Alexander Vakhrushev Alexander Vakhrushev
Inno Gatin
Alexey Matveichev

View file

@ -33,9 +33,9 @@ Description
#undef yyFlexLexer #undef yyFlexLexer
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ local definitions ------ local definitions
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
#include "scalarList.H" #include "scalarList.H"
#include "IStringStream.H" #include "IStringStream.H"
@ -150,9 +150,9 @@ nFlags {space}"NFLAGS:"{space}
mtype {space}"MTYPE:"{space} mtype {space}"MTYPE:"{space}
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
----- Exclusive start states ----- ----- Exclusive start states -----
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
%option stack %option stack
@ -193,11 +193,11 @@ mtype {space}"MTYPE:"{space}
%} %}
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ Start Lexing ------ ------ Start Lexing ------
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */
/* ------ Reading control header ------ */ /* ------ Reading control header ------ */
{controlInfo} { {controlInfo} {
BEGIN(readControlHeader); BEGIN(readControlHeader);
@ -289,7 +289,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading nodal coordinates ------ */ /* ------ Reading nodal coordinates ------ */
{nodalCoords}{spaceNl} { {nodalCoords}{spaceNl} {
@ -317,7 +317,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading cells and elements ------ */ /* ------ Reading cells and elements ------ */
{cellsAndElements}{spaceNl} { {cellsAndElements}{spaceNl} {
@ -409,7 +409,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading element group information ------ */ /* ------ Reading element group information ------ */
{cellStreams}{spaceNl} { {cellStreams}{spaceNl} {
Info<< "Reading cell streams" << endl; Info<< "Reading cell streams" << endl;
@ -515,7 +515,7 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading end of section and others ------ */ /* ------ Reading end of section and others ------ */
<cellStreamLabels>{endOfSection}\n { <cellStreamLabels>{endOfSection}\n {
@ -601,19 +601,19 @@ mtype {space}"MTYPE:"{space}
} }
/* ------ Reading end of section and others ------ */ /* ------ Reading end of section and others ------ */
<controlInfo,nodalCoords,cellsAndElements>{endOfSection}\n { <controlInfo,nodalCoords,cellsAndElements>{endOfSection}\n {
BEGIN(INITIAL); BEGIN(INITIAL);
} }
/* ------ Ignore remaining space and \n s. Any other characters are errors. */ /* ------ Ignore remaining space and \n s. Any other characters are errors. */
.|\n {} .|\n {}
/* ------ On EOF return to previous file, if none exists terminate. ------ */ /* ------ On EOF return to previous file, if none exists terminate. ------ */
<<EOF>> { <<EOF>> {
yyterminate(); yyterminate();
@ -869,6 +869,6 @@ int main(int argc, char *argv[])
} }
/* ------------------------------------------------------------------------- *\ /* ------------------------------------------------------------------------- *\
------ End of gambitToFoam.L ------ End of gambitToFoam.L
\* ------------------------------------------------------------------------- */ \* ------------------------------------------------------------------------- */