Index: translator/ResolvExpr/Resolver.cc
===================================================================
--- translator/ResolvExpr/Resolver.cc	(revision d9a0e763800888addddd70d8848a8f432b825e4b)
+++ translator/ResolvExpr/Resolver.cc	(revision 0b8cd7227c65b28513877765de7302e28eefbb6f)
@@ -47,5 +47,5 @@
 	    (*i)->print( std::cerr );
 	    (*i)->accept( resolver );
-	}
+	} // for
 #endif
     }
@@ -81,6 +81,6 @@
 		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,5 +98,5 @@
 	    } else {
 		return true;
-	    }
+	    } // if
 	}
   
@@ -112,6 +112,6 @@
 		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,10 +124,10 @@
 			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,5 +147,5 @@
 	    Type *new_type = resolveTypeof( typeDecl->get_base(), *this );
 	    typeDecl->set_base( new_type );
-	}
+	} // if
 	SymTab::Indexer::visit( typeDecl );
     }
@@ -163,5 +163,5 @@
 	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,5 +173,5 @@
 	    delete exprStmt->get_expr();
 	    exprStmt->set_expr( newExpr );
-	}
+	} // if
     }
 
@@ -196,5 +196,5 @@
 	    delete forStmt->get_condition();
 	    forStmt->set_condition( newExpr );
-	}
+	} // if
   
 	if ( forStmt->get_increment() ) {
@@ -202,5 +202,5 @@
 	    delete forStmt->get_increment();
 	    forStmt->set_increment( newExpr );
-	}
+	} // if
   
 	Visitor::visit( forStmt );
@@ -236,15 +236,15 @@
 	    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 );
     }