Changeset ad47ec4 for src/Parser

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

Location:

src/Parser

Files:

• DeclarationNode.cpp (modified) (4 diffs)
• ExpressionNode.cpp (modified) (2 diffs)
• ExpressionNode.hpp (modified) (2 diffs)
• InitializerNode.cpp (modified) (2 diffs)
• TypeData.cpp (modified) (4 diffs)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cpp

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 23 18:25:57 2024
-// Update Count     : 1533
+// Last Modified On : Thu Aug 22 14:11:47 2024
+// Update Count     : 1555
 //
 
@@ -134 +134 @@
                 os << endl << string( indent + 2, ' ' ) << "with initializer ";
                 initializer->printOneLine( os );
-                os << " maybe constructed? " << initializer->get_maybeConstructed();
+                if ( ! initializer->get_maybeConstructed() ) {
+                        os << " constructed with @= ";
+                } // if
         } // if
 
@@ -957 +959 @@
                         isDelete ? nullptr : maybeBuild( initializer ),
                         copy( attributes )
-                )->set_extension( extension );
+                );
+                decl->extension = extension;
                 if ( isDelete ) {
                         auto dwt = strict_dynamic_cast<ast::DeclWithType *>( decl );
@@ -999 +1002 @@
         assert( type );
 
-        // Some types are parsed as declarations and, syntactically, can have
-        // initializers. However, semantically, this is meaningless.
-        if ( initializer ) {
-                SemanticError( this, "Initializer on type declaration " );
+        // Some types are parsed as declarations and, syntactically, can have initializers, which are not support (possibly
+        // meaningless).
+        if ( initializer && initializer->get_maybeConstructed() ) { // no @=
+                SemanticError( location, "default initialization for parameter %s is unsupport for a function-pointer declaration.",
+                                           (this->name) ? this->name->c_str() : "anonymous" );
         }
 

src/Parser/ExpressionNode.cpp

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 14 18:57:07 2023
-// Update Count     : 1087
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Aug 23 10:22:00 2024
+// Update Count     : 1088
 //
 
@@ -780 +780 @@
 } // build_compoundLiteral
 
+ast::Expr * build_va_arg( const CodeLocation & location,
+                ExpressionNode * function, DeclarationNode * declaration ) {
+        return build_func( location,
+                new ExpressionNode(
+                        build_varref( location, new std::string( "__builtin_va_arg" ) ) ),
+                function->set_last( new ExpressionNode( new ast::TypeExpr( location,
+                        maybeMoveBuildType( declaration ) ) ) )
+        );
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/ExpressionNode.hpp

@@ -43 +43 @@
         ast::Expr * build() {
                 ast::Expr * node = expr.release();
-                node->set_extension( this->get_extension() );
+                node->extension = this->extension;
                 node->location = this->location;
                 return node;
@@ -83 +83 @@
 ast::Expr * build_func( const CodeLocation &, ExpressionNode * function, ExpressionNode * expr_node );
 ast::Expr * build_compoundLiteral( const CodeLocation &, DeclarationNode * decl_node, InitializerNode * kids );
+ast::Expr * build_va_arg( const CodeLocation &, ExpressionNode * function, DeclarationNode * type );
 
 ast::Expr * build_enum_pos_expr( const CodeLocation &, ast::Expr * expr_node );

src/Parser/InitializerNode.cpp

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:20:24 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr  4 11:18:00 2023
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Aug 20 22:36:22 2024
+// Update Count     : 28
 //
 
@@ -86 +86 @@
         } // if
 
-        InitializerNode *moreInit;
+        InitializerNode * moreInit;
         if ( ( moreInit = next ) ) {
                 moreInit->printOneLine( os );

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

src/Parser/parser.yy

@@ -792 +792 @@
                 { $$ = new ExpressionNode( build_func( yylloc, $1, $3 ) ); }
         | VA_ARG '(' primary_expression ',' declaration_specifier_nobody abstract_parameter_declarator_opt ')'
-                // { SemanticError( yylloc, "va_arg is currently unimplemented." ); $$ = nullptr; }
-                { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, new string( "__builtin_va_arg" ) ) ),
-                                                                                           $3->set_last( (ExpressionNode *)($6 ? $6->addType( $5 ) : $5) ) ) ); }
+                { $$ = new ExpressionNode( build_va_arg( yylloc, $3, ( $6 ? $6->addType( $5 ) : $5 ) ) ); }
         | postfix_expression '`' identifier                                     // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, build_postfix_name( $3 ) ) ), $1 ) ); }