Changeset 2810700 for src

Timestamp:

Feb 22, 2024, 1:43:00 PM (10 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

2beaf9b

Parents:

7bb516f

Message:

The two argument form of the conditional operator now only has two arguments all the way to the resolver.

Location:

src

Files:

• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)

src/Parser/parser.yy

@@ -1041 +1041 @@
                 // FIX ME: computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
-                { $$ = new ExpressionNode( build_cond( yylloc, $1, $1->clone(), $4 ) ); }
+                { $$ = new ExpressionNode( build_cond( yylloc, $1, nullptr, $4 ) ); }
         ;
 

src/ResolvExpr/CandidateFinder.cpp

@@ -1512 +1512 @@
         void Finder::postvisit( const ast::ConditionalExpr * conditionalExpr ) {
                 // candidates for condition
+                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
                 CandidateFinder finder1( context, tenv );
-                ast::ptr<ast::Expr> arg1 = notZeroExpr( conditionalExpr->arg1 );
                 finder1.find( arg1, ResolveMode::withAdjustment() );
                 if ( finder1.candidates.empty() ) return;
 
                 // candidates for true result
+                ast::Expr const * arg2 = conditionalExpr->arg2;
+                arg2 = arg2 ? arg2 : conditionalExpr->arg1.get();
                 CandidateFinder finder2( context, tenv );
                 finder2.allowVoid = true;
-                finder2.find( conditionalExpr->arg2, ResolveMode::withAdjustment() );
+                finder2.find( arg2, ResolveMode::withAdjustment() );
                 if ( finder2.candidates.empty() ) return;