Changeset b965774

Timestamp:

Aug 26, 2024, 10:54:57 AM (2 hours ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Parents:

075c6d5

Message:

Isolated the logic to decide if a function is a var-args function or not.

File:

• src/Parser/TypeData.cpp (modified) (4 diffs)

src/Parser/TypeData.cpp

@@ -1540 +1540 @@
 
 
+// The argument flag (is/is not var-args) of a computed property.
+static ast::ArgumentFlag argumentFlag( const TypeData * td ) {
+        assert( td->kind == TypeData::Function );
+        bool isVaArgs = !td->function.params || td->function.params->hasEllipsis;
+        return (isVaArgs) ? ast::VariableArgs : ast::FixedArgs;
+} // argumentFlag
+
+
 ast::FunctionDecl * buildFunctionDecl(
                 const TypeData * td,
@@ -1549 +1557 @@
                 std::vector<ast::ptr<ast::Attribute>> && attributes ) {
         assert( td->kind == TypeData::Function );
-        // For some reason FunctionDecl takes a bool instead of an ArgumentFlag.
-        bool isVarArgs = !td->function.params || td->function.params->hasEllipsis;
         ast::CV::Qualifiers cvq = buildQualifiers( td );
         std::vector<ast::ptr<ast::TypeDecl>> forall;
@@ -1604 +1610 @@
                 std::move( attributes ),
                 funcSpec,
-                (isVarArgs) ? ast::VariableArgs : ast::FixedArgs
+                argumentFlag( td )
         );
         buildList( td->function.withExprs, decl->withExprs );
@@ -1656 +1662 @@
         assert( td->kind == TypeData::Function );
         ast::FunctionType * ft = new ast::FunctionType(
-                ( !td->function.params || td->function.params->hasEllipsis )
-                        ? ast::VariableArgs : ast::FixedArgs,
+                argumentFlag( td ),
                 buildQualifiers( td )
         );