Skip to content

Commit 81ca4ac

Browse files
committed
fixing various merge related errors
1 parent a985b93 commit 81ca4ac

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/arkreactor/Builtins/String.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace Ark::internal::Builtins::String
5656
else
5757
{
5858
std::stringstream ss;
59-
ss << (*it);
59+
it->toString(ss, *vm);
6060
current = fmt::format(current, ss.str());
6161
}
6262

src/arkreactor/Compiler/Compiler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ namespace Ark
250250
}
251251
}
252252

253-
void Compiler::pushSpecificInstArgc(Instruction inst, uint16_t previous, int p) noexcept
253+
uint16_t Compiler::computeSpecificInstArgc(Instruction inst, uint16_t previous) noexcept
254254
{
255255
switch (inst)
256256
{
@@ -647,8 +647,8 @@ namespace Ark
647647

648648
if (exp_count == 1)
649649
{
650-
if (isUnaryInst(static_cast<Instruction>(op_inst)))
651-
page(p).push_back(op_inst);
650+
if (isUnaryInst(static_cast<Instruction>(op.opcode)))
651+
page(p).push_back(op.opcode);
652652
else
653653
throwCompilerError("Operator needs two arguments, but was called with only one", x.constList()[0]);
654654
}

src/arkreactor/VM/VM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ namespace Ark
458458

459459
Value* ptr = (*context.locals.back())[arg];
460460
if (!ptr)
461-
throwVMError("Couldn't capture '" + m_state.m_symbols[id] + "' as it is currently unbound");
461+
throwVMError("Couldn't capture '" + m_state.m_symbols[arg] + "' as it is currently unbound");
462462
ptr = ptr->valueType() == ValueType::Reference ? ptr->reference() : ptr;
463463
(*context.saved_scope.value()).push_back(arg, *ptr);
464464

src/arkreactor/VM/Value.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ namespace Ark
149149
{
150150
case ValueType::Number:
151151
{
152-
double d = V.number();
152+
double d = number();
153153
os << fmt::format("{}", d);
154154
break;
155155
}
156156

157157
case ValueType::String:
158-
os << V.string();
158+
os << string();
159159
break;
160160

161161
case ValueType::PageAddr:

0 commit comments

Comments
 (0)