bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Implement GOSUB/GOTO x:@LABEL

Browse Source
This commit is contained in:
otya128
2016-12-29 16:16:56 +09:00
parent 5c6ec3e9e0
commit abdd6cdc8c
3 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
SMILEBASIC/VM.d
View File

@@ -372,7 +372,21 @@ class VM
}
bool chklabel(wstring label)
{
if (label in currentSlot.globalLabel)
auto name = parse(label);
VMSlot slot;
if (name.hasSlot)
{
if (!checkSlotNumber(name.slot))
{
return false;
}
slot = slots[name.slot];
}
else
{
slot = currentSlot;
}
if (label in slot.globalLabel)
return true;
if (currentFunction && label in currentFunction.label)
return true;
@@ -982,23 +996,36 @@ class GotoFalse : Code
}
class GotoExpr : Code
{
this()
{
}
override void execute(VM vm)
{
Value label;
vm.pop(label);
if(label.isString)
{
if (label.castDString.length == 0)
throw new InternalError();
int pc;
if (vm.currentFunction)
auto name = VM.parse(label.castDString);
if (name.name[0] != '@')
{
pc = vm.currentFunction.label.get(label.castDString, int.min);
throw new IllegalSymbolString();
}
if (name.name.length == 0 || name.hasSlot)
{
if (!vm.checkSlotNumber(name.slot))
{
throw new IllegalSymbolString();
}
vm.setCurrentSlot(name.slot);
}
if (!name.hasSlot && vm.currentFunction)
{
vm.setCurrentSlot(vm.currentFunction.slot.index);
pc = vm.currentFunction.label.get(name.name, int.min);
}
else
{
pc = vm.currentSlot.globalLabel.get(label.castDString, int.min);
pc = vm.currentSlot.globalLabel.get(name.name, int.min);
}
if (pc == int.min)
{
@@ -1048,27 +1075,38 @@ class GosubS : Code
}
class GosubExpr : Code
{
Scope sc;
this(Scope sc)
{
this.sc = sc;
}
override void execute(VM vm)
{
Value label;
vm.pop(label);
if(label.isString)
{
if (label.castDString.length == 0)
throw new InternalError();
int pc;
auto name = VM.parse(label.castDString);
if (name.name.length == 0 || name.name[0] != '@')
{
throw new IllegalSymbolString();
}
vm.pushBackTrace(label.castDString);
vm.pushpc;
int pc;
if (sc && sc.func)
if (name.hasSlot)
{
pc = sc.func.label.get(label.castDString, int.min);
if (!vm.checkSlotNumber(name.slot))
{
throw new IllegalSymbolString();
}
vm.setCurrentSlot(name.slot);
}
if (!name.hasSlot && vm.currentFunction)
{
vm.setCurrentSlot(vm.currentFunction.slot.index);
pc = vm.currentFunction.label.get(name.name, int.min);
}
else
{
pc = vm.currentSlot.globalLabel.get(label.castDString, int.min);
pc = vm.currentSlot.globalLabel.get(name.name, int.min);
}
if (pc == int.min)
{

2
SMILEBASIC/compiler.d
View File

@@ -1032,7 +1032,7 @@ class Compiler
else
{
compileExpression(gosub.labelexpr, s);
genCode(new GosubExpr(s));
genCode(new GosubExpr());
}
}
break;

16
SMILEBASIC/error.d
View File

@@ -38,6 +38,14 @@ class SmileBasicError : Exception
return message2;
}
}
class InternalError : SmileBasicError
{
this()
{
this.errnum = 1;
super("Internal Error");
}
}
class SyntaxError : SmileBasicError
{
this()
@@ -203,6 +211,14 @@ class SubscriptOutOfRange : SmileBasicError
super("Subscript out of range(" ~ func ~ ":" ~ arg.to!string ~ ")");
}
}
class IllegalSymbolString : SmileBasicError
{
this()
{
this.errnum = 34;
super("Illegal symbol string");
}
}
class UsePRGEDITBeforeAnyPRGFunction : SmileBasicError
{
this(string func)