ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont use NULL macro

Browse source
This commit is contained in:
IlyaShurupov 2024-03-23 12:16:44 +03:00
parent 9a9262f6d0
commit 4c66704830
16 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/private/interpreter/Interpreter.cpp
View file

@ -33,7 +33,7 @@ void Interpreter::exec(obj::MethodObject* method, obj::ClassObject* self, obj::D
return;
}
mCallStack.enter({ NULL, method, 0 });
mCallStack.enter({ nullptr, method, 0 });
mCallStack.mStack.last().mSelf = self;
stepBytecodeIn();
@ -250,7 +250,7 @@ void Interpreter::stepBytecodeIn() {
case OpCode::OBJ_CREATE:
{
auto type = mOperandsStack.getOperand<StringObject>();
Object* new_obj = NULL;
Object* new_obj = nullptr;
// basic types
auto idx = NDO->types.presents(type->val);
@ -272,11 +272,11 @@ void Interpreter::stepBytecodeIn() {
// PUSH_ARGS protocol
tp::uint2 len = 0;
mOperandsStack.push((Object*) len);
mOperandsStack.push(NULL);
mOperandsStack.push(nullptr);
// CALL protocol
mScopeStack.enterScope(false);
mCallStack.enter({ NULL, method, 0 });
mCallStack.enter({ nullptr, method, 0 });
break;
}
@ -313,14 +313,14 @@ void Interpreter::stepBytecodeIn() {
// Layout of OperandsStack:
// ....
// +1) length : to chech number of args
// +2) NULL : stop saving args
// +2) nullptr : stop saving args
// +3) object1
// +4) object2
// ...
tp::uint2 len = read_byte(bytecode);
mOperandsStack.push((Object*) len);
mOperandsStack.push(NULL);
mOperandsStack.push(nullptr);
break;
}
@ -367,7 +367,7 @@ void Interpreter::stepBytecodeIn() {
NDO_CASTV(MethodObject, obj, method);
mScopeStack.enterScope(false);
mCallStack.enter({ NULL, method, 0 });
mCallStack.enter({ nullptr, method, 0 });
// push self
mCallStack.mStack.last().mSelf = mLastParent;
@ -376,7 +376,7 @@ void Interpreter::stepBytecodeIn() {
(*mTypeMethod)(this);
mIsTypeMethod = false;
mTypeMethod = NULL;
mTypeMethod = nullptr;
break;
}
@ -455,7 +455,7 @@ void Interpreter::stepBytecodeIn() {
auto parent = mOperandsStack.getOperand();
bool is_method = read_byte(bytecode);
Object* child = NULL;
Object* child = nullptr;
TypeMethods::LookupKey tm_key;
if (is_method) {

2
Objects/private/interpreter/OperandsStack.cpp
View file

@ -15,7 +15,7 @@ void OperandStack::push(Operand operand) {
}
void OperandStack::pop() {
ASSERT(mIdx != NULL && "stack overflow");
ASSERT(mIdx != 0 && "stack overflow");
mIdx--;
}

2
Objects/private/interpreter/ScopeStack.cpp
View file

@ -40,7 +40,7 @@ void ScopeStack::enterScope(bool aChildReachable) {
}
void ScopeStack::leaveScope() {
ASSERT(mIdx != NULL && "stack overflow");
ASSERT(mIdx != 0 && "stack overflow");
mBuff[mIdx - 1].~Scope();
mIdx--;
}