Changeset ad47ec4 for src/Parser/TypeData.cpp

Timestamp:

Aug 29, 2024, 2:38:39 PM (14 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

9bb6c5f

Parents:

960665c (diff), b965774 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

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 )
         );