bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

配列の添え字,次元チェックを追加

Browse Source
This commit is contained in:
otya128
2015-06-12 21:53:39 +09:00
parent 1e51bd37ca
commit fd74c8b071
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SMILEBASIC/error.d
View File

@@ -19,6 +19,14 @@ class SmileBasicError : Exception
super(message); super(message);
} }
} }
class SyntaxError : SmileBasicError
{
this()
{
this.errnum = 3;
super("Syntax error");
}
}
class TypeMismatch : SmileBasicError class TypeMismatch : SmileBasicError
{ {
this() this()
@@ -43,3 +51,12 @@ class ReturnWithoutGosub : SmileBasicError
super("RETURN without GOSUB"); super("RETURN without GOSUB");
} }
} }
class SubscriptOutOfRange : SmileBasicError
{
this()
{
this.errnum = 31;
super("Subscript out of range");
}
}

17
SMILEBASIC/type.d
View File

@@ -1,4 +1,5 @@
module otya.smilebasic.type; module otya.smilebasic.type;
import otya.smilebasic.error;
enum ValueType : byte enum ValueType : byte
{ {
Void,//DEF A()ENDの返り値とか未初期化の変数とか Void,//DEF A()ENDの返り値とか未初期化の変数とか
@@ -153,34 +154,50 @@ class Array(T)
} }
T opIndex(int i1) T opIndex(int i1)
{ {
if(dimCount != 1) throw new SyntaxError();
if(i1 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1]; return array[i1];
} }
T opIndex(int i1, int i2) T opIndex(int i1, int i2)
{ {
if(dimCount != 2) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] + i2]; return array[i1 * dim[0] + i2];
} }
T opIndex(int i1, int i2, int i3) T opIndex(int i1, int i2, int i3)
{ {
if(dimCount != 3) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] * dim[1] + i2 * dim[1] + i3]; return array[i1 * dim[0] * dim[1] + i2 * dim[1] + i3];
} }
T opIndex(int i1, int i2, int i3, int i4) T opIndex(int i1, int i2, int i3, int i4)
{ {
if(dimCount != 4) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2] && i4 >= dim[3]) throw new SubscriptOutOfRange();
return array[i1];//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3]; return array[i1];//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3];
} }
T opIndexAssign(T v, int i1) T opIndexAssign(T v, int i1)
{ {
if(dimCount != 1) throw new SyntaxError();
if(i1 >= dim[0]) throw new SubscriptOutOfRange();
return array[i1] = v; return array[i1] = v;
} }
T opIndexAssign(T v, int i1, int i2) T opIndexAssign(T v, int i1, int i2)
{ {
if(dimCount != 2) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] + i2] = v; return array[i1 * dim[0] + i2] = v;
} }
T opIndexAssign(T v, int i1, int i2, int i3) T opIndexAssign(T v, int i1, int i2, int i3)
{ {
if(dimCount != 3) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2]) throw new SubscriptOutOfRange();
return array[i1 * dim[0] * dim[1] + i2 * dim[1] + i3] = v; return array[i1 * dim[0] * dim[1] + i2 * dim[1] + i3] = v;
} }
T opIndexAssign(T v, int i1, int i2, int i3, int i4) T opIndexAssign(T v, int i1, int i2, int i3, int i4)
{ {
if(dimCount != 4) throw new SyntaxError();
if(i1 >= dim[0] && i2 >= dim[1] && i3 >= dim[2] && i4 >= dim[3]) throw new SubscriptOutOfRange();
return array[i1] = v;//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3] = v; return array[i1] = v;//array[i1 * dim[0] * dim[1] * dim[2] + i2 * dim[1] + i3] = v;
} }