Changeset 0e80d3 in git


Ignore:
Timestamp:
Jan 11, 2007, 6:40:08 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
794ecf5da4d6d9881240e1e1398f75ef285ac2b4
Parents:
b066dcd11bcaf01720cb5960743e55eada29612f
Message:
*hannes: bigint compare


git-svn-id: file:///usr/local/Singular/svn/trunk@9702 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    rb066dc r0e80d3  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.430 2007-01-11 12:57:35 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.431 2007-01-11 17:40:08 Singular Exp $ */
    55
    66/*
    … …  
    10771077  return FALSE;
    10781078}
     1079static BOOLEAN jjGE_BI(leftv res, leftv u, leftv v)
     1080{
     1081  number h=nlSub((number)u->Data(),(number)v->Data());
     1082  res->data = (char *) (nlGreaterZero(h)||(nlIsZero(h)));
     1083  nlDelete(&h);
     1084  return FALSE;
     1085}
    10791086static BOOLEAN jjGE_I(leftv res, leftv u, leftv v)
    10801087{
    … …  
    10891096  return FALSE;
    10901097}
     1098static BOOLEAN jjGT_BI(leftv res, leftv u, leftv v)
     1099{
     1100  number h=nlSub((number)u->Data(),(number)v->Data());
     1101  res->data = (char *) (nlGreaterZero(h)&&(!nlIsZero(h)));
     1102  nlDelete(&h);
     1103  return FALSE;
     1104}
    10911105static BOOLEAN jjGT_I(leftv res, leftv u, leftv v)
    10921106{
    … …  
    11011115  return FALSE;
    11021116}
     1117static BOOLEAN jjLE_BI(leftv res, leftv u, leftv v)
     1118{
     1119  return jjGE_BI(res,v,u);
     1120}
    11031121static BOOLEAN jjLE_I(leftv res, leftv u, leftv v)
    11041122{
    … …  
    11081126static BOOLEAN jjLE_N(leftv res, leftv u, leftv v)
    11091127{
    1110   number h=nSub((number)v->Data(),(number)u->Data());
    1111   res->data = (char *) (nGreaterZero(h)||nIsZero(h));
    1112   nDelete(&h);
    1113   return FALSE;
     1128  return GE_N(res,v,u);
     1129}
     1130static BOOLEAN jjLT_BI(leftv res, leftv u, leftv v)
     1131{
     1132  return jjGT_BI(res,v,u);
    11141133}
    11151134static BOOLEAN jjLT_I(leftv res, leftv u, leftv v)
    … …  
    11201139static BOOLEAN jjLT_N(leftv res, leftv u, leftv v)
    11211140{
    1122   number h=nSub((number)v->Data(),(number)u->Data());
    1123   res->data = (char *) (nGreaterZero(h)&&(!nIsZero(h)));
    1124   nDelete(&h);
    1125   return FALSE;
     1141  return jjGT_N(res,v,u);
    11261142}
    11271143static BOOLEAN jjDIVMOD_I(leftv res, leftv u, leftv v)
    … …  
    12751291  }
    12761292  res->data=(char *)mm;
     1293  return FALSE;
     1294}
     1295static BOOLEAN jjEQUAL_BI(leftv res, leftv u, leftv v)
     1296{
     1297  res->data = (char *)((long)nlEqual((number)u->Data(),(number)v->Data()));
     1298  jjEQUAL_REST(res,u,v);
    12771299  return FALSE;
    12781300}
    … …  
    29322954,{jjCOMPARE_P, LE,             INT_CMD,        POLY_CMD,   POLY_CMD ALLOW_PLURAL}
    29332955,{jjCOMPARE_P, LE,             INT_CMD,        VECTOR_CMD, VECTOR_CMD ALLOW_PLURAL}
     2956,{jjLE_BI,     LE,             INT_CMD,        BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
    29342957,{jjLT_I,      '<',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
    29352958,{jjLT_N,      '<',            INT_CMD,        NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
    … …  
    29392962,{jjCOMPARE_P, '<',            INT_CMD,        POLY_CMD,   POLY_CMD ALLOW_PLURAL}
    29402963,{jjCOMPARE_P, '<',            INT_CMD,        VECTOR_CMD, VECTOR_CMD ALLOW_PLURAL}
     2964,{jjLT_BI,     '<',            INT_CMD,        BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
    29412965,{jjGE_I,      GE,             INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
    29422966,{jjGE_N,      GE,             INT_CMD,        NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
    … …  
    29462970,{jjCOMPARE_P, GE,             INT_CMD,        POLY_CMD,   POLY_CMD ALLOW_PLURAL}
    29472971,{jjCOMPARE_P, GE,             INT_CMD,        VECTOR_CMD, VECTOR_CMD ALLOW_PLURAL}
     2972,{jjGE_BI,     GE,             INT_CMD,        BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
    29482973,{jjGT_I,      '>',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
    29492974,{jjGT_N,      '>',            INT_CMD,        NUMBER_CMD, NUMBER_CMD ALLOW_PLURAL}
    … …  
    29532978,{jjCOMPARE_P, '>',            INT_CMD,        POLY_CMD,   POLY_CMD ALLOW_PLURAL}
    29542979,{jjCOMPARE_P, '>',            INT_CMD,        VECTOR_CMD, VECTOR_CMD ALLOW_PLURAL}
     2980,{jjGT_BI,     '>',            INT_CMD,        BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
    29552981,{jjAND_I,     '&',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
    29562982,{jjOR_I,      '|',            INT_CMD,        INT_CMD,    INT_CMD ALLOW_PLURAL}
    … …  
    29632989,{jjCOMPARE_IV,EQUAL_EQUAL,    INT_CMD,        INTVEC_CMD, INTVEC_CMD ALLOW_PLURAL}
    29642990,{jjCOMPARE_IV,EQUAL_EQUAL,    INT_CMD,        INTMAT_CMD, INTMAT_CMD ALLOW_PLURAL}
     2991,{jjEQUAL_BI,  EQUAL_EQUAL,    INT_CMD,        BIGINT_CMD, BIGINT_CMD ALLOW_PLURAL}
    29652992,{jjEQUAL_Ma,  EQUAL_EQUAL,    INT_CMD,        MATRIX_CMD, MATRIX_CMD ALLOW_PLURAL}
    29662993,{jjWRONG2,    EQUAL_EQUAL,    0,              IDEAL_CMD,  IDEAL_CMD ALLOW_PLURAL}
Note: See TracChangeset for help on using the changeset viewer.