[BACK]Return to kanExport0.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / kan96xx / Kan

Diff for /OpenXM/src/kan96xx/Kan/kanExport0.c between version 1.31 and 1.32

version 1.31, 2004/09/09 03:14:46 version 1.32, 2004/09/09 11:42:22
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.30 2004/09/04 11:25:58 takayama Exp $  */  /* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.31 2004/09/09 03:14:46 takayama Exp $  */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "stackm.h"  #include "stackm.h"
Line 919  struct object KdataConversion(obj,key)
Line 919  struct object KdataConversion(obj,key)
       return(rob);        return(rob);
     }else if (strcmp(key,"poly") == 0) {      }else if (strcmp(key,"poly") == 0) {
       rob = KpoPOLY(ZERO);        rob = KpoPOLY(ZERO);
         return rob;
       }else if (strcmp(key,"array") == 0) {
         rob = newObjectArray(0);
         return rob;
     }else{      }else{
       warningKan("Sorry. The data conversion from null to this data type has not supported yet.\n");        warningKan("Sorry. The data conversion from null to this data type has not supported yet.\n");
     }      }
Line 1015  struct object KdataConversion(obj,key)
Line 1019  struct object KdataConversion(obj,key)
     if (strcmp(key,"array") == 0) {      if (strcmp(key,"array") == 0) {
       return(rob);        return(rob);
     }else if (strcmp(key,"list") == 0) {      }else if (strcmp(key,"list") == 0) {
       rob = *( arrayToList(obj) );        rob = KarrayToList(obj);
       return(rob);        return(rob);
     }else if (strcmp(key,"arrayOfPOLY")==0) {      }else if (strcmp(key,"arrayOfPOLY")==0) {
       rob = KpoArrayOfPOLY(arrayToArrayOfPOLY(obj));        rob = KpoArrayOfPOLY(arrayToArrayOfPOLY(obj));
Line 1108  struct object KdataConversion(obj,key)
Line 1112  struct object KdataConversion(obj,key)
     break;      break;
   case Slist:    case Slist:
     if (strcmp(key,"array") == 0) {      if (strcmp(key,"array") == 0) {
       rob = listToArray(&obj);        rob = KlistToArray(obj);
       return(rob);        return(rob);
     }      }
     break;      break;
Line 2958  struct object Krest(struct object ob) {
Line 2962  struct object Krest(struct object ob) {
       putoa(rob,i-1,getoa(ob,i));        putoa(rob,i-1,getoa(ob,i));
     }      }
     return rob;      return rob;
   }else if (ob.tag == Slist) {    }else if ((ob.tag == Slist) || (ob.tag == Snull)) {
     errorKan1("%s\n","Krest: it has not yet been implemented.");      return Kcdr(ob);
   }else{    }else{
     errorKan1("%s\n","Krest(ob): ob must be an array or a list.");      errorKan1("%s\n","Krest(ob): ob must be an array or a list.");
   }    }
Line 2977  struct object Kjoin(struct object ob1, struct object o
Line 2981  struct object Kjoin(struct object ob1, struct object o
       putoa(rob,i,getoa(ob2,i-n1));        putoa(rob,i,getoa(ob2,i-n1));
     }      }
     return rob;      return rob;
     }else if ((ob1.tag == Slist) || (ob1.tag == Snull)) {
           if ((ob2.tag == Slist) || (ob2.tag == Snull)) {
             return KvJoin(ob1,ob2);
           }else{
             errorKan1("%s\n","Kjoin: both argument must be a list.");
           }
   }else{    }else{
     errorKan1("%s\n","Kjoin: arguments must be arrays.");      errorKan1("%s\n","Kjoin: arguments must be arrays.");
   }    }
Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>