fix generation of TYPE ENUMERATION

cshorler · cshorler · commit 9025643a1b3e · 2015-03-28T13:32:21.000Z
diff --git a/src/exp2python/src/classes_python.c b/src/exp2python/src/classes_python.c
@@ -1960,29 +1960,28 @@ TYPEenum_lib_print( const Type type, FILE * f ) {
     } else {
         fprintf( f, "\n# ENUMERATION TYPE %s\n", TYPEget_name( type ) );
     }
-    /* first write all the values of the enum */
-    DICTdo_type_init( ENUM_TYPEget_items( type ), &de, OBJ_ENUM );
     /* then outputs the enum */
     if( is_python_keyword( TYPEget_name( type ) ) ) {
-        fprintf( f, "%s_ = ENUMERATION(", TYPEget_name( type ) );
+        fprintf( f, "%s_ = ENUMERATION('%s_','", TYPEget_name( type ), TYPEget_name( type ) );
     } else {
-        fprintf( f, "%s = ENUMERATION(", TYPEget_name( type ) );
+        fprintf( f, "%s = ENUMERATION('%s','", TYPEget_name( type ), TYPEget_name( type ) );
     }
-    /*  set up the dictionary info  */
 
+    /*  set up the dictionary info  */
     DICTdo_type_init( ENUM_TYPEget_items( type ), &de, OBJ_ENUM );
     while( 0 != ( expr = ( Expression )DICTdo( &de ) ) ) {
         strncpy( c_enum_ele, EnumCElementName( type, expr ), BUFSIZ );
         if( is_python_keyword( EXPget_name( expr ) ) ) {
-            fprintf( f, "\n'%s_',", EXPget_name( expr ) );
+            fprintf( f, "%s_ ", EXPget_name( expr ) );
         } else {
-            fprintf( f, "\n\t'%s',", EXPget_name( expr ) );
+            fprintf( f, "%s ", EXPget_name( expr ) );
         }
     }
-    fprintf( f, "\n\tscope = schema_scope)\n" );
+    fprintf( f, "')\n" );
 }
 
 
+
 void Type_Description( const Type, char * );
 
 /* return printable version of entire type definition */
@@ -2246,7 +2245,9 @@ TYPEprint_descriptions( const Type type, FILES * files, Schema schema ) {
             fprintf( files->lib, "%s = bool\n", TYPEget_name( type ) );
         } else if( TYPEis_select( type ) ) {
             TYPEselect_lib_print( type, files -> lib );
-        } else {
+        } else if( TYPEis_enumeration( type ) ) {
+            TYPEenum_lib_print( type, files -> lib );
+        } else { 
             /* the defined datatype inherits from the base type */
             fprintf( files->lib, "# Defined datatype %s\n", TYPEget_name( type ) );
             fprintf( files->lib, "class %s(", TYPEget_name( type ) );
