[Smipl-devel] SF.net SVN: smipl:[37] smipl-devel/src
Brought to you by:
the_student
From: <the...@us...> - 2009-08-10 14:52:58
|
Revision: 37 http://smipl.svn.sourceforge.net/smipl/?rev=37&view=rev Author: the_student Date: 2009-08-10 14:52:48 +0000 (Mon, 10 Aug 2009) Log Message: ----------- Removed non-standard stricmps Modified Paths: -------------- smipl-devel/src/Console.h smipl-devel/src/SMIPL-header.h smipl-devel/src/SMIPL.cpp smipl-devel/src/SVM.h Modified: smipl-devel/src/Console.h =================================================================== --- smipl-devel/src/Console.h 2009-08-10 11:55:00 UTC (rev 36) +++ smipl-devel/src/Console.h 2009-08-10 14:52:48 UTC (rev 37) @@ -1,4 +1,4 @@ -#define cmd_is(c) !stricmp(command.argv[0],c) +#define cmd_is(c) !strcasecmp(command.argv[0],c) bool using_script=false, using_library=false; IFileStream *library_file, *script_file; @@ -51,14 +51,12 @@ delete[]str2; str2=strdup(str, "_START"); MDS_Set(str2, Lib_start); - if(!stricmp(command.argv[1], "START")) { - for(int a=0;a<=10000;a++) { - cout<<a<<" "; - if(library_file->getline(Program[a], 80)==0) {strcpy(Program[a], "PROGRAM END");break;} - if(!stricmp(Program[a], "PROGRAM END")) break; - } - VM0.Run(&Lib_start); + for(int a=0;a<=10000;a++) { + cout<<a<<" "; + if(library_file->getline(Program[a], 80)==0) {strcpy(Program[a], "PROGRAM END");break;} + if(!stricmp(Program[a], "PROGRAM END")) break; } + VM0.Run(&Lib_start); delete[]str2; delete library_file; continue; @@ -97,8 +95,8 @@ } if(isdigit(command.argv[0][0])) { if(command.argc==1) { - lib_start=atof(command.argv[0]); - for(int a=lib_start;a<=10000;a++) { + Lib_start=(int)atof(command.argv[0]); + for(int a=Lib_start;a<=10000;a++) { cout<<a<<" "; getstr(Program[a], 80); if(!stricmp(Program[a], "PROGRAM END")) break; Modified: smipl-devel/src/SMIPL-header.h =================================================================== --- smipl-devel/src/SMIPL-header.h 2009-08-10 11:55:00 UTC (rev 36) +++ smipl-devel/src/SMIPL-header.h 2009-08-10 14:52:48 UTC (rev 37) @@ -1,8 +1,8 @@ //C libraries -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <cmath> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> //IO streams #include <iostream> #include <fstream> Modified: smipl-devel/src/SMIPL.cpp =================================================================== --- smipl-devel/src/SMIPL.cpp 2009-08-10 11:55:00 UTC (rev 36) +++ smipl-devel/src/SMIPL.cpp 2009-08-10 14:52:48 UTC (rev 37) @@ -2,7 +2,7 @@ int main(int argc, char **argv) { cout<<"Setting up version globals"<<endl; MDS_Create("/Global/smipl.version.major",3); - MDS_Create("/Global/smipl.version.minor",0); + MDS_Create("/Global/smipl.version.minor",50); MDS_Create("/Global/smipl.version.patch",0); cout<<"Running init"<<endl; if(!Init(argc, argv)) {cerr<<"Init error:"<<GetLastSysError()<<endl;for(;;);} Modified: smipl-devel/src/SVM.h =================================================================== --- smipl-devel/src/SVM.h 2009-08-10 11:55:00 UTC (rev 36) +++ smipl-devel/src/SVM.h 2009-08-10 14:52:48 UTC (rev 37) @@ -70,14 +70,14 @@ while(1) { strcpy(cmd.str,Program[Address]); cmd.Split(); - if(!stricmp(cmd.argv[0],"STOP")) break; - if(!stricmp(cmd.str,"PROGRAM END")) break; - if(!stricmp(cmd.argv[0],"GOTO")) if(cmd.argc>=2) {Atof(cmd.argv[1],&number);Address=number-1;} - if(!stricmp(cmd.argv[0],"SET")) for(int a=1;a<cmd.argc;a+=2) {Atof(cmd.argv[a+1],&number);MDS_Set(cmd.argv[a], number);} - if(!stricmp(cmd.argv[0],"ADD")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number+=number2;}MDS_Set(cmd.argv[1], number);} - if(!stricmp(cmd.argv[0],"SUBRACT")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number-=number2;}MDS_Set(cmd.argv[1], number);} - if(!stricmp(cmd.argv[0],"MULTIPLY")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number*=number2;}MDS_Set(cmd.argv[1], number);} - if(!stricmp(cmd.argv[0],"DIVIDE")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number/=number2;}MDS_Set(cmd.argv[1], number);} + if(!strcasecmp(cmd.argv[0],"STOP")) break; + if(!strcasecmp(cmd.str,"PROGRAM END")) break; + if(!strcasecmp(cmd.argv[0],"GOTO")) if(cmd.argc>=2) {Atof(cmd.argv[1],&number);Address=number-1;} + if(!strcasecmp(cmd.argv[0],"SET")) for(int a=1;a<cmd.argc;a+=2) {Atof(cmd.argv[a+1],&number);MDS_Set(cmd.argv[a], number);} + if(!strcasecmp(cmd.argv[0],"ADD")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number+=number2;}MDS_Set(cmd.argv[1], number);} + if(!strcasecmp(cmd.argv[0],"SUBRACT")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number-=number2;}MDS_Set(cmd.argv[1], number);} + if(!strcasecmp(cmd.argv[0],"MULTIPLY")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number*=number2;}MDS_Set(cmd.argv[1], number);} + if(!strcasecmp(cmd.argv[0],"DIVIDE")) {Atof(cmd.argv[1],&number);for(int a=2;a<cmd.argc;a++){Atof(cmd.argv[a], &number2);number/=number2;}MDS_Set(cmd.argv[1], number);} Address++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |