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

Diff for /OpenXM_contrib2/asir2000/parse/eval.c between version 1.62 and 1.63

version 1.62, 2007/12/20 03:31:01 version 1.63, 2008/09/01 06:20:33
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/eval.c,v 1.61 2007/11/15 06:24:59 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/eval.c,v 1.62 2007/12/20 03:31:01 noro Exp $
 */  */
 #include <ctype.h>  #include <ctype.h>
 #include "ca.h"  #include "ca.h"
Line 195  pointer eval(FNODE f)
Line 195  pointer eval(FNODE f)
                 case I_RECMAP:                  case I_RECMAP:
                         val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;                          val = eval_rec_mapf((FUNC)FA0(f),(FNODE)FA1(f)); break;
                 case I_IFUNC:                  case I_IFUNC:
                         val = evalif((FNODE)FA0(f),(FNODE)FA1(f)); break;                          val = evalif((FNODE)FA0(f),(FNODE)FA1(f),(FNODE)FA2(f)); break;
 #if !defined(VISUAL)  #if !defined(VISUAL)
                 case I_TIMER:                  case I_TIMER:
                         {                          {
Line 1217  pointer bevalf(FUNC f,NODE a)
Line 1217  pointer bevalf(FUNC f,NODE a)
         return val;          return val;
 }  }
   
 pointer evalif(FNODE f,FNODE a)  pointer evalif(FNODE f,FNODE a,FNODE opt)
 {  {
         Obj g;          Obj g;
         QUOTE q;          QUOTE q;
Line 1226  pointer evalif(FNODE f,FNODE a)
Line 1226  pointer evalif(FNODE f,FNODE a)
   
         g = (Obj)eval(f);          g = (Obj)eval(f);
         if ( g && (OID(g) == O_P) && (VR((P)g)->attr == (pointer)V_SR) )          if ( g && (OID(g) == O_P) && (VR((P)g)->attr == (pointer)V_SR) )
                 return evalf((FUNC)VR((P)g)->priv,a,0);                  return evalf((FUNC)VR((P)g)->priv,a,opt);
         else if ( g && OID(g) == O_QUOTEARG && ((QUOTEARG)g)->type == A_func ) {          else if ( g && OID(g) == O_QUOTEARG && ((QUOTEARG)g)->type == A_func ) {
                 t = mkfnode(2,I_FUNC,((QUOTEARG)g)->body,a);                  t = mkfnode(2,I_FUNC,((QUOTEARG)g)->body,a);
                 MKQUOTE(q,t);                  MKQUOTE(q,t);

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>