Merge branch 'master' into splitCyclic

Conflicts:
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
	applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
	applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
	src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
	src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
	src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
	src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H
	src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
	src/edgeMesh/edgeFormats/vtk/VTKedgeFormat.H
	src/mesh/blockMesh/curvedEdges/spline.H
	src/meshTools/PointEdgeWave/PointEdgeWave.C
	src/meshTools/sets/topoSets/faceSet.C

.gitignore

@@ -51,7 +51,9 @@ doc/[Dd]oxygen/latex
 doc/[Dd]oxygen/man
 
 # generated files in the main directory (e.g. ReleaseNotes-?.?.html)
+# and in the doc directory
 /*.html
+/doc/*.html
 
 # source packages - anywhere
 *.tar.bz2

README

@@ -2,7 +2,7 @@
 #
 #+TITLE:             OpenFOAM README for version 1.6
 #+AUTHOR:                      OpenCFD Ltd.
-#+DATE:                         July 2009
+#+DATE:                       November 2009
 #+LINK:                  http://www.opencfd.co.uk
 #+OPTIONS: author:nil ^:{}
 
@@ -168,9 +168,9 @@
   + rm -rf paraview-3.6.1/platforms
   + ./makeParaView
 
-  The PV3FoamReader module is an OpenFOAM utility that can be compiled in the
+  The PV3blockMeshReader and the PV3FoamReader ParaView plugins are compiled
-  usual manner as follows:
+  as usual for OpenFOAM utilities:
-  + cd $FOAM_UTILITIES/postProcessing/graphics/PV3FoamReader
+  + cd $FOAM_UTILITIES/postProcessing/graphics/PV3Readers/
   + ./Allwclean
   + ./Allwmake
 
@@ -187,7 +187,8 @@
     newly built qmake as an argument:
     + ./makeParaView -qmake <path_to_qmake>
 
-    The user must then recompile the PV3FoamReader module as normal (see above).
+    The user must then recompile the PV3blockMeshReader and the
+    PV3FoamReader plugins as usual (see above).
 
 * Documentation
   http://www.OpenFOAM.org/doc

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -38,11 +38,9 @@ Description
 
 int main(int argc, char *argv[])
 {
-
+    argList::addBoolOption("writep", "write the final pressure field");
-    argList::validOptions.insert("writep", "");
 
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 #   include "createMesh.H"
 #   include "createFields.H"

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H

@@ -124,11 +124,6 @@ public:
 
     // Member Functions
 
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
@@ -147,41 +142,44 @@ public:
             );
         }
 
-        //- Return the effective turbulent thermal diffusivity
+        //- Return the turbulence viscosity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> mut() const
         {
-            return tmp<volScalarField>
+            return mut_;
-            (
+        }
-                new volScalarField("alphaEff", alphat_ + alpha())
+
-            );
+        //- Return the turbulence thermal diffusivity
+        virtual tmp<volScalarField> alphat() const
+        {
+            return alphat_;
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
         //- Read turbulenceProperties dictionary
-        bool read();
+        virtual bool read();
 };
 
 

applications/solvers/combustion/dieselEngineFoam/createFields.H

@@ -88,7 +88,7 @@ volScalarField DpDt =
 
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-forAll (Y, i)
+forAll(Y, i)
 {
     fields.add(Y[i]);
 }

applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C

@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
 
         dieselSpray.evolve();
 
-        Info << "Solving chemistry" << endl;
+        Info<< "Solving chemistry" << endl;
 
         chemistry.solve
         (

applications/solvers/combustion/dieselFoam/dieselFoam.C

@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
@@ -72,11 +72,11 @@ int main(int argc, char *argv[])
         runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        Info << "Evolving Spray" << endl;
+        Info<< "Evolving Spray" << endl;
 
         dieselSpray.evolve();
 
-        Info << "Solving chemistry" << endl;
+        Info<< "Solving chemistry" << endl;
 
         chemistry.solve
         (

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {

applications/solvers/combustion/reactingFoam/chemistry.H

@@ -1,5 +1,5 @@
 {
-    Info << "Solving chemistry" << endl;
+    Info<< "Solving chemistry" << endl;
 
     chemistry.solve
     (

applications/solvers/combustion/reactingFoam/createFields.H

@@ -77,7 +77,7 @@ volScalarField DpDt =
 
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-forAll (Y, i)
+forAll(Y, i)
 {
     fields.add(Y[i]);
 }

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {

applications/solvers/combustion/rhoReactingFoam/chemistry.H

@@ -1,5 +1,5 @@
 {
-    Info << "Solving chemistry" << endl;
+    Info<< "Solving chemistry" << endl;
 
     chemistry.solve
     (

applications/solvers/combustion/rhoReactingFoam/createFields.H

@@ -77,7 +77,7 @@ volScalarField DpDt =
 
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-forAll (Y, i)
+forAll(Y, i)
 {
     fields.add(Y[i]);
 }

applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "maxwellSlipUFvPatchVectorField.H"
@@ -155,7 +153,7 @@ void maxwellSlipUFvPatchVectorField::updateCoeffs()
 
     refValue() = Uwall_;
 
-    if(thermalCreep_)
+    if (thermalCreep_)
     {
         const volScalarField& vsfT =
             this->db().objectRegistry::lookupObject<volScalarField>("T");
@@ -167,7 +165,7 @@ void maxwellSlipUFvPatchVectorField::updateCoeffs()
         refValue() -= 3.0*pnu/(4.0*pT)*transform(I - n*n, gradpT);
     }
 
-    if(curvature_)
+    if (curvature_)
     {
         const fvPatchTensorField& ptauMC =
             patch().lookupPatchField<volTensorField, tensor>("tauMC");

applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C

@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "mixedFixedValueSlipFvPatchFields.H"

applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C

@@ -50,14 +50,14 @@ int main(int argc, char *argv[])
 
     label nAveragingSteps = 0;
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.loop())
     {
 
         nAveragingSteps++;
 
-        Info << "Time = " << runTime.timeName() << endl;
+        Info<< "Time = " << runTime.timeName() << endl;
 
         molecules.evolve();
 
@@ -74,12 +74,12 @@ int main(int argc, char *argv[])
             nAveragingSteps = 0;
         }
 
-        Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
     }
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C

@@ -48,14 +48,14 @@ int main(int argc, char *argv[])
 
     label nAveragingSteps = 0;
 
-    Info << "\nStarting time loop\n" << endl;
+    Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.loop())
     {
 
         nAveragingSteps++;
 
-        Info << "Time = " << runTime.timeName() << endl;
+        Info<< "Time = " << runTime.timeName() << endl;
 
         molecules.evolve();
 
@@ -70,12 +70,12 @@ int main(int argc, char *argv[])
             nAveragingSteps = 0;
         }
 
-        Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
     }
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/solvers/incompressible/channelFoam/createGradP.H

@@ -11,7 +11,7 @@
         runTime.path()/runTime.timeName()/"uniform"/"gradP.raw"
     );
 
-    if(gradPFile.good())
+    if (gradPFile.good())
     {
         gradPFile >> gradP;
         Info<< "Reading average pressure gradient" <<endl

applications/solvers/incompressible/channelFoam/writeGradP.H

@@ -5,7 +5,7 @@
             runTime.path()/runTime.timeName()/"uniform"/"gradP.raw"
         );
 
-        if(gradPFile.good())
+        if (gradPFile.good())
         {
             gradPFile << gradP << endl;
         }

applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H

@@ -29,7 +29,7 @@
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
-        if(p.boundaryField()[i].fixesValue())
+        if (p.boundaryField()[i].fixesValue())
         {
             pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
         }
@@ -50,7 +50,7 @@
         pcorrTypes
     );
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (

applications/solvers/incompressible/porousSimpleFoam/createFields.H

@@ -1,4 +1,4 @@
-    Info << "Reading field p\n" << endl;
+    Info<< "Reading field p\n" << endl;
     volScalarField p
     (
         IOobject
@@ -12,7 +12,7 @@
         mesh
     );
 
-    Info << "Reading field U\n" << endl;
+    Info<< "Reading field U\n" << endl;
     volVectorField U
     (
         IOobject

applications/solvers/incompressible/simpleFoam/createFields.H

@@ -1,4 +1,4 @@
-    Info << "Reading field p\n" << endl;
+    Info<< "Reading field p\n" << endl;
     volScalarField p
     (
         IOobject
@@ -12,7 +12,7 @@
         mesh
     );
 
-    Info << "Reading field U\n" << endl;
+    Info<< "Reading field U\n" << endl;
     volVectorField U
     (
         IOobject

applications/solvers/lagrangian/coalChemistryFoam/chemistry.H

@@ -1,5 +1,5 @@
 {
-    Info << "Solving chemistry" << endl;
+    Info<< "Solving chemistry" << endl;
 
     chemistry.solve
     (

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -28,7 +28,7 @@
 
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         fields.add(Y[i]);
     }

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H

@@ -1,5 +1,5 @@
 {
-    Info << "Solving chemistry" << endl;
+    Info<< "Solving chemistry" << endl;
 
     chemistry.solve
     (

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H

@@ -84,7 +84,7 @@
     Info<< "Creating multi-variate interpolation scheme\n" << endl;
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         fields.add(Y[i]);
     }

applications/solvers/lagrangian/reactingParcelFoam/chemistry.H

@@ -1,5 +1,5 @@
 {
-    Info << "Solving chemistry" << endl;
+    Info<< "Solving chemistry" << endl;
 
     chemistry.solve
     (

applications/solvers/lagrangian/reactingParcelFoam/createFields.H

@@ -90,7 +90,7 @@
 
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         fields.add(Y[i]);
     }

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H

@@ -47,8 +47,10 @@
         )
     );
 
-    word kinematicCloudName("kinematicCloud");
+    const word kinematicCloudName
-    args.optionReadIfPresent("cloudName", kinematicCloudName);
+    (
+        args.optionLookupOrDefault<word>("cloudName", "kinematicCloud")
+    );
 
     Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
     basicKinematicCloud kinematicCloud

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C

@@ -42,7 +42,7 @@ Description
 
 int main(int argc, char *argv[])
 {
-    argList::validOptions.insert("cloudName", "cloud name");
+    argList::addOption("cloudName", "cloud name");
 
     #include "setRootCase.H"
     #include "createTime.H"

applications/solvers/multiphase/bubbleFoam/kEpsilon.H

@@ -1,4 +1,4 @@
-if(turbulence)
+if (turbulence)
 {
     if (mesh.changing())
     {

applications/solvers/multiphase/bubbleFoam/pEqn.H

@@ -34,7 +34,7 @@
 
     surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H

@@ -42,7 +42,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (

applications/solvers/multiphase/compressibleInterFoam/pEqn.H

@@ -30,7 +30,7 @@
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqnIncomp
         (

applications/solvers/multiphase/interDyMFoam/correctPhi.H

@@ -42,7 +42,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (

applications/solvers/multiphase/interDyMFoam/pEqn.H

@@ -18,7 +18,7 @@
       + fvc::interpolate(rho)*(g & mesh.Sf())
     )*rAUf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/interFoam/correctPhi.H

@@ -34,7 +34,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (

applications/solvers/multiphase/interFoam/pEqn.H

@@ -19,7 +19,7 @@
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H

@@ -34,7 +34,7 @@
 
     adjustPhi(phi, U, pcorr);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pcorrEqn
         (

applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H

@@ -23,7 +23,7 @@
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C

@@ -125,7 +125,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixture::rho() const
 
     tmp<volScalarField> trho = iter()*iter().rho();
 
-    for(++iter; iter != phases_.end(); ++iter)
+    for (++iter; iter != phases_.end(); ++iter)
     {
         trho() += iter()*iter().rho();
     }
@@ -140,7 +140,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixture::mu() const
 
     tmp<volScalarField> tmu = iter()*iter().rho()*iter().nu();
 
-    for(++iter; iter != phases_.end(); ++iter)
+    for (++iter; iter != phases_.end(); ++iter)
     {
         tmu() += iter()*iter().rho()*iter().nu();
     }
@@ -156,7 +156,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseMixture::muf() const
     tmp<surfaceScalarField> tmuf =
         fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu());
 
-    for(++iter; iter != phases_.end(); ++iter)
+    for (++iter; iter != phases_.end(); ++iter)
     {
         tmuf() +=
             fvc::interpolate(iter())*iter().rho()*fvc::interpolate(iter().nu());
@@ -210,7 +210,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
         PtrDictionary<phase>::const_iterator iter2 = iter1;
         ++iter2;
 
-        for(; iter2 != phases_.end(); ++iter2)
+        for (; iter2 != phases_.end(); ++iter2)
         {
             const phase& alpha2 = iter2();
 
@@ -489,7 +489,7 @@ void Foam::multiphaseMixture::solveAlphas
         if (cycleAlpha)
         {
             PtrDictionary<phase>::iterator refPhaseIter = phases_.begin();
-            for(label i=0; i<nSolves%phases_.size(); i++)
+            for (label i=0; i<nSolves%phases_.size(); i++)
             {
                 ++refPhaseIter;
             }

applications/solvers/multiphase/multiphaseInterFoam/pEqn.H

@@ -18,7 +18,7 @@
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/settlingFoam/pEqn.H

@@ -17,7 +17,7 @@ phi =
 surfaceScalarField phiU("phiU", phi);
 phi += fvc::interpolate(rho)*(g & mesh.Sf())*rUAf;
 
-for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 {
     fvScalarMatrix pEqn
     (

applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H

@@ -13,7 +13,7 @@
 
     phi = phiU + fvc::interpolate(rho)*(g & mesh.Sf())*rUAf;
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H

@@ -190,7 +190,7 @@
         }
     }
 
-    Info << "dragPhase is " << dragPhase << endl;
+    Info<< "dragPhase is " << dragPhase << endl;
     kineticTheoryModel kineticTheory
     (
         phasea,

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C

@@ -78,7 +78,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
 
     forAll(Re, celli)
     {
-        if(Re[celli] > 1000.0)
+        if (Re[celli] > 1000.0)
         {
             Cds[celli] = 0.44;
         }
@@ -89,7 +89,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
     volScalarField& KWenYu = tKWenYu();
 
     // Ergun
-    forAll (beta, cellj)
+    forAll(beta, cellj)
     {
         if (beta[cellj] <= 0.8)
         {

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C

@@ -77,7 +77,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
 
     forAll(Re, celli)
     {
-        if(Re[celli] > 1000.0)
+        if (Re[celli] > 1000.0)
         {
             Cds[celli] = 0.44;
         }

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C

@@ -74,7 +74,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
 
     forAll(Re, celli)
     {
-        if(Re[celli] > 1000.0)
+        if (Re[celli] > 1000.0)
         {
             Cds[celli] = 0.44;
         }

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C

@@ -73,7 +73,7 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
     volScalarField A = pow(beta, 4.14);
     volScalarField B = 0.8*pow(beta, 1.28);
 
-    forAll (beta, celli)
+    forAll(beta, celli)
     {
         if (beta[celli] > 0.85)
         {

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C

@@ -77,7 +77,7 @@ Foam::tmp<Foam::volScalarField> Foam::WenYu::K
 
     forAll(Re, celli)
     {
-        if(Re[celli] > 1000.0)
+        if (Re[celli] > 1000.0)
         {
             Cds[celli] = 0.44;
         }

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C

@@ -41,7 +41,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
         interfaceDict.lookup("dragModel" + phasea.name())
     );
 
-    Info << "Selecting dragModel for phase " 
+    Info<< "Selecting dragModel for phase "
         << phasea.name()
         << ": "
         << dragModelType << endl;
@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
                 << dragModelType
                 << ", constructor not in hash table" << endl << endl
                 << "    Valid dragModel types are : " << endl;
-        Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
     }
 
     return cstrIter()(interfaceDict, alpha, phasea, phaseb);

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C

@@ -125,7 +125,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchaefferFrictionalStress::muf
 
     volScalarField& muff = tmuf();
 
-    forAll (D, celli)
+    forAll(D, celli)
     {
         if (alpha[celli] > alphaMax.value()-5e-2)
         {

applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H

@@ -47,7 +47,7 @@
 
     surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob);
 
-    for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
         (

applications/solvers/multiphase/twoPhaseEulerFoam/packingLimiter.H

@@ -7,7 +7,7 @@
         labelListList neighbour = mesh.cellCells();
         scalarField cellVolumes = mesh.cellVolumes();
 
-        forAll (alphaEx, celli)
+        forAll(alphaEx, celli)
         {
             // Finding the labels of the neighbouring cells
             labelList neighbourCell = neighbour[celli];
@@ -15,12 +15,12 @@
             // Initializing neighbouring cells contribution
             scalar neighboursEx = 0.0;
 
-            forAll (neighbourCell, cellj)
+            forAll(neighbourCell, cellj)
             {
                 labelList neighboursNeighbour = neighbour[neighbourCell[cellj]];
                 scalar neighboursNeighbourCellVolumes = 0.0;
 
-                forAll (neighboursNeighbour, cellk)
+                forAll(neighboursNeighbour, cellk)
                 {
                     neighboursNeighbourCellVolumes +=
                         cellVolumes[neighboursNeighbour[cellk]];

applications/test/BSpline/Make/files

@@ -1,3 +0,0 @@
-BSplineTest.C
-
-EXE = $(FOAM_USER_APPBIN)/BSplineTest

applications/test/BSpline/test-splines

@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-(
-    // Upper body longitudinal splines.
-    (
-        (-0.22685 -0.01125166 0)       // 7
-        (-0.21685 -0.01340204 0)
-        (-0.20685 -0.01529684 0)
-        (-0.19685 -0.01694748 0)
-        (-0.18685 -0.01836538 0)
-        (-0.17685 -0.01956197 0)
-        (-0.16685 -0.02054868 0)
-        (-0.15685 -0.02133693 0)
-        (-0.14685 -0.02193816 0)
-        (-0.13685 -0.02236377 0)
-        (-0.12685 -0.02262521 0)
-        (-0.11685 -0.02273389 0)       // 2
-    )
-
-    (
-        (-0.22685 0 0.01125166)        // 8
-        (-0.21685 0 0.01340204)
-        (-0.20685 0 0.01529684)
-        (-0.19685 0 0.01694748)
-        (-0.18685 0 0.01836538)
-        (-0.17685 0 0.01956197)
-        (-0.16685 0 0.02054868)
-        (-0.15685 0 0.02133693)
-        (-0.14685 0 0.02193816)
-        (-0.13685 0 0.02236377)
-        (-0.12685 0 0.02262521)
-        (-0.11685 0 0.02273389)        // 3
-    )
-
-    (
-        (-0.22685 0.01125166 0)        // 9
-        (-0.21685 0.01340204 0)
-        (-0.20685 0.01529684 0)
-        (-0.19685 0.01694748 0)
-        (-0.18685 0.01836538 0)
-        (-0.17685 0.01956197 0)
-        (-0.16685 0.02054868 0)
-        (-0.15685 0.02133693 0)
-        (-0.14685 0.02193816 0)
-        (-0.13685 0.02236377 0)
-        (-0.12685 0.02262521 0)
-        (-0.11685 0.02273389 0)        // 4
-    )
-
-    (
-        (-0.22685 0 -0.01125166)       // 6
-        (-0.21685 0 -0.01340204)
-        (-0.20685 0 -0.01529684)
-        (-0.19685 0 -0.01694748)
-        (-0.18685 0 -0.01836538)
-        (-0.17685 0 -0.01956197)
-        (-0.16685 0 -0.02054868)
-        (-0.15685 0 -0.02133693)
-        (-0.14685 0 -0.02193816)
-        (-0.13685 0 -0.02236377)
-        (-0.12685 0 -0.02262521)
-        (-0.11685 0 -0.02273389)       // 1
-    )
-);

applications/test/Dictionary/DictionaryTest.C

@@ -84,7 +84,7 @@ public:
 
     ~Scalar()
     {
-        Info <<"delete Scalar: " << data_ << endl;
+        Info<<"delete Scalar: " << data_ << endl;
     }
 
     friend Ostream& operator<<(Ostream& os, const Scalar& val)
@@ -197,11 +197,11 @@ int main(int argc, char *argv[])
 
     if (p)
     {
-        Info << "found: " << *p << endl;
+        Info<< "found: " << *p << endl;
     }
     else
     {
-        Info << "no p: " << endl;
+        Info<< "no p: " << endl;
     }
 
     scalarDict.clear();

applications/test/HashSet/hashSetTest.C

@@ -92,6 +92,8 @@ int main(int argc, char *argv[])
     labelHashSet setD(1);
     setD.insert(11);
     setD.insert(100);
+    setD.insert(49);
+    setD.insert(36);
     setD.insert(2008);
 
     Info<< "setD : " << setD << endl;
@@ -138,6 +140,17 @@ int main(int argc, char *argv[])
     // this doesn't work (yet?)
     // setD[12] = true;
 
+    List<label> someLst(10);
+    forAll(someLst, elemI)
+    {
+        someLst[elemI] = elemI*elemI;
+    }
+
+    label added = setD.set(someLst);
+    Info<< "added " << added << " from " << someLst.size() << endl;
+    Info<< "setD : " << setD << endl;
+
+
     return 0;
 }
 

applications/test/IndirectList/IndirectListTest.C

@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
         << "list: " << idl() << nl
         << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/LduMatrix/LduMatrixTest.C

@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 
     Info<< psi << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/LduMatrix/LduMatrixTest2.C

@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 
     Info<< psi << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/List/ListTest.C

@@ -47,11 +47,11 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validOptions.insert("reList", "reList");
+    argList::addOption("reList", "reList");
-    argList::validOptions.insert("wordList", "wordList");
+    argList::addOption("wordList", "wordList");
-    argList::validOptions.insert("stringList", "stringList");
+    argList::addOption("stringList", "stringList");
-    argList::validOptions.insert("float", "xx");
+    argList::addOption("float", "xx");
-    argList::validOptions.insert("flag", "");
+    argList::addBoolOption("flag");
 
 #   include "setRootCase.H"
 

applications/test/Map/MapTest.C

@@ -53,15 +53,15 @@ int main(int argc, char *argv[])
 
     if (bananaIter == banana.end())
     {
-        Info << "not found" << endl;
+        Info<< "not found" << endl;
     }
     else
     {
-        Info << "5 is " << bananaIter() << endl;
+        Info<< "5 is " << bananaIter() << endl;
     }
 
     // Same with STL
-    Info << "Same with STL" << endl;
+    Info<< "Same with STL" << endl;
 
     std::map<label, bool> STLbanana;
     STLbanana[5] = true;
@@ -69,11 +69,11 @@ int main(int argc, char *argv[])
 
     if (STLbananaIter == STLbanana.end())
     {
-        Info << "not found" << endl;
+        Info<< "not found" << endl;
     }
     else
     {
-        Info << "5 is " << STLbananaIter->second << endl;
+        Info<< "5 is " << STLbananaIter->second << endl;
     }
 
 

applications/test/Matrix/MatrixTest.C

@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     hmm4 = hmm5;
     Info<< hmm5 << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/NamedEnum/namedEnumTest.C

@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
     namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin));
     Info<< namedEnumTest::namedEnum[hmm] << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/ODETest/ODETest.C

@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
     Info<< nl << "Analytical: y(2.0) = " << yEnd << endl;
     Info      << "Numerical:  y(2.0) = " << y << ", hEst = " << hEst << endl;
 
-    Info << "\nEnd\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }

applications/test/POSIX/POSIXTest.C

@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
 {
     rmDir("hmm");
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/PackedList/PackedListTest.C

@@ -82,9 +82,13 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::validArgs.insert("file .. fileN");
 
-    argList::validOptions.insert("mask", "");
+    argList::addBoolOption("mask", "report information about the bit masks");
-    argList::validOptions.insert("count", "");
+    argList::addBoolOption("count", "test the count() method");
-    argList::validOptions.insert("info", "");
+    argList::addBoolOption
+    (
+        "info",
+        "print an ascii representation of the storage"
+    );
 
     argList args(argc, argv, false, true);
 

applications/test/PackedList1/PackedListTest1.C

@@ -58,9 +58,15 @@ int main(int argc, char *argv[])
     list1.print(Info);
 
     Info<< "\ntest set() with default argument (max_value)\n";
+    list1.set(1);
     list1.set(3);
     list1.print(Info);
 
+    Info<< "\ntest unset() with in-range and out-of-range\n";
+    list1.unset(3);
+    list1.unset(100000);
+    list1.print(Info);
+
     Info<< "\ntest assign between references\n";
     list1[2] = 3;
     list1[4] = list1[2];

applications/test/PackedList2/PackedListTest2.C

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for(unsigned int i = 0; i < stlVector.size(); i++)
+        for (unsigned int i = 0; i < stlVector.size(); i++)
         {
             sum += stlVector[i];
         }
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
         << " s" << endl;
 
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/PackedList3/Make/files

@@ -0,0 +1,3 @@
+PackedListTest3.C
+
+EXE = $(FOAM_USER_APPBIN)/PackedListTest3

applications/test/PackedList3/PackedListTest3.C

@@ -22,43 +22,51 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-\*---------------------------------------------------------------------------*/
+Application
-#include "argList.H"
 
