diff --git a/nautilus/include/nautilus/common/config.h.in b/nautilus/include/nautilus/common/config.h.in index 7e476bc8..cdbcecd3 100644 --- a/nautilus/include/nautilus/common/config.h.in +++ b/nautilus/include/nautilus/common/config.h.in @@ -1,5 +1,6 @@ #cmakedefine ENABLE_TRACING +#cmakedefine ENABLE_LOGGING #cmakedefine ENABLE_BC_BACKEND #cmakedefine ENABLE_C_BACKEND #cmakedefine ENABLE_MLIR_BACKEND diff --git a/nautilus/include/nautilus/tracing/TypedValueRef.hpp b/nautilus/include/nautilus/tracing/TypedValueRef.hpp index a0e31d17..42f13a90 100644 --- a/nautilus/include/nautilus/tracing/TypedValueRef.hpp +++ b/nautilus/include/nautilus/tracing/TypedValueRef.hpp @@ -35,8 +35,6 @@ struct TypedValueRef { bool operator>=(const TypedValueRef& rhs) const { return !(*this < rhs); } - - [[nodiscard]] std::string toString() const; }; class TypedValueRefHolder { diff --git a/nautilus/src/nautilus/compiler/DumpHandler.hpp b/nautilus/src/nautilus/compiler/DumpHandler.hpp index eca8cacb..abff1838 100644 --- a/nautilus/src/nautilus/compiler/DumpHandler.hpp +++ b/nautilus/src/nautilus/compiler/DumpHandler.hpp @@ -15,7 +15,7 @@ class DumpHandler { [[nodiscard]] bool dumpToConsole() const; [[nodiscard]] bool dumpToFile() const; const engine::Options& options; - const CompilationUnitID& id; + [[maybe_unused]] const CompilationUnitID& id; const std::filesystem::path rootPath; }; diff --git a/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.cpp b/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.cpp index 2b6d7184..c04ebbd7 100644 --- a/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.cpp +++ b/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.cpp @@ -30,16 +30,16 @@ void BCLoweringProvider::RegisterProvider::freeRegister() { std::tuple BCLoweringProvider::LoweringContext::process() { defaultRegisterFile.fill(0); - auto functionOperation = ir->getRootOperation(); + const auto& functionOperation = ir->getRootOperation(); RegisterFrame rootFrame; - auto functionBasicBlock = functionOperation->getFunctionBasicBlock(); - for (auto i = 0ull; i < functionBasicBlock->getArguments().size(); i++) { - auto& argument = functionBasicBlock->getArguments()[i]; + const auto& functionBasicBlock = functionOperation.getFunctionBasicBlock(); + for (auto i = 0ull; i < functionBasicBlock.getArguments().size(); i++) { + auto& argument = functionBasicBlock.getArguments()[i]; auto argumentRegister = registerProvider.allocRegister(); rootFrame.setValue(argument->getIdentifier(), argumentRegister); program.arguments.emplace_back(argumentRegister); } - this->process(functionBasicBlock, rootFrame); + this->process(&functionBasicBlock, rootFrame); // NES_INFO("Allocated Registers: " << // this->registerProvider.allocRegister()); return std::make_tuple(program, defaultRegisterFile); @@ -944,7 +944,7 @@ void BCLoweringProvider::LoweringContext::process(ir::ShiftOperation* shiftOpera program.blocks[block].code.emplace_back(oc); } -void BCLoweringProvider::LoweringContext::process(ir::BasicBlockInvocation& bi, short block, RegisterFrame& parentFrame) { +void BCLoweringProvider::LoweringContext::process(const ir::BasicBlockInvocation& bi, short block, RegisterFrame& parentFrame) { auto blockInputArguments = bi.getArguments(); auto& blockTargetArguments = bi.getBlock()->getArguments(); std::vector tempArgs; diff --git a/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.hpp b/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.hpp index 3df71990..04f145ec 100644 --- a/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.hpp +++ b/nautilus/src/nautilus/compiler/backends/bc/BCLoweringProvider.hpp @@ -88,7 +88,7 @@ class BCLoweringProvider { void process(ir::BranchOperation* opt, short block, RegisterFrame& frame); - void process(ir::BasicBlockInvocation& opt, short block, RegisterFrame& frame); + void process(const ir::BasicBlockInvocation& opt, short block, RegisterFrame& frame); void process(ir::LoadOperation* opt, short block, RegisterFrame& frame); diff --git a/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.cpp b/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.cpp index 403ea0d2..32adb0d5 100644 --- a/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.cpp +++ b/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.cpp @@ -63,17 +63,17 @@ std::string CPPLoweringProvider::LoweringContext::getType(const Type& stamp) { std::stringstream CPPLoweringProvider::LoweringContext::process() { - auto functionOperation = ir->getRootOperation(); + const auto& functionOperation = ir->getRootOperation(); RegisterFrame rootFrame; std::vector arguments; - auto functionBasicBlock = functionOperation->getFunctionBasicBlock(); - for (auto i = 0ull; i < functionBasicBlock->getArguments().size(); i++) { - auto argument = functionBasicBlock->getArguments()[i].get(); + const auto& functionBasicBlock = functionOperation.getFunctionBasicBlock(); + for (auto i = 0ull; i < functionBasicBlock.getArguments().size(); i++) { + auto argument = functionBasicBlock.getArguments()[i].get(); auto var = getVariable(argument->getIdentifier()); rootFrame.setValue(argument->getIdentifier(), var); arguments.emplace_back(getType(argument->getStamp()) + " " + var); } - this->process(functionBasicBlock, rootFrame); + this->process(&functionBasicBlock, rootFrame); std::stringstream pipelineCode; pipelineCode << "\n"; @@ -179,7 +179,7 @@ void CPPLoweringProvider::LoweringContext::process(ir::StoreOperation* storeOp, blocks[blockIndex] << "*reinterpret_cast<" << type << "*>(" << address << ") = " << value << ";\n"; } -void CPPLoweringProvider::LoweringContext::process(ir::BasicBlockInvocation& bi, short blockIndex, RegisterFrame& parentFrame) { +void CPPLoweringProvider::LoweringContext::process(const ir::BasicBlockInvocation& bi, short blockIndex, RegisterFrame& parentFrame) { auto blockInputArguments = bi.getArguments(); auto& blockTargetArguments = bi.getBlock()->getArguments(); blocks[blockIndex] << "// prepare block arguments\n"; @@ -351,8 +351,7 @@ void CPPLoweringProvider::LoweringContext::process(const std::unique_ptrtoString()); - return; + throw NotImplementedException("Operation is not implemented"); } } } diff --git a/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.hpp b/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.hpp index 334e0f7e..45131b5f 100644 --- a/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.hpp +++ b/nautilus/src/nautilus/compiler/backends/cpp/CPPLoweringProvider.hpp @@ -63,7 +63,7 @@ class CPPLoweringProvider { std::string process(const ir::BasicBlock*, RegisterFrame& frame); - void process(ir::BasicBlockInvocation& opt, short block, RegisterFrame& frame); + void process(const ir::BasicBlockInvocation& opt, short block, RegisterFrame& frame); void process(const std::unique_ptr& operation, short block, RegisterFrame& frame); @@ -97,13 +97,11 @@ class CPPLoweringProvider { blockArguments << getType(constValue->getStamp()) << " " << var << ";\n"; frame.setValue(constValue->getIdentifier(), var); - blocks[blockIndex] << var << " = (" << getType(constValue->getStamp()) << ")" << constValue->getValue() - << ";\n"; + blocks[blockIndex] << var << " = (" << getType(constValue->getStamp()) << ")" << constValue->getValue() << ";\n"; } template - void processBinary(const std::unique_ptr& o, const std::string& operation, short blockIndex, - RegisterFrame& frame) { + void processBinary(const std::unique_ptr& o, const std::string& operation, short blockIndex, RegisterFrame& frame) { auto op = static_cast(o.get()); auto leftInput = frame.getValue(op->getLeftInput()->getIdentifier()); auto rightInput = frame.getValue(op->getRightInput()->getIdentifier()); diff --git a/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.cpp b/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.cpp index 7cb0578e..b69c97c2 100644 --- a/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.cpp +++ b/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.cpp @@ -241,7 +241,7 @@ void MLIRLoweringProvider::generateMLIR(const ir::BasicBlock* basicBlock, ValueF void MLIRLoweringProvider::generateMLIR(const std::unique_ptr& operation, ValueFrame& frame) { switch (operation->getOperationType()) { case ir::Operation::OperationType::FunctionOp: - generateMLIR(as(operation), frame); + // generateMLIR(as(operation), frame); break; case ir::Operation::OperationType::ConstIntOp: generateMLIR(as(operation), frame); @@ -356,23 +356,23 @@ void MLIRLoweringProvider::generateMLIR(ir::AndOperation* andOperation, ValueFra ); } -void MLIRLoweringProvider::generateMLIR(ir::FunctionOperation* functionOp, ValueFrame& frame) { +void MLIRLoweringProvider::generateMLIR(const ir::FunctionOperation& functionOp, ValueFrame& frame) { // Generate execute function. Set input/output types and get its entry block. llvm::SmallVector inputTypes(0); - for (auto& inputArg : functionOp->getFunctionBasicBlock()->getArguments()) { + for (auto& inputArg : functionOp.getFunctionBasicBlock().getArguments()) { inputTypes.emplace_back(getMLIRType(inputArg->getStamp())); } - llvm::SmallVector outputTypes(1, getMLIRType(functionOp->getOutputArg())); + llvm::SmallVector outputTypes(1, getMLIRType(functionOp.getOutputArg())); ; auto functionInOutTypes = builder->getFunctionType(inputTypes, outputTypes); auto loc = getNameLoc("EntryPoint"); - auto mlirFunction = builder->create(loc, functionOp->getName(), functionInOutTypes); + auto mlirFunction = builder->create(loc, functionOp.getName(), functionInOutTypes); // Avoid function name mangling. mlirFunction->setAttr("llvm.emit_c_interface", mlir::UnitAttr::get(context)); - if (isUnsignedInteger(functionOp->getStamp())) { + if (isUnsignedInteger(functionOp.getStamp())) { mlirFunction.setResultAttr(0, "llvm.zeroext", mlir::UnitAttr::get(context)); - } else if (isSignedInteger(functionOp->getStamp())) { + } else if (isSignedInteger(functionOp.getStamp())) { mlirFunction.setResultAttr(0, "llvm.signext", mlir::UnitAttr::get(context)); } // mlirFunction.setArgAttr(0, "llvm.signext", mlir::UnitAttr::get(context)); @@ -395,14 +395,14 @@ void MLIRLoweringProvider::generateMLIR(ir::FunctionOperation* functionOp, Value // Store references to function args in the valueMap map. auto valueMapIterator = mlirFunction.args_begin(); - for (int i = 0; i < (int) functionOp->getFunctionBasicBlock()->getArguments().size(); ++i) { - frame.setValue(functionOp->getFunctionBasicBlock()->getArguments().at(i)->getIdentifier(), valueMapIterator[i] + for (int i = 0; i < (int) functionOp.getFunctionBasicBlock().getArguments().size(); ++i) { + frame.setValue(functionOp.getFunctionBasicBlock().getArguments().at(i)->getIdentifier(), valueMapIterator[i] ); } // Generate MLIR for operations in function body (BasicBlock). - generateMLIR(functionOp->getFunctionBasicBlock(), frame); + generateMLIR(&functionOp.getFunctionBasicBlock(), frame); theModule.push_back(mlirFunction); } diff --git a/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.hpp b/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.hpp index 80717cec..805cd97d 100644 --- a/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.hpp +++ b/nautilus/src/nautilus/compiler/backends/mlir/MLIRLoweringProvider.hpp @@ -102,7 +102,7 @@ class MLIRLoweringProvider { */ void generateMLIR(const std::unique_ptr& operation, ValueFrame& frame); - void generateMLIR(ir::FunctionOperation* funcOp, ValueFrame& frame); + void generateMLIR(const ir::FunctionOperation& funcOp, ValueFrame& frame); void generateMLIR(ir::ConstIntOperation* constIntOp, ValueFrame& frame); @@ -147,9 +147,7 @@ class MLIRLoweringProvider { * @param varArgs: Include variable arguments. * @return FlatSymbolRefAttr: Reference to function used in CallOps. */ - ::mlir::FlatSymbolRefAttr insertExternalFunction(const std::string& name, void* functionPtr, - ::mlir::Type resultType, std::vector<::mlir::Type> argTypes, - bool varArgs); + ::mlir::FlatSymbolRefAttr insertExternalFunction(const std::string& name, void* functionPtr, ::mlir::Type resultType, std::vector<::mlir::Type> argTypes, bool varArgs); /** * @brief Generates a Name(d)Loc(ation) that is attached to the operation. diff --git a/nautilus/src/nautilus/compiler/ir/CMakeLists.txt b/nautilus/src/nautilus/compiler/ir/CMakeLists.txt index 434913fa..9c5d3ede 100644 --- a/nautilus/src/nautilus/compiler/ir/CMakeLists.txt +++ b/nautilus/src/nautilus/compiler/ir/CMakeLists.txt @@ -4,4 +4,4 @@ add_subdirectory(operations) add_subdirectory(phases) #add_subdirectory(Types) -add_source_files(nautilus IRGraph.cpp IRDumpHandler.cpp) \ No newline at end of file +add_source_files(nautilus IRGraph.cpp) \ No newline at end of file diff --git a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp index 98ed9ae1..e69de29b 100644 --- a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp +++ b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp @@ -1,87 +0,0 @@ - -#include "nautilus/compiler/ir/IRDumpHandler.hpp" -#include "nautilus/compiler/ir/operations/BranchOperation.hpp" -#include "nautilus/compiler/ir/operations/FunctionOperation.hpp" -#include "nautilus/compiler/ir/operations/IfOperation.hpp" -#include "nautilus/compiler/ir/operations/Operation.hpp" -#include - -namespace nautilus::compiler::ir { - -NESIRDumpHandler::~NESIRDumpHandler() = default; - -NESIRDumpHandler::NESIRDumpHandler(std::ostream& out) : out(out) { -} - -std::shared_ptr NESIRDumpHandler::create(std::ostream& out) { - return std::make_shared(out); -} - -const BasicBlock* NESIRDumpHandler::getNextLowerOrEqualLevelBasicBlock(const BasicBlock* thenBlock) { - auto& terminatorOp = thenBlock->getOperations().back(); - if (terminatorOp->getOperationType() == Operation::OperationType::BranchOp) { - auto branchOp = dynamic_cast(terminatorOp.get()); - return getNextLowerOrEqualLevelBasicBlock(branchOp->getNextBlockInvocation().getBlock()); - } else if (terminatorOp->getOperationType() == Operation::OperationType::IfOp) { - auto ifOp = dynamic_cast(terminatorOp.get()); - if (ifOp->getFalseBlockInvocation().getBlock() != nullptr) { - return getNextLowerOrEqualLevelBasicBlock(ifOp->getFalseBlockInvocation().getBlock()); - } else { - return getNextLowerOrEqualLevelBasicBlock(ifOp->getTrueBlockInvocation().getBlock()); - } - } else { // ReturnOp todo changed #3234 - return nullptr; - } -} - -void NESIRDumpHandler::dumpHelper(Operation* terminatorOp) { - switch (terminatorOp->getOperationType()) { - case Operation::OperationType::BranchOp: { - auto branchOp = static_cast(terminatorOp); - dumpHelper(branchOp->getNextBlockInvocation().getBlock()); - break; - } - case Operation::OperationType::IfOp: { - auto ifOp = static_cast(terminatorOp); - auto lastTerminatorOp = getNextLowerOrEqualLevelBasicBlock(ifOp->getTrueBlockInvocation().getBlock()); - dumpHelper(ifOp->getTrueBlockInvocation().getBlock()); - dumpHelper(ifOp->getFalseBlockInvocation().getBlock()); - if (lastTerminatorOp) { - dumpHelper(lastTerminatorOp); - } - break; - } - case Operation::OperationType::ReturnOp: - break; - default: - break; - } -} - -void NESIRDumpHandler::dumpHelper(const BasicBlock* basicBlock) { - if (!visitedBlocks.contains(basicBlock->getIdentifier())) { - // int32_t indent = basicBlock->getScopeLevel() + 1; - visitedBlocks.emplace(basicBlock->getIdentifier()); - out << '\n' << "Block_" << basicBlock->getIdentifier() << '('; - if (basicBlock->getArguments().size() > 0) { - out << basicBlock->getArguments().at(0)->getIdentifier().toString() << ":" << toString(basicBlock->getArguments().at(0)->getStamp()); - for (int i = 1; i < (int) basicBlock->getArguments().size(); ++i) { - out << ", " << basicBlock->getArguments().at(i)->getIdentifier().toString() << ":" << toString(basicBlock->getArguments().at(i)->getStamp()); - } - } - out << "):" << '\n'; - for (auto& operation : basicBlock->getOperations()) { - out << std::string(4, ' ') << operation->toString() << " :" << toString(operation->getStamp()) << std::endl; - } - auto& terminatorOp = basicBlock->getOperations().back(); - dumpHelper(terminatorOp.get()); - } -} - -void NESIRDumpHandler::dump(const std::unique_ptr& funcOp) { - out << funcOp->toString() << " {"; - dumpHelper(funcOp->getFunctionBasicBlock()); - out << "}\n"; -} - -} // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp index 1166b2e7..e69de29b 100644 --- a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp +++ b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp @@ -1,58 +0,0 @@ -#pragma once - -#include "nautilus/compiler/ir/IRGraph.hpp" -#include "nautilus/compiler/ir/blocks/BasicBlock.hpp" -#include -#include - -namespace nautilus::compiler::ir { - -/** - * @brief Converts query plans and pipeline plans to the .nesviz format and dumps them to a file.m - */ -class NESIRDumpHandler { - -public: - virtual ~NESIRDumpHandler(); - - static std::shared_ptr create(std::ostream& out); - - explicit NESIRDumpHandler(std::ostream& out); - - /** - * @brief Dump the NESIR of the funcOp into the 'out' stringstream. - * @param funcOp: FunctionOperation that exists on the top level of a NESIR module. - */ - void dump(const std::unique_ptr& funcOp); - -private: - std::ostream& out; - std::unordered_set visitedBlocks; // We keep track of visited blocks to avoid multi or infinite - // dumping. - - /** - * @brief Traverses the NESIR to find a BB that is on the same or higher 'blockScopeLevel' compared to the initial - * 'basicBlock'. Note: There is always a 'next block', since we always have a return block at the very end of a - * function. - * @param basicBlock: Initially the block that we want to find the next BB for. Replaced while recursively - * traversing NESIR. - */ - const BasicBlock* getNextLowerOrEqualLevelBasicBlock(const BasicBlock* basicBlock); - - /** - * @brief Handle dumping terminator operations(LoopOp, BranchOp, IfOp, ReturnOp) to the 'out' stringstream. - * - * @param terminatorOp: Terminator operation that we append to the 'out' stringstream. - * @param scopeLevel: scopeLevel of the BasicBlock that is terminated by the terminator operation. - */ - void dumpHelper(Operation* terminatorOp); - - /** - * @brief Handle dumping BasicBlocks to the 'out' stringstream. Print all operations, then handle the terminatorOp. - * - * @param basicBlock: The basicBlock that is dumped to the 'out' stringstream. - */ - void dumpHelper(const BasicBlock* basicBlock); -}; - -} // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/IRGraph.cpp b/nautilus/src/nautilus/compiler/ir/IRGraph.cpp index efe2332e..1cddc131 100644 --- a/nautilus/src/nautilus/compiler/ir/IRGraph.cpp +++ b/nautilus/src/nautilus/compiler/ir/IRGraph.cpp @@ -1,8 +1,23 @@ #include "nautilus/compiler/ir/IRGraph.hpp" -#include "nautilus/compiler/ir/IRDumpHandler.hpp" +#include "nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.hpp" +#include "nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp" +#include "nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.hpp" +#include "nautilus/compiler/ir/operations/BranchOperation.hpp" +#include "nautilus/compiler/ir/operations/CastOperation.hpp" +#include "nautilus/compiler/ir/operations/ConstBooleanOperation.hpp" +#include "nautilus/compiler/ir/operations/ConstFloatOperation.hpp" +#include "nautilus/compiler/ir/operations/ConstIntOperation.hpp" +#include "nautilus/compiler/ir/operations/ConstPtrOperation.hpp" #include "nautilus/compiler/ir/operations/FunctionOperation.hpp" -#include +#include "nautilus/compiler/ir/operations/IfOperation.hpp" +#include "nautilus/compiler/ir/operations/LoadOperation.hpp" +#include "nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp" +#include "nautilus/compiler/ir/operations/LogicalOperations/NotOperation.hpp" +#include "nautilus/compiler/ir/operations/ProxyCallOperation.hpp" +#include "nautilus/compiler/ir/operations/ReturnOperation.hpp" +#include "nautilus/compiler/ir/operations/StoreOperation.hpp" +#include #include namespace nautilus::compiler::ir { @@ -19,22 +34,237 @@ const CompilationUnitID& IRGraph::getId() const { return id; } -FunctionOperation* IRGraph::getRootOperation() { - return rootOperation.get(); +const FunctionOperation& IRGraph::getRootOperation() const { + return *rootOperation; } -std::string IRGraph::toString() const { - std::stringstream ss; - ss << "NESIR {\n"; - auto dumpHandler = NESIRDumpHandler::create(ss); - dumpHandler->dump(rootOperation); - ss << "} //NESIR"; - return ss.str(); +constexpr const char* binaryOpToString(Operation::OperationType type) { + switch (type) { + case Operation::OperationType::AddOp: + return "+"; + case Operation::OperationType::AndOp: + return "and"; + case Operation::OperationType::NotOp: + return "!"; + case Operation::OperationType::DivOp: + return "/"; + case Operation::OperationType::ModOp: + return "%"; + case Operation::OperationType::MulOp: + return "*"; + case Operation::OperationType::NegateOp: + return "neg"; + case Operation::OperationType::OrOp: + return "or"; + case Operation::OperationType::SubOp: + return "-"; + default: + return ""; + } } -std::ostream& operator<<(std::ostream& os, const IRGraph& graph) { - os << graph.toString(); - return os; +constexpr const char* shiftOpToString(ShiftOperation::ShiftType type) { + switch (type) { + case ShiftOperation::ShiftType::LS: + return "<<"; + case ShiftOperation::ShiftType::RS: + return ">>"; + default: + return ""; + } +} + +constexpr const char* shiftOpToString(BinaryCompOperation::Type type) { + switch (type) { + case BinaryCompOperation::BOR: + return "|"; + case BinaryCompOperation::BAND: + return "&"; + case BinaryCompOperation::XOR: + return "^"; + default: + return ""; + } +} + +constexpr const char* compOpToString(CompareOperation::Comparator type) { + switch (type) { + case CompareOperation::Comparator::EQ: + return "=="; + case CompareOperation::Comparator::LE: + return "<="; + case CompareOperation::Comparator::LT: + return "<"; + case CompareOperation::Comparator::GE: + return ">="; + case CompareOperation::Comparator::GT: + return ">"; + default: + return ""; + } } } // namespace nautilus::compiler::ir + +std::string nautilus::compiler::ir::IRGraph::toString() const { + return fmt::to_string(*this); +} + +namespace fmt { +using namespace nautilus::compiler::ir; +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::IRGraph& c, format_context& ctx) -> format_context::iterator; +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::OperationIdentifier& op, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "${}", op.getId()); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::BasicBlockInvocation& op, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "Block_{}(", op.getBlock()->getIdentifier()); + const auto& args = op.getArguments(); + for (size_t i = 0; i < args.size(); ++i) { + if (i > 0) { + fmt::format_to(out, ", "); + } + fmt::format_to(out, "{}", args.at(i)->getIdentifier()); + } + fmt::format_to(out, ")"); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::IfOperation& op, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "if {} ? {} : {}", op.getValue()->getIdentifier(), op.getTrueBlockInvocation(), op.getFalseBlockInvocation()); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::ProxyCallOperation& op, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + + if (op.getStamp() != nautilus::Type::v) { + fmt::format_to(out, "${} = ", op.getIdentifier().getId()); + } + fmt::format_to(out, "{}(", op.getFunctionName()); + const auto& args = op.getInputArguments(); + for (size_t i = 0; i < args.size(); ++i) { + if (i > 0) { + fmt::format_to(out, ","); + } + fmt::format_to(out, "{}", args.at(i)->getIdentifier()); + } + fmt::format_to(out, ")"); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::Operation& op, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + if (auto shiftOp = op.dynCast()) { + fmt::format_to(out, "{} = {} {} {}", op.getIdentifier(), shiftOp->getLeftInput()->getIdentifier(), shiftOpToString(shiftOp->getType()), shiftOp->getRightInput()->getIdentifier()); + } else if (auto compOp = op.dynCast()) { + fmt::format_to(out, "{} = {} {} {}", op.getIdentifier(), compOp->getLeftInput()->getIdentifier(), compOpToString(compOp->getComparator()), compOp->getRightInput()->getIdentifier()); + } else if (auto bcompOp = op.dynCast()) { + fmt::format_to(out, "{} = {} {} {}", op.getIdentifier(), bcompOp->getLeftInput()->getIdentifier(), shiftOpToString(bcompOp->getType()), bcompOp->getRightInput()->getIdentifier()); + } else if (auto res = op.dynCast()) { + fmt::format_to(out, "{} = {} {} {}", op.getIdentifier(), res->getLeftInput()->getIdentifier(), binaryOpToString(op.getOperationType()), res->getRightInput()->getIdentifier()); + } else if (auto ifOp = op.dynCast()) { + fmt::format_to(out, "{}", *ifOp); + } else if (auto brOp = op.dynCast()) { + fmt::format_to(out, "br {}", brOp->getNextBlockInvocation()); + } else if (auto constBool = op.dynCast()) { + fmt::format_to(out, "{} = {}", op.getIdentifier(), constBool->getValue()); + } else if (auto constInt = op.dynCast()) { + fmt::format_to(out, "{} = {}", op.getIdentifier(), constInt->getValue()); + } else if (auto constFloat = op.dynCast()) { + fmt::format_to(out, "{} = {}", op.getIdentifier(), constFloat->getValue()); + } else if (auto returnOp = op.dynCast()) { + fmt::format_to(out, "return"); + if (returnOp->hasReturnValue()) { + fmt::format_to(out, " ({})", returnOp->getReturnValue()->getIdentifier()); + } + } else if (auto constPtr = op.dynCast()) { + fmt::format_to(out, "{} = *", constPtr->getIdentifier()); + } else if (auto callOp = op.dynCast()) { + fmt::format_to(out, "{}", *callOp); + } else if (auto castOp = op.dynCast()) { + fmt::format_to(out, "{} = {} cast_to {}", castOp->getIdentifier(), castOp->getInput()->getIdentifier(), toString(castOp->getStamp())); + } else if (auto loadOp = op.dynCast()) { + fmt::format_to(out, "{} = load({})", loadOp->getIdentifier(), loadOp->getAddress()->getIdentifier()); + } else if (auto storeOp = op.dynCast()) { + fmt::format_to(out, "store({}, {})", storeOp->getValue()->getIdentifier(), storeOp->getAddress()->getIdentifier()); + } else if (auto notOp = op.dynCast()) { + fmt::format_to(out, "{} = !{}", notOp->getIdentifier(), notOp->getInput()->getIdentifier()); + } else if (auto negateOp = op.dynCast()) { + fmt::format_to(out, "{} = ~{}", negateOp->getIdentifier(), negateOp->getInput()->getIdentifier()); + } else { + fmt::format_to(out, "{}", op.getIdentifier().toString()); + } + fmt::format_to(out, " :{}", toString(op.getStamp())); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::BasicBlock& block, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "\nBlock_{}(", block.getIdentifier()); + const auto& args = block.getArguments(); + if (!args.empty()) { + fmt::format_to(out, "{}:{}", args.at(0)->getIdentifier().toString(), toString(args.at(0)->getStamp())); + for (size_t i = 1; i < args.size(); ++i) { + fmt::format_to(out, ", {}:{}", args.at(i)->getIdentifier().toString(), toString(args.at(i)->getStamp())); + } + } + fmt::format_to(out, "):\n"); + for (auto& operation : block.getOperations()) { + fmt::format_to(out, "\t{}\n", *operation); + } + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::compiler::ir::FunctionOperation& func, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "{}(", func.getName()); + for (const auto& arg : func.getInputArgNames()) { + fmt::format_to(out, "{} ", arg); + } + fmt::format_to(out, ") {{"); + for (const auto& block : func.getBasicBlocks()) { + fmt::format_to(out, "{}", *block); + } + fmt::format_to(out, "}}\n"); + return out; + } +}; +} // namespace fmt + +auto fmt::formatter::format(const nautilus::compiler::ir::IRGraph& graph, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "NautilusIr {{\n"); + auto& rootOp = graph.getRootOperation(); + fmt::format_to(out, "{}", rootOp); + fmt::format_to(out, "}} //NESIR"); + return out; +} diff --git a/nautilus/src/nautilus/compiler/ir/IRGraph.hpp b/nautilus/src/nautilus/compiler/ir/IRGraph.hpp index 46382a68..07900827 100644 --- a/nautilus/src/nautilus/compiler/ir/IRGraph.hpp +++ b/nautilus/src/nautilus/compiler/ir/IRGraph.hpp @@ -3,7 +3,6 @@ #include "nautilus/JITCompiler.hpp" #include -#include #include namespace nautilus::compiler::ir { @@ -21,13 +20,11 @@ class IRGraph { std::unique_ptr& addRootOperation(std::unique_ptr rootOperation); - FunctionOperation* getRootOperation(); + const FunctionOperation& getRootOperation() const; + std::string toString() const; - [[nodiscard]] std::string toString() const; [[nodiscard]] const CompilationUnitID& getId() const; - friend std::ostream& operator<<(std::ostream& os, const IRGraph& graph); - private: std::unique_ptr rootOperation; const CompilationUnitID id; diff --git a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.cpp b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.cpp index d849330e..b2711b0f 100644 --- a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.cpp +++ b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.cpp @@ -4,13 +4,4 @@ namespace nautilus::compiler::ir { BasicBlockArgument::BasicBlockArgument(const OperationIdentifier identifier, Type stamp) : Operation(OperationType::BasicBlockArgument, identifier, stamp) { } - -std::ostream& operator<<(std::ostream& os, const BasicBlockArgument& argument) { - os << argument.identifier; - return os; -} - -std::string BasicBlockArgument::toString() { - return identifier.toString(); -} } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.hpp b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.hpp index 55e8dc97..098893ae 100644 --- a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.hpp +++ b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockArgument.hpp @@ -15,7 +15,6 @@ class BasicBlockArgument : public Operation { friend std::ostream& operator<<(std::ostream& os, const BasicBlockArgument& argument); - std::string toString() override; }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.cpp b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.cpp index 1ad03dc8..6b92d1d3 100644 --- a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.cpp +++ b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.cpp @@ -55,8 +55,4 @@ const std::vector& BasicBlockInvocation::getArguments() const { return operations; } -std::string BasicBlockInvocation::toString() { - return "BasicBlockInvocation"; -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.hpp b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.hpp index 349b8f9d..ddbb3286 100644 --- a/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.hpp +++ b/nautilus/src/nautilus/compiler/ir/blocks/BasicBlockInvocation.hpp @@ -30,7 +30,6 @@ class BasicBlockInvocation : public Operation { */ int getOperationArgIndex(Operation*); - std::string toString() override; private: BasicBlock* basicBlock; diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.cpp index 4bdd59e0..273eab52 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.cpp @@ -6,10 +6,6 @@ namespace nautilus::compiler::ir { AddOperation::AddOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::AddOp, identifier, leftInput->getStamp(), leftInput, rightInput) { } -std::string AddOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " + " + getRightInput()->getIdentifier().toString(); -} - bool AddOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::AddOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.hpp index 713696ac..42e7f658 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.hpp @@ -9,8 +9,6 @@ class AddOperation final : public BinaryOperation { ~AddOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.cpp index e268d13f..93bcf0b8 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.cpp @@ -6,10 +6,6 @@ namespace nautilus::compiler::ir { DivOperation::DivOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::DivOp, identifier, leftInput->getStamp(), leftInput, rightInput) { } -std::string DivOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " / " + getRightInput()->getIdentifier().toString(); -} - bool DivOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::DivOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.hpp index 125e4709..43f94a4d 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.hpp @@ -9,8 +9,6 @@ class DivOperation final : public BinaryOperation { ~DivOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.cpp index 3a0e009a..f12a2b09 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.cpp @@ -7,10 +7,6 @@ namespace nautilus::compiler::ir { ModOperation::ModOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::ModOp, identifier, leftInput->getStamp(), leftInput, rightInput) { } -std::string ModOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " % " + getRightInput()->getIdentifier().toString(); -} - bool ModOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::DivOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.hpp index 472b99a3..7f620f96 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/ModOperation.hpp @@ -11,8 +11,6 @@ class ModOperation final : public BinaryOperation { ~ModOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.cpp index c9ffc95c..6b85f26e 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.cpp @@ -7,10 +7,6 @@ namespace nautilus::compiler::ir { MulOperation::MulOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::MulOp, identifier, leftInput->getStamp(), leftInput, rightInput) { } -std::string MulOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " * " + getRightInput()->getIdentifier().toString(); -} - bool MulOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::MulOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.hpp index ff1ebbde..60bb6ac4 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.hpp @@ -10,8 +10,6 @@ class MulOperation final : public BinaryOperation { ~MulOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.cpp index 6d6f8324..30f166d8 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.cpp @@ -6,10 +6,6 @@ namespace nautilus::compiler::ir { SubOperation::SubOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::SubOp, identifier, leftInput->getStamp(), leftInput, rightInput) { } -std::string SubOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " - " + getRightInput()->getIdentifier().toString(); -} - bool SubOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::SubOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.hpp index ee1bef3e..cbefcbd4 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.hpp @@ -11,8 +11,6 @@ class SubOperation final : public BinaryOperation { ~SubOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.cpp index 6758f68b..a4d3329a 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.cpp @@ -8,24 +8,6 @@ BinaryCompOperation::BinaryCompOperation(OperationIdentifier identifier, Operati : BinaryOperation(OperationType::BinaryComp, identifier, leftInput->getStamp(), leftInput, rightInput), type(type) { } -std::string BinaryCompOperation::toString() { - - std::string opSymbol; - switch (type) { - case BAND: - opSymbol = " & "; - break; - case BOR: - opSymbol = " | "; - break; - case XOR: - opSymbol = " ^ "; - break; - } - - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + opSymbol + getRightInput()->getIdentifier().toString(); -} - BinaryCompOperation::Type BinaryCompOperation::getType() const { return type; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.hpp index d4926508..ddd85cde 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/BinaryCompOperation.hpp @@ -14,8 +14,6 @@ class BinaryCompOperation final : public BinaryOperation { ~BinaryCompOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); Type getType() const; diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.cpp index eaa795b8..a9f5f8e3 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.cpp @@ -6,15 +6,11 @@ namespace nautilus::compiler::ir { NegateOperation::NegateOperation(OperationIdentifier identifier, Operation* input) : Operation(OperationType::NegateOp, identifier, input->getStamp(), {input}) { } -std::string NegateOperation::toString() { - return identifier.toString() + "= ~" + getInput()->getIdentifier().toString(); -} - bool NegateOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::NegateOp; } -Operation* NegateOperation::getInput() { +Operation* NegateOperation::getInput() const { return inputs[0]; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp index 5c11fe22..3f75759f 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp @@ -9,12 +9,10 @@ class NegateOperation : public Operation { ~NegateOperation() override = default; - Operation* getInput(); + Operation* getInput() const; void setInput(Operation* newInput); - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.cpp index 50f9b816..1ded5d46 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.cpp @@ -7,14 +7,6 @@ namespace nautilus::compiler::ir { ShiftOperation::ShiftOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput, ShiftType type) : BinaryOperation(OperationType::ShiftOp, identifier, leftInput->getStamp(), leftInput, rightInput), type(type) { } -std::string ShiftOperation::toString() { - if (type == LS) { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " << " + getRightInput()->getIdentifier().toString(); - } else { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " >> " + getRightInput()->getIdentifier().toString(); - } -} - ShiftOperation::ShiftType ShiftOperation::getType() const { return type; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.hpp index 44c69e36..7fe33b2b 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BinaryOperations/ShiftOperation.hpp @@ -13,8 +13,6 @@ class ShiftOperation final : public BinaryOperation { ~ShiftOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); ShiftType getType() const; diff --git a/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.cpp index 19a62bcd..52984368 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.cpp @@ -7,19 +7,12 @@ namespace nautilus::compiler::ir { BranchOperation::BranchOperation() : Operation(OperationType::BranchOp, Type::v), basicBlock() { } -BasicBlockInvocation& BranchOperation::getNextBlockInvocation() { +const BasicBlockInvocation& BranchOperation::getNextBlockInvocation() const { return basicBlock; } -std::string BranchOperation::toString() { - std::string baseString = "br Block_" + basicBlock.getBlock()->getIdentifier() + "("; - if (!basicBlock.getBlock()->getArguments().empty()) { - baseString += basicBlock.getArguments().at(0)->getIdentifier().toString(); - for (int i = 1; i < (int) basicBlock.getArguments().size(); ++i) { - baseString += ", " + basicBlock.getArguments().at(i)->getIdentifier().toString(); - } - } - return baseString + ")"; +BasicBlockInvocation& BranchOperation::getNextBlockInvocation() { + return basicBlock; } bool BranchOperation::classof(const Operation* Op) { diff --git a/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.hpp index ae44f447..96c19b8a 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/BranchOperation.hpp @@ -13,10 +13,9 @@ class BranchOperation : public Operation { ~BranchOperation() override = default; + const BasicBlockInvocation& getNextBlockInvocation()const; BasicBlockInvocation& getNextBlockInvocation(); - std::string toString() override; - static bool classof(const Operation* Op); private: diff --git a/nautilus/src/nautilus/compiler/ir/operations/CastOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/CastOperation.cpp index 9d539bda..22538b46 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/CastOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/CastOperation.cpp @@ -6,7 +6,7 @@ namespace nautilus::compiler::ir { CastOperation::CastOperation(OperationIdentifier identifier, Operation* input, Type targetStamp) : Operation(OperationType::CastOp, identifier, targetStamp, {input}) { } -Operation* CastOperation::getInput() { +Operation* CastOperation::getInput() const { return inputs[0]; } @@ -14,8 +14,4 @@ void CastOperation::setInput(Operation* newInput) { this->inputs[0] = newInput; } -std::string CastOperation::toString() { - return identifier.toString() + " = " + getInput()->getIdentifier().toString() + " cast_to " + nautilus::toString(getStamp()); -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/CastOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/CastOperation.hpp index 9d29d776..d37328c8 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/CastOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/CastOperation.hpp @@ -11,9 +11,7 @@ class CastOperation : public Operation { ~CastOperation() override = default; - std::string toString() override; - - Operation* getInput(); + Operation* getInput() const; void setInput(Operation* newInput); }; diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.cpp index a26c59e4..70986285 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.cpp @@ -8,7 +8,7 @@ namespace nautilus::compiler::ir { ConstBooleanOperation::ConstBooleanOperation(OperationIdentifier identifier, bool constantValue) : Operation(OperationType::ConstBooleanOp, identifier, Type::b), constantValue(constantValue) { } -bool ConstBooleanOperation::getValue() { +bool ConstBooleanOperation::getValue() const { return constantValue; } @@ -16,8 +16,4 @@ bool ConstBooleanOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::ConstBooleanOp; } -std::string ConstBooleanOperation::toString() { - return identifier.toString() + " = " + std::to_string(constantValue); -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.hpp index 4e8ecceb..42243955 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstBooleanOperation.hpp @@ -11,9 +11,7 @@ class ConstBooleanOperation : public Operation { ~ConstBooleanOperation() override = default; - bool getValue(); - - std::string toString() override; + bool getValue() const; static bool classof(const Operation* Op); diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.cpp index 1b71f232..f6244584 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.cpp @@ -8,7 +8,7 @@ namespace nautilus::compiler::ir { ConstFloatOperation::ConstFloatOperation(OperationIdentifier identifier, double constantValue, Type stamp) : Operation(OperationType::ConstFloatOp, identifier, stamp), constantValue(constantValue) { } -double ConstFloatOperation::getValue() { +double ConstFloatOperation::getValue() const { return constantValue; } @@ -16,8 +16,4 @@ bool ConstFloatOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::ConstIntOp; } -std::string ConstFloatOperation::toString() { - return identifier.toString() + " = " + std::to_string(constantValue); -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.hpp index d02badf8..d9302ee1 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstFloatOperation.hpp @@ -11,13 +11,11 @@ class ConstFloatOperation : public Operation { ~ConstFloatOperation() override = default; - double getValue(); + double getValue() const; template T getFloatViaType(); - std::string toString() override; - static bool classof(const Operation* Op); private: diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.cpp index 93f72eb5..b1f2285b 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.cpp @@ -9,7 +9,7 @@ namespace nautilus::compiler::ir { ConstIntOperation::ConstIntOperation(OperationIdentifier identifier, int64_t constantValue, Type stamp) : Operation(OperationType::ConstIntOp, identifier, stamp), constantValue(constantValue) { } -int64_t ConstIntOperation::getValue() { +int64_t ConstIntOperation::getValue() const { return constantValue; } @@ -17,8 +17,4 @@ bool ConstIntOperation::classof(const Operation*) { return false; } -std::string ConstIntOperation::toString() { - return identifier.toString() + " = " + std::to_string(constantValue); -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.hpp index 302b3e8e..4f79ad07 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstIntOperation.hpp @@ -10,13 +10,11 @@ class ConstIntOperation : public Operation { ~ConstIntOperation() override = default; - int64_t getValue(); + int64_t getValue() const ; template T getIntegerViaType(); - std::string toString() override; - static bool classof(const Operation* Op); private: diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.cpp index f6034db6..f8685e48 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.cpp @@ -9,7 +9,7 @@ namespace nautilus::compiler::ir { ConstPtrOperation::ConstPtrOperation(OperationIdentifier identifier, void* constantValue) : Operation(OperationType::ConstPtrOp, identifier, Type::ptr), constantValue(constantValue) { } -void* ConstPtrOperation::getValue() { +void* ConstPtrOperation::getValue() const { return constantValue; } @@ -17,8 +17,4 @@ bool ConstPtrOperation::classof(const Operation*) { return false; } -std::string ConstPtrOperation::toString() { - return identifier.toString() + " = ptr"; -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.hpp index c1030356..63288dc5 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ConstPtrOperation.hpp @@ -11,9 +11,7 @@ class ConstPtrOperation : public Operation { ~ConstPtrOperation() override = default; - void* getValue(); - - std::string toString() override; + void* getValue() const; static bool classof(const Operation* Op); diff --git a/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.cpp index 548e277c..dd4d82a2 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.cpp @@ -12,27 +12,20 @@ const std::string& FunctionOperation::getName() const { return name; } -BasicBlock* FunctionOperation::getFunctionBasicBlock() { - return functionBasicBlocks[0].get(); +const BasicBlock& FunctionOperation::getFunctionBasicBlock() const { + return *functionBasicBlocks.front(); } const std::vector& FunctionOperation::getInputArgs() const { return inputArgs; } -Type FunctionOperation::getOutputArg() const { - return getStamp(); +const std::vector>& FunctionOperation::getBasicBlocks() const { + return functionBasicBlocks; } -std::string FunctionOperation::toString() { - std::string baseString = name + '('; - if (inputArgNames.size() > 0) { - baseString += inputArgNames[0]; - for (int i = 1; i < (int) inputArgNames.size(); ++i) { - baseString += ", " + inputArgNames.at(i); - } - } - return baseString + ')'; +Type FunctionOperation::getOutputArg() const { + return getStamp(); } bool FunctionOperation::classof(const Operation* Op) { diff --git a/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.hpp index f5102290..5ad9b9f1 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/FunctionOperation.hpp @@ -7,8 +7,7 @@ namespace nautilus::compiler::ir { class FunctionOperation : public Operation { public: - explicit FunctionOperation(std::string name, std::vector>& functionBasicBlocks, - std::vector inputArgs, std::vector inputArgNames, Type outputArg); + explicit FunctionOperation(std::string name, std::vector>& functionBasicBlocks, std::vector inputArgs, std::vector inputArgNames, Type outputArg); ~FunctionOperation() override = default; @@ -16,7 +15,8 @@ class FunctionOperation : public Operation { BasicBlock* addFunctionBasicBlock(BasicBlockPtr functionBasicBlock); - BasicBlock* getFunctionBasicBlock(); + const BasicBlock& getFunctionBasicBlock() const; + const std::vector>& getBasicBlocks() const; [[nodiscard]] const std::vector& getInputArgs() const; @@ -24,8 +24,6 @@ class FunctionOperation : public Operation { [[nodiscard]] const std::vector& getInputArgNames() const; - std::string toString() override; - static bool classof(const Operation* Op); private: diff --git a/nautilus/src/nautilus/compiler/ir/operations/IfOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/IfOperation.cpp index 352d9150..a94b8c7a 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/IfOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/IfOperation.cpp @@ -6,14 +6,22 @@ namespace nautilus::compiler::ir { IfOperation::IfOperation(Operation* booleanValue) : Operation(Operation::OperationType::IfOp, Type::v, {booleanValue}) { } -Operation* IfOperation::getValue() { +Operation* IfOperation::getValue() const { return inputs[0]; } +const BasicBlockInvocation& IfOperation::getTrueBlockInvocation() const { + return trueBlockInvocation; +} + BasicBlockInvocation& IfOperation::getTrueBlockInvocation() { return trueBlockInvocation; } +const BasicBlockInvocation& IfOperation::getFalseBlockInvocation() const { + return falseBlockInvocation; +} + BasicBlockInvocation& IfOperation::getFalseBlockInvocation() { return falseBlockInvocation; } @@ -42,28 +50,6 @@ void IfOperation::setMergeBlock(BasicBlockPtr mergeBlock) { this->mergeBlock = mergeBlock; } -std::string IfOperation::toString() { - std::string baseString = "if " + getValue()->getIdentifier().toString() + " ? Block_" + trueBlockInvocation.getBlock()->getIdentifier() + '('; - // "if " + comparatorOp->getIdentifier() + " ? Block_" + - // trueBlockInvocation.getBlock()->getIdentifier() + '('; - if (trueBlockInvocation.getArguments().size() > 0) { - baseString += trueBlockInvocation.getArguments()[0]->getIdentifier().toString(); - for (int i = 1; i < (int) trueBlockInvocation.getArguments().size(); ++i) { - baseString += ", " + trueBlockInvocation.getArguments().at(i)->getIdentifier().toString(); - } - } - if (falseBlockInvocation.getBlock()) { - baseString += ") : Block_" + falseBlockInvocation.getBlock()->getIdentifier() + '('; - if (falseBlockInvocation.getArguments().size() > 0) { - baseString += falseBlockInvocation.getArguments()[0]->getIdentifier().toString(); - for (int i = 1; i < (int) falseBlockInvocation.getArguments().size(); ++i) { - baseString += ", " + falseBlockInvocation.getArguments().at(i)->getIdentifier().toString(); - } - } - } - return baseString += ')'; -} - bool IfOperation::hasFalseCase() { return this->falseBlockInvocation.getBlock() != nullptr; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/IfOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/IfOperation.hpp index 61b189ec..a42bfa2e 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/IfOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/IfOperation.hpp @@ -11,7 +11,7 @@ class IfOperation : public Operation { ~IfOperation() override = default; - Operation* getValue(); + Operation* getValue() const; BasicBlockPtr getMergeBlock(); @@ -22,8 +22,9 @@ class IfOperation : public Operation { void setMergeBlock(BasicBlockPtr mergeBlock); BasicBlockInvocation& getTrueBlockInvocation(); - + const BasicBlockInvocation& getTrueBlockInvocation() const; BasicBlockInvocation& getFalseBlockInvocation(); + const BasicBlockInvocation& getFalseBlockInvocation() const; void setTrueBlockInvocation(BasicBlock* trueBlockInvocation); @@ -31,8 +32,6 @@ class IfOperation : public Operation { bool hasFalseCase(); - std::string toString() override; - private: BasicBlockInvocation trueBlockInvocation; BasicBlockInvocation falseBlockInvocation; diff --git a/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.cpp index bb3f5de3..065739a5 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.cpp @@ -6,12 +6,8 @@ namespace nautilus::compiler::ir { LoadOperation::LoadOperation(const OperationIdentifier& identifier, Operation* address, Type type) : Operation(OperationType::LoadOp, identifier, type, {address}) { } -const Operation* LoadOperation::getAddress() { +const Operation* LoadOperation::getAddress() const { return inputs[0]; } -std::string LoadOperation::toString() { - return identifier.toString() + " = load(" + getAddress()->getIdentifier().toString() + ")"; -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.hpp index 1ef6071a..7add1b6d 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LoadOperation.hpp @@ -9,8 +9,6 @@ class LoadOperation : public Operation { ~LoadOperation() override = default; - const Operation* getAddress(); - - std::string toString() override; + const Operation* getAddress() const; }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.cpp index f5312ea3..0bab970c 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.cpp @@ -6,10 +6,6 @@ namespace nautilus::compiler::ir { AndOperation::AndOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::AndOp, identifier, Type::b, leftInput, rightInput) { } -std::string AndOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " and " + getRightInput()->getIdentifier().toString(); -} - bool AndOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::AddOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.hpp index 4a9f3ba0..e6e3c26d 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/AndOperation.hpp @@ -9,8 +9,6 @@ class AndOperation : public BinaryOperation { ~AndOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.cpp index b1f7a89b..10893781 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.cpp @@ -7,7 +7,7 @@ CompareOperation::CompareOperation(OperationIdentifier identifier, Operation* le : BinaryOperation(Operation::OperationType::CompareOp, identifier, Type::b, leftInput, rightInput), comparator(comparator) { } -CompareOperation::Comparator CompareOperation::getComparator() { +CompareOperation::Comparator CompareOperation::getComparator() const { return comparator; } @@ -61,8 +61,4 @@ std::string CompareOperation::getComparatorAsString() { return ""; } -std::string CompareOperation::toString() { - return identifier.toString() + " = " + getLeftInput()->getIdentifier().toString() + " " + getComparatorAsString() + " " + getRightInput()->getIdentifier().toString(); -} - } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp index 7a29054f..a886c128 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp @@ -18,7 +18,7 @@ class CompareOperation : public BinaryOperation { ~CompareOperation() override = default; - Comparator getComparator(); + Comparator getComparator() const; bool isLessThan(); @@ -38,8 +38,6 @@ class CompareOperation : public BinaryOperation { std::string getComparatorAsString(); - std::string toString() override; - private: Comparator comparator; }; diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.cpp index 32d72405..0acb3f08 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.cpp @@ -6,15 +6,11 @@ namespace nautilus::compiler::ir { NotOperation::NotOperation(OperationIdentifier identifier, Operation* input) : Operation(OperationType::NotOp, identifier, Type::b, {input}) { } -std::string NotOperation::toString() { - return identifier.toString() + "= !" + getInput()->getIdentifier().toString(); -} - bool NotOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::NotOp; } -Operation* NotOperation::getInput() { +Operation* NotOperation::getInput() const { return inputs[0]; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.hpp index 59c56c9f..5c814fda 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/NotOperation.hpp @@ -9,12 +9,10 @@ class NotOperation : public Operation { ~NotOperation() override = default; - Operation* getInput(); + Operation* getInput() const; void setInput(Operation* newInput); - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.cpp index 7147c80c..6f5f8dad 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.cpp @@ -6,11 +6,6 @@ namespace nautilus::compiler::ir { OrOperation::OrOperation(OperationIdentifier identifier, Operation* leftInput, Operation* rightInput) : BinaryOperation(OperationType::OrOp, identifier, Type::b, leftInput, rightInput) { } -std::string OrOperation::toString() { - return getIdentifier().toString() + " = " + getLeftInput()->getIdentifier().toString() + " or " + getRightInput()->getIdentifier().toString(); - ; -} - bool OrOperation::classof(const Operation* Op) { return Op->getOperationType() == OperationType::AddOp; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.hpp index 3665f087..85509517 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/LogicalOperations/OrOperation.hpp @@ -9,8 +9,6 @@ class OrOperation : public BinaryOperation { ~OrOperation() override = default; - std::string toString() override; - bool classof(const Operation* Op); }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/Operation.cpp b/nautilus/src/nautilus/compiler/ir/operations/Operation.cpp index d68f7261..b94771a2 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/Operation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/Operation.cpp @@ -1,21 +1,5 @@ #include "nautilus/compiler/ir/operations/Operation.hpp" -#include "nautilus/compiler/ir/operations/ArithmeticOperations/AddOperation.hpp" -#include "nautilus/compiler/ir/operations/ArithmeticOperations/DivOperation.hpp" -#include "nautilus/compiler/ir/operations/ArithmeticOperations/MulOperation.hpp" -#include "nautilus/compiler/ir/operations/ArithmeticOperations/SubOperation.hpp" -#include "nautilus/compiler/ir/operations/BinaryOperations/NegateOperation.hpp" -#include "nautilus/compiler/ir/operations/BranchOperation.hpp" -#include "nautilus/compiler/ir/operations/CastOperation.hpp" -#include "nautilus/compiler/ir/operations/IfOperation.hpp" -#include "nautilus/compiler/ir/operations/LoadOperation.hpp" -#include "nautilus/compiler/ir/operations/LogicalOperations/AndOperation.hpp" -#include "nautilus/compiler/ir/operations/LogicalOperations/CompareOperation.hpp" -#include "nautilus/compiler/ir/operations/LogicalOperations/OrOperation.hpp" -#include "nautilus/compiler/ir/operations/ProxyCallOperation.hpp" -#include "nautilus/compiler/ir/operations/ReturnOperation.hpp" -#include "nautilus/compiler/ir/operations/StoreOperation.hpp" -#include namespace nautilus::compiler::ir { Operation::Operation(OperationType opType, const OperationIdentifier& identifier, Type stamp, const std::vector& inputs) : opType(opType), identifier(identifier), stamp(stamp), inputs(inputs) { @@ -41,9 +25,8 @@ const Type& Operation::getStamp() const { OperationIdentifier::OperationIdentifier(uint32_t ir) : id(ir) { } -std::ostream& operator<<(std::ostream& os, const OperationIdentifier& identifier) { - os << identifier.id; - return os; +uint32_t OperationIdentifier::getId() const { + return id; } bool OperationIdentifier::operator==(const OperationIdentifier& rhs) const { @@ -83,11 +66,11 @@ bool Operation::isConstOperation() const { BinaryOperation::BinaryOperation(OperationType opType, const OperationIdentifier& identifier, Type type, Operation* left, Operation* right) : Operation(opType, identifier, type, {left, right}) { } -Operation* BinaryOperation::getLeftInput() { +Operation* BinaryOperation::getLeftInput() const { return inputs[0]; } -Operation* BinaryOperation::getRightInput() { +Operation* BinaryOperation::getRightInput() const { return inputs[1]; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/Operation.hpp b/nautilus/src/nautilus/compiler/ir/operations/Operation.hpp index a03aca20..c093970e 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/Operation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/Operation.hpp @@ -4,7 +4,7 @@ #include "nautilus/tracing/Types.hpp" #include #include -#include +#include #include namespace nautilus::compiler::ir { @@ -13,8 +13,6 @@ class OperationIdentifier { public: OperationIdentifier(uint32_t id); - friend std::ostream& operator<<(std::ostream& os, const OperationIdentifier& identifier); - bool operator==(const OperationIdentifier& rhs) const; bool operator!=(const OperationIdentifier& rhs) const; @@ -31,6 +29,8 @@ class OperationIdentifier { bool operator>=(const OperationIdentifier& rhs) const; + uint32_t getId() const; + private: uint32_t id; }; @@ -68,8 +68,7 @@ class Operation { ShiftOp, }; - explicit Operation(OperationType opType, const OperationIdentifier& identifier, Type type, - const std::vector& inputs = {}); + explicit Operation(OperationType opType, const OperationIdentifier& identifier, Type type, const std::vector& inputs = {}); explicit Operation(OperationType opType, Type type, const std::vector& inputs = {}); @@ -77,8 +76,6 @@ class Operation { const OperationIdentifier& getIdentifier() const; - virtual std::string toString() = 0; - OperationType getOperationType() const; // std::string getOperationTypeAsString() const; @@ -90,6 +87,11 @@ class Operation { void replaceInput(Operation* toReplace, std::shared_ptr replaceWith); + template + const OP* dynCast() const { + return dynamic_cast(this); + } + protected: const OperationType opType; const OperationIdentifier identifier; @@ -109,18 +111,15 @@ T* as(const std::unique_ptr& op) { class BinaryOperation : public Operation { public: - BinaryOperation(OperationType opType, const OperationIdentifier& identifier, Type type, Operation* left, - Operation* right); + BinaryOperation(OperationType opType, const OperationIdentifier& identifier, Type type, Operation* left, Operation* right); - Operation* getLeftInput(); + Operation* getLeftInput() const; - Operation* getRightInput(); + Operation* getRightInput() const; void setLeftInput(Operation* newLeftInput); void setRightInput(Operation* newRightInput); - - virtual std::string toString() = 0; }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.cpp index 6b36450b..4d2199af 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.cpp @@ -18,33 +18,11 @@ void ProxyCallOperation::setInputArguments(std::vector& newInputArgu this->inputs = newInputArguments; } -std::string ProxyCallOperation::toString() { - std::string baseString = ""; - if (!identifier.toString().empty()) { - baseString = identifier.toString() + " = "; - } - baseString = baseString + getFunctionName() + "("; - if (!inputs.empty()) { - // baseString += inputArguments[0].lock()->getIdentifier().toString(); - // for (int i = 1; i < (int) inputArguments.size(); ++i) { - // baseString += ", " + - // inputArguments.at(i).lock()->getIdentifier().toString(); - - baseString += inputs[0]->getIdentifier().toString(); - // baseString += inputArguments[0].lock()->getIdentifier(); - for (int i = 1; i < (int) inputs.size(); ++i) { - baseString += ", " + inputs.at(i)->getIdentifier().toString(); - // baseString += ", " + inputArguments.at(i).lock()->getIdentifier(); - } - } - return baseString + ")"; -} - -const std::string& ProxyCallOperation::getFunctionName() { +const std::string& ProxyCallOperation::getFunctionName() const { return functionName; } -const std::string& ProxyCallOperation::getFunctionSymbol() { +const std::string& ProxyCallOperation::getFunctionSymbol() const { return mangedFunctionSymbol; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.hpp index f817898f..85e723f0 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ProxyCallOperation.hpp @@ -1,6 +1,7 @@ #include "nautilus/compiler/ir/operations/Operation.hpp" #include +#include namespace nautilus::compiler::ir { class ProxyCallOperation : public Operation { @@ -15,11 +16,8 @@ class ProxyCallOperation : public Operation { void setInputArguments(std::vector& newInputArguments); - const std::string& getFunctionSymbol(); - const std::string& getFunctionName(); - - std::string toString() override; - + const std::string& getFunctionSymbol() const; + const std::string& getFunctionName() const; void* getFunctionPtr(); private: diff --git a/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.cpp index fd5d8409..aae6dc58 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.cpp @@ -10,15 +10,7 @@ ReturnOperation::ReturnOperation() : Operation(Operation::OperationType::ReturnO ReturnOperation::ReturnOperation(Operation* returnValue) : Operation(Operation::OperationType::ReturnOp, returnValue->getStamp(), {returnValue}) { } -std::string ReturnOperation::toString() { - if (hasReturnValue()) { - return "return (" + getReturnValue()->getIdentifier().toString() + ")"; - } else { - return "return"; - } -} - -Operation* ReturnOperation::getReturnValue() { +Operation* ReturnOperation::getReturnValue() const { return inputs[0]; } @@ -26,7 +18,7 @@ void ReturnOperation::setReturnValue(Operation* newReturnValue) { inputs[0] = newReturnValue; } -bool ReturnOperation::hasReturnValue() { +bool ReturnOperation::hasReturnValue() const { return stamp != Type::v; } diff --git a/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.hpp index b1238f48..2fb77405 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/ReturnOperation.hpp @@ -12,12 +12,10 @@ class ReturnOperation : public Operation { ~ReturnOperation() override = default; - Operation* getReturnValue(); + Operation* getReturnValue() const; void setReturnValue(Operation* newReturnValue); - bool hasReturnValue(); - - std::string toString() override; + bool hasReturnValue() const; }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.cpp b/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.cpp index cc231d8f..a043188b 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.cpp +++ b/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.cpp @@ -7,11 +7,11 @@ namespace nautilus::compiler::ir { StoreOperation::StoreOperation(Operation* value, Operation* address) : Operation(OperationType::StoreOp, Type::v, {value, address}) { } -Operation* StoreOperation::getValue() { +Operation* StoreOperation::getValue() const { return inputs[0]; } -Operation* StoreOperation::getAddress() { +Operation* StoreOperation::getAddress() const { return inputs[1]; } @@ -23,7 +23,4 @@ void StoreOperation::setAddress(Operation* newAddress) { inputs[1] = newAddress; } -std::string StoreOperation::toString() { - return "store(" + getValue()->getIdentifier().toString() + ", " + getAddress()->getIdentifier().toString() + ")"; -} } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.hpp b/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.hpp index b0eb9d5b..82d0f234 100644 --- a/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.hpp +++ b/nautilus/src/nautilus/compiler/ir/operations/StoreOperation.hpp @@ -10,14 +10,13 @@ class StoreOperation : public Operation { ~StoreOperation() override = default; - Operation* getValue(); + Operation* getValue() const; - Operation* getAddress(); + Operation* getAddress() const; void setValue(Operation* newValue); void setAddress(Operation* newAddress); - std::string toString() override; }; } // namespace nautilus::compiler::ir diff --git a/nautilus/src/nautilus/tracing/Block.cpp b/nautilus/src/nautilus/tracing/Block.cpp index 0ab8a826..a7738ea6 100644 --- a/nautilus/src/nautilus/tracing/Block.cpp +++ b/nautilus/src/nautilus/tracing/Block.cpp @@ -1,4 +1,5 @@ #include "nautilus/tracing/Block.hpp" +#include "nautilus/tracing/TraceOperation.hpp" #include "nautilus/tracing/TracingUtil.hpp" #include "nautilus/tracing/Types.hpp" @@ -20,26 +21,4 @@ void Block::addArgument(TypedValueRef ref) { } } -std::ostream& operator<<(std::ostream& os, const Block& block) { - - os << "("; - for (size_t i = 0; i < block.arguments.size(); i++) { - if (i != 0) { - os << ","; - } - os << "$" << block.arguments[i].ref << ":" << toString(block.arguments[i].type); - } - os << ")"; - if (block.type == Block::Type::ControlFlowMerge) { - os << " ControlFlowMerge"; - } - os << "\n"; - for (const auto& operation : block.operations) { - if (operation.op != FREE) { - os << "\t" << operation << "\n"; - } - } - return os; -} - } // namespace nautilus::tracing diff --git a/nautilus/src/nautilus/tracing/Block.hpp b/nautilus/src/nautilus/tracing/Block.hpp index 3dc74b88..4e6bfce8 100644 --- a/nautilus/src/nautilus/tracing/Block.hpp +++ b/nautilus/src/nautilus/tracing/Block.hpp @@ -4,7 +4,6 @@ #include "TraceOperation.hpp" #include "nautilus/tracing/TracingUtil.hpp" #include -#include #include namespace nautilus::tracing { @@ -38,8 +37,6 @@ class Block { */ void addArgument(TypedValueRef ref); - friend std::ostream& operator<<(std::ostream& os, const Block& block); - /** * @brief defines the id of this block. */ @@ -67,3 +64,5 @@ class Block { }; } // namespace nautilus::tracing + + diff --git a/nautilus/src/nautilus/tracing/ExecutionTrace.cpp b/nautilus/src/nautilus/tracing/ExecutionTrace.cpp index 1ae25643..201b0975 100644 --- a/nautilus/src/nautilus/tracing/ExecutionTrace.cpp +++ b/nautilus/src/nautilus/tracing/ExecutionTrace.cpp @@ -2,8 +2,7 @@ #include "nautilus/tracing/ExecutionTrace.hpp" #include "nautilus/tracing/symbolic_execution/TraceTerminationException.hpp" #include -#include -#include +#include namespace nautilus::tracing { @@ -239,18 +238,119 @@ void ExecutionTrace::addTag(Snapshot& snapshot, operation_identifier& identifier localTagMap[snapshot] = identifier; } -std::string ExecutionTrace::toString() const { - std::stringstream ss; - ss << *this; - return ss.str(); +} // namespace nautilus::tracing + +std::string nautilus::tracing::ExecutionTrace::toString() const { + return fmt::to_string(*this); } -std::ostream& operator<<(std::ostream& os, const ExecutionTrace& executionTrace) { - for (size_t i = 0; i < executionTrace.blocks.size(); i++) { - os << "B" << i; - os << executionTrace.blocks[i]; +namespace fmt { +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::ExecutionTrace& trace, format_context& ctx) -> format_context::iterator; +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::Block& trace, format_context& ctx) -> format_context::iterator; +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::TraceOperation& trace, format_context& ctx) -> format_context::iterator; +}; + +auto formatter::format(const nautilus::tracing::ExecutionTrace& trace, fmt::format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + for (size_t i = 0; i < trace.blocks.size(); i++) { + fmt::format_to(out, "B{}{}", i, trace.blocks[i]); } - return os; + return out; } -} // namespace nautilus::tracing +auto formatter::format(const nautilus::tracing::Block& block, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "("); + for (size_t i = 0; i < block.arguments.size(); i++) { + if (i != 0) { + fmt::format_to(out, ","); + } + fmt::format_to(out, "${}:{}", block.arguments[i].ref, toString(block.arguments[i].type)); + } + fmt::format_to(out, ")"); + if (block.type == nautilus::tracing::Block::Type::ControlFlowMerge) { + fmt::format_to(out, " ControlFlowMerge"); + } + fmt::format_to(out, "\n"); + for (const auto& operation : block.operations) { + fmt::format_to(out, "{}\n", operation); + } + return out; +} + +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::TypedValueRef& typeValRef, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "${}", typeValRef.ref); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::BlockRef& ref, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "B{}(", ref.block); + for (size_t i = 0; i < ref.arguments.size(); i++) { + if (i != 0) { + fmt::format_to(out, ","); + } + fmt::format_to(out, "{}", ref.arguments[i]); + } + fmt::format_to(out, ")"); + return out; + } +}; + +template <> +struct formatter : formatter { + static auto format(const nautilus::tracing::FunctionCall& call, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "{}(", call.functionName); + for (size_t i = 0; i < call.arguments.size(); i++) { + if (i != 0) { + fmt::format_to(out, ","); + } + fmt::format_to(out, "{}", call.arguments[i]); + } + fmt::format_to(out, ")"); + return out; + } +}; + +template <> +struct formatter : formatter { + auto format(nautilus::ConstantLiteral c, format_context& ctx) const -> format_context::iterator; +}; + +auto formatter::format(const nautilus::tracing::TraceOperation& operation, format_context& ctx) -> format_context::iterator { + auto out = ctx.out(); + fmt::format_to(out, "\t{}\t", toString(operation.op)); + fmt::format_to(out, "{}\t", operation.resultRef); + for (const auto& opInput : operation.input) { + if (auto inputRef = std::get_if(&opInput)) { + fmt::format_to(out, "{}\t", *inputRef); + } else if (auto blockRef = std::get_if(&opInput)) { + fmt::format_to(out, "{}\t", *blockRef); + } else if (auto fCall = std::get_if(&opInput)) { + fmt::format_to(out, "{}\t", *fCall); + } else if (auto constant = std::get_if(&opInput)) { + fmt::format_to(out, "{}", *constant); + } + } + fmt::format_to(out, ":{}", toString(operation.resultType)); + return out; +} + +} // namespace fmt diff --git a/nautilus/src/nautilus/tracing/ExecutionTrace.hpp b/nautilus/src/nautilus/tracing/ExecutionTrace.hpp index c4bccc5c..77fef459 100644 --- a/nautilus/src/nautilus/tracing/ExecutionTrace.hpp +++ b/nautilus/src/nautilus/tracing/ExecutionTrace.hpp @@ -18,8 +18,7 @@ class ExecutionTrace { ~ExecutionTrace() = default; - value_ref addOperationWithResult(Snapshot& snapshot, Op& operation, Type& resultType, - std::vector&& inputs); + value_ref addOperationWithResult(Snapshot& snapshot, Op& operation, Type& resultType, std::vector&& inputs); void addCmpOperation(Snapshot& snapshot, value_ref inputs); @@ -78,8 +77,7 @@ class ExecutionTrace { return currentBlockIndex; } - void addOperation(Snapshot& snapshot, Op& operation, Type& resultType, nautilus::tracing::value_ref targetRef, - nautilus::tracing::value_ref srcRef); + void addOperation(Snapshot& snapshot, Op& operation, Type& resultType, nautilus::tracing::value_ref targetRef, nautilus::tracing::value_ref srcRef); /** * @brief Returns the current block @@ -118,8 +116,6 @@ class ExecutionTrace { uint16_t getNextValueRef(); - friend std::ostream& operator<<(std::ostream& os, const ExecutionTrace& tag); - private: void addTag(Snapshot& snapshot, operation_identifier& identifier); @@ -136,3 +132,5 @@ class ExecutionTrace { }; } // namespace nautilus::tracing + + diff --git a/nautilus/src/nautilus/tracing/TraceOperation.cpp b/nautilus/src/nautilus/tracing/TraceOperation.cpp index 07d9e686..ae3e88ab 100644 --- a/nautilus/src/nautilus/tracing/TraceOperation.cpp +++ b/nautilus/src/nautilus/tracing/TraceOperation.cpp @@ -1,68 +1,14 @@ #include "nautilus/tracing/TraceOperation.hpp" -#include namespace nautilus::tracing { -std::ostream& operator<<(std::ostream& os, const FunctionCall& call) { - os << call.functionName << "("; - for (size_t i = 0; i < call.arguments.size(); i++) { - if (i != 0) { - os << ","; - } - os << "$" << call.arguments[i].ref; - } - os << ")"; - return os; -} - BlockRef::BlockRef(uint16_t block) : block(block) { } -std::ostream& operator<<(std::ostream& os, const BlockRef& ref) { - os << "B" << ref.block << "("; - for (size_t i = 0; i < ref.arguments.size(); i++) { - if (i != 0) { - os << ","; - } - os << ref.arguments[i].toString(); - } - os << ")"; - return os; -} - TraceOperation::TraceOperation(Snapshot& tag, Op op, Type resultType, value_ref ref, std::vector&& input) : tag(tag), op(op), resultType(resultType), resultRef(ref), input(input) { } TraceOperation::TraceOperation(Op op, std::vector&& input) : tag(), op(op), resultType(Type::v), resultRef(), input(input) { } -std::ostream& operator<<(std::ostream& os, const TraceOperation& operation) { - if (operation.op == FREE) { - return os; - } - os << fmt::format("{}\t", toString(operation.op)); - os << operation.resultRef.toString() << "\t"; - for (const InputVariant& opInput : operation.input) { - if (auto inputRef = std::get_if(&opInput)) { - os << fmt::format("${}\t", inputRef->ref); - } else if (auto blockRef = std::get_if(&opInput)) { - os << *blockRef << "\t"; - } else if (auto fCall = std::get_if(&opInput)) { - os << *fCall << "\t"; - } else if (auto constant = std::get_if(&opInput)) { - std::visit( - [&](auto&& value) -> void { - using T = std::decay_t; - if constexpr (!std::is_pointer_v) { - os << value << "\t"; - } else { - os << "*\t"; - } - }, - *constant); - } - } - os << fmt::format(":{}\t", toString(operation.resultType)); - return os; -} } // namespace nautilus::tracing diff --git a/nautilus/src/nautilus/tracing/TraceOperation.hpp b/nautilus/src/nautilus/tracing/TraceOperation.hpp index 645f75ff..0d321d6d 100644 --- a/nautilus/src/nautilus/tracing/TraceOperation.hpp +++ b/nautilus/src/nautilus/tracing/TraceOperation.hpp @@ -5,8 +5,6 @@ #include "nautilus/tracing/TracingUtil.hpp" #include "nautilus/tracing/tag/Tag.hpp" #include -#include -#include #include #include #include @@ -21,17 +19,12 @@ struct FunctionCall { std::string mangledName; void* ptr; std::vector arguments; - - friend std::ostream& operator<<(std::ostream& os, const FunctionCall& call); }; struct BlockRef { explicit BlockRef(uint16_t block); - uint16_t block; std::vector arguments; - - friend std::ostream& operator<<(std::ostream& os, const BlockRef& ref); }; using InputVariant = std::variant; @@ -42,11 +35,7 @@ using InputVariant = std::variant&& input); - TraceOperation(Op op, std::vector&& input); - - friend std::ostream& operator<<(std::ostream& os, const TraceOperation& operation); - Snapshot tag; Op op; Type resultType; diff --git a/nautilus/src/nautilus/tracing/TracingUtil.cpp b/nautilus/src/nautilus/tracing/TracingUtil.cpp index dd4772e3..afe46d32 100644 --- a/nautilus/src/nautilus/tracing/TracingUtil.cpp +++ b/nautilus/src/nautilus/tracing/TracingUtil.cpp @@ -3,8 +3,8 @@ #include "TraceContext.hpp" #include #include +#include #include -#include #include namespace nautilus::tracing { @@ -115,10 +115,6 @@ void popStaticVal() { } } -std::string TypedValueRef::toString() const { - return fmt::format("${}", ref); -} - } // namespace nautilus::tracing namespace nautilus { @@ -127,3 +123,25 @@ std::ostream& operator<<(std::ostream& os, const Type& type) { return os; } } // namespace nautilus + +namespace fmt { +template <> +struct formatter : formatter { + auto format(nautilus::ConstantLiteral c, format_context& ctx) const -> format_context::iterator; +}; +} // namespace fmt + +auto fmt::formatter::format(nautilus::ConstantLiteral lit, format_context& ctx) const -> format_context::iterator { + auto out = ctx.out(); + std::visit( + [&](auto&& value) { + using T = std::decay_t; + if constexpr (!std::is_pointer_v) { + fmt::format_to(out, "{}\t", value); + } else { + fmt::format_to(out, "*\t"); + } + }, + lit); + return out; +} diff --git a/nautilus/test/data/bool-tests/after_ssa/boolAnd.trace b/nautilus/test/data/bool-tests/after_ssa/boolAnd.trace index 577eefb7..309979e5 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolAnd.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolAnd.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - AND $5 $1 $2 :bool - RETURN $5 :bool + AND $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolAssignment.trace b/nautilus/test/data/bool-tests/after_ssa/boolAssignment.trace index cab293c4..a527c7ec 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolAssignment.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolAssignment.trace @@ -1,2 +1,2 @@ B0($1:bool) - RETURN $1 :bool + RETURN $1 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolAssignmentOr.trace b/nautilus/test/data/bool-tests/after_ssa/boolAssignmentOr.trace index 98ccc738..fbc6e91b 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolAssignmentOr.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolAssignmentOr.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - OR $6 $1 $2 :bool - RETURN $6 :bool + OR $6 $1 $2 :bool + RETURN $6 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolConst.trace b/nautilus/test/data/bool-tests/after_ssa/boolConst.trace index a0ae7b7d..ed20f465 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolConst.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolConst.trace @@ -1,4 +1,4 @@ B0($1:bool) - CONST $3 1 :bool - AND $4 $1 $3 :bool - RETURN $4 :bool + CONST $3 true :bool + AND $4 $1 $3 :bool + RETURN $4 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolEquals.trace b/nautilus/test/data/bool-tests/after_ssa/boolEquals.trace index 584f7486..3ecedcf5 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolEquals.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolEquals.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - EQ $3 $1 $2 :bool - RETURN $3 :bool + EQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolIfElse.trace b/nautilus/test/data/bool-tests/after_ssa/boolIfElse.trace index 1f3f50af..b59ce876 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolIfElse.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolIfElse.trace @@ -1,11 +1,11 @@ B0($1:bool,$2:bool) - AND $5 $1 $2 :bool - CMP $6 $5 B1() B2() :void + AND $5 $1 $2 :bool + CMP $6 $5 B1() B2() :void B1() - CONST $7 1 :bool - JMP $0 B3($7) :void + CONST $7 true :bool + JMP $0 B3($7) :void B2() - CONST $10 0 :bool - JMP $0 B3($10) :void + CONST $10 false :bool + JMP $0 B3($10) :void B3($7:bool) - RETURN $7 :bool + RETURN $7 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolNestedFunction.trace b/nautilus/test/data/bool-tests/after_ssa/boolNestedFunction.trace index 004f6a2e..2ca2d58f 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolNestedFunction.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolNestedFunction.trace @@ -1,11 +1,11 @@ B0($1:bool,$2:bool) - EQ $5 $1 $2 :bool - CMP $6 $5 B1() B2() :void + EQ $5 $1 $2 :bool + CMP $6 $5 B1() B2() :void B1() - CONST $7 1 :bool - JMP $0 B3($7) :void + CONST $7 true :bool + JMP $0 B3($7) :void B2() - CONST $10 0 :bool - JMP $0 B3($10) :void + CONST $10 false :bool + JMP $0 B3($10) :void B3($7:bool) - RETURN $7 :bool + RETURN $7 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolNot.trace b/nautilus/test/data/bool-tests/after_ssa/boolNot.trace index 2a509d93..79f08759 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolNot.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolNot.trace @@ -1,3 +1,3 @@ B0($1:bool) - NOT $3 $1 :bool - RETURN $3 :bool + NOT $3 $1 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolNotEquals.trace b/nautilus/test/data/bool-tests/after_ssa/boolNotEquals.trace index e70dff6b..915cacfb 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolNotEquals.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolNotEquals.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - NEQ $3 $1 $2 :bool - RETURN $3 :bool + NEQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/after_ssa/boolOr.trace b/nautilus/test/data/bool-tests/after_ssa/boolOr.trace index e675131b..e481fa59 100644 --- a/nautilus/test/data/bool-tests/after_ssa/boolOr.trace +++ b/nautilus/test/data/bool-tests/after_ssa/boolOr.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - OR $5 $1 $2 :bool - RETURN $5 :bool + OR $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/bool-tests/ir/boolAnd.trace b/nautilus/test/data/bool-tests/ir/boolAnd.trace index af1a80a2..c34e4ffa 100644 --- a/nautilus/test/data/bool-tests/ir/boolAnd.trace +++ b/nautilus/test/data/bool-tests/ir/boolAnd.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $5 = $1 and $2 :bool - return ($5) :bool + $5 = $1 and $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolAssignment.trace b/nautilus/test/data/bool-tests/ir/boolAssignment.trace index 0ada380a..513027df 100644 --- a/nautilus/test/data/bool-tests/ir/boolAssignment.trace +++ b/nautilus/test/data/bool-tests/ir/boolAssignment.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool): - return ($1) :bool + return ($1) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolAssignmentOr.trace b/nautilus/test/data/bool-tests/ir/boolAssignmentOr.trace index ee85d765..d4472bd7 100644 --- a/nautilus/test/data/bool-tests/ir/boolAssignmentOr.trace +++ b/nautilus/test/data/bool-tests/ir/boolAssignmentOr.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $6 = $1 or $2 :bool - return ($6) :bool + $6 = $1 or $2 :bool + return ($6) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolConst.trace b/nautilus/test/data/bool-tests/ir/boolConst.trace index 5582a9c5..81aa2a55 100644 --- a/nautilus/test/data/bool-tests/ir/boolConst.trace +++ b/nautilus/test/data/bool-tests/ir/boolConst.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool): - $3 = 1 :bool - $4 = $1 and $3 :bool - return ($4) :bool + $3 = true :bool + $4 = $1 and $3 :bool + return ($4) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolEquals.trace b/nautilus/test/data/bool-tests/ir/boolEquals.trace index 73d38862..77a7a9e2 100644 --- a/nautilus/test/data/bool-tests/ir/boolEquals.trace +++ b/nautilus/test/data/bool-tests/ir/boolEquals.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $3 = $1 == $2 :bool - return ($3) :bool + $3 = $1 == $2 :bool + return ($3) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolIfElse.trace b/nautilus/test/data/bool-tests/ir/boolIfElse.trace index 34799be7..dc8c842a 100644 --- a/nautilus/test/data/bool-tests/ir/boolIfElse.trace +++ b/nautilus/test/data/bool-tests/ir/boolIfElse.trace @@ -1,18 +1,18 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $5 = $1 and $2 :bool - if $5 ? Block_1() : Block_2() :void + $5 = $1 and $2 :bool + if $5 ? Block_1() : Block_2() :void Block_1(): - $7 = 1 :bool - br Block_3($7) :void + $7 = true :bool + br Block_3($7) :void Block_3($7:bool): - return ($7) :bool + return ($7) :bool Block_2(): - $10 = 0 :bool - br Block_3($10) :void + $10 = false :bool + br Block_3($10) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolNestedFunction.trace b/nautilus/test/data/bool-tests/ir/boolNestedFunction.trace index 404f3b55..97562577 100644 --- a/nautilus/test/data/bool-tests/ir/boolNestedFunction.trace +++ b/nautilus/test/data/bool-tests/ir/boolNestedFunction.trace @@ -1,18 +1,18 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $5 = $1 == $2 :bool - if $5 ? Block_1() : Block_2() :void + $5 = $1 == $2 :bool + if $5 ? Block_1() : Block_2() :void Block_1(): - $7 = 1 :bool - br Block_3($7) :void + $7 = true :bool + br Block_3($7) :void Block_3($7:bool): - return ($7) :bool + return ($7) :bool Block_2(): - $10 = 0 :bool - br Block_3($10) :void + $10 = false :bool + br Block_3($10) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolNot.trace b/nautilus/test/data/bool-tests/ir/boolNot.trace index 59f2a6cb..1c1f3708 100644 --- a/nautilus/test/data/bool-tests/ir/boolNot.trace +++ b/nautilus/test/data/bool-tests/ir/boolNot.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool): - $3= !$1 :bool - return ($3) :bool + $3 = !$1 :bool + return ($3) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolNotEquals.trace b/nautilus/test/data/bool-tests/ir/boolNotEquals.trace index 618b4735..fa7ec3ef 100644 --- a/nautilus/test/data/bool-tests/ir/boolNotEquals.trace +++ b/nautilus/test/data/bool-tests/ir/boolNotEquals.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $3 = $1 != $2 :bool - return ($3) :bool + $3 = $1 $2 :bool + return ($3) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/ir/boolOr.trace b/nautilus/test/data/bool-tests/ir/boolOr.trace index f68ee578..b25a72d5 100644 --- a/nautilus/test/data/bool-tests/ir/boolOr.trace +++ b/nautilus/test/data/bool-tests/ir/boolOr.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool, $2:bool): - $5 = $1 or $2 :bool - return ($5) :bool + $5 = $1 or $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/bool-tests/tracing/boolAnd.trace b/nautilus/test/data/bool-tests/tracing/boolAnd.trace index 7ec1eaea..3f428c30 100644 --- a/nautilus/test/data/bool-tests/tracing/boolAnd.trace +++ b/nautilus/test/data/bool-tests/tracing/boolAnd.trace @@ -1,5 +1,5 @@ B0($1:bool,$2:bool) - ASSIGN $3 $1 :bool - ASSIGN $4 $2 :bool - AND $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :bool + ASSIGN $4 $2 :bool + AND $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolAssignment.trace b/nautilus/test/data/bool-tests/tracing/boolAssignment.trace index 83b00137..d38cd100 100644 --- a/nautilus/test/data/bool-tests/tracing/boolAssignment.trace +++ b/nautilus/test/data/bool-tests/tracing/boolAssignment.trace @@ -1,3 +1,3 @@ B0($1:bool) - ASSIGN $2 $1 :bool - RETURN $2 :bool + ASSIGN $2 $1 :bool + RETURN $2 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolAssignmentOr.trace b/nautilus/test/data/bool-tests/tracing/boolAssignmentOr.trace index 7b1f8f4a..60c1fef0 100644 --- a/nautilus/test/data/bool-tests/tracing/boolAssignmentOr.trace +++ b/nautilus/test/data/bool-tests/tracing/boolAssignmentOr.trace @@ -1,7 +1,7 @@ B0($1:bool,$2:bool) - ASSIGN $3 $1 :bool - ASSIGN $1 $2 :bool - ASSIGN $4 $3 :bool - ASSIGN $5 $2 :bool - OR $6 $4 $5 :bool - RETURN $6 :bool + ASSIGN $3 $1 :bool + ASSIGN $1 $2 :bool + ASSIGN $4 $3 :bool + ASSIGN $5 $2 :bool + OR $6 $4 $5 :bool + RETURN $6 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolConst.trace b/nautilus/test/data/bool-tests/tracing/boolConst.trace index e1011528..33045c35 100644 --- a/nautilus/test/data/bool-tests/tracing/boolConst.trace +++ b/nautilus/test/data/bool-tests/tracing/boolConst.trace @@ -1,5 +1,5 @@ B0($1:bool) - ASSIGN $2 $1 :bool - CONST $3 1 :bool - AND $4 $2 $3 :bool - RETURN $4 :bool + ASSIGN $2 $1 :bool + CONST $3 true :bool + AND $4 $2 $3 :bool + RETURN $4 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolEquals.trace b/nautilus/test/data/bool-tests/tracing/boolEquals.trace index 584f7486..3ecedcf5 100644 --- a/nautilus/test/data/bool-tests/tracing/boolEquals.trace +++ b/nautilus/test/data/bool-tests/tracing/boolEquals.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - EQ $3 $1 $2 :bool - RETURN $3 :bool + EQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolIfElse.trace b/nautilus/test/data/bool-tests/tracing/boolIfElse.trace index 0a329617..a1872d2f 100644 --- a/nautilus/test/data/bool-tests/tracing/boolIfElse.trace +++ b/nautilus/test/data/bool-tests/tracing/boolIfElse.trace @@ -1,11 +1,11 @@ B0($1:bool,$2:bool) - ASSIGN $3 $1 :bool - ASSIGN $4 $2 :bool - AND $5 $3 $4 :bool - CMP $6 $5 B1() B2() :void + ASSIGN $3 $1 :bool + ASSIGN $4 $2 :bool + AND $5 $3 $4 :bool + CMP $6 $5 B1() B2() :void B1() - CONST $7 1 :bool - RETURN $7 :bool + CONST $7 true :bool + RETURN $7 :bool B2() - CONST $10 0 :bool - RETURN $10 :bool + CONST $10 false :bool + RETURN $10 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolNestedFunction.trace b/nautilus/test/data/bool-tests/tracing/boolNestedFunction.trace index 931d9f57..583d61af 100644 --- a/nautilus/test/data/bool-tests/tracing/boolNestedFunction.trace +++ b/nautilus/test/data/bool-tests/tracing/boolNestedFunction.trace @@ -1,11 +1,11 @@ B0($1:bool,$2:bool) - ASSIGN $3 $1 :bool - ASSIGN $4 $2 :bool - EQ $5 $3 $4 :bool - CMP $6 $5 B1() B2() :void + ASSIGN $3 $1 :bool + ASSIGN $4 $2 :bool + EQ $5 $3 $4 :bool + CMP $6 $5 B1() B2() :void B1() - CONST $7 1 :bool - RETURN $7 :bool + CONST $7 true :bool + RETURN $7 :bool B2() - CONST $10 0 :bool - RETURN $10 :bool + CONST $10 false :bool + RETURN $10 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolNot.trace b/nautilus/test/data/bool-tests/tracing/boolNot.trace index f673ccf3..f3b0e700 100644 --- a/nautilus/test/data/bool-tests/tracing/boolNot.trace +++ b/nautilus/test/data/bool-tests/tracing/boolNot.trace @@ -1,4 +1,4 @@ B0($1:bool) - ASSIGN $2 $1 :bool - NOT $3 $2 :bool - RETURN $3 :bool + ASSIGN $2 $1 :bool + NOT $3 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolNotEquals.trace b/nautilus/test/data/bool-tests/tracing/boolNotEquals.trace index e70dff6b..915cacfb 100644 --- a/nautilus/test/data/bool-tests/tracing/boolNotEquals.trace +++ b/nautilus/test/data/bool-tests/tracing/boolNotEquals.trace @@ -1,3 +1,3 @@ B0($1:bool,$2:bool) - NEQ $3 $1 $2 :bool - RETURN $3 :bool + NEQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/bool-tests/tracing/boolOr.trace b/nautilus/test/data/bool-tests/tracing/boolOr.trace index 46e20855..34eb0bc7 100644 --- a/nautilus/test/data/bool-tests/tracing/boolOr.trace +++ b/nautilus/test/data/bool-tests/tracing/boolOr.trace @@ -1,5 +1,5 @@ B0($1:bool,$2:bool) - ASSIGN $3 $1 :bool - ASSIGN $4 $2 :bool - OR $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :bool + ASSIGN $4 $2 :bool + OR $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i16.trace index d10483a7..c5c7414b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i32.trace index 0ffe7d2b..786190c7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i64.trace index e2ff023f..eaebff97 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i8.trace index 20ff8232..29d2d7ce 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_i8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui16.trace index 6a5e1c4c..df91c955 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui32.trace index 7fefa6ec..cb2106b6 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui64.trace index 310393e6..926054a0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui8.trace index 8650f9b3..4477eb5d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_d_ui8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i16.trace index c3df1513..bc579d7a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i32.trace index 3fa89795..10399631 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i64.trace index 1ba8993a..ea2471bf 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i8.trace index 73469fad..95ac587d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_i8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui16.trace index 432251c7..5c25a4f9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui32.trace index 6062df1d..89e188af 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui64.trace index 4423e269..e4a108b0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui8.trace index a8498ca5..648cbee5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_f_ui8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i16.trace index c9831096..5c367da7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i16.trace @@ -1,2 +1,2 @@ B0($1:i16) - RETURN $1 :i16 + RETURN $1 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i32.trace index eb6ef292..6fed6416 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i64.trace index 98f74c4d..56d913af 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i8.trace index cf8dfbbc..83e1b2b4 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_i8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui16.trace index a551a56e..8109e6eb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui16.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui32.trace index 75c659a1..9ba83981 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui64.trace index cccf151c..daf7fe5f 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui8.trace index 828bbc09..0f19d567 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i16_ui8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i16.trace index 8b3d89af..ddc232d2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i32.trace index 51f8b1bd..f4d13fba 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i32.trace @@ -1,2 +1,2 @@ B0($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i64.trace index 8f25fa0d..94189ec2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i8.trace index 76cdf62b..a153a27c 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_i8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui16.trace index 7ef09eb2..6ea9da5b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui32.trace index dd5d2473..b6fcccf2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui32.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui64.trace index 0a2c3409..044468d5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui8.trace index 98d779f1..4067793b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i32_ui8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i16.trace index 39cb45f1..bbb810fb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i32.trace index 4253a7d6..8acef449 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i64.trace index 462594d2..e73ef494 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i64.trace @@ -1,2 +1,2 @@ B0($1:i64) - RETURN $1 :i64 + RETURN $1 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i8.trace index bcbd9dd8..0a52aed1 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_i8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui16.trace index 4055fae6..12a6b63a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui32.trace index e1583698..3687fb73 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui64.trace index ed526607..14e282e0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui64.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui8.trace index 3694581d..865e6578 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i64_ui8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i16.trace index 740addf3..8776e24f 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i32.trace index bb121fad..a30ad079 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i64.trace index f592d94f..975e8462 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i8.trace index 729a32ae..43b9acd1 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_i8.trace @@ -1,2 +1,2 @@ B0($1:i8) - RETURN $1 :i8 + RETURN $1 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui16.trace index 472e094f..24fc597a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui32.trace index 97a415d3..e8a68c1a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui64.trace index b7177ee0..ea8a669d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui8.trace index b47e79ce..020bf320 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_i8_ui8.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i16.trace index d575ef21..b77f50b5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i32.trace index f8f3964c..1766b961 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i64.trace index 48d6a9ea..9710f2e9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i8.trace index c0b41318..bc2a6de6 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_i8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui16.trace index a000357e..694938c2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui16.trace @@ -1,2 +1,2 @@ B0($1:ui16) - RETURN $1 :ui16 + RETURN $1 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui32.trace index 2768cd0c..f8feb2fa 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui64.trace index 9be25f96..a22d23eb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui8.trace index f21d2879..820ec966 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui16_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i16.trace index 6bc17a0d..9fe4a2b3 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i32.trace index 99444cb5..81978586 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i64.trace index c8af76c6..964cf673 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i8.trace index 5a30146a..61254476 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_i8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui16.trace index 47233312..c6697b49 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui32.trace index 3bd2245f..436f261e 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui32.trace @@ -1,2 +1,2 @@ B0($1:ui32) - RETURN $1 :ui32 + RETURN $1 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui64.trace index 040f06dd..e96f4bcd 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui8.trace index ad71c7d5..d47acf1b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui32_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i16.trace index 4aa06798..1f948a47 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i32.trace index b4ab6e88..b2ed7333 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i64.trace index ba60005c..8259f895 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i8.trace index 812607d8..cffe51b9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_i8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui16.trace index 09a96e69..77f55a4a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui32.trace index 0a1b61c6..c141f921 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui64.trace index ce5d65b6..35c5acd7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui64.trace @@ -1,2 +1,2 @@ B0($1:ui64) - RETURN $1 :ui64 + RETURN $1 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui8.trace index 315086ac..7ce4bace 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui64_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i16.trace index f4d962d9..22ce9603 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i32.trace index 133a284a..2c2945c7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i64.trace index 6403f961..0def4379 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i8.trace index cd27f383..2a504194 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_i8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui16.trace index cbccb6c7..91655b4c 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui32.trace index a69db9c9..c3e675ef 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui64.trace index b90cb46f..6f3da5cb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui8.trace index dd1dac42..91d89e5e 100644 --- a/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/implicitCast_ui8_ui8.trace @@ -1,2 +1,2 @@ B0($1:ui8) - RETURN $1 :ui8 + RETURN $1 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i16.trace index d10483a7..c5c7414b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i32.trace index 0ffe7d2b..786190c7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i64.trace index e2ff023f..eaebff97 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i8.trace index 20ff8232..29d2d7ce 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_i8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui16.trace index 6a5e1c4c..df91c955 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui32.trace index 7fefa6ec..cb2106b6 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui64.trace index 310393e6..926054a0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui8.trace index 8650f9b3..4477eb5d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_d_ui8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i16.trace index c3df1513..bc579d7a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i32.trace index 3fa89795..10399631 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i64.trace index 1ba8993a..ea2471bf 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i8.trace index 73469fad..95ac587d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_i8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui16.trace index 432251c7..5c25a4f9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui32.trace index 6062df1d..89e188af 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui64.trace index 4423e269..e4a108b0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui8.trace index a8498ca5..648cbee5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_f_ui8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i16.trace index c9831096..5c367da7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i16.trace @@ -1,2 +1,2 @@ B0($1:i16) - RETURN $1 :i16 + RETURN $1 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i32.trace index eb6ef292..6fed6416 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i64.trace index 98f74c4d..56d913af 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i8.trace index cf8dfbbc..83e1b2b4 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_i8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui16.trace index a551a56e..8109e6eb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui16.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui32.trace index 75c659a1..9ba83981 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui64.trace index cccf151c..daf7fe5f 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui8.trace index 828bbc09..0f19d567 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i16_ui8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i16.trace index 8b3d89af..ddc232d2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i32.trace index 51f8b1bd..f4d13fba 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i32.trace @@ -1,2 +1,2 @@ B0($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i64.trace index 8f25fa0d..94189ec2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i8.trace index 76cdf62b..a153a27c 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_i8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui16.trace index 7ef09eb2..6ea9da5b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui32.trace index dd5d2473..b6fcccf2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui32.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui64.trace index 0a2c3409..044468d5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui8.trace index 98d779f1..4067793b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i32_ui8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i16.trace index 39cb45f1..bbb810fb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i32.trace index 4253a7d6..8acef449 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i64.trace index 462594d2..e73ef494 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i64.trace @@ -1,2 +1,2 @@ B0($1:i64) - RETURN $1 :i64 + RETURN $1 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i8.trace index bcbd9dd8..0a52aed1 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_i8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui16.trace index 4055fae6..12a6b63a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui32.trace index e1583698..3687fb73 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui64.trace index ed526607..14e282e0 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui64.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui8.trace index 3694581d..865e6578 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i64_ui8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i16.trace index 740addf3..8776e24f 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i32.trace index bb121fad..a30ad079 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i64.trace index f592d94f..975e8462 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i8.trace index 729a32ae..43b9acd1 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_i8.trace @@ -1,2 +1,2 @@ B0($1:i8) - RETURN $1 :i8 + RETURN $1 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui16.trace index 472e094f..24fc597a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui32.trace index 97a415d3..e8a68c1a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui64.trace index b7177ee0..ea8a669d 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui8.trace index b47e79ce..020bf320 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_i8_ui8.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i16.trace index d575ef21..b77f50b5 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i32.trace index f8f3964c..1766b961 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i64.trace index 48d6a9ea..9710f2e9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i8.trace index c0b41318..bc2a6de6 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_i8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui16.trace index a000357e..694938c2 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui16.trace @@ -1,2 +1,2 @@ B0($1:ui16) - RETURN $1 :ui16 + RETURN $1 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui32.trace index 2768cd0c..f8feb2fa 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui64.trace index 9be25f96..a22d23eb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui8.trace index f21d2879..820ec966 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui16_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i16.trace index 6bc17a0d..9fe4a2b3 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i32.trace index 99444cb5..81978586 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i64.trace index c8af76c6..964cf673 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i8.trace index 5a30146a..61254476 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_i8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui16.trace index 47233312..c6697b49 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui32.trace index 3bd2245f..436f261e 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui32.trace @@ -1,2 +1,2 @@ B0($1:ui32) - RETURN $1 :ui32 + RETURN $1 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui64.trace index 040f06dd..e96f4bcd 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui8.trace index ad71c7d5..d47acf1b 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui32_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i16.trace index 4aa06798..1f948a47 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i32.trace index b4ab6e88..b2ed7333 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i64.trace index ba60005c..8259f895 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i8.trace index 812607d8..cffe51b9 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_i8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui16.trace index 09a96e69..77f55a4a 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui32.trace index 0a1b61c6..c141f921 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui64.trace index ce5d65b6..35c5acd7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui64.trace @@ -1,2 +1,2 @@ B0($1:ui64) - RETURN $1 :ui64 + RETURN $1 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui8.trace index 315086ac..7ce4bace 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui64_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i16.trace index f4d962d9..22ce9603 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i32.trace index 133a284a..2c2945c7 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i64.trace index 6403f961..0def4379 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i8.trace index cd27f383..2a504194 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_i8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui16.trace index cbccb6c7..91655b4c 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui32.trace index a69db9c9..c3e675ef 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui64.trace index b90cb46f..6f3da5cb 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui8.trace index dd1dac42..91d89e5e 100644 --- a/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/after_ssa/staticCast_ui8_ui8.trace @@ -1,2 +1,2 @@ B0($1:ui8) - RETURN $1 :ui8 + RETURN $1 :ui8 diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_i16.trace index a7228099..17720896 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_i32.trace index 61030d1c..e6733003 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_i64.trace index 4b5d7f9e..1b152ab3 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_i8.trace index 9a10ecde..6337e2b5 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui16.trace index 2cce3f9a..63d001e8 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui32.trace index 61e31d0b..5d62ea0d 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui64.trace index c6dc8312..ba942f7e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui8.trace index 4b53e3d6..ab267785 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_d_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_i16.trace index 8e2912d3..94f9f902 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_i32.trace index c3153d43..a042ce41 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_i64.trace index 38098734..948e90ab 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_i8.trace index 0f7500e7..5272babe 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui16.trace index 50f1d2a0..2ec60651 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui32.trace index b9b94193..1b6877d7 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui64.trace index bf246eee..8e1070ed 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui8.trace index 39d629f3..0787ee33 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_f_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i16.trace index 811b362f..f9f12cad 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i16.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - return ($1) :i16 + return ($1) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i32.trace index 4fb1f274..c3091726 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i64.trace index caba316c..5196eb9a 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i8.trace index b340c160..04a25a2b 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui16.trace index 71267acc..3148858f 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui32.trace index 0629bcd7..00bbcc41 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui64.trace index 4239800d..d0919855 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui8.trace index 81b69e6d..321ebc5e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i16_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i16.trace index b5e3b0e1..b893048e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i32.trace index d1418bc1..62807bf8 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i32.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i64.trace index 94d97675..6f1f472e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i8.trace index 1917dd08..12b636fd 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui16.trace index 7b965d62..9be97e59 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui32.trace index c35b4476..a718bd87 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui64.trace index c2c6ce1a..423cbff3 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui8.trace index 10fec438..2fc6a4d3 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i32_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i16.trace index 15a90ee2..bfa5d218 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i32.trace index 39810fa4..1cbb822b 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i64.trace index d9183c02..f51c5cf2 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i64.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - return ($1) :i64 + return ($1) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i8.trace index 5e8b7fd1..b0b0521b 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui16.trace index 469a62e5..f3283bfa 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui32.trace index ca18c313..8935ab0c 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui64.trace index cf2d0a38..fa78a094 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui8.trace index 5b0506af..1530c75b 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i64_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i16.trace index 9b6c66eb..3b4d2d0e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i32.trace index 2b8cae68..b3a77888 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i64.trace index ff455869..e541f146 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i8.trace index 419e0489..20c276cb 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_i8.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - return ($1) :i8 + return ($1) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui16.trace index ff089eb8..c52438d1 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui32.trace index c47efc72..9d57e43e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui64.trace index 85eb411a..865ac77e 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui8.trace index 2ad5f5db..e97cdf97 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_i8_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i16.trace index 6557d20d..a8478273 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i32.trace index 216fbd1e..ad42e864 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i64.trace index 7225362d..f0cb9a9c 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i8.trace index 67f90286..77600f70 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui16.trace index d88a353e..63534360 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui16.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - return ($1) :ui16 + return ($1) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui32.trace index 40cd2b91..23d21904 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui64.trace index 4066f4d7..1e74aa9a 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui8.trace index 5381b296..82246dbf 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui16_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i16.trace index d5283f56..45cd9ed9 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i32.trace index 6c46e2c4..583dd23d 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i64.trace index ac59cbc5..1ebbd90b 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i8.trace index 24bc9919..d7a7fb51 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui16.trace index 604cf9c8..5ad9d914 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui32.trace index cfc5dd3f..dab3693d 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui32.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - return ($1) :ui32 + return ($1) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui64.trace index 247d2b1c..bbc7a974 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui8.trace index 7af0bb36..85b3f9ed 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui32_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i16.trace index a86f04bf..72ef46b0 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i32.trace index eb06c95c..62427fd4 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i64.trace index a21c7322..06daf627 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i8.trace index 26dfe376..abfb3957 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui16.trace index a6f0e420..50175a09 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui32.trace index b49276f2..df9bb365 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui64.trace index e0465097..4bc4f995 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui64.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - return ($1) :ui64 + return ($1) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui8.trace index 18c516fa..1f85e4a4 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui64_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i16.trace index 79d71108..efdc8b44 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i32.trace index a73f65c6..42fbd84d 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i64.trace index 3070c151..177956b1 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i8.trace index f7230c85..55fad177 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui16.trace index 17cae0d7..08e8cecc 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui32.trace index 36a22452..5a6b9a41 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui64.trace index 6f35f53f..fcf7d8fc 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui8.trace index 883cc902..81efe7bc 100644 --- a/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/implicitCast_ui8_ui8.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - return ($1) :ui8 + return ($1) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_i16.trace index a7228099..17720896 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_i32.trace index 61030d1c..e6733003 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_i64.trace index 4b5d7f9e..1b152ab3 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_i8.trace index 9a10ecde..6337e2b5 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_ui16.trace index 2cce3f9a..63d001e8 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_ui32.trace index 61e31d0b..5d62ea0d 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_ui64.trace index c6dc8312..ba942f7e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_d_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_d_ui8.trace index 4b53e3d6..ab267785 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_d_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_i16.trace index 8e2912d3..94f9f902 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_i32.trace index c3153d43..a042ce41 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_i64.trace index 38098734..948e90ab 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_i8.trace index 0f7500e7..5272babe 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_ui16.trace index 50f1d2a0..2ec60651 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_ui32.trace index b9b94193..1b6877d7 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_ui64.trace index bf246eee..8e1070ed 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_f_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_f_ui8.trace index 39d629f3..0787ee33 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_f_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_i16.trace index 811b362f..f9f12cad 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_i16.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - return ($1) :i16 + return ($1) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_i32.trace index 4fb1f274..c3091726 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_i64.trace index caba316c..5196eb9a 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_i8.trace index b340c160..04a25a2b 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui16.trace index 71267acc..3148858f 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui32.trace index 0629bcd7..00bbcc41 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui64.trace index 4239800d..d0919855 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui8.trace index 81b69e6d..321ebc5e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i16_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_i16.trace index b5e3b0e1..b893048e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_i32.trace index d1418bc1..62807bf8 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_i32.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_i64.trace index 94d97675..6f1f472e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_i8.trace index 1917dd08..12b636fd 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui16.trace index 7b965d62..9be97e59 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui32.trace index c35b4476..a718bd87 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui64.trace index c2c6ce1a..423cbff3 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui8.trace index 10fec438..2fc6a4d3 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i32_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_i16.trace index 15a90ee2..bfa5d218 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_i32.trace index 39810fa4..1cbb822b 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_i64.trace index d9183c02..f51c5cf2 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_i64.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - return ($1) :i64 + return ($1) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_i8.trace index 5e8b7fd1..b0b0521b 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui16.trace index 469a62e5..f3283bfa 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui32.trace index ca18c313..8935ab0c 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui64.trace index cf2d0a38..fa78a094 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui8.trace index 5b0506af..1530c75b 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i64_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_i16.trace index 9b6c66eb..3b4d2d0e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_i32.trace index 2b8cae68..b3a77888 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_i64.trace index ff455869..e541f146 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_i8.trace index 419e0489..20c276cb 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_i8.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - return ($1) :i8 + return ($1) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui16.trace index ff089eb8..c52438d1 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui32.trace index c47efc72..9d57e43e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui64.trace index 85eb411a..865ac77e 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui8.trace index 2ad5f5db..e97cdf97 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_i8_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i16.trace index 6557d20d..a8478273 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i32.trace index 216fbd1e..ad42e864 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i64.trace index 7225362d..f0cb9a9c 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i8.trace index 67f90286..77600f70 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui16.trace index d88a353e..63534360 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui16.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - return ($1) :ui16 + return ($1) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui32.trace index 40cd2b91..23d21904 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui64.trace index 4066f4d7..1e74aa9a 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui8.trace index 5381b296..82246dbf 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui16_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui16): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i16.trace index d5283f56..45cd9ed9 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i32.trace index 6c46e2c4..583dd23d 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i64.trace index ac59cbc5..1ebbd90b 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i8.trace index 24bc9919..d7a7fb51 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui16.trace index 604cf9c8..5ad9d914 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui32.trace index cfc5dd3f..dab3693d 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui32.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - return ($1) :ui32 + return ($1) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui64.trace index 247d2b1c..bbc7a974 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui8.trace index 7af0bb36..85b3f9ed 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui32_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i16.trace index a86f04bf..72ef46b0 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i32.trace index eb06c95c..62427fd4 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i64.trace index a21c7322..06daf627 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i8.trace index 26dfe376..abfb3957 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui16.trace index a6f0e420..50175a09 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui32.trace index b49276f2..df9bb365 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui64.trace index e0465097..4bc4f995 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui64.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - return ($1) :ui64 + return ($1) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui8.trace index 18c516fa..1f85e4a4 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui64_ui8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui64): - $2 = $1 cast_to ui8 :ui8 - return ($2) :ui8 + $2 = $1 cast_to ui8 :ui8 + return ($2) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i16.trace index 79d71108..efdc8b44 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i16 :i16 - return ($2) :i16 + $2 = $1 cast_to i16 :i16 + return ($2) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i32.trace index a73f65c6..42fbd84d 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i32 :i32 - return ($2) :i32 + $2 = $1 cast_to i32 :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i64.trace index 3070c151..177956b1 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i64 :i64 - return ($2) :i64 + $2 = $1 cast_to i64 :i64 + return ($2) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i8.trace index f7230c85..55fad177 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to i8 :i8 - return ($2) :i8 + $2 = $1 cast_to i8 :i8 + return ($2) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui16.trace index 17cae0d7..08e8cecc 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui16.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui16 :ui16 - return ($2) :ui16 + $2 = $1 cast_to ui16 :ui16 + return ($2) :ui16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui32.trace index 36a22452..5a6b9a41 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui32.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui32 :ui32 - return ($2) :ui32 + $2 = $1 cast_to ui32 :ui32 + return ($2) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui64.trace index 6f35f53f..fcf7d8fc 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui64.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - $2 = $1 cast_to ui64 :ui64 - return ($2) :ui64 + $2 = $1 cast_to ui64 :ui64 + return ($2) :ui64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui8.trace index 883cc902..81efe7bc 100644 --- a/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/ir/staticCast_ui8_ui8.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui8): - return ($1) :ui8 + return ($1) :ui8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i16.trace index d10483a7..c5c7414b 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i32.trace index 0ffe7d2b..786190c7 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i64.trace index e2ff023f..eaebff97 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i8.trace index 20ff8232..29d2d7ce 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_i8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui16.trace index 6a5e1c4c..df91c955 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui32.trace index 7fefa6ec..cb2106b6 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui64.trace index 310393e6..926054a0 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui8.trace index 8650f9b3..4477eb5d 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_d_ui8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i16.trace index c3df1513..bc579d7a 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i32.trace index 3fa89795..10399631 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i64.trace index 1ba8993a..ea2471bf 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i8.trace index 73469fad..95ac587d 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_i8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui16.trace index 432251c7..5c25a4f9 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui32.trace index 6062df1d..89e188af 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui64.trace index 4423e269..e4a108b0 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui8.trace index a8498ca5..648cbee5 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_f_ui8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i16.trace index ae27f3f0..a24bfd17 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i16.trace @@ -1,3 +1,3 @@ B0($1:i16) - ASSIGN $2 $1 :i16 - RETURN $2 :i16 + ASSIGN $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i32.trace index eb6ef292..6fed6416 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i64.trace index 98f74c4d..56d913af 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i8.trace index cf8dfbbc..83e1b2b4 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_i8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui16.trace index a551a56e..8109e6eb 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui16.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui32.trace index 75c659a1..9ba83981 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui64.trace index cccf151c..daf7fe5f 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui8.trace index 828bbc09..0f19d567 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i16_ui8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i16.trace index 8b3d89af..ddc232d2 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i32.trace index 56fc6838..7e125e8f 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i32.trace @@ -1,3 +1,3 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - RETURN $2 :i32 + ASSIGN $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i64.trace index 8f25fa0d..94189ec2 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i8.trace index 76cdf62b..a153a27c 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_i8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui16.trace index 7ef09eb2..6ea9da5b 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui32.trace index dd5d2473..b6fcccf2 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui32.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui64.trace index 0a2c3409..044468d5 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui8.trace index 98d779f1..4067793b 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i32_ui8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i16.trace index 39cb45f1..bbb810fb 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i32.trace index 4253a7d6..8acef449 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i64.trace index e9f3be55..838eb456 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i64.trace @@ -1,3 +1,3 @@ B0($1:i64) - ASSIGN $2 $1 :i64 - RETURN $2 :i64 + ASSIGN $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i8.trace index bcbd9dd8..0a52aed1 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_i8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui16.trace index 4055fae6..12a6b63a 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui32.trace index e1583698..3687fb73 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui64.trace index ed526607..14e282e0 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui64.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui8.trace index 3694581d..865e6578 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i64_ui8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i16.trace index 740addf3..8776e24f 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i32.trace index bb121fad..a30ad079 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i64.trace index f592d94f..975e8462 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i8.trace index 6e837886..872b70e5 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_i8.trace @@ -1,3 +1,3 @@ B0($1:i8) - ASSIGN $2 $1 :i8 - RETURN $2 :i8 + ASSIGN $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui16.trace index 472e094f..24fc597a 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui32.trace index 97a415d3..e8a68c1a 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui64.trace index b7177ee0..ea8a669d 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui8.trace index b47e79ce..020bf320 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_i8_ui8.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i16.trace index d575ef21..b77f50b5 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i32.trace index f8f3964c..1766b961 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i64.trace index 48d6a9ea..9710f2e9 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i8.trace index c0b41318..bc2a6de6 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_i8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui16.trace index 6c9d19d3..0200e5df 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - ASSIGN $2 $1 :ui16 - RETURN $2 :ui16 + ASSIGN $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui32.trace index 2768cd0c..f8feb2fa 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui64.trace index 9be25f96..a22d23eb 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui8.trace index f21d2879..820ec966 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui16_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i16.trace index 6bc17a0d..9fe4a2b3 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i32.trace index 99444cb5..81978586 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i64.trace index c8af76c6..964cf673 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i8.trace index 5a30146a..61254476 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_i8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui16.trace index 47233312..c6697b49 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui32.trace index 2980bf04..82cbd99c 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - ASSIGN $2 $1 :ui32 - RETURN $2 :ui32 + ASSIGN $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui64.trace index 040f06dd..e96f4bcd 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui8.trace index ad71c7d5..d47acf1b 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui32_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i16.trace index 4aa06798..1f948a47 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i32.trace index b4ab6e88..b2ed7333 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i64.trace index ba60005c..8259f895 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i8.trace index 812607d8..cffe51b9 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_i8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui16.trace index 09a96e69..77f55a4a 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui32.trace index 0a1b61c6..c141f921 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui64.trace index 75700e24..d2567c5c 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - ASSIGN $2 $1 :ui64 - RETURN $2 :ui64 + ASSIGN $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui8.trace index 315086ac..7ce4bace 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui64_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i16.trace index f4d962d9..22ce9603 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i32.trace index 133a284a..2c2945c7 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i64.trace index 6403f961..0def4379 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i8.trace index cd27f383..2a504194 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_i8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui16.trace index cbccb6c7..91655b4c 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui32.trace index a69db9c9..c3e675ef 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui64.trace index b90cb46f..6f3da5cb 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui8.trace index 4fb69bf9..0ef9c4fc 100644 --- a/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/implicitCast_ui8_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - ASSIGN $2 $1 :ui8 - RETURN $2 :ui8 + ASSIGN $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_i16.trace index d10483a7..c5c7414b 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_i16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_i32.trace index 0ffe7d2b..786190c7 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_i32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_i64.trace index e2ff023f..eaebff97 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_i64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_i8.trace index 20ff8232..29d2d7ce 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_i8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui16.trace index 6a5e1c4c..df91c955 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui16.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui32.trace index 7fefa6ec..cb2106b6 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui32.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui64.trace index 310393e6..926054a0 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui64.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui8.trace index 8650f9b3..4477eb5d 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_d_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_d_ui8.trace @@ -1,3 +1,3 @@ B0($1:f64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_i16.trace index c3df1513..bc579d7a 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_i16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_i32.trace index 3fa89795..10399631 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_i32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_i64.trace index 1ba8993a..ea2471bf 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_i64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_i8.trace index 73469fad..95ac587d 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_i8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui16.trace index 432251c7..5c25a4f9 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui16.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui32.trace index 6062df1d..89e188af 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui32.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui64.trace index 4423e269..e4a108b0 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui64.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui8.trace index a8498ca5..648cbee5 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_f_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_f_ui8.trace @@ -1,3 +1,3 @@ B0($1:f32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i16.trace index ae27f3f0..a24bfd17 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i16.trace @@ -1,3 +1,3 @@ B0($1:i16) - ASSIGN $2 $1 :i16 - RETURN $2 :i16 + ASSIGN $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i32.trace index eb6ef292..6fed6416 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i64.trace index 98f74c4d..56d913af 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i8.trace index cf8dfbbc..83e1b2b4 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_i8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui16.trace index a551a56e..8109e6eb 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui16.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui32.trace index 75c659a1..9ba83981 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui32.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui64.trace index cccf151c..daf7fe5f 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui64.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui8.trace index 828bbc09..0f19d567 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i16_ui8.trace @@ -1,3 +1,3 @@ B0($1:i16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i16.trace index 8b3d89af..ddc232d2 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i32.trace index 56fc6838..7e125e8f 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i32.trace @@ -1,3 +1,3 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - RETURN $2 :i32 + ASSIGN $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i64.trace index 8f25fa0d..94189ec2 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i8.trace index 76cdf62b..a153a27c 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_i8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui16.trace index 7ef09eb2..6ea9da5b 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui16.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui32.trace index dd5d2473..b6fcccf2 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui32.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui64.trace index 0a2c3409..044468d5 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui64.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui8.trace index 98d779f1..4067793b 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i32_ui8.trace @@ -1,3 +1,3 @@ B0($1:i32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i16.trace index 39cb45f1..bbb810fb 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i32.trace index 4253a7d6..8acef449 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i64.trace index e9f3be55..838eb456 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i64.trace @@ -1,3 +1,3 @@ B0($1:i64) - ASSIGN $2 $1 :i64 - RETURN $2 :i64 + ASSIGN $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i8.trace index bcbd9dd8..0a52aed1 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_i8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui16.trace index 4055fae6..12a6b63a 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui16.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui32.trace index e1583698..3687fb73 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui32.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui64.trace index ed526607..14e282e0 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui64.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui8.trace index 3694581d..865e6578 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i64_ui8.trace @@ -1,3 +1,3 @@ B0($1:i64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i16.trace index 740addf3..8776e24f 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i32.trace index bb121fad..a30ad079 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i64.trace index f592d94f..975e8462 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i8.trace index 6e837886..872b70e5 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_i8.trace @@ -1,3 +1,3 @@ B0($1:i8) - ASSIGN $2 $1 :i8 - RETURN $2 :i8 + ASSIGN $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui16.trace index 472e094f..24fc597a 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui16.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui32.trace index 97a415d3..e8a68c1a 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui32.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui64.trace index b7177ee0..ea8a669d 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui64.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui8.trace index b47e79ce..020bf320 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_i8_ui8.trace @@ -1,3 +1,3 @@ B0($1:i8) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i16.trace index d575ef21..b77f50b5 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i32.trace index f8f3964c..1766b961 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i64.trace index 48d6a9ea..9710f2e9 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i8.trace index c0b41318..bc2a6de6 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_i8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui16.trace index 6c9d19d3..0200e5df 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui16) - ASSIGN $2 $1 :ui16 - RETURN $2 :ui16 + ASSIGN $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui32.trace index 2768cd0c..f8feb2fa 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui64.trace index 9be25f96..a22d23eb 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui8.trace index f21d2879..820ec966 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui16_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui16) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i16.trace index 6bc17a0d..9fe4a2b3 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i32.trace index 99444cb5..81978586 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i64.trace index c8af76c6..964cf673 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i8.trace index 5a30146a..61254476 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_i8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui16.trace index 47233312..c6697b49 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui32.trace index 2980bf04..82cbd99c 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui32) - ASSIGN $2 $1 :ui32 - RETURN $2 :ui32 + ASSIGN $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui64.trace index 040f06dd..e96f4bcd 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui8.trace index ad71c7d5..d47acf1b 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui32_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i16.trace index 4aa06798..1f948a47 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i32.trace index b4ab6e88..b2ed7333 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i64.trace index ba60005c..8259f895 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i8.trace index 812607d8..cffe51b9 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_i8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui16.trace index 09a96e69..77f55a4a 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui32.trace index 0a1b61c6..c141f921 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui64.trace index 75700e24..d2567c5c 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui64) - ASSIGN $2 $1 :ui64 - RETURN $2 :ui64 + ASSIGN $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui8.trace index 315086ac..7ce4bace 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui64_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui64) - CAST $2 $1 :ui8 - RETURN $2 :ui8 + CAST $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i16.trace index f4d962d9..22ce9603 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i16 - RETURN $2 :i16 + CAST $2 $1 :i16 + RETURN $2 :i16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i32.trace index 133a284a..2c2945c7 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i32 - RETURN $2 :i32 + CAST $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i64.trace index 6403f961..0def4379 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i64 - RETURN $2 :i64 + CAST $2 $1 :i64 + RETURN $2 :i64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i8.trace index cd27f383..2a504194 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_i8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :i8 - RETURN $2 :i8 + CAST $2 $1 :i8 + RETURN $2 :i8 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui16.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui16.trace index cbccb6c7..91655b4c 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui16.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui16.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui16 - RETURN $2 :ui16 + CAST $2 $1 :ui16 + RETURN $2 :ui16 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui32.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui32.trace index a69db9c9..c3e675ef 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui32.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui32.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui32 - RETURN $2 :ui32 + CAST $2 $1 :ui32 + RETURN $2 :ui32 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui64.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui64.trace index b90cb46f..6f3da5cb 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui64.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui64.trace @@ -1,3 +1,3 @@ B0($1:ui8) - CAST $2 $1 :ui64 - RETURN $2 :ui64 + CAST $2 $1 :ui64 + RETURN $2 :ui64 diff --git a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui8.trace b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui8.trace index 4fb69bf9..0ef9c4fc 100644 --- a/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui8.trace +++ b/nautilus/test/data/cast-tests/tracing/staticCast_ui8_ui8.trace @@ -1,3 +1,3 @@ B0($1:ui8) - ASSIGN $2 $1 :ui8 - RETURN $2 :ui8 + ASSIGN $2 $1 :ui8 + RETURN $2 :ui8 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/andCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/andCondition.trace index 3d1975c6..9c93998e 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/andCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/andCondition.trace @@ -1,16 +1,16 @@ B0($1:i32,$2:i32) - CONST $3 1 :i32 - CONST $4 8 :i32 - EQ $5 $1 $4 :bool - CONST $6 1 :i32 - EQ $7 $2 $6 :bool - AND $8 $5 $7 :bool - CMP $9 $8 B1($3) B2($3) :void + CONST $3 1 :i32 + CONST $4 8 :i32 + EQ $5 $1 $4 :bool + CONST $6 1 :i32 + EQ $7 $2 $6 :bool + AND $8 $5 $7 :bool + CMP $9 $8 B1($3) B2($3) :void B1($3:i32) - CONST $10 14 :i32 - ADD $11 $3 $10 :i32 - JMP $0 B3($11) :void + CONST $10 14 :i32 + ADD $11 $3 $10 :i32 + JMP $0 B3($11) :void B2($3:i32) - JMP $0 B3($3) :void + JMP $0 B3($3) :void B3($3:i32) - RETURN $3 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/andFunction.trace b/nautilus/test/data/control-flow-tests/after_ssa/andFunction.trace index bb4b5199..777f6e83 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/andFunction.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/andFunction.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 1 :bool - CONST $4 42 :i64 - CAST $5 $1 :i64 - EQ $6 $5 $4 :bool - AND $7 $2 $6 :bool - CONST $9 42 :i64 - CAST $10 $1 :i64 - EQ $11 $10 $9 :bool - AND $12 $7 $11 :bool - CONST $14 42 :i64 - CAST $15 $1 :i64 - EQ $16 $15 $14 :bool - AND $17 $12 $16 :bool - RETURN $17 :bool + CONST $2 true :bool + CONST $4 42 :i64 + CAST $5 $1 :i64 + EQ $6 $5 $4 :bool + AND $7 $2 $6 :bool + CONST $9 42 :i64 + CAST $10 $1 :i64 + EQ $11 $10 $9 :bool + AND $12 $7 $11 :bool + CONST $14 42 :i64 + CAST $15 $1 :i64 + EQ $16 $15 $14 :bool + AND $17 $12 $16 :bool + RETURN $17 :bool diff --git a/nautilus/test/data/control-flow-tests/after_ssa/complexLogicalExpressions.trace b/nautilus/test/data/control-flow-tests/after_ssa/complexLogicalExpressions.trace index 8034751d..f6027263 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/complexLogicalExpressions.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/complexLogicalExpressions.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CONST $5 10 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CONST $8 15 :i32 - GT $9 $1 $8 :bool - CONST $10 20 :i32 - LT $11 $1 $10 :bool - AND $12 $9 $11 :bool - OR $13 $7 $12 :bool - CMP $14 $13 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CONST $5 10 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CONST $8 15 :i32 + GT $9 $1 $8 :bool + CONST $10 20 :i32 + LT $11 $1 $10 :bool + AND $12 $9 $11 :bool + OR $13 $7 $12 :bool + CMP $14 $13 B1() B2($2) :void B1() - CONST $15 1 :i32 - JMP $0 B3($15) :void + CONST $15 1 :i32 + JMP $0 B3($15) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/compoundAssignment.trace b/nautilus/test/data/control-flow-tests/after_ssa/compoundAssignment.trace index 0e940fc8..dd14692b 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/compoundAssignment.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/compoundAssignment.trace @@ -1,13 +1,13 @@ B0($1:i32) - CONST $2 10 :i32 - CONST $3 5 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1($2) B2($2) :void + CONST $2 10 :i32 + CONST $3 5 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1($2) B2($2) :void B1($2:i32) - CONST $6 5 :i32 - ADD $7 $2 $6 :i32 - JMP $0 B3($7) :void + CONST $6 5 :i32 + ADD $7 $2 $6 :i32 + JMP $0 B3($7) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/compoundStatements.trace b/nautilus/test/data/control-flow-tests/after_ssa/compoundStatements.trace index 127ee009..adc9ed8a 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/compoundStatements.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/compoundStatements.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2($2) :void B1() - CONST $6 1 :i32 - CONST $7 2 :i32 - MUL $8 $6 $7 :i32 - JMP $0 B3($8) :void + CONST $6 1 :i32 + CONST $7 2 :i32 + MUL $8 $6 $7 :i32 + JMP $0 B3($8) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject.trace b/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject.trace index ae855187..24c77247 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject.trace @@ -1,21 +1,21 @@ B0($1:i32,$2:i32) - GT $5 $1 $2 :bool - CMP $6 $5 B1($2,$1) B2() :void + GT $5 $1 $2 :bool + CMP $6 $5 B1($2,$1) B2() :void B1($4:i32,$3:i32) - CONST $9 1 :i32 - ADD $10 $3 $9 :i32 - CONST $11 1 :i32 - ADD $12 $4 $11 :i32 - ADD $13 $10 $12 :i32 - JMP $0 B3($13) :void + CONST $9 1 :i32 + ADD $10 $3 $9 :i32 + CONST $11 1 :i32 + ADD $12 $4 $11 :i32 + ADD $13 $10 $12 :i32 + JMP $0 B3($13) :void B2() - CONST $16 0 :i32 - CONST $17 0 :i32 - CONST $18 1 :i32 - ADD $19 $16 $18 :i32 - CONST $20 1 :i32 - ADD $21 $17 $20 :i32 - ADD $22 $19 $21 :i32 - JMP $0 B3($22) :void + CONST $16 0 :i32 + CONST $17 0 :i32 + CONST $18 1 :i32 + ADD $19 $16 $18 :i32 + CONST $20 1 :i32 + ADD $21 $17 $20 :i32 + ADD $22 $19 $21 :i32 + JMP $0 B3($22) :void B3($13:i32) - RETURN $13 :i32 + RETURN $13 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject2.trace b/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject2.trace index 44fc5051..f1471ab5 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject2.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/constructComplexReturnObject2.trace @@ -1,25 +1,25 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - GT $8 $1 $2 :bool - CMP $9 $8 B1($2,$1) B2() :void + CONST $3 0 :i32 + GT $8 $1 $2 :bool + CMP $9 $8 B1($2,$1) B2() :void B1($7:i32,$6:i32) - CONST $12 1 :i32 - ADD $13 $6 $12 :i32 - CONST $14 1 :i32 - ADD $15 $7 $14 :i32 - ADD $16 $13 $15 :i32 - CONST $17 42 :i32 - JMP $0 B3($16,$17) :void + CONST $12 1 :i32 + ADD $13 $6 $12 :i32 + CONST $14 1 :i32 + ADD $15 $7 $14 :i32 + ADD $16 $13 $15 :i32 + CONST $17 42 :i32 + JMP $0 B3($16,$17) :void B2() - CONST $21 0 :i32 - CONST $22 0 :i32 - CONST $23 1 :i32 - ADD $24 $21 $23 :i32 - CONST $25 1 :i32 - ADD $26 $22 $25 :i32 - ADD $27 $24 $26 :i32 - CONST $28 42 :i32 - JMP $0 B3($27,$28) :void + CONST $21 0 :i32 + CONST $22 0 :i32 + CONST $23 1 :i32 + ADD $24 $21 $23 :i32 + CONST $25 1 :i32 + ADD $26 $22 $25 :i32 + ADD $27 $24 $26 :i32 + CONST $28 42 :i32 + JMP $0 B3($27,$28) :void B3($3:i32,$17:i32) ControlFlowMerge - ADD $18 $3 $17 :i32 - RETURN $18 :i32 + ADD $18 $3 $17 :i32 + RETURN $18 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseCondition.trace index 700e2451..63614521 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseCondition.trace @@ -1,47 +1,47 @@ B0() - CONST $1 5 :i32 - CONST $2 8 :i32 - LT $3 $1 $2 :bool - CMP $4 $3 B1($1) B2($1) :void + CONST $1 5 :i32 + CONST $2 8 :i32 + LT $3 $1 $2 :bool + CMP $4 $3 B1($1) B2($1) :void B1($1:i32) - CONST $5 6 :i32 - GT $6 $1 $5 :bool - CMP $7 $6 B3($1) B4($1) :void + CONST $5 6 :i32 + GT $6 $1 $5 :bool + CMP $7 $6 B3($1) B4($1) :void B2($1:i32) - CONST $13 20 :i32 - ADD $14 $1 $13 :i32 - CONST $15 2 :i32 - JMP $0 B5($14,$15) :void + CONST $13 20 :i32 + ADD $14 $1 $13 :i32 + CONST $15 2 :i32 + JMP $0 B5($14,$15) :void B3($1:i32) - CONST $8 10 :i32 - ADD $9 $1 $8 :i32 - CONST $10 2 :i32 - JMP $0 B5($9,$10) :void + CONST $8 10 :i32 + ADD $9 $1 $8 :i32 + CONST $10 2 :i32 + JMP $0 B5($9,$10) :void B4($1:i32) - CONST $16 6 :i32 - LT $17 $1 $16 :bool - CMP $18 $17 B6($1) B7($1) :void + CONST $16 6 :i32 + LT $17 $1 $16 :bool + CMP $18 $17 B6($1) B7($1) :void B5($1:i32,$10:i32) ControlFlowMerge - JMP $0 B10($1,$10) :void + JMP $0 B10($1,$10) :void B6($1:i32) - CONST $19 5 :i32 - EQ $20 $1 $19 :bool - CMP $21 $20 B8($1) B9($1) :void + CONST $19 5 :i32 + EQ $20 $1 $19 :bool + CMP $21 $20 B8($1) B9($1) :void B7($1:i32) - CONST $25 2 :i32 - JMP $0 B11($1,$25) :void + CONST $25 2 :i32 + JMP $0 B11($1,$25) :void B8($1:i32) - CONST $22 5 :i32 - ADD $23 $1 $22 :i32 - CONST $24 2 :i32 - JMP $0 B10($23,$24) :void + CONST $22 5 :i32 + ADD $23 $1 $22 :i32 + CONST $24 2 :i32 + JMP $0 B10($23,$24) :void B9($1:i32) - CONST $26 2 :i32 - JMP $0 B12($1,$26) :void + CONST $26 2 :i32 + JMP $0 B12($1,$26) :void B10($1:i32,$10:i32) ControlFlowMerge - JMP $0 B11($1,$10) :void + JMP $0 B11($1,$10) :void B11($1:i32,$10:i32) ControlFlowMerge - JMP $0 B12($1,$10) :void + JMP $0 B12($1,$10) :void B12($1:i32,$10:i32) ControlFlowMerge - ADD $11 $1 $10 :i32 - RETURN $11 :i32 + ADD $11 $1 $10 :i32 + RETURN $11 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseIfCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseIfCondition.trace index b36b2d7e..2a03b4d3 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/deeplyNestedIfElseIfCondition.trace @@ -1,38 +1,38 @@ B0() - CONST $1 5 :i32 - CONST $2 8 :i32 - LT $3 $1 $2 :bool - CMP $4 $3 B1($1) B2($1) :void + CONST $1 5 :i32 + CONST $2 8 :i32 + LT $3 $1 $2 :bool + CMP $4 $3 B1($1) B2($1) :void B1($1:i32) - CONST $5 10 :i32 - ADD $6 $1 $5 :i32 - CONST $7 2 :i32 - JMP $0 B5($6,$7) :void + CONST $5 10 :i32 + ADD $6 $1 $5 :i32 + CONST $7 2 :i32 + JMP $0 B5($6,$7) :void B2($1:i32) - CONST $10 5 :i32 - EQ $11 $1 $10 :bool - CMP $12 $11 B3($1) B4($1) :void + CONST $10 5 :i32 + EQ $11 $1 $10 :bool + CMP $12 $11 B3($1) B4($1) :void B3($1:i32) - CONST $13 5 :i32 - ADD $14 $1 $13 :i32 - CONST $15 2 :i32 - JMP $0 B5($14,$15) :void + CONST $13 5 :i32 + ADD $14 $1 $13 :i32 + CONST $15 2 :i32 + JMP $0 B5($14,$15) :void B4($1:i32) - CONST $16 4 :i32 - EQ $17 $1 $16 :bool - CMP $18 $17 B6($1) B7($1) :void + CONST $16 4 :i32 + EQ $17 $1 $16 :bool + CMP $18 $17 B6($1) B7($1) :void B5($1:i32,$7:i32) ControlFlowMerge - JMP $0 B8($1,$7) :void + JMP $0 B8($1,$7) :void B6($1:i32) - CONST $19 4 :i32 - ADD $20 $1 $19 :i32 - CONST $21 2 :i32 - JMP $0 B8($20,$21) :void + CONST $19 4 :i32 + ADD $20 $1 $19 :i32 + CONST $21 2 :i32 + JMP $0 B8($20,$21) :void B7($1:i32) - CONST $22 2 :i32 - JMP $0 B9($1,$22) :void + CONST $22 2 :i32 + JMP $0 B9($1,$22) :void B8($1:i32,$7:i32) ControlFlowMerge - JMP $0 B9($1,$7) :void + JMP $0 B9($1,$7) :void B9($1:i32,$7:i32) ControlFlowMerge - ADD $8 $1 $7 :i32 - RETURN $8 :i32 + ADD $8 $1 $7 :i32 + RETURN $8 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/doubleIfCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/doubleIfCondition.trace index 68e524de..e475beab 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/doubleIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/doubleIfCondition.trace @@ -1,25 +1,25 @@ B0() - CONST $1 1 :i32 - CONST $2 8 :i32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1($1) B2($1) :void + CONST $1 1 :i32 + CONST $2 8 :i32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1($1) B2($1) :void B1($1:i32) - CONST $5 1 :i32 - JMP $0 B5($1,$5) :void + CONST $5 1 :i32 + JMP $0 B5($1,$5) :void B2($1:i32) - CONST $13 1 :i32 - JMP $0 B5($1,$13) :void + CONST $13 1 :i32 + JMP $0 B5($1,$13) :void B3($1:i32) - CONST $8 20 :i32 - ADD $9 $1 $8 :i32 - CONST $10 2 :i32 - JMP $0 B6($9,$10) :void + CONST $8 20 :i32 + ADD $9 $1 $8 :i32 + CONST $10 2 :i32 + JMP $0 B6($9,$10) :void B4($1:i32) - CONST $14 2 :i32 - JMP $0 B6($1,$14) :void + CONST $14 2 :i32 + JMP $0 B6($1,$14) :void B5($1:i32,$5:i32) ControlFlowMerge - EQ $6 $1 $5 :bool - CMP $7 $6 B3($1) B4($1) :void + EQ $6 $1 $5 :bool + CMP $7 $6 B3($1) B4($1) :void B6($1:i32,$10:i32) ControlFlowMerge - ADD $11 $1 $10 :i32 - RETURN $11 :i32 + ADD $11 $1 $10 :i32 + RETURN $11 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfCondition.trace index 8cf864a3..9ad21aa1 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfCondition.trace @@ -1,27 +1,27 @@ B0() - CONST $1 1 :i32 - CONST $2 8 :i32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1($1) B2($1) :void + CONST $1 1 :i32 + CONST $2 8 :i32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1($1) B2($1) :void B1($1:i32) - CONST $5 14 :i32 - ADD $6 $1 $5 :i32 - CONST $7 2 :i32 - JMP $0 B5($6,$7) :void + CONST $5 14 :i32 + ADD $6 $1 $5 :i32 + CONST $7 2 :i32 + JMP $0 B5($6,$7) :void B2($1:i32) - CONST $10 1 :i32 - EQ $11 $1 $10 :bool - CMP $12 $11 B3($1) B4($1) :void + CONST $10 1 :i32 + EQ $11 $1 $10 :bool + CMP $12 $11 B3($1) B4($1) :void B3($1:i32) - CONST $13 20 :i32 - ADD $14 $1 $13 :i32 - CONST $15 2 :i32 - JMP $0 B5($14,$15) :void + CONST $13 20 :i32 + ADD $14 $1 $13 :i32 + CONST $15 2 :i32 + JMP $0 B5($14,$15) :void B4($1:i32) - CONST $16 2 :i32 - JMP $0 B6($1,$16) :void + CONST $16 2 :i32 + JMP $0 B6($1,$16) :void B5($1:i32,$7:i32) ControlFlowMerge - JMP $0 B6($1,$7) :void + JMP $0 B6($1,$7) :void B6($1:i32,$7:i32) ControlFlowMerge - ADD $8 $1 $7 :i32 - RETURN $8 :i32 + ADD $8 $1 $7 :i32 + RETURN $8 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfElse.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfElse.trace index 77caeb2b..d9b17719 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfElse.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfElse.trace @@ -1,20 +1,20 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2($1) :void + CONST $2 0 :i32 + CONST $3 0 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2($1) :void B1() - CONST $6 10 :i32 - JMP $0 B5($6) :void + CONST $6 10 :i32 + JMP $0 B5($6) :void B2($1:i32) - CONST $8 1 :i32 - EQ $9 $1 $8 :bool - CMP $10 $9 B3() B4() :void + CONST $8 1 :i32 + EQ $9 $1 $8 :bool + CMP $10 $9 B3() B4() :void B3() - CONST $11 20 :i32 - JMP $0 B5($11) :void + CONST $11 20 :i32 + JMP $0 B5($11) :void B4() - CONST $13 30 :i32 - JMP $0 B5($13) :void + CONST $13 30 :i32 + JMP $0 B5($13) :void B5($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfOnly.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfOnly.trace index e913dd5b..4277c54d 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfOnly.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifElseIfOnly.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1() B2($1,$2) :void + CONST $2 0 :i32 + CONST $3 5 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1() B2($1,$2) :void B1() - CONST $6 1 :i32 - JMP $0 B5($6) :void + CONST $6 1 :i32 + JMP $0 B5($6) :void B2($1:i32,$2:i32) - CONST $8 10 :i32 - LT $9 $1 $8 :bool - CMP $10 $9 B3() B4($2) :void + CONST $8 10 :i32 + LT $9 $1 $8 :bool + CMP $10 $9 B3() B4($2) :void B3() - CONST $11 2 :i32 - JMP $0 B5($11) :void + CONST $11 2 :i32 + JMP $0 B5($11) :void B4($2:i32) - JMP $0 B5($2) :void + JMP $0 B5($2) :void B5($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifNotEqual.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifNotEqual.trace index 09b8f404..4a586b43 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifNotEqual.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifNotEqual.trace @@ -1,12 +1,12 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 5 :i32 - NEQ $4 $1 $3 :bool - CMP $5 $4 B1() B2($2) :void + CONST $2 1 :i32 + CONST $3 5 :i32 + NEQ $4 $1 $3 :bool + CMP $5 $4 B1() B2($2) :void B1() - CONST $6 2 :i32 - JMP $0 B3($6) :void + CONST $6 2 :i32 + JMP $0 B3($6) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifThenCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifThenCondition.trace index db7eafd5..be2a5bbb 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifThenCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifThenCondition.trace @@ -1,16 +1,16 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1($2) B2($2) :void + CONST $2 1 :i32 + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1($2) B2($2) :void B1($2:i32) - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - CONST $8 42 :i32 - JMP $0 B3($7,$8) :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + CONST $8 42 :i32 + JMP $0 B3($7,$8) :void B2($2:i32) - CONST $11 42 :i32 - JMP $0 B3($2,$11) :void + CONST $11 42 :i32 + JMP $0 B3($2,$11) :void B3($2:i32,$8:i32) ControlFlowMerge - ADD $9 $2 $8 :i32 - RETURN $9 :i32 + ADD $9 $2 $8 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifThenElseCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifThenElseCondition.trace index db6d95c9..9aced513 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifThenElseCondition.trace @@ -1,18 +1,18 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1($2) B2($2) :void + CONST $2 1 :i32 + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1($2) B2($2) :void B1($2:i32) - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - CONST $8 42 :i32 - JMP $0 B3($7,$8) :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + CONST $8 42 :i32 + JMP $0 B3($7,$8) :void B2($2:i32) - CONST $11 42 :i32 - ADD $12 $2 $11 :i32 - CONST $13 42 :i32 - JMP $0 B3($12,$13) :void + CONST $11 42 :i32 + ADD $12 $2 $11 :i32 + CONST $13 42 :i32 + JMP $0 B3($12,$13) :void B3($2:i32,$8:i32) ControlFlowMerge - ADD $9 $2 $8 :i32 - RETURN $9 :i32 + ADD $9 $2 $8 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifWithFunctionCall.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifWithFunctionCall.trace index ebff2bfe..23998b97 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifWithFunctionCall.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifWithFunctionCall.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $4 2 :i32 - MUL $5 $1 $4 :i32 - CONST $6 10 :i32 - GT $7 $5 $6 :bool - CMP $8 $7 B1() B2($2) :void + CONST $2 0 :i32 + CONST $4 2 :i32 + MUL $5 $1 $4 :i32 + CONST $6 10 :i32 + GT $7 $5 $6 :bool + CMP $8 $7 B1() B2($2) :void B1() - CONST $9 1 :i32 - JMP $0 B3($9) :void + CONST $9 1 :i32 + JMP $0 B3($9) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/ifWithTernary.trace b/nautilus/test/data/control-flow-tests/after_ssa/ifWithTernary.trace index 7d2f3be0..64f63066 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/ifWithTernary.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/ifWithTernary.trace @@ -1,22 +1,22 @@ B0($1:i32) - CONST $2 5 :i32 - GT $3 $1 $2 :bool - CMP $4 $3 B1($1) B2($1) :void + CONST $2 5 :i32 + GT $3 $1 $2 :bool + CMP $4 $3 B1($1) B2($1) :void B1($1:i32) - CONST $5 10 :i32 - CONST $6 0 :i32 - JMP $0 B5($1,$6,$5) :void + CONST $5 10 :i32 + CONST $6 0 :i32 + JMP $0 B5($1,$6,$5) :void B2($1:i32) - CONST $11 5 :i32 - CONST $12 0 :i32 - JMP $0 B5($1,$12,$11) :void + CONST $11 5 :i32 + CONST $12 0 :i32 + JMP $0 B5($1,$12,$11) :void B3() - CONST $9 -1 :i32 - JMP $0 B6($9) :void + CONST $9 -1 :i32 + JMP $0 B6($9) :void B4($5:i32) - JMP $0 B6($5) :void + JMP $0 B6($5) :void B5($1:i32,$6:i32,$5:i32) ControlFlowMerge - EQ $7 $1 $6 :bool - CMP $8 $7 B3() B4($5) :void + EQ $7 $1 $6 :bool + CMP $8 $7 B3() B4($5) :void B6($5:i32) - RETURN $5 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/logicalAnd.trace b/nautilus/test/data/control-flow-tests/after_ssa/logicalAnd.trace index d8bd92c8..2ea78cc3 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/logicalAnd.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/logicalAnd.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CONST $5 15 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CMP $8 $7 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CONST $5 15 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CMP $8 $7 B1() B2($2) :void B1() - CONST $9 1 :i32 - JMP $0 B3($9) :void + CONST $9 1 :i32 + JMP $0 B3($9) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/logicalOr.trace b/nautilus/test/data/control-flow-tests/after_ssa/logicalOr.trace index 7038ce8b..034e816f 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/logicalOr.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/logicalOr.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - EQ $4 $1 $3 :bool - CONST $5 20 :i32 - EQ $6 $1 $5 :bool - OR $7 $4 $6 :bool - CMP $8 $7 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 10 :i32 + EQ $4 $1 $3 :bool + CONST $5 20 :i32 + EQ $6 $1 $5 :bool + OR $7 $4 $6 :bool + CMP $8 $7 B1() B2($2) :void B1() - CONST $9 1 :i32 - JMP $0 B3($9) :void + CONST $9 1 :i32 + JMP $0 B3($9) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/logicalXOR.trace b/nautilus/test/data/control-flow-tests/after_ssa/logicalXOR.trace index 4597d543..694c6c25 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/logicalXOR.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/logicalXOR.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - LT $4 $1 $3 :bool - CONST $5 5 :i32 - GT $6 $1 $5 :bool - NEQ $7 $4 $6 :bool - CMP $8 $7 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 10 :i32 + LT $4 $1 $3 :bool + CONST $5 5 :i32 + GT $6 $1 $5 :bool + NEQ $7 $4 $6 :bool + CMP $8 $7 B1() B2($2) :void B1() - CONST $9 1 :i32 - JMP $0 B3($9) :void + CONST $9 1 :i32 + JMP $0 B3($9) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/multipleConditions.trace b/nautilus/test/data/control-flow-tests/after_ssa/multipleConditions.trace index 531e2d65..a13f9c77 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/multipleConditions.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/multipleConditions.trace @@ -1,18 +1,18 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - GT $4 $1 $3 :bool - CONST $5 10 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CONST $8 20 :i32 - EQ $9 $1 $8 :bool - OR $10 $7 $9 :bool - CMP $11 $10 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 0 :i32 + GT $4 $1 $3 :bool + CONST $5 10 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CONST $8 20 :i32 + EQ $9 $1 $8 :bool + OR $10 $7 $9 :bool + CMP $11 $10 B1() B2($2) :void B1() - CONST $12 1 :i32 - JMP $0 B3($12) :void + CONST $12 1 :i32 + JMP $0 B3($12) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/multipleElse.trace b/nautilus/test/data/control-flow-tests/after_ssa/multipleElse.trace index 3f1ffb92..33bb17c5 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/multipleElse.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/multipleElse.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2($1) :void + CONST $2 0 :i32 + CONST $3 10 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2($1) :void B1() - CONST $6 1 :i32 - JMP $0 B5($6) :void + CONST $6 1 :i32 + JMP $0 B5($6) :void B2($1:i32) - CONST $8 2 :i32 - CONST $9 5 :i32 - EQ $10 $1 $9 :bool - CMP $11 $10 B3() B4() :void + CONST $8 2 :i32 + CONST $9 5 :i32 + EQ $10 $1 $9 :bool + CMP $11 $10 B3() B4() :void B3() - CONST $12 3 :i32 - JMP $0 B5($12) :void + CONST $12 3 :i32 + JMP $0 B5($12) :void B4() - CONST $14 4 :i32 - JMP $0 B5($14) :void + CONST $14 4 :i32 + JMP $0 B5($14) :void B5($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/multipleVoidReturnsFunction.trace b/nautilus/test/data/control-flow-tests/after_ssa/multipleVoidReturnsFunction.trace index 2277f468..caee60e0 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/multipleVoidReturnsFunction.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/multipleVoidReturnsFunction.trace @@ -1,15 +1,15 @@ B0($1:ptr) - LOAD $4 $1 :i32 - CONST $5 10 :i32 - GT $6 $4 $5 :bool - CMP $7 $6 B1($1) B2($1) :void + LOAD $4 $1 :i32 + CONST $5 10 :i32 + GT $6 $4 $5 :bool + CMP $7 $6 B1($1) B2($1) :void B1($1:ptr) - CONST $10 1 :i32 - STORE $1 $10 :i32 - JMP $0 B3() :void + CONST $10 1 :i32 + STORE $1 $10 :i32 + JMP $0 B3() :void B2($1:ptr) - CONST $14 42 :i32 - STORE $1 $14 :i32 - JMP $0 B3() :void + CONST $14 42 :i32 + STORE $1 $14 :i32 + JMP $0 B3() :void B3() - RETURN $0 :void + RETURN $0 :void diff --git a/nautilus/test/data/control-flow-tests/after_ssa/nestedIf.trace b/nautilus/test/data/control-flow-tests/after_ssa/nestedIf.trace index 7b87c8d1..f57c4ab9 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/nestedIf.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/nestedIf.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 20 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1($1) B2($2) :void + CONST $2 1 :i32 + CONST $3 20 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1($1) B2($2) :void B1($1:i32) - CONST $6 10 :i32 - GT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 10 :i32 + GT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2($2:i32) - JMP $0 B5($2) :void + JMP $0 B5($2) :void B3() - CONST $9 2 :i32 - JMP $0 B5($9) :void + CONST $9 2 :i32 + JMP $0 B5($9) :void B4() - CONST $12 3 :i32 - JMP $0 B5($12) :void + CONST $12 3 :i32 + JMP $0 B5($12) :void B5($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfElseDifferentLevels.trace b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfElseDifferentLevels.trace index 2bcf08da..7ec3964f 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfElseDifferentLevels.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfElseDifferentLevels.trace @@ -1,27 +1,27 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1($1) B2() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1($1) B2() :void B1($1:i32) - CONST $6 5 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4($1) :void + CONST $6 5 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4($1) :void B2() - CONST $11 -1 :i32 - JMP $0 B7($11) :void + CONST $11 -1 :i32 + JMP $0 B7($11) :void B3() - CONST $9 1 :i32 - JMP $0 B7($9) :void + CONST $9 1 :i32 + JMP $0 B7($9) :void B4($1:i32) - CONST $13 2 :i32 - CONST $14 6 :i32 - EQ $15 $1 $14 :bool - CMP $16 $15 B5() B6($13) :void + CONST $13 2 :i32 + CONST $14 6 :i32 + EQ $15 $1 $14 :bool + CMP $16 $15 B5() B6($13) :void B5() - CONST $17 3 :i32 - JMP $0 B7($17) :void + CONST $17 3 :i32 + JMP $0 B7($17) :void B6($2:i32) - JMP $0 B7($2) :void + JMP $0 B7($2) :void B7($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfNoElseCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfNoElseCondition.trace index 4f734186..14a7cd09 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfNoElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfNoElseCondition.trace @@ -1,28 +1,28 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1($2) B2($2) :void + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1($2) B2($2) :void B1($2:i32) - CONST $6 4 :i32 - ADD $7 $2 $6 :i32 - CONST $8 2 :i32 - JMP $0 B5($7,$8) :void + CONST $6 4 :i32 + ADD $7 $2 $6 :i32 + CONST $8 2 :i32 + JMP $0 B5($7,$8) :void B2($2:i32) - CONST $13 9 :i32 - ADD $14 $2 $13 :i32 - CONST $15 8 :i32 - EQ $16 $14 $15 :bool - CMP $17 $16 B3($14) B4($14) :void + CONST $13 9 :i32 + ADD $14 $2 $13 :i32 + CONST $15 8 :i32 + EQ $16 $14 $15 :bool + CMP $17 $16 B3($14) B4($14) :void B3($2:i32) - CONST $18 14 :i32 - ADD $19 $2 $18 :i32 - CONST $20 2 :i32 - JMP $0 B5($2,$20) :void + CONST $18 14 :i32 + ADD $19 $2 $18 :i32 + CONST $20 2 :i32 + JMP $0 B5($2,$20) :void B4($2:i32) - CONST $23 2 :i32 - JMP $0 B6($2,$23) :void + CONST $23 2 :i32 + JMP $0 B6($2,$23) :void B5($2:i32,$8:i32) ControlFlowMerge - JMP $0 B6($2,$8) :void + JMP $0 B6($2,$8) :void B6($2:i32,$8:i32) ControlFlowMerge - ADD $9 $2 $8 :i32 - RETURN $9 :i32 + ADD $9 $2 $8 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfThenElseCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfThenElseCondition.trace index 51dfe96f..6f5cf778 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/nestedIfThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/nestedIfThenElseCondition.trace @@ -1,24 +1,24 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1($2) B2($2) :void + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1($2) B2($2) :void B1($2:i32) - CONST $6 2 :i32 - JMP $0 B5($2,$6) :void + CONST $6 2 :i32 + JMP $0 B5($2,$6) :void B2($2:i32) - CONST $11 8 :i32 - EQ $12 $2 $11 :bool - CMP $13 $12 B3($2) B4($2) :void + CONST $11 8 :i32 + EQ $12 $2 $11 :bool + CMP $13 $12 B3($2) B4($2) :void B3($2:i32) - CONST $14 2 :i32 - JMP $0 B5($2,$14) :void + CONST $14 2 :i32 + JMP $0 B5($2,$14) :void B4($2:i32) - CONST $17 2 :i32 - ADD $18 $2 $17 :i32 - CONST $19 2 :i32 - JMP $0 B6($18,$19) :void + CONST $17 2 :i32 + ADD $18 $2 $17 :i32 + CONST $19 2 :i32 + JMP $0 B6($18,$19) :void B5($2:i32,$6:i32) ControlFlowMerge - JMP $0 B6($2,$6) :void + JMP $0 B6($2,$6) :void B6($2:i32,$6:i32) ControlFlowMerge - ADD $7 $2 $6 :i32 - RETURN $7 :i32 + ADD $7 $2 $6 :i32 + RETURN $7 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/orCondition.trace b/nautilus/test/data/control-flow-tests/after_ssa/orCondition.trace index 20277c27..7d5f2c24 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/orCondition.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/orCondition.trace @@ -1,16 +1,16 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 8 :i32 - EQ $4 $1 $3 :bool - CONST $5 1 :i32 - EQ $6 $1 $5 :bool - OR $7 $4 $6 :bool - CMP $8 $7 B1($2) B2($2) :void + CONST $2 1 :i32 + CONST $3 8 :i32 + EQ $4 $1 $3 :bool + CONST $5 1 :i32 + EQ $6 $1 $5 :bool + OR $7 $4 $6 :bool + CMP $8 $7 B1($2) B2($2) :void B1($2:i32) - CONST $9 14 :i32 - ADD $10 $2 $9 :i32 - JMP $0 B3($10) :void + CONST $9 14 :i32 + ADD $10 $2 $9 :i32 + JMP $0 B3($10) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/shortCircuitEvaluation.trace b/nautilus/test/data/control-flow-tests/after_ssa/shortCircuitEvaluation.trace index 07dd0a20..05dc85ff 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/shortCircuitEvaluation.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/shortCircuitEvaluation.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - NEQ $4 $1 $3 :bool - CONST $5 10 :i32 - DIV $6 $5 $1 :i32 - CONST $7 1 :i32 - GT $8 $6 $7 :bool - AND $9 $4 $8 :bool - CMP $10 $9 B1() B2($2) :void + CONST $2 0 :i32 + CONST $3 0 :i32 + NEQ $4 $1 $3 :bool + CONST $5 10 :i32 + DIV $6 $5 $1 :i32 + CONST $7 1 :i32 + GT $8 $6 $7 :bool + AND $9 $4 $8 :bool + CMP $10 $9 B1() B2($2) :void B1() - CONST $11 1 :i32 - JMP $0 B3($11) :void + CONST $11 1 :i32 + JMP $0 B3($11) :void B2($2:i32) - JMP $0 B3($2) :void + JMP $0 B3($2) :void B3($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/after_ssa/varyingComplexity.trace b/nautilus/test/data/control-flow-tests/after_ssa/varyingComplexity.trace index 4431d9c0..6955251f 100644 --- a/nautilus/test/data/control-flow-tests/after_ssa/varyingComplexity.trace +++ b/nautilus/test/data/control-flow-tests/after_ssa/varyingComplexity.trace @@ -1,31 +1,31 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1() B2($1) :void + CONST $2 0 :i32 + CONST $3 5 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1() B2($1) :void B1() - CONST $6 1 :i32 - JMP $0 B7($6) :void + CONST $6 1 :i32 + JMP $0 B7($6) :void B2($1:i32) - CONST $8 5 :i32 - GTE $9 $1 $8 :bool - CONST $10 10 :i32 - LTE $11 $1 $10 :bool - AND $12 $9 $11 :bool - CMP $13 $12 B3($1) B4() :void + CONST $8 5 :i32 + GTE $9 $1 $8 :bool + CONST $10 10 :i32 + LTE $11 $1 $10 :bool + AND $12 $9 $11 :bool + CMP $13 $12 B3($1) B4() :void B3($1:i32) - CONST $14 2 :i32 - CONST $15 7 :i32 - EQ $16 $1 $15 :bool - CMP $17 $16 B5($14) B6($14) :void + CONST $14 2 :i32 + CONST $15 7 :i32 + EQ $16 $1 $15 :bool + CMP $17 $16 B5($14) B6($14) :void B4() - CONST $21 3 :i32 - JMP $0 B7($21) :void + CONST $21 3 :i32 + JMP $0 B7($21) :void B5($2:i32) - CONST $18 1 :i32 - ADD $19 $2 $18 :i32 - JMP $0 B7($19) :void + CONST $18 1 :i32 + ADD $19 $2 $18 :i32 + JMP $0 B7($19) :void B6($2:i32) - JMP $0 B7($2) :void + JMP $0 B7($2) :void B7($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/ir/andCondition.trace b/nautilus/test/data/control-flow-tests/ir/andCondition.trace index c3f0bca5..b78a5c91 100644 --- a/nautilus/test/data/control-flow-tests/ir/andCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/andCondition.trace @@ -1,23 +1,23 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 1 :i32 - $4 = 8 :i32 - $5 = $1 == $4 :bool - $6 = 1 :i32 - $7 = $2 == $6 :bool - $8 = $5 and $7 :bool - if $8 ? Block_1($3) : Block_2($3) :void + $3 = 1 :i32 + $4 = 8 :i32 + $5 = $1 == $4 :bool + $6 = 1 :i32 + $7 = $2 == $6 :bool + $8 = $5 and $7 :bool + if $8 ? Block_1($3) : Block_2($3) :void Block_1($3:i32): - $10 = 14 :i32 - $11 = $3 + $10 :i32 - br Block_3($11) :void + $10 = 14 :i32 + $11 = $3 + $10 :i32 + br Block_3($11) :void Block_3($3:i32): - return ($3) :i32 + return ($3) :i32 Block_2($3:i32): - br Block_3($3) :void + br Block_3($3) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/andFunction.trace b/nautilus/test/data/control-flow-tests/ir/andFunction.trace index 2d6e58fe..f7aed42a 100644 --- a/nautilus/test/data/control-flow-tests/ir/andFunction.trace +++ b/nautilus/test/data/control-flow-tests/ir/andFunction.trace @@ -1,19 +1,19 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :bool - $4 = 42 :i64 - $5 = $1 cast_to i64 :i64 - $6 = $5 == $4 :bool - $7 = $2 and $6 :bool - $9 = 42 :i64 - $10 = $1 cast_to i64 :i64 - $11 = $10 == $9 :bool - $12 = $7 and $11 :bool - $14 = 42 :i64 - $15 = $1 cast_to i64 :i64 - $16 = $15 == $14 :bool - $17 = $12 and $16 :bool - return ($17) :bool + $2 = true :bool + $4 = 42 :i64 + $5 = $1 cast_to i64 :i64 + $6 = $5 == $4 :bool + $7 = $2 and $6 :bool + $9 = 42 :i64 + $10 = $1 cast_to i64 :i64 + $11 = $10 == $9 :bool + $12 = $7 and $11 :bool + $14 = 42 :i64 + $15 = $1 cast_to i64 :i64 + $16 = $15 == $14 :bool + $17 = $12 and $16 :bool + return ($17) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/complexLogicalExpressions.trace b/nautilus/test/data/control-flow-tests/ir/complexLogicalExpressions.trace index f934ee24..feaea4c3 100644 --- a/nautilus/test/data/control-flow-tests/ir/complexLogicalExpressions.trace +++ b/nautilus/test/data/control-flow-tests/ir/complexLogicalExpressions.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 5 :i32 - $4 = $1 > $3 :bool - $5 = 10 :i32 - $6 = $1 < $5 :bool - $7 = $4 and $6 :bool - $8 = 15 :i32 - $9 = $1 > $8 :bool - $10 = 20 :i32 - $11 = $1 < $10 :bool - $12 = $9 and $11 :bool - $13 = $7 or $12 :bool - if $13 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 5 :i32 + $4 = $1 > $3 :bool + $5 = 10 :i32 + $6 = $1 < $5 :bool + $7 = $4 and $6 :bool + $8 = 15 :i32 + $9 = $1 > $8 :bool + $10 = 20 :i32 + $11 = $1 < $10 :bool + $12 = $9 and $11 :bool + $13 = $7 or $12 :bool + if $13 ? Block_1() : Block_2($2) :void Block_1(): - $15 = 1 :i32 - br Block_3($15) :void + $15 = 1 :i32 + br Block_3($15) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/compoundAssignment.trace b/nautilus/test/data/control-flow-tests/ir/compoundAssignment.trace index 37ebf0fa..4bb39dfc 100644 --- a/nautilus/test/data/control-flow-tests/ir/compoundAssignment.trace +++ b/nautilus/test/data/control-flow-tests/ir/compoundAssignment.trace @@ -1,20 +1,20 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 10 :i32 - $3 = 5 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1($2) : Block_2($2) :void + $2 = 10 :i32 + $3 = 5 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $6 = 5 :i32 - $7 = $2 + $6 :i32 - br Block_3($7) :void + $6 = 5 :i32 + $7 = $2 + $6 :i32 + br Block_3($7) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/compoundStatements.trace b/nautilus/test/data/control-flow-tests/ir/compoundStatements.trace index f937a8ef..ad69a665 100644 --- a/nautilus/test/data/control-flow-tests/ir/compoundStatements.trace +++ b/nautilus/test/data/control-flow-tests/ir/compoundStatements.trace @@ -1,21 +1,21 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 5 :i32 - $4 = $1 > $3 :bool - if $4 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 5 :i32 + $4 = $1 > $3 :bool + if $4 ? Block_1() : Block_2($2) :void Block_1(): - $6 = 1 :i32 - $7 = 2 :i32 - $8 = $6 * $7 :i32 - br Block_3($8) :void + $6 = 1 :i32 + $7 = 2 :i32 + $8 = $6 * $7 :i32 + br Block_3($8) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject.trace b/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject.trace index a71d4908..3eeb1448 100644 --- a/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject.trace +++ b/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $5 = $1 > $2 :bool - if $5 ? Block_1($2, $1) : Block_2() :void + $5 = $1 > $2 :bool + if $5 ? Block_1($2, $1) : Block_2() :void Block_1($4:i32, $3:i32): - $9 = 1 :i32 - $10 = $3 + $9 :i32 - $11 = 1 :i32 - $12 = $4 + $11 :i32 - $13 = $10 + $12 :i32 - br Block_3($13) :void + $9 = 1 :i32 + $10 = $3 + $9 :i32 + $11 = 1 :i32 + $12 = $4 + $11 :i32 + $13 = $10 + $12 :i32 + br Block_3($13) :void Block_3($13:i32): - return ($13) :i32 + return ($13) :i32 Block_2(): - $16 = 0 :i32 - $17 = 0 :i32 - $18 = 1 :i32 - $19 = $16 + $18 :i32 - $20 = 1 :i32 - $21 = $17 + $20 :i32 - $22 = $19 + $21 :i32 - br Block_3($22) :void + $16 = 0 :i32 + $17 = 0 :i32 + $18 = 1 :i32 + $19 = $16 + $18 :i32 + $20 = 1 :i32 + $21 = $17 + $20 :i32 + $22 = $19 + $21 :i32 + br Block_3($22) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject2.trace b/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject2.trace index 529634bd..a8fde299 100644 --- a/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject2.trace +++ b/nautilus/test/data/control-flow-tests/ir/constructComplexReturnObject2.trace @@ -1,32 +1,32 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 0 :i32 - $8 = $1 > $2 :bool - if $8 ? Block_1($2, $1) : Block_2() :void + $3 = 0 :i32 + $8 = $1 > $2 :bool + if $8 ? Block_1($2, $1) : Block_2() :void Block_1($7:i32, $6:i32): - $12 = 1 :i32 - $13 = $6 + $12 :i32 - $14 = 1 :i32 - $15 = $7 + $14 :i32 - $16 = $13 + $15 :i32 - $17 = 42 :i32 - br Block_3($16, $17) :void + $12 = 1 :i32 + $13 = $6 + $12 :i32 + $14 = 1 :i32 + $15 = $7 + $14 :i32 + $16 = $13 + $15 :i32 + $17 = 42 :i32 + br Block_3($16, $17) :void Block_3($3:i32, $17:i32): - $18 = $3 + $17 :i32 - return ($18) :i32 + $18 = $3 + $17 :i32 + return ($18) :i32 Block_2(): - $21 = 0 :i32 - $22 = 0 :i32 - $23 = 1 :i32 - $24 = $21 + $23 :i32 - $25 = 1 :i32 - $26 = $22 + $25 :i32 - $27 = $24 + $26 :i32 - $28 = 42 :i32 - br Block_3($27, $28) :void + $21 = 0 :i32 + $22 = 0 :i32 + $23 = 1 :i32 + $24 = $21 + $23 :i32 + $25 = 1 :i32 + $26 = $22 + $25 :i32 + $27 = $24 + $26 :i32 + $28 = 42 :i32 + br Block_3($27, $28) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseCondition.trace b/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseCondition.trace index 4925b077..2b727fc6 100644 --- a/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseCondition.trace @@ -1,63 +1,63 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 5 :i32 - $2 = 8 :i32 - $3 = $1 < $2 :bool - if $3 ? Block_1($1) : Block_2($1) :void + $1 = 5 :i32 + $2 = 8 :i32 + $3 = $1 < $2 :bool + if $3 ? Block_1($1) : Block_2($1) :void Block_1($1:i32): - $5 = 6 :i32 - $6 = $1 > $5 :bool - if $6 ? Block_3($1) : Block_4($1) :void + $5 = 6 :i32 + $6 = $1 > $5 :bool + if $6 ? Block_3($1) : Block_4($1) :void Block_3($1:i32): - $8 = 10 :i32 - $9 = $1 + $8 :i32 - $10 = 2 :i32 - br Block_5($9, $10) :void + $8 = 10 :i32 + $9 = $1 + $8 :i32 + $10 = 2 :i32 + br Block_5($9, $10) :void Block_5($1:i32, $10:i32): - br Block_10($1, $10) :void + br Block_10($1, $10) :void Block_10($1:i32, $10:i32): - br Block_11($1, $10) :void + br Block_11($1, $10) :void Block_11($1:i32, $10:i32): - br Block_12($1, $10) :void + br Block_12($1, $10) :void Block_12($1:i32, $10:i32): - $11 = $1 + $10 :i32 - return ($11) :i32 + $11 = $1 + $10 :i32 + return ($11) :i32 Block_4($1:i32): - $16 = 6 :i32 - $17 = $1 < $16 :bool - if $17 ? Block_6($1) : Block_7($1) :void + $16 = 6 :i32 + $17 = $1 < $16 :bool + if $17 ? Block_6($1) : Block_7($1) :void Block_6($1:i32): - $19 = 5 :i32 - $20 = $1 == $19 :bool - if $20 ? Block_8($1) : Block_9($1) :void + $19 = 5 :i32 + $20 = $1 == $19 :bool + if $20 ? Block_8($1) : Block_9($1) :void Block_8($1:i32): - $22 = 5 :i32 - $23 = $1 + $22 :i32 - $24 = 2 :i32 - br Block_10($23, $24) :void + $22 = 5 :i32 + $23 = $1 + $22 :i32 + $24 = 2 :i32 + br Block_10($23, $24) :void Block_9($1:i32): - $26 = 2 :i32 - br Block_12($1, $26) :void + $26 = 2 :i32 + br Block_12($1, $26) :void Block_7($1:i32): - $25 = 2 :i32 - br Block_11($1, $25) :void + $25 = 2 :i32 + br Block_11($1, $25) :void Block_2($1:i32): - $13 = 20 :i32 - $14 = $1 + $13 :i32 - $15 = 2 :i32 - br Block_5($14, $15) :void + $13 = 20 :i32 + $14 = $1 + $13 :i32 + $15 = 2 :i32 + br Block_5($14, $15) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseIfCondition.trace b/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseIfCondition.trace index fcfac6fa..282d136d 100644 --- a/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/deeplyNestedIfElseIfCondition.trace @@ -1,51 +1,51 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 5 :i32 - $2 = 8 :i32 - $3 = $1 < $2 :bool - if $3 ? Block_1($1) : Block_2($1) :void + $1 = 5 :i32 + $2 = 8 :i32 + $3 = $1 < $2 :bool + if $3 ? Block_1($1) : Block_2($1) :void Block_1($1:i32): - $5 = 10 :i32 - $6 = $1 + $5 :i32 - $7 = 2 :i32 - br Block_5($6, $7) :void + $5 = 10 :i32 + $6 = $1 + $5 :i32 + $7 = 2 :i32 + br Block_5($6, $7) :void Block_5($1:i32, $7:i32): - br Block_8($1, $7) :void + br Block_8($1, $7) :void Block_8($1:i32, $7:i32): - br Block_9($1, $7) :void + br Block_9($1, $7) :void Block_9($1:i32, $7:i32): - $8 = $1 + $7 :i32 - return ($8) :i32 + $8 = $1 + $7 :i32 + return ($8) :i32 Block_2($1:i32): - $10 = 5 :i32 - $11 = $1 == $10 :bool - if $11 ? Block_3($1) : Block_4($1) :void + $10 = 5 :i32 + $11 = $1 == $10 :bool + if $11 ? Block_3($1) : Block_4($1) :void Block_3($1:i32): - $13 = 5 :i32 - $14 = $1 + $13 :i32 - $15 = 2 :i32 - br Block_5($14, $15) :void + $13 = 5 :i32 + $14 = $1 + $13 :i32 + $15 = 2 :i32 + br Block_5($14, $15) :void Block_4($1:i32): - $16 = 4 :i32 - $17 = $1 == $16 :bool - if $17 ? Block_6($1) : Block_7($1) :void + $16 = 4 :i32 + $17 = $1 == $16 :bool + if $17 ? Block_6($1) : Block_7($1) :void Block_6($1:i32): - $19 = 4 :i32 - $20 = $1 + $19 :i32 - $21 = 2 :i32 - br Block_8($20, $21) :void + $19 = 4 :i32 + $20 = $1 + $19 :i32 + $21 = 2 :i32 + br Block_8($20, $21) :void Block_7($1:i32): - $22 = 2 :i32 - br Block_9($1, $22) :void + $22 = 2 :i32 + br Block_9($1, $22) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/doubleIfCondition.trace b/nautilus/test/data/control-flow-tests/ir/doubleIfCondition.trace index 9d3fa945..e7356057 100644 --- a/nautilus/test/data/control-flow-tests/ir/doubleIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/doubleIfCondition.trace @@ -1,35 +1,35 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 8 :i32 - $3 = $1 == $2 :bool - if $3 ? Block_1($1) : Block_2($1) :void + $1 = 1 :i32 + $2 = 8 :i32 + $3 = $1 == $2 :bool + if $3 ? Block_1($1) : Block_2($1) :void Block_1($1:i32): - $5 = 1 :i32 - br Block_5($1, $5) :void + $5 = 1 :i32 + br Block_5($1, $5) :void Block_5($1:i32, $5:i32): - $6 = $1 == $5 :bool - if $6 ? Block_3($1) : Block_4($1) :void + $6 = $1 == $5 :bool + if $6 ? Block_3($1) : Block_4($1) :void Block_3($1:i32): - $8 = 20 :i32 - $9 = $1 + $8 :i32 - $10 = 2 :i32 - br Block_6($9, $10) :void + $8 = 20 :i32 + $9 = $1 + $8 :i32 + $10 = 2 :i32 + br Block_6($9, $10) :void Block_6($1:i32, $10:i32): - $11 = $1 + $10 :i32 - return ($11) :i32 + $11 = $1 + $10 :i32 + return ($11) :i32 Block_4($1:i32): - $14 = 2 :i32 - br Block_6($1, $14) :void + $14 = 2 :i32 + br Block_6($1, $14) :void Block_2($1:i32): - $13 = 1 :i32 - br Block_5($1, $13) :void + $13 = 1 :i32 + br Block_5($1, $13) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifElseIfCondition.trace b/nautilus/test/data/control-flow-tests/ir/ifElseIfCondition.trace index 4a483d11..d4871eb1 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifElseIfCondition.trace @@ -1,37 +1,37 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 8 :i32 - $3 = $1 == $2 :bool - if $3 ? Block_1($1) : Block_2($1) :void + $1 = 1 :i32 + $2 = 8 :i32 + $3 = $1 == $2 :bool + if $3 ? Block_1($1) : Block_2($1) :void Block_1($1:i32): - $5 = 14 :i32 - $6 = $1 + $5 :i32 - $7 = 2 :i32 - br Block_5($6, $7) :void + $5 = 14 :i32 + $6 = $1 + $5 :i32 + $7 = 2 :i32 + br Block_5($6, $7) :void Block_5($1:i32, $7:i32): - br Block_6($1, $7) :void + br Block_6($1, $7) :void Block_6($1:i32, $7:i32): - $8 = $1 + $7 :i32 - return ($8) :i32 + $8 = $1 + $7 :i32 + return ($8) :i32 Block_2($1:i32): - $10 = 1 :i32 - $11 = $1 == $10 :bool - if $11 ? Block_3($1) : Block_4($1) :void + $10 = 1 :i32 + $11 = $1 == $10 :bool + if $11 ? Block_3($1) : Block_4($1) :void Block_3($1:i32): - $13 = 20 :i32 - $14 = $1 + $13 :i32 - $15 = 2 :i32 - br Block_5($14, $15) :void + $13 = 20 :i32 + $14 = $1 + $13 :i32 + $15 = 2 :i32 + br Block_5($14, $15) :void Block_4($1:i32): - $16 = 2 :i32 - br Block_6($1, $16) :void + $16 = 2 :i32 + br Block_6($1, $16) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifElseIfElse.trace b/nautilus/test/data/control-flow-tests/ir/ifElseIfElse.trace index 6f7f8b62..b657f042 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifElseIfElse.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifElseIfElse.trace @@ -1,29 +1,29 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1() : Block_2($1) :void + $2 = 0 :i32 + $3 = 0 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1() : Block_2($1) :void Block_1(): - $6 = 10 :i32 - br Block_5($6) :void + $6 = 10 :i32 + br Block_5($6) :void Block_5($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($1:i32): - $8 = 1 :i32 - $9 = $1 == $8 :bool - if $9 ? Block_3() : Block_4() :void + $8 = 1 :i32 + $9 = $1 == $8 :bool + if $9 ? Block_3() : Block_4() :void Block_3(): - $11 = 20 :i32 - br Block_5($11) :void + $11 = 20 :i32 + br Block_5($11) :void Block_4(): - $13 = 30 :i32 - br Block_5($13) :void + $13 = 30 :i32 + br Block_5($13) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifElseIfOnly.trace b/nautilus/test/data/control-flow-tests/ir/ifElseIfOnly.trace index 376009a7..af2a94a6 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifElseIfOnly.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifElseIfOnly.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 5 :i32 - $4 = $1 < $3 :bool - if $4 ? Block_1() : Block_2($1, $2) :void + $2 = 0 :i32 + $3 = 5 :i32 + $4 = $1 < $3 :bool + if $4 ? Block_1() : Block_2($1, $2) :void Block_1(): - $6 = 1 :i32 - br Block_5($6) :void + $6 = 1 :i32 + br Block_5($6) :void Block_5($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($1:i32, $2:i32): - $8 = 10 :i32 - $9 = $1 < $8 :bool - if $9 ? Block_3() : Block_4($2) :void + $8 = 10 :i32 + $9 = $1 < $8 :bool + if $9 ? Block_3() : Block_4($2) :void Block_3(): - $11 = 2 :i32 - br Block_5($11) :void + $11 = 2 :i32 + br Block_5($11) :void Block_4($2:i32): - br Block_5($2) :void + br Block_5($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifNotEqual.trace b/nautilus/test/data/control-flow-tests/ir/ifNotEqual.trace index 28d80d2b..bba71d0e 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifNotEqual.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifNotEqual.trace @@ -1,19 +1,19 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 5 :i32 - $4 = $1 != $3 :bool - if $4 ? Block_1() : Block_2($2) :void + $2 = 1 :i32 + $3 = 5 :i32 + $4 = $1 $3 :bool + if $4 ? Block_1() : Block_2($2) :void Block_1(): - $6 = 2 :i32 - br Block_3($6) :void + $6 = 2 :i32 + br Block_3($6) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifThenCondition.trace b/nautilus/test/data/control-flow-tests/ir/ifThenCondition.trace index cb3c20fd..b073910f 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifThenCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifThenCondition.trace @@ -1,23 +1,23 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 42 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1($2) : Block_2($2) :void + $2 = 1 :i32 + $3 = 42 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $6 = 1 :i32 - $7 = $2 + $6 :i32 - $8 = 42 :i32 - br Block_3($7, $8) :void + $6 = 1 :i32 + $7 = $2 + $6 :i32 + $8 = 42 :i32 + br Block_3($7, $8) :void Block_3($2:i32, $8:i32): - $9 = $2 + $8 :i32 - return ($9) :i32 + $9 = $2 + $8 :i32 + return ($9) :i32 Block_2($2:i32): - $11 = 42 :i32 - br Block_3($2, $11) :void + $11 = 42 :i32 + br Block_3($2, $11) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifThenElseCondition.trace b/nautilus/test/data/control-flow-tests/ir/ifThenElseCondition.trace index 898d083d..2d4a5fef 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifThenElseCondition.trace @@ -1,25 +1,25 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 42 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1($2) : Block_2($2) :void + $2 = 1 :i32 + $3 = 42 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $6 = 1 :i32 - $7 = $2 + $6 :i32 - $8 = 42 :i32 - br Block_3($7, $8) :void + $6 = 1 :i32 + $7 = $2 + $6 :i32 + $8 = 42 :i32 + br Block_3($7, $8) :void Block_3($2:i32, $8:i32): - $9 = $2 + $8 :i32 - return ($9) :i32 + $9 = $2 + $8 :i32 + return ($9) :i32 Block_2($2:i32): - $11 = 42 :i32 - $12 = $2 + $11 :i32 - $13 = 42 :i32 - br Block_3($12, $13) :void + $11 = 42 :i32 + $12 = $2 + $11 :i32 + $13 = 42 :i32 + br Block_3($12, $13) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifWithFunctionCall.trace b/nautilus/test/data/control-flow-tests/ir/ifWithFunctionCall.trace index 3623de9a..20065e1d 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifWithFunctionCall.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifWithFunctionCall.trace @@ -1,21 +1,21 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $4 = 2 :i32 - $5 = $1 * $4 :i32 - $6 = 10 :i32 - $7 = $5 > $6 :bool - if $7 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $4 = 2 :i32 + $5 = $1 * $4 :i32 + $6 = 10 :i32 + $7 = $5 > $6 :bool + if $7 ? Block_1() : Block_2($2) :void Block_1(): - $9 = 1 :i32 - br Block_3($9) :void + $9 = 1 :i32 + br Block_3($9) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/ifWithTernary.trace b/nautilus/test/data/control-flow-tests/ir/ifWithTernary.trace index 855134b0..7b379244 100644 --- a/nautilus/test/data/control-flow-tests/ir/ifWithTernary.trace +++ b/nautilus/test/data/control-flow-tests/ir/ifWithTernary.trace @@ -1,32 +1,32 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 > $2 :bool - if $3 ? Block_1($1) : Block_2($1) :void + $2 = 5 :i32 + $3 = $1 > $2 :bool + if $3 ? Block_1($1) : Block_2($1) :void Block_1($1:i32): - $5 = 10 :i32 - $6 = 0 :i32 - br Block_5($1, $6, $5) :void + $5 = 10 :i32 + $6 = 0 :i32 + br Block_5($1, $6, $5) :void Block_5($1:i32, $6:i32, $5:i32): - $7 = $1 == $6 :bool - if $7 ? Block_3() : Block_4($5) :void + $7 = $1 == $6 :bool + if $7 ? Block_3() : Block_4($5) :void Block_3(): - $9 = -1 :i32 - br Block_6($9) :void + $9 = -1 :i32 + br Block_6($9) :void Block_6($5:i32): - return ($5) :i32 + return ($5) :i32 Block_4($5:i32): - br Block_6($5) :void + br Block_6($5) :void Block_2($1:i32): - $11 = 5 :i32 - $12 = 0 :i32 - br Block_5($1, $12, $11) :void + $11 = 5 :i32 + $12 = 0 :i32 + br Block_5($1, $12, $11) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/logicalAnd.trace b/nautilus/test/data/control-flow-tests/ir/logicalAnd.trace index 5c5a211d..d6aac5d1 100644 --- a/nautilus/test/data/control-flow-tests/ir/logicalAnd.trace +++ b/nautilus/test/data/control-flow-tests/ir/logicalAnd.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 5 :i32 - $4 = $1 > $3 :bool - $5 = 15 :i32 - $6 = $1 < $5 :bool - $7 = $4 and $6 :bool - if $7 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 5 :i32 + $4 = $1 > $3 :bool + $5 = 15 :i32 + $6 = $1 < $5 :bool + $7 = $4 and $6 :bool + if $7 ? Block_1() : Block_2($2) :void Block_1(): - $9 = 1 :i32 - br Block_3($9) :void + $9 = 1 :i32 + br Block_3($9) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/logicalOr.trace b/nautilus/test/data/control-flow-tests/ir/logicalOr.trace index d8c620a2..bd0ed6ff 100644 --- a/nautilus/test/data/control-flow-tests/ir/logicalOr.trace +++ b/nautilus/test/data/control-flow-tests/ir/logicalOr.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 10 :i32 - $4 = $1 == $3 :bool - $5 = 20 :i32 - $6 = $1 == $5 :bool - $7 = $4 or $6 :bool - if $7 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 10 :i32 + $4 = $1 == $3 :bool + $5 = 20 :i32 + $6 = $1 == $5 :bool + $7 = $4 or $6 :bool + if $7 ? Block_1() : Block_2($2) :void Block_1(): - $9 = 1 :i32 - br Block_3($9) :void + $9 = 1 :i32 + br Block_3($9) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/logicalXOR.trace b/nautilus/test/data/control-flow-tests/ir/logicalXOR.trace index d6ffc1d4..5ab60f5a 100644 --- a/nautilus/test/data/control-flow-tests/ir/logicalXOR.trace +++ b/nautilus/test/data/control-flow-tests/ir/logicalXOR.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 10 :i32 - $4 = $1 < $3 :bool - $5 = 5 :i32 - $6 = $1 > $5 :bool - $7 = $4 != $6 :bool - if $7 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 10 :i32 + $4 = $1 < $3 :bool + $5 = 5 :i32 + $6 = $1 > $5 :bool + $7 = $4 $6 :bool + if $7 ? Block_1() : Block_2($2) :void Block_1(): - $9 = 1 :i32 - br Block_3($9) :void + $9 = 1 :i32 + br Block_3($9) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/multipleConditions.trace b/nautilus/test/data/control-flow-tests/ir/multipleConditions.trace index 88dda3a1..f3b9cfc3 100644 --- a/nautilus/test/data/control-flow-tests/ir/multipleConditions.trace +++ b/nautilus/test/data/control-flow-tests/ir/multipleConditions.trace @@ -1,25 +1,25 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - $4 = $1 > $3 :bool - $5 = 10 :i32 - $6 = $1 < $5 :bool - $7 = $4 and $6 :bool - $8 = 20 :i32 - $9 = $1 == $8 :bool - $10 = $7 or $9 :bool - if $10 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 0 :i32 + $4 = $1 > $3 :bool + $5 = 10 :i32 + $6 = $1 < $5 :bool + $7 = $4 and $6 :bool + $8 = 20 :i32 + $9 = $1 == $8 :bool + $10 = $7 or $9 :bool + if $10 ? Block_1() : Block_2($2) :void Block_1(): - $12 = 1 :i32 - br Block_3($12) :void + $12 = 1 :i32 + br Block_3($12) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/multipleElse.trace b/nautilus/test/data/control-flow-tests/ir/multipleElse.trace index ea786af9..640e528d 100644 --- a/nautilus/test/data/control-flow-tests/ir/multipleElse.trace +++ b/nautilus/test/data/control-flow-tests/ir/multipleElse.trace @@ -1,30 +1,30 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 10 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1() : Block_2($1) :void + $2 = 0 :i32 + $3 = 10 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1() : Block_2($1) :void Block_1(): - $6 = 1 :i32 - br Block_5($6) :void + $6 = 1 :i32 + br Block_5($6) :void Block_5($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($1:i32): - $8 = 2 :i32 - $9 = 5 :i32 - $10 = $1 == $9 :bool - if $10 ? Block_3() : Block_4() :void + $8 = 2 :i32 + $9 = 5 :i32 + $10 = $1 == $9 :bool + if $10 ? Block_3() : Block_4() :void Block_3(): - $12 = 3 :i32 - br Block_5($12) :void + $12 = 3 :i32 + br Block_5($12) :void Block_4(): - $14 = 4 :i32 - br Block_5($14) :void + $14 = 4 :i32 + br Block_5($14) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/multipleVoidReturnsFunction.trace b/nautilus/test/data/control-flow-tests/ir/multipleVoidReturnsFunction.trace index 2434f8ab..6bf8551d 100644 --- a/nautilus/test/data/control-flow-tests/ir/multipleVoidReturnsFunction.trace +++ b/nautilus/test/data/control-flow-tests/ir/multipleVoidReturnsFunction.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $4 = load($1) :i32 - $5 = 10 :i32 - $6 = $4 > $5 :bool - if $6 ? Block_1($1) : Block_2($1) :void + $4 = load($1) :i32 + $5 = 10 :i32 + $6 = $4 > $5 :bool + if $6 ? Block_1($1) : Block_2($1) :void Block_1($1:ptr): - $10 = 1 :i32 - store($10, $1) :void - br Block_3() :void + $10 = 1 :i32 + store($10, $1) :void + br Block_3() :void Block_3(): - return :void + return :void Block_2($1:ptr): - $14 = 42 :i32 - store($14, $1) :void - br Block_3() :void + $14 = 42 :i32 + store($14, $1) :void + br Block_3() :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/nestedIf.trace b/nautilus/test/data/control-flow-tests/ir/nestedIf.trace index b54541fb..77fe2c07 100644 --- a/nautilus/test/data/control-flow-tests/ir/nestedIf.trace +++ b/nautilus/test/data/control-flow-tests/ir/nestedIf.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 20 :i32 - $4 = $1 < $3 :bool - if $4 ? Block_1($1) : Block_2($2) :void + $2 = 1 :i32 + $3 = 20 :i32 + $4 = $1 < $3 :bool + if $4 ? Block_1($1) : Block_2($2) :void Block_1($1:i32): - $6 = 10 :i32 - $7 = $1 > $6 :bool - if $7 ? Block_3() : Block_4() :void + $6 = 10 :i32 + $7 = $1 > $6 :bool + if $7 ? Block_3() : Block_4() :void Block_3(): - $9 = 2 :i32 - br Block_5($9) :void + $9 = 2 :i32 + br Block_5($9) :void Block_5($2:i32): - return ($2) :i32 + return ($2) :i32 Block_4(): - $12 = 3 :i32 - br Block_5($12) :void + $12 = 3 :i32 + br Block_5($12) :void Block_2($2:i32): - br Block_5($2) :void + br Block_5($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/nestedIfElseDifferentLevels.trace b/nautilus/test/data/control-flow-tests/ir/nestedIfElseDifferentLevels.trace index f81fda88..eff409d5 100644 --- a/nautilus/test/data/control-flow-tests/ir/nestedIfElseDifferentLevels.trace +++ b/nautilus/test/data/control-flow-tests/ir/nestedIfElseDifferentLevels.trace @@ -1,38 +1,38 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - $4 = $1 > $3 :bool - if $4 ? Block_1($1) : Block_2() :void + $2 = 0 :i32 + $3 = 0 :i32 + $4 = $1 > $3 :bool + if $4 ? Block_1($1) : Block_2() :void Block_1($1:i32): - $6 = 5 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3() : Block_4($1) :void + $6 = 5 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3() : Block_4($1) :void Block_3(): - $9 = 1 :i32 - br Block_7($9) :void + $9 = 1 :i32 + br Block_7($9) :void Block_7($2:i32): - return ($2) :i32 + return ($2) :i32 Block_4($1:i32): - $13 = 2 :i32 - $14 = 6 :i32 - $15 = $1 == $14 :bool - if $15 ? Block_5() : Block_6($13) :void + $13 = 2 :i32 + $14 = 6 :i32 + $15 = $1 == $14 :bool + if $15 ? Block_5() : Block_6($13) :void Block_5(): - $17 = 3 :i32 - br Block_7($17) :void + $17 = 3 :i32 + br Block_7($17) :void Block_6($2:i32): - br Block_7($2) :void + br Block_7($2) :void Block_2(): - $11 = -1 :i32 - br Block_7($11) :void + $11 = -1 :i32 + br Block_7($11) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/nestedIfNoElseCondition.trace b/nautilus/test/data/control-flow-tests/ir/nestedIfNoElseCondition.trace index 1cdd2581..f5bc4350 100644 --- a/nautilus/test/data/control-flow-tests/ir/nestedIfNoElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/nestedIfNoElseCondition.trace @@ -1,38 +1,38 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 42 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1($2) : Block_2($2) :void + $3 = 42 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $6 = 4 :i32 - $7 = $2 + $6 :i32 - $8 = 2 :i32 - br Block_5($7, $8) :void + $6 = 4 :i32 + $7 = $2 + $6 :i32 + $8 = 2 :i32 + br Block_5($7, $8) :void Block_5($2:i32, $8:i32): - br Block_6($2, $8) :void + br Block_6($2, $8) :void Block_6($2:i32, $8:i32): - $9 = $2 + $8 :i32 - return ($9) :i32 + $9 = $2 + $8 :i32 + return ($9) :i32 Block_2($2:i32): - $13 = 9 :i32 - $14 = $2 + $13 :i32 - $15 = 8 :i32 - $16 = $14 == $15 :bool - if $16 ? Block_3($14) : Block_4($14) :void + $13 = 9 :i32 + $14 = $2 + $13 :i32 + $15 = 8 :i32 + $16 = $14 == $15 :bool + if $16 ? Block_3($14) : Block_4($14) :void Block_3($2:i32): - $18 = 14 :i32 - $19 = $2 + $18 :i32 - $20 = 2 :i32 - br Block_5($2, $20) :void + $18 = 14 :i32 + $19 = $2 + $18 :i32 + $20 = 2 :i32 + br Block_5($2, $20) :void Block_4($2:i32): - $23 = 2 :i32 - br Block_6($2, $23) :void + $23 = 2 :i32 + br Block_6($2, $23) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/nestedIfThenElseCondition.trace b/nautilus/test/data/control-flow-tests/ir/nestedIfThenElseCondition.trace index cb0e89fb..a45b7e31 100644 --- a/nautilus/test/data/control-flow-tests/ir/nestedIfThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/nestedIfThenElseCondition.trace @@ -1,34 +1,34 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 42 :i32 - $4 = $1 == $3 :bool - if $4 ? Block_1($2) : Block_2($2) :void + $3 = 42 :i32 + $4 = $1 == $3 :bool + if $4 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $6 = 2 :i32 - br Block_5($2, $6) :void + $6 = 2 :i32 + br Block_5($2, $6) :void Block_5($2:i32, $6:i32): - br Block_6($2, $6) :void + br Block_6($2, $6) :void Block_6($2:i32, $6:i32): - $7 = $2 + $6 :i32 - return ($7) :i32 + $7 = $2 + $6 :i32 + return ($7) :i32 Block_2($2:i32): - $11 = 8 :i32 - $12 = $2 == $11 :bool - if $12 ? Block_3($2) : Block_4($2) :void + $11 = 8 :i32 + $12 = $2 == $11 :bool + if $12 ? Block_3($2) : Block_4($2) :void Block_3($2:i32): - $14 = 2 :i32 - br Block_5($2, $14) :void + $14 = 2 :i32 + br Block_5($2, $14) :void Block_4($2:i32): - $17 = 2 :i32 - $18 = $2 + $17 :i32 - $19 = 2 :i32 - br Block_6($18, $19) :void + $17 = 2 :i32 + $18 = $2 + $17 :i32 + $19 = 2 :i32 + br Block_6($18, $19) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/orCondition.trace b/nautilus/test/data/control-flow-tests/ir/orCondition.trace index 4de367bc..eb863c5d 100644 --- a/nautilus/test/data/control-flow-tests/ir/orCondition.trace +++ b/nautilus/test/data/control-flow-tests/ir/orCondition.trace @@ -1,23 +1,23 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 8 :i32 - $4 = $1 == $3 :bool - $5 = 1 :i32 - $6 = $1 == $5 :bool - $7 = $4 or $6 :bool - if $7 ? Block_1($2) : Block_2($2) :void + $2 = 1 :i32 + $3 = 8 :i32 + $4 = $1 == $3 :bool + $5 = 1 :i32 + $6 = $1 == $5 :bool + $7 = $4 or $6 :bool + if $7 ? Block_1($2) : Block_2($2) :void Block_1($2:i32): - $9 = 14 :i32 - $10 = $2 + $9 :i32 - br Block_3($10) :void + $9 = 14 :i32 + $10 = $2 + $9 :i32 + br Block_3($10) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/shortCircuitEvaluation.trace b/nautilus/test/data/control-flow-tests/ir/shortCircuitEvaluation.trace index 70bb1d22..e5ef81ce 100644 --- a/nautilus/test/data/control-flow-tests/ir/shortCircuitEvaluation.trace +++ b/nautilus/test/data/control-flow-tests/ir/shortCircuitEvaluation.trace @@ -1,24 +1,24 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - $4 = $1 != $3 :bool - $5 = 10 :i32 - $6 = $5 / $1 :i32 - $7 = 1 :i32 - $8 = $6 > $7 :bool - $9 = $4 and $8 :bool - if $9 ? Block_1() : Block_2($2) :void + $2 = 0 :i32 + $3 = 0 :i32 + $4 = $1 $3 :bool + $5 = 10 :i32 + $6 = $5 / $1 :i32 + $7 = 1 :i32 + $8 = $6 > $7 :bool + $9 = $4 and $8 :bool + if $9 ? Block_1() : Block_2($2) :void Block_1(): - $11 = 1 :i32 - br Block_3($11) :void + $11 = 1 :i32 + br Block_3($11) :void Block_3($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($2:i32): - br Block_3($2) :void + br Block_3($2) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/ir/varyingComplexity.trace b/nautilus/test/data/control-flow-tests/ir/varyingComplexity.trace index 87984157..bf74685d 100644 --- a/nautilus/test/data/control-flow-tests/ir/varyingComplexity.trace +++ b/nautilus/test/data/control-flow-tests/ir/varyingComplexity.trace @@ -1,42 +1,42 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 5 :i32 - $4 = $1 < $3 :bool - if $4 ? Block_1() : Block_2($1) :void + $2 = 0 :i32 + $3 = 5 :i32 + $4 = $1 < $3 :bool + if $4 ? Block_1() : Block_2($1) :void Block_1(): - $6 = 1 :i32 - br Block_7($6) :void + $6 = 1 :i32 + br Block_7($6) :void Block_7($2:i32): - return ($2) :i32 + return ($2) :i32 Block_2($1:i32): - $8 = 5 :i32 - $9 = $1 >= $8 :bool - $10 = 10 :i32 - $11 = $1 <= $10 :bool - $12 = $9 and $11 :bool - if $12 ? Block_3($1) : Block_4() :void + $8 = 5 :i32 + $9 = $1 >= $8 :bool + $10 = 10 :i32 + $11 = $1 <= $10 :bool + $12 = $9 and $11 :bool + if $12 ? Block_3($1) : Block_4() :void Block_3($1:i32): - $14 = 2 :i32 - $15 = 7 :i32 - $16 = $1 == $15 :bool - if $16 ? Block_5($14) : Block_6($14) :void + $14 = 2 :i32 + $15 = 7 :i32 + $16 = $1 == $15 :bool + if $16 ? Block_5($14) : Block_6($14) :void Block_5($2:i32): - $18 = 1 :i32 - $19 = $2 + $18 :i32 - br Block_7($19) :void + $18 = 1 :i32 + $19 = $2 + $18 :i32 + br Block_7($19) :void Block_6($2:i32): - br Block_7($2) :void + br Block_7($2) :void Block_4(): - $21 = 3 :i32 - br Block_7($21) :void + $21 = 3 :i32 + br Block_7($21) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/control-flow-tests/tracing/andCondition.trace b/nautilus/test/data/control-flow-tests/tracing/andCondition.trace index 5161bf62..3ce5204d 100644 --- a/nautilus/test/data/control-flow-tests/tracing/andCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/andCondition.trace @@ -1,15 +1,15 @@ B0($1:i32,$2:i32) - CONST $3 1 :i32 - CONST $4 8 :i32 - EQ $5 $1 $4 :bool - CONST $6 1 :i32 - EQ $7 $2 $6 :bool - AND $8 $5 $7 :bool - CMP $9 $8 B1() B2() :void + CONST $3 1 :i32 + CONST $4 8 :i32 + EQ $5 $1 $4 :bool + CONST $6 1 :i32 + EQ $7 $2 $6 :bool + AND $8 $5 $7 :bool + CMP $9 $8 B1() B2() :void B1() - CONST $10 14 :i32 - ADD $11 $3 $10 :i32 - ASSIGN $3 $11 :i32 - RETURN $3 :i32 + CONST $10 14 :i32 + ADD $11 $3 $10 :i32 + ASSIGN $3 $11 :i32 + RETURN $3 :i32 B2() - RETURN $3 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/andFunction.trace b/nautilus/test/data/control-flow-tests/tracing/andFunction.trace index cb23ef1f..30f76c26 100644 --- a/nautilus/test/data/control-flow-tests/tracing/andFunction.trace +++ b/nautilus/test/data/control-flow-tests/tracing/andFunction.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 1 :bool - ASSIGN $3 $2 :bool - CONST $4 42 :i64 - CAST $5 $1 :i64 - EQ $6 $5 $4 :bool - AND $7 $3 $6 :bool - ASSIGN $2 $7 :bool - ASSIGN $8 $2 :bool - CONST $9 42 :i64 - CAST $10 $1 :i64 - EQ $11 $10 $9 :bool - AND $12 $8 $11 :bool - ASSIGN $2 $12 :bool - ASSIGN $13 $2 :bool - CONST $14 42 :i64 - CAST $15 $1 :i64 - EQ $16 $15 $14 :bool - AND $17 $13 $16 :bool - ASSIGN $2 $17 :bool - RETURN $2 :bool + CONST $2 true :bool + ASSIGN $3 $2 :bool + CONST $4 42 :i64 + CAST $5 $1 :i64 + EQ $6 $5 $4 :bool + AND $7 $3 $6 :bool + ASSIGN $2 $7 :bool + ASSIGN $8 $2 :bool + CONST $9 42 :i64 + CAST $10 $1 :i64 + EQ $11 $10 $9 :bool + AND $12 $8 $11 :bool + ASSIGN $2 $12 :bool + ASSIGN $13 $2 :bool + CONST $14 42 :i64 + CAST $15 $1 :i64 + EQ $16 $15 $14 :bool + AND $17 $13 $16 :bool + ASSIGN $2 $17 :bool + RETURN $2 :bool diff --git a/nautilus/test/data/control-flow-tests/tracing/complexLogicalExpressions.trace b/nautilus/test/data/control-flow-tests/tracing/complexLogicalExpressions.trace index ebed6d76..9e97cd79 100644 --- a/nautilus/test/data/control-flow-tests/tracing/complexLogicalExpressions.trace +++ b/nautilus/test/data/control-flow-tests/tracing/complexLogicalExpressions.trace @@ -1,20 +1,20 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CONST $5 10 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CONST $8 15 :i32 - GT $9 $1 $8 :bool - CONST $10 20 :i32 - LT $11 $1 $10 :bool - AND $12 $9 $11 :bool - OR $13 $7 $12 :bool - CMP $14 $13 B1() B2() :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CONST $5 10 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CONST $8 15 :i32 + GT $9 $1 $8 :bool + CONST $10 20 :i32 + LT $11 $1 $10 :bool + AND $12 $9 $11 :bool + OR $13 $7 $12 :bool + CMP $14 $13 B1() B2() :void B1() - CONST $15 1 :i32 - ASSIGN $2 $15 :i32 - RETURN $2 :i32 + CONST $15 1 :i32 + ASSIGN $2 $15 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/compoundAssignment.trace b/nautilus/test/data/control-flow-tests/tracing/compoundAssignment.trace index 77409460..64c29b0f 100644 --- a/nautilus/test/data/control-flow-tests/tracing/compoundAssignment.trace +++ b/nautilus/test/data/control-flow-tests/tracing/compoundAssignment.trace @@ -1,12 +1,12 @@ B0($1:i32) - CONST $2 10 :i32 - CONST $3 5 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 10 :i32 + CONST $3 5 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 5 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - RETURN $2 :i32 + CONST $6 5 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/compoundStatements.trace b/nautilus/test/data/control-flow-tests/tracing/compoundStatements.trace index 78ace26f..7b4cec53 100644 --- a/nautilus/test/data/control-flow-tests/tracing/compoundStatements.trace +++ b/nautilus/test/data/control-flow-tests/tracing/compoundStatements.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ASSIGN $2 $6 :i32 - CONST $7 2 :i32 - MUL $8 $2 $7 :i32 - ASSIGN $2 $8 :i32 - RETURN $2 :i32 + CONST $6 1 :i32 + ASSIGN $2 $6 :i32 + CONST $7 2 :i32 + MUL $8 $2 $7 :i32 + ASSIGN $2 $8 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject.trace b/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject.trace index a74aae52..e640c42e 100644 --- a/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject.trace +++ b/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject.trace @@ -1,23 +1,23 @@ B0($1:i32,$2:i32) - ASSIGN $3 $1 :i32 - ASSIGN $4 $2 :i32 - GT $5 $3 $4 :bool - CMP $6 $5 B1() B2() :void + ASSIGN $3 $1 :i32 + ASSIGN $4 $2 :i32 + GT $5 $3 $4 :bool + CMP $6 $5 B1() B2() :void B1() - ASSIGN $7 $3 :i32 - ASSIGN $8 $4 :i32 - CONST $9 1 :i32 - ADD $10 $7 $9 :i32 - CONST $11 1 :i32 - ADD $12 $8 $11 :i32 - ADD $13 $10 $12 :i32 - RETURN $13 :i32 + ASSIGN $7 $3 :i32 + ASSIGN $8 $4 :i32 + CONST $9 1 :i32 + ADD $10 $7 $9 :i32 + CONST $11 1 :i32 + ADD $12 $8 $11 :i32 + ADD $13 $10 $12 :i32 + RETURN $13 :i32 B2() - CONST $16 0 :i32 - CONST $17 0 :i32 - CONST $18 1 :i32 - ADD $19 $16 $18 :i32 - CONST $20 1 :i32 - ADD $21 $17 $20 :i32 - ADD $22 $19 $21 :i32 - RETURN $22 :i32 + CONST $16 0 :i32 + CONST $17 0 :i32 + CONST $18 1 :i32 + ADD $19 $16 $18 :i32 + CONST $20 1 :i32 + ADD $21 $17 $20 :i32 + ADD $22 $19 $21 :i32 + RETURN $22 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject2.trace b/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject2.trace index 6fcdd706..80adcf12 100644 --- a/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject2.trace +++ b/nautilus/test/data/control-flow-tests/tracing/constructComplexReturnObject2.trace @@ -1,34 +1,34 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - ASSIGN $4 $1 :i32 - ASSIGN $5 $2 :i32 - ASSIGN $6 $4 :i32 - ASSIGN $7 $5 :i32 - GT $8 $6 $7 :bool - CMP $9 $8 B1() B2() :void + CONST $3 0 :i32 + ASSIGN $4 $1 :i32 + ASSIGN $5 $2 :i32 + ASSIGN $6 $4 :i32 + ASSIGN $7 $5 :i32 + GT $8 $6 $7 :bool + CMP $9 $8 B1() B2() :void B1() - ASSIGN $10 $6 :i32 - ASSIGN $11 $7 :i32 - CONST $12 1 :i32 - ADD $13 $10 $12 :i32 - CONST $14 1 :i32 - ADD $15 $11 $14 :i32 - ADD $16 $13 $15 :i32 - ASSIGN $3 $16 :i32 - CONST $17 42 :i32 - JMP $0 B3() :void + ASSIGN $10 $6 :i32 + ASSIGN $11 $7 :i32 + CONST $12 1 :i32 + ADD $13 $10 $12 :i32 + CONST $14 1 :i32 + ADD $15 $11 $14 :i32 + ADD $16 $13 $15 :i32 + ASSIGN $3 $16 :i32 + CONST $17 42 :i32 + JMP $0 B3() :void B2() - CONST $21 0 :i32 - CONST $22 0 :i32 - CONST $23 1 :i32 - ADD $24 $21 $23 :i32 - CONST $25 1 :i32 - ADD $26 $22 $25 :i32 - ADD $27 $24 $26 :i32 - ASSIGN $3 $27 :i32 - CONST $28 42 :i32 - ASSIGN $17 $28 :i32 - JMP $0 B3() :void + CONST $21 0 :i32 + CONST $22 0 :i32 + CONST $23 1 :i32 + ADD $24 $21 $23 :i32 + CONST $25 1 :i32 + ADD $26 $22 $25 :i32 + ADD $27 $24 $26 :i32 + ASSIGN $3 $27 :i32 + CONST $28 42 :i32 + ASSIGN $17 $28 :i32 + JMP $0 B3() :void B3() ControlFlowMerge - ADD $18 $3 $17 :i32 - RETURN $18 :i32 + ADD $18 $3 $17 :i32 + RETURN $18 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseCondition.trace b/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseCondition.trace index 36fd4e89..6a028597 100644 --- a/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseCondition.trace @@ -1,56 +1,56 @@ B0() - CONST $1 5 :i32 - CONST $2 8 :i32 - LT $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $1 5 :i32 + CONST $2 8 :i32 + LT $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 6 :i32 - GT $6 $1 $5 :bool - CMP $7 $6 B3() B4() :void + CONST $5 6 :i32 + GT $6 $1 $5 :bool + CMP $7 $6 B3() B4() :void B2() - CONST $13 20 :i32 - ADD $14 $1 $13 :i32 - ASSIGN $1 $14 :i32 - CONST $15 2 :i32 - ASSIGN $10 $15 :i32 - JMP $0 B5() :void + CONST $13 20 :i32 + ADD $14 $1 $13 :i32 + ASSIGN $1 $14 :i32 + CONST $15 2 :i32 + ASSIGN $10 $15 :i32 + JMP $0 B5() :void B3() - CONST $8 10 :i32 - ADD $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 2 :i32 - JMP $0 B5() :void + CONST $8 10 :i32 + ADD $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 2 :i32 + JMP $0 B5() :void B4() - CONST $16 6 :i32 - LT $17 $1 $16 :bool - CMP $18 $17 B6() B7() :void + CONST $16 6 :i32 + LT $17 $1 $16 :bool + CMP $18 $17 B6() B7() :void B5() ControlFlowMerge - JMP $0 B10() :void + JMP $0 B10() :void B6() - CONST $19 5 :i32 - EQ $20 $1 $19 :bool - CMP $21 $20 B8() B9() :void + CONST $19 5 :i32 + EQ $20 $1 $19 :bool + CMP $21 $20 B8() B9() :void B7() - CONST $25 2 :i32 - ASSIGN $10 $25 :i32 - JMP $0 B11() :void + CONST $25 2 :i32 + ASSIGN $10 $25 :i32 + JMP $0 B11() :void B8() - CONST $22 5 :i32 - ADD $23 $1 $22 :i32 - ASSIGN $1 $23 :i32 - CONST $24 2 :i32 - ASSIGN $10 $24 :i32 - JMP $0 B10() :void + CONST $22 5 :i32 + ADD $23 $1 $22 :i32 + ASSIGN $1 $23 :i32 + CONST $24 2 :i32 + ASSIGN $10 $24 :i32 + JMP $0 B10() :void B9() - CONST $26 2 :i32 - ASSIGN $10 $26 :i32 - JMP $0 B12() :void + CONST $26 2 :i32 + ASSIGN $10 $26 :i32 + JMP $0 B12() :void B10() ControlFlowMerge - JMP $0 B11() :void + JMP $0 B11() :void B11() ControlFlowMerge - JMP $0 B12() :void + JMP $0 B12() :void B12() ControlFlowMerge - ADD $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - ASSIGN $12 $1 :i32 - RETURN $12 :i32 + ADD $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + ASSIGN $12 $1 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseIfCondition.trace b/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseIfCondition.trace index 20ac3e4f..fbe3c004 100644 --- a/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/deeplyNestedIfElseIfCondition.trace @@ -1,46 +1,46 @@ B0() - CONST $1 5 :i32 - CONST $2 8 :i32 - LT $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $1 5 :i32 + CONST $2 8 :i32 + LT $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 10 :i32 - ADD $6 $1 $5 :i32 - ASSIGN $1 $6 :i32 - CONST $7 2 :i32 - JMP $0 B5() :void + CONST $5 10 :i32 + ADD $6 $1 $5 :i32 + ASSIGN $1 $6 :i32 + CONST $7 2 :i32 + JMP $0 B5() :void B2() - CONST $10 5 :i32 - EQ $11 $1 $10 :bool - CMP $12 $11 B3() B4() :void + CONST $10 5 :i32 + EQ $11 $1 $10 :bool + CMP $12 $11 B3() B4() :void B3() - CONST $13 5 :i32 - ADD $14 $1 $13 :i32 - ASSIGN $1 $14 :i32 - CONST $15 2 :i32 - ASSIGN $7 $15 :i32 - JMP $0 B5() :void + CONST $13 5 :i32 + ADD $14 $1 $13 :i32 + ASSIGN $1 $14 :i32 + CONST $15 2 :i32 + ASSIGN $7 $15 :i32 + JMP $0 B5() :void B4() - CONST $16 4 :i32 - EQ $17 $1 $16 :bool - CMP $18 $17 B6() B7() :void + CONST $16 4 :i32 + EQ $17 $1 $16 :bool + CMP $18 $17 B6() B7() :void B5() ControlFlowMerge - JMP $0 B8() :void + JMP $0 B8() :void B6() - CONST $19 4 :i32 - ADD $20 $1 $19 :i32 - ASSIGN $1 $20 :i32 - CONST $21 2 :i32 - ASSIGN $7 $21 :i32 - JMP $0 B8() :void + CONST $19 4 :i32 + ADD $20 $1 $19 :i32 + ASSIGN $1 $20 :i32 + CONST $21 2 :i32 + ASSIGN $7 $21 :i32 + JMP $0 B8() :void B7() - CONST $22 2 :i32 - ASSIGN $7 $22 :i32 - JMP $0 B9() :void + CONST $22 2 :i32 + ASSIGN $7 $22 :i32 + JMP $0 B9() :void B8() ControlFlowMerge - JMP $0 B9() :void + JMP $0 B9() :void B9() ControlFlowMerge - ADD $8 $1 $7 :i32 - ASSIGN $1 $8 :i32 - ASSIGN $9 $1 :i32 - RETURN $9 :i32 + ADD $8 $1 $7 :i32 + ASSIGN $1 $8 :i32 + ASSIGN $9 $1 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/doubleIfCondition.trace b/nautilus/test/data/control-flow-tests/tracing/doubleIfCondition.trace index 879fcda9..1fd31586 100644 --- a/nautilus/test/data/control-flow-tests/tracing/doubleIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/doubleIfCondition.trace @@ -1,30 +1,30 @@ B0() - CONST $1 1 :i32 - CONST $2 8 :i32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $1 1 :i32 + CONST $2 8 :i32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 1 :i32 - JMP $0 B5() :void + CONST $5 1 :i32 + JMP $0 B5() :void B2() - CONST $13 1 :i32 - ASSIGN $5 $13 :i32 - JMP $0 B5() :void + CONST $13 1 :i32 + ASSIGN $5 $13 :i32 + JMP $0 B5() :void B3() - CONST $8 20 :i32 - ADD $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 2 :i32 - JMP $0 B6() :void + CONST $8 20 :i32 + ADD $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 2 :i32 + JMP $0 B6() :void B4() - CONST $14 2 :i32 - ASSIGN $10 $14 :i32 - JMP $0 B6() :void + CONST $14 2 :i32 + ASSIGN $10 $14 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - EQ $6 $1 $5 :bool - CMP $7 $6 B3() B4() :void + EQ $6 $1 $5 :bool + CMP $7 $6 B3() B4() :void B6() ControlFlowMerge - ADD $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - ASSIGN $12 $1 :i32 - RETURN $12 :i32 + ADD $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + ASSIGN $12 $1 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifElseIfCondition.trace b/nautilus/test/data/control-flow-tests/tracing/ifElseIfCondition.trace index 9a30dde8..4bc5319d 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifElseIfCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifElseIfCondition.trace @@ -1,33 +1,33 @@ B0() - CONST $1 1 :i32 - CONST $2 8 :i32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $1 1 :i32 + CONST $2 8 :i32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 14 :i32 - ADD $6 $1 $5 :i32 - ASSIGN $1 $6 :i32 - CONST $7 2 :i32 - JMP $0 B5() :void + CONST $5 14 :i32 + ADD $6 $1 $5 :i32 + ASSIGN $1 $6 :i32 + CONST $7 2 :i32 + JMP $0 B5() :void B2() - CONST $10 1 :i32 - EQ $11 $1 $10 :bool - CMP $12 $11 B3() B4() :void + CONST $10 1 :i32 + EQ $11 $1 $10 :bool + CMP $12 $11 B3() B4() :void B3() - CONST $13 20 :i32 - ADD $14 $1 $13 :i32 - ASSIGN $1 $14 :i32 - CONST $15 2 :i32 - ASSIGN $7 $15 :i32 - JMP $0 B5() :void + CONST $13 20 :i32 + ADD $14 $1 $13 :i32 + ASSIGN $1 $14 :i32 + CONST $15 2 :i32 + ASSIGN $7 $15 :i32 + JMP $0 B5() :void B4() - CONST $16 2 :i32 - ASSIGN $7 $16 :i32 - JMP $0 B6() :void + CONST $16 2 :i32 + ASSIGN $7 $16 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - JMP $0 B6() :void + JMP $0 B6() :void B6() ControlFlowMerge - ADD $8 $1 $7 :i32 - ASSIGN $1 $8 :i32 - ASSIGN $9 $1 :i32 - RETURN $9 :i32 + ADD $8 $1 $7 :i32 + ASSIGN $1 $8 :i32 + ASSIGN $9 $1 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifElseIfElse.trace b/nautilus/test/data/control-flow-tests/tracing/ifElseIfElse.trace index 5c1a4f55..d4e3513e 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifElseIfElse.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifElseIfElse.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 10 :i32 - ASSIGN $2 $6 :i32 - RETURN $2 :i32 + CONST $6 10 :i32 + ASSIGN $2 $6 :i32 + RETURN $2 :i32 B2() - CONST $8 1 :i32 - EQ $9 $1 $8 :bool - CMP $10 $9 B3() B4() :void + CONST $8 1 :i32 + EQ $9 $1 $8 :bool + CMP $10 $9 B3() B4() :void B3() - CONST $11 20 :i32 - ASSIGN $2 $11 :i32 - RETURN $2 :i32 + CONST $11 20 :i32 + ASSIGN $2 $11 :i32 + RETURN $2 :i32 B4() - CONST $13 30 :i32 - ASSIGN $2 $13 :i32 - RETURN $2 :i32 + CONST $13 30 :i32 + ASSIGN $2 $13 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifElseIfOnly.trace b/nautilus/test/data/control-flow-tests/tracing/ifElseIfOnly.trace index 7fa9c6c0..4332a689 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifElseIfOnly.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifElseIfOnly.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 5 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ASSIGN $2 $6 :i32 - RETURN $2 :i32 + CONST $6 1 :i32 + ASSIGN $2 $6 :i32 + RETURN $2 :i32 B2() - CONST $8 10 :i32 - LT $9 $1 $8 :bool - CMP $10 $9 B3() B4() :void + CONST $8 10 :i32 + LT $9 $1 $8 :bool + CMP $10 $9 B3() B4() :void B3() - CONST $11 2 :i32 - ASSIGN $2 $11 :i32 - RETURN $2 :i32 + CONST $11 2 :i32 + ASSIGN $2 $11 :i32 + RETURN $2 :i32 B4() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifNotEqual.trace b/nautilus/test/data/control-flow-tests/tracing/ifNotEqual.trace index 11076b6a..6c128770 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifNotEqual.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifNotEqual.trace @@ -1,11 +1,11 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 5 :i32 - NEQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 1 :i32 + CONST $3 5 :i32 + NEQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 2 :i32 - ASSIGN $2 $6 :i32 - RETURN $2 :i32 + CONST $6 2 :i32 + ASSIGN $2 $6 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifThenCondition.trace b/nautilus/test/data/control-flow-tests/tracing/ifThenCondition.trace index 2338d7a5..e569c384 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifThenCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifThenCondition.trace @@ -1,18 +1,18 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 1 :i32 + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 42 :i32 - JMP $0 B3() :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 42 :i32 + JMP $0 B3() :void B2() - CONST $11 42 :i32 - ASSIGN $8 $11 :i32 - JMP $0 B3() :void + CONST $11 42 :i32 + ASSIGN $8 $11 :i32 + JMP $0 B3() :void B3() ControlFlowMerge - ADD $9 $2 $8 :i32 - RETURN $9 :i32 + ADD $9 $2 $8 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifThenElseCondition.trace b/nautilus/test/data/control-flow-tests/tracing/ifThenElseCondition.trace index 30ab829b..b86cf99f 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifThenElseCondition.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 1 :i32 + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 42 :i32 - JMP $0 B3() :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 42 :i32 + JMP $0 B3() :void B2() - CONST $11 42 :i32 - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 42 :i32 - ASSIGN $8 $13 :i32 - JMP $0 B3() :void + CONST $11 42 :i32 + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 42 :i32 + ASSIGN $8 $13 :i32 + JMP $0 B3() :void B3() ControlFlowMerge - ADD $9 $2 $8 :i32 - RETURN $9 :i32 + ADD $9 $2 $8 :i32 + RETURN $9 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifWithFunctionCall.trace b/nautilus/test/data/control-flow-tests/tracing/ifWithFunctionCall.trace index 1d3fc08b..cf14f318 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifWithFunctionCall.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifWithFunctionCall.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - ASSIGN $3 $1 :i32 - CONST $4 2 :i32 - MUL $5 $3 $4 :i32 - CONST $6 10 :i32 - GT $7 $5 $6 :bool - CMP $8 $7 B1() B2() :void + CONST $2 0 :i32 + ASSIGN $3 $1 :i32 + CONST $4 2 :i32 + MUL $5 $3 $4 :i32 + CONST $6 10 :i32 + GT $7 $5 $6 :bool + CMP $8 $7 B1() B2() :void B1() - CONST $9 1 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 1 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/ifWithTernary.trace b/nautilus/test/data/control-flow-tests/tracing/ifWithTernary.trace index 74fc951e..51e9554d 100644 --- a/nautilus/test/data/control-flow-tests/tracing/ifWithTernary.trace +++ b/nautilus/test/data/control-flow-tests/tracing/ifWithTernary.trace @@ -1,23 +1,23 @@ B0($1:i32) - CONST $2 5 :i32 - GT $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $2 5 :i32 + GT $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 10 :i32 - CONST $6 0 :i32 - JMP $0 B5() :void + CONST $5 10 :i32 + CONST $6 0 :i32 + JMP $0 B5() :void B2() - CONST $11 5 :i32 - ASSIGN $5 $11 :i32 - CONST $12 0 :i32 - ASSIGN $6 $12 :i32 - JMP $0 B5() :void + CONST $11 5 :i32 + ASSIGN $5 $11 :i32 + CONST $12 0 :i32 + ASSIGN $6 $12 :i32 + JMP $0 B5() :void B3() - CONST $9 -1 :i32 - ASSIGN $5 $9 :i32 - RETURN $5 :i32 + CONST $9 -1 :i32 + ASSIGN $5 $9 :i32 + RETURN $5 :i32 B4() - RETURN $5 :i32 + RETURN $5 :i32 B5() ControlFlowMerge - EQ $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + EQ $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void diff --git a/nautilus/test/data/control-flow-tests/tracing/logicalAnd.trace b/nautilus/test/data/control-flow-tests/tracing/logicalAnd.trace index c7f4191d..cc61f945 100644 --- a/nautilus/test/data/control-flow-tests/tracing/logicalAnd.trace +++ b/nautilus/test/data/control-flow-tests/tracing/logicalAnd.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - GT $4 $1 $3 :bool - CONST $5 15 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CMP $8 $7 B1() B2() :void + CONST $2 0 :i32 + CONST $3 5 :i32 + GT $4 $1 $3 :bool + CONST $5 15 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CMP $8 $7 B1() B2() :void B1() - CONST $9 1 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 1 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/logicalOr.trace b/nautilus/test/data/control-flow-tests/tracing/logicalOr.trace index f2dfc411..e8eae1cf 100644 --- a/nautilus/test/data/control-flow-tests/tracing/logicalOr.trace +++ b/nautilus/test/data/control-flow-tests/tracing/logicalOr.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - EQ $4 $1 $3 :bool - CONST $5 20 :i32 - EQ $6 $1 $5 :bool - OR $7 $4 $6 :bool - CMP $8 $7 B1() B2() :void + CONST $2 0 :i32 + CONST $3 10 :i32 + EQ $4 $1 $3 :bool + CONST $5 20 :i32 + EQ $6 $1 $5 :bool + OR $7 $4 $6 :bool + CMP $8 $7 B1() B2() :void B1() - CONST $9 1 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 1 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/logicalXOR.trace b/nautilus/test/data/control-flow-tests/tracing/logicalXOR.trace index 563d6cc8..f69fe48f 100644 --- a/nautilus/test/data/control-flow-tests/tracing/logicalXOR.trace +++ b/nautilus/test/data/control-flow-tests/tracing/logicalXOR.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - LT $4 $1 $3 :bool - CONST $5 5 :i32 - GT $6 $1 $5 :bool - NEQ $7 $4 $6 :bool - CMP $8 $7 B1() B2() :void + CONST $2 0 :i32 + CONST $3 10 :i32 + LT $4 $1 $3 :bool + CONST $5 5 :i32 + GT $6 $1 $5 :bool + NEQ $7 $4 $6 :bool + CMP $8 $7 B1() B2() :void B1() - CONST $9 1 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 1 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/multipleConditions.trace b/nautilus/test/data/control-flow-tests/tracing/multipleConditions.trace index e391a20d..79a8b5dd 100644 --- a/nautilus/test/data/control-flow-tests/tracing/multipleConditions.trace +++ b/nautilus/test/data/control-flow-tests/tracing/multipleConditions.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - GT $4 $1 $3 :bool - CONST $5 10 :i32 - LT $6 $1 $5 :bool - AND $7 $4 $6 :bool - CONST $8 20 :i32 - EQ $9 $1 $8 :bool - OR $10 $7 $9 :bool - CMP $11 $10 B1() B2() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + GT $4 $1 $3 :bool + CONST $5 10 :i32 + LT $6 $1 $5 :bool + AND $7 $4 $6 :bool + CONST $8 20 :i32 + EQ $9 $1 $8 :bool + OR $10 $7 $9 :bool + CMP $11 $10 B1() B2() :void B1() - CONST $12 1 :i32 - ASSIGN $2 $12 :i32 - RETURN $2 :i32 + CONST $12 1 :i32 + ASSIGN $2 $12 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/multipleElse.trace b/nautilus/test/data/control-flow-tests/tracing/multipleElse.trace index 196594d4..29c7359a 100644 --- a/nautilus/test/data/control-flow-tests/tracing/multipleElse.trace +++ b/nautilus/test/data/control-flow-tests/tracing/multipleElse.trace @@ -1,23 +1,23 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 10 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ASSIGN $2 $6 :i32 - RETURN $2 :i32 + CONST $6 1 :i32 + ASSIGN $2 $6 :i32 + RETURN $2 :i32 B2() - CONST $8 2 :i32 - ASSIGN $2 $8 :i32 - CONST $9 5 :i32 - EQ $10 $1 $9 :bool - CMP $11 $10 B3() B4() :void + CONST $8 2 :i32 + ASSIGN $2 $8 :i32 + CONST $9 5 :i32 + EQ $10 $1 $9 :bool + CMP $11 $10 B3() B4() :void B3() - CONST $12 3 :i32 - ASSIGN $2 $12 :i32 - RETURN $2 :i32 + CONST $12 3 :i32 + ASSIGN $2 $12 :i32 + RETURN $2 :i32 B4() - CONST $14 4 :i32 - ASSIGN $2 $14 :i32 - RETURN $2 :i32 + CONST $14 4 :i32 + ASSIGN $2 $14 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/multipleVoidReturnsFunction.trace b/nautilus/test/data/control-flow-tests/tracing/multipleVoidReturnsFunction.trace index 1e94b467..772aae05 100644 --- a/nautilus/test/data/control-flow-tests/tracing/multipleVoidReturnsFunction.trace +++ b/nautilus/test/data/control-flow-tests/tracing/multipleVoidReturnsFunction.trace @@ -1,19 +1,19 @@ B0($1:ptr) - ASSIGN $2 $1 :ptr - ASSIGN $3 $2 :ptr - LOAD $4 $3 :i32 - CONST $5 10 :i32 - GT $6 $4 $5 :bool - CMP $7 $6 B1() B2() :void + ASSIGN $2 $1 :ptr + ASSIGN $3 $2 :ptr + LOAD $4 $3 :i32 + CONST $5 10 :i32 + GT $6 $4 $5 :bool + CMP $7 $6 B1() B2() :void B1() - ASSIGN $8 $1 :ptr - ASSIGN $9 $8 :ptr - CONST $10 1 :i32 - STORE $1 $10 :i32 - RETURN $0 :void + ASSIGN $8 $1 :ptr + ASSIGN $9 $8 :ptr + CONST $10 1 :i32 + STORE $1 $10 :i32 + RETURN $0 :void B2() - ASSIGN $12 $1 :ptr - ASSIGN $13 $12 :ptr - CONST $14 42 :i32 - STORE $1 $14 :i32 - RETURN $0 :void + ASSIGN $12 $1 :ptr + ASSIGN $13 $12 :ptr + CONST $14 42 :i32 + STORE $1 $14 :i32 + RETURN $0 :void diff --git a/nautilus/test/data/control-flow-tests/tracing/nestedIf.trace b/nautilus/test/data/control-flow-tests/tracing/nestedIf.trace index 2afe8f2b..dffeb11e 100644 --- a/nautilus/test/data/control-flow-tests/tracing/nestedIf.trace +++ b/nautilus/test/data/control-flow-tests/tracing/nestedIf.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 20 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 1 :i32 + CONST $3 20 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 10 :i32 - GT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 10 :i32 + GT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() - CONST $9 2 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 2 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B4() - CONST $12 3 :i32 - ASSIGN $2 $12 :i32 - RETURN $2 :i32 + CONST $12 3 :i32 + ASSIGN $2 $12 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/nestedIfElseDifferentLevels.trace b/nautilus/test/data/control-flow-tests/tracing/nestedIfElseDifferentLevels.trace index 63d2954a..4a3d6bef 100644 --- a/nautilus/test/data/control-flow-tests/tracing/nestedIfElseDifferentLevels.trace +++ b/nautilus/test/data/control-flow-tests/tracing/nestedIfElseDifferentLevels.trace @@ -1,29 +1,29 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 5 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 5 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - CONST $11 -1 :i32 - ASSIGN $2 $11 :i32 - RETURN $2 :i32 + CONST $11 -1 :i32 + ASSIGN $2 $11 :i32 + RETURN $2 :i32 B3() - CONST $9 1 :i32 - ASSIGN $2 $9 :i32 - RETURN $2 :i32 + CONST $9 1 :i32 + ASSIGN $2 $9 :i32 + RETURN $2 :i32 B4() - CONST $13 2 :i32 - ASSIGN $2 $13 :i32 - CONST $14 6 :i32 - EQ $15 $1 $14 :bool - CMP $16 $15 B5() B6() :void + CONST $13 2 :i32 + ASSIGN $2 $13 :i32 + CONST $14 6 :i32 + EQ $15 $1 $14 :bool + CMP $16 $15 B5() B6() :void B5() - CONST $17 3 :i32 - ASSIGN $2 $17 :i32 - RETURN $2 :i32 + CONST $17 3 :i32 + ASSIGN $2 $17 :i32 + RETURN $2 :i32 B6() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/nestedIfNoElseCondition.trace b/nautilus/test/data/control-flow-tests/tracing/nestedIfNoElseCondition.trace index 9fe8a433..c35710c2 100644 --- a/nautilus/test/data/control-flow-tests/tracing/nestedIfNoElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/nestedIfNoElseCondition.trace @@ -1,34 +1,34 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 4 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 2 :i32 - JMP $0 B5() :void + CONST $6 4 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 2 :i32 + JMP $0 B5() :void B2() - CONST $13 9 :i32 - ADD $14 $2 $13 :i32 - ASSIGN $2 $14 :i32 - CONST $15 8 :i32 - EQ $16 $2 $15 :bool - CMP $17 $16 B3() B4() :void + CONST $13 9 :i32 + ADD $14 $2 $13 :i32 + ASSIGN $2 $14 :i32 + CONST $15 8 :i32 + EQ $16 $2 $15 :bool + CMP $17 $16 B3() B4() :void B3() - CONST $18 14 :i32 - ADD $19 $2 $18 :i32 - CONST $20 2 :i32 - ASSIGN $8 $20 :i32 - JMP $0 B5() :void + CONST $18 14 :i32 + ADD $19 $2 $18 :i32 + CONST $20 2 :i32 + ASSIGN $8 $20 :i32 + JMP $0 B5() :void B4() - CONST $23 2 :i32 - ASSIGN $8 $23 :i32 - JMP $0 B6() :void + CONST $23 2 :i32 + ASSIGN $8 $23 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - JMP $0 B6() :void + JMP $0 B6() :void B6() ControlFlowMerge - ADD $9 $2 $8 :i32 - ASSIGN $2 $9 :i32 - ASSIGN $10 $2 :i32 - RETURN $10 :i32 + ADD $9 $2 $8 :i32 + ASSIGN $2 $9 :i32 + ASSIGN $10 $2 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/nestedIfThenElseCondition.trace b/nautilus/test/data/control-flow-tests/tracing/nestedIfThenElseCondition.trace index 4c3f7552..6d68c4b2 100644 --- a/nautilus/test/data/control-flow-tests/tracing/nestedIfThenElseCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/nestedIfThenElseCondition.trace @@ -1,29 +1,29 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - EQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $3 42 :i32 + EQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 2 :i32 - JMP $0 B5() :void + CONST $6 2 :i32 + JMP $0 B5() :void B2() - CONST $11 8 :i32 - EQ $12 $2 $11 :bool - CMP $13 $12 B3() B4() :void + CONST $11 8 :i32 + EQ $12 $2 $11 :bool + CMP $13 $12 B3() B4() :void B3() - CONST $14 2 :i32 - ASSIGN $6 $14 :i32 - JMP $0 B5() :void + CONST $14 2 :i32 + ASSIGN $6 $14 :i32 + JMP $0 B5() :void B4() - CONST $17 2 :i32 - ADD $18 $2 $17 :i32 - ASSIGN $2 $18 :i32 - CONST $19 2 :i32 - ASSIGN $6 $19 :i32 - JMP $0 B6() :void + CONST $17 2 :i32 + ADD $18 $2 $17 :i32 + ASSIGN $2 $18 :i32 + CONST $19 2 :i32 + ASSIGN $6 $19 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - JMP $0 B6() :void + JMP $0 B6() :void B6() ControlFlowMerge - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - ASSIGN $8 $2 :i32 - RETURN $8 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + ASSIGN $8 $2 :i32 + RETURN $8 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/orCondition.trace b/nautilus/test/data/control-flow-tests/tracing/orCondition.trace index 120b5ea7..93ee667f 100644 --- a/nautilus/test/data/control-flow-tests/tracing/orCondition.trace +++ b/nautilus/test/data/control-flow-tests/tracing/orCondition.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 8 :i32 - EQ $4 $1 $3 :bool - CONST $5 1 :i32 - EQ $6 $1 $5 :bool - OR $7 $4 $6 :bool - CMP $8 $7 B1() B2() :void + CONST $2 1 :i32 + CONST $3 8 :i32 + EQ $4 $1 $3 :bool + CONST $5 1 :i32 + EQ $6 $1 $5 :bool + OR $7 $4 $6 :bool + CMP $8 $7 B1() B2() :void B1() - CONST $9 14 :i32 - ADD $10 $2 $9 :i32 - ASSIGN $2 $10 :i32 - RETURN $2 :i32 + CONST $9 14 :i32 + ADD $10 $2 $9 :i32 + ASSIGN $2 $10 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/shortCircuitEvaluation.trace b/nautilus/test/data/control-flow-tests/tracing/shortCircuitEvaluation.trace index a7e1c600..a493b98c 100644 --- a/nautilus/test/data/control-flow-tests/tracing/shortCircuitEvaluation.trace +++ b/nautilus/test/data/control-flow-tests/tracing/shortCircuitEvaluation.trace @@ -1,16 +1,16 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - NEQ $4 $1 $3 :bool - CONST $5 10 :i32 - DIV $6 $5 $1 :i32 - CONST $7 1 :i32 - GT $8 $6 $7 :bool - AND $9 $4 $8 :bool - CMP $10 $9 B1() B2() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + NEQ $4 $1 $3 :bool + CONST $5 10 :i32 + DIV $6 $5 $1 :i32 + CONST $7 1 :i32 + GT $8 $6 $7 :bool + AND $9 $4 $8 :bool + CMP $10 $9 B1() B2() :void B1() - CONST $11 1 :i32 - ASSIGN $2 $11 :i32 - RETURN $2 :i32 + CONST $11 1 :i32 + ASSIGN $2 $11 :i32 + RETURN $2 :i32 B2() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/control-flow-tests/tracing/varyingComplexity.trace b/nautilus/test/data/control-flow-tests/tracing/varyingComplexity.trace index 0351c0e1..c36219d1 100644 --- a/nautilus/test/data/control-flow-tests/tracing/varyingComplexity.trace +++ b/nautilus/test/data/control-flow-tests/tracing/varyingComplexity.trace @@ -1,33 +1,33 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 5 :i32 - LT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 5 :i32 + LT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ASSIGN $2 $6 :i32 - RETURN $2 :i32 + CONST $6 1 :i32 + ASSIGN $2 $6 :i32 + RETURN $2 :i32 B2() - CONST $8 5 :i32 - GTE $9 $1 $8 :bool - CONST $10 10 :i32 - LTE $11 $1 $10 :bool - AND $12 $9 $11 :bool - CMP $13 $12 B3() B4() :void + CONST $8 5 :i32 + GTE $9 $1 $8 :bool + CONST $10 10 :i32 + LTE $11 $1 $10 :bool + AND $12 $9 $11 :bool + CMP $13 $12 B3() B4() :void B3() - CONST $14 2 :i32 - ASSIGN $2 $14 :i32 - CONST $15 7 :i32 - EQ $16 $1 $15 :bool - CMP $17 $16 B5() B6() :void + CONST $14 2 :i32 + ASSIGN $2 $14 :i32 + CONST $15 7 :i32 + EQ $16 $1 $15 :bool + CMP $17 $16 B5() B6() :void B4() - CONST $21 3 :i32 - ASSIGN $2 $21 :i32 - RETURN $2 :i32 + CONST $21 3 :i32 + ASSIGN $2 $21 :i32 + RETURN $2 :i32 B5() - CONST $18 1 :i32 - ADD $19 $2 $18 :i32 - ASSIGN $2 $19 :i32 - RETURN $2 :i32 + CONST $18 1 :i32 + ADD $19 $2 $18 :i32 + ASSIGN $2 $19 :i32 + RETURN $2 :i32 B6() - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace b/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace index 8a907f5b..584e7ea8 100644 --- a/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace +++ b/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CALL $2 nautilus::enumFunction(nautilus::Color)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::enumFunction(nautilus::Color)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/enum-tests/after_ssa/getEnum.trace b/nautilus/test/data/enum-tests/after_ssa/getEnum.trace index c3a92b79..c6d74556 100644 --- a/nautilus/test/data/enum-tests/after_ssa/getEnum.trace +++ b/nautilus/test/data/enum-tests/after_ssa/getEnum.trace @@ -1,3 +1,3 @@ B0() - CONST $1 0 :ui32 - RETURN $1 :ui32 + CONST $1 0 :ui32 + RETURN $1 :ui32 diff --git a/nautilus/test/data/enum-tests/after_ssa/handleEnum.trace b/nautilus/test/data/enum-tests/after_ssa/handleEnum.trace index 3b004170..cdf4dd64 100644 --- a/nautilus/test/data/enum-tests/after_ssa/handleEnum.trace +++ b/nautilus/test/data/enum-tests/after_ssa/handleEnum.trace @@ -1,4 +1,4 @@ B0($1:ui32) - CONST $2 0 :ui32 - EQ $3 $1 $2 :bool - RETURN $3 :bool + CONST $2 0 :ui32 + EQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/enum-tests/after_ssa/isEnum.trace b/nautilus/test/data/enum-tests/after_ssa/isEnum.trace index 58ef03b3..adc272c5 100644 --- a/nautilus/test/data/enum-tests/after_ssa/isEnum.trace +++ b/nautilus/test/data/enum-tests/after_ssa/isEnum.trace @@ -1,19 +1,19 @@ B0($1:ui32) - CONST $2 0 :ui32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1() B2($1) :void + CONST $2 0 :ui32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1() B2($1) :void B1() - CONST $5 1 :i32 - JMP $0 B5($5) :void + CONST $5 1 :i32 + JMP $0 B5($5) :void B2($1:ui32) - CONST $7 1 :ui32 - EQ $8 $1 $7 :bool - CMP $9 $8 B3() B4() :void + CONST $7 1 :ui32 + EQ $8 $1 $7 :bool + CMP $9 $8 B3() B4() :void B3() - CONST $10 2 :i32 - JMP $0 B5($10) :void + CONST $10 2 :i32 + JMP $0 B5($10) :void B4() - CONST $12 42 :i32 - JMP $0 B5($12) :void + CONST $12 42 :i32 + JMP $0 B5($12) :void B5($5:i32) - RETURN $5 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/enum-tests/ir/callEnumFunction.trace b/nautilus/test/data/enum-tests/ir/callEnumFunction.trace index 26212912..e093ded3 100644 --- a/nautilus/test/data/enum-tests/ir/callEnumFunction.trace +++ b/nautilus/test/data/enum-tests/ir/callEnumFunction.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = nautilus::enumFunction(nautilus::Color)($1) :i32 - return ($2) :i32 + $2 = nautilus::enumFunction(nautilus::Color)($1) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/enum-tests/ir/getEnum.trace b/nautilus/test/data/enum-tests/ir/getEnum.trace index a0e646a5..c8bab973 100644 --- a/nautilus/test/data/enum-tests/ir/getEnum.trace +++ b/nautilus/test/data/enum-tests/ir/getEnum.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 0 :ui32 - return ($1) :ui32 + $1 = 0 :ui32 + return ($1) :ui32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/enum-tests/ir/handleEnum.trace b/nautilus/test/data/enum-tests/ir/handleEnum.trace index 87b6a963..e33aad62 100644 --- a/nautilus/test/data/enum-tests/ir/handleEnum.trace +++ b/nautilus/test/data/enum-tests/ir/handleEnum.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = 0 :ui32 - $3 = $1 == $2 :bool - return ($3) :bool + $2 = 0 :ui32 + $3 = $1 == $2 :bool + return ($3) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/enum-tests/ir/isEnum.trace b/nautilus/test/data/enum-tests/ir/isEnum.trace index f95dbb9c..3c024daf 100644 --- a/nautilus/test/data/enum-tests/ir/isEnum.trace +++ b/nautilus/test/data/enum-tests/ir/isEnum.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ui32): - $2 = 0 :ui32 - $3 = $1 == $2 :bool - if $3 ? Block_1() : Block_2($1) :void + $2 = 0 :ui32 + $3 = $1 == $2 :bool + if $3 ? Block_1() : Block_2($1) :void Block_1(): - $5 = 1 :i32 - br Block_5($5) :void + $5 = 1 :i32 + br Block_5($5) :void Block_5($5:i32): - return ($5) :i32 + return ($5) :i32 Block_2($1:ui32): - $7 = 1 :ui32 - $8 = $1 == $7 :bool - if $8 ? Block_3() : Block_4() :void + $7 = 1 :ui32 + $8 = $1 == $7 :bool + if $8 ? Block_3() : Block_4() :void Block_3(): - $10 = 2 :i32 - br Block_5($10) :void + $10 = 2 :i32 + br Block_5($10) :void Block_4(): - $12 = 42 :i32 - br Block_5($12) :void + $12 = 42 :i32 + br Block_5($12) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace b/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace index 8a907f5b..584e7ea8 100644 --- a/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace +++ b/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace @@ -1,3 +1,3 @@ B0($1:ui32) - CALL $2 nautilus::enumFunction(nautilus::Color)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::enumFunction(nautilus::Color)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/enum-tests/tracing/getEnum.trace b/nautilus/test/data/enum-tests/tracing/getEnum.trace index c3a92b79..c6d74556 100644 --- a/nautilus/test/data/enum-tests/tracing/getEnum.trace +++ b/nautilus/test/data/enum-tests/tracing/getEnum.trace @@ -1,3 +1,3 @@ B0() - CONST $1 0 :ui32 - RETURN $1 :ui32 + CONST $1 0 :ui32 + RETURN $1 :ui32 diff --git a/nautilus/test/data/enum-tests/tracing/handleEnum.trace b/nautilus/test/data/enum-tests/tracing/handleEnum.trace index 3b004170..cdf4dd64 100644 --- a/nautilus/test/data/enum-tests/tracing/handleEnum.trace +++ b/nautilus/test/data/enum-tests/tracing/handleEnum.trace @@ -1,4 +1,4 @@ B0($1:ui32) - CONST $2 0 :ui32 - EQ $3 $1 $2 :bool - RETURN $3 :bool + CONST $2 0 :ui32 + EQ $3 $1 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/enum-tests/tracing/isEnum.trace b/nautilus/test/data/enum-tests/tracing/isEnum.trace index 72ebe93d..3f4ff1ad 100644 --- a/nautilus/test/data/enum-tests/tracing/isEnum.trace +++ b/nautilus/test/data/enum-tests/tracing/isEnum.trace @@ -1,17 +1,17 @@ B0($1:ui32) - CONST $2 0 :ui32 - EQ $3 $1 $2 :bool - CMP $4 $3 B1() B2() :void + CONST $2 0 :ui32 + EQ $3 $1 $2 :bool + CMP $4 $3 B1() B2() :void B1() - CONST $5 1 :i32 - RETURN $5 :i32 + CONST $5 1 :i32 + RETURN $5 :i32 B2() - CONST $7 1 :ui32 - EQ $8 $1 $7 :bool - CMP $9 $8 B3() B4() :void + CONST $7 1 :ui32 + EQ $8 $1 $7 :bool + CMP $9 $8 B3() B4() :void B3() - CONST $10 2 :i32 - RETURN $10 :i32 + CONST $10 2 :i32 + RETURN $10 :i32 B4() - CONST $12 42 :i32 - RETURN $12 :i32 + CONST $12 42 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignAdd.trace b/nautilus/test/data/expression-tests/after_ssa/assignAdd.trace index 7090e004..3a79fe61 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignAdd.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignAdd.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - ADD $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + ADD $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignAnd.trace b/nautilus/test/data/expression-tests/after_ssa/assignAnd.trace index 24777a7c..3cc24dee 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignAnd.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignAnd.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - BAND $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + BAND $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignDiv.trace b/nautilus/test/data/expression-tests/after_ssa/assignDiv.trace index 2aaed49a..a0295e0a 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignDiv.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignDiv.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - DIV $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + DIV $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignMod.trace b/nautilus/test/data/expression-tests/after_ssa/assignMod.trace index 25b3f687..5b232e01 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignMod.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignMod.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - MOD $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + MOD $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignMul.trace b/nautilus/test/data/expression-tests/after_ssa/assignMul.trace index 94d08d07..dfceeaf8 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignMul.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignMul.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - MUL $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + MUL $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignOr.trace b/nautilus/test/data/expression-tests/after_ssa/assignOr.trace index b0575dc9..fdf01ca0 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignOr.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignOr.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - BOR $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + BOR $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignShl.trace b/nautilus/test/data/expression-tests/after_ssa/assignShl.trace index a0f462dd..9ad18711 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignShl.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignShl.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - LSH $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + LSH $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignShr.trace b/nautilus/test/data/expression-tests/after_ssa/assignShr.trace index 9e28346b..73a8ff80 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignShr.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignShr.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - RSH $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + RSH $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignSub.trace b/nautilus/test/data/expression-tests/after_ssa/assignSub.trace index 49443b63..b71b008e 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignSub.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignSub.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - SUB $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + SUB $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignXor.trace b/nautilus/test/data/expression-tests/after_ssa/assignXor.trace index 00367161..65d4e839 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignXor.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignXor.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - BXOR $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + BXOR $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignment1.trace b/nautilus/test/data/expression-tests/after_ssa/assignment1.trace index 51f8b1bd..f4d13fba 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignment1.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignment1.trace @@ -1,2 +1,2 @@ B0($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignment2.trace b/nautilus/test/data/expression-tests/after_ssa/assignment2.trace index 1a40dfa5..362c761d 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignment2.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignment2.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - RETURN $4 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + RETURN $4 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignment3.trace b/nautilus/test/data/expression-tests/after_ssa/assignment3.trace index 302e30f8..a2ceaaf2 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignment3.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignment3.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - RETURN $1 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignment4.trace b/nautilus/test/data/expression-tests/after_ssa/assignment4.trace index 6c2017c1..3f481100 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignment4.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignment4.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 42 :i32 - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - RETURN $4 :i32 + CONST $2 42 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + RETURN $4 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/assignment5.trace b/nautilus/test/data/expression-tests/after_ssa/assignment5.trace index 2ceb5e93..f6a141b9 100644 --- a/nautilus/test/data/expression-tests/after_ssa/assignment5.trace +++ b/nautilus/test/data/expression-tests/after_ssa/assignment5.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 42 :i32 - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - RETURN $1 :i32 + CONST $2 42 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/castFloatToDoubleAddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/castFloatToDoubleAddExpression.trace index 08c07b97..b3d5aef5 100644 --- a/nautilus/test/data/expression-tests/after_ssa/castFloatToDoubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/castFloatToDoubleAddExpression.trace @@ -1,5 +1,5 @@ B0($1:f32) - CONST $2 7 :f64 - CAST $3 $1 :f64 - ADD $4 $3 $2 :f64 - RETURN $4 :f64 + CONST $2 7 :f64 + CAST $3 $1 :f64 + ADD $4 $3 $2 :f64 + RETURN $4 :f64 diff --git a/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression.trace index 8013ccdc..30d667b2 100644 --- a/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression.trace @@ -1,5 +1,5 @@ B0($1:i8) - CONST $2 7 :i64 - CAST $3 $1 :i64 - ADD $4 $3 $2 :i64 - RETURN $4 :i64 + CONST $2 7 :i64 + CAST $3 $1 :i64 + ADD $4 $3 $2 :i64 + RETURN $4 :i64 diff --git a/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression2.trace b/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression2.trace index bae53481..313c3fc0 100644 --- a/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression2.trace +++ b/nautilus/test/data/expression-tests/after_ssa/castInt8ToInt64AddExpression2.trace @@ -1,5 +1,5 @@ B0($1:i8) - CONST $2 42 :i64 - CAST $3 $1 :i64 - ADD $4 $2 $3 :i64 - RETURN $4 :i64 + CONST $2 42 :i64 + CAST $3 $1 :i64 + ADD $4 $2 $3 :i64 + RETURN $4 :i64 diff --git a/nautilus/test/data/expression-tests/after_ssa/decrementPost.trace b/nautilus/test/data/expression-tests/after_ssa/decrementPost.trace index eeb3b419..e7e3b009 100644 --- a/nautilus/test/data/expression-tests/after_ssa/decrementPost.trace +++ b/nautilus/test/data/expression-tests/after_ssa/decrementPost.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $3 1 :i32 - SUB $4 $1 $3 :i32 - ADD $5 $1 $4 :i32 - RETURN $5 :i32 + CONST $3 1 :i32 + SUB $4 $1 $3 :i32 + ADD $5 $1 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/decrementPre.trace b/nautilus/test/data/expression-tests/after_ssa/decrementPre.trace index 4feaf15f..f4bb372c 100644 --- a/nautilus/test/data/expression-tests/after_ssa/decrementPre.trace +++ b/nautilus/test/data/expression-tests/after_ssa/decrementPre.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 1 :i32 - SUB $3 $1 $2 :i32 - ADD $5 $3 $3 :i32 - RETURN $5 :i32 + CONST $2 1 :i32 + SUB $3 $1 $2 :i32 + ADD $5 $3 $3 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/doubleAddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/doubleAddExpression.trace index 61dfd097..b7b9549d 100644 --- a/nautilus/test/data/expression-tests/after_ssa/doubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/doubleAddExpression.trace @@ -1,4 +1,4 @@ B0($1:f64) - CONST $2 7 :f64 - ADD $3 $1 $2 :f64 - RETURN $3 :f64 + CONST $2 7 :f64 + ADD $3 $1 $2 :f64 + RETURN $3 :f64 diff --git a/nautilus/test/data/expression-tests/after_ssa/floatAddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/floatAddExpression.trace index 65c12e47..055d89bf 100644 --- a/nautilus/test/data/expression-tests/after_ssa/floatAddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/floatAddExpression.trace @@ -1,4 +1,4 @@ B0($1:f32) - CONST $2 7 :f32 - ADD $3 $1 $2 :f32 - RETURN $3 :f32 + CONST $2 7 :f32 + ADD $3 $1 $2 :f32 + RETURN $3 :f32 diff --git a/nautilus/test/data/expression-tests/after_ssa/incrementPost.trace b/nautilus/test/data/expression-tests/after_ssa/incrementPost.trace index f3033272..beb8623a 100644 --- a/nautilus/test/data/expression-tests/after_ssa/incrementPost.trace +++ b/nautilus/test/data/expression-tests/after_ssa/incrementPost.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - ADD $5 $1 $4 :i32 - RETURN $5 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + ADD $5 $1 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/incrementPre.trace b/nautilus/test/data/expression-tests/after_ssa/incrementPre.trace index ed3e6df9..a8015585 100644 --- a/nautilus/test/data/expression-tests/after_ssa/incrementPre.trace +++ b/nautilus/test/data/expression-tests/after_ssa/incrementPre.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 1 :i32 - ADD $3 $1 $2 :i32 - ADD $5 $3 $3 :i32 - RETURN $5 :i32 + CONST $2 1 :i32 + ADD $3 $1 $2 :i32 + ADD $5 $3 $3 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace index fa4e99cb..8c277633 100644 --- a/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i16) - CONST $2 5 :i16 - ADD $3 $1 $2 :i32 - RETURN $3 :i16 + CONST $2 5 :i16 + ADD $3 $1 $2 :i32 + RETURN $3 :i16 diff --git a/nautilus/test/data/expression-tests/after_ssa/int32AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int32AddExpression.trace index 7090e004..3a79fe61 100644 --- a/nautilus/test/data/expression-tests/after_ssa/int32AddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/int32AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - ADD $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + ADD $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/after_ssa/int64AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int64AddExpression.trace index 3a837f24..dc9a16bf 100644 --- a/nautilus/test/data/expression-tests/after_ssa/int64AddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/int64AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i64) - CONST $2 7 :i64 - ADD $3 $1 $2 :i64 - RETURN $3 :i64 + CONST $2 7 :i64 + ADD $3 $1 $2 :i64 + RETURN $3 :i64 diff --git a/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace index c98a835f..227bcc78 100644 --- a/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace +++ b/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i8) - CONST $2  :i8 - ADD $3 $2 $1 :i32 - RETURN $3 :i8 + CONST $2 2 :i8 + ADD $3 $2 $1 :i32 + RETURN $3 :i8 diff --git a/nautilus/test/data/expression-tests/after_ssa/logicalNot_bool.trace b/nautilus/test/data/expression-tests/after_ssa/logicalNot_bool.trace index 2a509d93..79f08759 100644 --- a/nautilus/test/data/expression-tests/after_ssa/logicalNot_bool.trace +++ b/nautilus/test/data/expression-tests/after_ssa/logicalNot_bool.trace @@ -1,3 +1,3 @@ B0($1:bool) - NOT $3 $1 :bool - RETURN $3 :bool + NOT $3 $1 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/expression-tests/after_ssa/negate_i8.trace b/nautilus/test/data/expression-tests/after_ssa/negate_i8.trace index 89fee5b1..7a59d5f9 100644 --- a/nautilus/test/data/expression-tests/after_ssa/negate_i8.trace +++ b/nautilus/test/data/expression-tests/after_ssa/negate_i8.trace @@ -1,3 +1,3 @@ B0($1:i8) - NEGATE $3 $1 :i8 - RETURN $3 :i8 + NEGATE $3 $1 :i8 + RETURN $3 :i8 diff --git a/nautilus/test/data/expression-tests/after_ssa/shiftLeft_i8.trace b/nautilus/test/data/expression-tests/after_ssa/shiftLeft_i8.trace index 5f3bd801..5a1064ef 100644 --- a/nautilus/test/data/expression-tests/after_ssa/shiftLeft_i8.trace +++ b/nautilus/test/data/expression-tests/after_ssa/shiftLeft_i8.trace @@ -1,4 +1,4 @@ B0($1:i8,$2:i8) - LSH $3 $1 $2 :i32 - CAST $4 $3 :i8 - RETURN $4 :i8 + LSH $3 $1 $2 :i32 + CAST $4 $3 :i8 + RETURN $4 :i8 diff --git a/nautilus/test/data/expression-tests/after_ssa/shiftRight_i8.trace b/nautilus/test/data/expression-tests/after_ssa/shiftRight_i8.trace index 494fb4e2..3ecec5df 100644 --- a/nautilus/test/data/expression-tests/after_ssa/shiftRight_i8.trace +++ b/nautilus/test/data/expression-tests/after_ssa/shiftRight_i8.trace @@ -1,4 +1,4 @@ B0($1:i8,$2:i8) - RSH $3 $1 $2 :i32 - CAST $4 $3 :i8 - RETURN $4 :i8 + RSH $3 $1 $2 :i32 + CAST $4 $3 :i8 + RETURN $4 :i8 diff --git a/nautilus/test/data/expression-tests/ir/assignAdd.trace b/nautilus/test/data/expression-tests/ir/assignAdd.trace index a64db49e..2f7aa509 100644 --- a/nautilus/test/data/expression-tests/ir/assignAdd.trace +++ b/nautilus/test/data/expression-tests/ir/assignAdd.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 + $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 + $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignAnd.trace b/nautilus/test/data/expression-tests/ir/assignAnd.trace index 539c02ed..6678a2da 100644 --- a/nautilus/test/data/expression-tests/ir/assignAnd.trace +++ b/nautilus/test/data/expression-tests/ir/assignAnd.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 & $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 & $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignDiv.trace b/nautilus/test/data/expression-tests/ir/assignDiv.trace index 67d0b91c..50656036 100644 --- a/nautilus/test/data/expression-tests/ir/assignDiv.trace +++ b/nautilus/test/data/expression-tests/ir/assignDiv.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 / $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 / $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignMod.trace b/nautilus/test/data/expression-tests/ir/assignMod.trace index c70ca6da..94510921 100644 --- a/nautilus/test/data/expression-tests/ir/assignMod.trace +++ b/nautilus/test/data/expression-tests/ir/assignMod.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 % $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 % $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignMul.trace b/nautilus/test/data/expression-tests/ir/assignMul.trace index 167684f4..4e654af4 100644 --- a/nautilus/test/data/expression-tests/ir/assignMul.trace +++ b/nautilus/test/data/expression-tests/ir/assignMul.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 * $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 * $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignOr.trace b/nautilus/test/data/expression-tests/ir/assignOr.trace index 7df557b1..39d902c2 100644 --- a/nautilus/test/data/expression-tests/ir/assignOr.trace +++ b/nautilus/test/data/expression-tests/ir/assignOr.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 | $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 | $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignShl.trace b/nautilus/test/data/expression-tests/ir/assignShl.trace index a96aa588..6ac2c37b 100644 --- a/nautilus/test/data/expression-tests/ir/assignShl.trace +++ b/nautilus/test/data/expression-tests/ir/assignShl.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 << $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 << $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignShr.trace b/nautilus/test/data/expression-tests/ir/assignShr.trace index 4c4aac75..75579643 100644 --- a/nautilus/test/data/expression-tests/ir/assignShr.trace +++ b/nautilus/test/data/expression-tests/ir/assignShr.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 >> $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 >> $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignSub.trace b/nautilus/test/data/expression-tests/ir/assignSub.trace index 236d0169..71687b95 100644 --- a/nautilus/test/data/expression-tests/ir/assignSub.trace +++ b/nautilus/test/data/expression-tests/ir/assignSub.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 - $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 - $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignXor.trace b/nautilus/test/data/expression-tests/ir/assignXor.trace index 1ef329e0..684a2916 100644 --- a/nautilus/test/data/expression-tests/ir/assignXor.trace +++ b/nautilus/test/data/expression-tests/ir/assignXor.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 ^ $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 ^ $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignment1.trace b/nautilus/test/data/expression-tests/ir/assignment1.trace index d1418bc1..62807bf8 100644 --- a/nautilus/test/data/expression-tests/ir/assignment1.trace +++ b/nautilus/test/data/expression-tests/ir/assignment1.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignment2.trace b/nautilus/test/data/expression-tests/ir/assignment2.trace index d2341920..61153ed0 100644 --- a/nautilus/test/data/expression-tests/ir/assignment2.trace +++ b/nautilus/test/data/expression-tests/ir/assignment2.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $3 = 1 :i32 - $4 = $1 + $3 :i32 - return ($4) :i32 + $3 = 1 :i32 + $4 = $1 + $3 :i32 + return ($4) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignment3.trace b/nautilus/test/data/expression-tests/ir/assignment3.trace index 8429537d..3e2feb9b 100644 --- a/nautilus/test/data/expression-tests/ir/assignment3.trace +++ b/nautilus/test/data/expression-tests/ir/assignment3.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $3 = 1 :i32 - $4 = $1 + $3 :i32 - return ($1) :i32 + $3 = 1 :i32 + $4 = $1 + $3 :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignment4.trace b/nautilus/test/data/expression-tests/ir/assignment4.trace index 71c1b1a9..577f9c7d 100644 --- a/nautilus/test/data/expression-tests/ir/assignment4.trace +++ b/nautilus/test/data/expression-tests/ir/assignment4.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 42 :i32 - $3 = 1 :i32 - $4 = $1 + $3 :i32 - return ($4) :i32 + $2 = 42 :i32 + $3 = 1 :i32 + $4 = $1 + $3 :i32 + return ($4) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/assignment5.trace b/nautilus/test/data/expression-tests/ir/assignment5.trace index bd7db500..3aff7bda 100644 --- a/nautilus/test/data/expression-tests/ir/assignment5.trace +++ b/nautilus/test/data/expression-tests/ir/assignment5.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 42 :i32 - $3 = 1 :i32 - $4 = $1 + $3 :i32 - return ($1) :i32 + $2 = 42 :i32 + $3 = 1 :i32 + $4 = $1 + $3 :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/castFloatToDoubleAddExpression.trace b/nautilus/test/data/expression-tests/ir/castFloatToDoubleAddExpression.trace index 66a38b34..595dee8d 100644 --- a/nautilus/test/data/expression-tests/ir/castFloatToDoubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/castFloatToDoubleAddExpression.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = 7.000000 :f64 - $3 = $1 cast_to f64 :f64 - $4 = $3 + $2 :f64 - return ($4) :f64 + $2 = 7 :f64 + $3 = $1 cast_to f64 :f64 + $4 = $3 + $2 :f64 + return ($4) :f64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression.trace b/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression.trace index 4bbed130..c46b6071 100644 --- a/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = 7 :i64 - $3 = $1 cast_to i64 :i64 - $4 = $3 + $2 :i64 - return ($4) :i64 + $2 = 7 :i64 + $3 = $1 cast_to i64 :i64 + $4 = $3 + $2 :i64 + return ($4) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression2.trace b/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression2.trace index f92eba19..a046a52b 100644 --- a/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression2.trace +++ b/nautilus/test/data/expression-tests/ir/castInt8ToInt64AddExpression2.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = 42 :i64 - $3 = $1 cast_to i64 :i64 - $4 = $2 + $3 :i64 - return ($4) :i64 + $2 = 42 :i64 + $3 = $1 cast_to i64 :i64 + $4 = $2 + $3 :i64 + return ($4) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/decrementPost.trace b/nautilus/test/data/expression-tests/ir/decrementPost.trace index b4dd43a4..51b9bfc7 100644 --- a/nautilus/test/data/expression-tests/ir/decrementPost.trace +++ b/nautilus/test/data/expression-tests/ir/decrementPost.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $3 = 1 :i32 - $4 = $1 - $3 :i32 - $5 = $1 + $4 :i32 - return ($5) :i32 + $3 = 1 :i32 + $4 = $1 - $3 :i32 + $5 = $1 + $4 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/decrementPre.trace b/nautilus/test/data/expression-tests/ir/decrementPre.trace index 257e0241..b9bfbee8 100644 --- a/nautilus/test/data/expression-tests/ir/decrementPre.trace +++ b/nautilus/test/data/expression-tests/ir/decrementPre.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = $1 - $2 :i32 - $5 = $3 + $3 :i32 - return ($5) :i32 + $2 = 1 :i32 + $3 = $1 - $2 :i32 + $5 = $3 + $3 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/doubleAddExpression.trace b/nautilus/test/data/expression-tests/ir/doubleAddExpression.trace index 5e475f41..55514027 100644 --- a/nautilus/test/data/expression-tests/ir/doubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/doubleAddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f64): - $2 = 7.000000 :f64 - $3 = $1 + $2 :f64 - return ($3) :f64 + $2 = 7 :f64 + $3 = $1 + $2 :f64 + return ($3) :f64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/floatAddExpression.trace b/nautilus/test/data/expression-tests/ir/floatAddExpression.trace index 6b42759c..7bb7cee6 100644 --- a/nautilus/test/data/expression-tests/ir/floatAddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/floatAddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:f32): - $2 = 7.000000 :f32 - $3 = $1 + $2 :f32 - return ($3) :f32 + $2 = 7 :f32 + $3 = $1 + $2 :f32 + return ($3) :f32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/incrementPost.trace b/nautilus/test/data/expression-tests/ir/incrementPost.trace index d6c2b7f9..bf0d9d92 100644 --- a/nautilus/test/data/expression-tests/ir/incrementPost.trace +++ b/nautilus/test/data/expression-tests/ir/incrementPost.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $3 = 1 :i32 - $4 = $1 + $3 :i32 - $5 = $1 + $4 :i32 - return ($5) :i32 + $3 = 1 :i32 + $4 = $1 + $3 :i32 + $5 = $1 + $4 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/incrementPre.trace b/nautilus/test/data/expression-tests/ir/incrementPre.trace index 8b6b2fc1..3cfc2b27 100644 --- a/nautilus/test/data/expression-tests/ir/incrementPre.trace +++ b/nautilus/test/data/expression-tests/ir/incrementPre.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = $1 + $2 :i32 - $5 = $3 + $3 :i32 - return ($5) :i32 + $2 = 1 :i32 + $3 = $1 + $2 :i32 + $5 = $3 + $3 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/int16AddExpression.trace b/nautilus/test/data/expression-tests/ir/int16AddExpression.trace index fac5d8b5..52c58c64 100644 --- a/nautilus/test/data/expression-tests/ir/int16AddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/int16AddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i16): - $2 = 5 :i16 - $3 = $1 + $2 :i16 - return ($3) :i16 + $2 = 5 :i16 + $3 = $1 + $2 :i16 + return ($3) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/int32AddExpression.trace b/nautilus/test/data/expression-tests/ir/int32AddExpression.trace index a64db49e..2f7aa509 100644 --- a/nautilus/test/data/expression-tests/ir/int32AddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/int32AddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 5 :i32 - $3 = $1 + $2 :i32 - return ($3) :i32 + $2 = 5 :i32 + $3 = $1 + $2 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/int64AddExpression.trace b/nautilus/test/data/expression-tests/ir/int64AddExpression.trace index 6b50455d..6e34c56c 100644 --- a/nautilus/test/data/expression-tests/ir/int64AddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/int64AddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i64): - $2 = 7 :i64 - $3 = $1 + $2 :i64 - return ($3) :i64 + $2 = 7 :i64 + $3 = $1 + $2 :i64 + return ($3) :i64 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/int8AddExpression.trace b/nautilus/test/data/expression-tests/ir/int8AddExpression.trace index c68084bb..8a7c6cd9 100644 --- a/nautilus/test/data/expression-tests/ir/int8AddExpression.trace +++ b/nautilus/test/data/expression-tests/ir/int8AddExpression.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $2 = 2 :i8 - $3 = $2 + $1 :i8 - return ($3) :i8 + $2 = 2 :i8 + $3 = $2 + $1 :i8 + return ($3) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/logicalNot_bool.trace b/nautilus/test/data/expression-tests/ir/logicalNot_bool.trace index 59f2a6cb..1c1f3708 100644 --- a/nautilus/test/data/expression-tests/ir/logicalNot_bool.trace +++ b/nautilus/test/data/expression-tests/ir/logicalNot_bool.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:bool): - $3= !$1 :bool - return ($3) :bool + $3 = !$1 :bool + return ($3) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/negate_i8.trace b/nautilus/test/data/expression-tests/ir/negate_i8.trace index 2c66ed98..9b43c502 100644 --- a/nautilus/test/data/expression-tests/ir/negate_i8.trace +++ b/nautilus/test/data/expression-tests/ir/negate_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8): - $3= ~$1 :i8 - return ($3) :i8 + $3 = ~$1 :i8 + return ($3) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/shiftLeft_i8.trace b/nautilus/test/data/expression-tests/ir/shiftLeft_i8.trace index 26c639d1..d547eaaa 100644 --- a/nautilus/test/data/expression-tests/ir/shiftLeft_i8.trace +++ b/nautilus/test/data/expression-tests/ir/shiftLeft_i8.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8, $2:i8): - $3 = $1 << $2 :i8 - $4 = $3 cast_to i8 :i8 - return ($4) :i8 + $3 = $1 << $2 :i8 + $4 = $3 cast_to i8 :i8 + return ($4) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/ir/shiftRight_i8.trace b/nautilus/test/data/expression-tests/ir/shiftRight_i8.trace index d467add9..fed4835a 100644 --- a/nautilus/test/data/expression-tests/ir/shiftRight_i8.trace +++ b/nautilus/test/data/expression-tests/ir/shiftRight_i8.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i8, $2:i8): - $3 = $1 >> $2 :i8 - $4 = $3 cast_to i8 :i8 - return ($4) :i8 + $3 = $1 >> $2 :i8 + $4 = $3 cast_to i8 :i8 + return ($4) :i8 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/expression-tests/tracing/assignAdd.trace b/nautilus/test/data/expression-tests/tracing/assignAdd.trace index 6bb5244a..02416e42 100644 --- a/nautilus/test/data/expression-tests/tracing/assignAdd.trace +++ b/nautilus/test/data/expression-tests/tracing/assignAdd.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - ADD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + ADD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignAnd.trace b/nautilus/test/data/expression-tests/tracing/assignAnd.trace index 485f54e2..9f62af0d 100644 --- a/nautilus/test/data/expression-tests/tracing/assignAnd.trace +++ b/nautilus/test/data/expression-tests/tracing/assignAnd.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - BAND $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + BAND $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignDiv.trace b/nautilus/test/data/expression-tests/tracing/assignDiv.trace index dec90be0..52a47840 100644 --- a/nautilus/test/data/expression-tests/tracing/assignDiv.trace +++ b/nautilus/test/data/expression-tests/tracing/assignDiv.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - DIV $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + DIV $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignMod.trace b/nautilus/test/data/expression-tests/tracing/assignMod.trace index 2406e271..4c727152 100644 --- a/nautilus/test/data/expression-tests/tracing/assignMod.trace +++ b/nautilus/test/data/expression-tests/tracing/assignMod.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - MOD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + MOD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignMul.trace b/nautilus/test/data/expression-tests/tracing/assignMul.trace index 9ca3f4bc..2829cd68 100644 --- a/nautilus/test/data/expression-tests/tracing/assignMul.trace +++ b/nautilus/test/data/expression-tests/tracing/assignMul.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - MUL $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + MUL $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignOr.trace b/nautilus/test/data/expression-tests/tracing/assignOr.trace index 394b4bd1..eb3daa0b 100644 --- a/nautilus/test/data/expression-tests/tracing/assignOr.trace +++ b/nautilus/test/data/expression-tests/tracing/assignOr.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - BOR $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + BOR $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignShl.trace b/nautilus/test/data/expression-tests/tracing/assignShl.trace index 140cb6e9..0468c4d6 100644 --- a/nautilus/test/data/expression-tests/tracing/assignShl.trace +++ b/nautilus/test/data/expression-tests/tracing/assignShl.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - LSH $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + LSH $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignShr.trace b/nautilus/test/data/expression-tests/tracing/assignShr.trace index 1d989700..d5a30365 100644 --- a/nautilus/test/data/expression-tests/tracing/assignShr.trace +++ b/nautilus/test/data/expression-tests/tracing/assignShr.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - RSH $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + RSH $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignSub.trace b/nautilus/test/data/expression-tests/tracing/assignSub.trace index 4a4840b7..784bbe91 100644 --- a/nautilus/test/data/expression-tests/tracing/assignSub.trace +++ b/nautilus/test/data/expression-tests/tracing/assignSub.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - SUB $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + SUB $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignXor.trace b/nautilus/test/data/expression-tests/tracing/assignXor.trace index ea7764b9..afb1637c 100644 --- a/nautilus/test/data/expression-tests/tracing/assignXor.trace +++ b/nautilus/test/data/expression-tests/tracing/assignXor.trace @@ -1,5 +1,5 @@ B0($1:i32) - CONST $2 5 :i32 - BXOR $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CONST $2 5 :i32 + BXOR $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignment1.trace b/nautilus/test/data/expression-tests/tracing/assignment1.trace index 56fc6838..7e125e8f 100644 --- a/nautilus/test/data/expression-tests/tracing/assignment1.trace +++ b/nautilus/test/data/expression-tests/tracing/assignment1.trace @@ -1,3 +1,3 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - RETURN $2 :i32 + ASSIGN $2 $1 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignment2.trace b/nautilus/test/data/expression-tests/tracing/assignment2.trace index d7de1ca1..ad0e3628 100644 --- a/nautilus/test/data/expression-tests/tracing/assignment2.trace +++ b/nautilus/test/data/expression-tests/tracing/assignment2.trace @@ -1,6 +1,6 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - CONST $3 1 :i32 - ADD $4 $2 $3 :i32 - ASSIGN $2 $4 :i32 - RETURN $2 :i32 + ASSIGN $2 $1 :i32 + CONST $3 1 :i32 + ADD $4 $2 $3 :i32 + ASSIGN $2 $4 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignment3.trace b/nautilus/test/data/expression-tests/tracing/assignment3.trace index 071412ab..9d368893 100644 --- a/nautilus/test/data/expression-tests/tracing/assignment3.trace +++ b/nautilus/test/data/expression-tests/tracing/assignment3.trace @@ -1,6 +1,6 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - CONST $3 1 :i32 - ADD $4 $2 $3 :i32 - ASSIGN $2 $4 :i32 - RETURN $1 :i32 + ASSIGN $2 $1 :i32 + CONST $3 1 :i32 + ADD $4 $2 $3 :i32 + ASSIGN $2 $4 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignment4.trace b/nautilus/test/data/expression-tests/tracing/assignment4.trace index 91f0d310..2c646c36 100644 --- a/nautilus/test/data/expression-tests/tracing/assignment4.trace +++ b/nautilus/test/data/expression-tests/tracing/assignment4.trace @@ -1,6 +1,6 @@ B0($1:i32) - CONST $2 42 :i32 - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - ASSIGN $2 $4 :i32 - RETURN $2 :i32 + CONST $2 42 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + ASSIGN $2 $4 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/assignment5.trace b/nautilus/test/data/expression-tests/tracing/assignment5.trace index 5a826c6a..7c79546b 100644 --- a/nautilus/test/data/expression-tests/tracing/assignment5.trace +++ b/nautilus/test/data/expression-tests/tracing/assignment5.trace @@ -1,6 +1,6 @@ B0($1:i32) - CONST $2 42 :i32 - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - ASSIGN $2 $4 :i32 - RETURN $1 :i32 + CONST $2 42 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + ASSIGN $2 $4 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/castFloatToDoubleAddExpression.trace b/nautilus/test/data/expression-tests/tracing/castFloatToDoubleAddExpression.trace index 08c07b97..b3d5aef5 100644 --- a/nautilus/test/data/expression-tests/tracing/castFloatToDoubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/castFloatToDoubleAddExpression.trace @@ -1,5 +1,5 @@ B0($1:f32) - CONST $2 7 :f64 - CAST $3 $1 :f64 - ADD $4 $3 $2 :f64 - RETURN $4 :f64 + CONST $2 7 :f64 + CAST $3 $1 :f64 + ADD $4 $3 $2 :f64 + RETURN $4 :f64 diff --git a/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression.trace b/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression.trace index 8013ccdc..30d667b2 100644 --- a/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression.trace @@ -1,5 +1,5 @@ B0($1:i8) - CONST $2 7 :i64 - CAST $3 $1 :i64 - ADD $4 $3 $2 :i64 - RETURN $4 :i64 + CONST $2 7 :i64 + CAST $3 $1 :i64 + ADD $4 $3 $2 :i64 + RETURN $4 :i64 diff --git a/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression2.trace b/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression2.trace index bae53481..313c3fc0 100644 --- a/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression2.trace +++ b/nautilus/test/data/expression-tests/tracing/castInt8ToInt64AddExpression2.trace @@ -1,5 +1,5 @@ B0($1:i8) - CONST $2 42 :i64 - CAST $3 $1 :i64 - ADD $4 $2 $3 :i64 - RETURN $4 :i64 + CONST $2 42 :i64 + CAST $3 $1 :i64 + ADD $4 $2 $3 :i64 + RETURN $4 :i64 diff --git a/nautilus/test/data/expression-tests/tracing/decrementPost.trace b/nautilus/test/data/expression-tests/tracing/decrementPost.trace index f656fc66..87b3ce4e 100644 --- a/nautilus/test/data/expression-tests/tracing/decrementPost.trace +++ b/nautilus/test/data/expression-tests/tracing/decrementPost.trace @@ -1,7 +1,7 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - CONST $3 1 :i32 - SUB $4 $1 $3 :i32 - ASSIGN $1 $4 :i32 - ADD $5 $2 $1 :i32 - RETURN $5 :i32 + ASSIGN $2 $1 :i32 + CONST $3 1 :i32 + SUB $4 $1 $3 :i32 + ASSIGN $1 $4 :i32 + ADD $5 $2 $1 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/decrementPre.trace b/nautilus/test/data/expression-tests/tracing/decrementPre.trace index 72f01a64..6f8c790f 100644 --- a/nautilus/test/data/expression-tests/tracing/decrementPre.trace +++ b/nautilus/test/data/expression-tests/tracing/decrementPre.trace @@ -1,7 +1,7 @@ B0($1:i32) - CONST $2 1 :i32 - SUB $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - ASSIGN $4 $1 :i32 - ADD $5 $4 $1 :i32 - RETURN $5 :i32 + CONST $2 1 :i32 + SUB $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + ASSIGN $4 $1 :i32 + ADD $5 $4 $1 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/doubleAddExpression.trace b/nautilus/test/data/expression-tests/tracing/doubleAddExpression.trace index 61dfd097..b7b9549d 100644 --- a/nautilus/test/data/expression-tests/tracing/doubleAddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/doubleAddExpression.trace @@ -1,4 +1,4 @@ B0($1:f64) - CONST $2 7 :f64 - ADD $3 $1 $2 :f64 - RETURN $3 :f64 + CONST $2 7 :f64 + ADD $3 $1 $2 :f64 + RETURN $3 :f64 diff --git a/nautilus/test/data/expression-tests/tracing/floatAddExpression.trace b/nautilus/test/data/expression-tests/tracing/floatAddExpression.trace index 65c12e47..055d89bf 100644 --- a/nautilus/test/data/expression-tests/tracing/floatAddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/floatAddExpression.trace @@ -1,4 +1,4 @@ B0($1:f32) - CONST $2 7 :f32 - ADD $3 $1 $2 :f32 - RETURN $3 :f32 + CONST $2 7 :f32 + ADD $3 $1 $2 :f32 + RETURN $3 :f32 diff --git a/nautilus/test/data/expression-tests/tracing/incrementPost.trace b/nautilus/test/data/expression-tests/tracing/incrementPost.trace index a40793a2..c96c1fbb 100644 --- a/nautilus/test/data/expression-tests/tracing/incrementPost.trace +++ b/nautilus/test/data/expression-tests/tracing/incrementPost.trace @@ -1,7 +1,7 @@ B0($1:i32) - ASSIGN $2 $1 :i32 - CONST $3 1 :i32 - ADD $4 $1 $3 :i32 - ASSIGN $1 $4 :i32 - ADD $5 $2 $1 :i32 - RETURN $5 :i32 + ASSIGN $2 $1 :i32 + CONST $3 1 :i32 + ADD $4 $1 $3 :i32 + ASSIGN $1 $4 :i32 + ADD $5 $2 $1 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/incrementPre.trace b/nautilus/test/data/expression-tests/tracing/incrementPre.trace index da362c58..74fd71c4 100644 --- a/nautilus/test/data/expression-tests/tracing/incrementPre.trace +++ b/nautilus/test/data/expression-tests/tracing/incrementPre.trace @@ -1,7 +1,7 @@ B0($1:i32) - CONST $2 1 :i32 - ADD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - ASSIGN $4 $1 :i32 - ADD $5 $4 $1 :i32 - RETURN $5 :i32 + CONST $2 1 :i32 + ADD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + ASSIGN $4 $1 :i32 + ADD $5 $4 $1 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace index fa4e99cb..8c277633 100644 --- a/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i16) - CONST $2 5 :i16 - ADD $3 $1 $2 :i32 - RETURN $3 :i16 + CONST $2 5 :i16 + ADD $3 $1 $2 :i32 + RETURN $3 :i16 diff --git a/nautilus/test/data/expression-tests/tracing/int32AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int32AddExpression.trace index 7090e004..3a79fe61 100644 --- a/nautilus/test/data/expression-tests/tracing/int32AddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/int32AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i32) - CONST $2 5 :i32 - ADD $3 $1 $2 :i32 - RETURN $3 :i32 + CONST $2 5 :i32 + ADD $3 $1 $2 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/expression-tests/tracing/int64AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int64AddExpression.trace index 3a837f24..dc9a16bf 100644 --- a/nautilus/test/data/expression-tests/tracing/int64AddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/int64AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i64) - CONST $2 7 :i64 - ADD $3 $1 $2 :i64 - RETURN $3 :i64 + CONST $2 7 :i64 + ADD $3 $1 $2 :i64 + RETURN $3 :i64 diff --git a/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace index c98a835f..227bcc78 100644 --- a/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace +++ b/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace @@ -1,4 +1,4 @@ B0($1:i8) - CONST $2  :i8 - ADD $3 $2 $1 :i32 - RETURN $3 :i8 + CONST $2 2 :i8 + ADD $3 $2 $1 :i32 + RETURN $3 :i8 diff --git a/nautilus/test/data/expression-tests/tracing/logicalNot_bool.trace b/nautilus/test/data/expression-tests/tracing/logicalNot_bool.trace index f673ccf3..f3b0e700 100644 --- a/nautilus/test/data/expression-tests/tracing/logicalNot_bool.trace +++ b/nautilus/test/data/expression-tests/tracing/logicalNot_bool.trace @@ -1,4 +1,4 @@ B0($1:bool) - ASSIGN $2 $1 :bool - NOT $3 $2 :bool - RETURN $3 :bool + ASSIGN $2 $1 :bool + NOT $3 $2 :bool + RETURN $3 :bool diff --git a/nautilus/test/data/expression-tests/tracing/negate_i8.trace b/nautilus/test/data/expression-tests/tracing/negate_i8.trace index 5f38349e..bf6272a3 100644 --- a/nautilus/test/data/expression-tests/tracing/negate_i8.trace +++ b/nautilus/test/data/expression-tests/tracing/negate_i8.trace @@ -1,4 +1,4 @@ B0($1:i8) - ASSIGN $2 $1 :i8 - NEGATE $3 $2 :i8 - RETURN $3 :i8 + ASSIGN $2 $1 :i8 + NEGATE $3 $2 :i8 + RETURN $3 :i8 diff --git a/nautilus/test/data/expression-tests/tracing/shiftLeft_i8.trace b/nautilus/test/data/expression-tests/tracing/shiftLeft_i8.trace index 5f3bd801..5a1064ef 100644 --- a/nautilus/test/data/expression-tests/tracing/shiftLeft_i8.trace +++ b/nautilus/test/data/expression-tests/tracing/shiftLeft_i8.trace @@ -1,4 +1,4 @@ B0($1:i8,$2:i8) - LSH $3 $1 $2 :i32 - CAST $4 $3 :i8 - RETURN $4 :i8 + LSH $3 $1 $2 :i32 + CAST $4 $3 :i8 + RETURN $4 :i8 diff --git a/nautilus/test/data/expression-tests/tracing/shiftRight_i8.trace b/nautilus/test/data/expression-tests/tracing/shiftRight_i8.trace index 494fb4e2..3ecec5df 100644 --- a/nautilus/test/data/expression-tests/tracing/shiftRight_i8.trace +++ b/nautilus/test/data/expression-tests/tracing/shiftRight_i8.trace @@ -1,4 +1,4 @@ B0($1:i8,$2:i8) - RSH $3 $1 $2 :i32 - CAST $4 $3 :i8 - RETURN $4 :i8 + RSH $3 $1 $2 :i32 + CAST $4 $3 :i8 + RETURN $4 :i8 diff --git a/nautilus/test/data/loop-tests/after_ssa/collatz.trace b/nautilus/test/data/loop-tests/after_ssa/collatz.trace index d5432b3e..d2e88dd8 100644 --- a/nautilus/test/data/loop-tests/after_ssa/collatz.trace +++ b/nautilus/test/data/loop-tests/after_ssa/collatz.trace @@ -1,31 +1,31 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B5($2,$1,$3) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B5($2,$1,$3) :void B1($2:i32,$1:i32) - CONST $6 2 :i32 - MOD $7 $1 $6 :i32 - CONST $8 0 :i32 - EQ $9 $7 $8 :bool - CMP $10 $9 B3($2,$1) B4($2,$1) :void + CONST $6 2 :i32 + MOD $7 $1 $6 :i32 + CONST $8 0 :i32 + EQ $9 $7 $8 :bool + CMP $10 $9 B3($2,$1) B4($2,$1) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$1:i32) - CONST $11 2 :i32 - DIV $12 $1 $11 :i32 - CONST $13 1 :i32 - JMP $0 B6($12,$2,$13) :void + CONST $11 2 :i32 + DIV $12 $1 $11 :i32 + CONST $13 1 :i32 + JMP $0 B6($12,$2,$13) :void B4($2:i32,$1:i32) - CONST $18 3 :i32 - MUL $19 $18 $1 :i32 - CONST $20 1 :i32 - ADD $21 $19 $20 :i32 - CONST $22 1 :i32 - JMP $0 B6($21,$2,$22) :void + CONST $18 3 :i32 + MUL $19 $18 $1 :i32 + CONST $20 1 :i32 + ADD $21 $19 $20 :i32 + CONST $22 1 :i32 + JMP $0 B6($21,$2,$22) :void B5($2:i32,$1:i32,$3:i32) ControlFlowMerge - NEQ $4 $1 $3 :bool - CMP $5 $4 B1($2,$1) B2($2) :void + NEQ $4 $1 $3 :bool + CMP $5 $4 B1($2,$1) B2($2) :void B6($1:i32,$2:i32,$13:i32) ControlFlowMerge - ADD $14 $2 $13 :i32 - CONST $15 1 :i32 - JMP $0 B5($14,$1,$15) :void + ADD $14 $2 $13 :i32 + CONST $15 1 :i32 + JMP $0 B5($14,$1,$15) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/countDigits.trace b/nautilus/test/data/loop-tests/after_ssa/countDigits.trace index de0f3dcb..a1668674 100644 --- a/nautilus/test/data/loop-tests/after_ssa/countDigits.trace +++ b/nautilus/test/data/loop-tests/after_ssa/countDigits.trace @@ -1,16 +1,16 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - JMP $0 B3($2,$1,$3) :void + CONST $2 0 :i32 + CONST $3 0 :i32 + JMP $0 B3($2,$1,$3) :void B1($2:i32,$1:i32) - CONST $6 10 :i32 - DIV $7 $1 $6 :i32 - CONST $8 1 :i32 - ADD $9 $2 $8 :i32 - CONST $10 0 :i32 - JMP $0 B3($9,$7,$10) :void + CONST $6 10 :i32 + DIV $7 $1 $6 :i32 + CONST $8 1 :i32 + ADD $9 $2 $8 :i32 + CONST $10 0 :i32 + JMP $0 B3($9,$7,$10) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$1:i32,$3:i32) ControlFlowMerge - NEQ $4 $1 $3 :bool - CMP $5 $4 B1($2,$1) B2($2) :void + NEQ $4 $1 $3 :bool + CMP $5 $4 B1($2,$1) B2($2) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/decimalToBinary.trace b/nautilus/test/data/loop-tests/after_ssa/decimalToBinary.trace index 45253039..81ab4892 100644 --- a/nautilus/test/data/loop-tests/after_ssa/decimalToBinary.trace +++ b/nautilus/test/data/loop-tests/after_ssa/decimalToBinary.trace @@ -1,21 +1,21 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - CONST $4 2 :i32 - JMP $0 B3($1,$3,$2,$4) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + CONST $4 2 :i32 + JMP $0 B3($1,$3,$2,$4) :void B1($1:i32,$3:i32,$2:i32) - CONST $15 2 :i32 - JMP $0 B3($1,$3,$2,$15) :void + CONST $15 2 :i32 + JMP $0 B3($1,$3,$2,$15) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($1:i32,$3:i32,$2:i32,$4:i32) ControlFlowMerge - MOD $5 $1 $4 :i32 - MUL $6 $5 $3 :i32 - ADD $7 $2 $6 :i32 - CONST $8 10 :i32 - MUL $9 $3 $8 :i32 - CONST $10 2 :i32 - DIV $11 $1 $10 :i32 - CONST $12 0 :i32 - GT $13 $11 $12 :bool - CMP $14 $13 B1($11,$9,$7) B2($7) :void + MOD $5 $1 $4 :i32 + MUL $6 $5 $3 :i32 + ADD $7 $2 $6 :i32 + CONST $8 10 :i32 + MUL $9 $3 $8 :i32 + CONST $10 2 :i32 + DIV $11 $1 $10 :i32 + CONST $12 0 :i32 + GT $13 $11 $12 :bool + CMP $14 $13 B1($11,$9,$7) B2($7) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/digitSum.trace b/nautilus/test/data/loop-tests/after_ssa/digitSum.trace index 106c06de..89edc7bd 100644 --- a/nautilus/test/data/loop-tests/after_ssa/digitSum.trace +++ b/nautilus/test/data/loop-tests/after_ssa/digitSum.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B3($1,$2,$3) :void + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B3($1,$2,$3) :void B1($1:i32,$2:i32) - CONST $11 10 :i32 - JMP $0 B3($1,$2,$11) :void + CONST $11 10 :i32 + JMP $0 B3($1,$2,$11) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($1:i32,$2:i32,$3:i32) ControlFlowMerge - MOD $4 $1 $3 :i32 - ADD $5 $2 $4 :i32 - CONST $6 10 :i32 - DIV $7 $1 $6 :i32 - CONST $8 0 :i32 - GT $9 $7 $8 :bool - CMP $10 $9 B1($7,$5) B2($5) :void + MOD $4 $1 $3 :i32 + ADD $5 $2 $4 :i32 + CONST $6 10 :i32 + DIV $7 $1 $6 :i32 + CONST $8 0 :i32 + GT $9 $7 $8 :bool + CMP $10 $9 B1($7,$5) B2($5) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/elseOnlySumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/elseOnlySumLoop.trace index 4cc127c3..eca4364a 100644 --- a/nautilus/test/data/loop-tests/after_ssa/elseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/elseOnlySumLoop.trace @@ -1,26 +1,26 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5($1,$2,$3) :void B1($1:i32,$2:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($1,$2) B4($2,$1) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($1,$2) B4($2,$1) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($1:i32,$2:i32) - CONST $9 1 :i32 - JMP $0 B6($1,$2,$9) :void + CONST $9 1 :i32 + JMP $0 B6($1,$2,$9) :void B4($2:i32,$1:i32) - CONST $12 1 :i32 - ADD $13 $1 $12 :i32 - CONST $14 1 :i32 - JMP $0 B6($13,$2,$14) :void + CONST $12 1 :i32 + ADD $13 $1 $12 :i32 + CONST $14 1 :i32 + JMP $0 B6($13,$2,$14) :void B5($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($1,$2) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($1,$2) B2($1) :void B6($1:i32,$2:i32,$9:i32) ControlFlowMerge - ADD $10 $2 $9 :i32 - CONST $11 10 :i32 - JMP $0 B5($1,$10,$11) :void + ADD $10 $2 $9 :i32 + CONST $11 10 :i32 + JMP $0 B5($1,$10,$11) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/factorial.trace b/nautilus/test/data/loop-tests/after_ssa/factorial.trace index fe6a1dce..13613a78 100644 --- a/nautilus/test/data/loop-tests/after_ssa/factorial.trace +++ b/nautilus/test/data/loop-tests/after_ssa/factorial.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 1 :i32 - JMP $0 B3($2,$1,$3) :void + CONST $2 1 :i32 + CONST $3 1 :i32 + JMP $0 B3($2,$1,$3) :void B1($1:i32,$2:i32) - MUL $7 $2 $1 :i32 - CONST $8 1 :i32 - SUB $9 $1 $8 :i32 - CONST $10 1 :i32 - JMP $0 B3($7,$9,$10) :void + MUL $7 $2 $1 :i32 + CONST $8 1 :i32 + SUB $9 $1 $8 :i32 + CONST $10 1 :i32 + JMP $0 B3($7,$9,$10) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$1:i32,$3:i32) ControlFlowMerge - GT $4 $1 $3 :bool - CMP $5 $4 B1($1,$2) B2($2) :void + GT $4 $1 $3 :bool + CMP $5 $4 B1($1,$2) B2($2) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/fibonacci.trace b/nautilus/test/data/loop-tests/after_ssa/fibonacci.trace index 894aa0e1..9c569106 100644 --- a/nautilus/test/data/loop-tests/after_ssa/fibonacci.trace +++ b/nautilus/test/data/loop-tests/after_ssa/fibonacci.trace @@ -1,16 +1,16 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - CONST $4 0 :i32 - CONST $5 2 :i32 - JMP $0 B3($3,$5,$1,$2) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + CONST $4 0 :i32 + CONST $5 2 :i32 + JMP $0 B3($3,$5,$1,$2) :void B1($1:i32,$5:i32,$3:i32,$2:i32) - ADD $8 $2 $3 :i32 - CONST $9 1 :i32 - ADD $10 $5 $9 :i32 - JMP $0 B3($8,$10,$1,$3) :void + ADD $8 $2 $3 :i32 + CONST $9 1 :i32 + ADD $10 $5 $9 :i32 + JMP $0 B3($8,$10,$1,$3) :void B2($3:i32) - RETURN $3 :i32 + RETURN $3 :i32 B3($3:i32,$5:i32,$1:i32,$2:i32) ControlFlowMerge - LTE $6 $5 $1 :bool - CMP $7 $6 B1($1,$5,$3,$2) B2($3) :void + LTE $6 $5 $1 :bool + CMP $7 $6 B1($1,$5,$3,$2) B2($3) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/gcd.trace b/nautilus/test/data/loop-tests/after_ssa/gcd.trace index e6557802..ae7219dc 100644 --- a/nautilus/test/data/loop-tests/after_ssa/gcd.trace +++ b/nautilus/test/data/loop-tests/after_ssa/gcd.trace @@ -1,12 +1,12 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - JMP $0 B3($1,$2,$3) :void + CONST $3 0 :i32 + JMP $0 B3($1,$2,$3) :void B1($1:i32,$2:i32) - MOD $7 $1 $2 :i32 - CONST $8 0 :i32 - JMP $0 B3($2,$7,$8) :void + MOD $7 $1 $2 :i32 + CONST $8 0 :i32 + JMP $0 B3($2,$7,$8) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($1:i32,$2:i32,$3:i32) ControlFlowMerge - NEQ $4 $2 $3 :bool - CMP $5 $4 B1($1,$2) B2($1) :void + NEQ $4 $2 $3 :bool + CMP $5 $4 B1($1,$2) B2($1) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/ifElseSumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/ifElseSumLoop.trace index 0436820f..9bcfb3a0 100644 --- a/nautilus/test/data/loop-tests/after_ssa/ifElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/ifElseSumLoop.trace @@ -1,28 +1,28 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5($1,$2,$3) :void B1($2:i32,$1:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($2,$1) B4($2,$1) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($2,$1) B4($2,$1) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($2:i32,$1:i32) - CONST $9 10 :i32 - ADD $10 $1 $9 :i32 - CONST $11 1 :i32 - JMP $0 B6($10,$2,$11) :void + CONST $9 10 :i32 + ADD $10 $1 $9 :i32 + CONST $11 1 :i32 + JMP $0 B6($10,$2,$11) :void B4($2:i32,$1:i32) - CONST $14 1 :i32 - ADD $15 $1 $14 :i32 - CONST $16 1 :i32 - JMP $0 B6($15,$2,$16) :void + CONST $14 1 :i32 + ADD $15 $1 $14 :i32 + CONST $16 1 :i32 + JMP $0 B6($15,$2,$16) :void B5($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($2,$1) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($2,$1) B2($1) :void B6($1:i32,$2:i32,$11:i32) ControlFlowMerge - ADD $12 $2 $11 :i32 - CONST $13 10 :i32 - JMP $0 B5($1,$12,$13) :void + ADD $12 $2 $11 :i32 + CONST $13 10 :i32 + JMP $0 B5($1,$12,$13) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/ifInsideLoop.trace b/nautilus/test/data/loop-tests/after_ssa/ifInsideLoop.trace index 212022db..8dfb299d 100644 --- a/nautilus/test/data/loop-tests/after_ssa/ifInsideLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/ifInsideLoop.trace @@ -1,26 +1,26 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - JMP $0 B5($2,$3,$1) :void + CONST $2 0 :i32 + CONST $3 0 :i32 + JMP $0 B5($2,$3,$1) :void B1($1:i32,$3:i32,$2:i32) - CONST $6 2 :i32 - MOD $7 $3 $6 :i32 - CONST $8 0 :i32 - EQ $9 $7 $8 :bool - CMP $10 $9 B3($1,$3,$2) B4($2,$1,$3) :void + CONST $6 2 :i32 + MOD $7 $3 $6 :i32 + CONST $8 0 :i32 + EQ $9 $7 $8 :bool + CMP $10 $9 B3($1,$3,$2) B4($2,$1,$3) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($1:i32,$3:i32,$2:i32) - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - CONST $13 1 :i32 - JMP $0 B6($12,$1,$3,$13) :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + CONST $13 1 :i32 + JMP $0 B6($12,$1,$3,$13) :void B4($2:i32,$1:i32,$3:i32) - CONST $17 1 :i32 - JMP $0 B6($2,$1,$3,$17) :void + CONST $17 1 :i32 + JMP $0 B6($2,$1,$3,$17) :void B5($2:i32,$3:i32,$1:i32) ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1($1,$3,$2) B2($2) :void + LT $4 $3 $1 :bool + CMP $5 $4 B1($1,$3,$2) B2($2) :void B6($2:i32,$1:i32,$3:i32,$13:i32) ControlFlowMerge - ADD $14 $3 $13 :i32 - JMP $0 B5($2,$14,$1) :void + ADD $14 $3 $13 :i32 + JMP $0 B5($2,$14,$1) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/ifSumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/ifSumLoop.trace index 534cdcfc..79b1b4c0 100644 --- a/nautilus/test/data/loop-tests/after_ssa/ifSumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/ifSumLoop.trace @@ -1,26 +1,26 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5($1,$2,$3) :void B1($2:i32,$1:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($2,$1) B4($1,$2) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($2,$1) B4($1,$2) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($2:i32,$1:i32) - CONST $9 10 :i32 - ADD $10 $1 $9 :i32 - CONST $11 1 :i32 - JMP $0 B6($10,$2,$11) :void + CONST $9 10 :i32 + ADD $10 $1 $9 :i32 + CONST $11 1 :i32 + JMP $0 B6($10,$2,$11) :void B4($1:i32,$2:i32) - CONST $14 1 :i32 - JMP $0 B6($1,$2,$14) :void + CONST $14 1 :i32 + JMP $0 B6($1,$2,$14) :void B5($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($2,$1) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($2,$1) B2($1) :void B6($1:i32,$2:i32,$11:i32) ControlFlowMerge - ADD $12 $2 $11 :i32 - CONST $13 10 :i32 - JMP $0 B5($1,$12,$13) :void + ADD $12 $2 $11 :i32 + CONST $13 10 :i32 + JMP $0 B5($1,$12,$13) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/isPrime.trace b/nautilus/test/data/loop-tests/after_ssa/isPrime.trace index 5f964047..101e255f 100644 --- a/nautilus/test/data/loop-tests/after_ssa/isPrime.trace +++ b/nautilus/test/data/loop-tests/after_ssa/isPrime.trace @@ -1,30 +1,30 @@ B0($1:i32) - CONST $2 0 :bool - CONST $3 1 :bool - CONST $4 1 :i32 - LTE $5 $1 $4 :bool - CMP $6 $5 B1($2) B2($2,$1,$3) :void + CONST $2 false :bool + CONST $3 true :bool + CONST $4 1 :i32 + LTE $5 $1 $4 :bool + CMP $6 $5 B1($2) B2($2,$1,$3) :void B1($2:bool) - JMP $0 B8($2) :void + JMP $0 B8($2) :void B2($2:bool,$1:i32,$3:bool) - CONST $8 2 :i32 - JMP $0 B7($2,$1,$8,$3) :void + CONST $8 2 :i32 + JMP $0 B7($2,$1,$8,$3) :void B3($2:bool,$1:i32,$8:i32,$3:bool) - MOD $12 $1 $8 :i32 - CONST $13 0 :i32 - EQ $14 $12 $13 :bool - CMP $15 $14 B5($2) B6($2,$1,$8,$3) :void + MOD $12 $1 $8 :i32 + CONST $13 0 :i32 + EQ $14 $12 $13 :bool + CMP $15 $14 B5($2) B6($2,$1,$8,$3) :void B4($3:bool) - JMP $0 B8($3) :void + JMP $0 B8($3) :void B5($2:bool) - JMP $0 B8($2) :void + JMP $0 B8($2) :void B6($2:bool,$1:i32,$8:i32,$3:bool) - CONST $18 1 :i32 - ADD $19 $8 $18 :i32 - JMP $0 B7($2,$1,$19,$3) :void + CONST $18 1 :i32 + ADD $19 $8 $18 :i32 + JMP $0 B7($2,$1,$19,$3) :void B7($2:bool,$1:i32,$8:i32,$3:bool) ControlFlowMerge - MUL $9 $8 $8 :i32 - LTE $10 $9 $1 :bool - CMP $11 $10 B3($2,$1,$8,$3) B4($3) :void + MUL $9 $8 $8 :i32 + LTE $10 $9 $1 :bool + CMP $11 $10 B3($2,$1,$8,$3) B4($3) :void B8($2:bool) - RETURN $2 :bool + RETURN $2 :bool diff --git a/nautilus/test/data/loop-tests/after_ssa/nestedElseOnlySumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/nestedElseOnlySumLoop.trace index 93625c1b..38ce3541 100644 --- a/nautilus/test/data/loop-tests/after_ssa/nestedElseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/nestedElseOnlySumLoop.trace @@ -1,37 +1,37 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7($1,$2,$3) :void B1($1:i32,$2:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($1,$2) B4($2,$1) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($1,$2) B4($2,$1) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($1:i32,$2:i32) - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5($1,$2) B6($2,$1) :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5($1,$2) B6($2,$1) :void B4($2:i32,$1:i32) - CONST $15 1 :i32 - ADD $16 $1 $15 :i32 - CONST $17 1 :i32 - JMP $0 B8($16,$2,$17) :void + CONST $15 1 :i32 + ADD $16 $1 $15 :i32 + CONST $17 1 :i32 + JMP $0 B8($16,$2,$17) :void B5($1:i32,$2:i32) - CONST $12 1 :i32 - JMP $0 B8($1,$2,$12) :void + CONST $12 1 :i32 + JMP $0 B8($1,$2,$12) :void B6($2:i32,$1:i32) - CONST $18 100 :i32 - ADD $19 $1 $18 :i32 - CONST $20 1 :i32 - JMP $0 B9($19,$2,$20) :void + CONST $18 100 :i32 + ADD $19 $1 $18 :i32 + CONST $20 1 :i32 + JMP $0 B9($19,$2,$20) :void B7($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($1,$2) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($1,$2) B2($1) :void B8($1:i32,$2:i32,$12:i32) ControlFlowMerge - JMP $0 B9($1,$2,$12) :void + JMP $0 B9($1,$2,$12) :void B9($1:i32,$2:i32,$12:i32) ControlFlowMerge - ADD $13 $2 $12 :i32 - CONST $14 10 :i32 - JMP $0 B7($1,$13,$14) :void + ADD $13 $2 $12 :i32 + CONST $14 10 :i32 + JMP $0 B7($1,$13,$14) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/nestedIfElseSumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/nestedIfElseSumLoop.trace index 380fcacd..c441953d 100644 --- a/nautilus/test/data/loop-tests/after_ssa/nestedIfElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/nestedIfElseSumLoop.trace @@ -1,39 +1,39 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7($1,$2,$3) :void B1($2:i32,$1:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($2,$1) B4($2,$1) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($2,$1) B4($2,$1) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($2:i32,$1:i32) - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5($2,$1) B6($2,$1) :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5($2,$1) B6($2,$1) :void B4($2:i32,$1:i32) - CONST $17 1 :i32 - ADD $18 $1 $17 :i32 - CONST $19 1 :i32 - JMP $0 B8($18,$2,$19) :void + CONST $17 1 :i32 + ADD $18 $1 $17 :i32 + CONST $19 1 :i32 + JMP $0 B8($18,$2,$19) :void B5($2:i32,$1:i32) - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - CONST $14 1 :i32 - JMP $0 B8($13,$2,$14) :void + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + CONST $14 1 :i32 + JMP $0 B8($13,$2,$14) :void B6($2:i32,$1:i32) - CONST $20 100 :i32 - ADD $21 $1 $20 :i32 - CONST $22 1 :i32 - JMP $0 B9($21,$2,$22) :void + CONST $20 100 :i32 + ADD $21 $1 $20 :i32 + CONST $22 1 :i32 + JMP $0 B9($21,$2,$22) :void B7($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($2,$1) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($2,$1) B2($1) :void B8($1:i32,$2:i32,$14:i32) ControlFlowMerge - JMP $0 B9($1,$2,$14) :void + JMP $0 B9($1,$2,$14) :void B9($1:i32,$2:i32,$14:i32) ControlFlowMerge - ADD $15 $2 $14 :i32 - CONST $16 10 :i32 - JMP $0 B7($1,$15,$16) :void + ADD $15 $2 $14 :i32 + CONST $16 10 :i32 + JMP $0 B7($1,$15,$16) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/nestedIfSumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/nestedIfSumLoop.trace index 8d97cb4f..b05dcd5d 100644 --- a/nautilus/test/data/loop-tests/after_ssa/nestedIfSumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/nestedIfSumLoop.trace @@ -1,37 +1,37 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7($1,$2,$3) :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7($1,$2,$3) :void B1($2:i32,$1:i32) - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3($2,$1) B4($2,$1) :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3($2,$1) B4($2,$1) :void B2($1:i32) - RETURN $1 :i32 + RETURN $1 :i32 B3($2:i32,$1:i32) - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5($2,$1) B6($1,$2) :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5($2,$1) B6($1,$2) :void B4($2:i32,$1:i32) - CONST $17 1 :i32 - ADD $18 $1 $17 :i32 - CONST $19 1 :i32 - JMP $0 B8($18,$2,$19) :void + CONST $17 1 :i32 + ADD $18 $1 $17 :i32 + CONST $19 1 :i32 + JMP $0 B8($18,$2,$19) :void B5($2:i32,$1:i32) - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - CONST $14 1 :i32 - JMP $0 B8($13,$2,$14) :void + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + CONST $14 1 :i32 + JMP $0 B8($13,$2,$14) :void B6($1:i32,$2:i32) - CONST $20 1 :i32 - JMP $0 B9($1,$2,$20) :void + CONST $20 1 :i32 + JMP $0 B9($1,$2,$20) :void B7($1:i32,$2:i32,$3:i32) ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1($2,$1) B2($1) :void + LT $4 $2 $3 :bool + CMP $5 $4 B1($2,$1) B2($1) :void B8($1:i32,$2:i32,$14:i32) ControlFlowMerge - JMP $0 B9($1,$2,$14) :void + JMP $0 B9($1,$2,$14) :void B9($1:i32,$2:i32,$14:i32) ControlFlowMerge - ADD $15 $2 $14 :i32 - CONST $16 10 :i32 - JMP $0 B7($1,$15,$16) :void + ADD $15 $2 $14 :i32 + CONST $16 10 :i32 + JMP $0 B7($1,$15,$16) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/nestedSumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/nestedSumLoop.trace index d70f65da..ac744773 100644 --- a/nautilus/test/data/loop-tests/after_ssa/nestedSumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/nestedSumLoop.trace @@ -1,25 +1,25 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 0 :i32 - JMP $0 B6($2,$3,$1) :void + CONST $2 1 :i32 + CONST $3 0 :i32 + JMP $0 B6($2,$3,$1) :void B1($2:i32,$1:i32,$3:i32) - CONST $6 0 :i32 - JMP $0 B5($2,$1,$3,$6) :void + CONST $6 0 :i32 + JMP $0 B5($2,$1,$3,$6) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($1:i32,$3:i32,$6:i32,$2:i32) - CONST $9 10 :i32 - ADD $10 $2 $9 :i32 - CONST $11 1 :i32 - ADD $12 $6 $11 :i32 - JMP $0 B5($10,$1,$3,$12) :void + CONST $9 10 :i32 + ADD $10 $2 $9 :i32 + CONST $11 1 :i32 + ADD $12 $6 $11 :i32 + JMP $0 B5($10,$1,$3,$12) :void B4($2:i32,$1:i32,$3:i32) - CONST $15 1 :i32 - ADD $16 $3 $15 :i32 - JMP $0 B6($2,$16,$1) :void + CONST $15 1 :i32 + ADD $16 $3 $15 :i32 + JMP $0 B6($2,$16,$1) :void B5($2:i32,$1:i32,$3:i32,$6:i32) ControlFlowMerge - LT $7 $6 $1 :bool - CMP $8 $7 B3($1,$3,$6,$2) B4($2,$1,$3) :void + LT $7 $6 $1 :bool + CMP $8 $7 B3($1,$3,$6,$2) B4($2,$1,$3) :void B6($2:i32,$3:i32,$1:i32) ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1($2,$1,$3) B2($2) :void + LT $4 $3 $1 :bool + CMP $5 $4 B1($2,$1,$3) B2($2) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/reverseNumber.trace b/nautilus/test/data/loop-tests/after_ssa/reverseNumber.trace index 79de79f3..88884594 100644 --- a/nautilus/test/data/loop-tests/after_ssa/reverseNumber.trace +++ b/nautilus/test/data/loop-tests/after_ssa/reverseNumber.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B3($1,$2,$3) :void + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B3($1,$2,$3) :void B1($1:i32,$2:i32) - CONST $13 10 :i32 - JMP $0 B3($1,$2,$13) :void + CONST $13 10 :i32 + JMP $0 B3($1,$2,$13) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($1:i32,$2:i32,$3:i32) ControlFlowMerge - MUL $4 $2 $3 :i32 - CONST $5 10 :i32 - MOD $6 $1 $5 :i32 - ADD $7 $4 $6 :i32 - CONST $8 10 :i32 - DIV $9 $1 $8 :i32 - CONST $10 0 :i32 - GT $11 $9 $10 :bool - CMP $12 $11 B1($9,$7) B2($7) :void + MUL $4 $2 $3 :i32 + CONST $5 10 :i32 + MOD $6 $1 $5 :i32 + ADD $7 $4 $6 :i32 + CONST $8 10 :i32 + DIV $9 $1 $8 :i32 + CONST $10 0 :i32 + GT $11 $9 $10 :bool + CMP $12 $11 B1($9,$7) B2($7) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/sumLoop.trace b/nautilus/test/data/loop-tests/after_ssa/sumLoop.trace index 17d9e974..44e7eb29 100644 --- a/nautilus/test/data/loop-tests/after_ssa/sumLoop.trace +++ b/nautilus/test/data/loop-tests/after_ssa/sumLoop.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 0 :i32 - JMP $0 B3($2,$3,$1) :void + CONST $2 1 :i32 + CONST $3 0 :i32 + JMP $0 B3($2,$3,$1) :void B1($1:i32,$3:i32,$2:i32) - CONST $6 10 :i32 - ADD $7 $2 $6 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - JMP $0 B3($7,$9,$1) :void + CONST $6 10 :i32 + ADD $7 $2 $6 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + JMP $0 B3($7,$9,$1) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$3:i32,$1:i32) ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1($1,$3,$2) B2($2) :void + LT $4 $3 $1 :bool + CMP $5 $4 B1($1,$3,$2) B2($2) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/sumOfNumbers.trace b/nautilus/test/data/loop-tests/after_ssa/sumOfNumbers.trace index 9c85275c..c98fcf32 100644 --- a/nautilus/test/data/loop-tests/after_ssa/sumOfNumbers.trace +++ b/nautilus/test/data/loop-tests/after_ssa/sumOfNumbers.trace @@ -1,14 +1,14 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B3($2,$3,$1) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B3($2,$3,$1) :void B1($1:i32,$3:i32,$2:i32) - ADD $7 $2 $3 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - JMP $0 B3($7,$9,$1) :void + ADD $7 $2 $3 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + JMP $0 B3($7,$9,$1) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$3:i32,$1:i32) ControlFlowMerge - LTE $4 $3 $1 :bool - CMP $5 $4 B1($1,$3,$2) B2($2) :void + LTE $4 $3 $1 :bool + CMP $5 $4 B1($1,$3,$2) B2($2) :void diff --git a/nautilus/test/data/loop-tests/after_ssa/sumOfSquares.trace b/nautilus/test/data/loop-tests/after_ssa/sumOfSquares.trace index 20f3e464..01f24bfd 100644 --- a/nautilus/test/data/loop-tests/after_ssa/sumOfSquares.trace +++ b/nautilus/test/data/loop-tests/after_ssa/sumOfSquares.trace @@ -1,15 +1,15 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B3($2,$3,$1) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B3($2,$3,$1) :void B1($1:i32,$3:i32,$2:i32) - MUL $6 $3 $3 :i32 - ADD $7 $2 $6 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - JMP $0 B3($7,$9,$1) :void + MUL $6 $3 $3 :i32 + ADD $7 $2 $6 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + JMP $0 B3($7,$9,$1) :void B2($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 B3($2:i32,$3:i32,$1:i32) ControlFlowMerge - LTE $4 $3 $1 :bool - CMP $5 $4 B1($1,$3,$2) B2($2) :void + LTE $4 $3 $1 :bool + CMP $5 $4 B1($1,$3,$2) B2($2) :void diff --git a/nautilus/test/data/loop-tests/ir/collatz.trace b/nautilus/test/data/loop-tests/ir/collatz.trace index f038613e..0a30eb0f 100644 --- a/nautilus/test/data/loop-tests/ir/collatz.trace +++ b/nautilus/test/data/loop-tests/ir/collatz.trace @@ -1,41 +1,41 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - br Block_5($2, $1, $3) :void + $2 = 0 :i32 + $3 = 1 :i32 + br Block_5($2, $1, $3) :void Block_5($2:i32, $1:i32, $3:i32): - $4 = $1 != $3 :bool - if $4 ? Block_1($2, $1) : Block_2($2) :void + $4 = $1 $3 :bool + if $4 ? Block_1($2, $1) : Block_2($2) :void Block_1($2:i32, $1:i32): - $6 = 2 :i32 - $7 = $1 % $6 :i32 - $8 = 0 :i32 - $9 = $7 == $8 :bool - if $9 ? Block_3($2, $1) : Block_4($2, $1) :void + $6 = 2 :i32 + $7 = $1 % $6 :i32 + $8 = 0 :i32 + $9 = $7 == $8 :bool + if $9 ? Block_3($2, $1) : Block_4($2, $1) :void Block_3($2:i32, $1:i32): - $11 = 2 :i32 - $12 = $1 / $11 :i32 - $13 = 1 :i32 - br Block_6($12, $2, $13) :void + $11 = 2 :i32 + $12 = $1 / $11 :i32 + $13 = 1 :i32 + br Block_6($12, $2, $13) :void Block_6($1:i32, $2:i32, $13:i32): - $14 = $2 + $13 :i32 - $15 = 1 :i32 - br Block_5($14, $1, $15) :void + $14 = $2 + $13 :i32 + $15 = 1 :i32 + br Block_5($14, $1, $15) :void Block_4($2:i32, $1:i32): - $18 = 3 :i32 - $19 = $18 * $1 :i32 - $20 = 1 :i32 - $21 = $19 + $20 :i32 - $22 = 1 :i32 - br Block_6($21, $2, $22) :void + $18 = 3 :i32 + $19 = $18 * $1 :i32 + $20 = 1 :i32 + $21 = $19 + $20 :i32 + $22 = 1 :i32 + br Block_6($21, $2, $22) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/countDigits.trace b/nautilus/test/data/loop-tests/ir/countDigits.trace index d10b2dd5..cfe5b197 100644 --- a/nautilus/test/data/loop-tests/ir/countDigits.trace +++ b/nautilus/test/data/loop-tests/ir/countDigits.trace @@ -1,23 +1,23 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - br Block_3($2, $1, $3) :void + $2 = 0 :i32 + $3 = 0 :i32 + br Block_3($2, $1, $3) :void Block_3($2:i32, $1:i32, $3:i32): - $4 = $1 != $3 :bool - if $4 ? Block_1($2, $1) : Block_2($2) :void + $4 = $1 $3 :bool + if $4 ? Block_1($2, $1) : Block_2($2) :void Block_1($2:i32, $1:i32): - $6 = 10 :i32 - $7 = $1 / $6 :i32 - $8 = 1 :i32 - $9 = $2 + $8 :i32 - $10 = 0 :i32 - br Block_3($9, $7, $10) :void + $6 = 10 :i32 + $7 = $1 / $6 :i32 + $8 = 1 :i32 + $9 = $2 + $8 :i32 + $10 = 0 :i32 + br Block_3($9, $7, $10) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/decimalToBinary.trace b/nautilus/test/data/loop-tests/ir/decimalToBinary.trace index 4c38c602..89618405 100644 --- a/nautilus/test/data/loop-tests/ir/decimalToBinary.trace +++ b/nautilus/test/data/loop-tests/ir/decimalToBinary.trace @@ -1,28 +1,28 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - $4 = 2 :i32 - br Block_3($1, $3, $2, $4) :void + $2 = 0 :i32 + $3 = 1 :i32 + $4 = 2 :i32 + br Block_3($1, $3, $2, $4) :void Block_3($1:i32, $3:i32, $2:i32, $4:i32): - $5 = $1 % $4 :i32 - $6 = $5 * $3 :i32 - $7 = $2 + $6 :i32 - $8 = 10 :i32 - $9 = $3 * $8 :i32 - $10 = 2 :i32 - $11 = $1 / $10 :i32 - $12 = 0 :i32 - $13 = $11 > $12 :bool - if $13 ? Block_1($11, $9, $7) : Block_2($7) :void + $5 = $1 % $4 :i32 + $6 = $5 * $3 :i32 + $7 = $2 + $6 :i32 + $8 = 10 :i32 + $9 = $3 * $8 :i32 + $10 = 2 :i32 + $11 = $1 / $10 :i32 + $12 = 0 :i32 + $13 = $11 > $12 :bool + if $13 ? Block_1($11, $9, $7) : Block_2($7) :void Block_1($1:i32, $3:i32, $2:i32): - $15 = 2 :i32 - br Block_3($1, $3, $2, $15) :void + $15 = 2 :i32 + br Block_3($1, $3, $2, $15) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/digitSum.trace b/nautilus/test/data/loop-tests/ir/digitSum.trace index 6e788304..29ae218f 100644 --- a/nautilus/test/data/loop-tests/ir/digitSum.trace +++ b/nautilus/test/data/loop-tests/ir/digitSum.trace @@ -1,24 +1,24 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 10 :i32 - br Block_3($1, $2, $3) :void + $2 = 0 :i32 + $3 = 10 :i32 + br Block_3($1, $2, $3) :void Block_3($1:i32, $2:i32, $3:i32): - $4 = $1 % $3 :i32 - $5 = $2 + $4 :i32 - $6 = 10 :i32 - $7 = $1 / $6 :i32 - $8 = 0 :i32 - $9 = $7 > $8 :bool - if $9 ? Block_1($7, $5) : Block_2($5) :void + $4 = $1 % $3 :i32 + $5 = $2 + $4 :i32 + $6 = 10 :i32 + $7 = $1 / $6 :i32 + $8 = 0 :i32 + $9 = $7 > $8 :bool + if $9 ? Block_1($7, $5) : Block_2($5) :void Block_1($1:i32, $2:i32): - $11 = 10 :i32 - br Block_3($1, $2, $11) :void + $11 = 10 :i32 + br Block_3($1, $2, $11) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/elseOnlySumLoop.trace b/nautilus/test/data/loop-tests/ir/elseOnlySumLoop.trace index 27d4ca1b..b7f3ff3e 100644 --- a/nautilus/test/data/loop-tests/ir/elseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/elseOnlySumLoop.trace @@ -1,36 +1,36 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_5($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_5($1, $2, $3) :void Block_5($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($1, $2) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($1, $2) : Block_2($1) :void Block_1($1:i32, $2:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($1, $2) : Block_4($2, $1) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($1, $2) : Block_4($2, $1) :void Block_3($1:i32, $2:i32): - $9 = 1 :i32 - br Block_6($1, $2, $9) :void + $9 = 1 :i32 + br Block_6($1, $2, $9) :void Block_6($1:i32, $2:i32, $9:i32): - $10 = $2 + $9 :i32 - $11 = 10 :i32 - br Block_5($1, $10, $11) :void + $10 = $2 + $9 :i32 + $11 = 10 :i32 + br Block_5($1, $10, $11) :void Block_4($2:i32, $1:i32): - $12 = 1 :i32 - $13 = $1 + $12 :i32 - $14 = 1 :i32 - br Block_6($13, $2, $14) :void + $12 = 1 :i32 + $13 = $1 + $12 :i32 + $14 = 1 :i32 + br Block_6($13, $2, $14) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/factorial.trace b/nautilus/test/data/loop-tests/ir/factorial.trace index bf18db78..a9614ea9 100644 --- a/nautilus/test/data/loop-tests/ir/factorial.trace +++ b/nautilus/test/data/loop-tests/ir/factorial.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 1 :i32 - br Block_3($2, $1, $3) :void + $2 = 1 :i32 + $3 = 1 :i32 + br Block_3($2, $1, $3) :void Block_3($2:i32, $1:i32, $3:i32): - $4 = $1 > $3 :bool - if $4 ? Block_1($1, $2) : Block_2($2) :void + $4 = $1 > $3 :bool + if $4 ? Block_1($1, $2) : Block_2($2) :void Block_1($1:i32, $2:i32): - $7 = $2 * $1 :i32 - $8 = 1 :i32 - $9 = $1 - $8 :i32 - $10 = 1 :i32 - br Block_3($7, $9, $10) :void + $7 = $2 * $1 :i32 + $8 = 1 :i32 + $9 = $1 - $8 :i32 + $10 = 1 :i32 + br Block_3($7, $9, $10) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/fibonacci.trace b/nautilus/test/data/loop-tests/ir/fibonacci.trace index 6da88f37..a05187cb 100644 --- a/nautilus/test/data/loop-tests/ir/fibonacci.trace +++ b/nautilus/test/data/loop-tests/ir/fibonacci.trace @@ -1,23 +1,23 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - $4 = 0 :i32 - $5 = 2 :i32 - br Block_3($3, $5, $1, $2) :void + $2 = 0 :i32 + $3 = 1 :i32 + $4 = 0 :i32 + $5 = 2 :i32 + br Block_3($3, $5, $1, $2) :void Block_3($3:i32, $5:i32, $1:i32, $2:i32): - $6 = $5 <= $1 :bool - if $6 ? Block_1($1, $5, $3, $2) : Block_2($3) :void + $6 = $5 <= $1 :bool + if $6 ? Block_1($1, $5, $3, $2) : Block_2($3) :void Block_1($1:i32, $5:i32, $3:i32, $2:i32): - $8 = $2 + $3 :i32 - $9 = 1 :i32 - $10 = $5 + $9 :i32 - br Block_3($8, $10, $1, $3) :void + $8 = $2 + $3 :i32 + $9 = 1 :i32 + $10 = $5 + $9 :i32 + br Block_3($8, $10, $1, $3) :void Block_2($3:i32): - return ($3) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/gcd.trace b/nautilus/test/data/loop-tests/ir/gcd.trace index 16191239..2c1bc69e 100644 --- a/nautilus/test/data/loop-tests/ir/gcd.trace +++ b/nautilus/test/data/loop-tests/ir/gcd.trace @@ -1,19 +1,19 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 0 :i32 - br Block_3($1, $2, $3) :void + $3 = 0 :i32 + br Block_3($1, $2, $3) :void Block_3($1:i32, $2:i32, $3:i32): - $4 = $2 != $3 :bool - if $4 ? Block_1($1, $2) : Block_2($1) :void + $4 = $2 $3 :bool + if $4 ? Block_1($1, $2) : Block_2($1) :void Block_1($1:i32, $2:i32): - $7 = $1 % $2 :i32 - $8 = 0 :i32 - br Block_3($2, $7, $8) :void + $7 = $1 % $2 :i32 + $8 = 0 :i32 + br Block_3($2, $7, $8) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/ifElseSumLoop.trace b/nautilus/test/data/loop-tests/ir/ifElseSumLoop.trace index ad99b1eb..8098d8d0 100644 --- a/nautilus/test/data/loop-tests/ir/ifElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/ifElseSumLoop.trace @@ -1,38 +1,38 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_5($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_5($1, $2, $3) :void Block_5($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($2, $1) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($2, $1) : Block_2($1) :void Block_1($2:i32, $1:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($2, $1) : Block_4($2, $1) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($2, $1) : Block_4($2, $1) :void Block_3($2:i32, $1:i32): - $9 = 10 :i32 - $10 = $1 + $9 :i32 - $11 = 1 :i32 - br Block_6($10, $2, $11) :void + $9 = 10 :i32 + $10 = $1 + $9 :i32 + $11 = 1 :i32 + br Block_6($10, $2, $11) :void Block_6($1:i32, $2:i32, $11:i32): - $12 = $2 + $11 :i32 - $13 = 10 :i32 - br Block_5($1, $12, $13) :void + $12 = $2 + $11 :i32 + $13 = 10 :i32 + br Block_5($1, $12, $13) :void Block_4($2:i32, $1:i32): - $14 = 1 :i32 - $15 = $1 + $14 :i32 - $16 = 1 :i32 - br Block_6($15, $2, $16) :void + $14 = 1 :i32 + $15 = $1 + $14 :i32 + $16 = 1 :i32 + br Block_6($15, $2, $16) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/ifInsideLoop.trace b/nautilus/test/data/loop-tests/ir/ifInsideLoop.trace index ecc26e50..3c04cfef 100644 --- a/nautilus/test/data/loop-tests/ir/ifInsideLoop.trace +++ b/nautilus/test/data/loop-tests/ir/ifInsideLoop.trace @@ -1,36 +1,36 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 0 :i32 - br Block_5($2, $3, $1) :void + $2 = 0 :i32 + $3 = 0 :i32 + br Block_5($2, $3, $1) :void Block_5($2:i32, $3:i32, $1:i32): - $4 = $3 < $1 :bool - if $4 ? Block_1($1, $3, $2) : Block_2($2) :void + $4 = $3 < $1 :bool + if $4 ? Block_1($1, $3, $2) : Block_2($2) :void Block_1($1:i32, $3:i32, $2:i32): - $6 = 2 :i32 - $7 = $3 % $6 :i32 - $8 = 0 :i32 - $9 = $7 == $8 :bool - if $9 ? Block_3($1, $3, $2) : Block_4($2, $1, $3) :void + $6 = 2 :i32 + $7 = $3 % $6 :i32 + $8 = 0 :i32 + $9 = $7 == $8 :bool + if $9 ? Block_3($1, $3, $2) : Block_4($2, $1, $3) :void Block_3($1:i32, $3:i32, $2:i32): - $11 = 1 :i32 - $12 = $2 + $11 :i32 - $13 = 1 :i32 - br Block_6($12, $1, $3, $13) :void + $11 = 1 :i32 + $12 = $2 + $11 :i32 + $13 = 1 :i32 + br Block_6($12, $1, $3, $13) :void Block_6($2:i32, $1:i32, $3:i32, $13:i32): - $14 = $3 + $13 :i32 - br Block_5($2, $14, $1) :void + $14 = $3 + $13 :i32 + br Block_5($2, $14, $1) :void Block_4($2:i32, $1:i32, $3:i32): - $17 = 1 :i32 - br Block_6($2, $1, $3, $17) :void + $17 = 1 :i32 + br Block_6($2, $1, $3, $17) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/ifSumLoop.trace b/nautilus/test/data/loop-tests/ir/ifSumLoop.trace index 8cf4e304..726c3a3e 100644 --- a/nautilus/test/data/loop-tests/ir/ifSumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/ifSumLoop.trace @@ -1,36 +1,36 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_5($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_5($1, $2, $3) :void Block_5($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($2, $1) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($2, $1) : Block_2($1) :void Block_1($2:i32, $1:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($2, $1) : Block_4($1, $2) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($2, $1) : Block_4($1, $2) :void Block_3($2:i32, $1:i32): - $9 = 10 :i32 - $10 = $1 + $9 :i32 - $11 = 1 :i32 - br Block_6($10, $2, $11) :void + $9 = 10 :i32 + $10 = $1 + $9 :i32 + $11 = 1 :i32 + br Block_6($10, $2, $11) :void Block_6($1:i32, $2:i32, $11:i32): - $12 = $2 + $11 :i32 - $13 = 10 :i32 - br Block_5($1, $12, $13) :void + $12 = $2 + $11 :i32 + $13 = 10 :i32 + br Block_5($1, $12, $13) :void Block_4($1:i32, $2:i32): - $14 = 1 :i32 - br Block_6($1, $2, $14) :void + $14 = 1 :i32 + br Block_6($1, $2, $14) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/isPrime.trace b/nautilus/test/data/loop-tests/ir/isPrime.trace index 8a43b7fd..cbf1f220 100644 --- a/nautilus/test/data/loop-tests/ir/isPrime.trace +++ b/nautilus/test/data/loop-tests/ir/isPrime.trace @@ -1,42 +1,42 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :bool - $3 = 1 :bool - $4 = 1 :i32 - $5 = $1 <= $4 :bool - if $5 ? Block_1($2) : Block_2($2, $1, $3) :void + $2 = false :bool + $3 = true :bool + $4 = 1 :i32 + $5 = $1 <= $4 :bool + if $5 ? Block_1($2) : Block_2($2, $1, $3) :void Block_1($2:bool): - br Block_8($2) :void + br Block_8($2) :void Block_8($2:bool): - return ($2) :bool + return ($2) :bool Block_2($2:bool, $1:i32, $3:bool): - $8 = 2 :i32 - br Block_7($2, $1, $8, $3) :void + $8 = 2 :i32 + br Block_7($2, $1, $8, $3) :void Block_7($2:bool, $1:i32, $8:i32, $3:bool): - $9 = $8 * $8 :i32 - $10 = $9 <= $1 :bool - if $10 ? Block_3($2, $1, $8, $3) : Block_4($3) :void + $9 = $8 * $8 :i32 + $10 = $9 <= $1 :bool + if $10 ? Block_3($2, $1, $8, $3) : Block_4($3) :void Block_3($2:bool, $1:i32, $8:i32, $3:bool): - $12 = $1 % $8 :i32 - $13 = 0 :i32 - $14 = $12 == $13 :bool - if $14 ? Block_5($2) : Block_6($2, $1, $8, $3) :void + $12 = $1 % $8 :i32 + $13 = 0 :i32 + $14 = $12 == $13 :bool + if $14 ? Block_5($2) : Block_6($2, $1, $8, $3) :void Block_5($2:bool): - br Block_8($2) :void + br Block_8($2) :void Block_6($2:bool, $1:i32, $8:i32, $3:bool): - $18 = 1 :i32 - $19 = $8 + $18 :i32 - br Block_7($2, $1, $19, $3) :void + $18 = 1 :i32 + $19 = $8 + $18 :i32 + br Block_7($2, $1, $19, $3) :void Block_4($3:bool): - br Block_8($3) :void + br Block_8($3) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/nestedElseOnlySumLoop.trace b/nautilus/test/data/loop-tests/ir/nestedElseOnlySumLoop.trace index 5620f217..7d229ff2 100644 --- a/nautilus/test/data/loop-tests/ir/nestedElseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/nestedElseOnlySumLoop.trace @@ -1,50 +1,50 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_7($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_7($1, $2, $3) :void Block_7($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($1, $2) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($1, $2) : Block_2($1) :void Block_1($1:i32, $2:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($1, $2) : Block_4($2, $1) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($1, $2) : Block_4($2, $1) :void Block_3($1:i32, $2:i32): - $9 = 40 :i32 - $10 = $1 < $9 :bool - if $10 ? Block_5($1, $2) : Block_6($2, $1) :void + $9 = 40 :i32 + $10 = $1 < $9 :bool + if $10 ? Block_5($1, $2) : Block_6($2, $1) :void Block_5($1:i32, $2:i32): - $12 = 1 :i32 - br Block_8($1, $2, $12) :void + $12 = 1 :i32 + br Block_8($1, $2, $12) :void Block_8($1:i32, $2:i32, $12:i32): - br Block_9($1, $2, $12) :void + br Block_9($1, $2, $12) :void Block_9($1:i32, $2:i32, $12:i32): - $13 = $2 + $12 :i32 - $14 = 10 :i32 - br Block_7($1, $13, $14) :void + $13 = $2 + $12 :i32 + $14 = 10 :i32 + br Block_7($1, $13, $14) :void Block_6($2:i32, $1:i32): - $18 = 100 :i32 - $19 = $1 + $18 :i32 - $20 = 1 :i32 - br Block_9($19, $2, $20) :void + $18 = 100 :i32 + $19 = $1 + $18 :i32 + $20 = 1 :i32 + br Block_9($19, $2, $20) :void Block_4($2:i32, $1:i32): - $15 = 1 :i32 - $16 = $1 + $15 :i32 - $17 = 1 :i32 - br Block_8($16, $2, $17) :void + $15 = 1 :i32 + $16 = $1 + $15 :i32 + $17 = 1 :i32 + br Block_8($16, $2, $17) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/nestedIfElseSumLoop.trace b/nautilus/test/data/loop-tests/ir/nestedIfElseSumLoop.trace index 6deddda3..912f494b 100644 --- a/nautilus/test/data/loop-tests/ir/nestedIfElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/nestedIfElseSumLoop.trace @@ -1,52 +1,52 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_7($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_7($1, $2, $3) :void Block_7($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($2, $1) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($2, $1) : Block_2($1) :void Block_1($2:i32, $1:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($2, $1) : Block_4($2, $1) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($2, $1) : Block_4($2, $1) :void Block_3($2:i32, $1:i32): - $9 = 40 :i32 - $10 = $1 < $9 :bool - if $10 ? Block_5($2, $1) : Block_6($2, $1) :void + $9 = 40 :i32 + $10 = $1 < $9 :bool + if $10 ? Block_5($2, $1) : Block_6($2, $1) :void Block_5($2:i32, $1:i32): - $12 = 10 :i32 - $13 = $1 + $12 :i32 - $14 = 1 :i32 - br Block_8($13, $2, $14) :void + $12 = 10 :i32 + $13 = $1 + $12 :i32 + $14 = 1 :i32 + br Block_8($13, $2, $14) :void Block_8($1:i32, $2:i32, $14:i32): - br Block_9($1, $2, $14) :void + br Block_9($1, $2, $14) :void Block_9($1:i32, $2:i32, $14:i32): - $15 = $2 + $14 :i32 - $16 = 10 :i32 - br Block_7($1, $15, $16) :void + $15 = $2 + $14 :i32 + $16 = 10 :i32 + br Block_7($1, $15, $16) :void Block_6($2:i32, $1:i32): - $20 = 100 :i32 - $21 = $1 + $20 :i32 - $22 = 1 :i32 - br Block_9($21, $2, $22) :void + $20 = 100 :i32 + $21 = $1 + $20 :i32 + $22 = 1 :i32 + br Block_9($21, $2, $22) :void Block_4($2:i32, $1:i32): - $17 = 1 :i32 - $18 = $1 + $17 :i32 - $19 = 1 :i32 - br Block_8($18, $2, $19) :void + $17 = 1 :i32 + $18 = $1 + $17 :i32 + $19 = 1 :i32 + br Block_8($18, $2, $19) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/nestedIfSumLoop.trace b/nautilus/test/data/loop-tests/ir/nestedIfSumLoop.trace index a11fff00..468b305e 100644 --- a/nautilus/test/data/loop-tests/ir/nestedIfSumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/nestedIfSumLoop.trace @@ -1,50 +1,50 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 0 :i32 - $3 = 10 :i32 - br Block_7($1, $2, $3) :void + $1 = 1 :i32 + $2 = 0 :i32 + $3 = 10 :i32 + br Block_7($1, $2, $3) :void Block_7($1:i32, $2:i32, $3:i32): - $4 = $2 < $3 :bool - if $4 ? Block_1($2, $1) : Block_2($1) :void + $4 = $2 < $3 :bool + if $4 ? Block_1($2, $1) : Block_2($1) :void Block_1($2:i32, $1:i32): - $6 = 50 :i32 - $7 = $1 < $6 :bool - if $7 ? Block_3($2, $1) : Block_4($2, $1) :void + $6 = 50 :i32 + $7 = $1 < $6 :bool + if $7 ? Block_3($2, $1) : Block_4($2, $1) :void Block_3($2:i32, $1:i32): - $9 = 40 :i32 - $10 = $1 < $9 :bool - if $10 ? Block_5($2, $1) : Block_6($1, $2) :void + $9 = 40 :i32 + $10 = $1 < $9 :bool + if $10 ? Block_5($2, $1) : Block_6($1, $2) :void Block_5($2:i32, $1:i32): - $12 = 10 :i32 - $13 = $1 + $12 :i32 - $14 = 1 :i32 - br Block_8($13, $2, $14) :void + $12 = 10 :i32 + $13 = $1 + $12 :i32 + $14 = 1 :i32 + br Block_8($13, $2, $14) :void Block_8($1:i32, $2:i32, $14:i32): - br Block_9($1, $2, $14) :void + br Block_9($1, $2, $14) :void Block_9($1:i32, $2:i32, $14:i32): - $15 = $2 + $14 :i32 - $16 = 10 :i32 - br Block_7($1, $15, $16) :void + $15 = $2 + $14 :i32 + $16 = 10 :i32 + br Block_7($1, $15, $16) :void Block_6($1:i32, $2:i32): - $20 = 1 :i32 - br Block_9($1, $2, $20) :void + $20 = 1 :i32 + br Block_9($1, $2, $20) :void Block_4($2:i32, $1:i32): - $17 = 1 :i32 - $18 = $1 + $17 :i32 - $19 = 1 :i32 - br Block_8($18, $2, $19) :void + $17 = 1 :i32 + $18 = $1 + $17 :i32 + $19 = 1 :i32 + br Block_8($18, $2, $19) :void Block_2($1:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/nestedSumLoop.trace b/nautilus/test/data/loop-tests/ir/nestedSumLoop.trace index e7c55030..e9afcd9b 100644 --- a/nautilus/test/data/loop-tests/ir/nestedSumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/nestedSumLoop.trace @@ -1,35 +1,35 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 0 :i32 - br Block_6($2, $3, $1) :void + $2 = 1 :i32 + $3 = 0 :i32 + br Block_6($2, $3, $1) :void Block_6($2:i32, $3:i32, $1:i32): - $4 = $3 < $1 :bool - if $4 ? Block_1($2, $1, $3) : Block_2($2) :void + $4 = $3 < $1 :bool + if $4 ? Block_1($2, $1, $3) : Block_2($2) :void Block_1($2:i32, $1:i32, $3:i32): - $6 = 0 :i32 - br Block_5($2, $1, $3, $6) :void + $6 = 0 :i32 + br Block_5($2, $1, $3, $6) :void Block_5($2:i32, $1:i32, $3:i32, $6:i32): - $7 = $6 < $1 :bool - if $7 ? Block_3($1, $3, $6, $2) : Block_4($2, $1, $3) :void + $7 = $6 < $1 :bool + if $7 ? Block_3($1, $3, $6, $2) : Block_4($2, $1, $3) :void Block_3($1:i32, $3:i32, $6:i32, $2:i32): - $9 = 10 :i32 - $10 = $2 + $9 :i32 - $11 = 1 :i32 - $12 = $6 + $11 :i32 - br Block_5($10, $1, $3, $12) :void + $9 = 10 :i32 + $10 = $2 + $9 :i32 + $11 = 1 :i32 + $12 = $6 + $11 :i32 + br Block_5($10, $1, $3, $12) :void Block_4($2:i32, $1:i32, $3:i32): - $15 = 1 :i32 - $16 = $3 + $15 :i32 - br Block_6($2, $16, $1) :void + $15 = 1 :i32 + $16 = $3 + $15 :i32 + br Block_6($2, $16, $1) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/reverseNumber.trace b/nautilus/test/data/loop-tests/ir/reverseNumber.trace index 1e142580..881a5cc8 100644 --- a/nautilus/test/data/loop-tests/ir/reverseNumber.trace +++ b/nautilus/test/data/loop-tests/ir/reverseNumber.trace @@ -1,26 +1,26 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 10 :i32 - br Block_3($1, $2, $3) :void + $2 = 0 :i32 + $3 = 10 :i32 + br Block_3($1, $2, $3) :void Block_3($1:i32, $2:i32, $3:i32): - $4 = $2 * $3 :i32 - $5 = 10 :i32 - $6 = $1 % $5 :i32 - $7 = $4 + $6 :i32 - $8 = 10 :i32 - $9 = $1 / $8 :i32 - $10 = 0 :i32 - $11 = $9 > $10 :bool - if $11 ? Block_1($9, $7) : Block_2($7) :void + $4 = $2 * $3 :i32 + $5 = 10 :i32 + $6 = $1 % $5 :i32 + $7 = $4 + $6 :i32 + $8 = 10 :i32 + $9 = $1 / $8 :i32 + $10 = 0 :i32 + $11 = $9 > $10 :bool + if $11 ? Block_1($9, $7) : Block_2($7) :void Block_1($1:i32, $2:i32): - $13 = 10 :i32 - br Block_3($1, $2, $13) :void + $13 = 10 :i32 + br Block_3($1, $2, $13) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/sumLoop.trace b/nautilus/test/data/loop-tests/ir/sumLoop.trace index 346cad93..06c74710 100644 --- a/nautilus/test/data/loop-tests/ir/sumLoop.trace +++ b/nautilus/test/data/loop-tests/ir/sumLoop.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 1 :i32 - $3 = 0 :i32 - br Block_3($2, $3, $1) :void + $2 = 1 :i32 + $3 = 0 :i32 + br Block_3($2, $3, $1) :void Block_3($2:i32, $3:i32, $1:i32): - $4 = $3 < $1 :bool - if $4 ? Block_1($1, $3, $2) : Block_2($2) :void + $4 = $3 < $1 :bool + if $4 ? Block_1($1, $3, $2) : Block_2($2) :void Block_1($1:i32, $3:i32, $2:i32): - $6 = 10 :i32 - $7 = $2 + $6 :i32 - $8 = 1 :i32 - $9 = $3 + $8 :i32 - br Block_3($7, $9, $1) :void + $6 = 10 :i32 + $7 = $2 + $6 :i32 + $8 = 1 :i32 + $9 = $3 + $8 :i32 + br Block_3($7, $9, $1) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/sumOfNumbers.trace b/nautilus/test/data/loop-tests/ir/sumOfNumbers.trace index a3f03ccc..c842b0be 100644 --- a/nautilus/test/data/loop-tests/ir/sumOfNumbers.trace +++ b/nautilus/test/data/loop-tests/ir/sumOfNumbers.trace @@ -1,21 +1,21 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - br Block_3($2, $3, $1) :void + $2 = 0 :i32 + $3 = 1 :i32 + br Block_3($2, $3, $1) :void Block_3($2:i32, $3:i32, $1:i32): - $4 = $3 <= $1 :bool - if $4 ? Block_1($1, $3, $2) : Block_2($2) :void + $4 = $3 <= $1 :bool + if $4 ? Block_1($1, $3, $2) : Block_2($2) :void Block_1($1:i32, $3:i32, $2:i32): - $7 = $2 + $3 :i32 - $8 = 1 :i32 - $9 = $3 + $8 :i32 - br Block_3($7, $9, $1) :void + $7 = $2 + $3 :i32 + $8 = 1 :i32 + $9 = $3 + $8 :i32 + br Block_3($7, $9, $1) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/ir/sumOfSquares.trace b/nautilus/test/data/loop-tests/ir/sumOfSquares.trace index 6abec29c..43fdb880 100644 --- a/nautilus/test/data/loop-tests/ir/sumOfSquares.trace +++ b/nautilus/test/data/loop-tests/ir/sumOfSquares.trace @@ -1,22 +1,22 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - br Block_3($2, $3, $1) :void + $2 = 0 :i32 + $3 = 1 :i32 + br Block_3($2, $3, $1) :void Block_3($2:i32, $3:i32, $1:i32): - $4 = $3 <= $1 :bool - if $4 ? Block_1($1, $3, $2) : Block_2($2) :void + $4 = $3 <= $1 :bool + if $4 ? Block_1($1, $3, $2) : Block_2($2) :void Block_1($1:i32, $3:i32, $2:i32): - $6 = $3 * $3 :i32 - $7 = $2 + $6 :i32 - $8 = 1 :i32 - $9 = $3 + $8 :i32 - br Block_3($7, $9, $1) :void + $6 = $3 * $3 :i32 + $7 = $2 + $6 :i32 + $8 = 1 :i32 + $9 = $3 + $8 :i32 + br Block_3($7, $9, $1) :void Block_2($2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/loop-tests/tracing/collatz.trace b/nautilus/test/data/loop-tests/tracing/collatz.trace index 928b4f37..a290e0a8 100644 --- a/nautilus/test/data/loop-tests/tracing/collatz.trace +++ b/nautilus/test/data/loop-tests/tracing/collatz.trace @@ -1,36 +1,36 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B5() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B5() :void B1() - CONST $6 2 :i32 - MOD $7 $1 $6 :i32 - CONST $8 0 :i32 - EQ $9 $7 $8 :bool - CMP $10 $9 B3() B4() :void + CONST $6 2 :i32 + MOD $7 $1 $6 :i32 + CONST $8 0 :i32 + EQ $9 $7 $8 :bool + CMP $10 $9 B3() B4() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() - CONST $11 2 :i32 - DIV $12 $1 $11 :i32 - ASSIGN $1 $12 :i32 - CONST $13 1 :i32 - JMP $0 B6() :void + CONST $11 2 :i32 + DIV $12 $1 $11 :i32 + ASSIGN $1 $12 :i32 + CONST $13 1 :i32 + JMP $0 B6() :void B4() - CONST $18 3 :i32 - MUL $19 $18 $1 :i32 - CONST $20 1 :i32 - ADD $21 $19 $20 :i32 - ASSIGN $1 $21 :i32 - CONST $22 1 :i32 - ASSIGN $13 $22 :i32 - JMP $0 B6() :void + CONST $18 3 :i32 + MUL $19 $18 $1 :i32 + CONST $20 1 :i32 + ADD $21 $19 $20 :i32 + ASSIGN $1 $21 :i32 + CONST $22 1 :i32 + ASSIGN $13 $22 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - NEQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + NEQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B6() ControlFlowMerge - ADD $14 $2 $13 :i32 - ASSIGN $2 $14 :i32 - CONST $15 1 :i32 - ASSIGN $3 $15 :i32 - JMP $0 B5() :void + ADD $14 $2 $13 :i32 + ASSIGN $2 $14 :i32 + CONST $15 1 :i32 + ASSIGN $3 $15 :i32 + JMP $0 B5() :void diff --git a/nautilus/test/data/loop-tests/tracing/countDigits.trace b/nautilus/test/data/loop-tests/tracing/countDigits.trace index cd5f36a7..056df9e2 100644 --- a/nautilus/test/data/loop-tests/tracing/countDigits.trace +++ b/nautilus/test/data/loop-tests/tracing/countDigits.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + JMP $0 B3() :void B1() - CONST $6 10 :i32 - DIV $7 $1 $6 :i32 - ASSIGN $1 $7 :i32 - CONST $8 1 :i32 - ADD $9 $2 $8 :i32 - ASSIGN $2 $9 :i32 - CONST $10 0 :i32 - ASSIGN $3 $10 :i32 - JMP $0 B3() :void + CONST $6 10 :i32 + DIV $7 $1 $6 :i32 + ASSIGN $1 $7 :i32 + CONST $8 1 :i32 + ADD $9 $2 $8 :i32 + ASSIGN $2 $9 :i32 + CONST $10 0 :i32 + ASSIGN $3 $10 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - NEQ $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + NEQ $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/decimalToBinary.trace b/nautilus/test/data/loop-tests/tracing/decimalToBinary.trace index 9bd19814..44768259 100644 --- a/nautilus/test/data/loop-tests/tracing/decimalToBinary.trace +++ b/nautilus/test/data/loop-tests/tracing/decimalToBinary.trace @@ -1,25 +1,25 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - CONST $4 2 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + CONST $4 2 :i32 + JMP $0 B3() :void B1() - CONST $15 2 :i32 - ASSIGN $4 $15 :i32 - JMP $0 B3() :void + CONST $15 2 :i32 + ASSIGN $4 $15 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - MOD $5 $1 $4 :i32 - MUL $6 $5 $3 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 10 :i32 - MUL $9 $3 $8 :i32 - ASSIGN $3 $9 :i32 - CONST $10 2 :i32 - DIV $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - CONST $12 0 :i32 - GT $13 $1 $12 :bool - CMP $14 $13 B1() B2() :void + MOD $5 $1 $4 :i32 + MUL $6 $5 $3 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 10 :i32 + MUL $9 $3 $8 :i32 + ASSIGN $3 $9 :i32 + CONST $10 2 :i32 + DIV $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + CONST $12 0 :i32 + GT $13 $1 $12 :bool + CMP $14 $13 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/digitSum.trace b/nautilus/test/data/loop-tests/tracing/digitSum.trace index 9ca53a15..820fbb10 100644 --- a/nautilus/test/data/loop-tests/tracing/digitSum.trace +++ b/nautilus/test/data/loop-tests/tracing/digitSum.trace @@ -1,20 +1,20 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B3() :void B1() - CONST $11 10 :i32 - ASSIGN $3 $11 :i32 - JMP $0 B3() :void + CONST $11 10 :i32 + ASSIGN $3 $11 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - MOD $4 $1 $3 :i32 - ADD $5 $2 $4 :i32 - ASSIGN $2 $5 :i32 - CONST $6 10 :i32 - DIV $7 $1 $6 :i32 - ASSIGN $1 $7 :i32 - CONST $8 0 :i32 - GT $9 $1 $8 :bool - CMP $10 $9 B1() B2() :void + MOD $4 $1 $3 :i32 + ADD $5 $2 $4 :i32 + ASSIGN $2 $5 :i32 + CONST $6 10 :i32 + DIV $7 $1 $6 :i32 + ASSIGN $1 $7 :i32 + CONST $8 0 :i32 + GT $9 $1 $8 :bool + CMP $10 $9 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/elseOnlySumLoop.trace b/nautilus/test/data/loop-tests/tracing/elseOnlySumLoop.trace index c2a76d1c..037edd8d 100644 --- a/nautilus/test/data/loop-tests/tracing/elseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/elseOnlySumLoop.trace @@ -1,30 +1,30 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 1 :i32 - JMP $0 B6() :void + CONST $9 1 :i32 + JMP $0 B6() :void B4() - CONST $12 1 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 1 :i32 - ASSIGN $9 $14 :i32 - JMP $0 B6() :void + CONST $12 1 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 1 :i32 + ASSIGN $9 $14 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B6() ControlFlowMerge - ADD $10 $2 $9 :i32 - ASSIGN $2 $10 :i32 - CONST $11 10 :i32 - ASSIGN $3 $11 :i32 - JMP $0 B5() :void + ADD $10 $2 $9 :i32 + ASSIGN $2 $10 :i32 + CONST $11 10 :i32 + ASSIGN $3 $11 :i32 + JMP $0 B5() :void diff --git a/nautilus/test/data/loop-tests/tracing/factorial.trace b/nautilus/test/data/loop-tests/tracing/factorial.trace index d796828b..f33459d0 100644 --- a/nautilus/test/data/loop-tests/tracing/factorial.trace +++ b/nautilus/test/data/loop-tests/tracing/factorial.trace @@ -1,19 +1,19 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 1 :i32 - JMP $0 B3() :void + CONST $2 1 :i32 + CONST $3 1 :i32 + JMP $0 B3() :void B1() - ASSIGN $6 $1 :i32 - MUL $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 1 :i32 - SUB $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 1 :i32 - ASSIGN $3 $10 :i32 - JMP $0 B3() :void + ASSIGN $6 $1 :i32 + MUL $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 1 :i32 + SUB $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 1 :i32 + ASSIGN $3 $10 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/fibonacci.trace b/nautilus/test/data/loop-tests/tracing/fibonacci.trace index d832f63c..a58cf042 100644 --- a/nautilus/test/data/loop-tests/tracing/fibonacci.trace +++ b/nautilus/test/data/loop-tests/tracing/fibonacci.trace @@ -1,20 +1,20 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - CONST $4 0 :i32 - CONST $5 2 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + CONST $4 0 :i32 + CONST $5 2 :i32 + JMP $0 B3() :void B1() - ADD $8 $2 $3 :i32 - ASSIGN $4 $8 :i32 - ASSIGN $2 $3 :i32 - ASSIGN $3 $4 :i32 - CONST $9 1 :i32 - ADD $10 $5 $9 :i32 - ASSIGN $5 $10 :i32 - JMP $0 B3() :void + ADD $8 $2 $3 :i32 + ASSIGN $4 $8 :i32 + ASSIGN $2 $3 :i32 + ASSIGN $3 $4 :i32 + CONST $9 1 :i32 + ADD $10 $5 $9 :i32 + ASSIGN $5 $10 :i32 + JMP $0 B3() :void B2() - RETURN $3 :i32 + RETURN $3 :i32 B3() ControlFlowMerge - LTE $6 $5 $1 :bool - CMP $7 $6 B1() B2() :void + LTE $6 $5 $1 :bool + CMP $7 $6 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/gcd.trace b/nautilus/test/data/loop-tests/tracing/gcd.trace index f6452a8e..2964f21c 100644 --- a/nautilus/test/data/loop-tests/tracing/gcd.trace +++ b/nautilus/test/data/loop-tests/tracing/gcd.trace @@ -1,16 +1,16 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - JMP $0 B3() :void + CONST $3 0 :i32 + JMP $0 B3() :void B1() - ASSIGN $6 $2 :i32 - MOD $7 $1 $2 :i32 - ASSIGN $2 $7 :i32 - ASSIGN $1 $6 :i32 - CONST $8 0 :i32 - ASSIGN $3 $8 :i32 - JMP $0 B3() :void + ASSIGN $6 $2 :i32 + MOD $7 $1 $2 :i32 + ASSIGN $2 $7 :i32 + ASSIGN $1 $6 :i32 + CONST $8 0 :i32 + ASSIGN $3 $8 :i32 + JMP $0 B3() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() ControlFlowMerge - NEQ $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + NEQ $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/ifElseSumLoop.trace b/nautilus/test/data/loop-tests/tracing/ifElseSumLoop.trace index 95d3aab3..fdf72807 100644 --- a/nautilus/test/data/loop-tests/tracing/ifElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/ifElseSumLoop.trace @@ -1,33 +1,33 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 10 :i32 - ADD $10 $1 $9 :i32 - ASSIGN $1 $10 :i32 - CONST $11 1 :i32 - JMP $0 B6() :void + CONST $9 10 :i32 + ADD $10 $1 $9 :i32 + ASSIGN $1 $10 :i32 + CONST $11 1 :i32 + JMP $0 B6() :void B4() - CONST $14 1 :i32 - ADD $15 $1 $14 :i32 - ASSIGN $1 $15 :i32 - CONST $16 1 :i32 - ASSIGN $11 $16 :i32 - JMP $0 B6() :void + CONST $14 1 :i32 + ADD $15 $1 $14 :i32 + ASSIGN $1 $15 :i32 + CONST $16 1 :i32 + ASSIGN $11 $16 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B6() ControlFlowMerge - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 10 :i32 - ASSIGN $3 $13 :i32 - JMP $0 B5() :void + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 10 :i32 + ASSIGN $3 $13 :i32 + JMP $0 B5() :void diff --git a/nautilus/test/data/loop-tests/tracing/ifInsideLoop.trace b/nautilus/test/data/loop-tests/tracing/ifInsideLoop.trace index 1f9798d7..22a1de17 100644 --- a/nautilus/test/data/loop-tests/tracing/ifInsideLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/ifInsideLoop.trace @@ -1,29 +1,29 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 0 :i32 - JMP $0 B5() :void + CONST $2 0 :i32 + CONST $3 0 :i32 + JMP $0 B5() :void B1() - CONST $6 2 :i32 - MOD $7 $3 $6 :i32 - CONST $8 0 :i32 - EQ $9 $7 $8 :bool - CMP $10 $9 B3() B4() :void + CONST $6 2 :i32 + MOD $7 $3 $6 :i32 + CONST $8 0 :i32 + EQ $9 $7 $8 :bool + CMP $10 $9 B3() B4() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 1 :i32 - JMP $0 B6() :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 1 :i32 + JMP $0 B6() :void B4() - CONST $17 1 :i32 - ASSIGN $13 $17 :i32 - JMP $0 B6() :void + CONST $17 1 :i32 + ASSIGN $13 $17 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1() B2() :void + LT $4 $3 $1 :bool + CMP $5 $4 B1() B2() :void B6() ControlFlowMerge - ADD $14 $3 $13 :i32 - ASSIGN $3 $14 :i32 - JMP $0 B5() :void + ADD $14 $3 $13 :i32 + ASSIGN $3 $14 :i32 + JMP $0 B5() :void diff --git a/nautilus/test/data/loop-tests/tracing/ifSumLoop.trace b/nautilus/test/data/loop-tests/tracing/ifSumLoop.trace index bbf0c322..0cdbdee5 100644 --- a/nautilus/test/data/loop-tests/tracing/ifSumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/ifSumLoop.trace @@ -1,30 +1,30 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B5() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B5() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 10 :i32 - ADD $10 $1 $9 :i32 - ASSIGN $1 $10 :i32 - CONST $11 1 :i32 - JMP $0 B6() :void + CONST $9 10 :i32 + ADD $10 $1 $9 :i32 + ASSIGN $1 $10 :i32 + CONST $11 1 :i32 + JMP $0 B6() :void B4() - CONST $14 1 :i32 - ASSIGN $11 $14 :i32 - JMP $0 B6() :void + CONST $14 1 :i32 + ASSIGN $11 $14 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B6() ControlFlowMerge - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 10 :i32 - ASSIGN $3 $13 :i32 - JMP $0 B5() :void + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 10 :i32 + ASSIGN $3 $13 :i32 + JMP $0 B5() :void diff --git a/nautilus/test/data/loop-tests/tracing/isPrime.trace b/nautilus/test/data/loop-tests/tracing/isPrime.trace index 3270058c..c174b08e 100644 --- a/nautilus/test/data/loop-tests/tracing/isPrime.trace +++ b/nautilus/test/data/loop-tests/tracing/isPrime.trace @@ -1,29 +1,29 @@ B0($1:i32) - CONST $2 0 :bool - CONST $3 1 :bool - CONST $4 1 :i32 - LTE $5 $1 $4 :bool - CMP $6 $5 B1() B2() :void + CONST $2 false :bool + CONST $3 true :bool + CONST $4 1 :i32 + LTE $5 $1 $4 :bool + CMP $6 $5 B1() B2() :void B1() - RETURN $2 :bool + RETURN $2 :bool B2() - CONST $8 2 :i32 - JMP $0 B7() :void + CONST $8 2 :i32 + JMP $0 B7() :void B3() - MOD $12 $1 $8 :i32 - CONST $13 0 :i32 - EQ $14 $12 $13 :bool - CMP $15 $14 B5() B6() :void + MOD $12 $1 $8 :i32 + CONST $13 0 :i32 + EQ $14 $12 $13 :bool + CMP $15 $14 B5() B6() :void B4() - RETURN $3 :bool + RETURN $3 :bool B5() - RETURN $2 :bool + RETURN $2 :bool B6() - CONST $18 1 :i32 - ADD $19 $8 $18 :i32 - ASSIGN $8 $19 :i32 - JMP $0 B7() :void + CONST $18 1 :i32 + ADD $19 $8 $18 :i32 + ASSIGN $8 $19 :i32 + JMP $0 B7() :void B7() ControlFlowMerge - MUL $9 $8 $8 :i32 - LTE $10 $9 $1 :bool - CMP $11 $10 B3() B4() :void + MUL $9 $8 $8 :i32 + LTE $10 $9 $1 :bool + CMP $11 $10 B3() B4() :void diff --git a/nautilus/test/data/loop-tests/tracing/nestedElseOnlySumLoop.trace b/nautilus/test/data/loop-tests/tracing/nestedElseOnlySumLoop.trace index f72ec525..f09f5824 100644 --- a/nautilus/test/data/loop-tests/tracing/nestedElseOnlySumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/nestedElseOnlySumLoop.trace @@ -1,43 +1,43 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5() B6() :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5() B6() :void B4() - CONST $15 1 :i32 - ADD $16 $1 $15 :i32 - ASSIGN $1 $16 :i32 - CONST $17 1 :i32 - ASSIGN $12 $17 :i32 - JMP $0 B8() :void + CONST $15 1 :i32 + ADD $16 $1 $15 :i32 + ASSIGN $1 $16 :i32 + CONST $17 1 :i32 + ASSIGN $12 $17 :i32 + JMP $0 B8() :void B5() - CONST $12 1 :i32 - JMP $0 B8() :void + CONST $12 1 :i32 + JMP $0 B8() :void B6() - CONST $18 100 :i32 - ADD $19 $1 $18 :i32 - ASSIGN $1 $19 :i32 - CONST $20 1 :i32 - ASSIGN $12 $20 :i32 - JMP $0 B9() :void + CONST $18 100 :i32 + ADD $19 $1 $18 :i32 + ASSIGN $1 $19 :i32 + CONST $20 1 :i32 + ASSIGN $12 $20 :i32 + JMP $0 B9() :void B7() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B8() ControlFlowMerge - JMP $0 B9() :void + JMP $0 B9() :void B9() ControlFlowMerge - ADD $13 $2 $12 :i32 - ASSIGN $2 $13 :i32 - CONST $14 10 :i32 - ASSIGN $3 $14 :i32 - JMP $0 B7() :void + ADD $13 $2 $12 :i32 + ASSIGN $2 $13 :i32 + CONST $14 10 :i32 + ASSIGN $3 $14 :i32 + JMP $0 B7() :void diff --git a/nautilus/test/data/loop-tests/tracing/nestedIfElseSumLoop.trace b/nautilus/test/data/loop-tests/tracing/nestedIfElseSumLoop.trace index 5565b77b..566b55d7 100644 --- a/nautilus/test/data/loop-tests/tracing/nestedIfElseSumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/nestedIfElseSumLoop.trace @@ -1,46 +1,46 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5() B6() :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5() B6() :void B4() - CONST $17 1 :i32 - ADD $18 $1 $17 :i32 - ASSIGN $1 $18 :i32 - CONST $19 1 :i32 - ASSIGN $14 $19 :i32 - JMP $0 B8() :void + CONST $17 1 :i32 + ADD $18 $1 $17 :i32 + ASSIGN $1 $18 :i32 + CONST $19 1 :i32 + ASSIGN $14 $19 :i32 + JMP $0 B8() :void B5() - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 1 :i32 - JMP $0 B8() :void + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 1 :i32 + JMP $0 B8() :void B6() - CONST $20 100 :i32 - ADD $21 $1 $20 :i32 - ASSIGN $1 $21 :i32 - CONST $22 1 :i32 - ASSIGN $14 $22 :i32 - JMP $0 B9() :void + CONST $20 100 :i32 + ADD $21 $1 $20 :i32 + ASSIGN $1 $21 :i32 + CONST $22 1 :i32 + ASSIGN $14 $22 :i32 + JMP $0 B9() :void B7() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B8() ControlFlowMerge - JMP $0 B9() :void + JMP $0 B9() :void B9() ControlFlowMerge - ADD $15 $2 $14 :i32 - ASSIGN $2 $15 :i32 - CONST $16 10 :i32 - ASSIGN $3 $16 :i32 - JMP $0 B7() :void + ADD $15 $2 $14 :i32 + ASSIGN $2 $15 :i32 + CONST $16 10 :i32 + ASSIGN $3 $16 :i32 + JMP $0 B7() :void diff --git a/nautilus/test/data/loop-tests/tracing/nestedIfSumLoop.trace b/nautilus/test/data/loop-tests/tracing/nestedIfSumLoop.trace index 72ecd5b8..9eea02c0 100644 --- a/nautilus/test/data/loop-tests/tracing/nestedIfSumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/nestedIfSumLoop.trace @@ -1,43 +1,43 @@ B0() - CONST $1 1 :i32 - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B7() :void + CONST $1 1 :i32 + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B7() :void B1() - CONST $6 50 :i32 - LT $7 $1 $6 :bool - CMP $8 $7 B3() B4() :void + CONST $6 50 :i32 + LT $7 $1 $6 :bool + CMP $8 $7 B3() B4() :void B2() - RETURN $1 :i32 + RETURN $1 :i32 B3() - CONST $9 40 :i32 - LT $10 $1 $9 :bool - CMP $11 $10 B5() B6() :void + CONST $9 40 :i32 + LT $10 $1 $9 :bool + CMP $11 $10 B5() B6() :void B4() - CONST $17 1 :i32 - ADD $18 $1 $17 :i32 - ASSIGN $1 $18 :i32 - CONST $19 1 :i32 - ASSIGN $14 $19 :i32 - JMP $0 B8() :void + CONST $17 1 :i32 + ADD $18 $1 $17 :i32 + ASSIGN $1 $18 :i32 + CONST $19 1 :i32 + ASSIGN $14 $19 :i32 + JMP $0 B8() :void B5() - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 1 :i32 - JMP $0 B8() :void + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 1 :i32 + JMP $0 B8() :void B6() - CONST $20 1 :i32 - ASSIGN $14 $20 :i32 - JMP $0 B9() :void + CONST $20 1 :i32 + ASSIGN $14 $20 :i32 + JMP $0 B9() :void B7() ControlFlowMerge - LT $4 $2 $3 :bool - CMP $5 $4 B1() B2() :void + LT $4 $2 $3 :bool + CMP $5 $4 B1() B2() :void B8() ControlFlowMerge - JMP $0 B9() :void + JMP $0 B9() :void B9() ControlFlowMerge - ADD $15 $2 $14 :i32 - ASSIGN $2 $15 :i32 - CONST $16 10 :i32 - ASSIGN $3 $16 :i32 - JMP $0 B7() :void + ADD $15 $2 $14 :i32 + ASSIGN $2 $15 :i32 + CONST $16 10 :i32 + ASSIGN $3 $16 :i32 + JMP $0 B7() :void diff --git a/nautilus/test/data/loop-tests/tracing/nestedSumLoop.trace b/nautilus/test/data/loop-tests/tracing/nestedSumLoop.trace index ad2c81cb..3cc548a3 100644 --- a/nautilus/test/data/loop-tests/tracing/nestedSumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/nestedSumLoop.trace @@ -1,28 +1,28 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 0 :i32 - JMP $0 B6() :void + CONST $2 1 :i32 + CONST $3 0 :i32 + JMP $0 B6() :void B1() - CONST $6 0 :i32 - JMP $0 B5() :void + CONST $6 0 :i32 + JMP $0 B5() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() - CONST $9 10 :i32 - ADD $10 $2 $9 :i32 - ASSIGN $2 $10 :i32 - CONST $11 1 :i32 - ADD $12 $6 $11 :i32 - ASSIGN $6 $12 :i32 - JMP $0 B5() :void + CONST $9 10 :i32 + ADD $10 $2 $9 :i32 + ASSIGN $2 $10 :i32 + CONST $11 1 :i32 + ADD $12 $6 $11 :i32 + ASSIGN $6 $12 :i32 + JMP $0 B5() :void B4() - CONST $15 1 :i32 - ADD $16 $3 $15 :i32 - ASSIGN $3 $16 :i32 - JMP $0 B6() :void + CONST $15 1 :i32 + ADD $16 $3 $15 :i32 + ASSIGN $3 $16 :i32 + JMP $0 B6() :void B5() ControlFlowMerge - LT $7 $6 $1 :bool - CMP $8 $7 B3() B4() :void + LT $7 $6 $1 :bool + CMP $8 $7 B3() B4() :void B6() ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1() B2() :void + LT $4 $3 $1 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/reverseNumber.trace b/nautilus/test/data/loop-tests/tracing/reverseNumber.trace index 25bdaf04..b97ab3d6 100644 --- a/nautilus/test/data/loop-tests/tracing/reverseNumber.trace +++ b/nautilus/test/data/loop-tests/tracing/reverseNumber.trace @@ -1,22 +1,22 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 10 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 10 :i32 + JMP $0 B3() :void B1() - CONST $13 10 :i32 - ASSIGN $3 $13 :i32 - JMP $0 B3() :void + CONST $13 10 :i32 + ASSIGN $3 $13 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - MUL $4 $2 $3 :i32 - CONST $5 10 :i32 - MOD $6 $1 $5 :i32 - ADD $7 $4 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 10 :i32 - DIV $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 0 :i32 - GT $11 $1 $10 :bool - CMP $12 $11 B1() B2() :void + MUL $4 $2 $3 :i32 + CONST $5 10 :i32 + MOD $6 $1 $5 :i32 + ADD $7 $4 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 10 :i32 + DIV $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 0 :i32 + GT $11 $1 $10 :bool + CMP $12 $11 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/sumLoop.trace b/nautilus/test/data/loop-tests/tracing/sumLoop.trace index 2e7d25c5..47e3307f 100644 --- a/nautilus/test/data/loop-tests/tracing/sumLoop.trace +++ b/nautilus/test/data/loop-tests/tracing/sumLoop.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 1 :i32 - CONST $3 0 :i32 - JMP $0 B3() :void + CONST $2 1 :i32 + CONST $3 0 :i32 + JMP $0 B3() :void B1() - CONST $6 10 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - ASSIGN $3 $9 :i32 - JMP $0 B3() :void + CONST $6 10 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + ASSIGN $3 $9 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - LT $4 $3 $1 :bool - CMP $5 $4 B1() B2() :void + LT $4 $3 $1 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/sumOfNumbers.trace b/nautilus/test/data/loop-tests/tracing/sumOfNumbers.trace index c980caa0..1b060bdd 100644 --- a/nautilus/test/data/loop-tests/tracing/sumOfNumbers.trace +++ b/nautilus/test/data/loop-tests/tracing/sumOfNumbers.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B3() :void B1() - ASSIGN $6 $3 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - ASSIGN $3 $9 :i32 - JMP $0 B3() :void + ASSIGN $6 $3 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + ASSIGN $3 $9 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - LTE $4 $3 $1 :bool - CMP $5 $4 B1() B2() :void + LTE $4 $3 $1 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/loop-tests/tracing/sumOfSquares.trace b/nautilus/test/data/loop-tests/tracing/sumOfSquares.trace index 5b66fe3e..89b4bda2 100644 --- a/nautilus/test/data/loop-tests/tracing/sumOfSquares.trace +++ b/nautilus/test/data/loop-tests/tracing/sumOfSquares.trace @@ -1,17 +1,17 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - JMP $0 B3() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + JMP $0 B3() :void B1() - MUL $6 $3 $3 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 1 :i32 - ADD $9 $3 $8 :i32 - ASSIGN $3 $9 :i32 - JMP $0 B3() :void + MUL $6 $3 $3 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 1 :i32 + ADD $9 $3 $8 :i32 + ASSIGN $3 $9 :i32 + JMP $0 B3() :void B2() - RETURN $2 :i32 + RETURN $2 :i32 B3() ControlFlowMerge - LTE $4 $3 $1 :bool - CMP $5 $4 B1() B2() :void + LTE $4 $3 $1 :bool + CMP $5 $4 B1() B2() :void diff --git a/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace index 6836a3f0..c2385e7f 100644 Binary files a/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace and b/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace differ diff --git a/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace b/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace index 64bd7705..58ff292e 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace @@ -1,4 +1,4 @@ B0($1:ptr,$2:ptr) - CONST $3 0 :ui64 - CALL $4 nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2,$1,$3) :ptr - RETURN $0 :void + CONST $3 0 :ui64 + CALL $4 nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2,$1,$3) :ptr + RETURN $0 :void diff --git a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace index 3751e043..ed4f0666 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/castPtrAndGetValue_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/castPtrAndGetValue_i8.trace index 7c97a452..8ea721e6 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/castPtrAndGetValue_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/castPtrAndGetValue_i8.trace @@ -1,8 +1,8 @@ B0($1:ptr) - CONST $2 0 :i32 - CONST $6 2 :ui64 - CAST $7 $2 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $1 $8 :ptr - LOAD $12 $9 :i16 - RETURN $12 :i16 + CONST $2 0 :i32 + CONST $6 2 :ui64 + CAST $7 $2 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $1 $8 :ptr + LOAD $12 $9 :i16 + RETURN $12 :i16 diff --git a/nautilus/test/data/pointer-tests/after_ssa/castVoidPtr.trace b/nautilus/test/data/pointer-tests/after_ssa/castVoidPtr.trace index d3096eb1..b865ab23 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/castVoidPtr.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/castVoidPtr.trace @@ -1,8 +1,8 @@ B0($1:ptr) - CONST $2 0 :i32 - CONST $6 4 :ui64 - CAST $7 $2 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $1 $8 :ptr - LOAD $12 $9 :i32 - RETURN $12 :i32 + CONST $2 0 :i32 + CONST $6 4 :ui64 + CAST $7 $2 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $1 $8 :ptr + LOAD $12 $9 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/customPointerAdd.trace b/nautilus/test/data/pointer-tests/after_ssa/customPointerAdd.trace index 7294cae7..9cbd0665 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/customPointerAdd.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/customPointerAdd.trace @@ -1,6 +1,6 @@ B0($1:ptr,$2:i32) - CONST $6 12 :ui64 - CAST $7 $2 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $1 $8 :ptr - RETURN $9 :ptr + CONST $6 12 :ui64 + CAST $7 $2 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $1 $8 :ptr + RETURN $9 :ptr diff --git a/nautilus/test/data/pointer-tests/after_ssa/isNullptr_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/isNullptr_i8.trace index 042db741..582ef240 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/isNullptr_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/isNullptr_i8.trace @@ -1,4 +1,4 @@ B0($1:ptr) - CONST $3 * :ptr - EQ $6 $1 $3 :bool - RETURN $6 :bool + CONST $3 * :ptr + EQ $6 $1 $3 :bool + RETURN $6 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/load.trace b/nautilus/test/data/pointer-tests/after_ssa/load.trace index 6c8b1963..8a02d45d 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/load.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/load.trace @@ -1,7 +1,7 @@ B0($1:ptr,$2:i32) - CONST $7 4 :ui64 - CAST $8 $2 :ui64 - MUL $9 $8 $7 :ui64 - ADD $10 $1 $9 :ptr - LOAD $13 $10 :i32 - RETURN $13 :i32 + CONST $7 4 :ui64 + CAST $8 $2 :ui64 + MUL $9 $8 $7 :ui64 + ADD $10 $1 $9 :ptr + LOAD $13 $10 :i32 + RETURN $13 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/loadConst.trace b/nautilus/test/data/pointer-tests/after_ssa/loadConst.trace index 75dc7acf..c00075ee 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/loadConst.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/loadConst.trace @@ -1,4 +1,4 @@ B0() - CONST $1 * :ptr - LOAD $4 $1 :i32 - RETURN $4 :i32 + CONST $1 * :ptr + LOAD $4 $1 :i32 + RETURN $4 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace index bc0f39cf..23b339e6 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/pointerAdd.trace b/nautilus/test/data/pointer-tests/after_ssa/pointerAdd.trace index 44c2863d..6ffeeb01 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/pointerAdd.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/pointerAdd.trace @@ -1,7 +1,7 @@ B0($1:ptr,$2:i32) - CONST $6 4 :ui64 - CAST $7 $2 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $1 $8 :ptr - LOAD $12 $9 :i32 - RETURN $12 :i32 + CONST $6 4 :ui64 + CAST $7 $2 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $1 $8 :ptr + LOAD $12 $9 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/pointerAddConst.trace b/nautilus/test/data/pointer-tests/after_ssa/pointerAddConst.trace index 3930b955..70f99070 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/pointerAddConst.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/pointerAddConst.trace @@ -1,7 +1,7 @@ B0($1:ptr) - CONST $3 2 :ui64 - CONST $5 4 :ui64 - MUL $6 $3 $5 :ui64 - ADD $7 $1 $6 :ptr - LOAD $10 $7 :i32 - RETURN $10 :i32 + CONST $3 2 :ui64 + CONST $5 4 :ui64 + MUL $6 $3 $5 :ui64 + ADD $7 $1 $6 :ptr + LOAD $10 $7 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/pointerSub.trace b/nautilus/test/data/pointer-tests/after_ssa/pointerSub.trace index 43045daf..426117de 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/pointerSub.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/pointerSub.trace @@ -1,9 +1,9 @@ B0($1:ptr,$2:i32) - CONST $4 0 :i32 - SUB $5 $4 $2 :i32 - CONST $7 4 :ui64 - CAST $8 $5 :ui64 - MUL $9 $8 $7 :ui64 - ADD $10 $1 $9 :ptr - LOAD $13 $10 :i32 - RETURN $13 :i32 + CONST $4 0 :i32 + SUB $5 $4 $2 :i32 + CONST $7 4 :ui64 + CAST $8 $5 :ui64 + MUL $9 $8 $7 :ui64 + ADD $10 $1 $9 :ptr + LOAD $13 $10 :i32 + RETURN $13 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/pointerSubConst.trace b/nautilus/test/data/pointer-tests/after_ssa/pointerSubConst.trace index 49d1f66b..e96ec4d5 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/pointerSubConst.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/pointerSubConst.trace @@ -1,7 +1,7 @@ B0($1:ptr) - CONST $3 18446744073709551614 :ui64 - CONST $5 4 :ui64 - MUL $6 $3 $5 :ui64 - ADD $7 $1 $6 :ptr - LOAD $10 $7 :i32 - RETURN $10 :i32 + CONST $3 18446744073709551614 :ui64 + CONST $5 4 :ui64 + MUL $6 $3 $5 :ui64 + ADD $7 $1 $6 :ptr + LOAD $10 $7 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrAssignment.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrAssignment.trace index 8353b42a..5e00749f 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrAssignment.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrAssignment.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - LOAD $6 $2 :i32 - LOAD $9 $1 :i32 - ADD $10 $6 $9 :i32 - RETURN $10 :i32 + LOAD $6 $2 :i32 + LOAD $9 $1 :i32 + ADD $10 $6 $9 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrEquals_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrEquals_i8.trace index b13c4abc..a0e5a4d3 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrEquals_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - EQ $5 $1 $2 :bool - RETURN $5 :bool + EQ $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThanEquals_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThanEquals_i8.trace index f0bc025a..591adafb 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThanEquals_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - GTE $5 $1 $2 :bool - RETURN $5 :bool + GTE $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThan_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThan_i8.trace index e6426115..478593db 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThan_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrGreaterThan_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - GT $5 $1 $2 :bool - RETURN $5 :bool + GT $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrLessThanEquals_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrLessThanEquals_i8.trace index 237540c6..a7019122 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrLessThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrLessThanEquals_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - LTE $5 $1 $2 :bool - RETURN $5 :bool + LTE $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrLessThan_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrLessThan_i8.trace index 9ee15951..5537a8d9 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrLessThan_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrLessThan_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - LT $5 $1 $2 :bool - RETURN $5 :bool + LT $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/ptrNotEquals_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/ptrNotEquals_i8.trace index 77d5f3b3..0166a82e 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/ptrNotEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/ptrNotEquals_i8.trace @@ -1,3 +1,3 @@ B0($1:ptr,$2:ptr) - NEQ $5 $1 $2 :bool - RETURN $5 :bool + NEQ $5 $1 $2 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace b/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace index f9f9c9da..37680284 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/after_ssa/sumArray.trace b/nautilus/test/data/pointer-tests/after_ssa/sumArray.trace index 7ed4a991..ae9c7599 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/sumArray.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/sumArray.trace @@ -1,19 +1,19 @@ B0($1:ptr,$2:i32) - CONST $3 0 :i32 - CONST $4 0 :i32 - JMP $0 B3($3,$4,$2,$1) :void + CONST $3 0 :i32 + CONST $4 0 :i32 + JMP $0 B3($3,$4,$2,$1) :void B1($2:i32,$4:i32,$3:i32,$1:ptr) - CONST $11 4 :ui64 - CAST $12 $4 :ui64 - MUL $13 $12 $11 :ui64 - ADD $14 $1 $13 :ptr - LOAD $17 $14 :i32 - ADD $18 $3 $17 :i32 - CONST $19 1 :i32 - ADD $20 $4 $19 :i32 - JMP $0 B3($18,$20,$2,$1) :void + CONST $11 4 :ui64 + CAST $12 $4 :ui64 + MUL $13 $12 $11 :ui64 + ADD $14 $1 $13 :ptr + LOAD $17 $14 :i32 + ADD $18 $3 $17 :i32 + CONST $19 1 :i32 + ADD $20 $4 $19 :i32 + JMP $0 B3($18,$20,$2,$1) :void B2($3:i32) - RETURN $3 :i32 + RETURN $3 :i32 B3($3:i32,$4:i32,$2:i32,$1:ptr) ControlFlowMerge - LT $5 $4 $2 :bool - CMP $6 $5 B1($2,$4,$3,$1) B2($3) :void + LT $5 $4 $2 :bool + CMP $6 $5 B1($2,$4,$3,$1) B2($3) :void diff --git a/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace b/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace index 10335225..c3652e46 100644 --- a/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace +++ b/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - CALL $3 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - CALL $4 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 - ADD $5 $3 $4 :i32 - RETURN $5 :i32 + CALL $3 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + CALL $4 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 + ADD $5 $3 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/pointer-tests/ir/addArray_i8.trace b/nautilus/test/data/pointer-tests/ir/addArray_i8.trace index 0d59a7f9..95a5c599 100644 --- a/nautilus/test/data/pointer-tests/ir/addArray_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/addArray_i8.trace @@ -1,40 +1,40 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr, $3:i8): - $4 = 0 :i8 - br Block_3($4, $3, $1, $2) :void + $4 = 0 :i8 + br Block_3($4, $3, $1, $2) :void Block_3($4:i8, $3:i8, $1:ptr, $2:ptr): - $5 = $4 < $3 :bool - if $5 ? Block_1($3, $4, $1, $2) : Block_2() :void + $5 = $4 < $3 :bool + if $5 ? Block_1($3, $4, $1, $2) : Block_2() :void Block_1($3:i8, $4:i8, $1:ptr, $2:ptr): - $7 = $4 cast_to i32 :i32 - $11 = 1 :ui64 - $12 = $7 cast_to ui64 :ui64 - $13 = $12 * $11 :ui64 - $14 = $1 + $13 :ptr - $17 = load($14) :i8 - $18 = $4 cast_to i32 :i32 - $22 = 1 :ui64 - $23 = $18 cast_to ui64 :ui64 - $24 = $23 * $22 :ui64 - $25 = $2 + $24 :ptr - $28 = load($25) :i8 - $29 = $17 + $28 :i8 - $30 = $4 cast_to i32 :i32 - $34 = 1 :ui64 - $35 = $30 cast_to ui64 :ui64 - $36 = $35 * $34 :ui64 - $37 = $1 + $36 :ptr - store($29, $37) :void - $40 = 1 :i32 - $41 = $4 cast_to i32 :i32 - $42 = $41 + $40 :i32 - $43 = $42 cast_to i8 :i8 - br Block_3($43, $3, $1, $2) :void + $7 = $4 cast_to i32 :i32 + $11 = 1 :ui64 + $12 = $7 cast_to ui64 :ui64 + $13 = $12 * $11 :ui64 + $14 = $1 + $13 :ptr + $17 = load($14) :i8 + $18 = $4 cast_to i32 :i32 + $22 = 1 :ui64 + $23 = $18 cast_to ui64 :ui64 + $24 = $23 * $22 :ui64 + $25 = $2 + $24 :ptr + $28 = load($25) :i8 + $29 = $17 + $28 :i8 + $30 = $4 cast_to i32 :i32 + $34 = 1 :ui64 + $35 = $30 cast_to ui64 :ui64 + $36 = $35 * $34 :ui64 + $37 = $1 + $36 :ptr + store($29, $37) :void + $40 = 1 :i32 + $41 = $4 cast_to i32 :i32 + $42 = $41 + $40 :i32 + $43 = $42 cast_to i8 :i8 + br Block_3($43, $3, $1, $2) :void Block_2(): - return :void + return :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/callMemcpy.trace b/nautilus/test/data/pointer-tests/ir/callMemcpy.trace index 15a5497d..ab0bff81 100644 --- a/nautilus/test/data/pointer-tests/ir/callMemcpy.trace +++ b/nautilus/test/data/pointer-tests/ir/callMemcpy.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $3 = 0 :ui64 - $4 = nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2, $1, $3) :ptr - return :void + $3 = 0 :ui64 + $4 = nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2,$1,$3) :ptr + return :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace index f279df57..81c1983a 100644 --- a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace +++ b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $2 = nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 - return ($2) :i32 + $2 = nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/castPtrAndGetValue_i8.trace b/nautilus/test/data/pointer-tests/ir/castPtrAndGetValue_i8.trace index 8544b490..8b506194 100644 --- a/nautilus/test/data/pointer-tests/ir/castPtrAndGetValue_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/castPtrAndGetValue_i8.trace @@ -1,12 +1,12 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $2 = 0 :i32 - $6 = 2 :ui64 - $7 = $2 cast_to ui64 :ui64 - $8 = $7 * $6 :ui64 - $9 = $1 + $8 :ptr - $12 = load($9) :i16 - return ($12) :i16 + $2 = 0 :i32 + $6 = 2 :ui64 + $7 = $2 cast_to ui64 :ui64 + $8 = $7 * $6 :ui64 + $9 = $1 + $8 :ptr + $12 = load($9) :i16 + return ($12) :i16 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/castVoidPtr.trace b/nautilus/test/data/pointer-tests/ir/castVoidPtr.trace index b6649494..625f7ee4 100644 --- a/nautilus/test/data/pointer-tests/ir/castVoidPtr.trace +++ b/nautilus/test/data/pointer-tests/ir/castVoidPtr.trace @@ -1,12 +1,12 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $2 = 0 :i32 - $6 = 4 :ui64 - $7 = $2 cast_to ui64 :ui64 - $8 = $7 * $6 :ui64 - $9 = $1 + $8 :ptr - $12 = load($9) :i32 - return ($12) :i32 + $2 = 0 :i32 + $6 = 4 :ui64 + $7 = $2 cast_to ui64 :ui64 + $8 = $7 * $6 :ui64 + $9 = $1 + $8 :ptr + $12 = load($9) :i32 + return ($12) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/customPointerAdd.trace b/nautilus/test/data/pointer-tests/ir/customPointerAdd.trace index 1e15c87f..c7d5a8d5 100644 --- a/nautilus/test/data/pointer-tests/ir/customPointerAdd.trace +++ b/nautilus/test/data/pointer-tests/ir/customPointerAdd.trace @@ -1,10 +1,10 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:i32): - $6 = 12 :ui64 - $7 = $2 cast_to ui64 :ui64 - $8 = $7 * $6 :ui64 - $9 = $1 + $8 :ptr - return ($9) :ptr + $6 = 12 :ui64 + $7 = $2 cast_to ui64 :ui64 + $8 = $7 * $6 :ui64 + $9 = $1 + $8 :ptr + return ($9) :ptr } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/isNullptr_i8.trace b/nautilus/test/data/pointer-tests/ir/isNullptr_i8.trace index 182afae2..4bd9cba9 100644 --- a/nautilus/test/data/pointer-tests/ir/isNullptr_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/isNullptr_i8.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $3 = ptr :ptr - $6 = $1 == $3 :bool - return ($6) :bool + $3 = * :ptr + $6 = $1 == $3 :bool + return ($6) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/load.trace b/nautilus/test/data/pointer-tests/ir/load.trace index e21a4acf..4fca3cd9 100644 --- a/nautilus/test/data/pointer-tests/ir/load.trace +++ b/nautilus/test/data/pointer-tests/ir/load.trace @@ -1,11 +1,11 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:i32): - $7 = 4 :ui64 - $8 = $2 cast_to ui64 :ui64 - $9 = $8 * $7 :ui64 - $10 = $1 + $9 :ptr - $13 = load($10) :i32 - return ($13) :i32 + $7 = 4 :ui64 + $8 = $2 cast_to ui64 :ui64 + $9 = $8 * $7 :ui64 + $10 = $1 + $9 :ptr + $13 = load($10) :i32 + return ($13) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/loadConst.trace b/nautilus/test/data/pointer-tests/ir/loadConst.trace index eebd882f..4f05446f 100644 --- a/nautilus/test/data/pointer-tests/ir/loadConst.trace +++ b/nautilus/test/data/pointer-tests/ir/loadConst.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = ptr :ptr - $4 = load($1) :i32 - return ($4) :i32 + $1 = * :ptr + $4 = load($1) :i32 + return ($4) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/passCustomClass.trace b/nautilus/test/data/pointer-tests/ir/passCustomClass.trace index f00d4417..a2cb7a15 100644 --- a/nautilus/test/data/pointer-tests/ir/passCustomClass.trace +++ b/nautilus/test/data/pointer-tests/ir/passCustomClass.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $2 = nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 - return ($2) :i32 + $2 = nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/pointerAdd.trace b/nautilus/test/data/pointer-tests/ir/pointerAdd.trace index 52ee4aa4..5a091693 100644 --- a/nautilus/test/data/pointer-tests/ir/pointerAdd.trace +++ b/nautilus/test/data/pointer-tests/ir/pointerAdd.trace @@ -1,11 +1,11 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:i32): - $6 = 4 :ui64 - $7 = $2 cast_to ui64 :ui64 - $8 = $7 * $6 :ui64 - $9 = $1 + $8 :ptr - $12 = load($9) :i32 - return ($12) :i32 + $6 = 4 :ui64 + $7 = $2 cast_to ui64 :ui64 + $8 = $7 * $6 :ui64 + $9 = $1 + $8 :ptr + $12 = load($9) :i32 + return ($12) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/pointerAddConst.trace b/nautilus/test/data/pointer-tests/ir/pointerAddConst.trace index d2e907c8..56799b3f 100644 --- a/nautilus/test/data/pointer-tests/ir/pointerAddConst.trace +++ b/nautilus/test/data/pointer-tests/ir/pointerAddConst.trace @@ -1,11 +1,11 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $3 = 2 :ui64 - $5 = 4 :ui64 - $6 = $3 * $5 :ui64 - $7 = $1 + $6 :ptr - $10 = load($7) :i32 - return ($10) :i32 + $3 = 2 :ui64 + $5 = 4 :ui64 + $6 = $3 * $5 :ui64 + $7 = $1 + $6 :ptr + $10 = load($7) :i32 + return ($10) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/pointerSub.trace b/nautilus/test/data/pointer-tests/ir/pointerSub.trace index 8139bfd1..7bd885fb 100644 --- a/nautilus/test/data/pointer-tests/ir/pointerSub.trace +++ b/nautilus/test/data/pointer-tests/ir/pointerSub.trace @@ -1,13 +1,13 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:i32): - $4 = 0 :i32 - $5 = $4 - $2 :i32 - $7 = 4 :ui64 - $8 = $5 cast_to ui64 :ui64 - $9 = $8 * $7 :ui64 - $10 = $1 + $9 :ptr - $13 = load($10) :i32 - return ($13) :i32 + $4 = 0 :i32 + $5 = $4 - $2 :i32 + $7 = 4 :ui64 + $8 = $5 cast_to ui64 :ui64 + $9 = $8 * $7 :ui64 + $10 = $1 + $9 :ptr + $13 = load($10) :i32 + return ($13) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/pointerSubConst.trace b/nautilus/test/data/pointer-tests/ir/pointerSubConst.trace index c8a032ec..e5447781 100644 --- a/nautilus/test/data/pointer-tests/ir/pointerSubConst.trace +++ b/nautilus/test/data/pointer-tests/ir/pointerSubConst.trace @@ -1,11 +1,11 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $3 = -2 :ui64 - $5 = 4 :ui64 - $6 = $3 * $5 :ui64 - $7 = $1 + $6 :ptr - $10 = load($7) :i32 - return ($10) :i32 + $3 = -2 :ui64 + $5 = 4 :ui64 + $6 = $3 * $5 :ui64 + $7 = $1 + $6 :ptr + $10 = load($7) :i32 + return ($10) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrAssignment.trace b/nautilus/test/data/pointer-tests/ir/ptrAssignment.trace index 15b6cd82..d7e2c5e3 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrAssignment.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrAssignment.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $6 = load($2) :i32 - $9 = load($1) :i32 - $10 = $6 + $9 :i32 - return ($10) :i32 + $6 = load($2) :i32 + $9 = load($1) :i32 + $10 = $6 + $9 :i32 + return ($10) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrEquals_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrEquals_i8.trace index 0e904559..3052c474 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrEquals_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 == $2 :bool - return ($5) :bool + $5 = $1 == $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrGreaterThanEquals_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrGreaterThanEquals_i8.trace index 3dbdbaf2..174d57bb 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrGreaterThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrGreaterThanEquals_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 >= $2 :bool - return ($5) :bool + $5 = $1 >= $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrGreaterThan_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrGreaterThan_i8.trace index df7d9d2d..c218c6f3 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrGreaterThan_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrGreaterThan_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 > $2 :bool - return ($5) :bool + $5 = $1 > $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrLessThanEquals_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrLessThanEquals_i8.trace index c45d598b..3ed8aef3 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrLessThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrLessThanEquals_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 <= $2 :bool - return ($5) :bool + $5 = $1 <= $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrLessThan_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrLessThan_i8.trace index e5da1733..1889ef40 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrLessThan_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrLessThan_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 < $2 :bool - return ($5) :bool + $5 = $1 < $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/ptrNotEquals_i8.trace b/nautilus/test/data/pointer-tests/ir/ptrNotEquals_i8.trace index 4bc17cc7..2dac70b5 100644 --- a/nautilus/test/data/pointer-tests/ir/ptrNotEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/ir/ptrNotEquals_i8.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $5 = $1 != $2 :bool - return ($5) :bool + $5 = $1 $2 :bool + return ($5) :bool } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/specializeType.trace b/nautilus/test/data/pointer-tests/ir/specializeType.trace index ff74a199..f82a26bd 100644 --- a/nautilus/test/data/pointer-tests/ir/specializeType.trace +++ b/nautilus/test/data/pointer-tests/ir/specializeType.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr): - $2 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - return ($2) :i32 + $2 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/sumArray.trace b/nautilus/test/data/pointer-tests/ir/sumArray.trace index 181032c8..ea2810e7 100644 --- a/nautilus/test/data/pointer-tests/ir/sumArray.trace +++ b/nautilus/test/data/pointer-tests/ir/sumArray.trace @@ -1,26 +1,26 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:i32): - $3 = 0 :i32 - $4 = 0 :i32 - br Block_3($3, $4, $2, $1) :void + $3 = 0 :i32 + $4 = 0 :i32 + br Block_3($3, $4, $2, $1) :void Block_3($3:i32, $4:i32, $2:i32, $1:ptr): - $5 = $4 < $2 :bool - if $5 ? Block_1($2, $4, $3, $1) : Block_2($3) :void + $5 = $4 < $2 :bool + if $5 ? Block_1($2, $4, $3, $1) : Block_2($3) :void Block_1($2:i32, $4:i32, $3:i32, $1:ptr): - $11 = 4 :ui64 - $12 = $4 cast_to ui64 :ui64 - $13 = $12 * $11 :ui64 - $14 = $1 + $13 :ptr - $17 = load($14) :i32 - $18 = $3 + $17 :i32 - $19 = 1 :i32 - $20 = $4 + $19 :i32 - br Block_3($18, $20, $2, $1) :void + $11 = 4 :ui64 + $12 = $4 cast_to ui64 :ui64 + $13 = $12 * $11 :ui64 + $14 = $1 + $13 :ptr + $17 = load($14) :i32 + $18 = $3 + $17 :i32 + $19 = 1 :i32 + $20 = $4 + $19 :i32 + br Block_3($18, $20, $2, $1) :void Block_2($3:i32): - return ($3) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/ir/useWrapper.trace b/nautilus/test/data/pointer-tests/ir/useWrapper.trace index d15e623e..7e510680 100644 --- a/nautilus/test/data/pointer-tests/ir/useWrapper.trace +++ b/nautilus/test/data/pointer-tests/ir/useWrapper.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:ptr, $2:ptr): - $3 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - $4 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 - $5 = $3 + $4 :i32 - return ($5) :i32 + $3 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + $4 = nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 + $5 = $3 + $4 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace b/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace index 728f0b0d..17031406 100644 Binary files a/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace and b/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace differ diff --git a/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace b/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace index 64bd7705..58ff292e 100644 --- a/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace +++ b/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace @@ -1,4 +1,4 @@ B0($1:ptr,$2:ptr) - CONST $3 0 :ui64 - CALL $4 nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2,$1,$3) :ptr - RETURN $0 :void + CONST $3 0 :ui64 + CALL $4 nautilus::memcpy(nautilus::val, nautilus::val, nautilus::val)::$_0::__invoke(void*, void const*, unsigned long)($2,$1,$3) :ptr + RETURN $0 :void diff --git a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace index 3751e043..ed4f0666 100644 --- a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace +++ b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::castCustomClass(nautilus::val)::$_1::__invoke(nautilus::CustomClass*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/castPtrAndGetValue_i8.trace b/nautilus/test/data/pointer-tests/tracing/castPtrAndGetValue_i8.trace index 019f2aac..cdd1d3d4 100644 --- a/nautilus/test/data/pointer-tests/tracing/castPtrAndGetValue_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/castPtrAndGetValue_i8.trace @@ -1,13 +1,13 @@ B0($1:ptr) - CONST $2 0 :i32 - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :i32 - ASSIGN $5 $4 :i32 - CONST $6 2 :ui64 - CAST $7 $5 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $3 $8 :ptr - ASSIGN $10 $9 :ptr - ASSIGN $11 $10 :ptr - LOAD $12 $11 :i16 - RETURN $12 :i16 + CONST $2 0 :i32 + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :i32 + ASSIGN $5 $4 :i32 + CONST $6 2 :ui64 + CAST $7 $5 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $3 $8 :ptr + ASSIGN $10 $9 :ptr + ASSIGN $11 $10 :ptr + LOAD $12 $11 :i16 + RETURN $12 :i16 diff --git a/nautilus/test/data/pointer-tests/tracing/castVoidPtr.trace b/nautilus/test/data/pointer-tests/tracing/castVoidPtr.trace index f45c4eed..0325d3bd 100644 --- a/nautilus/test/data/pointer-tests/tracing/castVoidPtr.trace +++ b/nautilus/test/data/pointer-tests/tracing/castVoidPtr.trace @@ -1,13 +1,13 @@ B0($1:ptr) - CONST $2 0 :i32 - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :i32 - ASSIGN $5 $4 :i32 - CONST $6 4 :ui64 - CAST $7 $5 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $3 $8 :ptr - ASSIGN $10 $9 :ptr - ASSIGN $11 $10 :ptr - LOAD $12 $11 :i32 - RETURN $12 :i32 + CONST $2 0 :i32 + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :i32 + ASSIGN $5 $4 :i32 + CONST $6 4 :ui64 + CAST $7 $5 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $3 $8 :ptr + ASSIGN $10 $9 :ptr + ASSIGN $11 $10 :ptr + LOAD $12 $11 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/customPointerAdd.trace b/nautilus/test/data/pointer-tests/tracing/customPointerAdd.trace index a9564e56..cf396139 100644 --- a/nautilus/test/data/pointer-tests/tracing/customPointerAdd.trace +++ b/nautilus/test/data/pointer-tests/tracing/customPointerAdd.trace @@ -1,9 +1,9 @@ B0($1:ptr,$2:i32) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :i32 - ASSIGN $5 $4 :i32 - CONST $6 12 :ui64 - CAST $7 $5 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $3 $8 :ptr - RETURN $9 :ptr + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :i32 + ASSIGN $5 $4 :i32 + CONST $6 12 :ui64 + CAST $7 $5 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $3 $8 :ptr + RETURN $9 :ptr diff --git a/nautilus/test/data/pointer-tests/tracing/isNullptr_i8.trace b/nautilus/test/data/pointer-tests/tracing/isNullptr_i8.trace index 90a90b26..0f55be78 100644 --- a/nautilus/test/data/pointer-tests/tracing/isNullptr_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/isNullptr_i8.trace @@ -1,7 +1,7 @@ B0($1:ptr) - ASSIGN $2 $1 :ptr - CONST $3 * :ptr - ASSIGN $4 $2 :ptr - ASSIGN $5 $3 :ptr - EQ $6 $4 $5 :bool - RETURN $6 :bool + ASSIGN $2 $1 :ptr + CONST $3 * :ptr + ASSIGN $4 $2 :ptr + ASSIGN $5 $3 :ptr + EQ $6 $4 $5 :bool + RETURN $6 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/load.trace b/nautilus/test/data/pointer-tests/tracing/load.trace index 11a55c45..c42576c2 100644 --- a/nautilus/test/data/pointer-tests/tracing/load.trace +++ b/nautilus/test/data/pointer-tests/tracing/load.trace @@ -1,13 +1,13 @@ B0($1:ptr,$2:i32) - ASSIGN $3 $2 :i32 - ASSIGN $4 $1 :ptr - ASSIGN $5 $3 :i32 - ASSIGN $6 $5 :i32 - CONST $7 4 :ui64 - CAST $8 $6 :ui64 - MUL $9 $8 $7 :ui64 - ADD $10 $4 $9 :ptr - ASSIGN $11 $10 :ptr - ASSIGN $12 $11 :ptr - LOAD $13 $12 :i32 - RETURN $13 :i32 + ASSIGN $3 $2 :i32 + ASSIGN $4 $1 :ptr + ASSIGN $5 $3 :i32 + ASSIGN $6 $5 :i32 + CONST $7 4 :ui64 + CAST $8 $6 :ui64 + MUL $9 $8 $7 :ui64 + ADD $10 $4 $9 :ptr + ASSIGN $11 $10 :ptr + ASSIGN $12 $11 :ptr + LOAD $13 $12 :i32 + RETURN $13 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/loadConst.trace b/nautilus/test/data/pointer-tests/tracing/loadConst.trace index ef5f07a6..918c2678 100644 --- a/nautilus/test/data/pointer-tests/tracing/loadConst.trace +++ b/nautilus/test/data/pointer-tests/tracing/loadConst.trace @@ -1,6 +1,6 @@ B0() - CONST $1 * :ptr - ASSIGN $2 $1 :ptr - ASSIGN $3 $2 :ptr - LOAD $4 $3 :i32 - RETURN $4 :i32 + CONST $1 * :ptr + ASSIGN $2 $1 :ptr + ASSIGN $3 $2 :ptr + LOAD $4 $3 :i32 + RETURN $4 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace index bc0f39cf..23b339e6 100644 --- a/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace +++ b/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::passCustomClass(nautilus::val)::$_0::__invoke(nautilus::CustomClass*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/pointerAdd.trace b/nautilus/test/data/pointer-tests/tracing/pointerAdd.trace index 642d383c..656db759 100644 --- a/nautilus/test/data/pointer-tests/tracing/pointerAdd.trace +++ b/nautilus/test/data/pointer-tests/tracing/pointerAdd.trace @@ -1,12 +1,12 @@ B0($1:ptr,$2:i32) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :i32 - ASSIGN $5 $4 :i32 - CONST $6 4 :ui64 - CAST $7 $5 :ui64 - MUL $8 $7 $6 :ui64 - ADD $9 $3 $8 :ptr - ASSIGN $10 $9 :ptr - ASSIGN $11 $10 :ptr - LOAD $12 $11 :i32 - RETURN $12 :i32 + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :i32 + ASSIGN $5 $4 :i32 + CONST $6 4 :ui64 + CAST $7 $5 :ui64 + MUL $8 $7 $6 :ui64 + ADD $9 $3 $8 :ptr + ASSIGN $10 $9 :ptr + ASSIGN $11 $10 :ptr + LOAD $12 $11 :i32 + RETURN $12 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/pointerAddConst.trace b/nautilus/test/data/pointer-tests/tracing/pointerAddConst.trace index cce94bb7..78254676 100644 --- a/nautilus/test/data/pointer-tests/tracing/pointerAddConst.trace +++ b/nautilus/test/data/pointer-tests/tracing/pointerAddConst.trace @@ -1,11 +1,11 @@ B0($1:ptr) - ASSIGN $2 $1 :ptr - CONST $3 2 :ui64 - ASSIGN $4 $3 :ui64 - CONST $5 4 :ui64 - MUL $6 $4 $5 :ui64 - ADD $7 $2 $6 :ptr - ASSIGN $8 $7 :ptr - ASSIGN $9 $8 :ptr - LOAD $10 $9 :i32 - RETURN $10 :i32 + ASSIGN $2 $1 :ptr + CONST $3 2 :ui64 + ASSIGN $4 $3 :ui64 + CONST $5 4 :ui64 + MUL $6 $4 $5 :ui64 + ADD $7 $2 $6 :ptr + ASSIGN $8 $7 :ptr + ASSIGN $9 $8 :ptr + LOAD $10 $9 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/pointerSub.trace b/nautilus/test/data/pointer-tests/tracing/pointerSub.trace index b5d5e4f3..1b4e4a08 100644 --- a/nautilus/test/data/pointer-tests/tracing/pointerSub.trace +++ b/nautilus/test/data/pointer-tests/tracing/pointerSub.trace @@ -1,13 +1,13 @@ B0($1:ptr,$2:i32) - ASSIGN $3 $1 :ptr - CONST $4 0 :i32 - SUB $5 $4 $2 :i32 - ASSIGN $6 $5 :i32 - CONST $7 4 :ui64 - CAST $8 $6 :ui64 - MUL $9 $8 $7 :ui64 - ADD $10 $3 $9 :ptr - ASSIGN $11 $10 :ptr - ASSIGN $12 $11 :ptr - LOAD $13 $12 :i32 - RETURN $13 :i32 + ASSIGN $3 $1 :ptr + CONST $4 0 :i32 + SUB $5 $4 $2 :i32 + ASSIGN $6 $5 :i32 + CONST $7 4 :ui64 + CAST $8 $6 :ui64 + MUL $9 $8 $7 :ui64 + ADD $10 $3 $9 :ptr + ASSIGN $11 $10 :ptr + ASSIGN $12 $11 :ptr + LOAD $13 $12 :i32 + RETURN $13 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/pointerSubConst.trace b/nautilus/test/data/pointer-tests/tracing/pointerSubConst.trace index 704aa4a3..d7738352 100644 --- a/nautilus/test/data/pointer-tests/tracing/pointerSubConst.trace +++ b/nautilus/test/data/pointer-tests/tracing/pointerSubConst.trace @@ -1,11 +1,11 @@ B0($1:ptr) - ASSIGN $2 $1 :ptr - CONST $3 18446744073709551614 :ui64 - ASSIGN $4 $3 :ui64 - CONST $5 4 :ui64 - MUL $6 $4 $5 :ui64 - ADD $7 $2 $6 :ptr - ASSIGN $8 $7 :ptr - ASSIGN $9 $8 :ptr - LOAD $10 $9 :i32 - RETURN $10 :i32 + ASSIGN $2 $1 :ptr + CONST $3 18446744073709551614 :ui64 + ASSIGN $4 $3 :ui64 + CONST $5 4 :ui64 + MUL $6 $4 $5 :ui64 + ADD $7 $2 $6 :ptr + ASSIGN $8 $7 :ptr + ASSIGN $9 $8 :ptr + LOAD $10 $9 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/ptrAssignment.trace b/nautilus/test/data/pointer-tests/tracing/ptrAssignment.trace index 3caf163f..f5d8dabc 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrAssignment.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrAssignment.trace @@ -1,11 +1,11 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $1 $2 :ptr - ASSIGN $4 $1 :ptr - ASSIGN $5 $4 :ptr - LOAD $6 $5 :i32 - ASSIGN $7 $3 :ptr - ASSIGN $8 $7 :ptr - LOAD $9 $8 :i32 - ADD $10 $6 $9 :i32 - RETURN $10 :i32 + ASSIGN $3 $1 :ptr + ASSIGN $1 $2 :ptr + ASSIGN $4 $1 :ptr + ASSIGN $5 $4 :ptr + LOAD $6 $5 :i32 + ASSIGN $7 $3 :ptr + ASSIGN $8 $7 :ptr + LOAD $9 $8 :i32 + ADD $10 $6 $9 :i32 + RETURN $10 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/ptrEquals_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrEquals_i8.trace index de83c802..c16f3b67 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrEquals_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - EQ $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + EQ $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/ptrGreaterThanEquals_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrGreaterThanEquals_i8.trace index 08d2b6a2..dda66429 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrGreaterThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrGreaterThanEquals_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - GTE $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + GTE $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/ptrGreaterThan_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrGreaterThan_i8.trace index 35314be3..dc23a7a1 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrGreaterThan_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrGreaterThan_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - GT $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + GT $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/ptrLessThanEquals_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrLessThanEquals_i8.trace index 73afedac..dda57765 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrLessThanEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrLessThanEquals_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - LTE $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + LTE $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/ptrLessThan_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrLessThan_i8.trace index 599bc9d7..4d3490f5 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrLessThan_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrLessThan_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - LT $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + LT $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/ptrNotEquals_i8.trace b/nautilus/test/data/pointer-tests/tracing/ptrNotEquals_i8.trace index ce3c20cb..6f7a0db0 100644 --- a/nautilus/test/data/pointer-tests/tracing/ptrNotEquals_i8.trace +++ b/nautilus/test/data/pointer-tests/tracing/ptrNotEquals_i8.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - ASSIGN $3 $1 :ptr - ASSIGN $4 $2 :ptr - NEQ $5 $3 $4 :bool - RETURN $5 :bool + ASSIGN $3 $1 :ptr + ASSIGN $4 $2 :ptr + NEQ $5 $3 $4 :bool + RETURN $5 :bool diff --git a/nautilus/test/data/pointer-tests/tracing/specializeType.trace b/nautilus/test/data/pointer-tests/tracing/specializeType.trace index f9f9c9da..37680284 100644 --- a/nautilus/test/data/pointer-tests/tracing/specializeType.trace +++ b/nautilus/test/data/pointer-tests/tracing/specializeType.trace @@ -1,3 +1,3 @@ B0($1:ptr) - CALL $2 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/pointer-tests/tracing/sumArray.trace b/nautilus/test/data/pointer-tests/tracing/sumArray.trace index ddbfdab5..0ab53b01 100644 --- a/nautilus/test/data/pointer-tests/tracing/sumArray.trace +++ b/nautilus/test/data/pointer-tests/tracing/sumArray.trace @@ -1,27 +1,27 @@ B0($1:ptr,$2:i32) - CONST $3 0 :i32 - CONST $4 0 :i32 - JMP $0 B3() :void + CONST $3 0 :i32 + CONST $4 0 :i32 + JMP $0 B3() :void B1() - ASSIGN $7 $4 :i32 - ASSIGN $8 $1 :ptr - ASSIGN $9 $7 :i32 - ASSIGN $10 $9 :i32 - CONST $11 4 :ui64 - CAST $12 $10 :ui64 - MUL $13 $12 $11 :ui64 - ADD $14 $8 $13 :ptr - ASSIGN $15 $14 :ptr - ASSIGN $16 $15 :ptr - LOAD $17 $16 :i32 - ADD $18 $3 $17 :i32 - ASSIGN $3 $18 :i32 - CONST $19 1 :i32 - ADD $20 $4 $19 :i32 - ASSIGN $4 $20 :i32 - JMP $0 B3() :void + ASSIGN $7 $4 :i32 + ASSIGN $8 $1 :ptr + ASSIGN $9 $7 :i32 + ASSIGN $10 $9 :i32 + CONST $11 4 :ui64 + CAST $12 $10 :ui64 + MUL $13 $12 $11 :ui64 + ADD $14 $8 $13 :ptr + ASSIGN $15 $14 :ptr + ASSIGN $16 $15 :ptr + LOAD $17 $16 :i32 + ADD $18 $3 $17 :i32 + ASSIGN $3 $18 :i32 + CONST $19 1 :i32 + ADD $20 $4 $19 :i32 + ASSIGN $4 $20 :i32 + JMP $0 B3() :void B2() - RETURN $3 :i32 + RETURN $3 :i32 B3() ControlFlowMerge - LT $5 $4 $2 :bool - CMP $6 $5 B1() B2() :void + LT $5 $4 $2 :bool + CMP $6 $5 B1() B2() :void diff --git a/nautilus/test/data/pointer-tests/tracing/useWrapper.trace b/nautilus/test/data/pointer-tests/tracing/useWrapper.trace index 10335225..c3652e46 100644 --- a/nautilus/test/data/pointer-tests/tracing/useWrapper.trace +++ b/nautilus/test/data/pointer-tests/tracing/useWrapper.trace @@ -1,5 +1,5 @@ B0($1:ptr,$2:ptr) - CALL $3 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 - CALL $4 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 - ADD $5 $3 $4 :i32 - RETURN $5 :i32 + CALL $3 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($1) :i32 + CALL $4 nautilus::val::getX()::'lambda'(nautilus::CustomStruct2*)::__invoke(nautilus::CustomStruct2*)($2) :i32 + ADD $5 $3 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace index 080ec95c..93298929 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace @@ -1,4 +1,4 @@ B0($1:i32) - CALL $2 nautilus::engine::add(int, int)($1,$1) :i32 - CALL $3 nautilus::engine::add(int, int)($2,$2) :i32 - RETURN $3 :i32 + CALL $2 nautilus::engine::add(int, int)($1,$1) :i32 + CALL $3 nautilus::engine::add(int, int)($2,$2) :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace index 60648198..6375fc86 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace @@ -1,5 +1,5 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 - CALL $4 nautilus::engine::sub(int, int)($1,$2) :i32 - ADD $5 $3 $4 :i32 - RETURN $5 :i32 + CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 + CALL $4 nautilus::engine::sub(int, int)($1,$2) :i32 + ADD $5 $3 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace index c20d42fc..761efef8 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace @@ -1,3 +1,3 @@ B0($1:i32) - CALL $2 nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace index bf9f7585..86ff7f43 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace @@ -1,14 +1,14 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - CONST $4 0 :i32 - JMP $0 B3($3,$4,$1,$2) :void + CONST $3 0 :i32 + CONST $4 0 :i32 + JMP $0 B3($3,$4,$1,$2) :void B1($1:i32,$4:i32,$3:i32,$2:i32) - CALL $7 nautilus::engine::add(int, int)($3,$2) :i32 - CONST $8 1 :i32 - ADD $9 $4 $8 :i32 - JMP $0 B3($7,$9,$1,$2) :void + CALL $7 nautilus::engine::add(int, int)($3,$2) :i32 + CONST $8 1 :i32 + ADD $9 $4 $8 :i32 + JMP $0 B3($7,$9,$1,$2) :void B2($3:i32) - RETURN $3 :i32 + RETURN $3 :i32 B3($3:i32,$4:i32,$1:i32,$2:i32) ControlFlowMerge - LT $5 $4 $1 :bool - CMP $6 $5 B1($1,$4,$3,$2) B2($3) :void + LT $5 $4 $1 :bool + CMP $6 $5 B1($1,$4,$3,$2) B2($3) :void diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace index 14e2552e..747ab3c9 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace @@ -1,4 +1,4 @@ B0($1:i32) - CALL $2 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 - CALL $3 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 - RETURN $3 :i32 + CALL $2 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 + CALL $3 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace index 074fefdf..21a4e635 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 - RETURN $3 :i32 + CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/useFirstArg.trace b/nautilus/test/data/runtime-call-tests/after_ssa/useFirstArg.trace index 006fea00..7e63305d 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/useFirstArg.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/useFirstArg.trace @@ -1,2 +1,2 @@ B0($1:i32,$2:i32) - RETURN $1 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/useNoArg.trace b/nautilus/test/data/runtime-call-tests/after_ssa/useNoArg.trace index 2b2d6c19..174daabd 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/useNoArg.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/useNoArg.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - RETURN $3 :i32 + CONST $3 42 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/useSecondArg.trace b/nautilus/test/data/runtime-call-tests/after_ssa/useSecondArg.trace index 0c0d39fd..c7654ec0 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/useSecondArg.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/useSecondArg.trace @@ -1,2 +1,2 @@ B0($1:i32,$2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace index c2821a26..ccc1cb59 100644 --- a/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace +++ b/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::voidFunc(int, int)($1,$2) :void - RETURN $1 :i32 + CALL $3 nautilus::engine::voidFunc(int, int)($1,$2) :void + RETURN $1 :i32 diff --git a/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace index 0588b887..a920a430 100644 --- a/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace +++ b/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = nautilus::engine::add(int, int)($1, $1) :i32 - $3 = nautilus::engine::add(int, int)($2, $2) :i32 - return ($3) :i32 + $2 = nautilus::engine::add(int, int)($1,$1) :i32 + $3 = nautilus::engine::add(int, int)($2,$2) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace index 3e5abd05..e0488501 100644 --- a/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace +++ b/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace @@ -1,9 +1,9 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = nautilus::engine::add(int, int)($1, $2) :i32 - $4 = nautilus::engine::sub(int, int)($1, $2) :i32 - $5 = $3 + $4 :i32 - return ($5) :i32 + $3 = nautilus::engine::add(int, int)($1,$2) :i32 + $4 = nautilus::engine::sub(int, int)($1,$2) :i32 + $5 = $3 + $4 :i32 + return ($5) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace index f6eed2af..f17052b7 100644 --- a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 - return ($2) :i32 + $2 = nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace index b6e0e891..13620515 100644 --- a/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace @@ -1,21 +1,21 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 0 :i32 - $4 = 0 :i32 - br Block_3($3, $4, $1, $2) :void + $3 = 0 :i32 + $4 = 0 :i32 + br Block_3($3, $4, $1, $2) :void Block_3($3:i32, $4:i32, $1:i32, $2:i32): - $5 = $4 < $1 :bool - if $5 ? Block_1($1, $4, $3, $2) : Block_2($3) :void + $5 = $4 < $1 :bool + if $5 ? Block_1($1, $4, $3, $2) : Block_2($3) :void Block_1($1:i32, $4:i32, $3:i32, $2:i32): - $7 = nautilus::engine::add(int, int)($3, $2) :i32 - $8 = 1 :i32 - $9 = $4 + $8 :i32 - br Block_3($7, $9, $1, $2) :void + $7 = nautilus::engine::add(int, int)($3,$2) :i32 + $8 = 1 :i32 + $9 = $4 + $8 :i32 + br Block_3($7, $9, $1, $2) :void Block_2($3:i32): - return ($3) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace index 9a899b47..54d6516c 100644 --- a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace @@ -1,8 +1,8 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 - $3 = nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 - return ($3) :i32 + $2 = nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 + $3 = nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace index 3dfc00be..d492b4da 100644 --- a/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = nautilus::engine::add(int, int)($1, $2) :i32 - return ($3) :i32 + $3 = nautilus::engine::add(int, int)($1,$2) :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/useFirstArg.trace b/nautilus/test/data/runtime-call-tests/ir/useFirstArg.trace index fcab09be..c57afecc 100644 --- a/nautilus/test/data/runtime-call-tests/ir/useFirstArg.trace +++ b/nautilus/test/data/runtime-call-tests/ir/useFirstArg.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - return ($1) :i32 + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/useNoArg.trace b/nautilus/test/data/runtime-call-tests/ir/useNoArg.trace index a8561af4..042903ac 100644 --- a/nautilus/test/data/runtime-call-tests/ir/useNoArg.trace +++ b/nautilus/test/data/runtime-call-tests/ir/useNoArg.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = 42 :i32 - return ($3) :i32 + $3 = 42 :i32 + return ($3) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/useSecondArg.trace b/nautilus/test/data/runtime-call-tests/ir/useSecondArg.trace index a32c4959..349a18ad 100644 --- a/nautilus/test/data/runtime-call-tests/ir/useSecondArg.trace +++ b/nautilus/test/data/runtime-call-tests/ir/useSecondArg.trace @@ -1,6 +1,6 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - return ($2) :i32 + return ($2) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace index c46bf4e8..002b6aa4 100644 --- a/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace +++ b/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace @@ -1,7 +1,7 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32, $2:i32): - $3 = nautilus::engine::voidFunc(int, int)($1, $2) :void - return ($1) :i32 + nautilus::engine::voidFunc(int, int)($1,$2) :void + return ($1) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace index 8a012f46..3030b034 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace @@ -1,6 +1,6 @@ B0($1:i32) - CALL $2 nautilus::engine::add(int, int)($1,$1) :i32 - ASSIGN $1 $2 :i32 - CALL $3 nautilus::engine::add(int, int)($1,$1) :i32 - ASSIGN $1 $3 :i32 - RETURN $1 :i32 + CALL $2 nautilus::engine::add(int, int)($1,$1) :i32 + ASSIGN $1 $2 :i32 + CALL $3 nautilus::engine::add(int, int)($1,$1) :i32 + ASSIGN $1 $3 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace index 60648198..6375fc86 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace @@ -1,5 +1,5 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 - CALL $4 nautilus::engine::sub(int, int)($1,$2) :i32 - ADD $5 $3 $4 :i32 - RETURN $5 :i32 + CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 + CALL $4 nautilus::engine::sub(int, int)($1,$2) :i32 + ADD $5 $3 $4 :i32 + RETURN $5 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace index c20d42fc..761efef8 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace @@ -1,3 +1,3 @@ B0($1:i32) - CALL $2 nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 - RETURN $2 :i32 + CALL $2 nautilus::engine::lambdaRuntimeFunction(nautilus::val)::$_2::__invoke(int)($1) :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace index 00109897..950c3948 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace @@ -1,16 +1,16 @@ B0($1:i32,$2:i32) - CONST $3 0 :i32 - CONST $4 0 :i32 - JMP $0 B3() :void + CONST $3 0 :i32 + CONST $4 0 :i32 + JMP $0 B3() :void B1() - CALL $7 nautilus::engine::add(int, int)($3,$2) :i32 - ASSIGN $3 $7 :i32 - CONST $8 1 :i32 - ADD $9 $4 $8 :i32 - ASSIGN $4 $9 :i32 - JMP $0 B3() :void + CALL $7 nautilus::engine::add(int, int)($3,$2) :i32 + ASSIGN $3 $7 :i32 + CONST $8 1 :i32 + ADD $9 $4 $8 :i32 + ASSIGN $4 $9 :i32 + JMP $0 B3() :void B2() - RETURN $3 :i32 + RETURN $3 :i32 B3() ControlFlowMerge - LT $5 $4 $1 :bool - CMP $6 $5 B1() B2() :void + LT $5 $4 $1 :bool + CMP $6 $5 B1() B2() :void diff --git a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace index 14e2552e..747ab3c9 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace @@ -1,4 +1,4 @@ B0($1:i32) - CALL $2 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 - CALL $3 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 - RETURN $3 :i32 + CALL $2 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_4::__invoke(int)($1) :i32 + CALL $3 nautilus::engine::nestedLambdaRuntimeFunction(nautilus::val)::$_3::__invoke(int)($2) :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace index 074fefdf..21a4e635 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 - RETURN $3 :i32 + CALL $3 nautilus::engine::add(int, int)($1,$2) :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/useFirstArg.trace b/nautilus/test/data/runtime-call-tests/tracing/useFirstArg.trace index 006fea00..7e63305d 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/useFirstArg.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/useFirstArg.trace @@ -1,2 +1,2 @@ B0($1:i32,$2:i32) - RETURN $1 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/useNoArg.trace b/nautilus/test/data/runtime-call-tests/tracing/useNoArg.trace index 2b2d6c19..174daabd 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/useNoArg.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/useNoArg.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CONST $3 42 :i32 - RETURN $3 :i32 + CONST $3 42 :i32 + RETURN $3 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/useSecondArg.trace b/nautilus/test/data/runtime-call-tests/tracing/useSecondArg.trace index 0c0d39fd..c7654ec0 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/useSecondArg.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/useSecondArg.trace @@ -1,2 +1,2 @@ B0($1:i32,$2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace index c2821a26..ccc1cb59 100644 --- a/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace +++ b/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace @@ -1,3 +1,3 @@ B0($1:i32,$2:i32) - CALL $3 nautilus::engine::voidFunc(int, int)($1,$2) :void - RETURN $1 :i32 + CALL $3 nautilus::engine::voidFunc(int, int)($1,$2) :void + RETURN $1 :i32 diff --git a/nautilus/test/data/static-loop-tests/after_ssa/staticConstIterator.trace b/nautilus/test/data/static-loop-tests/after_ssa/staticConstIterator.trace index c2752d41..97140ca0 100644 --- a/nautilus/test/data/static-loop-tests/after_ssa/staticConstIterator.trace +++ b/nautilus/test/data/static-loop-tests/after_ssa/staticConstIterator.trace @@ -1,57 +1,57 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1($1,$2) B2($1,$2) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1($1,$2) B2($1,$2) :void B1($1:i32,$2:i32) - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - CONST $8 2 :i32 - JMP $0 B11($1,$7,$8) :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + CONST $8 2 :i32 + JMP $0 B11($1,$7,$8) :void B2($1:i32,$2:i32) - CONST $29 2 :i32 - JMP $0 B11($1,$2,$29) :void + CONST $29 2 :i32 + JMP $0 B11($1,$2,$29) :void B3($1:i32,$2:i32) - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - CONST $13 3 :i32 - JMP $0 B12($1,$12,$13) :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + CONST $13 3 :i32 + JMP $0 B12($1,$12,$13) :void B4($1:i32,$2:i32) - CONST $31 3 :i32 - JMP $0 B12($1,$2,$31) :void + CONST $31 3 :i32 + JMP $0 B12($1,$2,$31) :void B5($1:i32,$2:i32) - CONST $16 1 :i32 - ADD $17 $2 $16 :i32 - CONST $18 4 :i32 - JMP $0 B13($1,$17,$18) :void + CONST $16 1 :i32 + ADD $17 $2 $16 :i32 + CONST $18 4 :i32 + JMP $0 B13($1,$17,$18) :void B6($1:i32,$2:i32) - CONST $33 4 :i32 - JMP $0 B13($1,$2,$33) :void + CONST $33 4 :i32 + JMP $0 B13($1,$2,$33) :void B7($1:i32,$2:i32) - CONST $21 1 :i32 - ADD $22 $2 $21 :i32 - CONST $23 5 :i32 - JMP $0 B14($22,$1,$23) :void + CONST $21 1 :i32 + ADD $22 $2 $21 :i32 + CONST $23 5 :i32 + JMP $0 B14($22,$1,$23) :void B8($2:i32,$1:i32) - CONST $35 5 :i32 - JMP $0 B14($2,$1,$35) :void + CONST $35 5 :i32 + JMP $0 B14($2,$1,$35) :void B9($2:i32) - CONST $26 1 :i32 - ADD $27 $2 $26 :i32 - JMP $0 B15($27) :void + CONST $26 1 :i32 + ADD $27 $2 $26 :i32 + JMP $0 B15($27) :void B10($2:i32) - JMP $0 B15($2) :void + JMP $0 B15($2) :void B11($1:i32,$2:i32,$8:i32) ControlFlowMerge - GT $9 $1 $8 :bool - CMP $10 $9 B3($1,$2) B4($1,$2) :void + GT $9 $1 $8 :bool + CMP $10 $9 B3($1,$2) B4($1,$2) :void B12($1:i32,$2:i32,$13:i32) ControlFlowMerge - GT $14 $1 $13 :bool - CMP $15 $14 B5($1,$2) B6($1,$2) :void + GT $14 $1 $13 :bool + CMP $15 $14 B5($1,$2) B6($1,$2) :void B13($1:i32,$2:i32,$18:i32) ControlFlowMerge - GT $19 $1 $18 :bool - CMP $20 $19 B7($1,$2) B8($2,$1) :void + GT $19 $1 $18 :bool + CMP $20 $19 B7($1,$2) B8($2,$1) :void B14($2:i32,$1:i32,$23:i32) ControlFlowMerge - GT $24 $1 $23 :bool - CMP $25 $24 B9($2) B10($2) :void + GT $24 $1 $23 :bool + CMP $25 $24 B9($2) B10($2) :void B15($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/static-loop-tests/after_ssa/staticIterator.trace b/nautilus/test/data/static-loop-tests/after_ssa/staticIterator.trace index c2752d41..97140ca0 100644 --- a/nautilus/test/data/static-loop-tests/after_ssa/staticIterator.trace +++ b/nautilus/test/data/static-loop-tests/after_ssa/staticIterator.trace @@ -1,57 +1,57 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1($1,$2) B2($1,$2) :void + CONST $2 0 :i32 + CONST $3 1 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1($1,$2) B2($1,$2) :void B1($1:i32,$2:i32) - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - CONST $8 2 :i32 - JMP $0 B11($1,$7,$8) :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + CONST $8 2 :i32 + JMP $0 B11($1,$7,$8) :void B2($1:i32,$2:i32) - CONST $29 2 :i32 - JMP $0 B11($1,$2,$29) :void + CONST $29 2 :i32 + JMP $0 B11($1,$2,$29) :void B3($1:i32,$2:i32) - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - CONST $13 3 :i32 - JMP $0 B12($1,$12,$13) :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + CONST $13 3 :i32 + JMP $0 B12($1,$12,$13) :void B4($1:i32,$2:i32) - CONST $31 3 :i32 - JMP $0 B12($1,$2,$31) :void + CONST $31 3 :i32 + JMP $0 B12($1,$2,$31) :void B5($1:i32,$2:i32) - CONST $16 1 :i32 - ADD $17 $2 $16 :i32 - CONST $18 4 :i32 - JMP $0 B13($1,$17,$18) :void + CONST $16 1 :i32 + ADD $17 $2 $16 :i32 + CONST $18 4 :i32 + JMP $0 B13($1,$17,$18) :void B6($1:i32,$2:i32) - CONST $33 4 :i32 - JMP $0 B13($1,$2,$33) :void + CONST $33 4 :i32 + JMP $0 B13($1,$2,$33) :void B7($1:i32,$2:i32) - CONST $21 1 :i32 - ADD $22 $2 $21 :i32 - CONST $23 5 :i32 - JMP $0 B14($22,$1,$23) :void + CONST $21 1 :i32 + ADD $22 $2 $21 :i32 + CONST $23 5 :i32 + JMP $0 B14($22,$1,$23) :void B8($2:i32,$1:i32) - CONST $35 5 :i32 - JMP $0 B14($2,$1,$35) :void + CONST $35 5 :i32 + JMP $0 B14($2,$1,$35) :void B9($2:i32) - CONST $26 1 :i32 - ADD $27 $2 $26 :i32 - JMP $0 B15($27) :void + CONST $26 1 :i32 + ADD $27 $2 $26 :i32 + JMP $0 B15($27) :void B10($2:i32) - JMP $0 B15($2) :void + JMP $0 B15($2) :void B11($1:i32,$2:i32,$8:i32) ControlFlowMerge - GT $9 $1 $8 :bool - CMP $10 $9 B3($1,$2) B4($1,$2) :void + GT $9 $1 $8 :bool + CMP $10 $9 B3($1,$2) B4($1,$2) :void B12($1:i32,$2:i32,$13:i32) ControlFlowMerge - GT $14 $1 $13 :bool - CMP $15 $14 B5($1,$2) B6($1,$2) :void + GT $14 $1 $13 :bool + CMP $15 $14 B5($1,$2) B6($1,$2) :void B13($1:i32,$2:i32,$18:i32) ControlFlowMerge - GT $19 $1 $18 :bool - CMP $20 $19 B7($1,$2) B8($2,$1) :void + GT $19 $1 $18 :bool + CMP $20 $19 B7($1,$2) B8($2,$1) :void B14($2:i32,$1:i32,$23:i32) ControlFlowMerge - GT $24 $1 $23 :bool - CMP $25 $24 B9($2) B10($2) :void + GT $24 $1 $23 :bool + CMP $25 $24 B9($2) B10($2) :void B15($2:i32) - RETURN $2 :i32 + RETURN $2 :i32 diff --git a/nautilus/test/data/static-loop-tests/after_ssa/staticLoop.trace b/nautilus/test/data/static-loop-tests/after_ssa/staticLoop.trace index 6022c849..6199edda 100644 --- a/nautilus/test/data/static-loop-tests/after_ssa/staticLoop.trace +++ b/nautilus/test/data/static-loop-tests/after_ssa/staticLoop.trace @@ -1,23 +1,23 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - CONST $4 10 :i32 - ADD $5 $3 $4 :i32 - CONST $6 10 :i32 - ADD $7 $5 $6 :i32 - CONST $8 10 :i32 - ADD $9 $7 $8 :i32 - CONST $10 10 :i32 - ADD $11 $9 $10 :i32 - CONST $12 10 :i32 - ADD $13 $11 $12 :i32 - CONST $14 10 :i32 - ADD $15 $13 $14 :i32 - CONST $16 10 :i32 - ADD $17 $15 $16 :i32 - CONST $18 10 :i32 - ADD $19 $17 $18 :i32 - CONST $20 10 :i32 - ADD $21 $19 $20 :i32 - RETURN $21 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + CONST $4 10 :i32 + ADD $5 $3 $4 :i32 + CONST $6 10 :i32 + ADD $7 $5 $6 :i32 + CONST $8 10 :i32 + ADD $9 $7 $8 :i32 + CONST $10 10 :i32 + ADD $11 $9 $10 :i32 + CONST $12 10 :i32 + ADD $13 $11 $12 :i32 + CONST $14 10 :i32 + ADD $15 $13 $14 :i32 + CONST $16 10 :i32 + ADD $17 $15 $16 :i32 + CONST $18 10 :i32 + ADD $19 $17 $18 :i32 + CONST $20 10 :i32 + ADD $21 $19 $20 :i32 + RETURN $21 :i32 diff --git a/nautilus/test/data/static-loop-tests/after_ssa/staticLoopIncrement.trace b/nautilus/test/data/static-loop-tests/after_ssa/staticLoopIncrement.trace index 6022c849..6199edda 100644 --- a/nautilus/test/data/static-loop-tests/after_ssa/staticLoopIncrement.trace +++ b/nautilus/test/data/static-loop-tests/after_ssa/staticLoopIncrement.trace @@ -1,23 +1,23 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - CONST $4 10 :i32 - ADD $5 $3 $4 :i32 - CONST $6 10 :i32 - ADD $7 $5 $6 :i32 - CONST $8 10 :i32 - ADD $9 $7 $8 :i32 - CONST $10 10 :i32 - ADD $11 $9 $10 :i32 - CONST $12 10 :i32 - ADD $13 $11 $12 :i32 - CONST $14 10 :i32 - ADD $15 $13 $14 :i32 - CONST $16 10 :i32 - ADD $17 $15 $16 :i32 - CONST $18 10 :i32 - ADD $19 $17 $18 :i32 - CONST $20 10 :i32 - ADD $21 $19 $20 :i32 - RETURN $21 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + CONST $4 10 :i32 + ADD $5 $3 $4 :i32 + CONST $6 10 :i32 + ADD $7 $5 $6 :i32 + CONST $8 10 :i32 + ADD $9 $7 $8 :i32 + CONST $10 10 :i32 + ADD $11 $9 $10 :i32 + CONST $12 10 :i32 + ADD $13 $11 $12 :i32 + CONST $14 10 :i32 + ADD $15 $13 $14 :i32 + CONST $16 10 :i32 + ADD $17 $15 $16 :i32 + CONST $18 10 :i32 + ADD $19 $17 $18 :i32 + CONST $20 10 :i32 + ADD $21 $19 $20 :i32 + RETURN $21 :i32 diff --git a/nautilus/test/data/static-loop-tests/after_ssa/staticWhileLoopDecrement.trace b/nautilus/test/data/static-loop-tests/after_ssa/staticWhileLoopDecrement.trace index 065c1267..5d59381d 100644 --- a/nautilus/test/data/static-loop-tests/after_ssa/staticWhileLoopDecrement.trace +++ b/nautilus/test/data/static-loop-tests/after_ssa/staticWhileLoopDecrement.trace @@ -1,25 +1,25 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - CONST $4 9 :i32 - ADD $5 $3 $4 :i32 - CONST $6 8 :i32 - ADD $7 $5 $6 :i32 - CONST $8 7 :i32 - ADD $9 $7 $8 :i32 - CONST $10 6 :i32 - ADD $11 $9 $10 :i32 - CONST $12 5 :i32 - ADD $13 $11 $12 :i32 - CONST $14 4 :i32 - ADD $15 $13 $14 :i32 - CONST $16 3 :i32 - ADD $17 $15 $16 :i32 - CONST $18 2 :i32 - ADD $19 $17 $18 :i32 - CONST $20 1 :i32 - ADD $21 $19 $20 :i32 - CONST $22 0 :i32 - ADD $23 $21 $22 :i32 - RETURN $23 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + CONST $4 9 :i32 + ADD $5 $3 $4 :i32 + CONST $6 8 :i32 + ADD $7 $5 $6 :i32 + CONST $8 7 :i32 + ADD $9 $7 $8 :i32 + CONST $10 6 :i32 + ADD $11 $9 $10 :i32 + CONST $12 5 :i32 + ADD $13 $11 $12 :i32 + CONST $14 4 :i32 + ADD $15 $13 $14 :i32 + CONST $16 3 :i32 + ADD $17 $15 $16 :i32 + CONST $18 2 :i32 + ADD $19 $17 $18 :i32 + CONST $20 1 :i32 + ADD $21 $19 $20 :i32 + CONST $22 0 :i32 + ADD $23 $21 $22 :i32 + RETURN $23 :i32 diff --git a/nautilus/test/data/static-loop-tests/ir/staticConstIterator.trace b/nautilus/test/data/static-loop-tests/ir/staticConstIterator.trace index 0e9280a0..6a2a33a4 100644 --- a/nautilus/test/data/static-loop-tests/ir/staticConstIterator.trace +++ b/nautilus/test/data/static-loop-tests/ir/staticConstIterator.trace @@ -1,76 +1,76 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - $4 = $1 > $3 :bool - if $4 ? Block_1($1, $2) : Block_2($1, $2) :void + $2 = 0 :i32 + $3 = 1 :i32 + $4 = $1 > $3 :bool + if $4 ? Block_1($1, $2) : Block_2($1, $2) :void Block_1($1:i32, $2:i32): - $6 = 1 :i32 - $7 = $2 + $6 :i32 - $8 = 2 :i32 - br Block_11($1, $7, $8) :void + $6 = 1 :i32 + $7 = $2 + $6 :i32 + $8 = 2 :i32 + br Block_11($1, $7, $8) :void Block_11($1:i32, $2:i32, $8:i32): - $9 = $1 > $8 :bool - if $9 ? Block_3($1, $2) : Block_4($1, $2) :void + $9 = $1 > $8 :bool + if $9 ? Block_3($1, $2) : Block_4($1, $2) :void Block_3($1:i32, $2:i32): - $11 = 1 :i32 - $12 = $2 + $11 :i32 - $13 = 3 :i32 - br Block_12($1, $12, $13) :void + $11 = 1 :i32 + $12 = $2 + $11 :i32 + $13 = 3 :i32 + br Block_12($1, $12, $13) :void Block_12($1:i32, $2:i32, $13:i32): - $14 = $1 > $13 :bool - if $14 ? Block_5($1, $2) : Block_6($1, $2) :void + $14 = $1 > $13 :bool + if $14 ? Block_5($1, $2) : Block_6($1, $2) :void Block_5($1:i32, $2:i32): - $16 = 1 :i32 - $17 = $2 + $16 :i32 - $18 = 4 :i32 - br Block_13($1, $17, $18) :void + $16 = 1 :i32 + $17 = $2 + $16 :i32 + $18 = 4 :i32 + br Block_13($1, $17, $18) :void Block_13($1:i32, $2:i32, $18:i32): - $19 = $1 > $18 :bool - if $19 ? Block_7($1, $2) : Block_8($2, $1) :void + $19 = $1 > $18 :bool + if $19 ? Block_7($1, $2) : Block_8($2, $1) :void Block_7($1:i32, $2:i32): - $21 = 1 :i32 - $22 = $2 + $21 :i32 - $23 = 5 :i32 - br Block_14($22, $1, $23) :void + $21 = 1 :i32 + $22 = $2 + $21 :i32 + $23 = 5 :i32 + br Block_14($22, $1, $23) :void Block_14($2:i32, $1:i32, $23:i32): - $24 = $1 > $23 :bool - if $24 ? Block_9($2) : Block_10($2) :void + $24 = $1 > $23 :bool + if $24 ? Block_9($2) : Block_10($2) :void Block_9($2:i32): - $26 = 1 :i32 - $27 = $2 + $26 :i32 - br Block_15($27) :void + $26 = 1 :i32 + $27 = $2 + $26 :i32 + br Block_15($27) :void Block_15($2:i32): - return ($2) :i32 + return ($2) :i32 Block_10($2:i32): - br Block_15($2) :void + br Block_15($2) :void Block_8($2:i32, $1:i32): - $35 = 5 :i32 - br Block_14($2, $1, $35) :void + $35 = 5 :i32 + br Block_14($2, $1, $35) :void Block_6($1:i32, $2:i32): - $33 = 4 :i32 - br Block_13($1, $2, $33) :void + $33 = 4 :i32 + br Block_13($1, $2, $33) :void Block_4($1:i32, $2:i32): - $31 = 3 :i32 - br Block_12($1, $2, $31) :void + $31 = 3 :i32 + br Block_12($1, $2, $31) :void Block_2($1:i32, $2:i32): - $29 = 2 :i32 - br Block_11($1, $2, $29) :void + $29 = 2 :i32 + br Block_11($1, $2, $29) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/static-loop-tests/ir/staticIterator.trace b/nautilus/test/data/static-loop-tests/ir/staticIterator.trace index 0e9280a0..6a2a33a4 100644 --- a/nautilus/test/data/static-loop-tests/ir/staticIterator.trace +++ b/nautilus/test/data/static-loop-tests/ir/staticIterator.trace @@ -1,76 +1,76 @@ -NESIR { +NautilusIr { execute() { Block_0($1:i32): - $2 = 0 :i32 - $3 = 1 :i32 - $4 = $1 > $3 :bool - if $4 ? Block_1($1, $2) : Block_2($1, $2) :void + $2 = 0 :i32 + $3 = 1 :i32 + $4 = $1 > $3 :bool + if $4 ? Block_1($1, $2) : Block_2($1, $2) :void Block_1($1:i32, $2:i32): - $6 = 1 :i32 - $7 = $2 + $6 :i32 - $8 = 2 :i32 - br Block_11($1, $7, $8) :void + $6 = 1 :i32 + $7 = $2 + $6 :i32 + $8 = 2 :i32 + br Block_11($1, $7, $8) :void Block_11($1:i32, $2:i32, $8:i32): - $9 = $1 > $8 :bool - if $9 ? Block_3($1, $2) : Block_4($1, $2) :void + $9 = $1 > $8 :bool + if $9 ? Block_3($1, $2) : Block_4($1, $2) :void Block_3($1:i32, $2:i32): - $11 = 1 :i32 - $12 = $2 + $11 :i32 - $13 = 3 :i32 - br Block_12($1, $12, $13) :void + $11 = 1 :i32 + $12 = $2 + $11 :i32 + $13 = 3 :i32 + br Block_12($1, $12, $13) :void Block_12($1:i32, $2:i32, $13:i32): - $14 = $1 > $13 :bool - if $14 ? Block_5($1, $2) : Block_6($1, $2) :void + $14 = $1 > $13 :bool + if $14 ? Block_5($1, $2) : Block_6($1, $2) :void Block_5($1:i32, $2:i32): - $16 = 1 :i32 - $17 = $2 + $16 :i32 - $18 = 4 :i32 - br Block_13($1, $17, $18) :void + $16 = 1 :i32 + $17 = $2 + $16 :i32 + $18 = 4 :i32 + br Block_13($1, $17, $18) :void Block_13($1:i32, $2:i32, $18:i32): - $19 = $1 > $18 :bool - if $19 ? Block_7($1, $2) : Block_8($2, $1) :void + $19 = $1 > $18 :bool + if $19 ? Block_7($1, $2) : Block_8($2, $1) :void Block_7($1:i32, $2:i32): - $21 = 1 :i32 - $22 = $2 + $21 :i32 - $23 = 5 :i32 - br Block_14($22, $1, $23) :void + $21 = 1 :i32 + $22 = $2 + $21 :i32 + $23 = 5 :i32 + br Block_14($22, $1, $23) :void Block_14($2:i32, $1:i32, $23:i32): - $24 = $1 > $23 :bool - if $24 ? Block_9($2) : Block_10($2) :void + $24 = $1 > $23 :bool + if $24 ? Block_9($2) : Block_10($2) :void Block_9($2:i32): - $26 = 1 :i32 - $27 = $2 + $26 :i32 - br Block_15($27) :void + $26 = 1 :i32 + $27 = $2 + $26 :i32 + br Block_15($27) :void Block_15($2:i32): - return ($2) :i32 + return ($2) :i32 Block_10($2:i32): - br Block_15($2) :void + br Block_15($2) :void Block_8($2:i32, $1:i32): - $35 = 5 :i32 - br Block_14($2, $1, $35) :void + $35 = 5 :i32 + br Block_14($2, $1, $35) :void Block_6($1:i32, $2:i32): - $33 = 4 :i32 - br Block_13($1, $2, $33) :void + $33 = 4 :i32 + br Block_13($1, $2, $33) :void Block_4($1:i32, $2:i32): - $31 = 3 :i32 - br Block_12($1, $2, $31) :void + $31 = 3 :i32 + br Block_12($1, $2, $31) :void Block_2($1:i32, $2:i32): - $29 = 2 :i32 - br Block_11($1, $2, $29) :void + $29 = 2 :i32 + br Block_11($1, $2, $29) :void } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/static-loop-tests/ir/staticLoop.trace b/nautilus/test/data/static-loop-tests/ir/staticLoop.trace index 1740c599..ceb655a7 100644 --- a/nautilus/test/data/static-loop-tests/ir/staticLoop.trace +++ b/nautilus/test/data/static-loop-tests/ir/staticLoop.trace @@ -1,27 +1,27 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 10 :i32 - $3 = $1 + $2 :i32 - $4 = 10 :i32 - $5 = $3 + $4 :i32 - $6 = 10 :i32 - $7 = $5 + $6 :i32 - $8 = 10 :i32 - $9 = $7 + $8 :i32 - $10 = 10 :i32 - $11 = $9 + $10 :i32 - $12 = 10 :i32 - $13 = $11 + $12 :i32 - $14 = 10 :i32 - $15 = $13 + $14 :i32 - $16 = 10 :i32 - $17 = $15 + $16 :i32 - $18 = 10 :i32 - $19 = $17 + $18 :i32 - $20 = 10 :i32 - $21 = $19 + $20 :i32 - return ($21) :i32 + $1 = 1 :i32 + $2 = 10 :i32 + $3 = $1 + $2 :i32 + $4 = 10 :i32 + $5 = $3 + $4 :i32 + $6 = 10 :i32 + $7 = $5 + $6 :i32 + $8 = 10 :i32 + $9 = $7 + $8 :i32 + $10 = 10 :i32 + $11 = $9 + $10 :i32 + $12 = 10 :i32 + $13 = $11 + $12 :i32 + $14 = 10 :i32 + $15 = $13 + $14 :i32 + $16 = 10 :i32 + $17 = $15 + $16 :i32 + $18 = 10 :i32 + $19 = $17 + $18 :i32 + $20 = 10 :i32 + $21 = $19 + $20 :i32 + return ($21) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/static-loop-tests/ir/staticLoopIncrement.trace b/nautilus/test/data/static-loop-tests/ir/staticLoopIncrement.trace index 1740c599..ceb655a7 100644 --- a/nautilus/test/data/static-loop-tests/ir/staticLoopIncrement.trace +++ b/nautilus/test/data/static-loop-tests/ir/staticLoopIncrement.trace @@ -1,27 +1,27 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 10 :i32 - $3 = $1 + $2 :i32 - $4 = 10 :i32 - $5 = $3 + $4 :i32 - $6 = 10 :i32 - $7 = $5 + $6 :i32 - $8 = 10 :i32 - $9 = $7 + $8 :i32 - $10 = 10 :i32 - $11 = $9 + $10 :i32 - $12 = 10 :i32 - $13 = $11 + $12 :i32 - $14 = 10 :i32 - $15 = $13 + $14 :i32 - $16 = 10 :i32 - $17 = $15 + $16 :i32 - $18 = 10 :i32 - $19 = $17 + $18 :i32 - $20 = 10 :i32 - $21 = $19 + $20 :i32 - return ($21) :i32 + $1 = 1 :i32 + $2 = 10 :i32 + $3 = $1 + $2 :i32 + $4 = 10 :i32 + $5 = $3 + $4 :i32 + $6 = 10 :i32 + $7 = $5 + $6 :i32 + $8 = 10 :i32 + $9 = $7 + $8 :i32 + $10 = 10 :i32 + $11 = $9 + $10 :i32 + $12 = 10 :i32 + $13 = $11 + $12 :i32 + $14 = 10 :i32 + $15 = $13 + $14 :i32 + $16 = 10 :i32 + $17 = $15 + $16 :i32 + $18 = 10 :i32 + $19 = $17 + $18 :i32 + $20 = 10 :i32 + $21 = $19 + $20 :i32 + return ($21) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/static-loop-tests/ir/staticWhileLoopDecrement.trace b/nautilus/test/data/static-loop-tests/ir/staticWhileLoopDecrement.trace index 17f5cc3c..e705c73d 100644 --- a/nautilus/test/data/static-loop-tests/ir/staticWhileLoopDecrement.trace +++ b/nautilus/test/data/static-loop-tests/ir/staticWhileLoopDecrement.trace @@ -1,29 +1,29 @@ -NESIR { +NautilusIr { execute() { Block_0(): - $1 = 1 :i32 - $2 = 10 :i32 - $3 = $1 + $2 :i32 - $4 = 9 :i32 - $5 = $3 + $4 :i32 - $6 = 8 :i32 - $7 = $5 + $6 :i32 - $8 = 7 :i32 - $9 = $7 + $8 :i32 - $10 = 6 :i32 - $11 = $9 + $10 :i32 - $12 = 5 :i32 - $13 = $11 + $12 :i32 - $14 = 4 :i32 - $15 = $13 + $14 :i32 - $16 = 3 :i32 - $17 = $15 + $16 :i32 - $18 = 2 :i32 - $19 = $17 + $18 :i32 - $20 = 1 :i32 - $21 = $19 + $20 :i32 - $22 = 0 :i32 - $23 = $21 + $22 :i32 - return ($23) :i32 + $1 = 1 :i32 + $2 = 10 :i32 + $3 = $1 + $2 :i32 + $4 = 9 :i32 + $5 = $3 + $4 :i32 + $6 = 8 :i32 + $7 = $5 + $6 :i32 + $8 = 7 :i32 + $9 = $7 + $8 :i32 + $10 = 6 :i32 + $11 = $9 + $10 :i32 + $12 = 5 :i32 + $13 = $11 + $12 :i32 + $14 = 4 :i32 + $15 = $13 + $14 :i32 + $16 = 3 :i32 + $17 = $15 + $16 :i32 + $18 = 2 :i32 + $19 = $17 + $18 :i32 + $20 = 1 :i32 + $21 = $19 + $20 :i32 + $22 = 0 :i32 + $23 = $21 + $22 :i32 + return ($23) :i32 } } //NESIR \ No newline at end of file diff --git a/nautilus/test/data/static-loop-tests/tracing/staticConstIterator.trace b/nautilus/test/data/static-loop-tests/tracing/staticConstIterator.trace index 5597436d..51e14ac3 100644 --- a/nautilus/test/data/static-loop-tests/tracing/staticConstIterator.trace +++ b/nautilus/test/data/static-loop-tests/tracing/staticConstIterator.trace @@ -1,64 +1,64 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 2 :i32 - JMP $0 B11() :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 2 :i32 + JMP $0 B11() :void B2() - CONST $29 2 :i32 - ASSIGN $8 $29 :i32 - JMP $0 B11() :void + CONST $29 2 :i32 + ASSIGN $8 $29 :i32 + JMP $0 B11() :void B3() - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 3 :i32 - JMP $0 B12() :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 3 :i32 + JMP $0 B12() :void B4() - CONST $31 3 :i32 - ASSIGN $13 $31 :i32 - JMP $0 B12() :void + CONST $31 3 :i32 + ASSIGN $13 $31 :i32 + JMP $0 B12() :void B5() - CONST $16 1 :i32 - ADD $17 $2 $16 :i32 - ASSIGN $2 $17 :i32 - CONST $18 4 :i32 - JMP $0 B13() :void + CONST $16 1 :i32 + ADD $17 $2 $16 :i32 + ASSIGN $2 $17 :i32 + CONST $18 4 :i32 + JMP $0 B13() :void B6() - CONST $33 4 :i32 - ASSIGN $18 $33 :i32 - JMP $0 B13() :void + CONST $33 4 :i32 + ASSIGN $18 $33 :i32 + JMP $0 B13() :void B7() - CONST $21 1 :i32 - ADD $22 $2 $21 :i32 - ASSIGN $2 $22 :i32 - CONST $23 5 :i32 - JMP $0 B14() :void + CONST $21 1 :i32 + ADD $22 $2 $21 :i32 + ASSIGN $2 $22 :i32 + CONST $23 5 :i32 + JMP $0 B14() :void B8() - CONST $35 5 :i32 - ASSIGN $23 $35 :i32 - JMP $0 B14() :void + CONST $35 5 :i32 + ASSIGN $23 $35 :i32 + JMP $0 B14() :void B9() - CONST $26 1 :i32 - ADD $27 $2 $26 :i32 - ASSIGN $2 $27 :i32 - RETURN $2 :i32 + CONST $26 1 :i32 + ADD $27 $2 $26 :i32 + ASSIGN $2 $27 :i32 + RETURN $2 :i32 B10() - RETURN $2 :i32 + RETURN $2 :i32 B11() ControlFlowMerge - GT $9 $1 $8 :bool - CMP $10 $9 B3() B4() :void + GT $9 $1 $8 :bool + CMP $10 $9 B3() B4() :void B12() ControlFlowMerge - GT $14 $1 $13 :bool - CMP $15 $14 B5() B6() :void + GT $14 $1 $13 :bool + CMP $15 $14 B5() B6() :void B13() ControlFlowMerge - GT $19 $1 $18 :bool - CMP $20 $19 B7() B8() :void + GT $19 $1 $18 :bool + CMP $20 $19 B7() B8() :void B14() ControlFlowMerge - GT $24 $1 $23 :bool - CMP $25 $24 B9() B10() :void + GT $24 $1 $23 :bool + CMP $25 $24 B9() B10() :void diff --git a/nautilus/test/data/static-loop-tests/tracing/staticIterator.trace b/nautilus/test/data/static-loop-tests/tracing/staticIterator.trace index 5597436d..51e14ac3 100644 --- a/nautilus/test/data/static-loop-tests/tracing/staticIterator.trace +++ b/nautilus/test/data/static-loop-tests/tracing/staticIterator.trace @@ -1,64 +1,64 @@ B0($1:i32) - CONST $2 0 :i32 - CONST $3 1 :i32 - GT $4 $1 $3 :bool - CMP $5 $4 B1() B2() :void + CONST $2 0 :i32 + CONST $3 1 :i32 + GT $4 $1 $3 :bool + CMP $5 $4 B1() B2() :void B1() - CONST $6 1 :i32 - ADD $7 $2 $6 :i32 - ASSIGN $2 $7 :i32 - CONST $8 2 :i32 - JMP $0 B11() :void + CONST $6 1 :i32 + ADD $7 $2 $6 :i32 + ASSIGN $2 $7 :i32 + CONST $8 2 :i32 + JMP $0 B11() :void B2() - CONST $29 2 :i32 - ASSIGN $8 $29 :i32 - JMP $0 B11() :void + CONST $29 2 :i32 + ASSIGN $8 $29 :i32 + JMP $0 B11() :void B3() - CONST $11 1 :i32 - ADD $12 $2 $11 :i32 - ASSIGN $2 $12 :i32 - CONST $13 3 :i32 - JMP $0 B12() :void + CONST $11 1 :i32 + ADD $12 $2 $11 :i32 + ASSIGN $2 $12 :i32 + CONST $13 3 :i32 + JMP $0 B12() :void B4() - CONST $31 3 :i32 - ASSIGN $13 $31 :i32 - JMP $0 B12() :void + CONST $31 3 :i32 + ASSIGN $13 $31 :i32 + JMP $0 B12() :void B5() - CONST $16 1 :i32 - ADD $17 $2 $16 :i32 - ASSIGN $2 $17 :i32 - CONST $18 4 :i32 - JMP $0 B13() :void + CONST $16 1 :i32 + ADD $17 $2 $16 :i32 + ASSIGN $2 $17 :i32 + CONST $18 4 :i32 + JMP $0 B13() :void B6() - CONST $33 4 :i32 - ASSIGN $18 $33 :i32 - JMP $0 B13() :void + CONST $33 4 :i32 + ASSIGN $18 $33 :i32 + JMP $0 B13() :void B7() - CONST $21 1 :i32 - ADD $22 $2 $21 :i32 - ASSIGN $2 $22 :i32 - CONST $23 5 :i32 - JMP $0 B14() :void + CONST $21 1 :i32 + ADD $22 $2 $21 :i32 + ASSIGN $2 $22 :i32 + CONST $23 5 :i32 + JMP $0 B14() :void B8() - CONST $35 5 :i32 - ASSIGN $23 $35 :i32 - JMP $0 B14() :void + CONST $35 5 :i32 + ASSIGN $23 $35 :i32 + JMP $0 B14() :void B9() - CONST $26 1 :i32 - ADD $27 $2 $26 :i32 - ASSIGN $2 $27 :i32 - RETURN $2 :i32 + CONST $26 1 :i32 + ADD $27 $2 $26 :i32 + ASSIGN $2 $27 :i32 + RETURN $2 :i32 B10() - RETURN $2 :i32 + RETURN $2 :i32 B11() ControlFlowMerge - GT $9 $1 $8 :bool - CMP $10 $9 B3() B4() :void + GT $9 $1 $8 :bool + CMP $10 $9 B3() B4() :void B12() ControlFlowMerge - GT $14 $1 $13 :bool - CMP $15 $14 B5() B6() :void + GT $14 $1 $13 :bool + CMP $15 $14 B5() B6() :void B13() ControlFlowMerge - GT $19 $1 $18 :bool - CMP $20 $19 B7() B8() :void + GT $19 $1 $18 :bool + CMP $20 $19 B7() B8() :void B14() ControlFlowMerge - GT $24 $1 $23 :bool - CMP $25 $24 B9() B10() :void + GT $24 $1 $23 :bool + CMP $25 $24 B9() B10() :void diff --git a/nautilus/test/data/static-loop-tests/tracing/staticLoop.trace b/nautilus/test/data/static-loop-tests/tracing/staticLoop.trace index 60c02701..cc2255ac 100644 --- a/nautilus/test/data/static-loop-tests/tracing/staticLoop.trace +++ b/nautilus/test/data/static-loop-tests/tracing/staticLoop.trace @@ -1,33 +1,33 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - CONST $4 10 :i32 - ADD $5 $1 $4 :i32 - ASSIGN $1 $5 :i32 - CONST $6 10 :i32 - ADD $7 $1 $6 :i32 - ASSIGN $1 $7 :i32 - CONST $8 10 :i32 - ADD $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 10 :i32 - ADD $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 10 :i32 - ADD $15 $1 $14 :i32 - ASSIGN $1 $15 :i32 - CONST $16 10 :i32 - ADD $17 $1 $16 :i32 - ASSIGN $1 $17 :i32 - CONST $18 10 :i32 - ADD $19 $1 $18 :i32 - ASSIGN $1 $19 :i32 - CONST $20 10 :i32 - ADD $21 $1 $20 :i32 - ASSIGN $1 $21 :i32 - RETURN $1 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + CONST $4 10 :i32 + ADD $5 $1 $4 :i32 + ASSIGN $1 $5 :i32 + CONST $6 10 :i32 + ADD $7 $1 $6 :i32 + ASSIGN $1 $7 :i32 + CONST $8 10 :i32 + ADD $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 10 :i32 + ADD $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 10 :i32 + ADD $15 $1 $14 :i32 + ASSIGN $1 $15 :i32 + CONST $16 10 :i32 + ADD $17 $1 $16 :i32 + ASSIGN $1 $17 :i32 + CONST $18 10 :i32 + ADD $19 $1 $18 :i32 + ASSIGN $1 $19 :i32 + CONST $20 10 :i32 + ADD $21 $1 $20 :i32 + ASSIGN $1 $21 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/static-loop-tests/tracing/staticLoopIncrement.trace b/nautilus/test/data/static-loop-tests/tracing/staticLoopIncrement.trace index 60c02701..cc2255ac 100644 --- a/nautilus/test/data/static-loop-tests/tracing/staticLoopIncrement.trace +++ b/nautilus/test/data/static-loop-tests/tracing/staticLoopIncrement.trace @@ -1,33 +1,33 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - CONST $4 10 :i32 - ADD $5 $1 $4 :i32 - ASSIGN $1 $5 :i32 - CONST $6 10 :i32 - ADD $7 $1 $6 :i32 - ASSIGN $1 $7 :i32 - CONST $8 10 :i32 - ADD $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 10 :i32 - ADD $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - CONST $12 10 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 10 :i32 - ADD $15 $1 $14 :i32 - ASSIGN $1 $15 :i32 - CONST $16 10 :i32 - ADD $17 $1 $16 :i32 - ASSIGN $1 $17 :i32 - CONST $18 10 :i32 - ADD $19 $1 $18 :i32 - ASSIGN $1 $19 :i32 - CONST $20 10 :i32 - ADD $21 $1 $20 :i32 - ASSIGN $1 $21 :i32 - RETURN $1 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + CONST $4 10 :i32 + ADD $5 $1 $4 :i32 + ASSIGN $1 $5 :i32 + CONST $6 10 :i32 + ADD $7 $1 $6 :i32 + ASSIGN $1 $7 :i32 + CONST $8 10 :i32 + ADD $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 10 :i32 + ADD $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + CONST $12 10 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 10 :i32 + ADD $15 $1 $14 :i32 + ASSIGN $1 $15 :i32 + CONST $16 10 :i32 + ADD $17 $1 $16 :i32 + ASSIGN $1 $17 :i32 + CONST $18 10 :i32 + ADD $19 $1 $18 :i32 + ASSIGN $1 $19 :i32 + CONST $20 10 :i32 + ADD $21 $1 $20 :i32 + ASSIGN $1 $21 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/data/static-loop-tests/tracing/staticWhileLoopDecrement.trace b/nautilus/test/data/static-loop-tests/tracing/staticWhileLoopDecrement.trace index 68c7ecbb..5081e19c 100644 --- a/nautilus/test/data/static-loop-tests/tracing/staticWhileLoopDecrement.trace +++ b/nautilus/test/data/static-loop-tests/tracing/staticWhileLoopDecrement.trace @@ -1,36 +1,36 @@ B0() - CONST $1 1 :i32 - CONST $2 10 :i32 - ADD $3 $1 $2 :i32 - ASSIGN $1 $3 :i32 - CONST $4 9 :i32 - ADD $5 $1 $4 :i32 - ASSIGN $1 $5 :i32 - CONST $6 8 :i32 - ADD $7 $1 $6 :i32 - ASSIGN $1 $7 :i32 - CONST $8 7 :i32 - ADD $9 $1 $8 :i32 - ASSIGN $1 $9 :i32 - CONST $10 6 :i32 - ADD $11 $1 $10 :i32 - ASSIGN $1 $11 :i32 - CONST $12 5 :i32 - ADD $13 $1 $12 :i32 - ASSIGN $1 $13 :i32 - CONST $14 4 :i32 - ADD $15 $1 $14 :i32 - ASSIGN $1 $15 :i32 - CONST $16 3 :i32 - ADD $17 $1 $16 :i32 - ASSIGN $1 $17 :i32 - CONST $18 2 :i32 - ADD $19 $1 $18 :i32 - ASSIGN $1 $19 :i32 - CONST $20 1 :i32 - ADD $21 $1 $20 :i32 - ASSIGN $1 $21 :i32 - CONST $22 0 :i32 - ADD $23 $1 $22 :i32 - ASSIGN $1 $23 :i32 - RETURN $1 :i32 + CONST $1 1 :i32 + CONST $2 10 :i32 + ADD $3 $1 $2 :i32 + ASSIGN $1 $3 :i32 + CONST $4 9 :i32 + ADD $5 $1 $4 :i32 + ASSIGN $1 $5 :i32 + CONST $6 8 :i32 + ADD $7 $1 $6 :i32 + ASSIGN $1 $7 :i32 + CONST $8 7 :i32 + ADD $9 $1 $8 :i32 + ASSIGN $1 $9 :i32 + CONST $10 6 :i32 + ADD $11 $1 $10 :i32 + ASSIGN $1 $11 :i32 + CONST $12 5 :i32 + ADD $13 $1 $12 :i32 + ASSIGN $1 $13 :i32 + CONST $14 4 :i32 + ADD $15 $1 $14 :i32 + ASSIGN $1 $15 :i32 + CONST $16 3 :i32 + ADD $17 $1 $16 :i32 + ASSIGN $1 $17 :i32 + CONST $18 2 :i32 + ADD $19 $1 $18 :i32 + ASSIGN $1 $19 :i32 + CONST $20 1 :i32 + ADD $21 $1 $20 :i32 + ASSIGN $1 $21 :i32 + CONST $22 0 :i32 + ADD $23 $1 $22 :i32 + ASSIGN $1 $23 :i32 + RETURN $1 :i32 diff --git a/nautilus/test/execution-tests/TracingTest.cpp b/nautilus/test/execution-tests/TracingTest.cpp index 074a0538..0c1ac692 100644 --- a/nautilus/test/execution-tests/TracingTest.cpp +++ b/nautilus/test/execution-tests/TracingTest.cpp @@ -53,7 +53,7 @@ void writeTestFile(T* trace, std::string filePath) { // Check if the file is open if (file.is_open()) { // Write the string to the file - file << *trace; + file << trace->toString(); // Close the file file.close(); } else { @@ -84,7 +84,7 @@ bool checkTestFile(T* trace, const std::string category, const std::string group std::ifstream file(filePath); std::stringstream targetString; - targetString << *trace; // Ensure this operation is valid + targetString << trace->toString(); if (!file.is_open()) { std::cerr << "Unable to open file\n"; @@ -126,7 +126,7 @@ bool checkTestFile(T* trace, const std::string category, const std::string group if (differencesFound) { std::cout << "Got Trace" << std::endl; - std::cout << *trace << std::endl; + std::cout << trace->toString() << std::endl; } return !differencesFound; } diff --git a/third_party/fmt/.clang-format b/third_party/fmt/.clang-format new file mode 100644 index 00000000..df55d340 --- /dev/null +++ b/third_party/fmt/.clang-format @@ -0,0 +1,8 @@ +# Run manually to reformat a file: +# clang-format -i --style=file +Language: Cpp +BasedOnStyle: Google +IndentPPDirectives: AfterHash +IndentCaseLabels: false +AlwaysBreakTemplateDeclarations: false +DerivePointerAlignment: false diff --git a/third_party/fmt/.gitignore b/third_party/fmt/.gitignore new file mode 100644 index 00000000..2635026a --- /dev/null +++ b/third_party/fmt/.gitignore @@ -0,0 +1,20 @@ +*.a +*.so* +*.xcodeproj +*~ +.vscode/ +/CMakeScripts +/Testing +/_CPack_Packages +/install_manifest.txt +CMakeCache.txt +CMakeFiles +CPack*.cmake +CTestTestfile.cmake +FMT.build +Makefile +bin/ +build/ +cmake_install.cmake +fmt-*.cmake +fmt.pc diff --git a/third_party/fmt/support/Android.mk b/third_party/fmt/support/Android.mk new file mode 100644 index 00000000..84a3e32f --- /dev/null +++ b/third_party/fmt/support/Android.mk @@ -0,0 +1,15 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := fmt_static +LOCAL_MODULE_FILENAME := libfmt + +LOCAL_SRC_FILES := ../src/format.cc + +LOCAL_C_INCLUDES := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) + +LOCAL_CFLAGS += -std=c++11 -fexceptions + +include $(BUILD_STATIC_LIBRARY) + diff --git a/third_party/fmt/support/AndroidManifest.xml b/third_party/fmt/support/AndroidManifest.xml new file mode 100644 index 00000000..c282ef5a --- /dev/null +++ b/third_party/fmt/support/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/third_party/fmt/support/C++.sublime-syntax b/third_party/fmt/support/C++.sublime-syntax new file mode 100644 index 00000000..9dfb5cbe --- /dev/null +++ b/third_party/fmt/support/C++.sublime-syntax @@ -0,0 +1,2061 @@ +%YAML 1.2 +--- +# http://www.sublimetext.com/docs/3/syntax.html +name: C++ (fmt) +comment: I don't think anyone uses .hp. .cp tends to be paired with .h. (I could be wrong. :) -- chris +file_extensions: + - cpp + - cc + - cp + - cxx + - c++ + - C + - h + - hh + - hpp + - hxx + - h++ + - inl + - ipp +first_line_match: '-\*- C\+\+ -\*-' +scope: source.c++ +variables: + identifier: \b[[:alpha:]_][[:alnum:]_]*\b # upper and lowercase + macro_identifier: \b[[:upper:]_][[:upper:][:digit:]_]{2,}\b # only uppercase, at least 3 chars + path_lookahead: '(?:::\s*)?(?:{{identifier}}\s*::\s*)*(?:template\s+)?{{identifier}}' + operator_method_name: '\boperator\s*(?:[-+*/%^&|~!=<>]|[-+*/%^&|=!<>]=|<<=?|>>=?|&&|\|\||\+\+|--|,|->\*?|\(\)|\[\]|""\s*{{identifier}})' + casts: 'const_cast|dynamic_cast|reinterpret_cast|static_cast' + operator_keywords: 'and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|xor|xor_eq|noexcept' + control_keywords: 'break|case|catch|continue|default|do|else|for|goto|if|_Pragma|return|switch|throw|try|while' + memory_operators: 'new|delete' + basic_types: 'asm|__asm__|auto|bool|_Bool|char|_Complex|double|float|_Imaginary|int|long|short|signed|unsigned|void' + before_tag: 'struct|union|enum\s+class|enum\s+struct|enum|class' + declspec: '__declspec\(\s*\w+(?:\([^)]+\))?\s*\)' + storage_classes: 'static|export|extern|friend|explicit|virtual|register|thread_local' + type_qualifier: 'const|constexpr|mutable|typename|volatile' + compiler_directive: 'inline|restrict|__restrict__|__restrict' + visibility_modifiers: 'private|protected|public' + other_keywords: 'typedef|nullptr|{{visibility_modifiers}}|static_assert|sizeof|using|typeid|alignof|alignas|namespace|template' + modifiers: '{{storage_classes}}|{{type_qualifier}}|{{compiler_directive}}' + non_angle_brackets: '(?=<<|<=)' + + regular: '[^(){}&;*^%=<>-]*' + paren_open: (?:\( + paren_close: '\))?' + generic_open: (?:< + generic_close: '>)?' + balance_parentheses: '{{regular}}{{paren_open}}{{regular}}{{paren_close}}{{regular}}' + generic_lookahead: <{{regular}}{{generic_open}}{{regular}}{{generic_open}}{{regular}}{{generic_close}}\s*{{generic_close}}{{balance_parentheses}}> + + data_structures_forward_decl_lookahead: '(\s+{{macro_identifier}})*\s*(:\s*({{path_lookahead}}|{{visibility_modifiers}}|,|\s|<[^;]*>)+)?;' + non_func_keywords: 'if|for|switch|while|decltype|sizeof|__declspec|__attribute__|typeid|alignof|alignas|static_assert' + + format_spec: |- + (?x: + (?:.? [<>=^])? # fill align + [ +-]? # sign + \#? # alternate form + # technically, octal and hexadecimal integers are also supported as 'width', but rarely used + \d* # width + ,? # thousands separator + (?:\.\d+)? # precision + [bcdeEfFgGnosxX%]? # type + ) + +contexts: + main: + - include: preprocessor-global + - include: global + + ############################################################################# + # Reusable contexts + # + # The follow contexts are currently constructed to be reused in the + # Objetive-C++ syntax. They are specifically constructed to not push into + # sub-contexts, which ensures that Objective-C++ code isn't accidentally + # lexed as plain C++. + # + # The "unique-*" contexts are additions that C++ makes over C, and thus can + # be directly reused in Objective-C++ along with contexts from Objective-C + # and C. + ############################################################################# + + unique-late-expressions: + # This is highlighted after all of the other control keywords + # to allow operator overloading to be lexed properly + - match: \boperator\b + scope: keyword.control.c++ + + unique-modifiers: + - match: \b({{modifiers}})\b + scope: storage.modifier.c++ + + unique-variables: + - match: \bthis\b + scope: variable.language.c++ + # common C++ instance var naming idiom -- fMemberName + - match: '\b(f|m)[[:upper:]]\w*\b' + scope: variable.other.readwrite.member.c++ + # common C++ instance var naming idiom -- m_member_name + - match: '\bm_[[:alnum:]_]+\b' + scope: variable.other.readwrite.member.c++ + + unique-constants: + - match: \bnullptr\b + scope: constant.language.c++ + + unique-keywords: + - match: \busing\b + scope: keyword.control.c++ + - match: \bbreak\b + scope: keyword.control.flow.break.c++ + - match: \bcontinue\b + scope: keyword.control.flow.continue.c++ + - match: \bgoto\b + scope: keyword.control.flow.goto.c++ + - match: \breturn\b + scope: keyword.control.flow.return.c++ + - match: \bthrow\b + scope: keyword.control.flow.throw.c++ + - match: \b({{control_keywords}})\b + scope: keyword.control.c++ + - match: '\bdelete\b(\s*\[\])?|\bnew\b(?!])' + scope: keyword.control.c++ + - match: \b({{operator_keywords}})\b + scope: keyword.operator.word.c++ + + unique-types: + - match: \b(char16_t|char32_t|wchar_t|nullptr_t)\b + scope: storage.type.c++ + - match: \bclass\b + scope: storage.type.c++ + + unique-strings: + - match: '((?:L|u8|u|U)?R)("([^\(\)\\ ]{0,16})\()' + captures: + 1: storage.type.string.c++ + 2: punctuation.definition.string.begin.c++ + push: + - meta_scope: string.quoted.double.c++ + - match: '\)\3"' + scope: punctuation.definition.string.end.c++ + pop: true + - match: '\{\{|\}\}' + scope: constant.character.escape.c++ + - include: formatting-syntax + + unique-numbers: + - match: |- + (?x) + (?: + # floats + (?: + (?:\b\d(?:[\d']*\d)?\.\d(?:[\d']*\d)?|\B\.\d(?:[\d']*\d)?)(?:[Ee][+-]?\d(?:[\d']*\d)?)?(?:[fFlL]|(?:i[fl]?|h|min|[mun]?s|_\w*))?\b + | + (?:\b\d(?:[\d']*\d)?\.)(?:\B|(?:[fFlL]|(?:i[fl]?|h|min|[mun]?s|_\w*))\b|(?:[Ee][+-]?\d(?:[\d']*\d)?)(?:[fFlL]|(?:i[fl]?|h|min|[mun]?s|_\w*))?\b) + | + \b\d(?:[\d']*\d)?(?:[Ee][+-]?\d(?:[\d']*\d)?)(?:[fFlL]|(?:i[fl]?|h|min|[mun]?s|_\w*))?\b + ) + | + # ints + \b(?: + (?: + # dec + [1-9](?:[\d']*\d)? + | + # oct + 0(?:[0-7']*[0-7])? + | + # hex + 0[Xx][\da-fA-F](?:[\da-fA-F']*[\da-fA-F])? + | + # bin + 0[Bb][01](?:[01']*[01])? + ) + # int suffixes + (?:(?:l{1,2}|L{1,2})[uU]?|[uU](?:l{0,2}|L{0,2})|(?:i[fl]?|h|min|[mun]?s|_\w*))?)\b + ) + (?!\.) # Number must not be followed by a decimal point + scope: constant.numeric.c++ + + identifiers: + - match: '{{identifier}}\s*(::)\s*' + captures: + 1: punctuation.accessor.c++ + - match: '(?:(::)\s*)?{{identifier}}' + captures: + 1: punctuation.accessor.c++ + + function-specifiers: + - match: \b(const|final|noexcept|override)\b + scope: storage.modifier.c++ + + ############################################################################# + # The following are C++-specific contexts that should not be reused. This is + # because they push into subcontexts and use variables that are C++-specific. + ############################################################################# + + ## Common context layout + + global: + - match: '(?=\btemplate\b)' + push: + - include: template + - match: (?=\S) + set: global-modifier + - include: namespace + - include: keywords-angle-brackets + - match: '(?={{path_lookahead}}\s*<)' + push: global-modifier + # Take care of comments just before a function definition. + - match: /\* + scope: punctuation.definition.comment.c + push: + - - match: \s*(?=\w) + set: global-modifier + - match: "" + pop: true + - - meta_scope: comment.block.c + - match: \*/ + scope: punctuation.definition.comment.c + pop: true + - include: early-expressions + - match: ^\s*\b(extern)(?=\s+"C(\+\+)?") + scope: storage.modifier.c++ + push: + - include: comments + - include: strings + - match: '\{' + scope: punctuation.section.block.begin.c++ + set: + - meta_scope: meta.extern-c.c++ + - match: '^\s*(#\s*ifdef)\s*__cplusplus\s*' + scope: meta.preprocessor.c++ + captures: + 1: keyword.control.import.c++ + set: + - match: '\}' + scope: punctuation.section.block.end.c++ + pop: true + - include: preprocessor-global + - include: global + - match: '\}' + scope: punctuation.section.block.end.c++ + pop: true + - include: preprocessor-global + - include: global + - match: (?=\S) + set: global-modifier + - match: ^\s*(?=\w) + push: global-modifier + - include: late-expressions + + statements: + - include: preprocessor-statements + - include: scope:source.c#label + - include: expressions + + expressions: + - include: early-expressions + - include: late-expressions + + early-expressions: + - include: early-expressions-before-generic-type + - include: generic-type + - include: early-expressions-after-generic-type + + early-expressions-before-generic-type: + - include: preprocessor-expressions + - include: comments + - include: case-default + - include: typedef + - include: keywords-angle-brackets + - include: keywords-parens + - include: keywords + - include: numbers + # Prevent a '<' from getting scoped as the start of another template + # parameter list, if in reality a less-than-or-equals sign is meant. + - match: <= + scope: keyword.operator.comparison.c + + early-expressions-after-generic-type: + - include: members-arrow + - include: operators + - include: members-dot + - include: strings + - include: parens + - include: brackets + - include: block + - include: variables + - include: constants + - match: ',' + scope: punctuation.separator.c++ + - match: '\)|\}' + scope: invalid.illegal.stray-bracket-end.c++ + + expressions-minus-generic-type: + - include: early-expressions-before-generic-type + - include: angle-brackets + - include: early-expressions-after-generic-type + - include: late-expressions + + expressions-minus-generic-type-function-call: + - include: early-expressions-before-generic-type + - include: angle-brackets + - include: early-expressions-after-generic-type + - include: late-expressions-before-function-call + - include: identifiers + - match: ';' + scope: punctuation.terminator.c++ + + late-expressions: + - include: late-expressions-before-function-call + - include: function-call + - include: identifiers + - match: ';' + scope: punctuation.terminator.c++ + + late-expressions-before-function-call: + - include: unique-late-expressions + - include: modifiers-parens + - include: modifiers + - include: types + + expressions-minus-function-call: + - include: early-expressions + - include: late-expressions-before-function-call + - include: identifiers + - match: ';' + scope: punctuation.terminator.c++ + + comments: + - include: scope:source.c#comments + + operators: + - include: scope:source.c#operators + + modifiers: + - include: unique-modifiers + - include: scope:source.c#modifiers + + variables: + - include: unique-variables + - include: scope:source.c#variables + + constants: + - include: unique-constants + - include: scope:source.c#constants + + keywords: + - include: unique-keywords + - include: scope:source.c#keywords + + types: + - include: unique-types + - include: types-parens + - include: scope:source.c#types + + strings: + - include: unique-strings + - match: '(L|u8|u|U)?(")' + captures: + 1: storage.type.string.c++ + 2: punctuation.definition.string.begin.c++ + push: + - meta_scope: string.quoted.double.c++ + - match: '"' + scope: punctuation.definition.string.end.c++ + pop: true + - include: scope:source.c#string_escaped_char + - match: |- + (?x)% + (\d+\$)? # field (argument #) + [#0\- +']* # flags + [,;:_]? # separator character (AltiVec) + ((-?\d+)|\*(-?\d+\$)?)? # minimum field width + (\.((-?\d+)|\*(-?\d+\$)?)?)? # precision + (hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier + (\[[^\]]+\]|[am]s|[diouxXDOUeEfFgGaACcSspn%]) # conversion type + scope: constant.other.placeholder.c++ + - match: '\{\{|\}\}' + scope: constant.character.escape.c++ + - include: formatting-syntax + - include: scope:source.c#strings + + formatting-syntax: + # https://docs.python.org/3.6/library/string.html#formatstrings + - match: |- # simple form + (?x) + (\{) + (?: [\w.\[\]]+)? # field_name + ( ! [ars])? # conversion + ( : (?:{{format_spec}}| # format_spec OR + [^}%]*%.[^}]*) # any format-like string + )? + (\}) + scope: constant.other.placeholder.c++ + captures: + 1: punctuation.definition.placeholder.begin.c++ + 2: storage.modifier.c++onversion.c++ + 3: constant.other.format-spec.c++ + 4: punctuation.definition.placeholder.end.c++ + - match: \{(?=[^\}"']+\{[^"']*\}) # complex (nested) form + scope: punctuation.definition.placeholder.begin.c++ + push: + - meta_scope: constant.other.placeholder.c++ + - match: \} + scope: punctuation.definition.placeholder.end.c++ + pop: true + - match: '[\w.\[\]]+' + - match: '![ars]' + scope: storage.modifier.conversion.c++ + - match: ':' + push: + - meta_scope: meta.format-spec.c++ constant.other.format-spec.c++ + - match: (?=\}) + pop: true + - include: formatting-syntax + + numbers: + - include: unique-numbers + - include: scope:source.c#numbers + + ## C++-specific contexts + + case-default: + - match: '\b(default|case)\b' + scope: keyword.control.c++ + push: + - match: (?=[);,]) + pop: true + - match: ':' + scope: punctuation.separator.c++ + pop: true + - include: expressions + + modifiers-parens: + - match: '\b(alignas)\b\s*(\()' + captures: + 1: storage.modifier.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - match: \b(__attribute__)\s*(\(\() + captures: + 1: storage.modifier.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push : + - meta_scope: meta.attribute.c++ + - meta_content_scope: meta.group.c++ + - include: parens + - include: strings + - match: \)\) + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - match: \b(__declspec)(\() + captures: + 1: storage.modifier.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - match: '\b(align|allocate|code_seg|deprecated|property|uuid)\b\s*(\()' + captures: + 1: storage.modifier.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: numbers + - include: strings + - match: \b(get|put)\b + scope: variable.parameter.c++ + - match: ',' + scope: punctuation.separator.c++ + - match: '=' + scope: keyword.operator.assignment.c++ + - match: '\b(appdomain|deprecated|dllimport|dllexport|jintrinsic|naked|noalias|noinline|noreturn|nothrow|novtable|process|restrict|safebuffers|selectany|thread)\b' + scope: constant.other.c++ + + types-parens: + - match: '\b(decltype)\b\s*(\()' + captures: + 1: storage.type.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + + keywords-angle-brackets: + - match: \b({{casts}})\b\s* + scope: keyword.operator.word.cast.c++ + push: + - match: '>' + scope: punctuation.section.generic.end.c++ + pop: true + - match: '<' + scope: punctuation.section.generic.begin.c++ + push: + - match: '(?=>)' + pop: true + - include: expressions-minus-generic-type-function-call + + keywords-parens: + - match: '\b(alignof|typeid|static_assert|sizeof)\b\s*(\()' + captures: + 1: keyword.operator.word.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + + namespace: + - match: '\b(using)\s+(namespace)\s+(?={{path_lookahead}})' + captures: + 1: keyword.control.c++ + 2: keyword.control.c++ + push: + - include: identifiers + - match: '' + pop: true + - match: '\b(namespace)\s+(?=({{path_lookahead}})?(?!\s*[;,]))' + scope: meta.namespace.c++ + captures: + 1: keyword.control.c++ + push: + - meta_content_scope: meta.namespace.c++ entity.name.namespace.c++ + - include: identifiers + - match: '' + set: + - meta_scope: meta.namespace.c++ + - include: comments + - match: '=' + scope: keyword.operator.alias.c++ + - match: '(?=;)' + pop: true + - match: '\}' + scope: meta.block.c++ punctuation.section.block.end.c++ + pop: true + - match: '\{' + scope: punctuation.section.block.begin.c++ + push: + - meta_scope: meta.block.c++ + - match: '(?=\})' + pop: true + - include: preprocessor-global + - include: global + - include: expressions + + template-common: + # Exit the template scope if we hit some basic invalid characters. This + # helps when a user is in the middle of typing their template types and + # prevents re-highlighting the whole file until the next > is found. + - match: (?=[{};]) + pop: true + - include: expressions + + template: + - match: \btemplate\b + scope: storage.type.template.c++ + push: + - meta_scope: meta.template.c++ + # Explicitly include comments here at the top, in order to NOT match the + # \S lookahead in the case of comments. + - include: comments + - match: < + scope: punctuation.section.generic.begin.c++ + set: + - meta_content_scope: meta.template.c++ + - match: '>' + scope: meta.template.c++ punctuation.section.generic.end.c++ + pop: true + - match: \.{3} + scope: keyword.operator.variadic.c++ + - match: \b(typename|{{before_tag}})\b + scope: storage.type.c++ + - include: template # include template here for nested templates + - include: template-common + - match: (?=\S) + set: + - meta_content_scope: meta.template.c++ + - match: \b({{before_tag}})\b + scope: storage.type.c++ + - include: template-common + + generic-type: + - match: '(?=(?!template){{path_lookahead}}\s*{{generic_lookahead}}\s*\()' + push: + - meta_scope: meta.function-call.c++ + - match: \btemplate\b + scope: storage.type.template.c++ + - match: '(?:(::)\s*)?{{identifier}}\s*(::)\s*' + captures: + 1: punctuation.accessor.double-colon.c++ + 2: punctuation.accessor.double-colon.c++ + - match: (?:(::)\s*)?({{identifier}})\s*(<) + captures: + 1: punctuation.accessor.double-colon.c++ + 2: variable.function.c++ + 3: punctuation.section.generic.begin.c++ + push: + - match: '>' + scope: punctuation.section.generic.end.c++ + pop: true + - include: expressions-minus-generic-type-function-call + - match: (?:(::)\s*)?({{identifier}})\s*(\() + captures: + 1: punctuation.accessor.double-colon.c++ + 2: variable.function.c++ + 3: punctuation.section.group.begin.c++ + set: + - meta_scope: meta.function-call.c++ + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - include: angle-brackets + - match: '\(' + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_scope: meta.function-call.c++ + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - match: '(?=(?!template){{path_lookahead}}\s*{{generic_lookahead}})' + push: + - include: identifiers + - match: '<' + scope: punctuation.section.generic.begin.c++ + set: + - match: '>' + scope: punctuation.section.generic.end.c++ + pop: true + - include: expressions-minus-generic-type-function-call + + angle-brackets: + - match: '<(?!<)' + scope: punctuation.section.generic.begin.c++ + push: + - match: '>' + scope: punctuation.section.generic.end.c++ + pop: true + - include: expressions-minus-generic-type-function-call + + block: + - match: '\{' + scope: punctuation.section.block.begin.c++ + push: + - meta_scope: meta.block.c++ + - match: (?=^\s*#\s*(elif|else|endif)\b) + pop: true + - match: '\}' + scope: punctuation.section.block.end.c++ + pop: true + - include: statements + + function-call: + - match: (?={{path_lookahead}}\s*\() + push: + - meta_scope: meta.function-call.c++ + - include: scope:source.c#c99 + - match: '(?:(::)\s*)?{{identifier}}\s*(::)\s*' + scope: variable.function.c++ + captures: + 1: punctuation.accessor.c++ + 2: punctuation.accessor.c++ + - match: '(?:(::)\s*)?{{identifier}}' + scope: variable.function.c++ + captures: + 1: punctuation.accessor.c++ + - match: '\(' + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.function-call.c++ meta.group.c++ + - match: '\)' + scope: meta.function-call.c++ meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + + members-inside-function-call: + - meta_content_scope: meta.method-call.c++ meta.group.c++ + - match: \) + scope: meta.method-call.c++ meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + + members-after-accessor-junction: + # After we've seen an accessor (dot or arrow), this context decides what + # kind of entity we're accessing. + - include: comments + - match: \btemplate\b + scope: meta.method-call.c++ storage.type.template.c++ + # Guaranteed to be a template member function call after we match this + set: + - meta_content_scope: meta.method-call.c++ + - include: comments + - match: '{{identifier}}' + scope: variable.function.member.c++ + set: + - meta_content_scope: meta.method-call.c++ + - match: \( + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: members-inside-function-call + - include: comments + - include: angle-brackets + - match: (?=\S) # safety pop + pop: true + - match: (?=\S) # safety pop + pop: true + # Operator overloading + - match: '({{operator_method_name}})\s*(\()' + captures: + 0: meta.method-call.c++ + 1: variable.function.member.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + set: members-inside-function-call + # Non-templated member function call + - match: (~?{{identifier}})\s*(\() + captures: + 0: meta.method-call.c++ + 1: variable.function.member.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + set: members-inside-function-call + # Templated member function call + - match: (~?{{identifier}})\s*(?={{generic_lookahead}}) + captures: + 1: variable.function.member.c++ + set: + - meta_scope: meta.method-call.c++ + - match: < + scope: punctuation.section.generic.begin.c++ + set: + - meta_content_scope: meta.method-call.c++ + - match: '>' + scope: punctuation.section.generic.end.c++ + set: + - meta_content_scope: meta.method-call.c++ + - include: comments + - match: \( + scope: punctuation.section.group.begin.c++ + set: members-inside-function-call + - match: (?=\S) # safety pop + pop: true + - include: expressions + # Explicit base-class access + - match: ({{identifier}})\s*(::) + captures: + 1: variable.other.base-class.c++ + 2: punctuation.accessor.double-colon.c++ + set: members-after-accessor-junction # reset + # Just a regular member variable + - match: '{{identifier}}' + scope: variable.other.readwrite.member.c++ + pop: true + + members-dot: + - include: scope:source.c#access-illegal + # No lookahead required because members-dot goes after operators in the + # early-expressions-after-generic-type context. This means triple dots + # (i.e. "..." or "variadic") is attempted first. + - match: \. + scope: punctuation.accessor.dot.c++ + push: members-after-accessor-junction + + members-arrow: + # This needs to be before operators in the + # early-expressions-after-generic-type context because otherwise the "->" + # from the C language will match. + - match: -> + scope: punctuation.accessor.arrow.c++ + push: members-after-accessor-junction + + typedef: + - match: \btypedef\b + scope: storage.type.c++ + push: + - match: ({{identifier}})?\s*(?=;) + captures: + 1: entity.name.type.typedef.c++ + pop: true + - match: \b(struct)\s+({{identifier}})\b + captures: + 1: storage.type.c++ + - include: expressions-minus-generic-type + + parens: + - match: \( + scope: punctuation.section.group.begin.c++ + push: + - meta_scope: meta.group.c++ + - match: \) + scope: punctuation.section.group.end.c++ + pop: true + - include: expressions + + brackets: + - match: \[ + scope: punctuation.section.brackets.begin.c++ + push: + - meta_scope: meta.brackets.c++ + - match: \] + scope: punctuation.section.brackets.end.c++ + pop: true + - include: expressions + + function-trailing-return-type: + - match: '{{non_angle_brackets}}' + pop: true + - include: angle-brackets + - include: types + - include: modifiers-parens + - include: modifiers + - include: identifiers + - match: \*|& + scope: keyword.operator.c++ + - include: function-trailing-return-type-parens + - match: '(?=\S)' + pop: true + + function-trailing-return-type-parens: + - match: \( + scope: punctuation.section.group.begin.c++ + push: + - meta_scope: meta.group.c++ + - match: \) + scope: punctuation.section.group.end.c++ + pop: true + - include: function-trailing-return-type + + ## Detection of function and data structure definitions at the global level + + global-modifier: + - include: comments + - include: modifiers-parens + - include: modifiers + # Constructors and destructors don't have a type + - match: '(?={{path_lookahead}}\s*::\s*{{identifier}}\s*(\(|$))' + set: + - meta_content_scope: meta.function.c++ entity.name.function.constructor.c++ + - include: identifiers + - match: '(?=[^\w\s])' + set: function-definition-params + - match: '(?={{path_lookahead}}\s*::\s*~{{identifier}}\s*(\(|$))' + set: + - meta_content_scope: meta.function.c++ entity.name.function.destructor.c++ + - include: identifiers + - match: '~{{identifier}}' + - match: '(?=[^\w\s])' + set: function-definition-params + # If we see a path ending in :: before a newline, we don't know if it is + # a constructor or destructor, or a long return type, so we are just going + # to treat it like a regular function. Most likely it is a constructor, + # since it doesn't seem most developers would create such a long typename. + - match: '(?={{path_lookahead}}\s*::\s*$)' + set: + - meta_content_scope: meta.function.c++ entity.name.function.c++ + - include: identifiers + - match: '~{{identifier}}' + - match: '(?=[^\w\s])' + set: function-definition-params + - include: unique-strings + - match: '(?=\S)' + set: global-type + + global-type: + - include: comments + - match: \*|& + scope: keyword.operator.c++ + - match: '(?=\b({{control_keywords}}|{{operator_keywords}}|{{casts}}|{{memory_operators}}|{{other_keywords}}|operator)\b)' + pop: true + - match: '(?=\s)' + set: global-maybe-function + # If a class/struct/enum followed by a name that is not a macro or declspec + # then this is likely a return type of a function. This is uncommon. + - match: |- + (?x: + ({{before_tag}}) + \s+ + (?= + (?![[:upper:][:digit:]_]+\b|__declspec|{{before_tag}}) + {{path_lookahead}} + (\s+{{identifier}}\s*\(|\s*[*&]) + ) + ) + captures: + 1: storage.type.c++ + set: + - include: identifiers + - match: '' + set: global-maybe-function + # The previous match handles return types of struct/enum/etc from a func, + # there this one exits the context to allow matching an actual struct/class + - match: '(?=\b({{before_tag}})\b)' + set: data-structures + - match: '(?=\b({{casts}})\b\s*<)' + pop: true + - match: '{{non_angle_brackets}}' + pop: true + - include: angle-brackets + - include: types + # Allow a macro call + - match: '({{identifier}})\s*(\()(?=[^\)]+\))' + captures: + 1: variable.function.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_scope: meta.function-call.c++ + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - match: '(?={{path_lookahead}}\s*\()' + set: + - include: function-call + - match: '' + pop: true + - include: variables + - include: constants + - include: identifiers + - match: (?=\W) + pop: true + + global-maybe-function: + - include: comments + # Consume pointer info, macros and any type info that was offset by macros + - match: \*|& + scope: keyword.operator.c++ + - match: '(?=\b({{control_keywords}}|{{operator_keywords}}|{{casts}}|{{memory_operators}}|{{other_keywords}})\b)' + pop: true + - match: '\b({{type_qualifier}})\b' + scope: storage.modifier.c++ + - match: '{{non_angle_brackets}}' + pop: true + - include: angle-brackets + - include: types + - include: modifiers-parens + - include: modifiers + # All uppercase identifier just before a newline is most likely a macro + - match: '[[:upper:][:digit:]_]+\s*$' + # Operator overloading + - match: '(?=({{path_lookahead}}\s*(?:{{generic_lookahead}})?::\s*)?{{operator_method_name}}\s*(\(|$))' + set: + - meta_content_scope: meta.function.c++ entity.name.function.c++ + - include: identifiers + - match: '(?=\s*(\(|$))' + set: function-definition-params + # Identifier that is not the function name - likely a macro or type + - match: '(?={{path_lookahead}}([ \t]+|[*&])(?!\s*(<|::|\(|$)))' + push: + - include: identifiers + - match: '' + pop: true + # Real function definition + - match: '(?={{path_lookahead}}({{generic_lookahead}}({{path_lookahead}})?)\s*(\(|$))' + set: [function-definition-params, global-function-identifier-generic] + - match: '(?={{path_lookahead}}\s*(\(|$))' + set: [function-definition-params, global-function-identifier] + - match: '(?={{path_lookahead}}\s*::\s*$)' + set: [function-definition-params, global-function-identifier] + - match: '(?=\S)' + pop: true + + global-function-identifier-generic: + - include: angle-brackets + - match: '::' + scope: punctuation.accessor.c++ + - match: '(?={{identifier}}<.*>\s*\()' + push: + - meta_content_scope: entity.name.function.c++ + - include: identifiers + - match: '(?=<)' + pop: true + - match: '(?={{identifier}}\s*\()' + push: + - meta_content_scope: entity.name.function.c++ + - include: identifiers + - match: '' + pop: true + - match: '(?=\()' + pop: true + + global-function-identifier: + - meta_content_scope: entity.name.function.c++ + - include: identifiers + - match: '(?=\S)' + pop: true + + function-definition-params: + - meta_content_scope: meta.function.c++ + - include: comments + - match: '(?=\()' + set: + - match: \( + scope: meta.function.parameters.c++ meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.function.parameters.c++ meta.group.c++ + - match : \) + scope: punctuation.section.group.end.c++ + set: function-definition-continue + - match: '\bvoid\b' + scope: storage.type.c++ + - match: '{{identifier}}(?=\s*(\[|,|\)|=))' + scope: variable.parameter.c++ + - match: '=' + scope: keyword.operator.assignment.c++ + push: + - match: '(?=,|\))' + pop: true + - include: expressions-minus-generic-type + - include: scope:source.c#preprocessor-line-continuation + - include: expressions-minus-generic-type + - include: scope:source.c#preprocessor-line-continuation + - match: (?=\S) + pop: true + + function-definition-continue: + - meta_content_scope: meta.function.c++ + - include: comments + - match: '(?=;)' + pop: true + - match: '->' + scope: punctuation.separator.c++ + set: function-definition-trailing-return + - include: function-specifiers + - match: '=' + scope: keyword.operator.assignment.c++ + - match: '&' + scope: keyword.operator.c++ + - match: \b0\b + scope: constant.numeric.c++ + - match: \b(default|delete)\b + scope: storage.modifier.c++ + - match: '(?=\{)' + set: function-definition-body + - match: '(?=\S)' + pop: true + + function-definition-trailing-return: + - include: comments + - match: '(?=;)' + pop: true + - match: '(?=\{)' + set: function-definition-body + - include: function-specifiers + - include: function-trailing-return-type + + function-definition-body: + - meta_content_scope: meta.function.c++ meta.block.c++ + - match: '\{' + scope: punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.function.c++ meta.block.c++ + - match: '\}' + scope: meta.function.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - match: (?=^\s*#\s*(elif|else|endif)\b) + pop: true + - match: '(?=({{before_tag}})([^(;]+$|.*\{))' + push: data-structures + - include: statements + + ## Data structures including classes, structs, unions and enums + + data-structures: + - match: '\bclass\b' + scope: storage.type.c++ + set: data-structures-class-definition + # Detect variable type definitions using struct/enum/union followed by a tag + - match: '\b({{before_tag}})(?=\s+{{path_lookahead}}\s+{{path_lookahead}}\s*[=;\[])' + scope: storage.type.c++ + - match: '\bstruct\b' + scope: storage.type.c++ + set: data-structures-struct-definition + - match: '\benum(\s+(class|struct))?\b' + scope: storage.type.c++ + set: data-structures-enum-definition + - match: '\bunion\b' + scope: storage.type.c++ + set: data-structures-union-definition + - match: '(?=\S)' + pop: true + + preprocessor-workaround-eat-macro-before-identifier: + # Handle macros so they aren't matched as the class name + - match: ({{macro_identifier}})(?=\s+~?{{identifier}}) + captures: + 1: meta.assumed-macro.c + + data-structures-class-definition: + - meta_scope: meta.class.c++ + - include: data-structures-definition-common-begin + - match: '{{identifier}}(?={{data_structures_forward_decl_lookahead}})' + scope: entity.name.class.forward-decl.c++ + set: data-structures-class-definition-after-identifier + - match: '{{identifier}}' + scope: entity.name.class.c++ + set: data-structures-class-definition-after-identifier + - match: '(?=[:{])' + set: data-structures-class-definition-after-identifier + - match: '(?=;)' + pop: true + + data-structures-class-definition-after-identifier: + - meta_content_scope: meta.class.c++ + - include: data-structures-definition-common-begin + # No matching of identifiers since they should all be macros at this point + - include: data-structures-definition-common-end + - match: '\{' + scope: meta.block.c++ punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.class.c++ meta.block.c++ + - match: '\}' + scope: meta.class.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - include: data-structures-body + + data-structures-struct-definition: + - meta_scope: meta.struct.c++ + - include: data-structures-definition-common-begin + - match: '{{identifier}}(?={{data_structures_forward_decl_lookahead}})' + scope: entity.name.struct.forward-decl.c++ + set: data-structures-struct-definition-after-identifier + - match: '{{identifier}}' + scope: entity.name.struct.c++ + set: data-structures-struct-definition-after-identifier + - match: '(?=[:{])' + set: data-structures-struct-definition-after-identifier + - match: '(?=;)' + pop: true + + data-structures-struct-definition-after-identifier: + - meta_content_scope: meta.struct.c++ + - include: data-structures-definition-common-begin + # No matching of identifiers since they should all be macros at this point + - include: data-structures-definition-common-end + - match: '\{' + scope: meta.block.c++ punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.struct.c++ meta.block.c++ + - match: '\}' + scope: meta.struct.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - include: data-structures-body + + data-structures-enum-definition: + - meta_scope: meta.enum.c++ + - include: data-structures-definition-common-begin + - match: '{{identifier}}(?={{data_structures_forward_decl_lookahead}})' + scope: entity.name.enum.forward-decl.c++ + set: data-structures-enum-definition-after-identifier + - match: '{{identifier}}' + scope: entity.name.enum.c++ + set: data-structures-enum-definition-after-identifier + - match: '(?=[:{])' + set: data-structures-enum-definition-after-identifier + - match: '(?=;)' + pop: true + + data-structures-enum-definition-after-identifier: + - meta_content_scope: meta.enum.c++ + - include: data-structures-definition-common-begin + # No matching of identifiers since they should all be macros at this point + - include: data-structures-definition-common-end + - match: '\{' + scope: meta.block.c++ punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.enum.c++ meta.block.c++ + # Enums don't support methods so we have a simplified body + - match: '\}' + scope: meta.enum.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - include: statements + + data-structures-union-definition: + - meta_scope: meta.union.c++ + - include: data-structures-definition-common-begin + - match: '{{identifier}}(?={{data_structures_forward_decl_lookahead}})' + scope: entity.name.union.forward-decl.c++ + set: data-structures-union-definition-after-identifier + - match: '{{identifier}}' + scope: entity.name.union.c++ + set: data-structures-union-definition-after-identifier + - match: '(?=[{])' + set: data-structures-union-definition-after-identifier + - match: '(?=;)' + pop: true + + data-structures-union-definition-after-identifier: + - meta_content_scope: meta.union.c++ + - include: data-structures-definition-common-begin + # No matching of identifiers since they should all be macros at this point + # Unions don't support base classes + - include: angle-brackets + - match: '\{' + scope: meta.block.c++ punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.union.c++ meta.block.c++ + - match: '\}' + scope: meta.union.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - include: data-structures-body + - match: '(?=;)' + pop: true + + data-structures-definition-common-begin: + - include: comments + - match: '(?=\b(?:{{before_tag}}|{{control_keywords}})\b)' + pop: true + - include: preprocessor-other + - include: modifiers-parens + - include: modifiers + - include: preprocessor-workaround-eat-macro-before-identifier + + data-structures-definition-common-end: + - include: angle-brackets + - match: \bfinal\b + scope: storage.modifier.c++ + - match: ':' + scope: punctuation.separator.c++ + push: + - include: comments + - include: preprocessor-other + - include: modifiers-parens + - include: modifiers + - match: '\b(virtual|{{visibility_modifiers}})\b' + scope: storage.modifier.c++ + - match: (?={{path_lookahead}}) + push: + - meta_scope: entity.other.inherited-class.c++ + - include: identifiers + - match: '' + pop: true + - include: angle-brackets + - match: ',' + scope: punctuation.separator.c++ + - match: (?=\{|;) + pop: true + - match: '(?=;)' + pop: true + + data-structures-body: + - include: preprocessor-data-structures + - match: '(?=\btemplate\b)' + push: + - include: template + - match: (?=\S) + set: data-structures-modifier + - include: typedef + - match: \b({{visibility_modifiers}})\s*(:)(?!:) + captures: + 1: storage.modifier.c++ + 2: punctuation.section.class.c++ + - match: '^\s*(?=(?:~?\w+|::))' + push: data-structures-modifier + - include: expressions-minus-generic-type + + data-structures-modifier: + - match: '\bfriend\b' + scope: storage.modifier.c++ + push: + - match: (?=;) + pop: true + - match: '\{' + scope: punctuation.section.block.begin.c++ + set: + - meta_scope: meta.block.c++ + - match: '\}' + scope: punctuation.section.block.end.c++ + pop: true + - include: statements + - match: '\b({{before_tag}})\b' + scope: storage.type.c++ + - include: expressions-minus-function-call + - include: comments + - include: modifiers-parens + - include: modifiers + - match: '\bstatic_assert(?=\s*\()' + scope: meta.static-assert.c++ keyword.operator.word.c++ + push: + - match: '\(' + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.function-call.c++ meta.group.c++ + - match: '\)' + scope: meta.function-call.c++ meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + # Destructor + - match: '(?:{{identifier}}\s*(::)\s*)?~{{identifier}}(?=\s*(\(|$))' + scope: meta.method.destructor.c++ entity.name.function.destructor.c++ + captures: + 1: punctuation.accessor.c++ + set: method-definition-params + # It's a macro, not a constructor if there is no type in the first param + - match: '({{identifier}})\s*(\()(?=\s*(?!void){{identifier}}\s*[),])' + captures: + 1: variable.function.c++ + 2: meta.group.c++ punctuation.section.group.begin.c++ + push: + - meta_scope: meta.function-call.c++ + - meta_content_scope: meta.group.c++ + - match: '\)' + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + # Constructor + - include: preprocessor-workaround-eat-macro-before-identifier + - match: '((?!{{before_tag}}|template){{identifier}})(?=\s*\()' + scope: meta.method.constructor.c++ entity.name.function.constructor.c++ + set: method-definition-params + # Long form constructor + - match: '({{identifier}}\s*(::)\s*{{identifier}})(?=\s*\()' + captures: + 1: meta.method.constructor.c++ entity.name.function.constructor.c++ + 2: punctuation.accessor.c++ + push: method-definition-params + - match: '(?=\S)' + set: data-structures-type + + data-structures-type: + - include: comments + - match: \*|& + scope: keyword.operator.c++ + # Cast methods + - match: '(operator)\s+({{identifier}})(?=\s*(\(|$))' + captures: + 1: keyword.control.c++ + 2: meta.method.c++ entity.name.function.c++ + set: method-definition-params + - match: '(?=\b({{control_keywords}}|{{operator_keywords}}|{{casts}}|{{memory_operators}}|{{other_keywords}}|operator)\b)' + pop: true + - match: '(?=\s)' + set: data-structures-maybe-method + # If a class/struct/enum followed by a name that is not a macro or declspec + # then this is likely a return type of a function. This is uncommon. + - match: |- + (?x: + ({{before_tag}}) + \s+ + (?= + (?![[:upper:][:digit:]_]+\b|__declspec|{{before_tag}}) + {{path_lookahead}} + (\s+{{identifier}}\s*\(|\s*[*&]) + ) + ) + captures: + 1: storage.type.c++ + set: + - include: identifiers + - match: '' + set: data-structures-maybe-method + # The previous match handles return types of struct/enum/etc from a func, + # there this one exits the context to allow matching an actual struct/class + - match: '(?=\b({{before_tag}})\b)' + set: data-structures + - match: '(?=\b({{casts}})\b\s*<)' + pop: true + - match: '{{non_angle_brackets}}' + pop: true + - include: angle-brackets + - include: types + - include: variables + - include: constants + - include: identifiers + - match: (?=[&*]) + set: data-structures-maybe-method + - match: (?=\W) + pop: true + + data-structures-maybe-method: + - include: comments + # Consume pointer info, macros and any type info that was offset by macros + - match: \*|& + scope: keyword.operator.c++ + - match: '(?=\b({{control_keywords}}|{{operator_keywords}}|{{casts}}|{{memory_operators}}|{{other_keywords}})\b)' + pop: true + - match: '\b({{type_qualifier}})\b' + scope: storage.modifier.c++ + - match: '{{non_angle_brackets}}' + pop: true + - include: angle-brackets + - include: types + - include: modifiers-parens + - include: modifiers + # Operator overloading + - match: '{{operator_method_name}}(?=\s*(\(|$))' + scope: meta.method.c++ entity.name.function.c++ + set: method-definition-params + # Identifier that is not the function name - likely a macro or type + - match: '(?={{path_lookahead}}([ \t]+|[*&])(?!\s*(<|::|\()))' + push: + - include: identifiers + - match: '' + pop: true + # Real function definition + - match: '(?={{path_lookahead}}({{generic_lookahead}})\s*(\())' + set: [method-definition-params, data-structures-function-identifier-generic] + - match: '(?={{path_lookahead}}\s*(\())' + set: [method-definition-params, data-structures-function-identifier] + - match: '(?={{path_lookahead}}\s*::\s*$)' + set: [method-definition-params, data-structures-function-identifier] + - match: '(?=\S)' + pop: true + + data-structures-function-identifier-generic: + - include: angle-brackets + - match: '(?={{identifier}})' + push: + - meta_content_scope: entity.name.function.c++ + - include: identifiers + - match: '(?=<)' + pop: true + - match: '(?=\()' + pop: true + + data-structures-function-identifier: + - meta_content_scope: entity.name.function.c++ + - include: identifiers + - match: '(?=\S)' + pop: true + + method-definition-params: + - meta_content_scope: meta.method.c++ + - include: comments + - match: '(?=\()' + set: + - match: \( + scope: meta.method.parameters.c++ meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.method.parameters.c++ meta.group.c++ + - match : \) + scope: punctuation.section.group.end.c++ + set: method-definition-continue + - match: '\bvoid\b' + scope: storage.type.c++ + - match: '{{identifier}}(?=\s*(\[|,|\)|=))' + scope: variable.parameter.c++ + - match: '=' + scope: keyword.operator.assignment.c++ + push: + - match: '(?=,|\))' + pop: true + - include: expressions-minus-generic-type + - include: expressions-minus-generic-type + - match: '(?=\S)' + pop: true + + method-definition-continue: + - meta_content_scope: meta.method.c++ + - include: comments + - match: '(?=;)' + pop: true + - match: '->' + scope: punctuation.separator.c++ + set: method-definition-trailing-return + - include: function-specifiers + - match: '=' + scope: keyword.operator.assignment.c++ + - match: '&' + scope: keyword.operator.c++ + - match: \b0\b + scope: constant.numeric.c++ + - match: \b(default|delete)\b + scope: storage.modifier.c++ + - match: '(?=:)' + set: + - match: ':' + scope: punctuation.separator.initializer-list.c++ + set: + - meta_scope: meta.method.constructor.initializer-list.c++ + - match: '{{identifier}}' + scope: variable.other.readwrite.member.c++ + push: + - match: \( + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.group.c++ + - match: \) + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - match: \{ + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: + - meta_content_scope: meta.group.c++ + - match: \} + scope: meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + - include: comments + - match: (?=\{|;) + set: method-definition-continue + - include: expressions + - match: '(?=\{)' + set: method-definition-body + - match: '(?=\S)' + pop: true + + method-definition-trailing-return: + - include: comments + - match: '(?=;)' + pop: true + - match: '(?=\{)' + set: method-definition-body + - include: function-specifiers + - include: function-trailing-return-type + + method-definition-body: + - meta_content_scope: meta.method.c++ meta.block.c++ + - match: '\{' + scope: punctuation.section.block.begin.c++ + set: + - meta_content_scope: meta.method.c++ meta.block.c++ + - match: '\}' + scope: meta.method.c++ meta.block.c++ punctuation.section.block.end.c++ + pop: true + - match: (?=^\s*#\s*(elif|else|endif)\b) + pop: true + - match: '(?=({{before_tag}})([^(;]+$|.*\{))' + push: data-structures + - include: statements + + ## Preprocessor for data-structures + + preprocessor-data-structures: + - include: preprocessor-rule-enabled-data-structures + - include: preprocessor-rule-disabled-data-structures + - include: preprocessor-practical-workarounds + + preprocessor-rule-disabled-data-structures: + - match: ^\s*((#if)\s+(0))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - match: (?=^\s*#\s*endif\b) + pop: true + - include: negated-block + - include: data-structures-body + - match: "" + push: + - meta_scope: comment.block.preprocessor.if-branch.c++ + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: scope:source.c#preprocessor-disabled + + preprocessor-rule-enabled-data-structures: + - match: ^\s*((#if)\s+(0*1))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - meta_content_scope: comment.block.preprocessor.else-branch.c++ + - match: (?=^\s*#\s*endif\b) + pop: true + - include: scope:source.c#preprocessor-disabled + - match: "" + push: + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: negated-block + - include: data-structures-body + + ## Preprocessor for global + + preprocessor-global: + - include: preprocessor-rule-enabled-global + - include: preprocessor-rule-disabled-global + - include: preprocessor-rule-other-global + + preprocessor-statements: + - include: preprocessor-rule-enabled-statements + - include: preprocessor-rule-disabled-statements + - include: preprocessor-rule-other-statements + + preprocessor-expressions: + - include: scope:source.c#incomplete-inc + - include: preprocessor-macro-define + - include: scope:source.c#pragma-mark + - include: preprocessor-other + + preprocessor-rule-disabled-global: + - match: ^\s*((#if)\s+(0))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - match: (?=^\s*#\s*endif\b) + pop: true + - include: preprocessor-global + - include: negated-block + - include: global + - match: "" + push: + - meta_scope: comment.block.preprocessor.if-branch.c++ + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: scope:source.c#preprocessor-disabled + + preprocessor-rule-enabled-global: + - match: ^\s*((#if)\s+(0*1))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - meta_content_scope: comment.block.preprocessor.else-branch.c++ + - match: (?=^\s*#\s*endif\b) + pop: true + - include: scope:source.c#preprocessor-disabled + - match: "" + push: + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: preprocessor-global + - include: negated-block + - include: global + + preprocessor-rule-other-global: + - match: ^\s*(#\s*(?:if|ifdef|ifndef))\b + captures: + 1: keyword.control.import.c++ + push: + - meta_scope: meta.preprocessor.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-comments + - match: \bdefined\b + scope: keyword.control.c++ + # Enter a new scope where all elif/else branches have their + # contexts popped by a subsequent elif/else/endif. This ensures that + # preprocessor branches don't push multiple meta.block scopes on + # the stack, thus messing up the "global" context's detection of + # functions. + - match: $\n + set: preprocessor-if-branch-global + + # These gymnastics here ensure that we are properly handling scope even + # when the preprocessor is used to create different scope beginnings, such + # as a different if/while condition + preprocessor-if-branch-global: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: (?=^\s*#\s*(elif|else)\b) + push: preprocessor-elif-else-branch-global + - match: \{ + scope: punctuation.section.block.begin.c++ + set: preprocessor-block-if-branch-global + - include: preprocessor-global + - include: negated-block + - include: global + + preprocessor-block-if-branch-global: + - meta_scope: meta.block.c++ + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-block-finish-global + - match: (?=^\s*#\s*(elif|else)\b) + push: preprocessor-elif-else-branch-global + - match: \} + scope: punctuation.section.block.end.c++ + set: preprocessor-if-branch-global + - include: statements + + preprocessor-block-finish-global: + - meta_scope: meta.block.c++ + - match: ^\s*(#\s*(?:if|ifdef|ifndef))\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-block-finish-if-branch-global + - match: \} + scope: punctuation.section.block.end.c++ + pop: true + - include: statements + + preprocessor-block-finish-if-branch-global: + - match: ^\s*(#\s*endif)\b + captures: + 1: keyword.control.import.c++ + pop: true + - match: \} + scope: punctuation.section.block.end.c++ + set: preprocessor-if-branch-global + - include: statements + + preprocessor-elif-else-branch-global: + - match: (?=^\s*#\s*(endif)\b) + pop: true + - include: preprocessor-global + - include: negated-block + - include: global + + ## Preprocessor for statements + + preprocessor-rule-disabled-statements: + - match: ^\s*((#if)\s+(0))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - match: (?=^\s*#\s*endif\b) + pop: true + - include: negated-block + - include: statements + - match: "" + push: + - meta_scope: comment.block.preprocessor.if-branch.c++ + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: scope:source.c#preprocessor-disabled + + preprocessor-rule-enabled-statements: + - match: ^\s*((#if)\s+(0*1))\b + captures: + 1: meta.preprocessor.c++ + 2: keyword.control.import.c++ + 3: constant.numeric.preprocessor.c++ + push: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: ^\s*(#\s*else)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.else.c++ + push: + - meta_content_scope: comment.block.preprocessor.else-branch.c++ + - match: (?=^\s*#\s*endif\b) + pop: true + - include: scope:source.c#preprocessor-disabled + - match: "" + push: + - match: (?=^\s*#\s*(else|endif)\b) + pop: true + - include: negated-block + - include: statements + + preprocessor-rule-other-statements: + - match: ^\s*(#\s*(?:if|ifdef|ifndef))\b + captures: + 1: keyword.control.import.c++ + push: + - meta_scope: meta.preprocessor.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-comments + - match: \bdefined\b + scope: keyword.control.c++ + # Enter a new scope where all elif/else branches have their + # contexts popped by a subsequent elif/else/endif. This ensures that + # preprocessor branches don't push multiple meta.block scopes on + # the stack, thus messing up the "global" context's detection of + # functions. + - match: $\n + set: preprocessor-if-branch-statements + + # These gymnastics here ensure that we are properly handling scope even + # when the preprocessor is used to create different scope beginnings, such + # as a different if/while condition + preprocessor-if-branch-statements: + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + pop: true + - match: (?=^\s*#\s*(elif|else)\b) + push: preprocessor-elif-else-branch-statements + - match: \{ + scope: punctuation.section.block.begin.c++ + set: preprocessor-block-if-branch-statements + - match: (?=(?!{{non_func_keywords}}){{path_lookahead}}\s*\() + set: preprocessor-if-branch-function-call + - include: negated-block + - include: statements + + preprocessor-if-branch-function-call: + - meta_content_scope: meta.function-call.c++ + - include: scope:source.c#c99 + - match: '(?:(::)\s*)?{{identifier}}\s*(::)\s*' + scope: variable.function.c++ + captures: + 1: punctuation.accessor.c++ + 2: punctuation.accessor.c++ + - match: '(?:(::)\s*)?{{identifier}}' + scope: variable.function.c++ + captures: + 1: punctuation.accessor.c++ + - match: '\(' + scope: meta.group.c++ punctuation.section.group.begin.c++ + set: preprocessor-if-branch-function-call-arguments + + preprocessor-if-branch-function-call-arguments: + - meta_content_scope: meta.function-call.c++ meta.group.c++ + - match : \) + scope: meta.function-call.c++ meta.group.c++ punctuation.section.group.end.c++ + set: preprocessor-if-branch-statements + - match: ^\s*(#\s*(?:elif|else))\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-if-branch-statements + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-if-branch-function-call-arguments-finish + - include: expressions + + preprocessor-if-branch-function-call-arguments-finish: + - meta_content_scope: meta.function-call.c++ meta.group.c++ + - match: \) + scope: meta.function-call.c++ meta.group.c++ punctuation.section.group.end.c++ + pop: true + - include: expressions + + preprocessor-block-if-branch-statements: + - meta_scope: meta.block.c++ + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-block-finish-statements + - match: (?=^\s*#\s*(elif|else)\b) + push: preprocessor-elif-else-branch-statements + - match: \} + scope: punctuation.section.block.end.c++ + set: preprocessor-if-branch-statements + - include: statements + + preprocessor-block-finish-statements: + - meta_scope: meta.block.c++ + - match: ^\s*(#\s*(?:if|ifdef|ifndef))\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + set: preprocessor-block-finish-if-branch-statements + - match: \} + scope: punctuation.section.block.end.c++ + pop: true + - include: statements + + preprocessor-block-finish-if-branch-statements: + - match: ^\s*(#\s*endif)\b + captures: + 1: keyword.control.import.c++ + pop: true + - match: \} + scope: meta.block.c++ punctuation.section.block.end.c++ + set: preprocessor-if-branch-statements + - include: statements + + preprocessor-elif-else-branch-statements: + - match: (?=^\s*#\s*endif\b) + pop: true + - include: negated-block + - include: statements + + ## Preprocessor other + + negated-block: + - match: '\}' + scope: punctuation.section.block.end.c++ + push: + - match: '\{' + scope: punctuation.section.block.begin.c++ + pop: true + - match: (?=^\s*#\s*(elif|else|endif)\b) + pop: true + - include: statements + + preprocessor-macro-define: + - match: ^\s*(\#\s*define)\b + captures: + 1: meta.preprocessor.macro.c++ keyword.control.import.define.c++ + push: + - meta_content_scope: meta.preprocessor.macro.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-line-ending + - include: scope:source.c#preprocessor-comments + - match: '({{identifier}})(?=\()' + scope: entity.name.function.preprocessor.c++ + set: + - match: '\(' + scope: punctuation.section.group.begin.c++ + set: preprocessor-macro-params + - match: '{{identifier}}' + scope: entity.name.constant.preprocessor.c++ + set: preprocessor-macro-definition + + preprocessor-macro-params: + - meta_scope: meta.preprocessor.macro.parameters.c++ meta.group.c++ + - match: '{{identifier}}' + scope: variable.parameter.c++ + - match: \) + scope: punctuation.section.group.end.c++ + set: preprocessor-macro-definition + - match: ',' + scope: punctuation.separator.c++ + push: + - match: '{{identifier}}' + scope: variable.parameter.c++ + pop: true + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-comments + - match: '\.\.\.' + scope: keyword.operator.variadic.c++ + - match: '(?=\))' + pop: true + - match: (/\*).*(\*/) + scope: comment.block.c++ + captures: + 1: punctuation.definition.comment.c++ + 2: punctuation.definition.comment.c++ + - match: '\S+' + scope: invalid.illegal.unexpected-character.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-comments + - match: '\.\.\.' + scope: keyword.operator.variadic.c++ + - match: (/\*).*(\*/) + scope: comment.block.c++ + captures: + 1: punctuation.definition.comment.c++ + 2: punctuation.definition.comment.c++ + - match: $\n + scope: invalid.illegal.unexpected-end-of-line.c++ + + preprocessor-macro-definition: + - meta_content_scope: meta.preprocessor.macro.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-line-ending + - include: scope:source.c#preprocessor-comments + # Don't define blocks in define statements + - match: '\{' + scope: punctuation.section.block.begin.c++ + - match: '\}' + scope: punctuation.section.block.end.c++ + - include: expressions + + preprocessor-practical-workarounds: + - include: preprocessor-convention-ignore-uppercase-ident-lines + - include: scope:source.c#preprocessor-convention-ignore-uppercase-calls-without-semicolon + + preprocessor-convention-ignore-uppercase-ident-lines: + - match: ^(\s*{{macro_identifier}})+\s*$ + scope: meta.assumed-macro.c++ + push: + # It's possible that we are dealing with a function return type on its own line, and the + # name of the function is on the subsequent line. + - match: '(?={{path_lookahead}}({{generic_lookahead}}({{path_lookahead}})?)\s*\()' + set: [function-definition-params, global-function-identifier-generic] + - match: '(?={{path_lookahead}}\s*\()' + set: [function-definition-params, global-function-identifier] + - match: ^ + pop: true + + preprocessor-other: + - match: ^\s*(#\s*(?:if|ifdef|ifndef|elif|else|line|pragma|undef))\b + captures: + 1: keyword.control.import.c++ + push: + - meta_scope: meta.preprocessor.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-line-ending + - include: scope:source.c#preprocessor-comments + - match: \bdefined\b + scope: keyword.control.c++ + - match: ^\s*(#\s*endif)\b + captures: + 1: meta.preprocessor.c++ keyword.control.import.c++ + - match: ^\s*(#\s*(?:error|warning))\b + captures: + 1: keyword.control.import.error.c++ + push: + - meta_scope: meta.preprocessor.diagnostic.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-line-ending + - include: scope:source.c#preprocessor-comments + - include: strings + - match: '\S+' + scope: string.unquoted.c++ + - match: ^\s*(#\s*(?:include|include_next|import))\b + captures: + 1: keyword.control.import.include.c++ + push: + - meta_scope: meta.preprocessor.include.c++ + - include: scope:source.c#preprocessor-line-continuation + - include: scope:source.c#preprocessor-line-ending + - include: scope:source.c#preprocessor-comments + - match: '"' + scope: punctuation.definition.string.begin.c++ + push: + - meta_scope: string.quoted.double.include.c++ + - match: '"' + scope: punctuation.definition.string.end.c++ + pop: true + - match: < + scope: punctuation.definition.string.begin.c++ + push: + - meta_scope: string.quoted.other.lt-gt.include.c++ + - match: '>' + scope: punctuation.definition.string.end.c++ + pop: true + - include: preprocessor-practical-workarounds diff --git a/third_party/fmt/support/README b/third_party/fmt/support/README new file mode 100644 index 00000000..468f5485 --- /dev/null +++ b/third_party/fmt/support/README @@ -0,0 +1,4 @@ +This directory contains build support files such as + +* CMake modules +* Build scripts diff --git a/third_party/fmt/support/Vagrantfile b/third_party/fmt/support/Vagrantfile new file mode 100644 index 00000000..9d0ff6a5 --- /dev/null +++ b/third_party/fmt/support/Vagrantfile @@ -0,0 +1,19 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# A vagrant config for testing against gcc-4.8. +Vagrant.configure("2") do |config| + config.vm.box = "bento/ubuntu-22.04-arm64" + + config.vm.provider "vmware_desktop" do |vb| + vb.memory = "4096" + end + + config.vm.provision "shell", inline: <<-SHELL + apt-get update + apt-get install -y g++ make wget git + wget -q https://github.com/Kitware/CMake/releases/download/v3.26.0/cmake-3.26.0-Linux-x86_64.tar.gz + tar xzf cmake-3.26.0-Linux-x86_64.tar.gz + ln -s `pwd`/cmake-3.26.0-Linux-x86_64/bin/cmake /usr/local/bin + SHELL +end diff --git a/third_party/fmt/support/bazel/.bazelversion b/third_party/fmt/support/bazel/.bazelversion new file mode 100644 index 00000000..a8a18875 --- /dev/null +++ b/third_party/fmt/support/bazel/.bazelversion @@ -0,0 +1 @@ +7.1.2 diff --git a/third_party/fmt/support/bazel/BUILD.bazel b/third_party/fmt/support/bazel/BUILD.bazel new file mode 100644 index 00000000..1a06ed52 --- /dev/null +++ b/third_party/fmt/support/bazel/BUILD.bazel @@ -0,0 +1,20 @@ +cc_library( + name = "fmt", + srcs = [ + #"src/fmt.cc", # No C++ module support, yet in Bazel (https://github.com/bazelbuild/bazel/pull/19940) + "src/format.cc", + "src/os.cc", + ], + hdrs = glob([ + "include/fmt/*.h", + ]), + copts = select({ + "@platforms//os:windows": ["-utf-8"], + "//conditions:default": [], + }), + includes = [ + "include", + ], + strip_include_prefix = "include", + visibility = ["//visibility:public"], +) diff --git a/third_party/fmt/support/bazel/MODULE.bazel b/third_party/fmt/support/bazel/MODULE.bazel new file mode 100644 index 00000000..6023f362 --- /dev/null +++ b/third_party/fmt/support/bazel/MODULE.bazel @@ -0,0 +1,6 @@ +module( + name = "fmt", + compatibility_level = 10, +) + +bazel_dep(name = "platforms", version = "0.0.10") diff --git a/third_party/fmt/support/bazel/README.md b/third_party/fmt/support/bazel/README.md new file mode 100644 index 00000000..44508f1c --- /dev/null +++ b/third_party/fmt/support/bazel/README.md @@ -0,0 +1,28 @@ +# Bazel support + +To get [Bazel](https://bazel.build/) working with {fmt} you can copy the files `BUILD.bazel`, +`MODULE.bazel`, `WORKSPACE.bazel`, and `.bazelversion` from this folder (`support/bazel`) to the root folder of this project. +This way {fmt} gets bazelized and can be used with Bazel (e.g. doing a `bazel build //...` on {fmt}). + +## Using {fmt} as a dependency + +### Using Bzlmod + +The [Bazel Central Registry](https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/fmt) provides support for {fmt}. + +For instance, to use {fmt} add to your `MODULE.bazel` file: + +``` +bazel_dep(name = "fmt", version = "10.2.1") +``` + +### Live at head + +For a live-at-head approach, you can copy the contents of this repository and move the Bazel-related build files to the root folder of this project as described above and make use of `local_path_override`, e.g.: + +``` +local_path_override( + module_name = "fmt", + path = "../third_party/fmt", +) +``` diff --git a/third_party/fmt/support/bazel/WORKSPACE.bazel b/third_party/fmt/support/bazel/WORKSPACE.bazel new file mode 100644 index 00000000..b1be18f3 --- /dev/null +++ b/third_party/fmt/support/bazel/WORKSPACE.bazel @@ -0,0 +1,2 @@ +# WORKSPACE marker file needed by Bazel + diff --git a/third_party/fmt/support/build.gradle b/third_party/fmt/support/build.gradle new file mode 100644 index 00000000..c5126d05 --- /dev/null +++ b/third_party/fmt/support/build.gradle @@ -0,0 +1,132 @@ +import java.nio.file.Paths + +// General gradle arguments for root project +buildscript { + repositories { + google() + jcenter() + } + dependencies { + // + // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle + // + // Notice that 4.0.0 here is the version of [Android Gradle Plugin] + // According to URL above you will need Gradle 6.1 or higher + // + classpath "com.android.tools.build:gradle:4.1.1" + } +} +repositories { + google() + jcenter() +} + +// Project's root where CMakeLists.txt exists: rootDir/support/.cxx -> rootDir +def rootDir = Paths.get(project.buildDir.getParent()).getParent() +println("rootDir: ${rootDir}") + +// Output: Shared library (.so) for Android +apply plugin: "com.android.library" +android { + compileSdkVersion 25 // Android 7.0 + + // Target ABI + // - This option controls target platform of module + // - The platform might be limited by compiler's support + // some can work with Clang(default), but some can work only with GCC... + // if bad, both toolchains might not support it + splits { + abi { + enable true + // Specify platforms for Application + reset() + include "arm64-v8a", "armeabi-v7a", "x86_64" + } + } + ndkVersion "21.3.6528147" // ANDROID_NDK_HOME is deprecated. Be explicit + + defaultConfig { + minSdkVersion 21 // Android 5.0+ + targetSdkVersion 25 // Follow Compile SDK + versionCode 34 // Follow release count + versionName "7.1.2" // Follow Official version + + externalNativeBuild { + cmake { + arguments "-DANDROID_STL=c++_shared" // Specify Android STL + arguments "-DBUILD_SHARED_LIBS=true" // Build shared object + arguments "-DFMT_TEST=false" // Skip test + arguments "-DFMT_DOC=false" // Skip document + cppFlags "-std=c++17" + targets "fmt" + } + } + println(externalNativeBuild.cmake.cppFlags) + println(externalNativeBuild.cmake.arguments) + } + + // External Native build + // - Use existing CMakeList.txt + // - Give path to CMake. This gradle file should be + // neighbor of the top level cmake + externalNativeBuild { + cmake { + version "3.10.0+" + path "${rootDir}/CMakeLists.txt" + // buildStagingDirectory "./build" // Custom path for cmake output + } + } + + sourceSets{ + // Android Manifest for Gradle + main { + manifest.srcFile "AndroidManifest.xml" + } + } + + // https://developer.android.com/studio/build/native-dependencies#build_system_configuration + buildFeatures { + prefab true + prefabPublishing true + } + prefab { + fmt { + headers "${rootDir}/include" + } + } +} + +assemble.doLast +{ + // Instead of `ninja install`, Gradle will deploy the files. + // We are doing this since FMT is dependent to the ANDROID_STL after build + copy { + from "build/intermediates/cmake" + into "${rootDir}/libs" + } + // Copy debug binaries + copy { + from "${rootDir}/libs/debug/obj" + into "${rootDir}/libs/debug" + } + // Copy Release binaries + copy { + from "${rootDir}/libs/release/obj" + into "${rootDir}/libs/release" + } + // Remove empty directory + delete "${rootDir}/libs/debug/obj" + delete "${rootDir}/libs/release/obj" + + // Copy AAR files. Notice that the aar is named after the folder of this script. + copy { + from "build/outputs/aar/support-release.aar" + into "${rootDir}/libs" + rename "support-release.aar", "fmt-release.aar" + } + copy { + from "build/outputs/aar/support-debug.aar" + into "${rootDir}/libs" + rename "support-debug.aar", "fmt-debug.aar" + } +} diff --git a/third_party/fmt/support/check-commits b/third_party/fmt/support/check-commits new file mode 100644 index 00000000..11472d41 --- /dev/null +++ b/third_party/fmt/support/check-commits @@ -0,0 +1,43 @@ +#!/usr/bin/env python3 + +"""Compile source on a range of commits + +Usage: + check-commits +""" + +import docopt, os, sys, tempfile +from subprocess import check_call, check_output, run + +args = docopt.docopt(__doc__) +start = args.get('') +source = args.get('') + +cwd = os.getcwd() + +with tempfile.TemporaryDirectory() as work_dir: + check_call(['git', 'clone', 'https://github.com/fmtlib/fmt.git'], + cwd=work_dir) + repo_dir = os.path.join(work_dir, 'fmt') + commits = check_output( + ['git', 'rev-list', f'{start}..HEAD', '--abbrev-commit', + '--', 'include', 'src'], + text=True, cwd=repo_dir).rstrip().split('\n') + commits.reverse() + print('Time\tCommit') + for commit in commits: + check_call(['git', '-c', 'advice.detachedHead=false', 'checkout', commit], + cwd=repo_dir) + returncode = run( + ['c++', '-std=c++11', '-O3', '-DNDEBUG', '-I', 'include', + 'src/format.cc', os.path.join(cwd, source)], cwd=repo_dir).returncode + if returncode != 0: + continue + times = [] + for i in range(5): + output = check_output([os.path.join(repo_dir, 'a.out')], text=True) + times.append(float(output)) + message = check_output(['git', 'log', '-1', '--pretty=format:%s', commit], + cwd=repo_dir, text=True) + print(f'{min(times)}\t{commit} {message[:40]}') + sys.stdout.flush() diff --git a/third_party/fmt/support/docopt.py b/third_party/fmt/support/docopt.py new file mode 100644 index 00000000..2e43f7ce --- /dev/null +++ b/third_party/fmt/support/docopt.py @@ -0,0 +1,581 @@ +"""Pythonic command-line interface parser that will make you smile. + + * http://docopt.org + * Repository and issue-tracker: https://github.com/docopt/docopt + * Licensed under terms of MIT license (see LICENSE-MIT) + * Copyright (c) 2013 Vladimir Keleshev, vladimir@keleshev.com + +""" +import sys +import re + + +__all__ = ['docopt'] +__version__ = '0.6.1' + + +class DocoptLanguageError(Exception): + + """Error in construction of usage-message by developer.""" + + +class DocoptExit(SystemExit): + + """Exit in case user invoked program with incorrect arguments.""" + + usage = '' + + def __init__(self, message=''): + SystemExit.__init__(self, (message + '\n' + self.usage).strip()) + + +class Pattern(object): + + def __eq__(self, other): + return repr(self) == repr(other) + + def __hash__(self): + return hash(repr(self)) + + def fix(self): + self.fix_identities() + self.fix_repeating_arguments() + return self + + def fix_identities(self, uniq=None): + """Make pattern-tree tips point to same object if they are equal.""" + if not hasattr(self, 'children'): + return self + uniq = list(set(self.flat())) if uniq is None else uniq + for i, child in enumerate(self.children): + if not hasattr(child, 'children'): + assert child in uniq + self.children[i] = uniq[uniq.index(child)] + else: + child.fix_identities(uniq) + + def fix_repeating_arguments(self): + """Fix elements that should accumulate/increment values.""" + either = [list(child.children) for child in transform(self).children] + for case in either: + for e in [child for child in case if case.count(child) > 1]: + if type(e) is Argument or type(e) is Option and e.argcount: + if e.value is None: + e.value = [] + elif type(e.value) is not list: + e.value = e.value.split() + if type(e) is Command or type(e) is Option and e.argcount == 0: + e.value = 0 + return self + + +def transform(pattern): + """Expand pattern into an (almost) equivalent one, but with single Either. + + Example: ((-a | -b) (-c | -d)) => (-a -c | -a -d | -b -c | -b -d) + Quirks: [-a] => (-a), (-a...) => (-a -a) + + """ + result = [] + groups = [[pattern]] + while groups: + children = groups.pop(0) + parents = [Required, Optional, OptionsShortcut, Either, OneOrMore] + if any(t in map(type, children) for t in parents): + child = [c for c in children if type(c) in parents][0] + children.remove(child) + if type(child) is Either: + for c in child.children: + groups.append([c] + children) + elif type(child) is OneOrMore: + groups.append(child.children * 2 + children) + else: + groups.append(child.children + children) + else: + result.append(children) + return Either(*[Required(*e) for e in result]) + + +class LeafPattern(Pattern): + + """Leaf/terminal node of a pattern tree.""" + + def __init__(self, name, value=None): + self.name, self.value = name, value + + def __repr__(self): + return '%s(%r, %r)' % (self.__class__.__name__, self.name, self.value) + + def flat(self, *types): + return [self] if not types or type(self) in types else [] + + def match(self, left, collected=None): + collected = [] if collected is None else collected + pos, match = self.single_match(left) + if match is None: + return False, left, collected + left_ = left[:pos] + left[pos + 1:] + same_name = [a for a in collected if a.name == self.name] + if type(self.value) in (int, list): + if type(self.value) is int: + increment = 1 + else: + increment = ([match.value] if type(match.value) is str + else match.value) + if not same_name: + match.value = increment + return True, left_, collected + [match] + same_name[0].value += increment + return True, left_, collected + return True, left_, collected + [match] + + +class BranchPattern(Pattern): + + """Branch/inner node of a pattern tree.""" + + def __init__(self, *children): + self.children = list(children) + + def __repr__(self): + return '%s(%s)' % (self.__class__.__name__, + ', '.join(repr(a) for a in self.children)) + + def flat(self, *types): + if type(self) in types: + return [self] + return sum([child.flat(*types) for child in self.children], []) + + +class Argument(LeafPattern): + + def single_match(self, left): + for n, pattern in enumerate(left): + if type(pattern) is Argument: + return n, Argument(self.name, pattern.value) + return None, None + + @classmethod + def parse(class_, source): + name = re.findall('(<\S*?>)', source)[0] + value = re.findall('\[default: (.*)\]', source, flags=re.I) + return class_(name, value[0] if value else None) + + +class Command(Argument): + + def __init__(self, name, value=False): + self.name, self.value = name, value + + def single_match(self, left): + for n, pattern in enumerate(left): + if type(pattern) is Argument: + if pattern.value == self.name: + return n, Command(self.name, True) + else: + break + return None, None + + +class Option(LeafPattern): + + def __init__(self, short=None, long=None, argcount=0, value=False): + assert argcount in (0, 1) + self.short, self.long, self.argcount = short, long, argcount + self.value = None if value is False and argcount else value + + @classmethod + def parse(class_, option_description): + short, long, argcount, value = None, None, 0, False + options, _, description = option_description.strip().partition(' ') + options = options.replace(',', ' ').replace('=', ' ') + for s in options.split(): + if s.startswith('--'): + long = s + elif s.startswith('-'): + short = s + else: + argcount = 1 + if argcount: + matched = re.findall('\[default: (.*)\]', description, flags=re.I) + value = matched[0] if matched else None + return class_(short, long, argcount, value) + + def single_match(self, left): + for n, pattern in enumerate(left): + if self.name == pattern.name: + return n, pattern + return None, None + + @property + def name(self): + return self.long or self.short + + def __repr__(self): + return 'Option(%r, %r, %r, %r)' % (self.short, self.long, + self.argcount, self.value) + + +class Required(BranchPattern): + + def match(self, left, collected=None): + collected = [] if collected is None else collected + l = left + c = collected + for pattern in self.children: + matched, l, c = pattern.match(l, c) + if not matched: + return False, left, collected + return True, l, c + + +class Optional(BranchPattern): + + def match(self, left, collected=None): + collected = [] if collected is None else collected + for pattern in self.children: + m, left, collected = pattern.match(left, collected) + return True, left, collected + + +class OptionsShortcut(Optional): + + """Marker/placeholder for [options] shortcut.""" + + +class OneOrMore(BranchPattern): + + def match(self, left, collected=None): + assert len(self.children) == 1 + collected = [] if collected is None else collected + l = left + c = collected + l_ = None + matched = True + times = 0 + while matched: + # could it be that something didn't match but changed l or c? + matched, l, c = self.children[0].match(l, c) + times += 1 if matched else 0 + if l_ == l: + break + l_ = l + if times >= 1: + return True, l, c + return False, left, collected + + +class Either(BranchPattern): + + def match(self, left, collected=None): + collected = [] if collected is None else collected + outcomes = [] + for pattern in self.children: + matched, _, _ = outcome = pattern.match(left, collected) + if matched: + outcomes.append(outcome) + if outcomes: + return min(outcomes, key=lambda outcome: len(outcome[1])) + return False, left, collected + + +class Tokens(list): + + def __init__(self, source, error=DocoptExit): + self += source.split() if hasattr(source, 'split') else source + self.error = error + + @staticmethod + def from_pattern(source): + source = re.sub(r'([\[\]\(\)\|]|\.\.\.)', r' \1 ', source) + source = [s for s in re.split('\s+|(\S*<.*?>)', source) if s] + return Tokens(source, error=DocoptLanguageError) + + def move(self): + return self.pop(0) if len(self) else None + + def current(self): + return self[0] if len(self) else None + + +def parse_long(tokens, options): + """long ::= '--' chars [ ( ' ' | '=' ) chars ] ;""" + long, eq, value = tokens.move().partition('=') + assert long.startswith('--') + value = None if eq == value == '' else value + similar = [o for o in options if o.long == long] + if tokens.error is DocoptExit and similar == []: # if no exact match + similar = [o for o in options if o.long and o.long.startswith(long)] + if len(similar) > 1: # might be simply specified ambiguously 2+ times? + raise tokens.error('%s is not a unique prefix: %s?' % + (long, ', '.join(o.long for o in similar))) + elif len(similar) < 1: + argcount = 1 if eq == '=' else 0 + o = Option(None, long, argcount) + options.append(o) + if tokens.error is DocoptExit: + o = Option(None, long, argcount, value if argcount else True) + else: + o = Option(similar[0].short, similar[0].long, + similar[0].argcount, similar[0].value) + if o.argcount == 0: + if value is not None: + raise tokens.error('%s must not have an argument' % o.long) + else: + if value is None: + if tokens.current() in [None, '--']: + raise tokens.error('%s requires argument' % o.long) + value = tokens.move() + if tokens.error is DocoptExit: + o.value = value if value is not None else True + return [o] + + +def parse_shorts(tokens, options): + """shorts ::= '-' ( chars )* [ [ ' ' ] chars ] ;""" + token = tokens.move() + assert token.startswith('-') and not token.startswith('--') + left = token.lstrip('-') + parsed = [] + while left != '': + short, left = '-' + left[0], left[1:] + similar = [o for o in options if o.short == short] + if len(similar) > 1: + raise tokens.error('%s is specified ambiguously %d times' % + (short, len(similar))) + elif len(similar) < 1: + o = Option(short, None, 0) + options.append(o) + if tokens.error is DocoptExit: + o = Option(short, None, 0, True) + else: # why copying is necessary here? + o = Option(short, similar[0].long, + similar[0].argcount, similar[0].value) + value = None + if o.argcount != 0: + if left == '': + if tokens.current() in [None, '--']: + raise tokens.error('%s requires argument' % short) + value = tokens.move() + else: + value = left + left = '' + if tokens.error is DocoptExit: + o.value = value if value is not None else True + parsed.append(o) + return parsed + + +def parse_pattern(source, options): + tokens = Tokens.from_pattern(source) + result = parse_expr(tokens, options) + if tokens.current() is not None: + raise tokens.error('unexpected ending: %r' % ' '.join(tokens)) + return Required(*result) + + +def parse_expr(tokens, options): + """expr ::= seq ( '|' seq )* ;""" + seq = parse_seq(tokens, options) + if tokens.current() != '|': + return seq + result = [Required(*seq)] if len(seq) > 1 else seq + while tokens.current() == '|': + tokens.move() + seq = parse_seq(tokens, options) + result += [Required(*seq)] if len(seq) > 1 else seq + return [Either(*result)] if len(result) > 1 else result + + +def parse_seq(tokens, options): + """seq ::= ( atom [ '...' ] )* ;""" + result = [] + while tokens.current() not in [None, ']', ')', '|']: + atom = parse_atom(tokens, options) + if tokens.current() == '...': + atom = [OneOrMore(*atom)] + tokens.move() + result += atom + return result + + +def parse_atom(tokens, options): + """atom ::= '(' expr ')' | '[' expr ']' | 'options' + | long | shorts | argument | command ; + """ + token = tokens.current() + result = [] + if token in '([': + tokens.move() + matching, pattern = {'(': [')', Required], '[': [']', Optional]}[token] + result = pattern(*parse_expr(tokens, options)) + if tokens.move() != matching: + raise tokens.error("unmatched '%s'" % token) + return [result] + elif token == 'options': + tokens.move() + return [OptionsShortcut()] + elif token.startswith('--') and token != '--': + return parse_long(tokens, options) + elif token.startswith('-') and token not in ('-', '--'): + return parse_shorts(tokens, options) + elif token.startswith('<') and token.endswith('>') or token.isupper(): + return [Argument(tokens.move())] + else: + return [Command(tokens.move())] + + +def parse_argv(tokens, options, options_first=False): + """Parse command-line argument vector. + + If options_first: + argv ::= [ long | shorts ]* [ argument ]* [ '--' [ argument ]* ] ; + else: + argv ::= [ long | shorts | argument ]* [ '--' [ argument ]* ] ; + + """ + parsed = [] + while tokens.current() is not None: + if tokens.current() == '--': + return parsed + [Argument(None, v) for v in tokens] + elif tokens.current().startswith('--'): + parsed += parse_long(tokens, options) + elif tokens.current().startswith('-') and tokens.current() != '-': + parsed += parse_shorts(tokens, options) + elif options_first: + return parsed + [Argument(None, v) for v in tokens] + else: + parsed.append(Argument(None, tokens.move())) + return parsed + + +def parse_defaults(doc): + defaults = [] + for s in parse_section('options:', doc): + # FIXME corner case "bla: options: --foo" + _, _, s = s.partition(':') # get rid of "options:" + split = re.split('\n[ \t]*(-\S+?)', '\n' + s)[1:] + split = [s1 + s2 for s1, s2 in zip(split[::2], split[1::2])] + options = [Option.parse(s) for s in split if s.startswith('-')] + defaults += options + return defaults + + +def parse_section(name, source): + pattern = re.compile('^([^\n]*' + name + '[^\n]*\n?(?:[ \t].*?(?:\n|$))*)', + re.IGNORECASE | re.MULTILINE) + return [s.strip() for s in pattern.findall(source)] + + +def formal_usage(section): + _, _, section = section.partition(':') # drop "usage:" + pu = section.split() + return '( ' + ' '.join(') | (' if s == pu[0] else s for s in pu[1:]) + ' )' + + +def extras(help, version, options, doc): + if help and any((o.name in ('-h', '--help')) and o.value for o in options): + print(doc.strip("\n")) + sys.exit() + if version and any(o.name == '--version' and o.value for o in options): + print(version) + sys.exit() + + +class Dict(dict): + def __repr__(self): + return '{%s}' % ',\n '.join('%r: %r' % i for i in sorted(self.items())) + + +def docopt(doc, argv=None, help=True, version=None, options_first=False): + """Parse `argv` based on command-line interface described in `doc`. + + `docopt` creates your command-line interface based on its + description that you pass as `doc`. Such description can contain + --options, , commands, which could be + [optional], (required), (mutually | exclusive) or repeated... + + Parameters + ---------- + doc : str + Description of your command-line interface. + argv : list of str, optional + Argument vector to be parsed. sys.argv[1:] is used if not + provided. + help : bool (default: True) + Set to False to disable automatic help on -h or --help + options. + version : any object + If passed, the object will be printed if --version is in + `argv`. + options_first : bool (default: False) + Set to True to require options precede positional arguments, + i.e. to forbid options and positional arguments intermix. + + Returns + ------- + args : dict + A dictionary, where keys are names of command-line elements + such as e.g. "--verbose" and "", and values are the + parsed values of those elements. + + Example + ------- + >>> from docopt import docopt + >>> doc = ''' + ... Usage: + ... my_program tcp [--timeout=] + ... my_program serial [--baud=] [--timeout=] + ... my_program (-h | --help | --version) + ... + ... Options: + ... -h, --help Show this screen and exit. + ... --baud= Baudrate [default: 9600] + ... ''' + >>> argv = ['tcp', '127.0.0.1', '80', '--timeout', '30'] + >>> docopt(doc, argv) + {'--baud': '9600', + '--help': False, + '--timeout': '30', + '--version': False, + '': '127.0.0.1', + '': '80', + 'serial': False, + 'tcp': True} + + See also + -------- + * For video introduction see http://docopt.org + * Full documentation is available in README.rst as well as online + at https://github.com/docopt/docopt#readme + + """ + argv = sys.argv[1:] if argv is None else argv + + usage_sections = parse_section('usage:', doc) + if len(usage_sections) == 0: + raise DocoptLanguageError('"usage:" (case-insensitive) not found.') + if len(usage_sections) > 1: + raise DocoptLanguageError('More than one "usage:" (case-insensitive).') + DocoptExit.usage = usage_sections[0] + + options = parse_defaults(doc) + pattern = parse_pattern(formal_usage(DocoptExit.usage), options) + # [default] syntax for argument is disabled + #for a in pattern.flat(Argument): + # same_name = [d for d in arguments if d.name == a.name] + # if same_name: + # a.value = same_name[0].value + argv = parse_argv(Tokens(argv), list(options), options_first) + pattern_options = set(pattern.flat(Option)) + for options_shortcut in pattern.flat(OptionsShortcut): + doc_options = parse_defaults(doc) + options_shortcut.children = list(set(doc_options) - pattern_options) + #if any_options: + # options_shortcut.children += [Option(o.short, o.long, o.argcount) + # for o in argv if type(o) is Option] + extras(help, version, argv, doc) + matched, left, collected = pattern.fix().match(argv) + if matched and left == []: # better error message if left? + return Dict((a.name, a.value) for a in (pattern.flat() + collected)) + raise DocoptExit() diff --git a/third_party/fmt/support/manage.py b/third_party/fmt/support/manage.py new file mode 100644 index 00000000..3467afb0 --- /dev/null +++ b/third_party/fmt/support/manage.py @@ -0,0 +1,218 @@ +#!/usr/bin/env python3 + +"""Manage site and releases. + +Usage: + manage.py release [] + manage.py site + +For the release command $FMT_TOKEN should contain a GitHub personal access token +obtained from https://github.com/settings/tokens. +""" + +from __future__ import print_function +import datetime, docopt, errno, fileinput, json, os +import re, requests, shutil, sys +from contextlib import contextmanager +from subprocess import check_call + + +class Git: + def __init__(self, dir): + self.dir = dir + + def call(self, method, args, **kwargs): + return check_call(['git', method] + list(args), **kwargs) + + def add(self, *args): + return self.call('add', args, cwd=self.dir) + + def checkout(self, *args): + return self.call('checkout', args, cwd=self.dir) + + def clean(self, *args): + return self.call('clean', args, cwd=self.dir) + + def clone(self, *args): + return self.call('clone', list(args) + [self.dir]) + + def commit(self, *args): + return self.call('commit', args, cwd=self.dir) + + def pull(self, *args): + return self.call('pull', args, cwd=self.dir) + + def push(self, *args): + return self.call('push', args, cwd=self.dir) + + def reset(self, *args): + return self.call('reset', args, cwd=self.dir) + + def update(self, *args): + clone = not os.path.exists(self.dir) + if clone: + self.clone(*args) + return clone + + +def clean_checkout(repo, branch): + repo.clean('-f', '-d') + repo.reset('--hard') + repo.checkout(branch) + + +class Runner: + def __init__(self, cwd): + self.cwd = cwd + + def __call__(self, *args, **kwargs): + kwargs['cwd'] = kwargs.get('cwd', self.cwd) + check_call(args, **kwargs) + + +def create_build_env(): + """Create a build environment.""" + class Env: + pass + env = Env() + env.fmt_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + env.build_dir = 'build' + env.fmt_repo = Git(os.path.join(env.build_dir, 'fmt')) + return env + + +fmt_repo_url = 'git@github.com:fmtlib/fmt' + + +def update_site(env): + env.fmt_repo.update(fmt_repo_url) + + doc_repo = Git(os.path.join(env.build_dir, 'fmt.dev')) + doc_repo.update('git@github.com:fmtlib/fmt.dev') + + version = '11.0.0' + clean_checkout(env.fmt_repo, version) + target_doc_dir = os.path.join(env.fmt_repo.dir, 'doc') + + # Build the docs. + html_dir = os.path.join(env.build_dir, 'html') + if os.path.exists(html_dir): + shutil.rmtree(html_dir) + include_dir = env.fmt_repo.dir + import build + build.build_docs(version, doc_dir=target_doc_dir, + include_dir=include_dir, work_dir=env.build_dir) + shutil.rmtree(os.path.join(html_dir, '.doctrees')) + # Copy docs to the website. + version_doc_dir = os.path.join(doc_repo.dir, version) + try: + shutil.rmtree(version_doc_dir) + except OSError as e: + if e.errno != errno.ENOENT: + raise + shutil.move(html_dir, version_doc_dir) + + +def release(args): + env = create_build_env() + fmt_repo = env.fmt_repo + + branch = args.get('') + if branch is None: + branch = 'master' + if not fmt_repo.update('-b', branch, fmt_repo_url): + clean_checkout(fmt_repo, branch) + + # Update the date in the changelog and extract the version and the first + # section content. + changelog = 'ChangeLog.md' + changelog_path = os.path.join(fmt_repo.dir, changelog) + is_first_section = True + first_section = [] + for i, line in enumerate(fileinput.input(changelog_path, inplace=True)): + if i == 0: + version = re.match(r'# (.*) - TBD', line).group(1) + line = '# {} - {}\n'.format( + version, datetime.date.today().isoformat()) + elif not is_first_section: + pass + elif line.startswith('#'): + is_first_section = False + else: + first_section.append(line) + sys.stdout.write(line) + if first_section[0] == '\n': + first_section.pop(0) + + ns_version = None + base_h_path = os.path.join(fmt_repo.dir, 'include', 'fmt', 'base.h') + for line in fileinput.input(base_h_path): + m = re.match(r'\s*inline namespace v(.*) .*', line) + if m: + ns_version = m.group(1) + break + major_version = version.split('.')[0] + if not ns_version or ns_version != major_version: + raise Exception(f'Version mismatch {ns_version} != {major_version}') + + # Workaround GitHub-flavored Markdown treating newlines as
. + changes = '' + code_block = False + stripped = False + for line in first_section: + if re.match(r'^\s*```', line): + code_block = not code_block + changes += line + stripped = False + continue + if code_block: + changes += line + continue + if line == '\n' or re.match(r'^\s*\|.*', line): + if stripped: + changes += '\n' + stripped = False + changes += line + continue + if stripped: + line = ' ' + line.lstrip() + changes += line.rstrip() + stripped = True + + fmt_repo.checkout('-B', 'release') + fmt_repo.add(changelog) + fmt_repo.commit('-m', 'Update version') + + # Build the docs and package. + run = Runner(fmt_repo.dir) + run('cmake', '.') + run('make', 'doc', 'package_source') + + # Create a release on GitHub. + fmt_repo.push('origin', 'release') + auth_headers = {'Authorization': 'token ' + os.getenv('FMT_TOKEN')} + r = requests.post('https://api.github.com/repos/fmtlib/fmt/releases', + headers=auth_headers, + data=json.dumps({'tag_name': version, + 'target_commitish': 'release', + 'body': changes, 'draft': True})) + if r.status_code != 201: + raise Exception('Failed to create a release ' + str(r)) + id = r.json()['id'] + uploads_url = 'https://uploads.github.com/repos/fmtlib/fmt/releases' + package = 'fmt-{}.zip'.format(version) + r = requests.post( + '{}/{}/assets?name={}'.format(uploads_url, id, package), + headers={'Content-Type': 'application/zip'} | auth_headers, + data=open('build/fmt/' + package, 'rb')) + if r.status_code != 201: + raise Exception('Failed to upload an asset ' + str(r)) + + update_site(env) + +if __name__ == '__main__': + args = docopt.docopt(__doc__) + if args.get('release'): + release(args) + elif args.get('site'): + update_site(create_build_env()) diff --git a/third_party/fmt/support/mkdocs b/third_party/fmt/support/mkdocs new file mode 100644 index 00000000..6901918e --- /dev/null +++ b/third_party/fmt/support/mkdocs @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 +# A script to invoke mkdocs with the correct environment. +# Additionally supports deploying via mike: +# ./mkdocs deploy [mike-deploy-options] + +import errno, os, shutil, sys +from subprocess import call + +support_dir = os.path.dirname(os.path.normpath(__file__)) +build_dir = os.path.join(os.path.dirname(support_dir), 'build') + +# Set PYTHONPATH for the mkdocstrings handler. +env = os.environ.copy() +path = env.get('PYTHONPATH') +env['PYTHONPATH'] = \ + (path + ':' if path else '') + os.path.join(support_dir, 'python') + +config_path = os.path.join(support_dir, 'mkdocs.yml') +args = sys.argv[1:] +if len(args) > 0: + command = args[0] + if command == 'deploy': + git_url = 'https://github.com/' if 'CI' in os.environ else 'git@github.com:' + site_repo = git_url + 'fmtlib/fmt.dev.git' + + site_dir = os. path.join(build_dir, 'fmt.dev') + try: + shutil.rmtree(site_dir) + except OSError as e: + if e.errno == errno.ENOENT: + pass + ret = call(['git', 'clone', '--depth=1', site_repo, site_dir]) + if ret != 0: + sys.exit(ret) + + # Copy the config to the build dir because the site is built relative to it. + config_build_path = os.path.join(build_dir, 'mkdocs.yml') + shutil.copyfile(config_path, config_build_path) + + sys.exit(call(['mike'] + args + ['--config-file', config_build_path, + '--branch', 'master'], cwd=site_dir, env=env)) + elif not command.startswith('-'): + args += ['-f', config_path] +sys.exit(call(['mkdocs'] + args, env=env)) diff --git a/third_party/fmt/support/mkdocs.yml b/third_party/fmt/support/mkdocs.yml new file mode 100644 index 00000000..17034cd1 --- /dev/null +++ b/third_party/fmt/support/mkdocs.yml @@ -0,0 +1,48 @@ +site_name: '{fmt}' + +docs_dir: ../doc + +repo_url: https://github.com/fmtlib/fmt + +theme: + name: material + features: + - navigation.tabs + - navigation.top + - toc.integrate + +extra_javascript: + - https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js + - fmt.js + +extra_css: + - https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/styles/default.min.css + - fmt.css + +markdown_extensions: + - pymdownx.highlight: + # Use JavaScript syntax highlighter instead of Pygments because it + # automatically applies to code blocks extracted through Doxygen. + use_pygments: false + anchor_linenums: true + line_spans: __span + pygments_lang_class: true + - pymdownx.inlinehilite + - pymdownx.snippets + +plugins: + - search + - mkdocstrings: + default_handler: cxx +nav: + - Home: index.md + - Get Started: get-started.md + - API: api.md + - Syntax: syntax.md + +exclude_docs: ChangeLog-old.md + +extra: + version: + provider: mike + generator: false diff --git a/third_party/fmt/support/printable.py b/third_party/fmt/support/printable.py new file mode 100644 index 00000000..8fa86b30 --- /dev/null +++ b/third_party/fmt/support/printable.py @@ -0,0 +1,201 @@ +#!/usr/bin/env python3 + +# This script is based on +# https://github.com/rust-lang/rust/blob/master/library/core/src/unicode/printable.py +# distributed under https://github.com/rust-lang/rust/blob/master/LICENSE-MIT. + +# This script uses the following Unicode tables: +# - UnicodeData.txt + + +from collections import namedtuple +import csv +import os +import subprocess + +NUM_CODEPOINTS=0x110000 + +def to_ranges(iter): + current = None + for i in iter: + if current is None or i != current[1] or i in (0x10000, 0x20000): + if current is not None: + yield tuple(current) + current = [i, i + 1] + else: + current[1] += 1 + if current is not None: + yield tuple(current) + +def get_escaped(codepoints): + for c in codepoints: + if (c.class_ or "Cn") in "Cc Cf Cs Co Cn Zl Zp Zs".split() and c.value != ord(' '): + yield c.value + +def get_file(f): + try: + return open(os.path.basename(f)) + except FileNotFoundError: + subprocess.run(["curl", "-O", f], check=True) + return open(os.path.basename(f)) + +Codepoint = namedtuple('Codepoint', 'value class_') + +def get_codepoints(f): + r = csv.reader(f, delimiter=";") + prev_codepoint = 0 + class_first = None + for row in r: + codepoint = int(row[0], 16) + name = row[1] + class_ = row[2] + + if class_first is not None: + if not name.endswith("Last>"): + raise ValueError("Missing Last after First") + + for c in range(prev_codepoint + 1, codepoint): + yield Codepoint(c, class_first) + + class_first = None + if name.endswith("First>"): + class_first = class_ + + yield Codepoint(codepoint, class_) + prev_codepoint = codepoint + + if class_first is not None: + raise ValueError("Missing Last after First") + + for c in range(prev_codepoint + 1, NUM_CODEPOINTS): + yield Codepoint(c, None) + +def compress_singletons(singletons): + uppers = [] # (upper, # items in lowers) + lowers = [] + + for i in singletons: + upper = i >> 8 + lower = i & 0xff + if len(uppers) == 0 or uppers[-1][0] != upper: + uppers.append((upper, 1)) + else: + upper, count = uppers[-1] + uppers[-1] = upper, count + 1 + lowers.append(lower) + + return uppers, lowers + +def compress_normal(normal): + # lengths 0x00..0x7f are encoded as 00, 01, ..., 7e, 7f + # lengths 0x80..0x7fff are encoded as 80 80, 80 81, ..., ff fe, ff ff + compressed = [] # [truelen, (truelenaux), falselen, (falselenaux)] + + prev_start = 0 + for start, count in normal: + truelen = start - prev_start + falselen = count + prev_start = start + count + + assert truelen < 0x8000 and falselen < 0x8000 + entry = [] + if truelen > 0x7f: + entry.append(0x80 | (truelen >> 8)) + entry.append(truelen & 0xff) + else: + entry.append(truelen & 0x7f) + if falselen > 0x7f: + entry.append(0x80 | (falselen >> 8)) + entry.append(falselen & 0xff) + else: + entry.append(falselen & 0x7f) + + compressed.append(entry) + + return compressed + +def print_singletons(uppers, lowers, uppersname, lowersname): + print(" static constexpr singleton {}[] = {{".format(uppersname)) + for u, c in uppers: + print(" {{{:#04x}, {}}},".format(u, c)) + print(" };") + print(" static constexpr unsigned char {}[] = {{".format(lowersname)) + for i in range(0, len(lowers), 8): + print(" {}".format(" ".join("{:#04x},".format(l) for l in lowers[i:i+8]))) + print(" };") + +def print_normal(normal, normalname): + print(" static constexpr unsigned char {}[] = {{".format(normalname)) + for v in normal: + print(" {}".format(" ".join("{:#04x},".format(i) for i in v))) + print(" };") + +def main(): + file = get_file("https://www.unicode.org/Public/UNIDATA/UnicodeData.txt") + + codepoints = get_codepoints(file) + + CUTOFF=0x10000 + singletons0 = [] + singletons1 = [] + normal0 = [] + normal1 = [] + extra = [] + + for a, b in to_ranges(get_escaped(codepoints)): + if a > 2 * CUTOFF: + extra.append((a, b - a)) + elif a == b - 1: + if a & CUTOFF: + singletons1.append(a & ~CUTOFF) + else: + singletons0.append(a) + elif a == b - 2: + if a & CUTOFF: + singletons1.append(a & ~CUTOFF) + singletons1.append((a + 1) & ~CUTOFF) + else: + singletons0.append(a) + singletons0.append(a + 1) + else: + if a >= 2 * CUTOFF: + extra.append((a, b - a)) + elif a & CUTOFF: + normal1.append((a & ~CUTOFF, b - a)) + else: + normal0.append((a, b - a)) + + singletons0u, singletons0l = compress_singletons(singletons0) + singletons1u, singletons1l = compress_singletons(singletons1) + normal0 = compress_normal(normal0) + normal1 = compress_normal(normal1) + + print("""\ +FMT_FUNC auto is_printable(uint32_t cp) -> bool {\ +""") + print_singletons(singletons0u, singletons0l, 'singletons0', 'singletons0_lower') + print_singletons(singletons1u, singletons1l, 'singletons1', 'singletons1_lower') + print_normal(normal0, 'normal0') + print_normal(normal1, 'normal1') + print("""\ + auto lower = static_cast(cp); + if (cp < 0x10000) { + return is_printable(lower, singletons0, + sizeof(singletons0) / sizeof(*singletons0), + singletons0_lower, normal0, sizeof(normal0)); + } + if (cp < 0x20000) { + return is_printable(lower, singletons1, + sizeof(singletons1) / sizeof(*singletons1), + singletons1_lower, normal1, sizeof(normal1)); + }\ +""") + for a, b in extra: + print(" if (0x{:x} <= cp && cp < 0x{:x}) return false;".format(a, a + b)) + print("""\ + return cp < 0x{:x}; +}}\ +""".format(NUM_CODEPOINTS)) + +if __name__ == '__main__': + main() diff --git a/third_party/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py b/third_party/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py new file mode 100644 index 00000000..4ade52ab --- /dev/null +++ b/third_party/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py @@ -0,0 +1,317 @@ +# A basic mkdocstrings handler for {fmt}. +# Copyright (c) 2012 - present, Victor Zverovich + +import os +from pathlib import Path +from typing import Any, List, Mapping, Optional +from subprocess import CalledProcessError, PIPE, Popen, STDOUT +import xml.etree.ElementTree as et + +from mkdocstrings.handlers.base import BaseHandler + +class Definition: + '''A definition extracted by Doxygen.''' + def __init__(self, name: str, kind: Optional[str] = None, + node: Optional[et.Element] = None, + is_member: bool = False): + self.name = name + self.kind = kind if kind is not None else node.get('kind') + self.id = name if not is_member else None + self.params = None + self.members = None + +# A map from Doxygen to HTML tags. +tag_map = { + 'bold': 'b', + 'emphasis': 'em', + 'computeroutput': 'code', + 'para': 'p', + 'programlisting': 'pre', + 'verbatim': 'pre' +} + +# A map from Doxygen tags to text. +tag_text_map = { + 'codeline': '', + 'highlight': '', + 'sp': ' ' +} + +def escape_html(s: str) -> str: + return s.replace("<", "<") + +def doxyxml2html(nodes: List[et.Element]): + out = '' + for n in nodes: + tag = tag_map.get(n.tag) + if not tag: + out += tag_text_map[n.tag] + out += '<' + tag + '>' if tag else '' + out += '' if tag == 'pre' else '' + if n.text: + out += escape_html(n.text) + out += doxyxml2html(n) + out += '' if tag == 'pre' else '' + out += '' if tag else '' + if n.tail: + out += n.tail + return out + +def convert_template_params(node: et.Element) -> Optional[List[Definition]]: + templateparamlist = node.find('templateparamlist') + if templateparamlist is None: + return None + params = [] + for param_node in templateparamlist.findall('param'): + name = param_node.find('declname') + param = Definition(name.text if name is not None else '', 'param') + param.type = param_node.find('type').text + params.append(param) + return params + +def get_description(node: et.Element) -> List[et.Element]: + return node.findall('briefdescription/para') + \ + node.findall('detaileddescription/para') + +def normalize_type(type: str) -> str: + type = type.replace('< ', '<').replace(' >', '>') + return type.replace(' &', '&').replace(' *', '*') + +def convert_type(type: et.Element) -> str: + if type is None: + return None + result = type.text if type.text else '' + for ref in type: + result += ref.text + if ref.tail: + result += ref.tail + result += type.tail.strip() + return normalize_type(result) + +def convert_params(func: et.Element) -> Definition: + params = [] + for p in func.findall('param'): + d = Definition(p.find('declname').text, 'param') + d.type = convert_type(p.find('type')) + params.append(d) + return params + +def convert_return_type(d: Definition, node: et.Element) -> None: + d.trailing_return_type = None + if d.type == 'auto' or d.type == 'constexpr auto': + parts = node.find('argsstring').text.split(' -> ') + if len(parts) > 1: + d.trailing_return_type = normalize_type(parts[1]) + +def render_param(param: Definition) -> str: + return param.type + (f' {param.name}' if len(param.name) > 0 else '') + +def render_decl(d: Definition) -> None: + text = '' + if d.id is not None: + text += f'\n' + text += '
'
+
+  text += '
'
+  if d.template_params is not None:
+    text += 'template <'
+    text += ', '.join([render_param(p) for p in d.template_params])
+    text += '>\n'
+  text += '
'
+
+  text += '
'
+  end = ';'
+  if d.kind == 'function' or d.kind == 'variable':
+    text += d.type + ' ' if len(d.type) > 0 else ''
+  elif d.kind == 'typedef':
+    text += 'using '
+  elif d.kind == 'define':
+    end = ''
+  else:
+    text += d.kind + ' '
+  text += d.name
+
+  if d.params is not None:
+    params = ', '.join([
+      (p.type + ' ' if p.type else '') + p.name for p in d.params])
+    text += '(' + escape_html(params) + ')'
+    if d.trailing_return_type:
+      text += ' -⁠> ' + escape_html(d.trailing_return_type)
+  elif d.kind == 'typedef':
+    text += ' = ' + escape_html(d.type)
+
+  text += end
+  text += '
'
+  text += '
\n' + if d.id is not None: + text += f'\n' + return text + +class CxxHandler(BaseHandler): + def __init__(self, **kwargs: Any) -> None: + super().__init__(handler='cxx', **kwargs) + + headers = [ + 'args.h', 'base.h', 'chrono.h', 'color.h', 'compile.h', 'format.h', + 'os.h', 'ostream.h', 'printf.h', 'ranges.h', 'std.h', 'xchar.h' + ] + + # Run doxygen. + cmd = ['doxygen', '-'] + support_dir = Path(__file__).parents[3] + top_dir = os.path.dirname(support_dir) + include_dir = os.path.join(top_dir, 'include', 'fmt') + self._ns2doxyxml = {} + build_dir = os.path.join(top_dir, 'build') + os.makedirs(build_dir, exist_ok=True) + self._doxyxml_dir = os.path.join(build_dir, 'doxyxml') + p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=STDOUT) + _, _ = p.communicate(input=r''' + PROJECT_NAME = fmt + GENERATE_XML = YES + GENERATE_LATEX = NO + GENERATE_HTML = NO + INPUT = {0} + XML_OUTPUT = {1} + QUIET = YES + AUTOLINK_SUPPORT = NO + MACRO_EXPANSION = YES + PREDEFINED = _WIN32=1 \ + __linux__=1 \ + FMT_ENABLE_IF(...)= \ + FMT_USE_USER_DEFINED_LITERALS=1 \ + FMT_USE_ALIAS_TEMPLATES=1 \ + FMT_USE_NONTYPE_TEMPLATE_ARGS=1 \ + FMT_API= \ + "FMT_BEGIN_NAMESPACE=namespace fmt {{" \ + "FMT_END_NAMESPACE=}}" \ + "FMT_DOC=1" + '''.format( + ' '.join([os.path.join(include_dir, h) for h in headers]), + self._doxyxml_dir).encode('utf-8')) + if p.returncode != 0: + raise CalledProcessError(p.returncode, cmd) + + # Merge all file-level XMLs into one to simplify search. + self._file_doxyxml = None + for h in headers: + filename = h.replace(".h", "_8h.xml") + with open(os.path.join(self._doxyxml_dir, filename)) as f: + doxyxml = et.parse(f) + if self._file_doxyxml is None: + self._file_doxyxml = doxyxml + continue + root = self._file_doxyxml.getroot() + for node in doxyxml.getroot(): + root.append(node) + + def collect_compound(self, identifier: str, + cls: List[et.Element]) -> Definition: + '''Collect a compound definition such as a struct.''' + path = os.path.join(self._doxyxml_dir, cls[0].get('refid') + '.xml') + with open(path) as f: + xml = et.parse(f) + node = xml.find('compounddef') + d = Definition(identifier, node=node) + d.template_params = convert_template_params(node) + d.desc = get_description(node) + d.members = [] + for m in node.findall('sectiondef[@kind="public-attrib"]/memberdef') + \ + node.findall('sectiondef[@kind="public-func"]/memberdef'): + name = m.find('name').text + # Doxygen incorrectly classifies members of private unnamed unions as + # public members of the containing class. + if name.endswith('_'): + continue + desc = get_description(m) + if len(desc) == 0: + continue + kind = m.get('kind') + member = Definition(name if name else '', kind=kind, is_member=True) + type = m.find('type').text + member.type = type if type else '' + if kind == 'function': + member.params = convert_params(m) + convert_return_type(member, m) + member.template_params = None + member.desc = desc + d.members.append(member) + return d + + def collect(self, identifier: str, config: Mapping[str, Any]) -> Definition: + qual_name = 'fmt::' + identifier + + param_str = None + paren = qual_name.find('(') + if paren > 0: + qual_name, param_str = qual_name[:paren], qual_name[paren + 1:-1] + + colons = qual_name.rfind('::') + namespace, name = qual_name[:colons], qual_name[colons + 2:] + + # Load XML. + doxyxml = self._ns2doxyxml.get(namespace) + if doxyxml is None: + path = f'namespace{namespace.replace("::", "_1_1")}.xml' + with open(os.path.join(self._doxyxml_dir, path)) as f: + doxyxml = et.parse(f) + self._ns2doxyxml[namespace] = doxyxml + + nodes = doxyxml.findall( + f"compounddef/sectiondef/memberdef/name[.='{name}']/..") + if len(nodes) == 0: + nodes = self._file_doxyxml.findall( + f"compounddef/sectiondef/memberdef/name[.='{name}']/..") + candidates = [] + for node in nodes: + # Process a function or a typedef. + params = None + d = Definition(name, node=node) + if d.kind == 'function': + params = convert_params(node) + node_param_str = ', '.join([p.type for p in params]) + if param_str and param_str != node_param_str: + candidates.append(f'{name}({node_param_str})') + continue + elif d.kind == 'define': + params = [] + for p in node.findall('param'): + param = Definition(p.find('defname').text, kind='param') + param.type = None + params.append(param) + d.type = convert_type(node.find('type')) + d.template_params = convert_template_params(node) + d.params = params + convert_return_type(d, node) + d.desc = get_description(node) + return d + + cls = doxyxml.findall(f"compounddef/innerclass[.='{qual_name}']") + if not cls: + raise Exception(f'Cannot find {identifier}. Candidates: {candidates}') + return self.collect_compound(identifier, cls) + + def render(self, d: Definition, config: dict) -> str: + if d.id is not None: + self.do_heading('', 0, id=d.id) + text = '
\n' + text += render_decl(d) + text += '
\n' + text += doxyxml2html(d.desc) + if d.members is not None: + for m in d.members: + text += self.render(m, config) + text += '
\n' + text += '
\n' + return text + +def get_handler(theme: str, custom_templates: Optional[str] = None, + **config: Any) -> CxxHandler: + '''Return an instance of `CxxHandler`. + + Arguments: + theme: The theme to use when rendering contents. + custom_templates: Directory containing custom templates. + **config: Configuration passed to the handler. + ''' + return CxxHandler(theme=theme, custom_templates=custom_templates) diff --git a/third_party/fmt/support/python/mkdocstrings_handlers/cxx/templates/README b/third_party/fmt/support/python/mkdocstrings_handlers/cxx/templates/README new file mode 100644 index 00000000..7da18db5 --- /dev/null +++ b/third_party/fmt/support/python/mkdocstrings_handlers/cxx/templates/README @@ -0,0 +1 @@ +mkdocsstrings requires a handler to have a templates directory.