Changeset 3677

Timestamp:

05/10/10 11:28:57 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added EnumAsString.cpp and StringAsEnum.cpp

Location:

issm/trunk/src/c/EnumDefinitions

Files:

• EnumAsString.cpp (added)
• README (added)
• StringAsEnum.cpp (added)
• SynchronizeMatlabEnum.sh (modified) (8 diffs)
• SynchronizeStringFromEnum.sh (modified) (4 diffs)

issm/trunk/src/c/EnumDefinitions/SynchronizeMatlabEnum.sh

@@ -11 +11 @@
 cat EnumDefinitions.h | grep "Enum," |sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
 
-#Build File AnalysisTypeFromEnum.m
+#Build header of AnalysisTypeFromEnum.m{{{
 cat <<END > AnalysisTypeFromEnum.m
 function string=AnalysisTypeFromEnum(enum)
 %ANALYSISASENUM - get analysis type from Enum
 %
-%   file generated by src/c/SynchronizeMatlabEnum
-%   to be synchronized with the corresponding C Enum
-%   located in src/c/EnumDefinitions
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/SynchronizeMatlabEnum
+%            Please read src/c/README for more information
 %
 %   Usage:
@@ -26 +26 @@
 string='not found';
 END
+#}}}
 
 #get number of lines in temp
@@ -39 +40 @@
         let ENUM=$ENUM-1
 
-        #write corresponding Matlab file
-        #print info
+        #print info {{{
         if [ $i -lt 10 ]
         then
@@ -55 +55 @@
                 fi
         fi
-
+        #}}}
+        #Add case to matlabenum file{{{
         cat <<END > $(echo $NAME".m")
 function macro=$(echo $NAME)()
 %$(echo `echo $NAME | sed -e "s/[a-z]/\U&/g"`) - Enum of $(echo `echo $NAME | sed -e "s/Enum//"`)
 %
-%   file generated by src/c/EnumDefinitions/SynchronizeMatlabEnum
+%   WARNING: DO NOT MODIFY THIS FILE
+%            this file has been automatically generated by src/c/SynchronizeMatlabEnum
+%            Please read src/c/README for more information
 %
 %   Usage:
@@ -67 +70 @@
 macro=$ENUM;
 END
-
-        #update AnalysisTypeFromEnum
+#}}}
+#Add case to AnalysisTypeFromEnum file{{{
         if [ $(echo $NAME | grep AnalysisEnum) ]
         then
@@ -78 +81 @@
 END
         fi
+#}}}
 
         #move file to m/enum
@@ -84 +88 @@
 done
 
-#end of AnalysisTypeFromEnum
+#Footer of AnalysisTypeFromEnum.m{{{
 cat <<END >> AnalysisTypeFromEnum.m
 
@@ -92 +96 @@
 end
 END
+#}}}
 
-#clean up
+#clean up{{{
 mv AnalysisTypeFromEnum.m $ISSM_DIR/src/m/enum/
 rm temp
-
-#print info
+#}}}
+#print info{{{
 printf "\r                                                                      "
 printf "\rdone!\n"
+#}}}

issm/trunk/src/c/EnumDefinitions/SynchronizeStringFromEnum.sh

@@ -1 +1 @@
 #!/bin/bash
-#Synchronize StringFromEnum.cpp from EnumDefinition.h
+#Synchronize EnumAsString.cpp and StringAsEnum.cpp
 
 #first remove existing files
-rm StringFromEnum.cpp
-rm StringFromEnum.h
+rm EnumAsString.cpp StringAsEnum.cpp
 
-echo "Synchronizing StringFromEnum..."
+echo "Synchronizing EnumAsString..."
 #Get all lines of EnumDefinitions2.h which hold Enum, | remove all comas | add line number in the first column > put everything in file temp
 cat EnumDefinitions.h | grep "Enum," |sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
 
-#Build File StringFromEnum.h
-cat <<END > StringFromEnum.h
+#Build header of EnumAsString.cpp {{{1
+cat <<END > EnumAsString.cpp
 /*
-* \file StringFromEnum.h:
+* \file EnumAsString.cpp:
 * \brief: output string associated with enum
+*
+*   WARNING: DO NOT MODIFY THIS FILE
+*            this file has been automatically generated by SynchronizeStrings.sh
+*            Please read README for more information
 */
 
-#ifndef _STRINGFROMENUM_
-#define _STRINGFROMENUM_
+#include "../shared/shared.h"
+#include "../include/macros.h"
+#include "./EnumDefinition.h"
 
-char* StringFromEnum(int en);
-
-#endif
-END
-
-#Build File StringFromEnum.cpp
-cat <<END > StringFromEnum.cpp
-/*
-* \file StringFromEnum.cpp:
-* \brief: output string associated with enum
-*/
-
-#include "./StringFromEnum.h"
-
-char* StringFromEnum(int en){
+char* EnumAsString(int en){
 
         switch(en){
 
 END
+#}}}
+#Build header of StringAsEnum.cpp {{{1
+cat <<END > StringAsEnum.cpp
+/*
+* \file StringAsEnum.cpp:
+* \brief: output enum associated with string
+*
+*   WARNING: DO NOT MODIFY THIS FILE
+*            this file has been automatically generated by SynchronizeStrings.sh
+*            Please read README for more information
+*/
+
+#include "../shared/shared.h"
+#include "../include/macros.h"
+#include "./EnumDefinition.h"
+
+int  StringAsEnum(char* name){
+
+END
+#}}}
 
 #get number of lines in temp
@@ -47 +57 @@
 
         #Get name and enum of the line i
-        NAME=$(cat temp | grep "^[ ]*$i " | awk '{printf("%s",$2);}' | sed -e "s/Enum//g");
+        NAMEENUM=$(cat temp | grep "^[ ]*$i " | awk '{printf("%s",$2);}');
+        NAME=$(echo $NAMEENUM | sed -e "s/Enum//g")
         ENUM=$i;
         #offset Enum by one (Enum begins with 0 and not 1!)
         let ENUM=$ENUM-1
 
-        #print info
+        #print info {{{
         if [ $i -lt 10 ]
         then
@@ -67 +78 @@
                 fi
         fi
-
-        #Add corresponding lines
-        cat <<END >> StringFromEnum.cpp
-                case $ENUM :
+        #}}}
+        #Add case to EnumAsString.cpp {{{
+        cat <<END >> EnumAsString.cpp
+                case $NAMEENUM :
                         return "$NAME";
 END
+#}}}
+        #Add case to StringAsEnum.cpp {{{
+        if [ $i -eq 1 ]
+        then
+                cat <<END >> StringAsEnum.cpp
+        if (strcmp(name,"$NAME")==0) return $NAMEENUM;
+END
+        else
+                cat <<END >> StringAsEnum.cpp
+        else if (strcmp(name,"$NAME")==0) return $NAMEENUM;
+END
+        fi
+#}}}
+
 done
 
-#end of file
-cat <<END >> StringFromEnum.cpp
+#Add footer of of EnumAsString.cpp{{{1
+cat <<END >> EnumAsString.cpp
                 default :
                         ISSMERROR("Enum %i not found",en);
@@ -82 +107 @@
 }
 END
+#}}}
+#Add footer of of StringAsEnum.cpp{{{1
+cat <<END >> StringAsEnum.cpp
+        else ISSMERROR("Enum %i not found",en);
 
-#clean up
+}
+END
+#}}}
+
+#clean up{{{
 rm temp
-
-#print info
+#}}}
+#print info {{{
 printf "\r                                                                      "
 printf "\rdone!\n"
+#}}}