Changed the previous confusing names of the Fortran macros to remove the

seemingly random use of plurals ... the old names are still there, the
docs have already been updated with the new names


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2107 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 78 insertions, 21 deletions

diff --git a/src/include/cctk_FortranString.h b/src/include/cctk_FortranString.h
index 116d79fd..84740bae 100644
--- a/src/include/cctk_FortranString.h
+++ b/src/include/cctk_FortranString.h
@@ -25,112 +25,169 @@
 #include <fortran.h>
 #define ONE_FORTSTRING_ARG\
     _fcd cctk_str1
-#define TWO_FORTSTRINGS_ARGS\
+#define TWO_FORTSTRING_ARG\
     _fcd cctk_str1, _fcd cctk_str2
-#define THREE_FORTSTRINGS_ARGS\
+#define THREE_FORTSTRING_ARG\
     _fcd cctk_str1, _fcd cctk_str2, _fcd cctk_str3
+
 #define ONE_FORTSTRING_CREATE(arg1)\
        int cctk_strlen1 = _fcdlen(cctk_str1); \
        char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1);
-#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+#define TWO_FORTSTRING_CREATE(arg1,arg2)\
        int  cctk_strlen1    = _fcdlen(cctk_str1);\
        int  cctk_strlen2    = _fcdlen(cctk_str2);\
-       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1);\
+       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1)\
        char *arg2 = Util_NullTerminateString(_fcdtocp(cctk_str2),cctk_strlen2);
-#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+#define THREE_FORTSTRING_CREATE(arg1,arg2,arg3)\
        int  cctk_strlen1    = _fcdlen(cctk_str1);\
        int  cctk_strlen2    = _fcdlen(cctk_str2);\
        int  cctk_strlen3    = _fcdlen(cctk_str3);\
-       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1);\
-       char *arg2 = Util_NullTerminateString(_fcdtocp(cctk_str2),cctk_strlen2);\
+       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1)\
+       char *arg2 = Util_NullTerminateString(_fcdtocp(cctk_str2),cctk_strlen2)\
        char *arg3 = Util_NullTerminateString(_fcdtocp(cctk_str3),cctk_strlen3);
 
 #define ONE_FORTSTRING_PTR(arg1)\
        char *arg1 = _fcdtocp(cctk_str1);
-
 #define TWO_FORTSTRING_PTR(arg1, arg2)\
        char *arg1 = _fcdtocp(cctk_str1);\
        char *arg2 = _fcdtocp(cctk_str2);
-
 #define THREE_FORTSTRING_PTR(arg1, arg2, arg3)\
        char *arg1 = _fcdtocp(cctk_str1);\
        char *arg2 = _fcdtocp(cctk_str2);\
        char *arg3 = _fcdtocp(cctk_str3);
 
+/* DEPRECATED BETA 10 */
+#define TWO_FORTSTRINGS_ARGS\
+    _fcd cctk_str1, _fcd cctk_str2
+#define THREE_FORTSTRINGS_ARGS\
+    _fcd cctk_str1, _fcd cctk_str2, _fcd cctk_str3
+#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+       int  cctk_strlen1    = _fcdlen(cctk_str1);\
+       int  cctk_strlen2    = _fcdlen(cctk_str2);\
+       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1)\
+       char *arg2 = Util_NullTerminateString(_fcdtocp(cctk_str2),cctk_strlen2);
+#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+       int  cctk_strlen1    = _fcdlen(cctk_str1);\
+       int  cctk_strlen2    = _fcdlen(cctk_str2);\
+       int  cctk_strlen3    = _fcdlen(cctk_str3);\
+       char *arg1 = Util_NullTerminateString(_fcdtocp(cctk_str1),cctk_strlen1)\
+       char *arg2 = Util_NullTerminateString(_fcdtocp(cctk_str2),cctk_strlen2)\
+       char *arg3 = Util_NullTerminateString(_fcdtocp(cctk_str3),cctk_strlen3);
+/* END DEPRECATED */
+
 #elif defined WIN32_DIGITAL_FORTRAN
 
 #define ONE_FORTSTRING_ARG\
    char *cctk_str1, unsigned int cctk_strlen1
-#define TWO_FORTSTRINGS_ARGS\
+#define TWO_FORTSTRING_ARG\
    char *cctk_str1, int cctk_strlen1, char *cctk_str2, int cctk_strlen2
