Changeset 58c5821

Timestamp:

Dec 22, 2023, 11:32:14 AM (12 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

8b4faf6

Parents:

116d7e2

Message:

Remove extra compound statement and clean-up in InitTweak?.

File:

• src/InitTweak/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -189 +189 @@
                         if ( stmts.empty() ) {
                                 return {};
+                        } else if ( 1 == stmts.size() ) {
+                                return std::move( stmts.front() );
                         } else {
                                 auto block = new ast::CompoundStmt{ init->location, std::move( stmts ) };
@@ -387 +389 @@
 
 bool isDesignated( const ast::Init * init ) {
-//      return ( init ) ? ast::Pass<HasDesignations>::read( init ) : false;
-        ast::Pass<HasDesignations> finder;
-        maybe_accept( init, finder );
-        return finder.core.result;
+        return ( init ) ? ast::Pass<HasDesignations>::read( init ) : false;
 }
 
 bool checkInitDepth( const ast::ObjectDecl * objDecl ) {
-//      return ( objDecl->init ) ? ast::Pass<InitDepthChecker::read( objDecl->init, objDecl->type ) : true;
-        ast::Pass<InitDepthChecker> checker( objDecl->type );
-        maybe_accept( objDecl->init.get(), checker );
-        return checker.core.result;
+        return ( objDecl->init ) ? ast::Pass<InitDepthChecker>::read(
+                objDecl->init.get(), objDecl->type.get() ) : true;
 }