Changeset 17cd4eb for translator/ResolvExpr

Timestamp:

Jan 7, 2015, 6:04:42 PM (11 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, 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:

0b8cd722

Parents:

d9a0e76

Message:

fixed restrict, fixed parameter copy, introduced name table for types, changed variable after to string

File:

• translator/ResolvExpr/Resolver.cc (modified) (11 diffs)

translator/ResolvExpr/Resolver.cc

@@ -47 +47 @@
             (*i)->print( std::cerr );
             (*i)->accept( resolver );
-        }
+        } // for
 #endif
     }
@@ -81 +81 @@
                 for ( std::list< Alternative >::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
                     i->print( std::cout );
-                }
-            }
+                } // for
+            } // if
 #endif
             assert( finder.get_alternatives().size() == 1 );
@@ -98 +98 @@
             } else {
                 return true;
-            }
+            } // if
         }
   
@@ -112 +112 @@
                 for ( std::list< Alternative >::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
                     i->print( std::cout );
-                }
-            }
+                } // for
+            } // if
 #endif
             Expression *newExpr = 0;
@@ -124 +124 @@
                         newExpr = i->expr->clone();
                         newEnv = &i->env;
-                    }
-                }
-            }
+                    } // if
+                } // if
+            } // for
             if ( !newExpr ) {
                 throw SemanticError( "Too many interpretations for switch control expression", untyped );
-            }
+            } // if
             finishExpr( newExpr, *newEnv );
             return newExpr;
@@ -147 +147 @@
             Type *new_type = resolveTypeof( typeDecl->get_base(), *this );
             typeDecl->set_base( new_type );
-        }
+        } // if
         SymTab::Indexer::visit( typeDecl );
     }
@@ -163 +163 @@
         for ( std::list< DeclarationWithType * >::const_iterator i = functionDecl->get_functionType()->get_returnVals().begin(); i != functionDecl->get_functionType()->get_returnVals().end(); ++i ) {
             functionReturn.push_back( (*i)->get_type() );
-        }
+        } // for
         SymTab::Indexer::visit( functionDecl );
         functionReturn = oldFunctionReturn;
@@ -173 +173 @@
             delete exprStmt->get_expr();
             exprStmt->set_expr( newExpr );
-        }
+        } // if
     }
 
@@ -196 +196 @@
             delete forStmt->get_condition();
             forStmt->set_condition( newExpr );
-        }
+        } // if
   
         if ( forStmt->get_increment() ) {
@@ -202 +202 @@
             delete forStmt->get_increment();
             forStmt->set_increment( newExpr );
-        }
+        } // if
   
         Visitor::visit( forStmt );
@@ -236 +236 @@
             delete castExpr;
             returnStmt->set_expr( newExpr );
-        }
+        } // if
     }
 
     void Resolver::visit( SingleInit *singleInit ) {
-        // if ( singleInit->get_value() ) {
-        //     CastExpr *castExpr = new CastExpr( singleInit->get_value(), initContext->clone() );
-        //     Expression *newExpr = findSingleExpression( castExpr, *this );
-        //     delete castExpr;
-        //     singleInit->set_value( newExpr );
-        // }
-        // singleInit->get_value()->accept( *this );
+        if ( singleInit->get_value() ) {
+            CastExpr *castExpr = new CastExpr( singleInit->get_value(), initContext->clone() );
+            Expression *newExpr = findSingleExpression( castExpr, *this );
+            delete castExpr;
+            singleInit->set_value( newExpr );
+        } // if
+        singleInit->get_value()->accept( *this );
     }