1
0

Implement CHKLABEL(label,global)

This commit is contained in:
otya128
2017-07-09 23:32:36 +09:00
parent 2d2c09e38b
commit be5424a203
2 changed files with 11 additions and 5 deletions

View File

@@ -438,7 +438,7 @@ class VM
return true;
return false;
}
bool chklabel(wstring label)
bool chklabel(wstring label, bool global)
{
auto name = parse(label);
VMSlot slot;
@@ -454,10 +454,15 @@ class VM
{
slot = currentSlot;
}
if (currentFunction)
{
if (name.name in currentFunction.label)
return true;
if (!global)
return false;
}
if (name.name in slot.globalLabel)
return true;
if (currentFunction && name.name in currentFunction.label)
return true;
return false;
}
bool chkvar(wstring var)

View File

@@ -3079,10 +3079,11 @@ class BuiltinFunction
func = func.toUpper;
return p.vm.chkcall(func);
}
static int CHKLABEL(PetitComputer p, wstring label)
static int CHKLABEL(PetitComputer p, wstring label, DefaultValue!(int, false) global)
{
label = label.toUpper;
return p.vm.chklabel(label);
global.setDefaultValue(0);
return p.vm.chklabel(label, cast(bool)global);
}
static int CHKVAR(PetitComputer p, wstring var)
{