ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/calexpr.c
(Generate patch)

Comparing ray/src/common/calexpr.c (file contents):
Revision 2.2 by greg, Thu Dec 19 14:45:47 1991 UTC vs.
Revision 2.5 by greg, Tue May 19 20:21:58 1992 UTC

# Line 136 | Line 136 | register EPNODE  *epar;
136          case VAR:
137              varfree(epar->v.ln);
138              break;
139 – #endif
139              
140          case SYM:
141              freestr(epar->v.name);
142              break;
143 + #endif
144  
145          case NUM:
146          case CHAN:
# Line 437 | Line 437 | EPNODE  *ekid;
437   }
438  
439  
440 + #if  defined(VARIABLE) || defined(FUNCTION)
441   char *
442   getname()                       /* scan an identifier */
443   {
# Line 452 | Line 453 | getname()                      /* scan an identifier */
453  
454      return(str);
455   }
456 + #endif
457  
458  
459   int
# Line 753 | Line 755 | register EPNODE  *ep;
755  
756      if (ep->type != VAR)
757          return(0);
758 <    dp = ep->v.ln->def;
759 <    if (dp != NULL && dp->type != ':')
760 <        return(0);
761 <    if ((dp == NULL || dp->v.kid->type != FUNC)
762 <            && ((lp = liblookup(ep->v.ln->name)) == NULL
761 <                    || lp->atyp != ':'))
762 <        return(0);
763 <    return(1);
758 >    if ((dp = ep->v.ln->def) != NULL && dp->v.kid->type == FUNC)
759 >        return(dp->type == ':');
760 >    if ((lp = ep->v.ln->lib) != NULL)
761 >        return(lp->atyp == ':');
762 >    return(0);
763   }
764   #endif
765   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines