Changeset b181639

Timestamp:

Sep 13, 2018, 10:26:06 AM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

40cd873

Parents:

3b3491b

Message:

refinements to ResolvProtoDump? output

File:

• src/CodeTools/ResolvProtoDump.cc (modified) (4 diffs)

src/CodeTools/ResolvProtoDump.cc

@@ -37 +37 @@
         class ProtoDump : public WithShortCircuiting, public WithVisitorRef<ProtoDump> {
                 std::set<std::string> decls;               ///< Declarations in this scope
-                std::set<std::string> exprs;               ///< Expressions in this scope
+                std::vector<std::string> exprs;            ///< Expressions in this scope
                 std::vector<PassVisitor<ProtoDump>> subs;  ///< Sub-scopes
                 const ProtoDump* parent;                   ///< Outer lexical scope
@@ -63 +63 @@
                 /// adds a new expression to this scope
                 void addExpr( const std::string& s ) {
-                        if ( ! s.empty() ) { exprs.insert( s ); }
+                        if ( ! s.empty() ) { exprs.emplace_back( s ); }
                 }
 
@@ -198 +198 @@
 
                         // arrays represented as generic type
-                        void previsit( ArrayType* ) { ss << "#$arr<"; ++depth; }
-                        void postvisit( ArrayType* ) { --depth; ss << '>'; }
+                        void previsit( ArrayType* at ) {
+                                ss << "#$arr<";
+                                ++depth;
+                                at->base->accept( *visitor );
+                                --depth;
+                                ss << '>';
+                                visit_children = false;
+                        }
 
                         // ignore top-level reference types, they're mostly transparent to resolution
@@ -380 +386 @@
                         }
 
-                        /// Casts replaced with arguments 
-                        /// TODO put casts in resolv-proto
+                        /// Casts replaced with result type
+                        /// TODO put cast target functions in, and add second expression for target
+                        void previsit( CastExpr* cast ) {
+                                PassVisitor<TypePrinter> tyPrinter{ ss };
+                                cast->result->accept( tyPrinter );
+                                visit_children = false;
+                        }
                         
                         /// Member access handled as function from aggregate to member