bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

VALで二進数を扱えるようにした

Browse Source
This commit is contained in:
otya128
2015-08-23 11:48:46 +09:00
parent e7f13edaec
commit 6df9bc25f8
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SMILEBASIC/TEST.txt
View File

@@ -22,6 +22,13 @@ ASSERT__ ROUND(-1)==-1, "ROUND"
ASSERT__ ROUND(-1.25)==-1, "ROUND" ASSERT__ ROUND(-1.25)==-1, "ROUND"
ASSERT__ ROUND(-1.5)==-2, "ROUND" ASSERT__ ROUND(-1.5)==-2, "ROUND"
ASSERT__ VAL("0")==0, "VAL"
ASSERT__ VAL("1")==1, "VAL"
ASSERT__ VAL("-1")==-1, "VAL"
ASSERT__ VAL("&HA")==10, "VAL"
ASSERT__ VAL("&H-A")==0, "VAL"
ASSERT__ VAL("&B10")==2, "VAL"
ASSERT__ VAL("aa")==0, "VAL"
ASSERT__ SUBST$("0123456789",0,"B")=="B","SUBST$" ASSERT__ SUBST$("0123456789",0,"B")=="B","SUBST$"
ASSERT__ SUBST$("0123456789",0,4,"B")=="B456789","SUBST$" ASSERT__ SUBST$("0123456789",0,4,"B")=="B456789","SUBST$"
ASSERT__ SUBST$("",0,4,"B")=="B","SUBST$" ASSERT__ SUBST$("",0,4,"B")=="B","SUBST$"

6
SMILEBASIC/builtinfunctions.d
View File

@@ -226,10 +226,14 @@ class BuiltinFunction
{ {
try try
{ {
if(str[0..2] == "&H") if(str.length > 2 && str[0..2] == "&H")
{ {
return str[2..$].to!int(16); return str[2..$].to!int(16);
} }
if(str.length > 2 && str[0..2] == "&B")
{
return str[2..$].to!int(2);
}
double val = str.to!double; double val = str.to!double;
return val; return val;
} }