From 96f84446166302ee7518f2360fbc6593ada18ace Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Thu, 18 Sep 2008 06:04:39 +0000 Subject: [PATCH] more comparison commands git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2682 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/command.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/source/src/command.cpp b/source/src/command.cpp index 74852d89..d665ee09 100644 --- a/source/src/command.cpp +++ b/source/src/command.cpp @@ -704,15 +704,18 @@ COMMAND(at, ARG_2STR); COMMAND(listlen, ARG_1EST); COMMAND(findlist, ARG_2STR); -int add(int a, int b) { return a+b; } COMMANDN(+, add, ARG_2EXP); -int mul(int a, int b) { return a*b; } COMMANDN(*, mul, ARG_2EXP); -int sub(int a, int b) { return a-b; } COMMANDN(-, sub, ARG_2EXP); -int divi(int a, int b) { return b ? a/b : 0; } COMMANDN(div, divi, ARG_2EXP); -int mod(int a, int b) { return b ? a%b : 0; } COMMAND(mod, ARG_2EXP); -int equal(int a, int b) { return (int)(a==b); } COMMANDN(=, equal, ARG_2EXP); +int add(int a, int b) { return a+b; } COMMANDN(+, add, ARG_2EXP); +int mul(int a, int b) { return a*b; } COMMANDN(*, mul, ARG_2EXP); +int sub(int a, int b) { return a-b; } COMMANDN(-, sub, ARG_2EXP); +int divi(int a, int b) { return b ? a/b : 0; } COMMANDN(div, divi, ARG_2EXP); +int mod(int a, int b) { return b ? a%b : 0; } COMMAND(mod, ARG_2EXP); +int nota(int a) { return (int)(!a); } COMMANDN(!=, nota, ARG_1EXP); +int equal(int a, int b) { return (int)(a==b); } COMMANDN(=, equal, ARG_2EXP); int notequal(int a, int b) { return (int)(a!=b); } COMMANDN(!=, notequal, ARG_2EXP); -int lt(int a, int b) { return (int)(ab); } COMMANDN(>, gt, ARG_2EXP); +int lt(int a, int b) { return (int)(ab); } COMMANDN(>, gt, ARG_2EXP); +int lte(int a, int b) { return (int)(a<=b); } COMMANDN(<=, lte, ARG_2EXP); +int gte(int a, int b) { return (int)(a>=b); } COMMANDN(>=, gte, ARG_2EXP); void anda (char *a, char *b) { intret(execute(a)!=0 && execute(b)!=0); } void ora (char *a, char *b) { intret(execute(a)!=0 || execute(b)!=0); }