Changeset 92d8cda for src

Timestamp:

Sep 6, 2023, 11:49:02 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4a40fca7, 79b05224, 9d47c1f

Parents:

1f10959 (diff), 1fc111c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/ResolveTypeof.cc (modified) (1 diff)

src/ResolvExpr/ResolveTypeof.cc

@@ -253 +253 @@
                             const ast::ObjectDecl * mem = baseEnum->members.at(m).as<const ast::ObjectDecl>();
                             assert(mem);
-                            if ( mem->init ) {
-                                const ast::SingleInit * memInit = mem->init.as<const ast::SingleInit>();
-                                ast::Expr * initValue = shallowCopy( memInit->value.get() );
-                                newDesination->designators.push_back( initValue );
-                            } else {
-                                SemanticError(des->location, "TODO: Enum Array Designation with no explicit value is not implemented");
-                            }
+                            const ast::ConstantExpr * enumAsInit = ast::ConstantExpr::from_int(newDesination->location, m);
+                            newDesination->designators.push_back( enumAsInit );
                         }
                     }