Changeset 322b97e

Timestamp:

Aug 15, 2017, 1:27:46 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

c6c6f2ae

Parents:

ae4038d

git-author:

Rob Schluntz <rschlunt@…> (08/15/17 13:27:32)

git-committer:

Rob Schluntz <rschlunt@…> (08/15/17 13:27:46)

Message:

Resolve typeof in sizeof/alignof expressions [fixes #37]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -941 +941 @@
         void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
                 if ( sizeofExpr->get_isType() ) {
-                        // xxx - resolveTypeof?
-                        alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
+                        Type * newType = sizeofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
                 } else {
                         // find all alternatives for the argument to sizeof
@@ -961 +961 @@
         void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
                 if ( alignofExpr->get_isType() ) {
-                        // xxx - resolveTypeof?
-                        alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
+                        Type * newType = alignofExpr->get_type()->clone();
+                        alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) );
                 } else {
                         // find all alternatives for the argument to sizeof