-#include "vector.H"
+Description
-#include "IFstream.H"
+
-#include "BSpline.H"
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "boolList.H"
+#include "HashSet.H"
+#include "StaticHashTable.H"
+#include "cpuTime.H"
+#include <vector>
+#include "PackedList.H"
+#include "PackedBoolList.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
 // Main program:
 
 int main(int argc, char *argv[])
 {
-    argList::noParallel();
+    const label n = 100000000;
-    argList::validArgs.insert("file .. fileN");
+    const label nReport = 1000000;
 
-    argList args(argc, argv, false, true);
+    cpuTime timer;
 
-    forAll(args.additionalArgs(), argI)
+    // test inserts
+    // PackedBoolList
+    PackedBoolList packed;
+    for (label i = 0; i < n; i++)
     {
-        const string& srcFile = args.additionalArgs()[argI];
+        if ((i % nReport) == 0 && i)
-        Info<< nl << "reading " << srcFile << nl;
-        IFstream ifs(srcFile);
-
-        List<pointField> splinePointFields(ifs);
-
-        forAll(splinePointFields, splineI)
         {
-            Info<<"convert " << splinePointFields[splineI] << " to bspline" << endl;
+            Info<< "i:" << i << " in " << timer.cpuTimeIncrement() << " s" 
-
+                <<endl;
-            BSpline spl(splinePointFields[splineI], vector::zero, vector::zero);
-
-            Info<< "1/2 = " << spl.position(0.5) << endl;
         }
+        packed[i] = 1;
     }
+    Info<< "insert test: " << n << " elements in "
+        << timer.cpuTimeIncrement() << " s\n\n";
 
+    Info << "\nEnd\n" << endl;
 
     return 0;
 }

