bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix SWAP STR1$,STR2$

Browse Source
This commit is contained in:
otya128
2016-12-17 15:31:51 +09:00
parent 7d75e8ff75
commit e934760ab2
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SMILEBASIC/VM.d
View File

@@ -1994,6 +1994,43 @@ class SwapCode : Code
return;
}
}
if (refitem2.type == ValueType.StringReference && refitem1.type == ValueType.Reference)
{
swap(refitem1, refitem2);
}
if (refitem1.type == ValueType.StringReference && refitem2.type == ValueType.Reference)
{
auto str = refitem2.reference.castString;
wchar wc = cast(wchar)refitem1.stringReference;
refitem1.stringReference = str;
refitem2.reference.stringValue = new Array!wchar([wc]);
return;
}
if (refitem2.type == ValueType.StringArrayReference && refitem1.type == ValueType.Reference)
{
swap(refitem1, refitem2);
}
if (refitem1.type == ValueType.StringArrayReference && refitem2.type == ValueType.Reference)
{
auto str = refitem2.reference.castString;
auto str2 = cast(Array!wchar)refitem1.stringArrayReference;
refitem1.stringArrayReference = str;
refitem2.reference.stringValue = str2;
return;
}
if (refitem2.type == ValueType.StringReference && refitem1.type == ValueType.StringArrayReference)
{
swap(refitem1, refitem2);
}
if (refitem1.type == ValueType.StringReference && refitem2.type == ValueType.StringArrayReference)
{
auto str = cast(Array!wchar)refitem2.stringArrayReference;
wchar wc = cast(wchar)refitem1.stringReference;
refitem1.stringReference = str;
refitem2.stringArrayReference = new Array!wchar([wc]);
return;
}
throw new TypeMismatch();
}
}

13
SMILEBASIC/type.d
View File

@@ -456,7 +456,7 @@ class Array(T)
{
if(dimCount != 1 || v.dimCount != 1 ) throw new SyntaxError();
if(i1 >= dim[0]) throw new SubscriptOutOfRange();
array = array[0..i1] ~ v.array ~ array[i1..$];
array = array[0..i1] ~ v.array ~ array[i1 + 1..$];
dim[0] = cast(int)array.length;
}
Array!T opOpAssign(string op = "~")(Array!T v)
@@ -492,10 +492,7 @@ class Array(T)
void insert(Array!T ary, int index)
{
if(dimCount != 1 || ary.dimCount != 1 ) throw new SyntaxError();
if (length == 0)
{
throw new SubscriptOutOfRange();
}
if(index >= dim[0]) throw new SubscriptOutOfRange();
array = array[0..index] ~ ary.array ~ array[index + 1..$];
dim[0] = cast(int)array.length;
}
@@ -537,8 +534,8 @@ struct ArrayReference(T)
void swap(T2)(ref T2 t2)
if (!is(T2 T3 == ArrayReference!T3))
{
T temp = reference.array[index];
reference.array[index] = cast(T)t2;
t2 = cast(T2)temp;
T temp = reference[index];
reference[index] = t2;
t2 = temp;
}
}