Changeset 58d246a

Timestamp:

Mar 24, 2017, 4:31:09 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

6d48157, cb4d825

Parents:

231f01c (diff), f20dffa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (3 diffs)
• SynTree/Initializer.h (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:45:42 2016
-// Update Count     : 204
+// Last Modified On : Thu Mar 23 17:23:14 2017
+// Update Count     : 211
 //
 
@@ -371 +371 @@
         void Resolver::visit( SingleInit *singleInit ) {
                 if ( singleInit->get_value() ) {
-#if 0
-                        if (NameExpr * ne = dynamic_cast<NameExpr*>(singleInit->get_value())) {
-                                string n = ne->get_name();
-                                if (n == "0") {
-                                        initContext = new BasicType(Type::Qualifiers(),
-                                                                                                BasicType::SignedInt);
-                                } else {
-                                        DeclarationWithType * decl = lookupId( n );
-                                        initContext = decl->get_type();
-                                }
-                        } else if (ConstantExpr * e =
-                                           dynamic_cast<ConstantExpr*>(singleInit->get_value())) {
-                                Constant *c = e->get_constant();
-                                initContext = c->get_type();
-                        } else {
-                                assert(0);
-                        }
-#endif
+                        // // find all the d's
+                        // std::list<Expression *> &designators = singleInit->get_designators();
+                        // std::list<Type *> types1{ initContext }, types2;
+                        // for ( Expression * expr: designators ) {
+                        //      cerr << expr << endl;
+                        //      if ( NameExpr * nexpr = dynamic_cast<NameExpr *>( expr ) ) {
+                        //              for ( Type * type: types1 ) {
+                        //                      cerr << type << endl;
+                        //                      ReferenceToType * fred = dynamic_cast<ReferenceToType *>(type);
+                        //                      std::list<Declaration *> members;
+                        //                      if ( fred ) {
+                        //                              fred->lookup( nexpr->get_name(), members ); // concatenate identical field name
+                        //                              for ( Declaration * mem: members ) {
+                        //                                      if ( DeclarationWithType * dwt = dynamic_cast<DeclarationWithType *>(mem) ) {
+                        //                                              types2.push_back( dwt->get_type() );
+                        //                                      } // if
+                        //                              } // for
+                        //                      } // if
+                        //              } // for
+                        //              types1 = types2;
+                        //              types2.clear();
+                        //      } // if
+                        // } // for
+                        // // for ( Type * type: types1 ) {
+                        // //   cerr << type << endl;
+                        // // } // for
+                        
+                        // // O(N^2) checks of d-types with f-types
+                        // // find the minimum cost
                         CastExpr *castExpr = new CastExpr( singleInit->get_value(), initContext->clone() );
                         Expression *newExpr = findSingleExpression( castExpr, *this );
@@ -410 +421 @@
                         }
                 } // if
-//      singleInit->get_value()->accept( *this );
         }
 

src/SynTree/Initializer.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 12 13:49:13 2016
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 23 16:12:42 2017
+// Update Count     : 20
 //
 
@@ -70 +70 @@
         void set_value( Expression *newValue ) { value = newValue; }
 
+        std::list<Expression *> &get_designators() { return designators; }
         void set_designators( std::list<Expression *> &newValue ) { designators = newValue; }
-        std::list<Expression *> &get_designators() { return designators; }
 
         virtual SingleInit *clone() const { return new SingleInit( *this); }

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:04:03 2017
-// Update Count     : 147
+// Last Modified On : Thu Mar 23 16:16:36 2017
+// Update Count     : 149
 //
 
@@ -331 +331 @@
         virtual Type *acceptMutator( Mutator & m ) = 0;
         virtual void print( std::ostream & os, int indent = 0 ) const;
+
+        virtual void lookup( const std::string & name, std::list< Declaration* > & foundDecls ) const {}
   protected:
         virtual std::string typeString() const = 0;