Changeset a2dbcff1

Timestamp:

Dec 14, 2018, 2:47:57 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

107b01a

Parents:

6ebc13f

Message:

Fixed warning and spacing

Location:

src

Files:

• CodeTools/ResolvProtoDump.cc (modified) (18 diffs)
• config.h.in (modified) (1 diff)
• main.cc (modified) (1 diff)

src/CodeTools/ResolvProtoDump.cc

@@ -51 +51 @@
 
                 /// Child constructor
-                ProtoDump(const ProtoDump* p, Type* r) 
+                ProtoDump(const ProtoDump* p, Type* r)
                         : decls(), exprs(), subs(), closed(p->closed), parent(p), rtnType(r) {}
 
                 // Fix copy issues
-                ProtoDump(const ProtoDump& o) 
-                        : decls(o.decls), exprs(o.exprs), subs(o.subs), closed(o.closed), parent(o.parent), 
+                ProtoDump(const ProtoDump& o)
+                        : decls(o.decls), exprs(o.exprs), subs(o.subs), closed(o.closed), parent(o.parent),
                           rtnType(maybeClone(o.rtnType.get())) {}
                 ProtoDump( ProtoDump&& ) = default;
@@ -69 +69 @@
                         parent = o.parent;
                         rtnType.reset( maybeClone(o.rtnType.get()) );
-                        
+
                         return *this;
                 }
-                ProtoDump& operator= (ProtoDump&&) = default;
+                ProtoDump& operator= (ProtoDump&&) = delete;
 
         private:
@@ -96 +96 @@
                         subs.emplace_back( std::move(sub.pass) );
                 }
-        
+
                 /// Whether lists should be separated, terminated, or preceded by their separator
                 enum septype { separated, terminated, preceded };
@@ -102 +102 @@
                 /// builds space-separated list of types
                 template<typename V>
-                static void build( V& visitor, const std::list< Type* >& tys, std::stringstream& ss, 
+                static void build( V& visitor, const std::list< Type* >& tys, std::stringstream& ss,
                                 septype mode = separated ) {
                         if ( tys.empty() ) return;
@@ -121 +121 @@
                 /// builds list of types wrapped as tuple type
                 template<typename V>
-                static void buildAsTuple( V& visitor, const std::list< Type* >& tys, 
+                static void buildAsTuple( V& visitor, const std::list< Type* >& tys,
                                 std::stringstream& ss ) {
                         switch ( tys.size() ) {
@@ -162 +162 @@
                         if ( name.compare( 0, 10, "_operator_" ) == 0 ) {
                                 ss << name.substr(10);
-                        } else if ( name.compare( "_constructor" ) == 0 
+                        } else if ( name.compare( "_constructor" ) == 0
                                         || name.compare( "_destructor" ) == 0 ) {
                                 ss << name.substr(1);
@@ -173 +173 @@
 
                 /// replaces operators with resolv-proto names
-                static void rp_name( const std::string& name, std::stringstream& ss, 
+                static void rp_name( const std::string& name, std::stringstream& ss,
                                 std::string&& pre = "" ) {
                         // safety check for anonymous names
@@ -187 +187 @@
                                 op_name( info.outputName, ss );
                                 return;
-                        } 
-                        
+                        }
+
                         // replace retval names
                         if ( name.compare( 0, 8, "_retval_" ) == 0 ) {
@@ -195 +195 @@
                                 return;
                         }
-                        
+
                         // default to just name, with first character in lowercase
-                        ss << pre 
+                        ss << pre
                            << (char)std::tolower( static_cast<unsigned char>(name[0]) )
                            << (name.c_str() + 1);
@@ -221 +221 @@
                         // strip trailing "_generic_" from autogen names (avoids some user-generation issues)
                         char generic[] = "_generic_"; size_t n_generic = sizeof(generic) - 1;
-                        if ( stripped.size() >= n_generic 
+                        if ( stripped.size() >= n_generic
                                         && stripped.substr( stripped.size() - n_generic ) == generic ) {
                                 stripped.resize( stripped.size() - n_generic );
@@ -237 +237 @@
                         unsigned depth;                                 ///< Depth of nesting from root type
 
-                        TypePrinter( const std::unordered_set<std::string>& closed, std::stringstream& ss ) 
+                        TypePrinter( const std::unordered_set<std::string>& closed, std::stringstream& ss )
                                 : ss(ss), closed(closed), depth(0) {}
 
@@ -337 +337 @@
                         }
                 };
-        
+
                 /// builds description of function
                 void build( const std::string& name, FunctionType* fnTy, std::stringstream& ss ) {
@@ -350 +350 @@
                         for ( TypeDecl* tyvar : fnTy->forall ) {
                                 for ( DeclarationWithType* assn : tyvar->assertions ) {
-                                        ss << " | "; 
+                                        ss << " | ";
                                         build( assn->name, assn->get_type(), ss );
                                 }
@@ -360 +360 @@
                         // ignore top-level references
                         Type *norefs = ty->stripReferences();
-                        
+
                         // fall back to function declaration if function type
                         if ( PointerType* pTy = dynamic_cast< PointerType* >(norefs) ) {
@@ -409 +409 @@
                         std::stringstream& ss;                          ///< Output to print to
 
-                        ExprPrinter( const std::unordered_set<std::string>& closed, std::stringstream& ss ) 
+                        ExprPrinter( const std::unordered_set<std::string>& closed, std::stringstream& ss )
                                 : closed(closed), ss(ss) {}
 
@@ -476 +476 @@
                                 visit_children = false;
                         }
-                        
+
                         /// Member access handled as function from aggregate to member
                         void previsit( UntypedMemberExpr* expr ) {
@@ -662 +662 @@
                                         }
                                 }
-                                
+
                                 // add named parameters and returns to local scope
                                 body.pass.addAll( decl->type->returnVals );
@@ -679 +679 @@
                 void previsit( StructDecl* sd ) { addAggregateFields(sd); }
                 void previsit( UnionDecl* ud ) { addAggregateFields(ud); }
-                
+
                 void previsit( EnumDecl* ed ) {
-                        std::unique_ptr<Type> eType = 
+                        std::unique_ptr<Type> eType =
                                 std::make_unique<BasicType>( Type::Qualifiers{}, BasicType::SignedInt );
-                        
+
                         // add field names directly to enclosing scope
                         for ( Declaration* member : ed->members ) {

src/config.h.in

@@ -7 +7 @@
 #undef CFA_64_CPU
 
-/* Location of include files. */
+/* Backend compiler to use. */
 #undef CFA_BACKEND_CC
 

src/main.cc

@@ -487 +487 @@
                         resolvep = true;
                         break;
-                        case 'R':                                                                               // dump resolv-proto instance
+                  case 'R':                                                                             // dump resolv-proto instance
                         resolvprotop = true;
                         break;