Changeset db19e1d for src

Timestamp:

Sep 3, 2024, 12:08:09 PM (5 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

737bf73

Parents:

cdbb909

Message:

Changed the interpritation of () to be no parameters instead of any parameters. This had a lot of little changes because of this and some nearby clean-up. This includes some changes, including changing some generated functions to be fixed-args instead of variable-args, stripping out the place holder void parameter earlier, but it still shows up earlier in some cases that examine the parser directly. Also had to update the function generation tools. Have only tested with one --arch. Hopefully this all works out.

Location:

src

Files:

• CodeGen/CodeGenerator.cpp (modified) (1 diff)
• CodeGen/GenType.cpp (modified) (1 diff)
• Concurrency/Keywords.cpp (modified) (1 diff)
• Concurrency/Waitfor.cpp (modified) (1 diff)
• Parser/TypeData.cpp (modified) (4 diffs)
• Parser/parser.yy (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -180 +180 @@
 
         if ( 0 == decl->params.size() ) {
-                if ( decl->type->isVarArgs ) {
+                if ( !decl->type->isVarArgs ) {
+                        acc << "(void)";
+                } else if ( options.genC ) {
                         acc << "()";
                 } else {
-                        acc << "(void)";
+                        acc << "(...)";
                 }
         } else {

src/CodeGen/GenType.cpp

@@ -168 +168 @@
 
         if ( type->params.empty() ) {
-                if ( type->isVarArgs ) {
+                if ( !type->isVarArgs ) {
+                        os << "(void)";
+                } else if ( options.genC ) {
                         os << "()";
                 } else {
-                        os << "(void)";
+                        os << "(...)";
                 }
         } else {

src/Concurrency/Keywords.cpp

@@ -1510 +1510 @@
 
 ast::ptr<ast::Type> MutexKeyword::generic_func =
-        new ast::FunctionType( ast::VariableArgs );
+        new ast::FunctionType( ast::FixedArgs );
 
 // --------------------------------------------------------------------------

src/Concurrency/Waitfor.cpp

@@ -302 +302 @@
         const ast::ObjectDecl * monitors = declMonitors( out, clause );
         ast::Type * fptr_t = new ast::PointerType(
-                        new ast::FunctionType( ast::VariableArgs ) );
+                        new ast::FunctionType( ast::FixedArgs ) );
 
         const ast::VariableExpr * variableExpr =

src/Parser/TypeData.cpp

@@ -1541 +1541 @@
 
 // The argument flag (is/is not var-args) of a computed property.
-static ast::ArgumentFlag argumentFlag( const TypeData * td ) {
+static ast::ArgumentFlag buildArgumentFlag( const TypeData * td ) {
         assert( td->kind == TypeData::Function );
-        bool isVaArgs = !td->function.params || td->function.params->hasEllipsis;
-        return (isVaArgs) ? ast::VariableArgs : ast::FixedArgs;
-} // argumentFlag
+        bool isVarArgs = !td->function.params || td->function.params->hasEllipsis;
+        return (isVarArgs) ? ast::VariableArgs : ast::FixedArgs;
+}
+
+
+// Wrapper to convert the void parameter into the empty explicit list.
+static void buildParamList( DeclarationNode * decl,
+                std::vector<ast::ptr<ast::DeclWithType>> & params ) {
+        buildList( decl, params );
+        if ( 1 == params.size() && params[0]->get_type()->isVoid() ) {
+                params.pop_back();
+        }
+}
 
 
@@ -1562 +1572 @@
         std::vector<ast::ptr<ast::DeclWithType>> params;
         std::vector<ast::ptr<ast::DeclWithType>> returns;
-        buildList( td->function.params, params );
+        buildParamList( td->function.params, params );
         buildForall( td->forall, forall );
         // Functions do not store their assertions there anymore.
@@ -1610 +1620 @@
                 std::move( attributes ),
                 funcSpec,
-                argumentFlag( td )
+                buildArgumentFlag( td )
         );
         buildList( td->function.withExprs, decl->withExprs );
@@ -1662 +1672 @@
         assert( td->kind == TypeData::Function );
         ast::FunctionType * ft = new ast::FunctionType(
-                argumentFlag( td ),
+                buildArgumentFlag( td ),
                 buildQualifiers( td )
         );

src/Parser/parser.yy

@@ -2889 +2889 @@
 parameter_list_ellipsis_opt:
         // empty
-                { $$ = nullptr; }
+                { $$ = DeclarationNode::newFromTypeData( build_basic_type( TypeData::Void ) ); }
         | ELLIPSIS
                 { $$ = nullptr; }