Changeset 66d12f7 for src/ControlStruct

Timestamp:

Jul 30, 2016, 2:31:17 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

ac911f4

Parents:

2750cde

Message:

change case ranges to use gcc syntax, first attempt

File:

• src/ControlStruct/CaseRangeMutator.cc (modified) (6 diffs)

src/ControlStruct/CaseRangeMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:35:13 2016
-// Update Count     : 9
+// Last Modified On : Thu Jul 28 01:56:47 2016
+// Update Count     : 14
 //
 
@@ -71 +71 @@
                         NameExpr *nmfunc;
                         if ( ( nmfunc = dynamic_cast< NameExpr *>( cond->get_function() )) != 0 ) {
-                                if ( nmfunc->get_name() == std::string("Range") ) {
+                                if ( nmfunc->get_name() == "Range" ) {
                                         assert( cond->get_args().size() == 2 );
                                         std::list<Expression *>::iterator i = cond->get_args().begin();
                                         Expression *lo = *i, *hi = *(++i ); // "unnecessary" temporaries
-                                        fillRange( lo, hi );
+                                        //fillRange( lo, hi );
                                 } // if
                         } // if
@@ -82 +82 @@
                         assert( ! tcond->get_exprs().empty() );
                         for ( std::list< Expression * >::iterator i = tcond->get_exprs().begin(); i != tcond->get_exprs().end(); i++ )
-                                newCaseLabels.push_back( *i ); // do I need to clone them?
+                                newCaseLabels.push_back( *i );                  // do I need to clone them?
                 } // if
 
@@ -99 +99 @@
 
                 if ( ce_lo && ce_hi ) {
+                        std::cout << ce_lo->get_constant()->get_value() << " " << ce_hi->get_constant()->get_value() << std::endl;
                         c_lo = ce_lo->get_constant(); c_hi = ce_hi->get_constant();
                 } /* else {
@@ -109 +110 @@
                 if ( ! ty_lo || ! ty_hi )
                         return; // one of them is not a constant
-
+#if 0
                 switch ( ty_lo->get_kind() ) {
                   case BasicType::Char:
@@ -176 +177 @@
                         break;
                 } // switch
-
+#endif
                 /* End: */{ 
                         // invalid range, signal a warning (it still generates the two case labels)
-                        newCaseLabels.push_back( lo );
-                        newCaseLabels.push_back( hi );
+//                      newCaseLabels.push_back( lo );
+//                      newCaseLabels.push_back( hi );
                         return;
                 }