mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
46225279c0
- add toScalar evaluation, embedded as "${{EXPR}}".
For example,
"repeat ${{5 * 7}} times or ${{ pow(3, 10) }}"
- use direct string concatenation if primitive entry is only a string
type. This prevents spurious quotes from appearing in the expansion.
radius "(2+4)";
angle "3*15";
#eval "$radius*sin(degToRad($angle))";
We want to have
'(2+4)*sin(degToRad(3*15))'
and not
'"(2+4)"*sin(degToRad("3*15"))'
ENH: code refactoring
- refactored expansion code with low-level service routines now
belonging to file-scope. All expansion routines use a common
multi-parameter backend to handle with/without dictionary etc.
This removes a large amount of code duplication.
149 lines
3.8 KiB
C
149 lines
3.8 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
Description
|
|
Test some string functionality
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "string.H"
|
|
#include "stringOps.H"
|
|
#include "dictionary.H"
|
|
#include "IOstreams.H"
|
|
#include "OSspecific.H"
|
|
|
|
#include "int.H"
|
|
#include "uint.H"
|
|
#include "scalar.H"
|
|
#include "Switch.H"
|
|
#include "fileName.H"
|
|
#include "stringList.H"
|
|
#include "stringOps.H"
|
|
|
|
using namespace Foam;
|
|
|
|
void testCommentStripping(const std::string& s)
|
|
{
|
|
Info<< "input" << nl
|
|
<< "========" << nl
|
|
<< s << nl
|
|
<< "========" << nl;
|
|
|
|
Info<< "output" << nl
|
|
<< "========" << nl
|
|
<< stringOps::removeComments(s) << nl
|
|
<< "========" << nl << nl;
|
|
}
|
|
|
|
|
|
void testNumericEvaluation(const std::string& s)
|
|
{
|
|
Info<< "input" << nl
|
|
<< "========" << nl
|
|
<< s << nl
|
|
<< "========" << nl;
|
|
|
|
const bool throwingIOError = FatalIOError.throwExceptions();
|
|
|
|
try
|
|
{
|
|
std::string expanded(stringOps::expand(s));
|
|
|
|
if (expanded == s)
|
|
{
|
|
Info<< "DID NOT EXPAND" << nl;
|
|
}
|
|
else
|
|
{
|
|
Info<< "output" << nl
|
|
<< "========" << nl
|
|
<< expanded << nl;
|
|
}
|
|
}
|
|
catch (const Foam::IOerror& err)
|
|
{
|
|
Info<< "Expand triggered FatalIOError:"
|
|
<< err.message().c_str() << nl;
|
|
}
|
|
|
|
Info<< "========" << nl << nl;
|
|
|
|
FatalIOError.throwExceptions(throwingIOError);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
// Main program:
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
// Test comment stripping
|
|
{
|
|
Info<< nl << "Test comment stripping" << nl;
|
|
|
|
for
|
|
(
|
|
const auto& cstr
|
|
:
|
|
{
|
|
"/String without comments/",
|
|
"Removed some/* C-comments */ / C comments",
|
|
"Removed some//C++ comments\n / C++ comments",
|
|
"Partly degenerate C comment </*/ C-comment...",
|
|
"Truncated C comment </* C-comment...",
|
|
"Truncated C++ comment <// C++ comment...",
|
|
}
|
|
)
|
|
{
|
|
testCommentStripping(cstr);
|
|
}
|
|
}
|
|
|
|
// Test numeric
|
|
{
|
|
Info<< nl << "Test numeric evaluation" << nl;
|
|
for
|
|
(
|
|
const auto& cstr
|
|
:
|
|
{
|
|
"My value <${{ round(100 / 15) }}> as int",
|
|
"sqrt(2) = (${{ sqrt(2) }})",
|
|
"sqrt(2) = (${{ sqrt(2) }/* Truncated */",
|
|
"sqrt(2) = (${{ sqrt(2) * foo() }})/* bad expr */",
|
|
"huge = (${{ sqrt(123E+5000) }})/* range error */",
|
|
}
|
|
)
|
|
{
|
|
testNumericEvaluation(cstr);
|
|
}
|
|
}
|
|
|
|
|
|
Info<< "\nEnd\n" << endl;
|
|
return 0;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|