applications/test/Polynomial/Make/files

@@ -0,0 +1,3 @@
+PolynomialTest.C
+
+EXE = $(FOAM_USER_APPBIN)/PolynomialTest

applications/test/Polynomial/Make/options

@@ -0,0 +1,3 @@
+EXE_INC = \
+
+EXE_LIBS = \

applications/test/Polynomial/PolynomialTest.C

@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    PolynomialTest
+
+Description
+    Test application for the templated Polynomial class
+
+\*---------------------------------------------------------------------------*/
+
+#include "IFstream.H"
+#include "Polynomial.H"
+#include "Random.H"
+
+using namespace Foam;
+
+scalar polyValue(const scalar x)
+{
+    // Hard-coded polynomial 8 coeff (7th order)
+    return
+        0.11
+      + 0.45*x
+      - 0.94*sqr(x)
+      + 1.58*pow3(x)
+      - 2.58*pow4(x)
+      + 0.08*pow5(x)
+      + 3.15*pow6(x)
+      - 4.78*x*pow6(x);
+}
+
+
+scalar intPolyValue(const scalar x)
+{
+    // Hard-coded integrated form of above polynomial
+    return
+        0.11*x
+      + 0.45/2.0*sqr(x)
+      - 0.94/3.0*pow3(x)
+      + 1.58/4.0*pow4(x)
+      - 2.58/5.0*pow5(x)
+      + 0.08/6.0*pow6(x)
+      + 3.15/7.0*x*pow6(x)
+      - 4.78/8.0*x*x*pow6(x);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    IFstream is("polyTestInput");
+
+    Polynomial<8> poly("testPoly", is);
+    Polynomial<9> intPoly(poly.integrate(0.0));
+
+    Info<< "poly = " << poly << endl;
+    Info<< "intPoly = " << intPoly << nl << endl;
+
+    Info<< "2*poly = " << 2*poly << endl;
+    Info<< "poly+poly = " << poly + poly << nl << endl;
+
+    Info<< "3*poly = " << 3*poly << endl;
+    Info<< "poly+poly+poly = " << poly + poly + poly << nl << endl;
+
+    Info<< "3*poly - 2*poly = " << 3*poly - 2*poly << nl << endl;
+
+    Polynomial<8> polyCopy = poly;
+    Info<< "poly, polyCopy = " << poly << ", " << polyCopy << nl << endl;
+    polyCopy = 2.5*poly;
+    Info<< "2.5*polyCopy = " << polyCopy << nl << endl;
+
+    Random rnd(123456);
+    for (int i=0; i<10; i++)
+    {
+        scalar x = rnd.scalar01()*100;
+
+        scalar px = polyValue(x);
+        scalar ipx = intPolyValue(x);
+
+        scalar pxTest = poly.evaluate(x);
+        scalar ipxTest = intPoly.evaluate(x);
+
+        Info<<"\nx = " << x << endl;
+        Info<< "    px, pxTest = " << px << ", " << pxTest << endl;
+        Info<< "    ipx, ipxTest = " << ipx << ", " << ipxTest << endl;
+
+        if (mag(px - pxTest) > SMALL)
+        {
+            Info<< "    *** WARNING: px != pxTest: " << px - pxTest << endl;
+        }
+
+        if (mag(ipx - ipxTest) > SMALL)
+        {
+            Info<< "    *** WARNING: ipx != ipxTest: " << ipx - ipxTest << endl;
+        }
+
+        Info<< endl;
+    }
+
+    Info<< nl << "Done." << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/Polynomial/polyTestInput

@@ -0,0 +1,11 @@
+    testPoly
+    (
+        0.11
+        0.45
+       -0.94
+        1.58
+       -2.58
+        0.08
+        3.15
+       -4.78
+    )

applications/test/PtrList/PtrListTest.C

@@ -54,7 +54,7 @@ public:
 
     ~Scalar()
     {
-        Info <<"delete Scalar: " << data_ << endl;
+        Info<<"delete Scalar: " << data_ << endl;
     }
 
     autoPtr<Scalar> clone() const;

applications/test/Tuple2/Tuple2Test.C

@@ -44,7 +44,7 @@ int main()
 
     Info<< t2 << " " << t2.first() << " " << t2.second() << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/UIndirectListTest/UIndirectListTest.C

@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
     dynList.append(UIndirectList<double>(completeList, addresses));
     Info<< "DynamicList::append(UIndirectList): " << dynList << endl;
 
-    Info << "\nEnd\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }

applications/test/callback/callbackTest.C

@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 
     cbr.testCallbackFunction();
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/dictionary/Allwmake

@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# this will have to do until we have a makefile rule
+
+if type Coco > /dev/null 2>&1
+then
+    Coco \
+        -frames $WM_THIRD_PARTY_DIR/coco-r \
+        calcEntry/calcEntry.atg
+else
+    echo "Coco not installed"
+fi
+
+wmake

applications/test/dictionary/Make/files

@@ -1,4 +1,7 @@
-calcEntry/calcEntry.C
 dictionaryTest.C
 
+calcEntry/calcEntry.C
+calcEntry/calcEntryParser.cpp
+calcEntry/calcEntryScanner.cpp
+
 EXE = $(FOAM_USER_APPBIN)/dictionaryTest

applications/test/dictionary/calcEntry/calcEntry.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,10 +26,12 @@ License
 
 #include "calcEntry.H"
 #include "dictionary.H"
-#include "IStringStream.H"
-#include "OStringStream.H"
 #include "addToMemberFunctionSelectionTable.H"
 
+#include "ISstream.H"
+#include "CocoParserErrors.H"
+#include "calcEntryParser.h"
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -59,11 +61,30 @@ bool Foam::functionEntries::calcEntry::execute
     Istream& is
 )
 {
-    dictionary args(parentDict, is);
+    std::istream& iss = dynamicCast<ISstream>(is).stdStream();
-    OStringStream resultStream;
+
-    resultStream
+    // define parser error handler
-        << (args.lookup("x")[0].number() + args.lookup("y")[0].number());
+    CocoParserErrors<calcEntryInternal::Errors>
-    entry.read(parentDict, IStringStream(resultStream.str())());
+        myErrorHandler("calcEntryInternal::Parser");
+
+    calcEntryInternal::Scanner scanner(iss);
+    calcEntryInternal::Parser  parser(&scanner, &myErrorHandler);
+
+    // Attach dictionary context
+    parser.dict(parentDict);
+
+    // Attach scalar functions
+    // parser.functions(parentDict);
+
+    parser.Parse();
+
+    // make a small input list to contain the answer
+    tokenList tokens(2);
+    tokens[0] = parser.Result();
+    tokens[1] = token::END_STATEMENT;
+
+    entry.read(parentDict, ITstream("ParserResult", tokens)());
+
     return true;
 }
 

applications/test/dictionary/calcEntry/calcEntry.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,8 @@ Class
     Foam::functionEntries::calcEntry
 
 Description
+    This dictionary function entry may or may not do anything particularly
+    useful - depending upon what is currently being used to test.
 
 SourceFiles
     calcEntry.C

applications/test/dictionary/calcEntry/calcEntry.atg

