bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix to get error line

Browse Source
This commit is contained in:
otya128
2016-12-23 22:16:14 +09:00
parent 58cf9048a5
commit f69f493ce0
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SMILEBASIC/petitcomputer.d
View File

@@ -178,6 +178,19 @@ struct Slot
wchar[] progbuff2 = (cast(wchar*)progbuff.ptr)[0..progbuff.length / 2]; wchar[] progbuff2 = (cast(wchar*)progbuff.ptr)[0..progbuff.length / 2];
return progbuff2; return progbuff2;
} }
import otya.smilebasic.token;
wstring getLine(SourceLocation loc)
{
import std.string;
int i;
foreach (line; program)
{
i++;
if (i == loc.line)
return line;
}
return "";
}
} }
struct Size struct Size
{ {
@@ -1165,7 +1178,7 @@ class PetitComputer
writeln(sbe.to!string); writeln(sbe.to!string);
writeln(sbe.getErrorMessage2); writeln(sbe.getErrorMessage2);
auto loc = vm.currentLocation; auto loc = vm.currentLocation;
console.print(loc.line, ":", loc.pos, ":", parser.getLine(loc)); console.print(loc.line, ":", loc.pos, ":", slot[vm.currentSlotNumber].getLine(loc));
} }
catch(Throwable t) catch(Throwable t)
{ {
@@ -1179,7 +1192,8 @@ class PetitComputer
{ {
console.print(t.to!string); console.print(t.to!string);
writeln(t); writeln(t);
console.print(parser.getLine(vm.currentLocation)); auto loc = vm.currentLocation;
console.print(slot[vm.currentSlotNumber].getLine(loc));
} }
catch(Throwable t) catch(Throwable t)
{ {
@@ -1232,7 +1246,7 @@ class PetitComputer
writeln(sbe.getErrorMessage2); writeln(sbe.getErrorMessage2);
writeln(sbe.func); writeln(sbe.func);
loc = vm.currentLocation; loc = vm.currentLocation;
console.print(loc.line, ":", loc.pos, ":", parser.getLine(loc)); console.print(loc.line, ":", loc.pos, ":", slot[vm.currentSlotNumber].getLine(loc));
} }
catch(Throwable t) catch(Throwable t)
{ {
@@ -1246,7 +1260,7 @@ class PetitComputer
{ {
console.print(t.to!string); console.print(t.to!string);
writeln(t); writeln(t);
console.print(parser.getLine(vm.currentLocation)); console.print(slot[vm.currentSlotNumber].getLine(vm.currentLocation));
} }
catch(Throwable t) catch(Throwable t)
{ {