Changeset ac911f4

Timestamp:

Jul 30, 2016, 11:37:26 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:

3778cb2

Parents:

66d12f7

Message:

case range, second attempt

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (3 diffs)
• tests/switch.c (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 30 01:48:20 2016
-// Update Count     : 329
+// Last Modified On : Sat Jul 30 11:27:07 2016
+// Update Count     : 340
 //
 
@@ -473 +473 @@
                         } else {
                                 if ( nameExpr->get_name() != "Range" ) {
+                                        // builtin routines
                                         nameExpr->accept( *this );
                                         output << "(";
@@ -478 +479 @@
                                         output << ")";
                                 } else {
-                                        genFredList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
-//                                      output << (*(untypedExpr->get_args().begin()))->accept( *this );// << " ... " << (*untypedExpr->get_args().end())->accept( *this ).getname();
+                                        // case V1 ... V2 or case V1~V2
+                                        assert( untypedExpr->get_args().size() == 2 );
+                                        (*untypedExpr->get_args().begin())->accept( *this );
+                                        output << " ... ";
+                                        (*--untypedExpr->get_args().end())->accept( *this );
                                 } // if
                         } // if

src/CodeGen/CodeGenerator.h ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 30 01:23:43 2016
-// Update Count     : 36
+// Last Modified On : Sat Jul 30 11:10:42 2016
+// Update Count     : 37
 //
 
@@ -90 +90 @@
 
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
-                template< class Iterator > void genFredList( Iterator begin, Iterator end );
 
                 struct Indenter {
@@ -132 +131 @@
         }
 
-        template< class Iterator >
-        void CodeGenerator::genFredList( Iterator begin, Iterator end ) {
-                if ( begin == end ) return;
-
-                for ( ;; ) {
-                        (*begin++)->accept( *this );
-                        if ( begin == end ) return;
-                        output << " ... ";
-                } // for
-        }
-
         inline bool doSemicolon( Declaration* decl ) {
                 if ( FunctionDecl* func = dynamic_cast< FunctionDecl* >( decl ) ) {

src/tests/switch.c ¶

@@ -10 +10 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:02:23 2016
-// Update Count     : 22
+// Last Modified On : Sat Jul 30 11:31:13 2016
+// Update Count     : 28
 // 
 
@@ -49 +49 @@
           default:
                 i = 3;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4:
+          case 1 ... 6:
+          case 20, 30:
                 j = 3;
                 f( 3 );
@@ -78 +78 @@
                 struct S { int i; };
                 S s;
-          case 3:
+          case 19:
           case 'A' ... 'Z':
-          case 5 ... 6:
-          case 2, 4, 7:
+          case 0 ... 6:
+          case 20, 30, 40:
                 i = 3;
                 f( 3 );