-#define THREE_FORTSTRINGS_ARGS\
+#define THREE_FORTSTRING_ARG\
    char *cctk_str1,\
    char *cctk_str2,\
    char *cctk_str3,\
    unsigned int cctk_strlen1,\
    unsigned int cctk_strlen2,\
    unsigned int cctk_strlen3
+
 #define ONE_FORTSTRING_CREATE(arg1)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);
-#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+#define TWO_FORTSTRING_CREATE(arg1,arg2)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
    char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);
-#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+#define THREE_FORTSTRING_CREATE(arg1,arg2,arg3)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
    char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);\
    char *arg3 = Util_NullTerminateString(cctk_str3,cctk_strlen3);
 
 #define ONE_FORTSTRING_PTR(arg1)\
        char *arg1 = cctk_str1;
-
 #define TWO_FORTSTRING_PTR(arg1, arg2)\
        char *arg1 = cctk_str1;\
        char *arg2 = cctk_str2;
-
 #define THREE_FORTSTRING_PTR(arg1, arg2, arg3)\
        char *arg1 = cctk_str1;\
        char *arg2 = cctk_str2;\
        char *arg3 = cctk_str3;
 
+/* DEPRECATED BETA 10 */
+#define TWO_FORTSTRINGS_ARGS\
+   char *cctk_str1, int cctk_strlen1, char *cctk_str2, int cctk_strlen2
+#define THREE_FORTSTRINGS_ARGS\
+   char *cctk_str1,\
+   char *cctk_str2,\
+   char *cctk_str3,\
+   unsigned int cctk_strlen1,\
+   unsigned int cctk_strlen2,\
+   unsigned int cctk_strlen3
+#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+   char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
+   char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);
+#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+   char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
+   char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);\
+   char *arg3 = Util_NullTerminateString(cctk_str3,cctk_strlen3);
+/* END DEPRECATED */
+
 #else
 
 #define ONE_FORTSTRING_ARG\
    char *cctk_str1,\
    unsigned int cctk_strlen1
-#define TWO_FORTSTRINGS_ARGS\
+#define TWO_FORTSTRING_ARG\
    char *cctk_str1,\
    char *cctk_str2,\
    unsigned int cctk_strlen1,\
    unsigned int cctk_strlen2
-#define THREE_FORTSTRINGS_ARGS\
+#define THREE_FORTSTRING_ARG\
    char *cctk_str1,\
    char *cctk_str2,\
    char *cctk_str3,\
    unsigned int cctk_strlen1,\
    unsigned int cctk_strlen2,\
    unsigned int cctk_strlen3
+
 #define ONE_FORTSTRING_CREATE(arg1)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);
-#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+#define TWO_FORTSTRING_CREATE(arg1,arg2)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
    char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);
-#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+#define THREE_FORTSTRING_CREATE(arg1,arg2,arg3)\
    char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
    char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);\
    char *arg3 = Util_NullTerminateString(cctk_str3,cctk_strlen3);
 
 #define ONE_FORTSTRING_PTR(arg1)\
        char *arg1 = cctk_str1;
-
 #define TWO_FORTSTRING_PTR(arg1, arg2)\
        char *arg1 = cctk_str1;\
        char *arg2 = cctk_str2;
-
 #define THREE_FORTSTRING_PTR(arg1, arg2, arg3)\
        char *arg1 = cctk_str1;\
        char *arg2 = cctk_str2;\
        char *arg3 = cctk_str3;
 
+/* DEPRECATED BETA 10 */
+#define TWO_FORTSTRINGS_ARGS\
+   char *cctk_str1,\
+   char *cctk_str2,\
+   unsigned int cctk_strlen1,\
+   unsigned int cctk_strlen2
+#define THREE_FORTSTRINGS_ARGS\
+   char *cctk_str1,\
+   char *cctk_str2,\
+   char *cctk_str3,\
+   unsigned int cctk_strlen1,\
+   unsigned int cctk_strlen2,\
+   unsigned int cctk_strlen3
+#define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
+   char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
+   char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);
+#define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
+   char *arg1 = Util_NullTerminateString(cctk_str1,cctk_strlen1);\
+   char *arg2 = Util_NullTerminateString(cctk_str2,cctk_strlen2);\
+   char *arg3 = Util_NullTerminateString(cctk_str3,cctk_strlen3);
+/* END DEPRECATED */
+
 #endif
 
 #endif /* _CCTK_FORTRANSTRING_H_*/