Changeset e172f42 for src/Parser

Timestamp:

Jun 16, 2023, 9:10:46 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

5dbb9f3

Parents:

a0bd9a2 (diff), 62d62db (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 'ast-experimental'

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (2 diffs)
• ExpressionNode.h (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -601 +601 @@
 ast::Expr * build_cast( const CodeLocation & location,
                 DeclarationNode * decl_node,
-                ExpressionNode * expr_node ) {
+                ExpressionNode * expr_node,
+                ast::CastExpr::CastKind kind ) {
         ast::Type * targetType = maybeMoveBuildType( decl_node );
         if ( dynamic_cast<ast::VoidType *>( targetType ) ) {
@@ -607 +608 @@
                 return new ast::CastExpr( location,
                         maybeMoveBuild( expr_node ),
-                        ast::ExplicitCast );
+                        ast::ExplicitCast, kind );
         } else {
                 return new ast::CastExpr( location,
                         maybeMoveBuild( expr_node ),
                         targetType,
-                        ast::ExplicitCast );
+                        ast::ExplicitCast, kind );
         } // if
 } // build_cast

src/Parser/ExpressionNode.h

@@ -69 +69 @@
 ast::DimensionExpr * build_dimensionref( const CodeLocation &, const std::string * name );
 
-ast::Expr * build_cast( const CodeLocation &, DeclarationNode * decl_node, ExpressionNode * expr_node );
+ast::Expr * build_cast( const CodeLocation &, DeclarationNode * decl_node, ExpressionNode * expr_node, ast::CastExpr::CastKind kind = ast::CastExpr::Default );
 ast::Expr * build_keyword_cast( const CodeLocation &, ast::AggregateDecl::Aggregate target, ExpressionNode * expr_node );
 ast::Expr * build_virtual_cast( const CodeLocation &, DeclarationNode * decl_node, ExpressionNode * expr_node );

src/Parser/parser.yy

@@ -931 +931 @@
                 { $$ = new ExpressionNode( new ast::VirtualCastExpr( yylloc, maybeMoveBuild( $5 ), maybeMoveBuildType( $3 ) ) ); }
         | '(' RETURN type_no_function ')' cast_expression       // CFA
-                { SemanticError( yylloc, "Return cast is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new ExpressionNode( build_cast( yylloc, $3, $5, ast::CastExpr::Return ) ); }
         | '(' COERCE type_no_function ')' cast_expression       // CFA
                 { SemanticError( yylloc, "Coerce cast is currently unimplemented." ); $$ = nullptr; }