Changeset ef22ad6 for src/ResolvExpr

Timestamp:

Aug 23, 2019, 6:52:14 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

bbb1b35

Parents:

2c60af75 (diff), 5d00425 (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:

deal with conflicts

File:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -1188 +1188 @@
                 assert( toType );
                 toType = resolveTypeof( toType, indexer );
+                assert(!dynamic_cast<TypeofType *>(toType));
                 SymTab::validateType( toType, &indexer );
                 adjustExprType( toType, env, indexer );