1
0

CEIL,ROUNDとテストを追加

This commit is contained in:
otya128
2015-08-23 11:44:13 +09:00
parent d7f0fced6f
commit e7f13edaec
3 changed files with 34 additions and 2 deletions

View File

@@ -1,3 +1,27 @@
ASSERT__ FLOOR(0.5)==0, "FLOOR"
ASSERT__ FLOOR(1)==1, "FLOOR"
ASSERT__ FLOOR(1.5)==1, "FLOOR"
ASSERT__ CEIL(0.5)==1, "CEIL"
ASSERT__ CEIL(1)==1, "CEIL"
ASSERT__ CEIL(1.25)==2, "CEIL"
ASSERT__ CEIL(1.5)==2, "CEIL"
ASSERT__ ROUND(0.5)==1, "ROUND"
ASSERT__ ROUND(1)==1, "ROUND"
ASSERT__ ROUND(1.25)==1, "ROUND"
ASSERT__ ROUND(1.5)==2, "ROUND"
ASSERT__ FLOOR(-0.5)==-1, "FLOOR"
ASSERT__ FLOOR(-1)==-1, "FLOOR"
ASSERT__ FLOOR(-1.5)==-2, "FLOOR"
ASSERT__ CEIL(-0.5)==-0, "CEIL"
ASSERT__ CEIL(-1)==-1, "CEIL"
ASSERT__ CEIL(-1.25)==-1, "CEIL"
ASSERT__ CEIL(-1.5)==-1, "CEIL"
ASSERT__ ROUND(-0.5)==-1, "ROUND"
ASSERT__ ROUND(-1)==-1, "ROUND"
ASSERT__ ROUND(-1.25)==-1, "ROUND"
ASSERT__ ROUND(-1.5)==-2, "ROUND"
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$"

View File

@@ -242,6 +242,14 @@ class BuiltinFunction
{ {
return val.floor; return val.floor;
} }
static double ROUND(double val)
{
return val.round;
}
static double CEIL(double val)
{
return val.ceil;
}
static wstring MID(wstring str, int i, int len) static wstring MID(wstring str, int i, int len)
{ {
if(i + len > str.length) if(i + len > str.length)

View File

@@ -735,12 +735,12 @@ class PetitComputer
//とりあえず //とりあえず
auto parser = new Parser( auto parser = new Parser(
//readText("./SYS/GAME6TALK.TXT").to!wstring //readText("./SYS/GAME6TALK.TXT").to!wstring
readText("./SYS/GAME2RPG.TXT").to!wstring //readText("./SYS/GAME2RPG.TXT").to!wstring
//readText("./SYS/GAME1DOTRC.TXT").to!wstring //readText("./SYS/GAME1DOTRC.TXT").to!wstring
//readText(input("LOAD PROGRAM:", true).to!string).to!wstring //readText(input("LOAD PROGRAM:", true).to!string).to!wstring
//readText("./SYS/EX1TEXT.TXT").to!wstring //readText("./SYS/EX1TEXT.TXT").to!wstring
//readText("FIZZBUZZ.TXT").to!wstring //readText("FIZZBUZZ.TXT").to!wstring
//readText("TEST.TXT").to!wstring readText("TEST.TXT").to!wstring
/*"?ABS(-1) /*"?ABS(-1)
LOCATE 0,10 LOCATE 0,10
COLOR 5 COLOR 5