=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.33 retrieving revision 1.41 diff -u -p -r1.33 -r1.41 --- OpenXM/src/kan96xx/Kan/ext.c 2004/11/23 01:37:47 1.33 +++ 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.32 2004/09/17 12:32:11 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]; @@ -94,9 +96,12 @@ struct object Kextension(struct object obj) { char *key; int size; - struct object keyo; + struct object keyo = OINIT; struct object rob = NullObject; - struct object obj1,obj2,obj3,obj4; + struct object obj1 = OINIT; + struct object obj2 = OINIT; + struct object obj3 = OINIT; + struct object obj4 = OINIT; int m,i,pid, uid; int argListc, fdListc; char *abc; @@ -312,6 +317,18 @@ struct object Kextension(struct object obj) printObject(obj2,0,fp); fclose(fp); rob = NullObject; + }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,"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,"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)); @@ -449,6 +466,16 @@ 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; @@ -460,6 +487,14 @@ struct object Kextension(struct object obj) }else{ rob = NullObject; } + }else if (strcmp(key,"traceShowScannerBuf")==0) { + char *ssst; + ssst = MsgSourceTrace; + if (ssst != NULL) { + rob = KpoString(ssst); + }else{ + rob = NullObject; + } }else if (strcmp(key,"regexec")==0) { if ((size != 3) && (size != 4)) errorKan1("%s\n","[(regexec) reg strArray flag(optional)] extension b"); obj1 = getoa(obj,1); @@ -469,7 +504,11 @@ struct object Kextension(struct object obj) if (size == 3) obj3 = newObjectArray(0); else obj3 = getoa(obj,3); rob = oregexec(obj1,obj2,obj3); - + }else if (strcmp(key,"unlink")==0) { + if (size != 2) errorKan1("%s\n","[(unlink) filename] extension b"); + obj1 = getoa(obj,1); + if (obj1.tag != Sdollar) errorKan1("%s\n","unlink, the first argument should be a string (filename)."); + rob = KpoInteger(oxDeleteFile(KopString(obj1))); } #include "plugin.hh" #include "Kclass/tree.hh" @@ -484,7 +523,7 @@ struct object Kextension(struct object obj) struct object KregionMatches(struct object sobj, struct object keyArray) { - struct object rob; + struct object rob = OINIT; int n,i,j,m,keyn; char *s,*key; rob = newObjectArray(3); @@ -518,8 +557,8 @@ struct object KregionMatches(struct object sobj, struc } static struct object oregexec(struct object oregex,struct object ostrArray,struct object oflag) { - struct object rob; - struct object ob; + struct object rob = OINIT; + struct object ob = OINIT; int n,i,j,m,keyn,cflag,eflag,er; char *regex; regex_t preg;