Changeset 16ba4897

Timestamp:

Oct 9, 2024, 5:07:59 PM (21 hours ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

0766399

Parents:

1b770e40

Message:

Replaced SemanticErrorException::isEmpty with ...::throwIfNonEmpty. This is how it was used in every context and it saves a bit of text (if not two lines) at every use. I considered putting this function in the header for better inlining, but this should have at least the same preformance as the last version.

Location:

src

Files:

• AST/Node.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (3 diffs)
• Common/ErrorObjects.hpp (modified) (1 diff)
• Common/SemanticError.cpp (modified) (1 diff)
• ControlStruct/MultiLevelExit.cpp (modified) (1 diff)
• InitTweak/FixInit.cpp (modified) (2 diffs)
• Parser/DeclarationNode.cpp (modified) (3 diffs)
• Parser/DeclarationNode.hpp (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• Validate/CheckAssertions.cpp (modified) (2 diffs)
• Validate/ReplaceTypedef.cpp (modified) (1 diff)

src/AST/Node.hpp

@@ -161 +161 @@
                 }
         }
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        }
+        errors.throwIfNonEmpty();
 }
 

src/AST/Pass.impl.hpp

@@ -250 +250 @@
         }
         pass_visitor_stats.depth--;
-        if ( !errors.isEmpty() ) { throw errors; }
+        errors.throwIfNonEmpty();
 
         return new_kids;
@@ -287 +287 @@
         __pedantic_pass_assert( new_kids.size() == container.size() );
         pass_visitor_stats.depth--;
-        if ( !errors.isEmpty() ) { throw errors; }
+        errors.throwIfNonEmpty();
 
         return ast::__pass::resultN<container_t, node_t>{ mutated, new_kids };
@@ -401 +401 @@
         }
         pass_visitor_stats.depth--;
-        if ( !errors.isEmpty() ) { throw errors; }
+        errors.throwIfNonEmpty();
 }
 

src/Common/ErrorObjects.hpp

@@ -41 +41 @@
         void append( SemanticErrorException & other );
         void append( CodeLocation location, const std::string & );
-        bool isEmpty() const;
+        void throwIfNonEmpty();
         void print();
   private:

src/Common/SemanticError.cpp

@@ -88 +88 @@
 }
 
-bool SemanticErrorException::isEmpty() const {
-        return errors.empty();
+void SemanticErrorException::throwIfNonEmpty() {
+        if ( !errors.empty() ) {
+                throw *this;
+        }
 }
 

src/ControlStruct/MultiLevelExit.cpp

@@ -688 +688 @@
         }
 
-        if ( !errors.isEmpty() ) {
-                throw errors;
-        }
+        errors.throwIfNonEmpty();
         return ret;
 }

src/InitTweak/FixInit.cpp

@@ -301 +301 @@
                 } // try
         } // for
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
+        errors.throwIfNonEmpty();
 }
 
@@ -1173 +1171 @@
                 function->stmts = mutStmts;
         }
-        if (! errors.isEmpty()) {
-                throw errors;
-        }
+        errors.throwIfNonEmpty();
         return function;
 }

src/Parser/DeclarationNode.cpp

@@ -829 +829 @@
         } // for
 
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
+        errors.throwIfNonEmpty();
 } // buildList
 
@@ -879 +877 @@
         } // for
 
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
+        errors.throwIfNonEmpty();
 } // buildList
 
@@ -897 +893 @@
         } // for
 
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
+        errors.throwIfNonEmpty();
 } // buildTypeList
 

src/Parser/DeclarationNode.hpp

@@ -156 +156 @@
                 } // try
         } // for
-        if ( ! errors.isEmpty() ) {
-                throw errors;
-        } // if
+        errors.throwIfNonEmpty();
 }
 

src/ResolvExpr/CandidateFinder.cpp

@@ -1115 +1115 @@
                 // Implement SFINAE; resolution errors are only errors if there aren't any non-error
                 // candidates
-                if ( found.empty() && ! errors.isEmpty() ) { throw errors; }
+                if ( found.empty() ) errors.throwIfNonEmpty();
 
                 // only keep the best matching intrinsic result to match C semantics (no unexpected narrowing/widening)

src/Validate/CheckAssertions.cpp

@@ -60 +60 @@
                 makeTypeVarMap( decl, typeVars );
                 checkList( typeVars, errors, decl->assertions );
-                if ( !errors.isEmpty() ) { throw errors; }
+                errors.throwIfNonEmpty();
         }
 
@@ -72 +72 @@
                 }
                 if ( checkMembers ) checkList( typeVars, errors, decl->members );
-                if ( !errors.isEmpty() ) { throw errors; }
+                errors.throwIfNonEmpty();
         }
 

src/Validate/ReplaceTypedef.cpp

@@ -327 +327 @@
         assert( declsToAddBefore.empty() );
         assert( declsToAddAfter.empty() );
-        if ( !errors.isEmpty() ) { throw errors; }
+        errors.throwIfNonEmpty();
 
         mut->members.clear();