=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.36 retrieving revision 1.41 diff -u -p -r1.36 -r1.41 --- OpenXM/src/kan96xx/Kan/ext.c 2005/06/16 05:07:23 1.36 +++ OpenXM/src/kan96xx/Kan/ext.c 2005/09/27 06:10:43 1.41 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.35 2005/06/09 05:46:57 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.40 2005/09/27 05:46:50 takayama Exp $ */ #include +#include #include #include #include @@ -20,6 +21,7 @@ extern int Quiet; extern char **environ; +extern char *MsgSourceTrace; #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; @@ -318,15 +320,15 @@ struct object Kextension(struct object obj) }else if (strcmp(key,"getAttributeList")==0) { if (size != 2) errorKan1("%s\n","[(getAttributeList) ob] extension rob"); rob = KgetAttributeList(getoa(obj,1)); - }else if (strcmp(key,"putAttributeList")==0) { - if (size != 3) errorKan1("%s\n","[(putAttributeList) ob attrlist] extension rob"); - rob = KputAttributeList(getoa(obj,1), getoa(obj,2)); + }else if (strcmp(key,"setAttributeList")==0) { + if (size != 3) errorKan1("%s\n","[(setAttributeList) ob attrlist] extension rob"); + rob = KsetAttributeList(getoa(obj,1), getoa(obj,2)); }else if (strcmp(key,"getAttribute")==0) { if (size != 3) errorKan1("%s\n","[(getAttribute) ob key] extension rob"); rob = KgetAttribute(getoa(obj,1),getoa(obj,2)); - }else if (strcmp(key,"putAttribute")==0) { - if (size != 4) errorKan1("%s\n","[(putAttributeList) ob key value] extension rob"); - rob = KputAttribute(getoa(obj,1), getoa(obj,2),getoa(obj,3)); + }else if (strcmp(key,"setAttribute")==0) { + if (size != 4) errorKan1("%s\n","[(setAttributeList) ob key value] extension rob"); + rob = KsetAttribute(getoa(obj,1), getoa(obj,2),getoa(obj,3)); }else if (strcmp(key,"hilbert")==0) { if (size != 3) errorKan1("%s\n","[(hilbert) obgb obvlist] extension."); rob = hilberto(getoa(obj,1),getoa(obj,2)); @@ -464,12 +466,30 @@ struct object Kextension(struct object obj) #else putoa(rob,0,KpoString("unix")); #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{