[BACK]Return to arith.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / parse

Diff for /OpenXM_contrib2/asir2000/parse/arith.c between version 1.21 and 1.23

version 1.21, 2005/09/27 03:00:21 version 1.23, 2005/11/16 23:42:54
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.20 2005/04/07 08:33:12 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/arith.c,v 1.22 2005/10/03 00:29:11 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 93  struct oAFUNC afunc[] = {
Line 93  struct oAFUNC afunc[] = {
 /* O_DPV=22 */  {adddv,subdv,muldv,notdef,notdef,chsgndv,compdv},  /* O_DPV=22 */  {adddv,subdv,muldv,notdef,notdef,chsgndv,compdv},
 /* O_QUOTEARG=23 */     {notdef,notdef,notdef,notdef,notdef,notdef,compqa},  /* O_QUOTEARG=23 */     {notdef,notdef,notdef,notdef,notdef,notdef,compqa},
 /* O_MAT=24 */  {AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,(int(*)())notdef},  /* O_MAT=24 */  {AddMatI,SubMatI,MulMatG,notdef,notdef,ChsgnI,(int(*)())notdef},
   /* O_NBP=25 */  {addnbp,subnbp,mulnbp,notdef,pwrnbp,chsgnnbp,(int(*)())notdef},
 };  };
   
 void arf_init() {  void arf_init() {
Line 260  Obj a,e,*r;
Line 261  Obj a,e,*r;
                         *r = 0;                          *r = 0;
                 else                  else
                         mkpow(vl,a,e,r);                          mkpow(vl,a,e,r);
         } else if ( OID(a) == O_QUOTE || OID(e) == O_QUOTE )          } else if ( !e ) {
                 (*(afunc[O_QUOTE].pwr))(vl,a,e,r);  
         else if ( !e ) {  
                 if ( OID(a) == O_MAT )                  if ( OID(a) == O_MAT )
                         (*(afunc[O_MAT].pwr))(vl,a,e,r);                          (*(afunc[O_MAT].pwr))(vl,a,e,r);
                 else                  else
                         *r = (pointer)ONE;                          *r = (pointer)ONE;
         } else if ( (OID(e) <= O_N) && INT(e) ) {          } else if ( OID(a) == O_QUOTE || OID(e) == O_QUOTE )
                   (*(afunc[O_QUOTE].pwr))(vl,a,e,r);
           else if ( (OID(e) <= O_N) && INT(e) ) {
                 if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) {                  if ( (OID(a) == O_P) && (SGN((Q)e) < 0) ) {
                         if ( allow_laurent )                          if ( allow_laurent )
                                 (*(afunc[O_P].pwr))(vl,a,e,r);                                  (*(afunc[O_P].pwr))(vl,a,e,r);
Legend:
Removed from v.1.21  
changed lines
  Added in v.1.23
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>