Changes in src/CodeTools/ResolvProtoDump.cc [4c42a5f:a4a000d]

File:

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

src/CodeTools/ResolvProtoDump.cc

@@ -196 +196 @@
                         }
                         
-                        // default to just name, with first character in lowercase
-                        ss << pre 
-                           << (char)std::tolower( static_cast<unsigned char>(name[0]) )
-                           << (name.c_str() + 1);
+                        // default to just name
+                        ss << pre << name;
                 }
 
                 /// ensures type inst names are uppercase
                 static void ti_name( const std::string& name, std::stringstream& ss ) {
-                        unsigned i = 0;
-                        while ( i < name.size() && name[i] == '_' ) { ++i; }
-                        if ( i == name.size() ) {
-                                ss << "Anon";
-                                return;
-                        }
-                        ss << (char)std::toupper( static_cast<unsigned char>(name[i]) )
-                           << (name.c_str() + i + 1);
+                        ss << (char)std::toupper( static_cast<unsigned char>(name[0]) )
+                           << (name.c_str() + 1);
                 }
 
@@ -227 +219 @@
                         void previsit( BasicType* bt ) { ss << (int)bt->get_kind(); }
 
-                        // pointers (except function pointers) represented as generic type
-                        void previsit( PointerType* pt ) {
-                                if ( ! dynamic_cast<FunctionType*>(pt->base) ) { ss << "#$ptr<"; ++depth; }
-                        }
-                        void postvisit( PointerType* pt ) {
-                                if ( ! dynamic_cast<FunctionType*>(pt->base) ) { --depth; ss << '>'; }
-                        }
-
-                        // arrays represented as generic pointers
+                        // pointers represented as generic type
+                        // TODO except pointer to function
+                        void previsit( PointerType* ) { ss << "#$ptr<"; ++depth; }
+                        void postvisit( PointerType* ) { --depth; ss << '>'; }
+
+                        // arrays represented as generic type
                         void previsit( ArrayType* at ) {
-                                ss << "#$ptr<";
+                                ss << "#$arr<";
                                 ++depth;
                                 at->base->accept( *visitor );
@@ -255 +244 @@
                         }
 
-                        // print function types using prototype syntax
+                        // encode function type as a 2-param generic type
+                        // TODO handle forall functions
                         void previsit( FunctionType* ft ) {
-                                ss << '[';
+                                ss << "#$fn<";
                                 ++depth;
-                                build( *visitor, from_decls( ft->returnVals ), ss, preceded );
-                                ss << " : ";
-                                build( *visitor, from_decls( ft->parameters ), ss, terminated );
+                                buildAsTuple( *visitor, from_decls( ft->returnVals ), ss );
+                                ss << ' ';
+                                buildAsTuple( *visitor, from_decls( ft->parameters ), ss );
                                 --depth;
-                                ss << ']';
+                                ss << '>';
                                 visit_children = false;
                         }
@@ -351 +341 @@
                         }
 
-                        // print variable declaration in prototype syntax
+                        // print variable declaration as zero-arg function
                         PassVisitor<TypePrinter> printTy{ closed, ss };
                         norefs->accept( printTy );
-                        ss << " &";
+                        ss << ' ';
                         rp_name( name, ss );
                 }
@@ -391 +381 @@
                                 : closed(closed), ss(ss) {}
 
-                        /// Names handled as name expressions
+                        /// Names handled as nullary function calls
                         void previsit( NameExpr* expr ) {
-                                ss << '&';
                                 rp_name( expr->name, ss );
+                                ss << "()";
                         }
 
@@ -426 +416 @@
                         }
 
-                        /// Already-resolved calls skipped
-                        void previsit( ApplicationExpr* ) {
-                                visit_children = false;
-                        }
-
                         /// Address-of handled as operator
                         void previsit( AddressExpr* expr ) {
@@ -600 +585 @@
 
                 void previsit( FunctionDecl *decl ) {
-                        // skip decls with ftype parameters
-                        for ( TypeDecl* tyvar : decl->type->forall ) {
-                                if ( tyvar->get_kind() == TypeDecl::Ftype ) {
-                                        visit_children = false;
-                                        return;
-                                }
-                        }
-
                         // add function as declaration
                         std::stringstream ss;