=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.37 retrieving revision 1.44 diff -u -p -r1.37 -r1.44 --- OpenXM/src/kan96xx/Kan/ext.c 2005/06/16 06:21:21 1.37 +++ OpenXM/src/kan96xx/Kan/ext.c 2013/09/22 01:26:07 1.44 @@ -1,11 +1,14 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.36 2005/06/16 05:07:23 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.43 2012/12/23 01:27:54 takayama Exp $ */ #include +#include #include #include #include #include #include #include +#include +#include #include "datatype.h" #include "stackm.h" #include "extern.h" @@ -20,6 +23,7 @@ extern int Quiet; extern char **environ; +extern char *MsgSourceTrace; #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; @@ -175,6 +179,11 @@ struct object Kextension(struct object obj) else { system(KopString(getoa(obj,1))); exit(0); } */ + }else if (strcmp(key,"date")==0) { + if (size != 1) errorKan1("%s\n","[(date)] extension."); + struct timeval tm; + gettimeofday(&tm,NULL); + rob = KpoString(ctime(&((time_t)tm.tv_sec))); }else if (strcmp(key,"defaultPolyRing")==0) { if (size != 2) errorKan1("%s\n","[(defaultPolyRing) n] extension."); rob = KdefaultPolyRing(getoa(obj,1)); @@ -385,6 +394,7 @@ struct object Kextension(struct object obj) if (obj1.tag != Sdollar) errorKan1("%s\n","[(getServerEnv) serverName] extension."); { char **se; int ii; int nn; + char **getServerEnv(char *); se = getServerEnv(KopString(obj1)); if (se == NULL) { debugServerEnv(KopString(obj1)); @@ -457,19 +467,43 @@ struct object Kextension(struct object obj) obj2 = getoa(obj,2); rob = Kjoin(obj1,obj2); }else if (strcmp(key,"ostype")==0) { - rob = newObjectArray(1); - /* Hard encode the OS type. */ + /* Hard encode the OS type. cpp -dM /dev/null */ #if defined(__CYGWIN__) + rob = newObjectArray(1); putoa(rob,0,KpoString("windows")); #else + rob = newObjectArray(2); putoa(rob,0,KpoString("unix")); +#if defined(__APPLE__) + putoa(rob,1,KpoString("mac")); +#else + putoa(rob,1,KpoString("generic")); #endif +#endif + }else if (strcmp(key,"stringToArgv")==0) { + if (size != 2) errorKan1("%s\n","[(stringToArgv) a ] extension b"); + obj1 = getoa(obj,1); + if (obj1.tag != Sdollar) errorKan1("%s\n","[(stringToArgv) a ] extension b, a must be a string."); + rob = KstringToArgv(obj1); + }else if (strcmp(key,"stringToArgv2")==0) { + if (size != 3) errorKan1("%s\n","[(stringToArgv2) str separator] extension b"); + obj1 = getoa(obj,1); + obj2 = getoa(obj,2); + rob = KstringToArgv2(obj1,obj2); }else if (strcmp(key,"traceClearStack")==0) { traceClearStack(); rob = NullObject; }else if (strcmp(key,"traceShowStack")==0) { char *ssst; ssst = traceShowStack(); + if (ssst != NULL) { + rob = KpoString(ssst); + }else{ + rob = NullObject; + } + }else if (strcmp(key,"traceShowScannerBuf")==0) { + char *ssst; + ssst = MsgSourceTrace; if (ssst != NULL) { rob = KpoString(ssst); }else{