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

fluent3DMeshToFoam: Updated to handle ',' and '|' characters in headers

Browse Source 
Patch provided by Bruno Santos
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1826
This commit is contained in:
Henry Weller
2015-08-24 17:53:50 +01:00
parent 86cc19bd8b
commit 047883da98
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -137,7 +137,6 @@ int yyFlexLexer::yywrap()
one_space [ \t\f] one_space [ \t\f]
space {one_space}* space {one_space}*
some_space {one_space}+ some_space {one_space}+
cspace ","{space}
alpha [_[:alpha:]] alpha [_[:alpha:]]
digit [[:digit:]] digit [[:digit:]]
@ -150,6 +149,7 @@ rbrac ")"
quote \" quote \"
dash "-" dash "-"
dotColonDash [.:-] dotColonDash [.:-]
commaPipe [,\|]
schemeSpecialInitial [!$%&*/\\:<=>?~_^#.@'] schemeSpecialInitial [!$%&*/\\:<=>?~_^#.@']
schemeSpecialSubsequent [.+-] schemeSpecialSubsequent [.+-]
@ -164,6 +164,7 @@ zeroLabel {digit}*
signedInteger [-+]?{integer} signedInteger [-+]?{integer}
word ({alpha}|{digit}|{dotColonDash})* word ({alpha}|{digit}|{dotColonDash})*
wordBraces ({word}|{lbrac}|{rbrac})* wordBraces ({word}|{lbrac}|{rbrac})*
wordBracesExtras ({word}|{lbrac}|{rbrac}|{commaPipe})*
exponent_part [eE][-+]?{digit}+ exponent_part [eE][-+]?{digit}+
fractional_constant [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit})) fractional_constant [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit}))
@ -186,6 +187,8 @@ schemeSymbolList ({schemeSymbolListElement}+{space})
starStar ("**") starStar ("**")
text ({space}({word}*{space})*) text ({space}({word}*{space})*)
textBraces ({space}({wordBraces}*{space})*) textBraces ({space}({wordBraces}*{space})*)
textExtras ({space}({word}*{commaPipe}{space})*)
textBracesExtras ({space}({wordBracesExtras}*{space})*)
anythingInBlock ([^)]*) anythingInBlock ([^)]*)
dateDDMMYYYY ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit}) dateDDMMYYYY ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit})
@ -278,7 +281,7 @@ endOfSection {space}")"{space}
BEGIN(readHeader); BEGIN(readHeader);
} }
<readHeader>{quote}{textBraces}{quote} { <readHeader>{quote}{textBracesExtras}{quote} {
Info<< "Reading header: " << YYText() << endl; Info<< "Reading header: " << YYText() << endl;
} }
@ -727,6 +730,8 @@ endOfSection {space}")"{space}
<ignoreBlock,ignoreEmbeddedBlock>{space}{text} { <ignoreBlock,ignoreEmbeddedBlock>{space}{text} {
} }
<ignoreBlock,ignoreEmbeddedBlock>{space}{textExtras} {
}
/* ------ Count newlines. ------ */ /* ------ Count newlines. ------ */