Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision cda48b6ebb3fe47a472e098d755ee821ad1681f7)
+++ src/ResolvExpr/Resolver.cc	(revision a8541d919dd331e12e9230b02e7c466d8aa48846)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 21:50:37 2015
-// Update Count     : 23
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 10 16:11:19 2015
+// Update Count     : 77
 //
 
@@ -37,4 +37,5 @@
 		virtual void visit( ObjectDecl *functionDecl );
 		virtual void visit( TypeDecl *typeDecl );
+		virtual void visit( ArrayType * at );
 
 		virtual void visit( ExprStmt *exprStmt );
@@ -157,14 +158,16 @@
 		initContext = new_type;
 		SymTab::Indexer::visit( objectDecl );
-
-		if ( ArrayType * at = dynamic_cast< ArrayType * >( new_type ) ){
-			if ( at->get_dimension() ) {
-				BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
-				CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
-				Expression *newExpr = findSingleExpression( castExpr, *this );
-				delete at->get_dimension();
-				at->set_dimension( newExpr );
-			}
-		}
+	}
+
+	void Resolver::visit( ArrayType * at ) {
+		if ( at->get_dimension() ) {
+			BasicType arrayLenType = BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+			CastExpr *castExpr = new CastExpr( at->get_dimension(), arrayLenType.clone() );
+			Expression *newExpr = findSingleExpression( castExpr, *this );
+			delete at->get_dimension();
+			at->set_dimension( newExpr );
+
+		}
+		Visitor::visit( at );
 	}
   
@@ -270,4 +273,13 @@
 			returnStmt->set_expr( newExpr );
 		} // if
+	}
+
+	template< typename T >
+	bool isCharType( T t ) {
+		if ( BasicType * bt = dynamic_cast< BasicType * >( t ) ) {
+			return bt->get_kind() == BasicType::Char || bt->get_kind() == BasicType::SignedChar || 
+				bt->get_kind() == BasicType::UnsignedChar;
+		}
+		return false;
 	}
 
@@ -296,4 +308,21 @@
 			delete castExpr;
 			singleInit->set_value( newExpr );
+
+			// check if initializing type is char[]
+			if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+				if ( isCharType( at->get_base() ) ) {
+					// check if the resolved type is char *
+					if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
+						if ( isCharType( pt->get_base() ) ) {
+							// strip cast if we're initializing a char[] with a char *, e.g.
+							// char x[] = "hello";
+							CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
+							singleInit->set_value( ce->get_arg() );
+							ce->set_arg( NULL );
+							delete ce;									
+						}
+					}
+				}
+			}
 		} // if
 //	singleInit->get_value()->accept( *this );
@@ -301,5 +330,19 @@
 
 	void Resolver::visit( ListInit *listInit ) {
-		Visitor::visit(listInit);
+		if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+			std::list< Initializer * >::iterator iter( listInit->begin_initializers() );
+			for ( ; iter != listInit->end_initializers(); ++iter ) {
+				initContext = at->get_base();
+				(*iter)->accept( *this );
+			} // for
+		} else if ( UnionInstType *st = dynamic_cast< UnionInstType * >( initContext ) ) {
+			DeclarationWithType *dt = dynamic_cast< DeclarationWithType * >( *st->get_baseUnion()->get_members().begin() );
+			initContext = dt->get_type();
+			(*listInit->begin_initializers())->accept( *this );
+		} else {
+			// basic types are handled here
+			Visitor::visit( listInit );
+		}
+
 #if 0
 		if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {