diff --git a/Source/SWIG1.1/parser.yxx b/Source/SWIG1.1/parser.yxx index 48d79f9cf..a29fe5a63 100644 --- a/Source/SWIG1.1/parser.yxx +++ b/Source/SWIG1.1/parser.yxx @@ -987,13 +987,11 @@ statement : INCLUDE STRING LBRACE { init_language(); if ($3) { if (temp_type) Delete(temp_type); - temp_type = NewSwigType(T_INT); - SwigType_typedef(temp_type,$3); - lang->add_typedef(temp_type,$3); - /* String *ts = NewStringf("enum %s", $3); + String *ts = NewStringf("enum %s", $3); + /* String *ts = NewSwigType(T_INT); */ SwigType_typedef(temp_type,ts); lang->add_typedef(temp_type,Char(ts)); - Delete(ts); */ + Delete(ts); } } @@ -1002,7 +1000,8 @@ statement : INCLUDE STRING LBRACE { | TYPEDEF ENUM ename LBRACE { scanner_clear_start(); } enumlist RBRACE ID { init_language(); if (temp_type) Delete(temp_type); - temp_type = NewSwigType(T_INT); + temp_type = NewStringf("enum %s", $3); + /* temp_type= NewSwigType(T_INT);*/ Active_typedef = Copy(temp_type); if ($3) { SwigType_typedef(temp_type,$3); @@ -1012,10 +1011,6 @@ statement : INCLUDE STRING LBRACE { SwigType_typedef(temp_type,$8); lang->add_typedef(temp_type,$8); } - /* String *ts = NewStringf("enum %s", $3); - SwigType_typedef(temp_type,ts); - lang->add_typedef(temp_type,Char(ts)); - Delete(ts); */ } typedeflist { } /* ----------------------------------------------------------------- @@ -2500,7 +2495,8 @@ cpp_member : type declaration LPAREN parms RPAREN cpp_end { if ($2) { cplus_register_type($2); if (temp_type) Delete(temp_type); - temp_type = NewSwigType(T_INT); + /* temp_type = NewSwigType(T_INT); */ + temp_type = NewStringf("enum %s",$2); SwigType_typedef(temp_type,$2); lang->add_typedef(temp_type,$2); }