Changeset 994ec2c

Timestamp:

Jul 20, 2015, 2:17:46 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

51b986f, 893256d

Parents:

1db21619

Message:

fix warning in logical expression

Location:

src

Files:

• ControlStruct/MLEMutator.cc (modified) (1 diff)
• SymTab/TypeEquality.cc (modified) (2 diffs)

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Sat Jun 27 10:56:14 2015
-// Update Count     : 174
-//
+// Last Modified On : Mon Jul 20 13:58:35 2015
+// Update Count     : 176
+//
+
+// NOTE: There are two known subtle differences from the code that uC++ 
+// generates for the same input
+// -CFA puts the break label inside at the end of a switch, uC++ puts it after
+// -CFA puts the break label after a block, uC++ puts it inside at the end
+// we don't yet know if these differences are important, but if they are then
+// the fix would go in this file, since this is where these labels are generated.
 
 #include <cassert>

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 09 11:18:46 2015
-// Update Count     : 36
+// Last Modified On : Mon Jul 20 14:16:11 2015
+// Update Count     : 37
 //
 
@@ -91 +91 @@
                         // and must both have a dimension expression or not have a dimension
                         result = result && arrayType->get_isVarLen() == at->get_isVarLen()
-                                && (arrayType->get_dimension() != 0 && at->get_dimension() != 0
-                                        || arrayType->get_dimension() == 0 && at->get_dimension() == 0);
+                                && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0)
+                                        || (arrayType->get_dimension() == 0 && at->get_dimension() == 0));
 
                         if ( vlaErr ) {