Changeset a32346b for src

Timestamp:

Sep 25, 2018, 4:56:55 PM (7 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:

34a6b2e, a332d432

Parents:

48b7085e (diff), 560812b (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 plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeTools/ResolvProtoDump.cc (modified) (7 diffs)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• SymTab/Demangle.cc (modified) (1 diff)
• cfa.make (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/CodeTools/ResolvProtoDump.cc

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

src/Makefile.am

@@ -50 +50 @@
 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS     = cr
 
 demangler_SOURCES = SymTab/demangler.cc

src/Makefile.in

@@ -152 +152 @@
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
-ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -582 +581 @@
 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
+ARFLAGS = cr
 demangler_SOURCES = SymTab/demangler.cc
 demangler_LDADD = libdemangle.a     # yywrap

src/SymTab/Demangle.cc

@@ -392 +392 @@
                                 parsers.emplace_back(Encoding::enum_t, [this](Type::Qualifiers tq) { return parseEnum(tq); });
                                 parsers.emplace_back(Encoding::type, [this](Type::Qualifiers tq) { return parseType(tq); });
-                                parsers.emplace_back(Encoding::zero, [this](Type::Qualifiers tq) { return new ZeroType(tq); });
-                                parsers.emplace_back(Encoding::one, [this](Type::Qualifiers tq) { return new OneType(tq); });
+                                parsers.emplace_back(Encoding::zero, [](Type::Qualifiers tq) { return new ZeroType(tq); });
+                                parsers.emplace_back(Encoding::one, [](Type::Qualifiers tq) { return new OneType(tq); });
                         }
 

src/cfa.make

@@ -6 +6 @@
 am__v_CFA_1 =
 
-.cfa.o: $(CFACC) $(CFACPP)
+.cfa.o:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
         $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

src/main.cc

@@ -172 +172 @@
                         if ( filename == nullptr ) filename = argv[ optind ];
                         // prelude filename comes in differently
-                        if ( libcfap ) filename = "prelude.cf";
+                        if ( libcfap ) filename = "prelude.cfa";
                         optind += 1;
                 } else {                                                                                // no input file name
@@ -199 +199 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
-                                assertf( prelude, "cannot open prelude.cf\n" );
+                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
+                                assertf( prelude, "cannot open prelude.cfa\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );