Changeset c75b30a for src/CodeGen

Timestamp:

Jan 31, 2024, 6:25:02 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

32490deb

Parents:

16afb2a

Message:

Introduce posE, valueE, labelE pseudo language to the language. Rework the internal representation of enumeration.

Location:

src/CodeGen

Files:

• CodeGenerator.cpp (modified) (3 diffs)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -331 +331 @@
         extension( decl );
         auto members = decl->members;
-        if ( decl->base && !members.empty() ) {
-                long long curVal = 0;
-                for ( auto member : members ) {
-                        auto obj = member.strict_as<ast::ObjectDecl>();
-                        output << "static ";
-                        output << genType( decl->base, mangleName( obj ), options );
-                        genEnumInitializer( visitor, decl->base, output, obj->init, &curVal, options );
-                        output << ";" << endl;
-                }
-        } else {
+        // if ( decl->base && !members.empty() ) {
+        //      long long curVal = 0;
+        //      for ( auto member : members ) {
+        //              auto obj = member.strict_as<ast::ObjectDecl>();
+        //              output << "static ";
+        //              output << genType( decl->base, mangleName( obj ), options );
+        //              genEnumInitializer( visitor, decl->base, output, obj->init, &curVal, options );
+        //              output << ";" << endl;
+        //      }
+        // } else {
                 output << "enum ";
                 genAttributes( decl->attributes );
@@ -353 +353 @@
                                 auto obj = member.strict_as<ast::ObjectDecl>();
                                 output << indent << mangleName( obj );
-                                if ( obj->init ) {
+                                if ( !decl->base && obj->init ) {
                                         output << " = ";
                                         obj->init->accept( *visitor );
@@ -363 +363 @@
                         output << indent << "}";
                 }
-        }
+        // }
 }
 

src/CodeGen/GenType.cc

@@ -228 +228 @@
 
 void GenType::postvisit( ast::EnumInstType const * type ) {
-        if ( type->base && type->base->base ) {
-                result = genType( type->base->base, result, options );
-        } else {
+        // if ( type->base && type->base->base ) {
+        //      result = genType( type->base->base, result, options );
+        // } else {
                 result = type->name + " " + result;
                 if ( options.genC ) {
                         result = "enum " + result;
                 }
-        }
+        // }
         handleQualifiers( type );
 }