Changeset 1aa4b71

Timestamp:

Dec 14, 2016, 2:10:42 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:

a64644c

Parents:

cce9429

Message:

added case for ConditionalExpr? in getBaseVar

File:

• src/GenPoly/GenPoly.cc (modified) (1 diff)

src/GenPoly/GenPoly.cc

@@ -219 +219 @@
                                 expr = commaExpr->get_arg2();
                                 continue;
+                        } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( expr ) ) {
+                                int lvl1;
+                                int lvl2;
+                                VariableExpr * var1 = getBaseVar( condExpr->get_arg2(), &lvl1 );
+                                VariableExpr * var2 = getBaseVar( condExpr->get_arg3(), &lvl2 );
+                                if ( lvl1 == lvl2 && var1 && var2 && var1->get_var() == var2->get_var() ) {
+                                        *levels = lvl1;
+                                        return var1;
+                                }
+                                break;
                         } else break;