@@ -0,0 +1,252 @@
+/*-------------------------------------------------------------------------
+ compile with:
+ Coco \
+    -frames $WM_THIRD_PARTY_DIR/coco-r \
+    calcEntry.atg
+-------------------------------------------------------------------------*/
+
+#include "dictionary.H"
+#include "scalar.H"
+#include "error.H"
+#include "wchar.H"
+
+
+COMPILER calcEntry
+$prefix=calcEntry
+$namespace=Foam::functionEntries::calcEntryInternal
+$eof=true     // grammar handles eof itself
+
+    // Simple four function calculator for OpenFOAM dictionaries
+
+    //! with debug
+    static const int debug = 0;
+
+    //! The parent dictionary
+    mutable dictionary* dict_;
+
+    //! Track that parent dictionary was set
+    bool hasDict_;
+
+    //! The calculation result
+    scalar val;
+
+
+    //! token -> scalar
+    scalar getScalar() const
+    {
+        return coco_string_toDouble(t->val);
+    }
+
+    //! token -> string
+    std::string getString() const
+    {
+        char* str = coco_string_create_char(t->val);
+        std::string s(str);
+        coco_string_delete(str);
+        return s;
+    }
+
+    //! attach a dictionary
+    void dict(const dictionary& dict)
+    {
+        dict_ = const_cast<dictionary*>(&dict);
+        hasDict_ = true;
+    }
+
+
+    //! lookup dictionary entry
+    scalar getDictLookup() const
+    {
+        scalar dictValue = 0;
+
+        if (!hasDict_)
+        {
+            FatalErrorIn
+            (
+                "calcEntry::getDictEntry() const"
+            )   << "No dictionary attached!"
+                << exit(FatalError);
+
+            return 0;
+        }
+
+        char* chars = coco_string_create_char
+        (
+            t->val,
+            1,
+            (coco_string_length(t->val) - 1)
+        );
+        word keyword(chars);
+        coco_string_delete(chars);
+
+        if (debug)
+        {
+            Info<<"lookup: " << keyword << nl;
+        }
+
+        entry* entryPtr = dict_->lookupEntryPtr(keyword, true, false);
+        if (entryPtr && !entryPtr->isDict())
+        {
+            if (entryPtr->stream().size() != 1)
+            {
+                FatalErrorIn
+                (
+                    "calcEntry::getDictEntry() const"
+                )   << "keyword " << keyword << " has "
+                    << entryPtr->stream().size() << " values in dictionary "
+                    << exit(FatalError);
+            }
+            entryPtr->stream() >> dictValue;
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "calcEntry::getDictEntry() const"
+            )   << "keyword " << keyword << " is undefined in dictionary "
+                << exit(FatalError);
+        }
+
+
+        return dictValue;
+    }
+
+    scalar Result() const
+    {
+        return val;
+    }
+
+
+/*---------------------------------------------------------------------------*/
+
+CHARACTERS
+    letter    = 'A'..'Z' + 'a'..'z'.
+    qualifier = '_' + ':'.
+    dollar    = '$'.
+    digit     = "0123456789".
+    sign      = '+' + '-'.
+    cr        = '\r'.
+    lf        = '\n'.
+    tab       = '\t'.
+    stringCh  = ANY - '"' - '\\' - cr - lf.
+    printable = '\u0020' .. '\u007e'.
+
+
+// * * * * * * * * * * * * * * * *  TOKENS * * * * * * * * * * * * * * * * * //
+
+TOKENS
+
+// identifier
+ident  =
+    letter { letter | digit | qualifier }.
+
+// string
+string =
+    '"' { stringCh | '\\' printable } '"'.
+
+// dictionary lookup identifier
+// starts with '$' and otherwise limited to a normal indentifier
+variable  =
+    dollar letter { letter | digit | qualifier }.
+
+// floating point and integer numbers
+number  =
+    [sign] ('.' digit { digit } ) | ( digit { digit } [ '.' { digit } ])
+    [ ('E' | 'e') [sign] digit { digit } ].
+
+
+// * * * * * * * * * * *  PRAGMAS / COMMENTS / IGNORE  * * * * * * * * * * * //
+
+COMMENTS FROM "/*" TO "*/" NESTED
+COMMENTS FROM "//" TO lf
+
+IGNORE cr + lf + tab
+
+
+// * * * * * * * * * * * * * * *  PRODUCTIONS  * * * * * * * * * * * * * * * //
+
+PRODUCTIONS
+
+calcEntry                       (. val = 0;
+                                 if (debug){Info<<"start val pos:"<< t->pos << nl;}
+                                 .)
+=
+  '{' Expr<val> '}'             (.
+                                   if (debug){
+                                       Info<<"end {} at pos:"<< t->pos
+                                           <<" val:"<< t->val
+                                           <<" len:"<< coco_string_length(t->val)
+                                           <<" la pos:"<< la->pos << nl;
+                                   }
+                                   // reposition to immediately after the closing '}'
+                                   scanner->buffer->SetPos
+                                   (
+                                       t->pos + coco_string_length(t->val)
+                                   );
+                                 .)
+    | ( Expr<val> EOF )
+.
+
+
+/*---------------------------------------------------------------------------*/
+
+Expr<scalar& val>               (. scalar val2 = 0;
+                                   if (debug) {Info<<"Expr:"<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+=
+  Term<val>
+  {
+      "+" Term<val2>            (. if (debug) {Info<<"+Term:"<<val2 << " pos:"<< t->pos << nl;}
+                                   val += val2;
+                                   if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+    | "-" Term<val2>            (. if (debug) {Info<<"-Term:"<<val2<< " pos:"<< t->pos << nl;}
+                                   val -= val2;
+                                   if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+  }
+.
+
+
+/*---------------------------------------------------------------------------*/
+
+Term<scalar& val>               (. scalar val2 = 0;
+                                   if (debug) {Info<<"Term:"<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+=
+  Factor<val>
+  {
+     "*" Factor<val2>           (. if (debug) {Info<<"*Factor:"<<val2<< " pos:"<< t->pos << nl;}
+                                   val *= val2;
+                                   if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+  |  "/" Factor<val2>           (. if (debug) {Info<<"/Factor:"<<val2<< " pos:"<< t->pos << nl;}
+                                   val /= val2;
+                                   if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+                                 .)
+  }
+.
+
+
+/*---------------------------------------------------------------------------*/
+Factor<scalar& val>
+=
+    variable                    (. val = getDictLookup();
+                                   if (debug) {Info<<"lookup:"<<val<< " pos:"<< t->pos << nl;}
+                                 .)
+  | number                      (. val = getScalar();
+                                   if (debug) {Info<<"got num:"<<val<< " pos:"<< t->pos << nl;}
+                                 .)
+  | '-' '(' Expr<val> ')'       (. val = -val;
+                                   if (debug) {Info<<"inv:"<<val<< " pos:"<< t->pos << nl;}
+                                 .)
+  | '(' Expr<val> ')'           (. if (debug){Info<<"got Expr:"<<val<< " pos:"<< t->pos << nl;}
+                                 .)
+.
+
+
+/*---------------------------------------------------------------------------*/
+
+END calcEntry.
+
+// ************************************************************************* //

applications/test/dictionary/calcEntry/calcEntryParser.cpp

@@ -0,0 +1,339 @@
+
+
+#include <wchar.h>
+#include "calcEntryParser.h"
+
+
+namespace Foam {
+namespace functionEntries {
+namespace calcEntryInternal {
+
+
+// ----------------------------------------------------------------------------
+// Parser Implementation
+// ----------------------------------------------------------------------------
+
+void Parser::SynErr(int n) {
+	if (errDist >= minErrDist) errors->SynErr(la->line, la->col, n);
+	errDist = 0;
+}
+
+
+void Parser::SemErr(const wchar_t* msg) {
+	if (errDist >= minErrDist) errors->Error(t->line, t->col, msg);
+	errDist = 0;
+}
+
+
+void Parser::Get() {
+	for (;;) {
+		t = la;
+		la = scanner->Scan();
+		if (la->kind <= maxT) {
+			++errDist;
+			break;
+		}
+
+		if (dummyToken != t) {
+			dummyToken->kind = t->kind;
+			dummyToken->pos = t->pos;
+			dummyToken->col = t->col;
+			dummyToken->line = t->line;
+			dummyToken->next = NULL;
+			coco_string_delete(dummyToken->val);
+			dummyToken->val = coco_string_create(t->val);
+			t = dummyToken;
+		}
+		la = t;
+	}
+}
+
+
+void Parser::Expect(int n) {
+	if (la->kind == n) {
+		Get();
+	}
+	else {
+		SynErr(n);
+	}
+}
+
+
+void Parser::ExpectWeak(int n, int follow) {
+	if (la->kind == n) {
+		Get();
+	}
+	else {
+		SynErr(n);
+		while (!StartOf(follow)) {
+			Get();
+		}
+	}
+}
+
+
+bool Parser::WeakSeparator(int n, int syFol, int repFol) {
+	if (la->kind == n) {
+		Get();
+		return true;
+	}
+	else if (StartOf(repFol)) {
+		return false;
+	}
+	else {
+		SynErr(n);
+		while (!(StartOf(syFol) || StartOf(repFol) || StartOf(0))) {
+			Get();
+		}
+		return StartOf(syFol);
+	}
+}
+
+
+void Parser::calcEntry() {
+		val = 0;
+		if (debug){Info<<"start val pos:"<< t->pos << nl;}
+		
+		if (la->kind == 5) {
+			Get();
+			Expr(val);
+			Expect(6);
+			if (debug){
+			   Info<<"end {} at pos:"<< t->pos
+			       <<" val:"<< t->val
+			       <<" len:"<< coco_string_length(t->val)
+			       <<" la pos:"<< la->pos << nl;
+			}
+			// reposition to immediately after the closing '}'
+			scanner->buffer->SetPos
+			(
+			    t->pos + coco_string_length(t->val)
+			);
+			
+		} else if (StartOf(1)) {
+			Expr(val);
+			Expect(0);
+		} else SynErr(14);
+}
+
+void Parser::Expr(scalar& val) {
+		scalar val2 = 0;
+		if (debug) {Info<<"Expr:"<< val<< " pos:"<< t->pos << nl;}
+		
+		Term(val);
+		while (la->kind == 7 || la->kind == 8) {
+			if (la->kind == 7) {
+				Get();
+				Term(val2);
+				if (debug) {Info<<"+Term:"<<val2 << " pos:"<< t->pos << nl;}
+				val += val2;
+				if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+				
+			} else {
+				Get();
+				Term(val2);
+				if (debug) {Info<<"-Term:"<<val2<< " pos:"<< t->pos << nl;}
+				val -= val2;
+				if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+				
+			}
+		}
+}
+
+void Parser::Term(scalar& val) {
+		scalar val2 = 0;
+		if (debug) {Info<<"Term:"<< val<< " pos:"<< t->pos << nl;}
+		
+		Factor(val);
+		while (la->kind == 9 || la->kind == 10) {
+			if (la->kind == 9) {
+				Get();
+				Factor(val2);
+				if (debug) {Info<<"*Factor:"<<val2<< " pos:"<< t->pos << nl;}
+				val *= val2;
+				if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+				
+			} else {
+				Get();
+				Factor(val2);
+				if (debug) {Info<<"/Factor:"<<val2<< " pos:"<< t->pos << nl;}
+				val /= val2;
+				if (debug) {Info<<"="<< val<< " pos:"<< t->pos << nl;}
+				
+			}
+		}
+}
+
+void Parser::Factor(scalar& val) {
+		if (la->kind == 3) {
+			Get();
+			val = getDictLookup();
+			if (debug) {Info<<"lookup:"<<val<< " pos:"<< t->pos << nl;}
+			
+		} else if (la->kind == 4) {
+			Get();
+			val = getScalar();
+			if (debug) {Info<<"got num:"<<val<< " pos:"<< t->pos << nl;}
+			
+		} else if (la->kind == 8) {
+			Get();
+			Expect(11);
+			Expr(val);
+			Expect(12);
+			val = -val;
+			if (debug) {Info<<"inv:"<<val<< " pos:"<< t->pos << nl;}
+			
+		} else if (la->kind == 11) {
+			Get();
+			Expr(val);
+			Expect(12);
+			if (debug){Info<<"got Expr:"<<val<< " pos:"<< t->pos << nl;}
+			
+		} else SynErr(15);
+}
+
+
+
+void Parser::Parse() {
+	t = NULL;
+	if (dummyToken) {    // safety: someone might call Parse() twice
+		delete dummyToken;
+	}
+	la = dummyToken = new Token();
+	la->val = coco_string_create(L"Dummy Token");
+	Get();
+	calcEntry();
+	// let grammar deal with end-of-file expectations
+
+}
+
+
+Parser::Parser(Scanner* scan, Errors* err)
+:
+	dummyToken(NULL),
+	deleteErrorsDestruct_(!err),
+	errDist(minErrDist),
+	scanner(scan),
+	errors(err),
+	t(NULL),
+	la(NULL)
+{
+
+	if (!errors) {   // add in default error handling
+		errors = new Errors();
+	}
+}
+
+
+bool Parser::StartOf(int s) {
+	const bool T = true;
+	const bool x = false;
+
+	static bool set[2][15] = {
+		{T,x,x,x, x,x,x,x, x,x,x,x, x,x,x},
+		{x,x,x,T, T,x,x,x, T,x,x,T, x,x,x}
+	};
+
+
+
+	return set[s][la->kind];
+}
+
+
+Parser::~Parser() {
+	if (deleteErrorsDestruct_) {    // delete default error handling
+		delete errors;
+	}
+	delete dummyToken;
+}
+
+
+// ----------------------------------------------------------------------------
+// Errors Implementation
+// ----------------------------------------------------------------------------
+
+Errors::Errors()
+:
+	count(0)
+{}
+
+
+Errors::~Errors()
+{}
+
+
+void Errors::clear() {
+	count = 0;
+}
+
+
+wchar_t* Errors::strerror(int n)
+{
+	wchar_t* s;
+	switch (n) {
+			case 0: s = coco_string_create(L"EOF expected"); break;
+			case 1: s = coco_string_create(L"ident expected"); break;
+			case 2: s = coco_string_create(L"string expected"); break;
+			case 3: s = coco_string_create(L"variable expected"); break;
+			case 4: s = coco_string_create(L"number expected"); break;
+			case 5: s = coco_string_create(L"\"{\" expected"); break;
+			case 6: s = coco_string_create(L"\"}\" expected"); break;
+			case 7: s = coco_string_create(L"\"+\" expected"); break;
+			case 8: s = coco_string_create(L"\"-\" expected"); break;
+			case 9: s = coco_string_create(L"\"*\" expected"); break;
+			case 10: s = coco_string_create(L"\"/\" expected"); break;
+			case 11: s = coco_string_create(L"\"(\" expected"); break;
+			case 12: s = coco_string_create(L"\")\" expected"); break;
+			case 13: s = coco_string_create(L"??? expected"); break;
+			case 14: s = coco_string_create(L"invalid calcEntry"); break;
+			case 15: s = coco_string_create(L"invalid Factor"); break;
+
+		default:
+		{
+			wchar_t format[20];
+			coco_swprintf(format, 20, L"error %d", n);
+			s = coco_string_create(format);
+		}
+		break;
+	}
+	return s;
+}
+
+
+void Errors::Warning(const wchar_t* msg) {
+	wprintf(L"%ls\n", msg);
+}
+
+
+void Errors::Warning(int line, int col, const wchar_t* msg) {
+	wprintf(L"-- line %d col %d: %ls\n", line, col, msg);
+}
+
+
+void Errors::Error(int line, int col, const wchar_t* msg) {
+	wprintf(L"-- line %d col %d: %ls\n", line, col, msg);
+	count++;
+}
+
+
+void Errors::SynErr(int line, int col, int n) {
+	wchar_t* msg = this->strerror(n);
+	this->Error(line, col, msg);
+	coco_string_delete(msg);
+}
+
+
+void Errors::Exception(const wchar_t* msg) {
+	wprintf(L"%ls", msg);
+	::exit(1);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // namespace
+} // namespace
+} // namespace
+
+
+// ************************************************************************* //

applications/test/dictionary/calcEntry/calcEntryParser.h

@@ -0,0 +1,206 @@
+
+
+#ifndef COCO_calcEntryPARSER_H__
+#define COCO_calcEntryPARSER_H__
+
+#include "dictionary.H"
+#include "scalar.H"
+#include "error.H"
+#include "wchar.H"
+
+
+#include "calcEntryScanner.h"
+
+namespace Foam {
+namespace functionEntries {
+namespace calcEntryInternal {
+
+
+//! Parser error handing
+class Errors {
+public:
+	int count;      //!< The number of errors detected
+
+	//! Allocate and return a string describing the given error code.
+	/** It is the responsibility of the caller to free this string,
+	 *  eg, with coco_string_delete()
+	 */
+	static wchar_t* strerror(int n);
+
+	Errors();               //!< Construct null - start with no errors
+	virtual ~Errors();      //!< Destructor
+	virtual void clear();   //!< Clear the error count
+
+	//! Handle a general warning 'msg'
+	virtual void Warning(const wchar_t* msg);
+	//! Handle a general warning 'msg'
+	virtual void Warning(int line, int col, const wchar_t* msg);
+	//! Handle general error 'msg' (eg, a semantic error)
+	virtual void Error(int line, int col, const wchar_t* msg);
+	//! Handle syntax error 'n', uses strerror for the message, calls Error()
+	virtual void SynErr(int line, int col, int n);
+	//! Handle a general exception 'msg'
+	virtual void Exception(const wchar_t* msg);
+
+}; // Errors
+
+
+//! A Coco/R Parser
+class Parser {
+private:
+	enum {
+		_EOF=0,
+		_ident=1,
+		_string=2,
+		_variable=3,
+		_number=4,
+	};
+	static const int maxT = 13;
+
+	static const int minErrDist = 2; //!< min. distance before reporting errors
+
+	Token *dummyToken;
+	bool deleteErrorsDestruct_; //!< delete the 'errors' member in destructor
+	int  errDist;
+
+	void SynErr(int n);         //!< Handle syntax error 'n'
+	void Get();
+	void Expect(int n);
+	bool StartOf(int s);
+	void ExpectWeak(int n, int follow);
+	bool WeakSeparator(int n, int syFol, int repFol);
+
+public:
+	Scanner *scanner;
+	Errors  *errors;
+
+	Token *t;                   //!< last recognized token
+	Token *la;                  //!< lookahead token
+
+static const int debug = 0;
+
+    //! The parent dictionary
+    mutable dictionary* dict_;
+
+    //! Track that parent dictionary was set
+    bool hasDict_;
+
+    //! The calculation result
+    scalar val;
+
+
+    //! token -> scalar
+    scalar getScalar() const
+    {
+        return coco_string_toDouble(t->val);
+    }
+
+    //! token -> string
+    std::string getString() const
+    {
+        char* str = coco_string_create_char(t->val);
+        std::string s(str);
+        coco_string_delete(str);
+        return s;
+    }
+
+    //! attach a dictionary
+    void dict(const dictionary& dict)
+    {
+        dict_ = const_cast<dictionary*>(&dict);
+        hasDict_ = true;
+    }
+
+
+    //! lookup dictionary entry
+    scalar getDictLookup() const
+    {
+        scalar dictValue = 0;
+
+        if (!hasDict_)
+        {
+            FatalErrorIn
+            (
+                "calcEntry::getDictEntry() const"
+            )   << "No dictionary attached!"
+                << exit(FatalError);
+
+            return 0;
+        }
+
+        char* chars = coco_string_create_char
+        (
+            t->val,
+            1,
+            (coco_string_length(t->val) - 1)
+        );
+        word keyword(chars);
+        coco_string_delete(chars);
+
+        if (debug)
+        {
+            Info<<"lookup: " << keyword << nl;
+        }
+
+        entry* entryPtr = dict_->lookupEntryPtr(keyword, true, false);
+        if (entryPtr && !entryPtr->isDict())
+        {
+            if (entryPtr->stream().size() != 1)
+            {
+                FatalErrorIn
+                (
+                    "calcEntry::getDictEntry() const"
+                )   << "keyword " << keyword << " has "
+                    << entryPtr->stream().size() << " values in dictionary "
+                    << exit(FatalError);
+            }
+            entryPtr->stream() >> dictValue;
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "calcEntry::getDictEntry() const"
+            )   << "keyword " << keyword << " is undefined in dictionary "
+                << exit(FatalError);
+        }
+
+
+        return dictValue;
+    }
+
+    scalar Result() const
+    {
+        return val;
+    }
+
+
+/*---------------------------------------------------------------------------*/
+
+
+
+	//! Construct for the specified scanner
+	/**
+	 *  Use the default error handling, or optionally provide an error
+	 *  handler, which will not be deleted upon destruction.
+	 */
+	Parser(Scanner* scan, Errors* err = 0);
+	~Parser();      //!< Destructor - cleanup errors and dummyToken
+	void SemErr(const wchar_t* msg);    //!< Handle semantic error
+
+	void calcEntry();
+	void Expr(scalar& val);
+	void Term(scalar& val);
+	void Factor(scalar& val);
+
+	void Parse();                       //!< Execute the parse operation
+
+}; // end Parser
+
+} // namespace
+} // namespace
+} // namespace
+
+
+#endif // COCO_calcEntryPARSER_H__
+

applications/test/dictionary/calcEntry/calcEntryScanner.cpp

@@ -0,0 +1,932 @@
+
+
+#include <sstream>
+
+#include "calcEntryScanner.h"
+
+// values for the file stream buffering
+#define MIN_BUFFER_LENGTH 1024        // 1KB
+#define MAX_BUFFER_LENGTH (64*MIN_BUFFER_LENGTH)   // 64KB
+// value for the heap management
+#define HEAP_BLOCK_SIZE   (64*1024)   // 64KB
+
+
+namespace Foam {
+namespace functionEntries {
+namespace calcEntryInternal {
+
+
+// * * * * * * * * * *  Wide Character String Routines * * * * * * * * * * * //
+
+// string handling, wide character
+
+wchar_t* coco_string_create(const wchar_t* str) {
+	int len = coco_string_length(str);
+	wchar_t* dest = new wchar_t[len + 1];
+	if (len) {
+		wcsncpy(dest, str, len);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+wchar_t* coco_string_create(const wchar_t* str, int index, int length) {
+	int len = coco_string_length(str);
+	if (len) {
+		len = length;
+	}
+	wchar_t* dest = new wchar_t[len + 1];
+	if (len) {
+		wcsncpy(dest, &(str[index]), len);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+
+wchar_t* coco_string_create_lower(const wchar_t* str) {
+	if (!str) { return NULL; }
+	return coco_string_create_lower(str, 0, wcslen(str));
+}
+
+
+wchar_t* coco_string_create_lower(const wchar_t* str, int index, int len) {
+	if (!str) { return NULL; }
+	wchar_t* dest = new wchar_t[len + 1];
+
+	for (int i = 0; i < len; i++) {
+		const wchar_t ch = str[index + i];
+		if ((L'A' <= ch) && (ch <= L'Z')) {
+			dest[i] = ch - (L'A' - L'a');
+		}
+		else {
+			dest[i] = ch;
+		}
+	}
+	dest[len] = L'\0';
+	return dest;
+}
+
+
+wchar_t* coco_string_create_append(const wchar_t* str1, const wchar_t* str2) {
+	int str1Len = coco_string_length(str1);
+	int str2Len = coco_string_length(str2);
+
+	wchar_t* dest = new wchar_t[str1Len + str2Len + 1];
+
+	if (str1Len) { wcscpy(dest, str1); }
+	if (str2Len) { wcscpy(dest + str1Len, str2); }
+
+	dest[str1Len + str2Len] = 0;
+	return dest;
+}
+
+wchar_t* coco_string_create_append(const wchar_t* str1, const wchar_t ch) {
+	int len = coco_string_length(str1);
+	wchar_t* dest = new wchar_t[len + 2];
+	wcsncpy(dest, str1, len);   // or use if (len) { wcscpy(dest, str1); }
+	dest[len] = ch;
+	dest[len + 1] = 0;
+	return dest;
+}
+
+void coco_string_delete(wchar_t* &str) {
+	delete [] str;
+	str = NULL;
+}
+
+int coco_string_length(const wchar_t* str) {
+	return str ? wcslen(str) : 0;
+}
+
+bool coco_string_endswith(const wchar_t* str, const wchar_t* endstr) {
+	int strLen = wcslen(str);
+	int endLen = wcslen(endstr);
+	return (endLen <= strLen) && (wcscmp(str + strLen - endLen, endstr) == 0);
+}
+
+int coco_string_indexof(const wchar_t* str, const wchar_t ch) {
+	const wchar_t* fnd = wcschr(str, ch);
+	return fnd ? (fnd - str) : -1;
+}
+
+int coco_string_lastindexof(const wchar_t* str, const wchar_t ch) {
+	const wchar_t* fnd = wcsrchr(str, ch);
+	return fnd ? (fnd - str) : -1;
+}
+
+void coco_string_merge(wchar_t* &dest, const wchar_t* str) {
+	if (!str) { return; }
+	wchar_t* newstr = coco_string_create_append(dest, str);
+	delete [] dest;
+	dest = newstr;
+}
+
+bool coco_string_equal(const wchar_t* str1, const wchar_t* str2) {
+	return wcscmp(str1, str2) == 0;
+}
+
+int coco_string_compareto(const wchar_t* str1, const wchar_t* str2) {
+	return wcscmp(str1, str2);
+}
+
+int coco_string_hash(const wchar_t* str) {
+	int h = 0;
+	if (!str) { return 0; }
+	while (*str != 0) {
+		h = (h * 7) ^ *str;
+		++str;
+	}
+	if (h < 0) { h = -h; }
+	return h;
+}
+
+
+double coco_string_toDouble(const wchar_t* str)
+{
+	return str ? wcstod(str, NULL) : 0;
+}
+
+float coco_string_toFloat(const wchar_t* str)
+{
+	return str ? wcstof(str, NULL) : 0;
+}
+
+
+
+//
+// string handling, byte character
+//
+
+wchar_t* coco_string_create(const char* str) {
+	int len = str ? strlen(str) : 0;
+	wchar_t* dest = new wchar_t[len + 1];
+	for (int i = 0; i < len; ++i) {
+		dest[i] = wchar_t(str[i]);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+wchar_t* coco_string_create(const char* str, int index, int length) {
+	int len = str ? length : 0;
+	wchar_t* dest = new wchar_t[len + 1];
+	for (int i = 0; i < len; ++i) {
+		dest[i] = wchar_t(str[index + i]);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+
+char* coco_string_create_char(const wchar_t* str) {
+	int len = coco_string_length(str);
+	char *dest = new char[len + 1];
+	for (int i = 0; i < len; ++i)
+	{
+		dest[i] = char(str[i]);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+char* coco_string_create_char(const wchar_t* str, int index, int length) {
+	int len = coco_string_length(str);
+	if (len) {
+		len = length;
+	}
+	char *dest = new char[len + 1];
+	for (int i = 0; i < len; ++i) {
+		dest[i] = char(str[index + i]);
+	}
+	dest[len] = 0;
+	return dest;
+}
+
+
+void coco_string_delete(char* &str) {
+	delete [] str;
+	str = NULL;
+}
+
+
+double coco_string_toDouble(const char* str)
+{
+	return str ? strtod(str, NULL) : 0;
+}
+
+float coco_string_toFloat(const char* str)
+{
+	return str ? strtof(str, NULL) : 0;
+}
+
+
+// * * * * * * * * * End of Wide Character String Routines * * * * * * * * * //
+
+
+Token::Token()
+:
+    kind(0),
+    pos(0),
+    col(0),
+    line(0),
+    val(NULL),
+    next(NULL)
+{}
+
+
+// Note: this delete may not be correct if the token was actually
+// allocated by the internal heap mechanism
+Token::~Token() {
+	coco_string_delete(val);
+}
+
+
+// ----------------------------------------------------------------------------
+// Buffer Implementation
+// ----------------------------------------------------------------------------
+
+Buffer::Buffer(Buffer* b)
+:
+	buf(b->buf),
+	bufCapacity(b->bufCapacity),
+	bufLen(b->bufLen),
+	bufPos(b->bufPos),
+	bufStart(b->bufStart),
+	fileLen(b->fileLen),
+	cStream(b->cStream),
+	stdStream(b->stdStream),
+	isUserStream_(b->isUserStream_)
+{
+	// avoid accidental deletion on any of these members
+	b->buf = NULL;
+	b->cStream = NULL;
+	b->stdStream = NULL;
+}
+
+
+Buffer::Buffer(FILE* istr, bool isUserStream)
+:
+	buf(NULL),
+	bufCapacity(0),
+	bufLen(0),
+	bufPos(0),
+	bufStart(0),
+	fileLen(0),
+	cStream(istr),
+	stdStream(NULL),
+	isUserStream_(isUserStream)
+{
+// ensure binary read on windows
+#if _MSC_VER >= 1300
+	_setmode(_fileno(cStream), _O_BINARY);
+#endif
+
+	if (CanSeek()) {
+		fseek(cStream, 0, SEEK_END);
+		fileLen = ftell(cStream);
+		fseek(cStream, 0, SEEK_SET);
+		bufLen = (fileLen < MAX_BUFFER_LENGTH) ? fileLen : MAX_BUFFER_LENGTH;
+		bufStart = INT_MAX; // nothing in the buffer so far
+	}
+
+	bufCapacity = (bufLen > 0) ? bufLen : MIN_BUFFER_LENGTH;
+	buf = new unsigned char[bufCapacity];
+	if (fileLen > 0) SetPos(0);          // setup buffer to position 0 (start)
+	else bufPos = 0; // index 0 is already after the file, thus Pos = 0 is invalid
+	if (bufLen == fileLen && CanSeek()) Close();
+}
+
+
+Buffer::Buffer(std::istream* istr, bool isUserStream)
+:
+	buf(NULL),
+	bufCapacity(0),
+	bufLen(0),
+	bufPos(0),
+	bufStart(0),
+	fileLen(0),
+	cStream(NULL),
+	stdStream(istr),
+	isUserStream_(isUserStream)
+{
+	// ensure binary read on windows
+#if _MSC_VER >= 1300
+	// TODO
+#endif
+}
+
+
+Buffer::Buffer(std::string& str)
+:
+	buf(NULL),
+	bufCapacity(0),
+	bufLen(0),
+	bufPos(0),
+	bufStart(0),
+	fileLen(0),
+	cStream(NULL),
+	stdStream(new std::istringstream(str)),
+	isUserStream_(false)
+{}
+
+
+Buffer::Buffer(const unsigned char* chars, int len)
+:
+	buf(new unsigned char[len]),
+	bufCapacity(len),
+	bufLen(len),
+	bufPos(0),
+	bufStart(0),
+	fileLen(len),
+	cStream(NULL),
+	stdStream(NULL),
+	isUserStream_(false)
+{
+	memcpy(this->buf, chars, len*sizeof(char));
+}
+
+
+Buffer::Buffer(const char* chars, int len)
+:
+	buf(new unsigned char[len]),
+	bufCapacity(len),
+	bufLen(len),
+	bufPos(0),
+	bufStart(0),
+	fileLen(len),
+	cStream(NULL),
+	stdStream(NULL),
+	isUserStream_(false)
+{
+	memcpy(this->buf, chars, len*sizeof(char));
+}
+
+
+Buffer::~Buffer() {
+	Close();
+	if (buf) {
+		delete [] buf;
+		buf = NULL;
+	}
+}
+
+
+void Buffer::Close() {
+	if (!isUserStream_) {
+		if (cStream) {
+			fclose(cStream);
+			cStream = NULL;
+		}
+		else if (stdStream) {
+			delete stdStream;
+			stdStream = 0;
+		}
+	}
+}
+
+
+int Buffer::Read() {
+	if (stdStream)
+	{
+		int ch = stdStream->get();
+		if (stdStream->eof())
+		{
+			return EoF;
+		}
+		return ch;
+	}
+
+	if (bufPos < bufLen) {
+		return buf[bufPos++];
+	} else if (GetPos() < fileLen) {
+		SetPos(GetPos()); // shift buffer start to Pos
+		return buf[bufPos++];
+	} else if (cStream && !CanSeek() && (ReadNextStreamChunk() > 0)) {
+		return buf[bufPos++];
+	} else {
+		return EoF;
+	}
+}
+
+
+int UTF8Buffer::Read() {
+	int ch;
+	do {
+		ch = Buffer::Read();
+		// until we find a utf8 start (0xxxxxxx or 11xxxxxx)
+	} while ((ch >= 128) && ((ch & 0xC0) != 0xC0) && (ch != EoF));
+	if (ch < 128 || ch == EoF) {
+		// nothing to do, first 127 chars are the same in ascii and utf8
+		// 0xxxxxxx or end of file character
+	} else if ((ch & 0xF0) == 0xF0) {
+		// 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+		int c1 = ch & 0x07; ch = Buffer::Read();
+		int c2 = ch & 0x3F; ch = Buffer::Read();
+		int c3 = ch & 0x3F; ch = Buffer::Read();
+		int c4 = ch & 0x3F;
+		ch = (((((c1 << 6) | c2) << 6) | c3) << 6) | c4;
+	} else if ((ch & 0xE0) == 0xE0) {
+		// 1110xxxx 10xxxxxx 10xxxxxx
+		int c1 = ch & 0x0F; ch = Buffer::Read();
+		int c2 = ch & 0x3F; ch = Buffer::Read();
+		int c3 = ch & 0x3F;
+		ch = (((c1 << 6) | c2) << 6) | c3;
+	} else if ((ch & 0xC0) == 0xC0) {
+		// 110xxxxx 10xxxxxx
+		int c1 = ch & 0x1F; ch = Buffer::Read();
+		int c2 = ch & 0x3F;
+		ch = (c1 << 6) | c2;
+	}
+	return ch;
+}
+
+
+int Buffer::Peek() {
+	int curPos = GetPos();
+	int ch = Read();
+	SetPos(curPos);
+	return ch;
+}
+
+
+int Buffer::GetPos() const {
+	if (stdStream)
+	{
+		return stdStream->tellg();
+	}
+
+	return bufPos + bufStart;
+}
+
+
+void Buffer::SetPos(int value) {
+	if (stdStream)
+	{
+		stdStream->seekg(value, std::ios::beg);
+		return;
+	}
+
+	if ((value >= fileLen) && cStream && !CanSeek()) {
+		// Wanted position is after buffer and the stream
+		// is not seek-able e.g. network or console,
+		// thus we have to read the stream manually till
+		// the wanted position is in sight.
+		while ((value >= fileLen) && (ReadNextStreamChunk() > 0))
+		{}
+	}
+
+	if ((value < 0) || (value > fileLen)) {
+		wprintf(L"--- buffer out of bounds access, position: %d\n", value);
+		::exit(1);
+	}
+
+	if ((value >= bufStart) && (value < (bufStart + bufLen))) { // already in buffer
+		bufPos = value - bufStart;
+	} else if (cStream) { // must be swapped in
+		fseek(cStream, value, SEEK_SET);
+		bufLen = fread(buf, sizeof(char), bufCapacity, cStream);
+		bufStart = value; bufPos = 0;
+	} else {
+		bufPos = fileLen - bufStart; // make Pos return fileLen
+	}
+}
+
+
+// Read the next chunk of bytes from the stream, increases the buffer
+// if needed and updates the fields fileLen and bufLen.
+// Returns the number of bytes read.
+int Buffer::ReadNextStreamChunk() {
+	int freeLen = bufCapacity - bufLen;
+	if (freeLen == 0) {
+		// in the case of a growing input stream
+		// we can neither seek in the stream, nor can we
+		// foresee the maximum length, thus we must adapt
+		// the buffer size on demand.
+		bufCapacity = bufLen * 2;
+		unsigned char *newBuf = new unsigned char[bufCapacity];
+		memcpy(newBuf, buf, bufLen*sizeof(char));
+		delete [] buf;
+		buf = newBuf;
+		freeLen = bufLen;
+	}
+	int read = fread(buf + bufLen, sizeof(char), freeLen, cStream);
+	if (read > 0) {
+		fileLen = bufLen = (bufLen + read);
+		return read;
+	}
+	// end of stream reached
+	return 0;
+}
+
+
+bool Buffer::CanSeek() const {
+	return cStream && (ftell(cStream) != -1);
+}
+
+
+// ----------------------------------------------------------------------------
+// Scanner Implementation
+// ----------------------------------------------------------------------------
+
+Scanner::Scanner(FILE* istr)
+:
+	buffer(new Buffer(istr, true))
+{
+	Init();
+}
+
+
+Scanner::Scanner(std::istream& istr)
+:
+	buffer(new Buffer(&istr, true))
+{
+	Init();
+}
+
+
+Scanner::Scanner(const wchar_t* fileName) {
+	char *chFileName = coco_string_create_char(fileName);
+	FILE* istr;
+	if ((istr = fopen(chFileName, "rb")) == NULL) {
+		wprintf(L"--- Cannot open file %ls\n", fileName);
+		::exit(1);
+	}
+	coco_string_delete(chFileName);
+	buffer = new Buffer(istr, false);
+	Init();
+}
+
+
+Scanner::Scanner(const unsigned char* buf, int len)
+:
+	buffer(new Buffer(buf, len))
+{
+	Init();
+}
+
+
+Scanner::Scanner(const char* buf, int len)
+:
+	buffer(new Buffer(buf, len))
+{
+	Init();
+}
+
+
+Scanner::~Scanner() {
+	char* cur = reinterpret_cast<char*>(firstHeap);
+
+	while (cur) {
+		cur = *(reinterpret_cast<char**>(cur + HEAP_BLOCK_SIZE));
+		free(firstHeap);
+		firstHeap = cur;
+	}
+	delete [] tval;
+	delete buffer;
+}
+
+
+void Scanner::Init() {
+	for (int i = 65; i <= 90; ++i) start.set(i, 1);
+	for (int i = 97; i <= 122; ++i) start.set(i, 1);
+	for (int i = 36; i <= 36; ++i) start.set(i, 5);
+	start.set(45, 20);
+	for (int i = 48; i <= 57; ++i) start.set(i, 9);
+	start.set(34, 2);
+	start.set(46, 7);
+	start.set(123, 14);
+	start.set(125, 15);
+	start.set(43, 21);
+	start.set(42, 16);
+	start.set(47, 17);
+	start.set(40, 18);
+	start.set(41, 19);
+	start.set(Buffer::EoF, -1);
+
+
+
+	tvalLength = 128;
+	tval = new wchar_t[tvalLength]; // text of current token
+
+	// HEAP_BLOCK_SIZE byte heap + pointer to next heap block
+	heap = malloc(HEAP_BLOCK_SIZE + sizeof(void*));
+	firstHeap = heap;
+	heapEnd =
+		reinterpret_cast<void**>
+		(reinterpret_cast<char*>(heap) + HEAP_BLOCK_SIZE);
+	*heapEnd = 0;
+	heapTop = heap;
+	if (sizeof(Token) > HEAP_BLOCK_SIZE) {
+		wprintf(L"--- Too small HEAP_BLOCK_SIZE\n");
+		::exit(1);
+	}
+
+	pos = -1; line = 1; col = 0;
+	oldEols = 0;
+	NextCh();
+	if (ch == 0xEF) { // check optional byte order mark for UTF-8
+		NextCh(); int ch1 = ch;
+		NextCh(); int ch2 = ch;
+		if (ch1 != 0xBB || ch2 != 0xBF) {
+			wprintf(L"Illegal byte order mark at start of file");
+			::exit(1);
+		}
+		Buffer *oldBuf = buffer;
+		buffer = new UTF8Buffer(buffer); col = 0;
+		delete oldBuf; oldBuf = NULL;
+		NextCh();
+	}
+
+
+	pt = tokens = CreateToken(); // first token is a dummy
+}
+
+
+void Scanner::NextCh() {
+	if (oldEols > 0) {
+		ch = EOL;
+		oldEols--;
+	}
+	else {
+		pos = buffer->GetPos();
+		ch = buffer->Read(); col++;
+		// replace isolated '\r' by '\n' in order to make
+		// eol handling uniform across Windows, Unix and Mac
+		if (ch == L'\r' && buffer->Peek() != L'\n') ch = EOL;
+		if (ch == EOL) { line++; col = 0; }
+	}
+
+}
+
+
+void Scanner::AddCh() {
+	if (tlen >= tvalLength) {
+		tvalLength *= 2;
+		wchar_t *newBuf = new wchar_t[tvalLength];
+		memcpy(newBuf, tval, tlen*sizeof(wchar_t));
+		delete [] tval;
+		tval = newBuf;
+	}
+	if (ch != Buffer::EoF) {
+		tval[tlen++] = ch;
+		NextCh();
+	}
+}
+
+
+
+bool Scanner::Comment0() {
+	int level = 1, pos0 = pos, line0 = line, col0 = col;
+	NextCh();
+	if (ch == L'/') {
+		NextCh();
+		for(;;) {
+			if (ch == 10) {
+				level--;
+				if (level == 0) { oldEols = line - line0; NextCh(); return true; }
+				NextCh();
+			} else if (ch == buffer->EoF) return false;
+			else NextCh();
+		}
+	} else {
+		buffer->SetPos(pos0); NextCh(); line = line0; col = col0;
+	}
+	return false;
+}
+
+bool Scanner::Comment1() {
+	int level = 1, pos0 = pos, line0 = line, col0 = col;
+	NextCh();
+	if (ch == L'*') {
+		NextCh();
+		for(;;) {
+			if (ch == L'*') {
+				NextCh();
+				if (ch == L'/') {
+					level--;
+					if (level == 0) { oldEols = line - line0; NextCh(); return true; }
+					NextCh();
+				}
+			} else if (ch == L'/') {
+				NextCh();
+				if (ch == L'*') {
+					level++; NextCh();
+				}
+			} else if (ch == buffer->EoF) return false;
+			else NextCh();
+		}
+	} else {
+		buffer->SetPos(pos0); NextCh(); line = line0; col = col0;
+	}
+	return false;
+}
+
+
+void Scanner::CreateHeapBlock() {
+	char* cur = reinterpret_cast<char*>(firstHeap);
+
+	// release unused blocks
+	while
+	(
+            (reinterpret_cast<char*>(tokens) < cur)
+         || (reinterpret_cast<char*>(tokens) > (cur + HEAP_BLOCK_SIZE))
+        ) {
+		cur = *(reinterpret_cast<char**>(cur + HEAP_BLOCK_SIZE));
+		free(firstHeap);
+		firstHeap = cur;
+	}
+
+	// HEAP_BLOCK_SIZE byte heap + pointer to next heap block
+	void* newHeap = malloc(HEAP_BLOCK_SIZE + sizeof(void*));
+	*heapEnd = newHeap;
+	heapEnd =
+		reinterpret_cast<void**>
+		(reinterpret_cast<char*>(newHeap) + HEAP_BLOCK_SIZE);
+	*heapEnd = 0;
+	heap = newHeap;
+	heapTop = heap;
+}
+
+
+Token* Scanner::CreateToken() {
+	const int reqMem = sizeof(Token);
+	if
+	(
+	    (reinterpret_cast<char*>(heapTop) + reqMem)
+	 >= reinterpret_cast<char*>(heapEnd)
+	) {
+		CreateHeapBlock();
+	}
+	// token 'occupies' heap starting at heapTop
+	Token* tok = reinterpret_cast<Token*>(heapTop);
+	// increment past this part of the heap, which is now used
+	heapTop =
+		reinterpret_cast<void*>
+		(reinterpret_cast<char*>(heapTop) + reqMem);
+	tok->val  = NULL;
+	tok->next = NULL;
+	return tok;
+}
+
+
+void Scanner::AppendVal(Token* tok) {
+	const int reqMem = (tlen + 1) * sizeof(wchar_t);
+	if
+	(
+	    (reinterpret_cast<char*>(heapTop) + reqMem)
+	 >= reinterpret_cast<char*>(heapEnd)
+	) {
+		if (reqMem > HEAP_BLOCK_SIZE) {
+			wprintf(L"--- Too long token value\n");
+			::exit(1);
+		}
+		CreateHeapBlock();
+	}
+
+	// add text value from heap
+	tok->val = reinterpret_cast<wchar_t*>(heapTop);
+
+	// increment past this part of the heap, which is now used
+	heapTop =
+		reinterpret_cast<void*>
+		(reinterpret_cast<char*>(heapTop) + reqMem);
+
+	// copy the currently parsed tval into the token
+	wcsncpy(tok->val, tval, tlen);
+	tok->val[tlen] = L'\0';
+}
+
+
+Token* Scanner::NextToken() {
+	while (ch == ' ' ||
+			(ch >= 9 && ch <= 10) || ch == 13
+	) NextCh();
+	if ((ch == L'/' && Comment0()) || (ch == L'/' && Comment1())) return NextToken();
+	t = CreateToken();
+	t->pos = pos; t->col = col; t->line = line;
+	int state = start.state(ch);
+	tlen = 0; AddCh();
+
+	switch (state) {
+		case -1: { t->kind = eofSym; break; } // NextCh already done
+		case 0: { t->kind = noSym; break; }   // NextCh already done
+		case 1:
+			case_1:
+			if ((ch >= L'0' && ch <= L':') || (ch >= L'A' && ch <= L'Z') || ch == L'_' || (ch >= L'a' && ch <= L'z')) {AddCh(); goto case_1;}
+			else {t->kind = 1; break;}
+		case 2:
+			case_2:
+			if (ch <= 9 || (ch >= 11 && ch <= 12) || (ch >= 14 && ch <= L'!') || (ch >= L'#' && ch <= L'[') || (ch >= L']' && ch <= 65535)) {AddCh(); goto case_2;}
+			else if (ch == L'"') {AddCh(); goto case_4;}
+			else if (ch == 92) {AddCh(); goto case_3;}
+			else {t->kind = noSym; break;}
+		case 3:
+			case_3:
+			if ((ch >= L' ' && ch <= L'~')) {AddCh(); goto case_2;}
+			else {t->kind = noSym; break;}
+		case 4:
+			case_4:
+			{t->kind = 2; break;}
+		case 5:
+			if ((ch >= L'A' && ch <= L'Z') || (ch >= L'a' && ch <= L'z')) {AddCh(); goto case_6;}
+			else {t->kind = noSym; break;}
+		case 6:
+			case_6:
+			if ((ch >= L'0' && ch <= L':') || (ch >= L'A' && ch <= L'Z') || ch == L'_' || (ch >= L'a' && ch <= L'z')) {AddCh(); goto case_6;}
+			else {t->kind = 3; break;}
+		case 7:
+			case_7:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_8;}
+			else {t->kind = noSym; break;}
+		case 8:
+			case_8:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_8;}
+			else {t->kind = 4; break;}
+		case 9:
+			case_9:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_9;}
+			else if (ch == L'E' || ch == L'e') {AddCh(); goto case_10;}
+			else if (ch == L'.') {AddCh(); goto case_13;}
+			else {t->kind = 4; break;}
+		case 10:
+			case_10:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_12;}
+			else if (ch == L'+' || ch == L'-') {AddCh(); goto case_11;}
+			else {t->kind = noSym; break;}
+		case 11:
+			case_11:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_12;}
+			else {t->kind = noSym; break;}
+		case 12:
+			case_12:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_12;}
+			else {t->kind = 4; break;}
+		case 13:
+			case_13:
+			if ((ch >= L'0' && ch <= L'9')) {AddCh(); goto case_13;}
+			else if (ch == L'E' || ch == L'e') {AddCh(); goto case_10;}
+			else {t->kind = 4; break;}
+		case 14:
+			{t->kind = 5; break;}
+		case 15:
+			{t->kind = 6; break;}
+		case 16:
+			{t->kind = 9; break;}
+		case 17:
+			{t->kind = 10; break;}
+		case 18:
+			{t->kind = 11; break;}
+		case 19:
+			{t->kind = 12; break;}
+		case 20:
+			if (ch == L'.') {AddCh(); goto case_7;}
+			else {t->kind = 8; break;}
+		case 21:
+			if (ch == L'.') {AddCh(); goto case_7;}
+			else {t->kind = 7; break;}
+
+	}
+	AppendVal(t);
+	return t;
+}
+
+
+// get the next token (possibly a token already seen during peeking)
+Token* Scanner::Scan() {
+	if (tokens->next == NULL) {
+		return pt = tokens = NextToken();
+	} else {
+		pt = tokens = tokens->next;
+		return tokens;
+	}
+}
+
+
+// peek for the next token, ignore pragmas
+Token* Scanner::Peek() {
+	do {
+		if (pt->next == NULL) {
+			pt->next = NextToken();
+		}
+		pt = pt->next;
+	} while (pt->kind > maxT); // skip pragmas
+
+	return pt;
+}
+
+
+// make sure that peeking starts at the current scan position
+void Scanner::ResetPeek() {
+	pt = tokens;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // namespace
+} // namespace
+} // namespace
+
+
+// ************************************************************************* //

applications/test/dictionary/calcEntry/calcEntryScanner.h

@@ -0,0 +1,398 @@
+
+
+#ifndef COCO_calcEntrySCANNER_H__
+#define COCO_calcEntrySCANNER_H__
+
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <string>
+#include <fstream>
+#include <iostream>
+
+// io.h and fcntl are used to ensure binary read from streams on windows
+#if _MSC_VER >= 1300
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#if _MSC_VER >= 1400
+#define coco_swprintf swprintf_s
+#elif _MSC_VER >= 1300
+#define coco_swprintf _snwprintf
+#else
+// assume every other compiler knows swprintf
+#define coco_swprintf swprintf
+#endif
+
+
+#define COCO_WCHAR_MAX    65535
+
+
+namespace Foam {
+namespace functionEntries {
+namespace calcEntryInternal {
+
+
+
+// * * * * * * * * * *  Wide Character String Routines * * * * * * * * * * * //
+
+//
+// string handling, wide character
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+//! Create by copying str
+wchar_t* coco_string_create(const wchar_t* str);
+
+//! Create a substring of str starting at index and length characters long
+wchar_t* coco_string_create(const wchar_t* str, int index, int length);
+
+//! Create a lowercase string from str
+wchar_t* coco_string_create_lower(const wchar_t* str);
+
+//! Create a lowercase substring from str starting at index and length characters long
+wchar_t* coco_string_create_lower(const wchar_t* str, int index, int length);
+
+//! Create a string by concatenating str1 and str2
+wchar_t* coco_string_create_append(const wchar_t* str1, const wchar_t* str2);
+
+//! Create a string by concatenating a character to the end of str
+wchar_t* coco_string_create_append(const wchar_t* str, const wchar_t ch);
+
+//! Free storage and nullify the argument
+void  coco_string_delete(wchar_t* &str);
+
+//! The length of the str, or 0 if the str is NULL
+int   coco_string_length(const wchar_t* str);
+
+//! Return true if the str ends with the endstr
+bool  coco_string_endswith(const wchar_t* str, const wchar_t* endstr);
+
+//! Return the index of the first occurrence of ch.
+//  Return -1 if nothing is found.
+int   coco_string_indexof(const wchar_t* str, const wchar_t ch);
+
+//! Return the index of the last occurrence of ch.
+//  Return -1 if nothing is found.
+int   coco_string_lastindexof(const wchar_t* str, const wchar_t ch);
+
+//! Append str to dest
+void  coco_string_merge(wchar_t* &dest, const wchar_t* str);
+
+//! Compare strings, return true if they are equal
+bool  coco_string_equal(const wchar_t* str1, const wchar_t* str2);
+
+//! Compare strings, return 0 if they are equal
+int   coco_string_compareto(const wchar_t* str1, const wchar_t* str2);
+
+//! Simple string hashing function
+int   coco_string_hash(const wchar_t* str);
+
+//
+// String conversions
+// ~~~~~~~~~~~~~~~~~~
+
+//! Convert wide string to double
+double coco_string_toDouble(const wchar_t* str);
+
+//! Convert wide string to float
+float coco_string_toFloat(const wchar_t* str);
+
+//
+// String handling, byte character
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+//! Create by copying byte str
+wchar_t* coco_string_create(const char* str);
+
+//! Create a substring of byte str starting at index and length characters long
+wchar_t* coco_string_create(const char* str, int index, int length);
+
+//! Create a byte string by copying str
+char* coco_string_create_char(const wchar_t* str);
+
+//! Create a byte substring of str starting at index and length characters long
+char* coco_string_create_char(const wchar_t* str, int index, int length);
+
+//! Free storage and nullify the argument
+void  coco_string_delete(char* &str);
+
+
+//
+// String conversions, byte character
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+//! Convert byte string to double
+double coco_string_toDouble(const char* str);
+
+//! Convert byte string to float
+float coco_string_toFloat(const char* str);
+
+// * * * * * * * * * End of Wide Character String Routines * * * * * * * * * //
+
+
+//! Scanner Token
+class Token
+{
+public:
+	int kind;       //!< token kind
+	int pos;        //!< token position in the source text (starting at 0)
+	int col;        //!< token column (starting at 1)
+	int line;       //!< token line (starting at 1)
+	wchar_t* val;   //!< token value
+	Token *next;    //!< Peek tokens are kept in linked list
+
+	Token();        //!< Construct null
+	~Token();       //!< Destructor - cleanup allocated val??
+};
+
+
+//! Scanner Buffer
+//
+//! This Buffer supports the following cases:
+//! -# seekable stream (file)
+//!    -# whole stream in buffer
+//!    -# part of stream in buffer
+//! -# non seekable stream (network, console)
+class Buffer {
+private:
+	unsigned char *buf; //!< input buffer
+	int bufCapacity;    //!< capacity of buf
+	int bufLen;         //!< length of buffer
+	int bufPos;         //!< current position in buffer
+	int bufStart;       //!< position of first byte in buffer relative to input stream
+	int fileLen;        //!< length of input stream (may change if the stream is no file)
+	FILE* cStream;      //!< input stdio stream (normally seekable)
+	std::istream* stdStream;  //!< STL std stream (seekable)
+	bool isUserStream_;  //!< was the stream opened by the user?
+
+	int ReadNextStreamChunk();
+	bool CanSeek() const; //!< true if stream can be seeked otherwise false
+
+protected:
+	Buffer(Buffer*);    //!< for the UTF8Buffer
+
+public:
+	static const int EoF = COCO_WCHAR_MAX + 1;
+
+	//! Attach buffer to a stdio stream.
+	//! User streams are not closed in the destructor
+	Buffer(FILE*, bool isUserStream = true);
+
+	//! Attach buffer to an STL std stream
+	//! User streams are not closed in the destructor
+	explicit Buffer(std::istream*, bool isUserStream = true);
+
+	//! Copy buffer contents from constant string
+	//! Handled internally as an istringstream
+	explicit Buffer(std::string&);
+
+	//! Copy buffer contents from constant character string
+	Buffer(const unsigned char* chars, int len);
+	//! Copy buffer contents from constant character string
+	Buffer(const char* chars, int len);
+
+	//! Close stream (but not user streams) and free buf (if any)
+	virtual ~Buffer();
+
+	virtual void Close();   //!< Close stream (but not user streams)
+	virtual int Read();     //!< Get character from stream or buffer
+	virtual int Peek();     //!< Peek character from stream or buffer
+
+	virtual int GetPos() const;
+	virtual void SetPos(int value);
+};
+
+
+//! A Scanner buffer that handles UTF-8 characters
+class UTF8Buffer : public Buffer {
+public:
+	UTF8Buffer(Buffer* b) : Buffer(b) {}
+	virtual int Read();
+};
+
+
+//------------------------------------------------------------------------------
+// StartStates
+//------------------------------------------------------------------------------
+//! maps characters (integers) to start states of tokens
+class StartStates {
+private:
+	class Elem {
+	public:
+		int key, val;
+		Elem *next;
+		Elem(int k, int v) :
+			key(k), val(v), next(0)
+		{}
+	};
+
+	Elem **tab;
+
+public:
+	StartStates() :
+		tab(new Elem*[128])
+	{
+		memset(tab, 0, 128 * sizeof(Elem*));
+	}
+
+	virtual ~StartStates() {
+		for (int i = 0; i < 128; ++i) {
+			Elem *e = tab[i];
+			while (e) {
+				Elem *next = e->next;
+				delete e;
+				e = next;
+			}
+		}
+		delete [] tab;
+	}
+
+	void set(int key, int val) {
+		Elem *e = new Elem(key, val);
+		int k = unsigned(key) % 128;
+		e->next = tab[k];
+		tab[k] = e;
+	}
+
+	int state(int key) {
+		Elem *e = tab[unsigned(key) % 128];
+		while (e && e->key != key) e = e->next;
+		return e ? e->val : 0;
+	}
+};
+
+
+//------------------------------------------------------------------------------
+// KeywordMap
+//------------------------------------------------------------------------------
+//! maps strings to integers (identifiers to keyword kinds)
+class KeywordMap {
+private:
+	class Elem {
+	public:
+		wchar_t *key;
+		int val;
+		Elem *next;
+		Elem(const wchar_t *k, int v) :
+			key(coco_string_create(k)), val(v), next(0)
+		{}
+		virtual ~Elem() {
+			coco_string_delete(key);
+		}
+	};
+
+	Elem **tab;
+
+public:
+	KeywordMap() :
+		tab(new Elem*[128])
+	{
+		memset(tab, 0, 128 * sizeof(Elem*));
+	}
+
+	virtual ~KeywordMap() {
+		for (int i = 0; i < 128; ++i) {
+			Elem *e = tab[i];
+			while (e) {
+				Elem *next = e->next;
+				delete e;
+				e = next;
+			}
+		}
+		delete [] tab;
+	}
+
+	void set(const wchar_t *key, int val) {
+		Elem *e = new Elem(key, val);
+		const int k = coco_string_hash(key) % 128;
+		e->next = tab[k];
+		tab[k] = e;
+	}
+
+	int get(const wchar_t *key, int defaultVal) {
+		Elem *e = tab[coco_string_hash(key) % 128];
+		while (e && !coco_string_equal(e->key, key)) e = e->next;
+		return e ? e->val : defaultVal;
+	}
+};
+
+
+//! A Coco/R Scanner
+class Scanner {
+private:
+	static const int maxT = 13;
+	static const int noSym = 13;
+
+	static const int eofSym = 0;    //!< end-of-file token id
+	static const char EOL = '\n';   //!< end-of-line character
+
+	void *firstHeap;  //!< the start of the heap management
+	void *heap;       //!< the currently active block
+	void *heapTop;    //!< the top of the heap
+	void **heapEnd;   //!< the end of the last heap block
+
+	StartStates start;   //!< A map of start states for particular characters
+	KeywordMap keywords; //!< A hash of keyword literals to token kind
+
+	Token *t;         //!< current token
+	wchar_t *tval;    //!< text of current token
+	int tvalLength;   //!< maximum capacity (length) for tval
+	int tlen;         //!< length of tval
+
+	Token *tokens;    //!< list of tokens already peeked (first token is a dummy)
+	Token *pt;        //!< current peek token
+
+	int ch;           //!< current input character
+
+	int pos;          //!< byte position of current character
+	int line;         //!< line number of current character
+	int col;          //!< column number of current character
+	int oldEols;      //!< the number of EOLs that appeared in a comment
+
+	void CreateHeapBlock();       //!< add a heap block, freeing unused ones
+	Token* CreateToken();         //!< fit token on the heap
+	void AppendVal(Token* tok);   //!< adjust tok->val to point to the heap and copy tval into it
+
+	void Init();      //!< complete the initialization for the constructors
+	void NextCh();    //!< get the next input character into ch
+	void AddCh();     //!< append the character ch to tval
+	bool Comment0();
+	bool Comment1();
+
+	Token* NextToken();  //!< get the next token
+
+public:
+	//! The scanner buffer
+	Buffer *buffer;
+
+	//! Using an existing open file handle for the scanner
+	Scanner(FILE*);
+
+	//! Using an existing open STL std stream
+	explicit Scanner(std::istream&);
+
+	//! Open a file for reading and attach scanner
+	explicit Scanner(const wchar_t* fileName);
+
+	//! Attach scanner to an existing character buffer
+	Scanner(const unsigned char* chars, int len);
+	//! Attach scanner to an existing character buffer
+	Scanner(const char* chars, int len);
+
+	~Scanner();        //!< free heap and allocated memory
+	Token* Scan();     //!< get the next token (possibly a token already seen during peeking)
+	Token* Peek();     //!< peek for the next token, ignore pragmas
+	void ResetPeek();  //!< ensure that peeking starts at the current scan position
+
+}; // end Scanner
+
+} // namespace
+} // namespace
+} // namespace
+
+
+#endif // COCO_calcEntrySCANNER_H__
+

applications/test/dictionary/dictionaryTest.C

@@ -43,14 +43,16 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList args(argc, argv);
+    argList::validArgs.insert("dict .. dictN");
+    argList args(argc, argv, false, true);
 
     Info<< nl
         << "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
         << "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
         << endl;
 
-
+    if (args.additionalArgs().empty())
+    {
         {
             dictionary dict1(IFstream("testDict")());
             Info<< "dict1: " << dict1 << nl
@@ -108,6 +110,20 @@ int main(int argc, char *argv[])
                 << dict.subDict("someDict").lookup("xxx", true)
                     << endl;
         }
+    }
+    else
+    {
+        IOobject::writeDivider(Info);
+        forAll(args.additionalArgs(), argI)
+        {
+            const string& dictFile = args.additionalArgs()[argI];
+            IFstream is(dictFile);
+
+            dictionary dict(is);
+
+            Info<< dict << endl;
+        }
+    }
 
     return 0;
 }

applications/test/dictionary/testDict

@@ -67,7 +67,6 @@ boundaryField
         // error           #remove self;
         x               5;
         y               6;
-        another         #calc{x $x; y $y;};
     }
 
     // this should have no effect

applications/test/dictionary/testDictCalc

@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  Any                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDictTest;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+flowRatePerHour 720;
+
+x       10;
+y       20;
+z       t s v;
+// z       #test{ // this
+//     123 - 456
+//         // comments // are
+//         /* stripped
+//         * 10
+//          * {}
+//          */
+//         + 1 /*100 */  10
+// };
+
+p     this calculation #calc{
+          1 + 2 + 10 * 15 +
+          $x - $y
+        // $x + $y
+}
+is done inplace;
+
+
+flowRate    #calc{ $flowRatePerHour / 3600};
+
+xxx         yyy;
+foo         30;
+bar         15;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/dimensionedType/dimensionedTypeTest.C

@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 
     Info<< ds*dt << " " << dt*ds << endl;
 
-    Info << "End\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/test/extendedStencil/testExtendedStencil.C

@@ -477,7 +477,7 @@ int main(int argc, char *argv[])
 //        vf,
 //        stencilData
 //    );
-//    for(label faci = 0; faci < mesh.nInternalFaces(); faci++)
+//    for (label faci = 0; faci < mesh.nInternalFaces(); faci++)
 //    {
 //        const scalarList& stData = stencilData[faceI];
 //        const scalarList& stWeight = fit[faceI];

applications/test/fileName/fileNameTest.C

@@ -108,8 +108,7 @@ int main()
     Info<< " badName(die) => " << findEtcFile("badName", true) << nl
         << endl;
 
-    Info<< "\nEnd" << endl;
+    Info<< "\nEnd\n" << endl;
-
     return 0;
 }
 

applications/test/fileNameClean/fileNameCleanTest.C

@@ -66,17 +66,18 @@ int main(int argc, char *argv[])
     argList::noBanner();
     argList::noParallel();
     argList::validArgs.insert("fileName .. fileNameN");
+    argList::addOption("istream", "fileName", "test Istream values");
 
     argList args(argc, argv, false, true);
 
-    if (args.additionalArgs().empty())
+    if (args.additionalArgs().empty() && args.options().empty())
     {
         args.printUsage();
     }
 
-    if (args.optionFound("case"))
+    fileName pathName;
+    if (args.optionReadIfPresent("case", pathName))
     {
-        fileName pathName = args.option("case");
         Info<< nl
             << "-case" << nl
             << "path = " << args.path() << nl
@@ -91,12 +92,27 @@ int main(int argc, char *argv[])
 
     forAll(args.additionalArgs(), argI)
     {
-        fileName pathName = args.additionalArgs()[argI];
+        pathName = args.additionalArgs()[argI];
         printCleaning(pathName);
     }
 
-    Info<< "\nEnd" << endl;
+    if (args.optionFound("istream"))
+    {
+        args.optionLookup("istream")() >> pathName;
 
+        Info<< nl
+            << "-case" << nl
+            << "path = " << args.path() << nl
+            << "root = " << args.rootPath() << nl
+            << "case = " << args.caseName() << nl
+            << "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
+            << "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
+            << endl;
+
+        printCleaning(pathName);
+    }
+
+    Info<< "\nEnd\n" << endl;
     return 0;
 }
 

applications/test/fvSolutionCombine/fvSolutionCombine.C

@@ -98,8 +98,9 @@ bool checkDictionaryContent(const dictionary& dict1, const dictionary& dict2)
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-    argList::validOptions.insert("rewrite", "");
+    argList::addBoolOption("rewrite");
-    argList::validOptions.insert("show", "");
+    argList::addBoolOption("show");
+
     argList args(argc, argv);
 
     Time runTime(args.rootPath(), args.caseName());