Rename to ConditionalOperator

pol-core/bscript/CMakeSources.cmake

@@ -51,8 +51,8 @@ set (bscript_sources    # sorted !
   compiler/ast/CaseDispatchSelectors.h
   compiler/ast/CaseStatement.cpp
   compiler/ast/CaseStatement.h
-  compiler/ast/ConditionalExpression.cpp
-  compiler/ast/ConditionalExpression.h
+  compiler/ast/ConditionalOperator.cpp
+  compiler/ast/ConditionalOperator.h
   compiler/ast/ConstDeclaration.cpp
   compiler/ast/ConstDeclaration.h
   compiler/ast/CstyleForLoop.cpp

pol-core/bscript/compiler/ast/ConditionalExpression.cpp → pol-core/bscript/compiler/ast/ConditionalOperator.cpp

@@ -1,4 +1,4 @@
-#include "ConditionalExpression.h"
+#include "ConditionalOperator.h"
 
 #include <format/format.h>
 
@@ -7,10 +7,10 @@
 
 namespace Pol::Bscript::Compiler
 {
-ConditionalExpression::ConditionalExpression( const SourceLocation& source_location,
-                                              std::unique_ptr<Expression> conditional,
-                                              std::unique_ptr<Expression> consequent,
-                                              std::unique_ptr<Expression> alternate )
+ConditionalOperator::ConditionalOperator( const SourceLocation& source_location,
+                                          std::unique_ptr<Expression> conditional,
+                                          std::unique_ptr<Expression> consequent,
+                                          std::unique_ptr<Expression> alternate )
     : Expression( source_location ),
       consequent_label( std::make_shared<FlowControlLabel>() ),
       alternate_label( std::make_shared<FlowControlLabel>() )
@@ -22,27 +22,27 @@ ConditionalExpression::ConditionalExpression( const SourceLocation& source_locat
   children.push_back( std::move( alternate ) );
 }
 
-void ConditionalExpression::accept( NodeVisitor& visitor )
+void ConditionalOperator::accept( NodeVisitor& visitor )
 {
-  visitor.visit_conditional_expression( *this );
+  visitor.visit_conditional_operator( *this );
 }
 
-void ConditionalExpression::describe_to( fmt::Writer& w ) const
+void ConditionalOperator::describe_to( fmt::Writer& w ) const
 {
   w << "conditional-expression";
 }
 
-Expression& ConditionalExpression::conditional()
+Expression& ConditionalOperator::conditional()
 {
   return child<Expression>( 0 );
 }
 
-Expression& ConditionalExpression::consequent()
+Expression& ConditionalOperator::consequent()
 {
   return child<Expression>( 1 );
 }
 
-Expression& ConditionalExpression::alternate()
+Expression& ConditionalOperator::alternate()
 {
   return child<Expression>( 2 );
 }

pol-core/bscript/compiler/ast/ConditionalExpression.h → pol-core/bscript/compiler/ast/ConditionalOperator.h

@@ -1,17 +1,17 @@
-#ifndef POLSERVER_CONDITIONALEXPRESSION_H
-#define POLSERVER_CONDITIONALEXPRESSION_H
+#ifndef POLSERVER_CONDITIONALOPERATOR_H
+#define POLSERVER_CONDITIONALOPERATOR_H
 
 #include "bscript/compiler/ast/Expression.h"
 
 namespace Pol::Bscript::Compiler
 {
 class FlowControlLabel;
-class ConditionalExpression : public Expression
+class ConditionalOperator : public Expression
 {
 public:
-  ConditionalExpression( const SourceLocation&, std::unique_ptr<Expression> conditional,
-                         std::unique_ptr<Expression> consequent,
-                         std::unique_ptr<Expression> alternate );
+  ConditionalOperator( const SourceLocation&, std::unique_ptr<Expression> conditional,
+                       std::unique_ptr<Expression> consequent,
+                       std::unique_ptr<Expression> alternate );
 
   void accept( NodeVisitor& ) override;
   void describe_to( fmt::Writer& ) const override;
@@ -26,4 +26,4 @@ class ConditionalExpression : public Expression
 }  // namespace Pol::Bscript::Compiler
 
 
-#endif  // POLSERVER_CONDITIONALEXPRESSION_H
+#endif  // POLSERVER_CONDITIONALOPERATOR_H

pol-core/bscript/compiler/ast/NodeVisitor.cpp

@@ -11,7 +11,7 @@
 #include "bscript/compiler/ast/CaseDispatchGroups.h"
 #include "bscript/compiler/ast/CaseDispatchSelectors.h"
 #include "bscript/compiler/ast/CaseStatement.h"
-#include "bscript/compiler/ast/ConditionalExpression.h"
+#include "bscript/compiler/ast/ConditionalOperator.h"
 #include "bscript/compiler/ast/ConstDeclaration.h"
 #include "bscript/compiler/ast/CstyleForLoop.h"
 #include "bscript/compiler/ast/DebugStatementMarker.h"
@@ -354,7 +354,7 @@ void NodeVisitor::visit_while_loop( WhileLoop& node )
   visit_children( node );
 }
 
-void NodeVisitor::visit_conditional_expression( ConditionalExpression& node )
+void NodeVisitor::visit_conditional_operator( ConditionalOperator& node )
 {
   visit_children( node );
 }

pol-core/bscript/compiler/ast/NodeVisitor.h

@@ -15,7 +15,7 @@ class CaseDispatchDefaultSelector;
 class CaseDispatchGroup;
 class CaseDispatchGroups;
 class CaseDispatchSelectors;
-class ConditionalExpression;
+class ConditionalOperator;
 class ConstDeclaration;
 class CstyleForLoop;
 class DebugStatementMarker;
@@ -131,7 +131,7 @@ class NodeVisitor
   virtual void visit_var_statement( VarStatement& );
   virtual void visit_variable_assignment_statement( VariableAssignmentStatement& );
   virtual void visit_while_loop( WhileLoop& );
-  virtual void visit_conditional_expression( ConditionalExpression& );
+  virtual void visit_conditional_operator( ConditionalOperator& );
 
   virtual void visit_children( Node& parent );
 };

pol-core/bscript/compiler/astbuilder/ExpressionBuilder.cpp

@@ -4,7 +4,7 @@
 #include "bscript/compiler/ast/Argument.h"
 #include "bscript/compiler/ast/ArrayInitializer.h"
 #include "bscript/compiler/ast/BinaryOperator.h"
-#include "bscript/compiler/ast/ConditionalExpression.h"
+#include "bscript/compiler/ast/ConditionalOperator.h"
 #include "bscript/compiler/ast/DictionaryEntry.h"
 #include "bscript/compiler/ast/DictionaryInitializer.h"
 #include "bscript/compiler/ast/ElementAccess.h"
@@ -240,7 +240,7 @@ std::unique_ptr<ElvisOperator> ExpressionBuilder::elvis_operator(
   return std::make_unique<ElvisOperator>( source_location, std::move( lhs ), std::move( rhs ) );
 }
 
-std::unique_ptr<ConditionalExpression> ExpressionBuilder::conditional_expression(
+std::unique_ptr<ConditionalOperator> ExpressionBuilder::conditional_operator(
     EscriptParser::ExpressionContext* ctx )
 {
   auto source_location = location_for( *ctx );
@@ -249,8 +249,8 @@ std::unique_ptr<ConditionalExpression> ExpressionBuilder::conditional_expression
   auto consequent = expression( expressions[1] );
   auto alternate = expression( expressions[2] );
 
-  return std::make_unique<ConditionalExpression>( source_location, std::move( conditional ),
-                                                  std::move( consequent ), std::move( alternate ) );
+  return std::make_unique<ConditionalOperator>( source_location, std::move( conditional ),
+                                                std::move( consequent ), std::move( alternate ) );
 }
 
 
@@ -385,7 +385,7 @@ std::unique_ptr<Expression> ExpressionBuilder::expression( EscriptParser::Expres
   }
   else if ( auto conditional = ctx->QUESTION() )
   {
-    result = conditional_expression( ctx );
+    result = conditional_operator( ctx );
   }
   else
   {

pol-core/bscript/compiler/astbuilder/ExpressionBuilder.h

@@ -12,7 +12,7 @@ namespace Pol::Bscript::Compiler
 class Argument;
 class ArrayInitializer;
 class BinaryOperator;
-class ConditionalExpression;
+class ConditionalOperator;
 class DictionaryInitializer;
 class ElementAccess;
 class ElvisOperator;
@@ -51,7 +51,7 @@ class ExpressionBuilder : public ValueBuilder
   std::unique_ptr<ElvisOperator> elvis_operator(
       EscriptGrammar::EscriptParser::ExpressionContext* );
 
-  std::unique_ptr<ConditionalExpression> conditional_expression(
+  std::unique_ptr<ConditionalOperator> conditional_operator(
       EscriptGrammar::EscriptParser::ExpressionContext* );
 
   std::unique_ptr<ErrorInitializer> error(

pol-core/bscript/compiler/codegen/InstructionGenerator.cpp

@@ -11,7 +11,7 @@
 #include "bscript/compiler/ast/CaseDispatchGroups.h"
 #include "bscript/compiler/ast/CaseDispatchSelectors.h"
 #include "bscript/compiler/ast/CaseStatement.h"
-#include "bscript/compiler/ast/ConditionalExpression.h"
+#include "bscript/compiler/ast/ConditionalOperator.h"
 #include "bscript/compiler/ast/ConstDeclaration.h"
 #include "bscript/compiler/ast/CstyleForLoop.h"
 #include "bscript/compiler/ast/DebugStatementMarker.h"
@@ -738,7 +738,7 @@ void InstructionGenerator::visit_format_expression( FormatExpression& node )
   emit.format_expression();
 }
 
-void InstructionGenerator::visit_conditional_expression( ConditionalExpression& node )
+void InstructionGenerator::visit_conditional_operator( ConditionalOperator& node )
 {
   update_debug_location( node );
 

pol-core/bscript/compiler/codegen/InstructionGenerator.h

@@ -70,7 +70,7 @@ class InstructionGenerator : public NodeVisitor
   void visit_while_loop( WhileLoop& ) override;
   void visit_interpolate_string( InterpolateString& ) override;
   void visit_format_expression( FormatExpression& ) override;
-  void visit_conditional_expression( ConditionalExpression& ) override;
+  void visit_conditional_operator( ConditionalOperator& ) override;
 
 private:
   // There are two of these because sometimes when calling a method