Changeset 7447d8 in git


Ignore:
Timestamp:
Jul 27, 2005, 5:48:29 PM (19 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
0b5a8b964a0f8ffcf71b80e540492fabe3f379ce
Parents:
7adb161bdb6d1b153d8380ad71f162acf6914d8f
Message:
*hannes: gcc 4 and 64bit


git-svn-id: file:///usr/local/Singular/svn/trunk@8463 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.in

    r7adb161 r7447d8  
    173173        dbm_sl.h libparse.h \
    174174        gms.h pcv.h eigenval_ip.h \
    175         feOpt.h fegetopt.h distrib.h walk.h \
     175        fegetopt.h distrib.h walk.h \
    176176        static.h\
    177177        omSingularConfig.h
     
    337337extra.o: feOpt.inc
    338338
    339 feOpt.inc: feOpt.cc mod2.h feOpt.h
    340         $(CXX) -DGENERATE_OPTION_INDEX feOpt.cc -o feOpt
     339feOpt.inc: feOpt.cc mod2.h
     340        $(CXX) -DGENERATE_OPTION_INDEX -I../kernel feOpt.cc -o feOpt
    341341        ./feOpt
    342342        /bin/rm -f feOpt feOpt.exe
    343343
    344 feOptES.inc: feOpt.cc mod2.h feOpt.h
    345         $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR feOpt.cc -o feOpt
     344feOptES.inc: feOpt.cc mod2.h
     345        $(CXX) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOpt
    346346        ./feOpt
    347347        rm -f feOpt feOpt.exe
    348348
    349 feOptTS.inc: feOpt.cc mod2.h feOpt.h
    350         $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR feOpt.cc -o feOpt
     349feOptTS.inc: feOpt.cc mod2.h
     350        $(CXX) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOpt
    351351        ./feOpt
    352352        rm -f feOpt feOpt.exe
  • Singular/attrib.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: attrib.cc,v 1.23 2005-05-18 15:59:33 Singular Exp $ */
     4/* $Id: attrib.cc,v 1.24 2005-07-27 15:47:52 Singular Exp $ */
    55
    66/*
     
    368368      return TRUE;
    369369    }
    370     if (((int)c->Data())!=0)
     370    if (((long)c->Data())!=0L)
    371371    {
    372372      if (h!=NULL) setFlag(h,FLAG_STD);
     
    387387    }
    388388    ideal I=(ideal)v->Data();
    389     I->rank=si_max((int)I->rank,(int)c->Data());
     389    I->rank=si_max((int)I->rank,(int)((long)c->Data()));
    390390  }
    391391  else if ((strcmp(name,"global")==0)
  • Singular/extra.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.228 2005-07-26 17:06:54 Singular Exp $ */
     4/* $Id: extra.cc,v 1.229 2005-07-27 15:47:53 Singular Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    421421          return TRUE;
    422422        }
    423         errormsg = feSetOptValue(opt, (int) h->Data());
     423        errormsg = feSetOptValue(opt, (int)((long) h->Data()));
    424424        if (errormsg != NULL)
    425           Werror("Option '--%s=%d' %s", sys_cmd, (int) h->Data(), errormsg);
     425          Werror("Option '--%s=%d' %s", sys_cmd, (int) ((long)h->Data()), errormsg);
    426426      }
    427427      else
     
    448448      if ((h!=NULL) &&(h->Typ()==INT_CMD))
    449449      {
    450         siRandomStart=(int)h->Data();
     450        siRandomStart=(int)((long)h->Data());
    451451#ifdef buildin_rand
    452452        siSeed=siRandomStart;
     
    483483            {
    484484              res->rtyp=INT_CMD;
    485               res->data=(void*)complexNearZero((gmp_complex*)h->Data(),(int)h->next->Data());
     485              res->data=(void*)complexNearZero((gmp_complex*)h->Data(),
     486                                               (int)((long)(h->next->Data())));
    486487              return FALSE;
    487488            }
     
    613614       return TRUE;
    614615     }
    615      if(((int)h->next->Data())==1)
     616     if(((long)h->next->Data())==1L)
    616617       return spectrumfProc(res,h);
    617618     return spectrumProc(res,h);
     
    685686        if ((h!=NULL) && (h->Typ()==INT_CMD))
    686687        {
    687           a=(int)h->CopyD();
     688          a=(int)((long)(h->Data()));
    688689          h=h->next;
    689690        }
     
    691692        if ((h!=NULL) && (h->Typ()==INT_CMD))
    692693        {
    693           b=(int)h->CopyD();
     694          b=(int)((long)(h->Data()));
    694695          h=h->next;
    695696        }
     
    703704        if ((h!=NULL) && (h->Typ()==INT_CMD))
    704705        {
    705           metric=(int)h->CopyD();
     706          metric=(int)((long)(h->Data()));
    706707        }
    707708        res->rtyp=MATRIX_CMD;
     
    11261127        return TRUE;
    11271128      }
    1128       if ((int) h->Data() != currRing->N)
     1129      if ((int) ((long)(h->Data())) != currRing->N)
    11291130      {
    11301131        Werror("system(\"Mivdp\" ...) intvecs not of length %d\n",
     
    11321133        return TRUE;
    11331134      }
    1134       int arg1 = (int) h->Data();
     1135      int arg1 = (int) ((long)(h->Data()));
    11351136
    11361137      intvec* result = (intvec*) Mivdp(arg1);
     
    11491150        return TRUE;
    11501151      }
    1151       if ((int) h->Data() != currRing->N)
     1152      if ((int) ((long)(h->Data())) != currRing->N)
    11521153      {
    11531154        Werror("system(\"Mivlp\" ...) intvecs not of length %d\n",
     
    11551156        return TRUE;
    11561157      }
    1157       int arg1 = (int) h->Data();
     1158      int arg1 = (int) ((long)(h->Data()));
    11581159
    11591160      intvec* result = (intvec*) Mivlp(arg1);
     
    13121313          return TRUE;
    13131314        }
    1314         int arg1 = (int) h->Data();
     1315        int arg1 = (int) ((long)(h->Data()));
    13151316
    13161317        intvec* result = (intvec*) MivMatrixOrderdp(arg1);
     
    13341335        ideal arg1 = (ideal) h->Data();
    13351336        intvec* arg2 = (intvec*) h->next->Data();
    1336         int arg3 = (int) h->next->next->Data();
     1337        int arg3 = (int) ((long)(h->next->next->Data()));
    13371338
    13381339        intvec* result = (intvec*) MPertVectors(arg1, arg2, arg3);
     
    13561357        ideal arg1 = (ideal) h->Data();
    13571358        intvec* arg2 = (intvec*) h->next->Data();
    1358         int arg3 = (int) h->next->next->Data();
     1359        int arg3 = (int) ((long)(h->next->next->Data()));
    13591360
    13601361        intvec* result = (intvec*) MPertVectorslp(arg1, arg2, arg3);
     
    13851386     if(strcmp(sys_cmd, "MivUnit") == 0)
    13861387      {
    1387         int arg1 = (int) h->Data();
     1388        int arg1 = (int) ((long)(h->Data()));
    13881389
    13891390        intvec* result = (intvec*) MivUnit(arg1);
     
    14331434          return TRUE;
    14341435        }
    1435         int arg1 = (int) h->Data();
     1436        int arg1 = (int) ((long)(h->Data()));
    14361437
    14371438        intvec* result = (intvec*) MivMatrixOrderlp(arg1);
     
    16151616      }
    16161617      ideal arg1 = (ideal) h->Data();
    1617       int arg2 = (int) h->next->Data();
    1618       int arg3 = (int) h->next->next->Data();
     1618      int arg2 = (int) ((long)(h->next->Data()));
     1619      int arg3 = (int) ((long)(h->next->next->Data()));
    16191620      intvec* arg4 = (intvec*) h->next->next->next->Data();
    16201621      intvec* arg5   =  (intvec*) h->next->next->next->next->Data();
    1621       int arg6   =  (int) h->next->next->next->next->next->Data();
     1622      int arg6   =  (int) ((long)(h->next->next->next->next->next->Data()));
    16221623
    16231624
     
    16521653      }
    16531654      ideal arg1 = (ideal) h->Data();
    1654       int arg2 = (int) h->next->Data();
    1655       int arg3 = (int) h->next->next->Data();
     1655      int arg2 = (int) ((long)(h->next->Data()));
     1656      int arg3 = (int) ((long)(h->next->next->Data()));
    16561657      intvec* arg4 = (intvec*) h->next->next->next->Data();
    16571658      intvec* arg5   =  (intvec*) h->next->next->next->next->Data();
     
    18121813      intvec* arg2 = (intvec*) h->next->Data();
    18131814      intvec* arg3   =  (intvec*) h->next->next->Data();
    1814       int arg4   =  (int) h->next->next->next->Data();
     1815      int arg4   =  (int) ((long)(h->next->next->next->Data()));
    18151816
    18161817      ideal result = (ideal) TranMImprovwalk(arg1, arg2, arg3, arg4);
     
    18661867          if (h != NULL && h->Typ() == INT_CMD)
    18671868          {
    1868             int n=(int)h->Data();
     1869            int n=(int)((long)h->Data());
    18691870            h=h->next;
    18701871            if (h != NULL && h->Typ() == INTVEC_CMD)
     
    20922093        struct itimerval t,o;
    20932094        memset(&t,0,sizeof(t));
    2094         t.it_value.tv_sec     =(unsigned)h->Data();
     2095        t.it_value.tv_sec     =(unsigned)((unsigned long)h->Data());
    20952096        setitimer(ITIMER_VIRTUAL,&t,&o);
    20962097        return FALSE;
     
    22222223    {
    22232224      int showproc=0;
    2224       if ((h!=NULL) && (h->Typ()==INT_CMD)) showproc=(int)h->Data();
     2225      if ((h!=NULL) && (h->Typ()==INT_CMD)) showproc=(int)((long)h->Data());
    22252226#ifdef HAVE_NS
    22262227      listall(showproc);
     
    23622363      if ((h!=NULL) && (h->Typ()==INT_CMD))
    23632364      {
    2364         sdb_flags=(int)h->Data();
     2365        sdb_flags=(int)((long)h->Data());
    23652366      }
    23662367      else
     
    24152416      if ((h!=NULL) && (h->Typ()==INT_CMD))
    24162417      {
    2417         i2=(int)h->Data();
     2418        i2=(int)((long)h->Data());
    24182419      }
    24192420      else return TRUE;
     
    25072508      poly f = (poly)h->Data();
    25082509      h=h->next;
    2509       int n=(int)h->Data();
     2510      int n=(int)((long)h->Data());
    25102511      res->rtyp=POLY_CMD ;
    25112512      res->data=(void*) pFastPower(f,n,r);
     
    25182519      poly f = (poly)h->Data();
    25192520      h=h->next;
    2520       int n=(int)h->Data();
     2521      int n=(int)((long)h->Data());
    25212522      res->rtyp=POLY_CMD ;
    25222523      res->data=(void*) pPower(pCopy(f),n);
     
    25292530      poly f = (poly)h->Data();
    25302531      h=h->next;
    2531       int n=(int)h->Data();
     2532      int n=(int)((long)h->Data());
    25322533      res->rtyp=POLY_CMD ;
    25332534      res->data=(void*) pFastPowerMC(f,n,r);
  • Singular/feOpt.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: feOpt.cc,v 1.21 2003-02-20 13:49:32 Singular Exp $ */
     4/* $Id: feOpt.cc,v 1.22 2005-07-27 15:47:54 Singular Exp $ */
    55/*
    66* ABSTRACT: Implementation of option buisness
     
    397397
    398398      case FE_OPT_ECHO:
    399         si_echo = (int) feOptSpec[FE_OPT_ECHO].value;
     399        si_echo = (int) ((long)(feOptSpec[FE_OPT_ECHO].value));
    400400        if (si_echo < 0 || si_echo > 9)
    401401          return "argument of option is not in valid range 0..9";
     
    403403
    404404      case FE_OPT_RANDOM:
    405         siRandomStart = (unsigned int) feOptSpec[FE_OPT_RANDOM].value;
     405        siRandomStart = (unsigned int) ((unsigned long)
     406                                          (feOptSpec[FE_OPT_RANDOM].value));
    406407#ifdef buildin_rand
    407408        siSeed=siRandomStart;
     
    453454      case FE_OPT_TICKS_PER_SEC:
    454455      {
    455         int ticks = (int) feOptSpec[FE_OPT_TICKS_PER_SEC].value;
     456        int ticks = (int) ((long)(feOptSpec[FE_OPT_TICKS_PER_SEC].value));
    456457        if (ticks <= 0)
    457458          return "integer argument must be larger than 0";
  • Singular/grammar.y

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: grammar.y,v 1.113 2005-07-26 17:06:56 Singular Exp $ */
     4/* $Id: grammar.y,v 1.114 2005-07-27 15:47:54 Singular Exp $ */
    55/*
    66* ABSTRACT: SINGULAR shell grammatik
     
    115115     YYERROR;                                          \
    116116   }                                                   \
    117    (i) = (int)(a).Data();
     117   (i) = (int)((long)(a).Data());
    118118
    119119#define MYYERROR(a) { WerrorS(a); YYERROR; }
     
    10481048                if (sl->Typ() == INT_CMD)
    10491049                {
    1050                   (*iv)[i++] = (int)(sl->Data());
     1050                  (*iv)[i++] = (int)((long)(sl->Data()));
    10511051                }
    10521052                else if ((sl->Typ() == INTVEC_CMD)
  • Singular/iparith.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.371 2005-07-26 17:06:56 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.372 2005-07-27 15:47:55 Singular Exp $ */
    55
    66/*
     
    405405{
    406406  intvec* aa= (intvec *)u->CopyD(INTVEC_CMD);
    407   int bb = (int)(v->Data());
     407  int bb = (int)(long)(v->Data());
    408408  if (errorreported) return TRUE;
    409409  switch (iiOp)
     
    427427{
    428428  intvec* aa= (intvec *)u->CopyD(INTVEC_CMD);
    429   int bb = (int)(v->Data());
     429  int bb = (int)(long)(v->Data());
    430430  int i=si_min(aa->rows(),aa->cols());
    431431  switch (iiOp)
     
    445445static BOOLEAN jjDOTDOT(leftv res, leftv u, leftv v)
    446446{
    447   res->data=(char *)new intvec((int)u->Data(),(int)v->Data());
     447  res->data=(char *)new intvec((int)(long)u->Data(),(int)(long)v->Data());
    448448  return FALSE;
    449449}
     
    459459    iiOp=save_iiOp;
    460460  }
    461   if (iiOp==NOTEQUAL) res->data=(char *)(!(int)res->data);
     461  if (iiOp==NOTEQUAL) res->data=(char *)(!(long)res->data);
    462462}
    463463static BOOLEAN jjCOMPARE_IV(leftv res, leftv u, leftv v)
     
    491491{
    492492  intvec* a = (intvec * )(u->Data());
    493   int     b = (int )     (v->Data());
     493  int     b = (int)(long)(v->Data());
    494494  int r=a->compare(b);
    495495  switch  (iiOp)
     
    615615static BOOLEAN jjPOWER_I(leftv res, leftv u, leftv v)
    616616{
    617   int b=(int)u->Data();
    618   int e=(int)v->Data();
     617  int b=(int)(long)u->Data();
     618  int e=(int)(long)v->Data();
    619619  int rc = 1;
    620620  BOOLEAN overflow=FALSE;
     
    652652static BOOLEAN jjPOWER_N(leftv res, leftv u, leftv v)
    653653{
    654   int e=(int)v->Data();
     654  int e=(int)(long)v->Data();
    655655  number n=(number)u->CopyD(NUMBER_CMD);
    656656  if (e<0)
     
    668668static BOOLEAN jjPOWER_P(leftv res, leftv u, leftv v)
    669669{
    670   res->data = (char *)pPower((poly)u->CopyD(POLY_CMD),(int)v->Data());
     670  res->data = (char *)pPower((poly)u->CopyD(POLY_CMD),(int)(long)v->Data());
    671671  if (u!=NULL) return jjOP_REST(res,u,v);
    672672  return FALSE;
     
    674674static BOOLEAN jjPOWER_ID(leftv res, leftv u, leftv v)
    675675{
    676   res->data = (char *)idPower((ideal)(u->Data()),(int)(v->Data()));
     676  res->data = (char *)idPower((ideal)(u->Data()),(int)(long)(v->Data()));
    677677  if (u!=NULL) return jjOP_REST(res,u,v);
    678678  return FALSE;
     
    792792static BOOLEAN jjPLUS_I(leftv res, leftv u, leftv v)
    793793{
    794   unsigned int a=(unsigned int)u->Data();
    795   unsigned int b=(unsigned int)v->Data();
     794  unsigned int a=(unsigned int)(unsigned long)u->Data();
     795  unsigned int b=(unsigned int)(unsigned long)v->Data();
    796796  unsigned int c=a+b;
    797797  res->data = (char *)c;
     
    864864static BOOLEAN jjMINUS_I(leftv res, leftv u, leftv v)
    865865{
    866   unsigned int a=(unsigned int)u->Data();
    867   unsigned int b=(unsigned int)v->Data();
     866  unsigned int a=(unsigned int)(unsigned long)u->Data();
     867  unsigned int b=(unsigned int)(unsigned long)v->Data();
    868868  unsigned int c=a-b;
    869869  if (((Sy_bit(31)&a)!=(Sy_bit(31)&b))&&((Sy_bit(31)&a)!=(Sy_bit(31)&c)))
     
    906906static BOOLEAN jjTIMES_I(leftv res, leftv u, leftv v)
    907907{
    908   int a=(int)u->Data();
    909   int b=(int)v->Data();
     908  int a=(int)(long)u->Data();
     909  int b=(int)(long)v->Data();
    910910  int c=a * b;
    911911  if ((b!=0) && (c/b !=a))
     
    994994static BOOLEAN jjTIMES_MA_I1(leftv res, leftv u, leftv v)
    995995{
    996   res->data = (char *)mpMultI((matrix)u->CopyD(MATRIX_CMD),(int)v->Data());
     996  res->data = (char *)mpMultI((matrix)u->CopyD(MATRIX_CMD),(int)(long)v->Data());
    997997  return FALSE;
    998998}
     
    10151015static BOOLEAN jjGE_I(leftv res, leftv u, leftv v)
    10161016{
    1017   res->data = (char *)((int)u->Data() >= (int)v->Data());
     1017  res->data = (char *)((long)u->Data() >= (long)v->Data());
    10181018  return FALSE;
    10191019}
     
    10271027static BOOLEAN jjGT_I(leftv res, leftv u, leftv v)
    10281028{
    1029   res->data = (char *)((int)u->Data()>(int)v->Data());
     1029  res->data = (char *)((long)u->Data()>(long)v->Data());
    10301030  return FALSE;
    10311031}
     
    10391039static BOOLEAN jjLE_I(leftv res, leftv u, leftv v)
    10401040{
    1041   res->data = (char *)((int)u->Data() <= (int)v->Data());
     1041  res->data = (char *)((long)u->Data() <= (long)v->Data());
    10421042  return FALSE;
    10431043}
     
    10511051static BOOLEAN jjLT_I(leftv res, leftv u, leftv v)
    10521052{
    1053   res->data = (char *)((int)u->Data() < (int)v->Data());
     1053  res->data = (char *)((int)(long)u->Data() < (int)(long)v->Data());
    10541054  return FALSE;
    10551055}
     
    10631063static BOOLEAN jjDIVMOD_I(leftv res, leftv u, leftv v)
    10641064{
    1065   int a= (int) u->Data();
    1066   int b= (int) v->Data();
     1065  int a= (int)(long)u->Data();
     1066  int b= (int)(long)v->Data();
    10671067  if (b==0)
    10681068  {
     
    12021202static BOOLEAN jjEQUAL_I(leftv res, leftv u, leftv v)
    12031203{
    1204   res->data = (char *)((int)u->Data() == (int)v->Data());
     1204  res->data = (char *)((int)(long)u->Data() == (int)(long)v->Data());
    12051205  jjEQUAL_REST(res,u,v);
    12061206  return FALSE;
     
    12471247static BOOLEAN jjAND_I(leftv res, leftv u, leftv v)
    12481248{
    1249   res->data = (char *)((int)u->Data() && (int)v->Data());
     1249  res->data = (char *)((long)u->Data() && (long)v->Data());
    12501250  return FALSE;
    12511251}
    12521252static BOOLEAN jjOR_I(leftv res, leftv u, leftv v)
    12531253{
    1254   res->data = (char *)((int)u->Data() || (int)v->Data());
     1254  res->data = (char *)((long)u->Data() || (long)v->Data());
    12551255  return FALSE;
    12561256}
     
    13101310{
    13111311  poly p=(poly)u->Data();
    1312   int i=(int)v->Data();
     1312  int i=(int)(long)v->Data();
    13131313  int j=0;
    13141314  while (p!=NULL)
     
    13581358  poly r=p; // pointer to the beginning of component i
    13591359  poly o=NULL;
    1360   int i=(int)v->Data();
     1360  int i=(int)(long)v->Data();
    13611361  while (p!=NULL)
    13621362  {
     
    14211421  if(u->name==NULL) return TRUE;
    14221422  char * nn = (char *)omAlloc(strlen(u->name) + 14);
    1423   sprintf(nn,"%s(%d)",u->name,(int)v->Data());
     1423  sprintf(nn,"%s(%d)",u->name,(int)(long)v->Data());
    14241424  omFree((ADDRESS)u->name);
    14251425  u->name=NULL;
     
    16731673static BOOLEAN jjEXTGCD_I(leftv res, leftv u, leftv v)
    16741674{
    1675   int uu=(int)u->Data();int vv=(int)v->Data();
     1675  int uu=(int)(long)u->Data();int vv=(int)(long)v->Data();
    16761676  int p0=ABS(uu),p1=ABS(vv);
    16771677  int f0 = 1, f1 = 0, g0 = 0, g1 = 1, q, r;
     
    16891689  int a = f0;
    16901690  int b = g0;
    1691   if ( uu /*(int)u->Data()*/ < 0 ) a=-a;
    1692   if ( vv /*(int)v->Data()*/ < 0 ) b=-b;
     1691  if ( uu /*(int)(long)u->Data()*/ < 0 ) a=-a;
     1692  if ( vv /*(int)(long)v->Data()*/ < 0 ) b=-b;
    16931693  lists L=(lists)omAllocBin(slists_bin);
    16941694  L->Init(3);
     
    18631863static BOOLEAN jjGCD_I(leftv res, leftv u, leftv v)
    18641864{
    1865   int uu=(int)u->Data();int vv=(int)v->Data();
     1865  int uu=(int)(long)u->Data();int vv=(int)(long)v->Data();
    18661866  int p0=ABS(uu),p1=ABS(vv);
    18671867  int r;
     
    19051905  intvec *module_w=(intvec*)atGet(u,"isHomog",INTVEC_CMD);
    19061906  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currQuotient);
    1907   switch((int)v->Data())
     1907  switch((int)(long)v->Data())
    19081908  {
    19091909    case 1:
     
    19441944{
    19451945  assumeStdFlag(u);
    1946   res->data=(void *)scIndIndset((ideal)(u->Data()),(int)(v->Data()),
     1946  res->data=(void *)scIndIndset((ideal)(u->Data()),(int)(long)(v->Data()),
    19471947                    currQuotient);
    19481948  return FALSE;
     
    19561956static BOOLEAN jjJanetBasis2(leftv res, leftv u, leftv v)
    19571957{
    1958   return jjStdJanetBasis(res,u,(int)v->Data());
     1958  return jjStdJanetBasis(res,u,(int)(long)v->Data());
    19591959}
    19601960static BOOLEAN jjJET_P(leftv res, leftv u, leftv v)
    19611961{
    1962   res->data = (char *)pJet((poly)u->CopyD(), (int)v->Data());
     1962  res->data = (char *)pJet((poly)u->CopyD(), (int)(long)v->Data());
    19631963  return FALSE;
    19641964}
    19651965static BOOLEAN jjJET_ID(leftv res, leftv u, leftv v)
    19661966{
    1967   res->data = (char *)idJet((ideal)u->Data(),(int)v->Data());
     1967  res->data = (char *)idJet((ideal)u->Data(),(int)(long)v->Data());
    19681968  return FALSE;
    19691969}
     
    19711971{
    19721972  assumeStdFlag(u);
    1973   res->data = (char *)scKBase((int)v->Data(),
     1973  res->data = (char *)scKBase((int)(long)v->Data(),
    19741974                              (ideal)(u->Data()),currQuotient);
    19751975  return FALSE;
     
    20102010static BOOLEAN jjMINOR(leftv res, leftv u, leftv v)
    20112011{
    2012   res->data = (char *)idMinors((matrix)u->Data(),(int)v->Data());
     2012  res->data = (char *)idMinors((matrix)u->Data(),(int)(long)v->Data());
    20132013  return (res->data==NULL);
    20142014}
     
    20882088{
    20892089  idhdl h=(idhdl)u->data;
    2090   int i=(int)v->Data();
     2090  int i=(int)(long)v->Data();
    20912091  int p=0;
    20922092  if ((0<i)
     
    22172217static BOOLEAN jjRANDOM(leftv res, leftv u, leftv v)
    22182218{
    2219   int i=(int)u->Data();
    2220   int j=(int)v->Data();
     2219  int i=(int)(long)u->Data();
     2220  int j=(int)(long)v->Data();
    22212221#ifdef buildin_rand
    22222222  res->data =(char *)((i > j) ? i : (siRand() % (j-i+1)) + i);
     
    22612261static BOOLEAN jjRES(leftv res, leftv u, leftv v)
    22622262{
    2263   int maxl=(int)v->Data();
     2263  int maxl=(int)(long)v->Data();
    22642264  if (maxl<0)
    22652265  {
     
    23792379static BOOLEAN jjRES(leftv res, leftv u, leftv v)
    23802380{
    2381   int maxl=(int)v->Data();
     2381  int maxl=(int)(long)v->Data();
    23822382  if (maxl<0)
    23832383  {
     
    25002500static BOOLEAN jjSIMPL_ID(leftv res, leftv u, leftv v)
    25012501{
    2502   int sw = (int)v->Data();
     2502  int sw = (int)(long)v->Data();
    25032503  // CopyD for IDEAL_CMD and MODUL_CMD are identical:
    25042504  ideal id = (ideal)u->CopyD(IDEAL_CMD);
     
    25352535{
    25362536  intvec *v=NULL;
    2537   int sw=(int)dummy->Data();
     2537  int sw=(int)(long)dummy->Data();
    25382538  int fac_sw=sw;
    25392539  if ((sw<0)||(sw>2)) fac_sw=1;
     
    25872587static BOOLEAN jjSIMPL_P(leftv res, leftv u, leftv v)
    25882588{
    2589   int sw = (int)v->Data();
     2589  int sw = (int)(long)v->Data();
    25902590  // CopyD for POLY_CMD and VECTOR_CMD are identical:
    25912591  poly p = (poly)u->CopyD(POLY_CMD);
     
    26452645{
    26462646  idhdl h=(idhdl)u->data;
    2647   int i=(int)v->Data();
     2647  int i=(int)(long)v->Data();
    26482648  if ((0<i) && (i<=IDRING(h)->N))
    26492649    res->data=omStrDup(IDRING(h)->names[i-1]);
     
    26572657static BOOLEAN jjWEDGE(leftv res, leftv u, leftv v)
    26582658{
    2659   res->data = (char *)mpWedge((matrix)u->Data(),(int)v->Data());
     2659  res->data = (char *)mpWedge((matrix)u->Data(),(int)(long)v->Data());
    26602660  return FALSE;
    26612661}
     
    30053005//static BOOLEAN jjPLUSPLUS(leftv res, leftv u)
    30063006//{
    3007 //  res->data = (char *)((int)u->Data()+1);
     3007//  res->data = (char *)((int)(long)u->Data()+1);
    30083008//  return FALSE;
    30093009//}
    30103010//static BOOLEAN jjMINUSMINUS(leftv res, leftv u)
    30113011//{
    3012 //  res->data = (char *)((int)u->Data()-1);
     3012//  res->data = (char *)((int)(long)u->Data()-1);
    30133013//  return FALSE;
    30143014//}
     
    30253025static BOOLEAN jjUMINUS_I(leftv res, leftv u)
    30263026{
    3027   res->data = (char *)(-(int)u->Data());
     3027  res->data = (char *)(-(int)(long)u->Data());
    30283028  return FALSE;
    30293029}
     
    32463246{
    32473247  res->data = (char *)pOne();
    3248   pSetComp((poly)res->data,(int)v->Data());
     3248  pSetComp((poly)res->data,(int)(long)v->Data());
    32493249  pSetm((poly)res->data);
    32503250  return FALSE;
     
    35663566{
    35673567  omUpdateInfo();
    3568   switch(((int)v->Data()))
     3568  switch(((int)(long)v->Data()))
    35693569  {
    35703570  case 0:
     
    36453645static BOOLEAN jjPAR1(leftv res, leftv v)
    36463646{
    3647   int i=(int)v->Data();
     3647  int i=(int)(long)v->Data();
    36483648  int p=0;
    36493649  p=rPar(currRing);
     
    36713671    return TRUE;
    36723672  }
    3673   int i=(int)v->Data();
     3673  int i=(int)(long)v->Data();
    36743674  int p=0;
    36753675  if ((0<i) && (currRing->parameter!=NULL) && (i<=(p=rPar(currRing))))
     
    37023702static BOOLEAN jjPRIME(leftv res, leftv v)
    37033703{
    3704   int i = IsPrime((int)(v->Data()));
     3704  int i = IsPrime((int)(long)(v->Data()));
    37053705  res->data = (char *)(i > 1 ? i : 2);
    37063706  return FALSE;
     
    39273927static BOOLEAN jjTYPEOF(leftv res, leftv v)
    39283928{
    3929   switch ((int)v->data)
     3929  switch ((int)(long)v->data)
    39303930  {
    39313931    case INT_CMD:     res->data=omStrDup("int"); break;
     
    39553955static BOOLEAN jjVAR1(leftv res, leftv v)
    39563956{
    3957   int i=(int)v->Data();
     3957  int i=(int)(long)v->Data();
    39583958  if ((0<i) && (i<=currRing->N))
    39593959  {
     
    39773977    return TRUE;
    39783978  }
    3979   int i=(int)v->Data();
     3979  int i=(int)(long)v->Data();
    39803980  if ((0<i) && (i<=currRing->N))
    39813981    res->data=omStrDup(currRing->names[i-1]);
     
    41224122        case (int)jjidTransp:     dArith1[i].p=(proc1)idTransp; break;
    41234123#ifdef GENTABLE
    4124         default: Werror("missing proc1-definition for %d",(int)dArith1[i].p);
     4124        default: Werror("missing proc1-definition for %d",(int)(long)dArith1[i].p);
    41254125#endif
    41264126      }
     
    41534153static BOOLEAN jjidFreeModule(leftv res, leftv v)
    41544154{
    4155   res->data = (char *)idFreeModule((int)v->Data());
     4155  res->data = (char *)idFreeModule((int)(long)v->Data());
    41564156  return FALSE;
    41574157}
     
    41804180static BOOLEAN jjidMaxIdeal(leftv res, leftv v)
    41814181{
    4182   res->data = (char *)idMaxIdeal((int)v->Data());
     4182  res->data = (char *)idMaxIdeal((int)(long)v->Data());
    41834183  return FALSE;
    41844184}
     
    45304530{
    45314531  char *s= (char *)u->Data();
    4532   int   r = (int)v->Data();
    4533   int   c = (int)w->Data();
     4532  int   r = (int)(long)v->Data();
     4533  int   c = (int)(long)w->Data();
    45344534  int l = strlen(s);
    45354535
     
    45464546{
    45474547  intvec *iv = (intvec *)u->Data();
    4548   int   r = (int)v->Data();
    4549   int   c = (int)w->Data();
     4548  int   r = (int)(long)v->Data();
     4549  int   c = (int)(long)w->Data();
    45504550  if ((r<1)||(r>iv->rows())||(c<1)||(c>iv->cols()))
    45514551  {
     
    45764576{
    45774577  matrix m= (matrix)u->Data();
    4578   int   r = (int)v->Data();
    4579   int   c = (int)w->Data();
     4578  int   r = (int)(long)v->Data();
     4579  int   c = (int)(long)w->Data();
    45804580  //Print("gen. elem %d, %d\n",r,c);
    45814581  if ((r<1)||(r>MATROWS(m))||(c<1)||(c>MATCOLS(m)))
     
    47734773  ideal m;
    47744774  lists l=(lists)omAllocBin(slists_bin);
    4775   int k=(int)w->Data();
     4775  int k=(int)(long)w->Data();
    47764776  if (k>=0)
    47774777  {
    4778     smCallNewBareiss((ideal)u->Data(),(int)v->Data(),(int)w->Data(),m,&iv);
     4778    smCallNewBareiss((ideal)u->Data(),(int)(long)v->Data(),(int)(long)w->Data(),m,&iv);
    47794779    l->Init(2);
    47804780    l->m[0].rtyp=MODUL_CMD;
     
    48554855  * or 0
    48564856  */
    4857   int n=(int)w->Data();
     4857  int n=(int)(long)w->Data();
    48584858  char *where=(char *)u->Data();
    48594859  char *what=(char *)v->Data();
     
    48804880static BOOLEAN jjFWALK3(leftv res, leftv u, leftv v, leftv w)
    48814881{
    4882   if ((int)w->Data()==0)
     4882  if ((int)(long)w->Data()==0)
    48834883    res->data=(char *)walkProc(u,v);
    48844884  else
     
    48994899  }
    49004900  intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currQuotient,wdegree);
    4901   switch((int)v->Data())
     4901  switch((int)(long)v->Data())
    49024902  {
    49034903    case 1:
     
    49154915static BOOLEAN jjINTMAT3(leftv res, leftv u, leftv v,leftv w)
    49164916{
    4917   intvec* im= new intvec((int)v->Data(),(int)w->Data(), 0);
     4917  intvec* im= new intvec((int)(long)v->Data(),(int)(long)w->Data(), 0);
    49184918  intvec* arg = (intvec*) u->Data();
    49194919  int i, n = si_min(im->cols()*im->rows(), arg->cols()*arg->rows());
     
    49304930{
    49314931  short *iw=iv2array((intvec *)w->Data());
    4932   res->data = (char *)ppJetW((poly)u->Data(),(int)v->Data(),iw);
     4932  res->data = (char *)ppJetW((poly)u->Data(),(int)(long)v->Data(),iw);
    49334933  omFreeSize((ADDRESS)iw,(pVariables+1)*sizeof(short));
    49344934  return FALSE;
     
    49414941    return TRUE;
    49424942  }
    4943   res->data = (char *)pSeries((int)w->Data(),(poly)u->CopyD(),(poly)v->CopyD());
     4943  res->data = (char *)pSeries((int)(long)w->Data(),(poly)u->CopyD(),(poly)v->CopyD());
    49444944  return FALSE;
    49454945}
    49464946static BOOLEAN jjJET_ID_IV(leftv res, leftv u, leftv v, leftv w)
    49474947{
    4948   res->data = (char *)idJetW((ideal)u->Data(),(int)v->Data(),
     4948  res->data = (char *)idJetW((ideal)u->Data(),(int)(long)v->Data(),
    49494949                             (intvec *)w->Data());
    49504950  return FALSE;
     
    49574957    return TRUE;
    49584958  }
    4959   res->data = (char *)idSeries((int)w->Data(),(ideal)u->CopyD(),
     4959  res->data = (char *)idSeries((int)(long)w->Data(),(ideal)u->CopyD(),
    49604960                               (matrix)v->CopyD());
    49614961  return FALSE;
     
    49654965  assumeStdFlag(w);
    49664966  res->data = (char *)idMinors(
    4967                         (matrix)u->Data(),(int)v->Data(),(ideal)w->Data());
     4967                        (matrix)u->Data(),(int)(long)v->Data(),(ideal)w->Data());
    49684968  return FALSE;
    49694969}
     
    50365036{
    50375037  int di, k;
    5038   int i=(int)u->Data();
    5039   int r=(int)v->Data();
    5040   int c=(int)w->Data();
     5038  int i=(int)(long)u->Data();
     5039  int r=(int)(long)v->Data();
     5040  int c=(int)(long)w->Data();
    50415041  if ((r<=0) || (c<=0)) return TRUE;
    50425042  intvec *iv = new intvec(r, c, 0);
     
    51525152static BOOLEAN jjMATRIX_Id(leftv res, leftv u, leftv v,leftv w)
    51535153{
    5154   matrix m=mpNew((int)v->Data(),(int)w->Data());
     5154  matrix m=mpNew((int)(long)v->Data(),(int)(long)w->Data());
    51555155  ideal I=(ideal)u->CopyD(IDEAL_CMD);
    5156   int i=si_min(IDELEMS(I),(int)v->Data()*(int)w->Data());
     5156  int i=si_min(IDELEMS(I),(int)(long)v->Data()*(int)(long)w->Data());
    51575157  //for(i=i-1;i>=0;i--)
    51585158  //{
     
    51695169{
    51705170  res->data = (char *)idModule2formatedMatrix((ideal)u->CopyD(MODUL_CMD),
    5171            (int)v->Data(),(int)w->Data());
     5171           (int)(long)v->Data(),(int)(long)w->Data());
    51725172  return FALSE;
    51735173}
    51745174static BOOLEAN jjMATRIX_Ma(leftv res, leftv u, leftv v,leftv w)
    51755175{
    5176   matrix m=mpNew((int)v->Data(),(int)w->Data());
     5176  matrix m=mpNew((int)(long)v->Data(),(int)(long)w->Data());
    51775177  matrix I=(matrix)u->CopyD(MATRIX_CMD);
    5178   int r=si_min(MATROWS(I),(int)v->Data());
    5179   int c=si_min(MATCOLS(I),(int)w->Data());
     5178  int r=si_min(MATROWS(I),(int)(long)v->Data());
     5179  int c=si_min(MATCOLS(I),(int)(long)w->Data());
    51805180  int i,j;
    51815181  for(i=r;i>0;i--)
     
    52325232  assumeStdFlag(v);
    52335233  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(poly)u->Data(),
    5234     0,(int)w->Data());
     5234    0,(int)(long)w->Data());
    52355235  return FALSE;
    52365236}
     
    52395239  assumeStdFlag(v);
    52405240  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(ideal)u->Data(),
    5241     0,(int)w->Data());
     5241    0,(int)(long)w->Data());
    52425242  return FALSE;
    52435243}
     
    54255425    if((v->next!=NULL) && (v->next->Typ()==INT_CMD))
    54265426    {
    5427       lineno=(int)v->next->Data();
     5427      lineno=(int)(long)v->next->Data();
    54285428    }
    54295429    return sdb_set_breakpoint(v->Name(),lineno);
     
    54995499  ideal Q=(ideal)w2.Data();
    55005500
    5501   int n=(int)v3->Data();
     5501  int n=(int)(long)v3->Data();
    55025502  short *w=NULL;
    55035503  if(v4!=NULL)
     
    55845584      case INT_CMD:
    55855585      {
    5586         number n=nInit((int)h->Data());
     5586        number n=nInit((int)(long)h->Data());
    55875587        if (!nIsZero(n))
    55885588        {
     
    57275727    if(h->Typ()==INT_CMD)
    57285728    {
    5729       (*iv)[i]=(int)h->Data();
     5729      (*iv)[i]=(int)(long)h->Data();
    57305730    }
    57315731    else
     
    57575757    }
    57585758    res->rtyp=u1->Typ();
    5759     res->data=(char*)pSeries((int)u3->Data(),pCopy((poly)u1->Data()),
     5759    res->data=(char*)pSeries((int)(long)u3->Data(),pCopy((poly)u1->Data()),
    57605760                             pCopy((poly)u2->Data()),(intvec*)u4->Data());
    57615761    return FALSE;
     
    57735773    }
    57745774    res->rtyp=u1->Typ();
    5775     res->data=(char*)idSeries((int)u3->Data(),idCopy((ideal)u1->Data()),
     5775    res->data=(char*)idSeries((int)(long)u3->Data(),idCopy((ideal)u1->Data()),
    57765776                              mpCopy((matrix)u2->Data()),(intvec*)u4->Data());
    57775777    return FALSE;
     
    58795879  {
    58805880    int save_d=Kstd1_deg;
    5881     Kstd1_deg=(int)u3->Data();
     5881    Kstd1_deg=(int)(long)u3->Data();
    58825882    kModW=(intvec *)u4->Data();
    58835883    BITSET save=verbose;
     
    59035903    res->rtyp=IDEAL_CMD;
    59045904    res->data=(char*)redNF(idCopy((ideal)u3->Data()),idCopy((ideal)u1->Data()),
    5905                            mpCopy((matrix)u2->Data()),(int)u4->Data());
     5905                           mpCopy((matrix)u2->Data()),(int)(long)u4->Data());
    59065906    return FALSE;
    59075907  }
     
    59185918    res->rtyp=POLY_CMD;
    59195919    res->data=(char*)redNF(idCopy((ideal)u3->Data()),pCopy((poly)u1->Data()),
    5920                            pCopy((poly)u2->Data()),(int)u4->Data());
     5920                           pCopy((poly)u2->Data()),(int)(long)u4->Data());
    59215921    return FALSE;
    59225922  }
     
    59465946    res->data=(char*)redNF(idCopy((ideal)u3->Data()),idCopy((ideal)u1->Data()),
    59475947                           mpCopy((matrix)u2->Data()),
    5948                            (int)u4->Data(),(intvec*)u5->Data());
     5948                           (int)(long)u4->Data(),(intvec*)u5->Data());
    59495949    return FALSE;
    59505950  }
     
    59625962    res->data=(char*)redNF(idCopy((ideal)u3->Data()),pCopy((poly)u1->Data()),
    59635963                           pCopy((poly)u2->Data()),
    5964                            (int)u4->Data(),(intvec*)u5->Data());
     5964                           (int)(long)u4->Data(),(intvec*)u5->Data());
    59655965    return FALSE;
    59665966  }
     
    60266026    if (v->Typ()!=INT_CMD)
    60276027      return TRUE;
    6028     test_cmd((int)v->Data());
     6028    test_cmd((int)(long)v->Data());
    60296029    v=v->next;
    60306030  }
     
    60496049  jjSTATUS3(res, v, v->next, v->next->next);
    60506050#if defined(HAVE_USLEEP)
    6051   if (((int) res->data) == 0)
    6052   {
    6053     int i_s = (int) v->next->next->next->Data();
     6051  if (((long) res->data) == 0L)
     6052  {
     6053    int i_s = (int)(long) v->next->next->next->Data();
    60546054    if (i_s > 0)
    60556055    {
    6056       usleep((int) v->next->next->next->Data());
     6056      usleep((int)(long) v->next->next->next->Data());
    60576057      jjSTATUS3(res, v, v->next, v->next->next);
    60586058    }
     
    61576157  assume( e->Typ()==INT_CMD );
    61586158  Subexpr r=(Subexpr)omAlloc0Bin(sSubexpr_bin);
    6159   r->start =(int)e->Data();
     6159  r->start =(int)(long)e->Data();
    61606160  return r;
    61616161}
  • Singular/ipassign.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipassign.cc,v 1.78 2005-07-22 16:22:10 levandov Exp $ */
     4/* $Id: ipassign.cc,v 1.79 2005-07-27 15:47:56 Singular Exp $ */
    55
    66/*
     
    4141static BOOLEAN jjECHO(leftv res, leftv a)
    4242{
    43   si_echo=(int)a->Data();
     43  si_echo=(int)((long)(a->Data()));
    4444  return FALSE;
    4545}
    4646static BOOLEAN jjPAGELENGTH(leftv res, leftv a)
    4747{
    48   pagelength=(int)a->Data();
     48  pagelength=(int)((long)(a->Data()));
    4949  return FALSE;
    5050}
    5151static BOOLEAN jjPRINTLEVEL(leftv res, leftv a)
    5252{
    53   printlevel=(int)a->Data();
     53  printlevel=(int)((long)(a->Data()));
    5454  return FALSE;
    5555}
    5656static BOOLEAN jjCOLMAX(leftv res, leftv a)
    5757{
    58   colmax=(int)a->Data();
     58  colmax=(int)((long)(a->Data()));
    5959  return FALSE;
    6060}
    6161static BOOLEAN jjTIMER(leftv res, leftv a)
    6262{
    63   timerv=(int)a->Data();
     63  timerv=(int)((long)(a->Data()));
    6464  initTimer();
    6565  return FALSE;
     
    6868static BOOLEAN jjRTIMER(leftv res, leftv a)
    6969{
    70   rtimerv=(int)a->Data();
     70  rtimerv=(int)((long)(a->Data()));
    7171  initRTimer();
    7272  return FALSE;
     
    7575static BOOLEAN jjMAXDEG(leftv res, leftv a)
    7676{
    77   Kstd1_deg=(int)a->Data();
     77  Kstd1_deg=(int)((long)(a->Data()));
    7878  if (Kstd1_deg!=0)
    7979    test |=Sy_bit(24);
     
    8484static BOOLEAN jjMAXMULT(leftv res, leftv a)
    8585{
    86   Kstd1_mu=(int)a->Data();
     86  Kstd1_mu=(int)((long)(a->Data()));
    8787  if (Kstd1_mu!=0)
    8888    test |=Sy_bit(23);
     
    9393static BOOLEAN jjTRACE(leftv res, leftv a)
    9494{
    95   traceit=(int)a->Data();
     95  traceit=(int)((long)(a->Data()));
    9696  return FALSE;
    9797}
     
    100100  if (currRing != NULL)
    101101  {
    102     BOOLEAN shortOut = (BOOLEAN)((int)a->Data());
     102    BOOLEAN shortOut = (BOOLEAN)((long)a->Data());
    103103#if HAVE_CAN_SHORT_OUT
    104104    if (!shortOut)
     
    255255      {
    256256        intvec *iv1=new intvec(i+1);
    257         (*iv1)[i]=(int)a->Data();
     257        (*iv1)[i]=(int)((long)(a->Data()));
    258258        intvec *ivn=ivAdd(iv,iv1);
    259259        delete iv;
     
    262262      }
    263263      else
    264         (*iv)[i]=(int)a->Data();
     264        (*iv)[i]=(int)((long)(a->Data()));
    265265    }
    266266    else
     
    273273      }
    274274      else
    275         IMATELEM(*iv,i+1,c) = (int)a->Data();
     275        IMATELEM(*iv,i+1,c) = (int)((long)(a->Data()));
    276276    }
    277277  }
     
    970970    if (hh->Typ() == INT_CMD)
    971971    {
    972       (*iv)[i++] = (int)(hh->Data());
     972      (*iv)[i++] = (int)((long)(hh->Data()));
    973973    }
    974974    else if ((hh->Typ() == INTVEC_CMD)
  • Singular/ipconv.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipconv.cc,v 1.27 2005-05-18 15:59:35 Singular Exp $ */
     4/* $Id: ipconv.cc,v 1.28 2005-07-27 15:47:57 Singular Exp $ */
    55/*
    66* ABSTRACT: automatic type conversions
     
    3737static void * iiI2P(void *data)
    3838{
    39   poly p=pISet((int)data);
     39  poly p=pISet((int)(long)data);
    4040  return (void *)p;
    4141}
     
    4343static void * iiI2V(void *data)
    4444{
    45   poly p=pISet((int)data);
     45  poly p=pISet((int)(long)data);
    4646  if (p!=NULL) pSetComp(p,1);
    4747  return (void *)p;
     
    5151{
    5252  ideal I=idInit(1,1);
    53   I->m[0]=pISet((int)data);
     53  I->m[0]=pISet((int)(long)data);
    5454  return (void *)I;
    5555}
     
    116116static void * iiI2Iv(void *data)
    117117{
    118   intvec *iv=new intvec((int)data,(int)data);
     118  int s=(int)(long)data;
     119  intvec *iv=new intvec(s,s);
    119120  return (void *)iv;
    120121}
     
    122123static void * iiI2N(void *data)
    123124{
    124   number n=nInit((int)data);
     125  number n=nInit((int)(long)data);
    125126  return (void *)n;
    126127}
  • Singular/ipprint.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipprint.cc,v 1.22 2005-05-18 15:59:35 Singular Exp $ */
     4/* $Id: ipprint.cc,v 1.23 2005-07-27 15:47:57 Singular Exp $ */
    55/*
    66* ABSTRACT: interpreter: printing
     
    263263  if ((u->next!=NULL)&&(u->Typ()==INT_CMD))
    264264  {
    265     print=((int)u->Data()>0);
     265    print=  (((long)(u->Data()))>0L);
    266266    u=u->next;
    267267  }
     
    286286{
    287287  int i,j;
    288   int row_shift=(int)atGet(u,"rowShift",INT_CMD);
     288  int row_shift=(int)((long)(atGet(u,"rowShift",INT_CMD)));
    289289  intvec * betti=(intvec *)u->Data();
    290290  // head line --------------------------------------------------------
  • Singular/ipshell.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.119 2005-07-26 17:04:44 Singular Exp $ */
     4/* $Id: ipshell.cc,v 1.120 2005-07-27 15:47:57 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    919919  r=liFindRes(l,&len,&typ0);
    920920  if (r==NULL) return TRUE;
    921   res->data=(char *)syBetti(r,len,&reg,weights,(int)v->Data());
     921  res->data=(char *)syBetti(r,len,&reg,weights,(int)(long)v->Data());
    922922  omFreeSize((ADDRESS)r,(len)*sizeof(ideal));
    923923  atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
     
    17341734    Werror("invald coeff. field description, expecting precision list");
    17351735  lists LL=(lists)L->m[1].data;
    1736   int r1=(int)LL->m[0].data;
    1737   int r2=(int)LL->m[1].data;
     1736  int r1=(int)(long)LL->m[0].data;
     1737  int r2=(int)(long)LL->m[1].data;
    17381738  if ((r1<=SHORT_REAL_LENGTH)
    17391739  && (r2=SHORT_REAL_LENGTH))
     
    17801780  if (L->m[0].Typ()==INT_CMD)
    17811781  {
    1782     R->ch=(int)L->m[0].Data();
     1782    R->ch=(int)(long)L->m[0].Data();
    17831783  }
    17841784  else if (L->m[0].Typ()==LIST_CMD)
     
    18971897      intvec *iv;
    18981898      if (vv->m[1].Typ()==INT_CMD)
    1899         iv=new intvec((int)vv->m[1].Data(),(int)vv->m[1].Data());
     1899        iv=new intvec((int)(long)vv->m[1].Data(),(int)(long)vv->m[1].Data());
    19001900      else
    19011901        iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
     
    20432043BOOLEAN mpKoszul(leftv res,leftv c/*ip*/, leftv b/*in*/, leftv id)
    20442044{
    2045   int n=(int)b->Data();
    2046   int d=(int)c->Data();
     2045  int n=(int)(long)b->Data();
     2046  int d=(int)(long)c->Data();
    20472047  int     k,l,sign,row,col;
    20482048  matrix  result;
     
    20992099{
    21002100  syStrategy syzstr=(syStrategy)u->Data();
    2101   BOOLEAN minim=(int)w->Data();
     2101  BOOLEAN minim=(int)(long)w->Data();
    21022102  int row_shift=0;
    21032103  int add_row_shift=0;
     
    23052305void spectrum::copy_deep( lists l )
    23062306{
    2307     mu = (int)(l->m[0].Data( ));
    2308     pg = (int)(l->m[1].Data( ));
    2309     n  = (int)(l->m[2].Data( ));
     2307    mu = (int)(long)(l->m[0].Data( ));
     2308    pg = (int)(long)(l->m[1].Data( ));
     2309    n  = (int)(long)(l->m[2].Data( ));
    23102310
    23112311    copy_new( n );
     
    29132913    // -------------------------
    29142914
    2915     int     mu = (int)(l->m[0].Data( ));
    2916     int     pg = (int)(l->m[1].Data( ));
    2917     int     n  = (int)(l->m[2].Data( ));
     2915    int     mu = (int)(long)(l->m[0].Data( ));
     2916    int     pg = (int)(long)(l->m[1].Data( ));
     2917    int     n  = (int)(long)(l->m[2].Data( ));
    29182918
    29192919    if( n <= 0 )
     
    30073007    }
    30083008
    3009     if( mu != (int)(l->m[0].Data( )) )
     3009    if( mu != (int)(long)(l->m[0].Data( )) )
    30103010    {
    30113011        return  semicListMilnorWrong;
     
    30243024    }
    30253025
    3026     if( pg != (int)(l->m[1].Data( )) )
     3026    if( pg != (int)(long)(l->m[1].Data( )) )
    30273027    {
    30283028        return  semicListPGWrong;
     
    30913091
    30923092    lists   l = (lists)first->Data( );
    3093     int     k = (int)second->Data( );
     3093    int     k = (int)(long)second->Data( );
    30943094
    30953095    if( (state=list_is_spectrum( l ))!=semicOK )
     
    31263126{
    31273127  semicState  state;
    3128   BOOLEAN qh=(((int)w->Data())==1);
     3128  BOOLEAN qh=(((int)(long)w->Data())==1);
    31293129
    31303130  // -----------------
     
    34553455    return TRUE;
    34563456  else
    3457     LP->m= (int)(v->Data());
     3457    LP->m= (int)(long)(v->Data());
    34583458
    34593459  v= v->next;
     
    34613461    return TRUE;
    34623462  else
    3463     LP->n= (int)(v->Data());
     3463    LP->n= (int)(long)(v->Data());
    34643464
    34653465  v= v->next;
     
    34673467    return TRUE;
    34683468  else
    3469     LP->m1= (int)(v->Data());
     3469    LP->m1= (int)(long)(v->Data());
    34703470
    34713471  v= v->next;
     
    34733473    return TRUE;
    34743474  else
    3475     LP->m2= (int)(v->Data());
     3475    LP->m2= (int)(long)(v->Data());
    34763476
    34773477  v= v->next;
     
    34793479    return TRUE;
    34803480  else
    3481     LP->m3= (int)(v->Data());
     3481    LP->m3= (int)(long)(v->Data());
    34823482
    34833483#ifdef mprDEBUG_PROT
     
    35203520{
    35213521  ideal gls = (ideal)(arg1->Data());
    3522   int imtype= (int)arg2->Data();
     3522  int imtype= (int)(long)arg2->Data();
    35233523
    35243524  uResultant::resMatType mtype= determineMType( imtype );
     
    35453545  poly gls;
    35463546  gls= (poly)(arg1->Data());
    3547   int howclean= (int)arg3->Data();
     3547  int howclean= (int)(long)arg3->Data();
    35483548
    35493549  if ( !(rField_is_R() ||
     
    36883688  int n= IDELEMS( p );
    36893689  int m= IDELEMS( w );
    3690   int tdg= (int)arg3->Data();
     3690  int tdg= (int)(long)arg3->Data();
    36913691
    36923692  res->data= (void*)NULL;
     
    37903790  if ( v->Typ() != INT_CMD )
    37913791    return TRUE;
    3792   else imtype= (int)v->Data();
     3792  else imtype= (int)(long)v->Data();
    37933793  v= v->next;
    37943794
     
    38063806  if ( v->Typ() != INT_CMD )
    38073807    return TRUE;
    3808   else howclean= (int)v->Data();
     3808  else howclean= (int)(long)v->Data();
    38093809
    38103810  uResultant::resMatType mtype= determineMType( imtype );
     
    43024302  if (pn->Typ()==INT_CMD)
    43034303  {
    4304     ch=(int)pn->Data();
     4304    ch=(int)(long)pn->Data();
    43054305  }
    43064306  else if ((pn->name != NULL)
     
    43114311    if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
    43124312    {
    4313       float_len=(int)pn->next->Data();
     4313      float_len=(int)(long)pn->next->Data();
    43144314      float_len2=float_len;
    43154315      pn=pn->next;
    43164316      if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
    43174317      {
    4318         float_len2=(int)pn->next->Data();
     4318        float_len2=(int)(long)pn->next->Data();
    43194319        pn=pn->next;
    43204320      }
  • Singular/lists.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: lists.cc,v 1.29 2005-07-22 16:22:11 levandov Exp $ */
     4/* $Id: lists.cc,v 1.30 2005-07-27 15:47:57 Singular Exp $ */
    55/*
    66* ABSTRACT: handling of the list type
     
    124124{
    125125  lists ul=(lists)u->CopyD();
    126   res->data=(char *)lInsert0(ul,v,(int)w->Data());
     126  res->data=(char *)lInsert0(ul,v,(int)(long)w->Data());
    127127  if (res->data==NULL)
    128128  {
    129129    Werror("cannot insert type `%s` at pos. %d",
    130       Tok2Cmdname(v->Typ()),(int)w->Data());
     130      Tok2Cmdname(v->Typ()),(int)(long)w->Data());
    131131    return TRUE;
    132132  }
     
    150150{
    151151  lists ul=(lists)u->Data();
    152   int VIndex=(int)v->Data()-1;
     152  int VIndex=(int)(long)v->Data()-1;
    153153
    154154  if((0<=VIndex)&&(VIndex<=ul->nr))
  • Singular/pcv.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: pcv.cc,v 1.34 2001-11-14 16:41:02 Singular Exp $ */
     4/* $Id: pcv.cc,v 1.35 2005-07-27 15:47:58 Singular Exp $ */
    55/*
    66* ABSTRACT: conversion between polys and coef vectors
     
    330330      if(h&&h->Typ()==INT_CMD)
    331331      {
    332         int d0=(int)h->Data();
     332        int d0=(int)(long)h->Data();
    333333        h=h->next;
    334334        if(h&&h->Typ()==INT_CMD)
    335335        {
    336           int d1=(int)h->Data();
     336          int d1=(int)(long)h->Data();
    337337          res->rtyp=LIST_CMD;
    338338          res->data=(void*)pcvP2CV(p,d0,d1);
     
    358358      if(h&&h->Typ()==INT_CMD)
    359359      {
    360         int d0=(int)h->Data();
     360        int d0=(int)(long)h->Data();
    361361        h=h->next;
    362362        if(h&&h->Typ()==INT_CMD)
    363363        {
    364           int d1=(int)h->Data();
     364          int d1=(int)(long)h->Data();
    365365          res->rtyp=LIST_CMD;
    366366          res->data=(void*)pcvCV2P(pl,d0,d1);
     
    392392    if(h&&h->Typ()==INT_CMD)
    393393    {
    394       int d0=(int)h->Data();
     394      int d0=(int)(long)h->Data();
    395395      h=h->next;
    396396      if(h&&h->Typ()==INT_CMD)
    397397      {
    398         int d1=(int)h->Data();
     398        int d1=(int)(long)h->Data();
    399399        res->rtyp=INT_CMD;
    400400        res->data=(void*)pcvDim(d0,d1);
     
    448448    if(h&&h->Typ()==INT_CMD)
    449449    {
    450       int d0=(int)h->Data();
     450      int d0=(int)(long)h->Data();
    451451      h=h->next;
    452452      if(h&&h->Typ()==INT_CMD)
    453453      {
    454         int d1=(int)h->Data();
     454        int d1=(int)(long)h->Data();
    455455        res->rtyp=LIST_CMD;
    456456        res->data=(void*)pcvBasis(d0,d1);
  • Singular/subexpr.cc

    r7adb161 r7447d8  
    55* ABSTRACT: handling of leftv
    66*/
    7 /* $Id: subexpr.cc,v 1.90 2005-05-31 07:42:21 bricken Exp $ */
     7/* $Id: subexpr.cc,v 1.91 2005-07-27 15:47:58 Singular Exp $ */
    88
    99#include <stdlib.h>
     
    144144          break;
    145145       case INT_CMD:
    146           ::Print("%-*.*s%d",spaces,spaces," ",(int)d);
     146          ::Print("%-*.*s%d",spaces,spaces," ",(int)(long)d);
    147147          break;
    148148       case PROC_CMD:
     
    662662          {
    663663            s=(char *)omAlloc(MAX_INT_LEN+7);
    664             sprintf(s,"int(%d)",(int)d);
     664            sprintf(s,"int(%d)",(int)(long)d);
    665665          }
    666666          else
    667667          {
    668668            s=(char *)omAlloc(MAX_INT_LEN+2);
    669             sprintf(s,"%d",(int)d);
     669            sprintf(s,"%d",(int)(long)d);
    670670          }
    671671          return s;
  • kernel/clapconv.cc

    r7adb161 r7447d8  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: clapconv.cc,v 1.5 2005-06-13 16:23:30 Singular Exp $
     5// $Id: clapconv.cc,v 1.6 2005-07-27 15:48:28 Singular Exp $
    66/*
    77* ABSTRACT: convert data between Singular and factory
     
    4848  else
    4949  {
    50     if ( ((int)n) & 1 )
    51     {
    52       term = ((int)n) >>2;
     50    if ( ((long)n) & 1L )
     51    {
     52      term = ((long)n) >>2;
    5353    }
    5454    else
     
    119119    else
    120120    {
    121       if ( (int)(pGetCoeff( p )) & 1 )
    122       {
    123         term = ((int)( pGetCoeff( p ) )>>2);
     121      if ( (long)(pGetCoeff( p )) & 1 )
     122      {
     123        term = ((long)( pGetCoeff( p ) )>>2);
    124124      }
    125125      else
     
    324324      //&&  ( napGetCoeff( p )->s == 0))
    325325      //  naNormalize( naGetCoeff( p ) );
    326       if ( (int)(napGetCoeff( p )) & 1 )
     326      if ( (long)(napGetCoeff( p )) & 1L )
    327327        term = nlInt( napGetCoeff( p ) );
    328328      else
     
    543543      //&&  ( napGetCoeff( p )->s == 0))
    544544      //  naNormalize( naGetCoeff( p ) );
    545       if ( (int)(napGetCoeff( p )) & SR_INT )
     545      if ( (long)(napGetCoeff( p )) & SR_INT )
    546546        term = nlInt( napGetCoeff( p ) );
    547547        //term = SR_TO_INT(napGetCoeff( p )) ;
  • kernel/fast_maps.cc

    r7adb161 r7447d8  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 02/01
    9  *  Version: $Id: fast_maps.cc,v 1.3 2005-04-25 12:59:13 Singular Exp $
     9 *  Version: $Id: fast_maps.cc,v 1.4 2005-07-27 15:48:28 Singular Exp $
    1010 *******************************************************************/
    1111#include "mod2.h"
     
    102102    p_wrp(monomial->dest, dest_r);
    103103  }
    104   if (monomial->f1!=NULL) { printf(" f1:%x", (unsigned int)monomial->f1->src);
     104  if (monomial->f1!=NULL) { printf(" f1:%x", (long)monomial->f1->src);
    105105                            // p_wrp(monomial->f1->src, src_r);
    106106                          }
    107   if (monomial->f2!=NULL) { printf(" f2:%x",(unsigned int)monomial->f2->src);
     107  if (monomial->f2!=NULL) { printf(" f2:%x",(long)monomial->f2->src);
    108108                            // p_wrp(monomial->f2->src, src_r);
    109109                          }
  • kernel/feOpt.h

    r7adb161 r7447d8  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: feOpt.h,v 1.1.1.1 2003-10-06 12:15:51 Singular Exp $ */
     6/* $Id: feOpt.h,v 1.2 2005-07-27 15:48:28 Singular Exp $ */
    77/*
    88* ABSTRACT: Declarations for working with Options
     
    6060  if (opt != FE_OPT_UNDEF && feOptSpec[(int)opt].type != feOptString)
    6161  {
    62     *val = (int) feOptSpec[(int)opt].value;
     62    *val = (int) ((long)(feOptSpec[(int)opt].value));
    6363    return TRUE;
    6464  }
  • kernel/ffields.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ffields.cc,v 1.2 2005-07-27 09:46:20 Singular Exp $ */
     4/* $Id: ffields.cc,v 1.3 2005-07-27 15:48:28 Singular Exp $ */
    55/*
    66* ABSTRACT: finite fields with a none-prime number of elements (via tables)
     
    123123BOOLEAN nfDBTest (number a, char *f, int l)
    124124{
    125   if (((int)a<0) || ((int)a>nfCharQ))
    126   {
    127     Print("wrong %d in %s:%d\n",(int)a,f,l);
     125  if (((long)a<0L) || ((long)a>(long)nfCharQ))
     126  {
     127    Print("wrong %d in %s:%d\n",(int)((long)a),f,l);
    128128    return FALSE;
    129129  }
     
    163163  nfTest(b);
    164164#endif
    165   if (((int)a == nfCharQ) || ((int)b == nfCharQ))
     165  if (((long)a == (long)nfCharQ) || ((long)b == (long)nfCharQ))
    166166    return (number)nfCharQ;
    167167  /*else*/
    168   int i=(int)a+(int)b;
     168  int i=(int)((long)a+(long)b);
    169169  if (i>=nfCharQ1) i-=nfCharQ1;
    170170#ifdef LDEBUG
     
    213213  nfTest(n);
    214214#endif
    215   if(nfCharQ == (int)n) return -1;
    216   return (int)n;
     215  if((long)nfCharQ == (long)n) return -1;
     216  return (int)((long)n);
    217217}
    218218
     
    236236  nfTest(b);
    237237#endif
    238   if (nfCharQ == (int)a) return b;
    239   if (nfCharQ == (int)b) return a;
    240   int zb,zab,r;
    241   if ((int)a >= (int)b)
    242   {
    243     zb = (int)b;
    244     zab = (int)a-(int)b;
     238  if ((long)nfCharQ == (long)a) return b;
     239  if ((long)nfCharQ == (long)b) return a;
     240  long zb,zab,r;
     241  if ((long)a >= (long)b)
     242  {
     243    zb = (long)b;
     244    zab = (long)a-(long)b;
    245245  }
    246246  else
    247247  {
    248     zb = (int)a;
    249     zab = (int)b-(int)a;
     248    zb = (long)a;
     249    zab = (long)b-(long)a;
    250250  }
    251251#ifdef LDEBUG
    252252  nfTest((number)zab);
    253253#endif
    254   if (nfPlus1Table[zab]==nfCharQ) r=nfCharQ; /*if z^(a-b)+1 =0*/
     254  if (nfPlus1Table[zab]==nfCharQ) r=(long)nfCharQ; /*if z^(a-b)+1 =0*/
    255255  else
    256256  {
    257     r= zb+nfPlus1Table[zab];
    258     if(r>=nfCharQ1) r-=nfCharQ1;
     257    r= zb+(long)nfPlus1Table[zab];
     258    if(r>=(long)nfCharQ1) r-=(long)nfCharQ1;
    259259  }
    260260#ifdef LDEBUG
     
    281281  nfTest(a);
    282282#endif
    283   return nfCharQ == (int)a;
     283  return (long)nfCharQ == (long)a;
    284284}
    285285
     
    292292  nfTest(a);
    293293#endif
    294   return 0 == (int)a;
     294  return 0L == (long)a;
    295295}
    296296
     
    303303  nfTest(a);
    304304#endif
    305   if (0 == (int)a) return FALSE; /* special handling of char 2*/
    306   return nfM1 == (int)a;
     305  if (0L == (long)a) return FALSE; /* special handling of char 2*/
     306  return (long)nfM1 == (long)a;
    307307}
    308308
     
    315315  nfTest(b);
    316316#endif
    317   if ((int)b==nfCharQ)
     317  if ((long)b==(long)nfCharQ)
    318318  {
    319319    WerrorS("div. by 0");
    320     return (number)nfCharQ;
    321   }
    322 #ifdef LDEBUG
    323   nfTest(a);
    324 #endif
    325   if ((int)a==nfCharQ)
    326     return (number)nfCharQ;
     320    return (number)((long)nfCharQ);
     321  }
     322#ifdef LDEBUG
     323  nfTest(a);
     324#endif
     325  if ((long)a==(long)nfCharQ)
     326    return (number)((long)nfCharQ);
    327327  /*else*/
    328   int s = (int)a - (int)b;
    329   if (s < 0)
    330     s += nfCharQ1;
     328  long s = (long)a - (long)b;
     329  if (s < 0L)
     330    s += (long)nfCharQ1;
    331331#ifdef LDEBUG
    332332  nfTest((number)s);
     
    343343  nfTest(c);
    344344#endif
    345   if ((int)c==nfCharQ)
     345  if ((long)c==(long)nfCharQ)
    346346  {
    347347    WerrorS("div. 1/0");
    348     return (number)nfCharQ;
    349   }
    350 #ifdef LDEBUG
    351   nfTest(((number)(nfCharQ1-(int)c)));
    352 #endif
    353   return (number)(nfCharQ1-(int)c);
     348    return (number)((long)nfCharQ);
     349  }
     350#ifdef LDEBUG
     351  nfTest(((number)((long)nfCharQ1-(long)c)));
     352#endif
     353  return (number)((long)nfCharQ1-(long)c);
    354354}
    355355
     
    363363  nfTest(c);
    364364#endif
    365   if (nfCharQ == (int)c) return c;
    366   int i=(int)c+nfM1;
    367   if (i>=nfCharQ1) i-=nfCharQ1;
     365  if ((long)nfCharQ == (long)c) return c;
     366  long i=(long)c+(long)nfM1;
     367  if (i>=(long)nfCharQ1) i-=(long)nfCharQ1;
    368368#ifdef LDEBUG
    369369  nfTest((number)i);
     
    381381  nfTest(b);
    382382#endif
    383   return (int)a != (int)b;
     383  return (long)a != (long)b;
    384384}
    385385
     
    393393  nfTest(b);
    394394#endif
    395   return (int)a == (int)b;
     395  return (long)a == (long)b;
    396396}
    397397
     
    404404  nfTest(a);
    405405#endif
    406   if ((int)a==nfCharQ)  StringAppendS("0");
    407   else if ((int)a==0)   StringAppendS("1");
     406  if ((long)a==(long)nfCharQ)  StringAppendS("0");
     407  else if ((long)a==0L)   StringAppendS("1");
    408408  else if (nfIsMOne(a))   StringAppendS("-1");
    409409  else
    410410  {
    411411    StringAppendS(nfParameter);
    412     if ((int)a!=1)
     412    if ((long)a!=1L)
    413413    {
    414414      if(currRing->ShortOut==0)  StringAppendS("^");
    415       StringAppend("%d",(int)a);
     415      StringAppend("%d",(int)((long)a));
    416416    }
    417417  }
     
    427427#endif
    428428  char *s;
    429   if (((int)a==nfCharQ) || ((int)a==0)) return NULL;
    430   else if ((int)a==1)
     429  if (((long)a==(long)nfCharQ) || ((long)a==0L)) return NULL;
     430  else if ((long)a==1L)
    431431  {
    432432    return omStrDup(nfParameter);
     
    435435  {
    436436    s=(char *)omAlloc(4+strlen(nfParameter));
    437     sprintf(s,"%s%d",nfParameter,(int)a);
     437    sprintf(s,"%s%d",nfParameter,(int)((long)a));
    438438  }
    439439  return s;
     
    450450  {
    451451    //*result=nfInit(1);
    452     *result = (number)0;
     452    *result = (number)0L;
    453453  }
    454454  else if (i==1)
     
    688688number nfMapP(number c)
    689689{
    690   return nfInit((int)c);
     690  return nfInit((int)((long)c));
    691691}
    692692
  • kernel/gr_kstd2.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: gr_kstd2.cc,v 1.7 2005-03-17 14:15:40 Singular Exp $ */
     4/* $Id: gr_kstd2.cc,v 1.8 2005-07-27 15:48:28 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
     
    944944/*   extern int zaehler; */
    945945/*   Print("Total pairs considered:%d\n",zaehler); zaehler=0; */
    946 #endif PDEBUG
     946#endif /*PDEBUG*/
    947947  return (strat->Shdl);
    948948}
  • kernel/longalg.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: longalg.cc,v 1.10 2005-06-08 13:52:12 Singular Exp $ */
     4/* $Id: longalg.cc,v 1.11 2005-07-27 15:48:28 Singular Exp $ */
    55/*
    66* ABSTRACT:   algebraic numbers
     
    19881988  l->s=2;
    19891989  l->z=(napoly)p_Init(nacRing);
    1990   int i=(int)c;
     1990  int i=(int)((long)c);
    19911991  if (i>(naPrimeM>>2)) i-=naPrimeM;
    19921992  napGetCoeff(l->z)=nlInit(i);
     
    20292029{
    20302030  if (npIsZero(c)) return NULL;
    2031   int i=(int)c;
     2031  int i=(int)((long)c);
    20322032  if (i>naPrimeM) i-=naPrimeM;
    20332033  number n=npInit(i);
  • kernel/longrat.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: longrat.cc,v 1.5 2004-09-14 10:27:20 Singular Exp $ */
     4/* $Id: longrat.cc,v 1.6 2005-07-27 15:48:28 Singular Exp $ */
    55/*
    66* ABSTRACT: computation with long rational numbers (Hubert Grassmann)
     
    157157  }
    158158  //if ((int)a==1) Print("!! 0x1 as number ? %s %d\n",f,l);
    159   if ((((int)a)&3)==3)
     159  if ((((long)a)&3L)==3L)
    160160  {
    161161    Print(" !!longrat:ptr(3) in %s:%d\n",f,l);
    162162    return FALSE;
    163163  }
    164   if ((((int)a)&3)==1)
    165   {
    166     if (((((int)a)<<1)>>1)!=((int)a))
    167     {
    168       Print(" !!longrat:arith:%x in %s:%d\n",(int)a, f,l);
     164  if ((((long)a)&3L)==1L)
     165  {
     166    if (((((long)a)<<1)>>1)!=((long)a))
     167    {
     168      Print(" !!longrat:arith:%x in %s:%d\n",(long)a, f,l);
    169169      return FALSE;
    170170    }
     
    475475#endif
    476476    n->s=1;
    477     if ((int)a>0)
     477    if ((long)a>0L)
    478478    {
    479479      mpz_init_set_si(&n->z,(long)1);
     
    761761  if (SR_HDL(a) & SR_HDL(b) & SR_INT)
    762762  {
    763     if ((int)a>0)
    764     {
    765       if ((int)b>0)
     763    if ((long)a>0L)
     764    {
     765      if ((long)b>0L)
    766766        return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
    767767      else
     
    770770    else
    771771    {
    772       if ((int)b>0)
     772      if ((long)b>0L)
    773773      {
    774774        int i=(-SR_TO_INT(a))%SR_TO_INT(b);
     
    787787  {
    788788    /* a is a small and b is a large int: -> a or (a+b) or (a-b) */
    789     if ((int)a<0)
     789    if ((long)a<0L)
    790790    {
    791791      if (mpz_isNeg(&b->z))
     
    907907      {
    908908        mpz_init_set(&u->n,&a->n);
    909         if ((int)b>0)
     909        if ((long)b>0L)
    910910          mpz_mul_ui(&u->n,&u->n,SR_TO_INT(b));
    911911        else
     
    12931293    return i%p;
    12941294  }
    1295   int iz=mpz_mmod_ui(NULL,&n->z,(unsigned long)p);
     1295  int iz=(int)mpz_mmod_ui(NULL,&n->z,(unsigned long)p);
    12961296  if (n->s!=3)
    12971297  {
    12981298    int in=mpz_mmod_ui(NULL,&n->n,(unsigned long)p);
    1299     return (int)npDiv((number)iz,(number)in);
     1299    return (int)((long)npDiv((number)iz,(number)in));
    13001300  }
    13011301  return iz;
     
    13961396    if (b->s!=0)
    13971397      return FALSE;
    1398     if (((int)a > 0) && (mpz_isNeg(&b->z)))
     1398    if (((long)a > 0L) && (mpz_isNeg(&b->z)))
    13991399      return FALSE;
    1400     if (((int)a < 0) && (!mpz_isNeg(&b->z)))
     1400    if (((long)a < 0L) && (!mpz_isNeg(&b->z)))
    14011401      return FALSE;
    14021402    MP_INT  bb;
     
    15371537      case 3:
    15381538      {
    1539         if ((int)a>0)
     1539        if ((long)a>0L)
    15401540          mpz_add_ui(&u->z,&b->z,SR_TO_INT(a));
    15411541        else
     
    17281728      case 3:
    17291729      {
    1730         if ((int)a>0)
     1730        if ((long)a>0L)
    17311731        {
    17321732          mpz_sub_ui(&u->z,&b->z,SR_TO_INT(a));
     
    17901790      case 3:
    17911791      {
    1792         if ((int)b>0)
     1792        if ((long)b>0L)
    17931793        {
    17941794          mpz_sub_ui(&u->z,&a->z,SR_TO_INT(b));
     
    19841984    u->s=b->s;
    19851985    if (u->s==1) u->s=0;
    1986     if ((int)a>0)
     1986    if ((long)a>0L)
    19871987    {
    19881988      mpz_mul_ui(&u->z,&b->z,(unsigned long)SR_TO_INT(a));
  • kernel/longrat.h

    r7adb161 r7447d8  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: longrat.h,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
     6/* $Id: longrat.h,v 1.2 2005-07-27 15:48:29 Singular Exp $ */
    77/*
    88* ABSTRACT: computation with long rational numbers
     
    1414typedef MP_INT lint;
    1515
    16 #define SR_INT    1
     16#define SR_INT    1L
    1717#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))
    1818#define SR_TO_INT(SR)   (((long)SR) >> 2)
  • kernel/modulop.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: modulop.cc,v 1.4 2005-07-05 17:10:41 Singular Exp $ */
     4/* $Id: modulop.cc,v 1.5 2005-07-27 15:48:29 Singular Exp $ */
    55/*
    66* ABSTRACT: numbers modulo p (<=32003)
     
    3636BOOLEAN npGreaterZero (number k)
    3737{
    38   int h = (int) k;
     38  int h = (int)((long) k);
    3939  return ((int)h !=0) && (h <= (npPrimeM>>1));
    4040}
     
    7373{
    7474  if ((long)n > (npPrimeM >>1)) return (int)((long)n -npPrimeM);
    75   else                          return (int)n;
     75  else                          return (int)((long)n);
    7676}
    7777
     
    235235{
    236236  if ((long)a > (npPrimeM >>1)) StringAppend("-%d",(int)(npPrimeM-((long)a)));
    237   else                          StringAppend("%d",(int)a);
     237  else                          StringAppend("%d",(int)((long)a));
    238238}
    239239
     
    435435  lint *dest,*ndest;
    436436  int size,i;
    437   int e,al,bl,iz,in;
     437  int e,al,bl,in;
     438  long iz;
    438439  mp_ptr qp,dd,nn;
    439440
     
    494495  omFreeBin((ADDRESS)res, rnumber_bin);
    495496  if(res->s==0)
    496     iz=(int)npDiv((number)iz,(number)in);
     497    iz=(long)npDiv((number)iz,(number)in);
    497498  return (number)iz;
    498499}
  • kernel/mpr_complex.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mpr_complex.cc,v 1.2 2005-02-03 16:43:37 Singular Exp $ */
     4/* $Id: mpr_complex.cc,v 1.3 2005-07-27 15:48:29 Singular Exp $ */
    55
    66/*
     
    2727// Make sure that it is up to date!!
    2828#define SR_HDL(A) ((long)(A))
    29 #define SR_INT    1
    3029#define SR_TO_INT(SR) (((long)SR) >> 2)
    3130
  • kernel/shortfl.cc

    r7adb161 r7447d8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: shortfl.cc,v 1.1.1.1 2003-10-06 12:16:03 Singular Exp $ */
     4/* $Id: shortfl.cc,v 1.2 2005-07-27 15:48:29 Singular Exp $ */
    55
    66/*
     
    407407static number nrMapP(number from)
    408408{
    409   int i = (int)from;
     409  int i = (int)((long)from);
    410410  float r = (float)i;
    411411  return nf(r).N();
Note: See TracChangeset for help on using the changeset viewer.