From 7dd1ad1e23b8c5cb932ec30d4c7345ca84fbd1c2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 15 Jan 2010 19:25:12 +0100
Subject: [PATCH] Adjust Make options for calcEntry.

---
 applications/test/dictionary/Allwmake                 | 10 ----------
 applications/test/dictionary/Make/options             |  1 -
 .../test/dictionary/calcEntry/calcEntryParser.atg     |  4 ++--
 applications/test/dictionary/testDictCalc             | 11 +----------
 wmake/rules/General/coco                              |  2 +-
 5 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100755 applications/test/dictionary/Allwmake

diff --git a/applications/test/dictionary/Allwmake b/applications/test/dictionary/Allwmake
deleted file mode 100755
index 86ec8fd45d..0000000000
--- a/applications/test/dictionary/Allwmake
+++ /dev/null
@@ -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
diff --git a/applications/test/dictionary/Make/options b/applications/test/dictionary/Make/options
index 3af3c946ac..22051a7c05 100644
--- a/applications/test/dictionary/Make/options
+++ b/applications/test/dictionary/Make/options
@@ -1,2 +1 @@
 EXE_INC = -IcalcEntry -I$(OBJECTS_DIR)
-
diff --git a/applications/test/dictionary/calcEntry/calcEntryParser.atg b/applications/test/dictionary/calcEntry/calcEntryParser.atg
index 7dfb17c107..f3751f77d4 100644
--- a/applications/test/dictionary/calcEntry/calcEntryParser.atg
+++ b/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
diff --git a/applications/test/dictionary/testDictCalc b/applications/test/dictionary/testDictCalc
index 092a933a29..f1d67650e8 100644
--- a/applications/test/dictionary/testDictCalc
+++ b/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;
diff --git a/wmake/rules/General/coco b/wmake/rules/General/coco
index 46fae00453..ca07810bdb 100644
--- a/wmake/rules/General/coco
+++ b/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: