Adjust Make options for calcEntry.

applications/test/dictionary/Allwmake

@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-# this will have to do until we have a makefile rule
-
-type Coco > /dev/null 2>&1 || {
-    echo "Coco not installed -- cannot make this test"
-}
-
-wmake

applications/test/dictionary/Make/options

@@ -1,2 +1 @@
 EXE_INC = -IcalcEntry -I$(OBJECTS_DIR)
-

applications/test/dictionary/calcEntry/calcEntryParser.atg

@@ -23,7 +23,7 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-@file calcEntryParser.ATG
+@file calcEntryParser.atg
 
 Description
     An attributed Coco/R grammar to parse simple arithmetic expressions
@@ -52,7 +52,7 @@ COMPILER calcEntry
     // grammar pragmas:
     $prefix=calcEntry
     $namespace=Foam::functionEntries::calcEntryInternal
-    $eof=true     // grammar handles eof itself
+    $explicitEOF=true     // grammar handles eof itself
 
 private:
     //- The parent dictionary

applications/test/dictionary/testDictCalc

@@ -37,16 +37,7 @@ p     this calculation #calc{
 is done inplace;
 
 
-flowRate    #calc{ $flowRatePerHour / 3600 };
-
-// inplace redefine
-flowRate    #calc{ $flowRate * 0.1 };
-
-sin45       #calc{ sin( 45.0 * pi() / 180 ) };
-cos45       #calc{ cos( degToRad(15- -15+ +15) ) };
-pow         #calc{ pow( $x, $y ) };
-log10       #calc{ log( 1e6 ) };
-// list #calc{ list() };
+flowRate    #calc{ $flowRatePerHour / 3600};
 
 xxx         yyy;
 foo         30;

wmake/rules/General/coco

@@ -6,7 +6,7 @@ atgtoo =  \
     $(WM_THIRD_PARTY_DIR)/coco-cpp/platforms/$(WM_ARCH)/bin/coco-cpp \
     -single \
     -frames $(WM_THIRD_PARTY_DIR)/coco-cpp/platforms/share/coco-cpp \
-    $$SOURCE -o $(OBJECTS_DIR) ; \
+    $$SOURCE -o $(OBJECTS_DIR) && \
     $(CC) $(c++FLAGS) -c $*.cpp -o $@
 
 .atg.dep: