From bd9767c21d4c4539ef042bc8db86a3aa2efb6b56 Mon Sep 17 00:00:00 2001 From: MichelJuillard <michel.juillard@mjui.fr> Date: Mon, 14 Nov 2022 17:20:33 +0100 Subject: [PATCH] yet more test --- src/SymbolTable.cc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc index 519a291b..bc2ab9ee 100644 --- a/src/SymbolTable.cc +++ b/src/SymbolTable.cc @@ -440,8 +440,8 @@ SymbolTable::addLagAuxiliaryVarInternal(bool endo, int orig_symb_id, int orig_le exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -486,7 +486,7 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index, expr_t e exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""}; aux_vars.emplace_back(aux_var_info); return symb_id; @@ -507,8 +507,8 @@ SymbolTable::addLogTransformAuxiliaryVar(int orig_symb_id, int orig_lead_lag, ex exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -528,8 +528,8 @@ SymbolTable::addDiffLagAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_id exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -549,8 +549,8 @@ SymbolTable::addDiffLeadAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_i exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -570,8 +570,8 @@ SymbolTable::addDiffAuxiliaryVar(int index, expr_t expr_arg, optional<int> orig_ exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diff, move(orig_symb_id), move(orig_lag), 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diff, move(orig_symb_id), move(orig_lag), 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -591,8 +591,8 @@ SymbolTable::addUnaryOpAuxiliaryVar(int index, expr_t expr_arg, string unary_op, exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::unaryOp, move(orig_symb_id), move(orig_lag), 0, 0, expr_arg, unary_op); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::unaryOp, move(orig_symb_id), move(orig_lag), 0, 0, expr_arg, unary_op); + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -612,8 +612,8 @@ SymbolTable::addMultiplierAuxiliaryVar(int index) noexcept(false) exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -632,8 +632,8 @@ SymbolTable::addDiffForwardAuxiliaryVar(int orig_symb_id, int orig_lead_lag, exp exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -651,8 +651,8 @@ SymbolTable::addPacExpectationAuxiliaryVar(const string &name, expr_t expr_arg) exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -670,8 +670,8 @@ SymbolTable::addPacTargetNonstationaryAuxiliaryVar(const string &name, expr_t ex exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } -- GitLab