Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.263
 
1.264
 
MAIN:ragge:20101221141358
 
trees.c
_>720720 int
 721721 conval(NODE *p, int o, NODE *q)
 722722 {
<> 723+        TWORD tl = p->n_type, tr = q->n_type, td;
723724         int i, u;
 724725         CONSZ val;
 725726         U_CONSZ v1, v2;
 726727 
 727728         val = q->n_lval;
<>728 -        u = ISUNSIGNED(p->n_type) || ISUNSIGNED(q->n_type);
  729+
  730+        /* make both sides same type */
  731+        if (tl < TMASK && tr < TMASK) {
  732+                td = tl > tr ? tl : tr;
  733+                if (td < INT)
  734+                        td = INT;
  735+                u = ISUNSIGNED(td);
  736+                if (tl != td)
  737+                        p = makety(p, td, 0, 0, MKAP(td));
  738+                if (tr != td)
  739+                        q = makety(q, td, 0, 0, MKAP(td));
  740+        } else
  741+                u = ISUNSIGNED(tl) || ISUNSIGNED(tr);
729742         if( u && (o==LE||o==LT||o==GE||o==GT)) o += (UGE-GE);
 730743 
 731744         if (p->n_sp != NULL && q->n_sp != NULL)
     
 !
734747                 return(0);
 735748         if (p->n_sp != NULL && o != PLUS && o != MINUS)
 736749                 return(0);
<> 750+
<_737751         v1 = p->n_lval;
 738752         v2 = q->n_lval;
 739753         switch( o ){
FishEye: Open Source License registered to PCC.
Your maintenance has expired. You can renew your license at http://www.atlassian.com/fisheye/renew
Atlassian FishEye, CVS analysis. (Version:1.6.3 Build:build-336 2008-11-04) - Administration - Page generated 2014-10-31 14:38 +0100