From 8b3c2f1c0a668c7f3ad2120bf8f582d1b4bd8c8b Mon Sep 17 00:00:00 2001
From: Dave Beazley <dave-swig@dabeaz.com>
Date: Tue, 19 Sep 2000 03:44:03 +0000
Subject: [PATCH] Slight tweak to enum handling and typedefs.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@857 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/SWIG1.1/parser.yxx | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

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);
 		  }