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.18 by greg, Sat Feb 22 02:07:21 2003 UTC vs.
Revision 2.31 by greg, Wed May 10 15:21:20 2006 UTC

# Line 17 | Line 17 | static const char      RCSid[] = "$Id$";
17   *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
18   */
19  
20 < /* ====================================================================
21 < * The Radiance Software License, Version 1.0
22 < *
23 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
24 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
25 < *
26 < * Redistribution and use in source and binary forms, with or without
27 < * modification, are permitted provided that the following conditions
28 < * are met:
29 < *
30 < * 1. Redistributions of source code must retain the above copyright
31 < *         notice, this list of conditions and the following disclaimer.
32 < *
33 < * 2. Redistributions in binary form must reproduce the above copyright
34 < *       notice, this list of conditions and the following disclaimer in
35 < *       the documentation and/or other materials provided with the
36 < *       distribution.
37 < *
38 < * 3. The end-user documentation included with the redistribution,
39 < *           if any, must include the following acknowledgment:
40 < *             "This product includes Radiance software
41 < *                 (http://radsite.lbl.gov/)
42 < *                 developed by the Lawrence Berkeley National Laboratory
43 < *               (http://www.lbl.gov/)."
44 < *       Alternately, this acknowledgment may appear in the software itself,
45 < *       if and wherever such third-party acknowledgments normally appear.
46 < *
47 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
48 < *       and "The Regents of the University of California" must
49 < *       not be used to endorse or promote products derived from this
50 < *       software without prior written permission. For written
51 < *       permission, please contact [email protected].
52 < *
53 < * 5. Products derived from this software may not be called "Radiance",
54 < *       nor may "Radiance" appear in their name, without prior written
55 < *       permission of Lawrence Berkeley National Laboratory.
56 < *
57 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
58 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
59 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
60 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
61 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
62 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
63 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
64 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
65 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
66 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
67 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
68 < * SUCH DAMAGE.
69 < * ====================================================================
70 < *
71 < * This software consists of voluntary contributions made by many
72 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
73 < * information on Lawrence Berkeley National Laboratory, please see
74 < * <http://www.lbl.gov/>.
75 < */
20 > #include "copyright.h"
21  
22   #include  <stdio.h>
23 <
23 > #include  <string.h>
24   #include  <ctype.h>
80 –
25   #include  <errno.h>
82 –
26   #include  <math.h>
84 –
27   #include  <stdlib.h>
28  
29 + #include  "rtmisc.h"
30 + #include  "rtio.h"
31 + #include  "rterror.h"
32   #include  "calcomp.h"
33  
34   #define  MAXLINE        256             /* maximum line length */
# Line 92 | Line 37 | static const char      RCSid[] = "$Id$";
37  
38   #define  isdecimal(c)   (isdigit(c) || (c) == '.')
39  
40 < static double  euminus(), eargument(), enumber();
41 < static double  echannel();
42 < static double  eadd(), esubtr(), emult(), edivi(), epow();
43 < static double  ebotch();
40 > static double  euminus(EPNODE *), eargument(EPNODE *), enumber(EPNODE *);
41 > static double  echannel(EPNODE *);
42 > static double  eadd(EPNODE *), esubtr(EPNODE *),
43 >               emult(EPNODE *), edivi(EPNODE *),
44 >               epow(EPNODE *);
45 > static double  ebotch(EPNODE *);
46  
47   unsigned int  esupport =                /* what to support */
48 <                E_VARIABLE | E_FUNCTION | E_REDEFW;
48 >                E_VARIABLE | E_FUNCTION ;
49  
50 + int  eofc = 0;                          /* optional end-of-file character */
51   int  nextc;                             /* lookahead character */
52  
53 < double  (*eoper[])() = {                /* expression operations */
53 > double  (*eoper[])(EPNODE *) = {        /* expression operations */
54          ebotch,
55          evariable,
56          enumber,
# Line 137 | Line 85 | static int  linepos;                   /* position in buffer */
85  
86  
87   EPNODE *
88 < eparse(expr)                    /* parse an expression string */
89 < char  *expr;
88 > eparse(                 /* parse an expression string */
89 >    char  *expr
90 > )
91   {
92      EPNODE  *ep;
93  
# Line 152 | Line 101 | char  *expr;
101  
102  
103   double
104 < eval(expr)                      /* evaluate an expression string */
105 < char  *expr;
104 > eval(                   /* evaluate an expression string */
105 >    char  *expr
106 > )
107   {
108      register EPNODE  *ep;
109      double  rval;
# Line 166 | Line 116 | char  *expr;
116  
117  
118   int
119 < epcmp(ep1, ep2)                 /* compare two expressions for equivalence */
120 < register EPNODE  *ep1, *ep2;
119 > epcmp(                  /* compare two expressions for equivalence */
120 >    register EPNODE  *ep1,
121 >    register EPNODE  *ep2
122 > )
123   {
124          double  d;
125  
# Line 183 | Line 135 | register EPNODE  *ep1, *ep2;
135                  if (ep2->v.num == 0)
136                          return(ep1->v.num != 0);
137                  d = ep1->v.num / ep2->v.num;
138 <                return(d > 1.000000000001 | d < 0.999999999999);
138 >                return((d > 1.000000000001) | (d < 0.999999999999));
139  
140          case CHAN:
141          case ARG:
# Line 214 | Line 166 | register EPNODE  *ep1, *ep2;
166  
167  
168   void
169 < epfree(epar)                    /* free a parse tree */
170 < register EPNODE  *epar;
169 > epfree(                 /* free a parse tree */
170 >    register EPNODE      *epar
171 > )
172   {
173      register EPNODE  *ep;
174  
# Line 249 | Line 202 | register EPNODE         *epar;
202  
203                                  /* the following used to be a switch */
204   static double
205 < eargument(ep)
206 < EPNODE  *ep;
205 > eargument(
206 >    EPNODE      *ep
207 > )
208   {
209      return(argument(ep->v.chan));
210   }
211  
212   static double
213 < enumber(ep)
214 < EPNODE  *ep;
213 > enumber(
214 >    EPNODE      *ep
215 > )
216   {
217      return(ep->v.num);
218   }
219  
220   static double
221 < euminus(ep)
222 < EPNODE  *ep;
221 > euminus(
222 >    EPNODE      *ep
223 > )
224   {
225      register EPNODE  *ep1 = ep->v.kid;
226  
# Line 272 | Line 228 | EPNODE *ep;
228   }
229  
230   static double
231 < echannel(ep)
232 < EPNODE  *ep;
231 > echannel(
232 >    EPNODE      *ep
233 > )
234   {
235      return(chanvalue(ep->v.chan));
236   }
237  
238   static double
239 < eadd(ep)
240 < EPNODE  *ep;
239 > eadd(
240 >    EPNODE      *ep
241 > )
242   {
243      register EPNODE  *ep1 = ep->v.kid;
244  
# Line 288 | Line 246 | EPNODE *ep;
246   }
247  
248   static double
249 < esubtr(ep)
250 < EPNODE  *ep;
249 > esubtr(
250 >    EPNODE      *ep
251 > )
252   {
253      register EPNODE  *ep1 = ep->v.kid;
254  
# Line 297 | Line 256 | EPNODE *ep;
256   }
257  
258   static double
259 < emult(ep)
260 < EPNODE  *ep;
259 > emult(
260 >    EPNODE      *ep
261 > )
262   {
263      register EPNODE  *ep1 = ep->v.kid;
264  
# Line 306 | Line 266 | EPNODE *ep;
266   }
267  
268   static double
269 < edivi(ep)
270 < EPNODE  *ep;
269 > edivi(
270 >    EPNODE      *ep
271 > )
272   {
273      register EPNODE  *ep1 = ep->v.kid;
274      double  d;
# Line 322 | Line 283 | EPNODE *ep;
283   }
284  
285   static double
286 < epow(ep)
287 < EPNODE  *ep;
286 > epow(
287 >    EPNODE      *ep
288 > )
289   {
290      register EPNODE  *ep1 = ep->v.kid;
291      double  d;
# Line 332 | Line 294 | EPNODE *ep;
294      lasterrno = errno;
295      errno = 0;
296      d = pow(evalue(ep1), evalue(ep1->sibling));
297 < #ifdef  IEEE
298 <    if (!finite(d))
299 <        errno = EDOM;
297 > #ifdef  isnan
298 >    if (errno == 0)
299 >        if (isnan(d))
300 >            errno = EDOM;
301 >        else if (isinf(d))
302 >            errno = ERANGE;
303   #endif
304 <    if (errno) {
304 >    if (errno == EDOM || errno == ERANGE) {
305          wputs("Illegal power\n");
306          return(0.0);
307      }
# Line 345 | Line 310 | EPNODE *ep;
310   }
311  
312   static double
313 < ebotch(ep)
314 < EPNODE  *ep;
313 > ebotch(
314 >    EPNODE      *ep
315 > )
316   {
317      eputs("Bad expression!\n");
318      quit(1);
319 +        return 0.0; /* pro forma return */
320   }
321  
322  
323   EPNODE *
324 < ekid(ep, n)                     /* return pointer to a node's nth kid */
325 < register EPNODE  *ep;
326 < register int  n;
324 > ekid(                   /* return pointer to a node's nth kid */
325 >    register EPNODE      *ep,
326 >    register int  n
327 > )
328   {
329  
330      for (ep = ep->v.kid; ep != NULL; ep = ep->sibling)
# Line 368 | Line 336 | register int  n;
336  
337  
338   int
339 < nekids(ep)                      /* return # of kids for node ep */
340 < register EPNODE  *ep;
339 > nekids(                 /* return # of kids for node ep */
340 >    register EPNODE      *ep
341 > )
342   {
343      register int  n = 0;
344  
# Line 381 | Line 350 | register EPNODE         *ep;
350  
351  
352   void
353 < initfile(fp, fn, ln)            /* prepare input file */
354 < FILE  *fp;
355 < char  *fn;
356 < int  ln;
353 > initfile(               /* prepare input file */
354 >    FILE  *fp,
355 >    char  *fn,
356 >    int  ln
357 > )
358   {
359      static char  inpbuf[MAXLINE];
360  
# Line 399 | Line 369 | int  ln;
369  
370  
371   void
372 < initstr(s, fn, ln)              /* prepare input string */
373 < char  *s;
374 < char  *fn;
375 < int  ln;
372 > initstr(                /* prepare input string */
373 >    char  *s,
374 >    char  *fn,
375 >    int  ln
376 > )
377   {
378      infp = NULL;
379      infile = fn;
# Line 414 | Line 385 | int  ln;
385  
386  
387   void
388 < getscanpos(fnp, lnp, spp, fpp)  /* return current scan position */
389 < char  **fnp;
390 < int  *lnp;
391 < char  **spp;
392 < FILE  **fpp;
388 > getscanpos(     /* return current scan position */
389 >    char  **fnp,
390 >    int  *lnp,
391 >    char  **spp,
392 >    FILE  **fpp
393 > )
394   {
395      if (fnp != NULL) *fnp = infile;
396      if (lnp != NULL) *lnp = lineno;
# Line 428 | Line 400 | FILE  **fpp;
400  
401  
402   int
403 < scan()                          /* scan next character, return literal next */
403 > scan(void)              /* scan next character, return literal next */
404   {
405      register int  lnext = 0;
406  
# Line 445 | Line 417 | scan()                         /* scan next character, return literal next
417              nextc = linbuf[linepos++];
418          if (!lnext)
419                  lnext = nextc;
420 +        if (nextc == eofc) {
421 +                nextc = EOF;
422 +                break;
423 +        }
424          if (nextc == '{') {
425              scan();
426              while (nextc != '}')
# Line 460 | Line 436 | scan()                         /* scan next character, return literal next
436  
437  
438   char *
439 < long2ascii(l)                         /* convert long to ascii */
440 < long  l;
439 > long2ascii(                           /* convert long to ascii */
440 >    long  l
441 > )
442   {
443      static char  buf[16];
444      register char  *cp;
# Line 486 | Line 463 | long  l;
463  
464  
465   void
466 < syntax(err)                     /* report syntax error and quit */
467 < char  *err;
466 > syntax(                 /* report syntax error and quit */
467 >    char  *err
468 > )
469   {
470      register int  i;
471  
# Line 512 | Line 490 | char  *err;
490  
491  
492   void
493 < addekid(ep, ekid)                       /* add a child to ep */
494 < register EPNODE  *ep;
495 < EPNODE  *ekid;
493 > addekid(                        /* add a child to ep */
494 >    register EPNODE      *ep,
495 >    EPNODE      *ekid
496 > )
497   {
498      if (ep->v.kid == NULL)
499          ep->v.kid = ekid;
# Line 528 | Line 507 | EPNODE *ekid;
507  
508  
509   char *
510 < getname()                       /* scan an identifier */
510 > getname(void)                   /* scan an identifier */
511   {
512 <    static char  str[MAXWORD+1];
512 >    static char  str[RMAXWORD+1];
513      register int  i, lnext;
514  
515      lnext = nextc;
516 <    for (i = 0; i < MAXWORD && isid(lnext); i++, lnext = scan())
516 >    for (i = 0; i < RMAXWORD && isid(lnext); i++, lnext = scan())
517          str[i] = lnext;
518      str[i] = '\0';
519      while (isid(lnext))         /* skip rest of name */
# Line 545 | Line 524 | getname()                      /* scan an identifier */
524  
525  
526   int
527 < getinum()                       /* scan a positive integer */
527 > getinum(void)                   /* scan a positive integer */
528   {
529      register int  n, lnext;
530  
# Line 560 | Line 539 | getinum()                      /* scan a positive integer */
539  
540  
541   double
542 < getnum()                        /* scan a positive float */
542 > getnum(void)                    /* scan a positive float */
543   {
544      register int  i, lnext;
545 <    char  str[MAXWORD+1];
545 >    char  str[RMAXWORD+1];
546  
547      i = 0;
548      lnext = nextc;
549 <    while (isdigit(lnext) && i < MAXWORD) {
549 >    while (isdigit(lnext) && i < RMAXWORD) {
550          str[i++] = lnext;
551          lnext = scan();
552      }
553 <    if (lnext == '.' && i < MAXWORD) {
553 >    if (lnext == '.' && i < RMAXWORD) {
554          str[i++] = lnext;
555          lnext = scan();
556          if (i == 1 && !isdigit(lnext))
557              syntax("badly formed number");
558 <        while (isdigit(lnext) && i < MAXWORD) {
558 >        while (isdigit(lnext) && i < RMAXWORD) {
559              str[i++] = lnext;
560              lnext = scan();
561          }
562      }
563 <    if ((lnext == 'e' | lnext == 'E') && i < MAXWORD) {
563 >    if ((lnext == 'e') | (lnext == 'E') && i < RMAXWORD) {
564          str[i++] = lnext;
565          lnext = scan();
566 <        if ((lnext == '-' | lnext == '+') && i < MAXWORD) {
566 >        if ((lnext == '-') | (lnext == '+') && i < RMAXWORD) {
567              str[i++] = lnext;
568              lnext = scan();
569          }
570          if (!isdigit(lnext))
571              syntax("missing exponent");
572 <        while (isdigit(lnext) && i < MAXWORD) {
572 >        while (isdigit(lnext) && i < RMAXWORD) {
573              str[i++] = lnext;
574              lnext = scan();
575          }
# Line 602 | Line 581 | getnum()                       /* scan a positive float */
581  
582  
583   EPNODE *
584 < getE1()                         /* E1 -> E1 ADDOP E2 */
584 > getE1(void)                             /* E1 -> E1 ADDOP E2 */
585                                  /*       E2 */
586   {
587      register EPNODE  *ep1, *ep2;
# Line 624 | Line 603 | getE1()                                /* E1 -> E1 ADDOP E2 */
603  
604  
605   EPNODE *
606 < getE2()                         /* E2 -> E2 MULOP E3 */
606 > getE2(void)                             /* E2 -> E2 MULOP E3 */
607                                  /*       E3 */
608   {
609      register EPNODE  *ep1, *ep2;
# Line 646 | Line 625 | getE2()                                /* E2 -> E2 MULOP E3 */
625  
626  
627   EPNODE *
628 < getE3()                         /* E3 -> E4 ^ E3 */
628 > getE3(void)                             /* E3 -> E4 ^ E3 */
629                                  /*       E4 */
630   {
631      register EPNODE  *ep1, *ep2;
# Line 668 | Line 647 | getE3()                                /* E3 -> E4 ^ E3 */
647  
648  
649   EPNODE *
650 < getE4()                         /* E4 -> ADDOP E5 */
650 > getE4(void)                             /* E4 -> ADDOP E5 */
651                                  /*       E5 */
652   {
653      register EPNODE  *ep1, *ep2;
# Line 696 | Line 675 | getE4()                                /* E4 -> ADDOP E5 */
675  
676  
677   EPNODE *
678 < getE5()                         /* E5 -> (E1) */
678 > getE5(void)                     /* E5 -> (E1) */
679                                  /*       VAR */
680                                  /*       NUM */
681                                  /*       $N */
682                                  /*       FUNC(E1,..) */
683                                  /*       ARG */
684   {
685 <    int  i;
686 <    char  *nam;
687 <    register EPNODE  *ep1, *ep2;
685 >        int      i;
686 >        char  *nam;
687 >        register EPNODE  *ep1, *ep2;
688  
689 <    if (nextc == '(') {
690 <        scan();
691 <        ep1 = getE1();
692 <        if (nextc != ')')
693 <            syntax("')' expected");
694 <        scan();
695 <        return(ep1);
696 <    }
689 >        if (nextc == '(') {
690 >                scan();
691 >                ep1 = getE1();
692 >                if (nextc != ')')
693 >                        syntax("')' expected");
694 >                scan();
695 >                return(ep1);
696 >        }
697  
698 <    if (esupport&E_INCHAN && nextc == '$') {
699 <        scan();
700 <        ep1 = newnode();
701 <        ep1->type = CHAN;
702 <        ep1->v.chan = getinum();
703 <        return(ep1);
704 <    }
698 >        if (esupport&E_INCHAN && nextc == '$') {
699 >                scan();
700 >                ep1 = newnode();
701 >                ep1->type = CHAN;
702 >                ep1->v.chan = getinum();
703 >                return(ep1);
704 >        }
705  
706 <  if (esupport&(E_VARIABLE|E_FUNCTION) &&
707 <                (isalpha(nextc) || nextc == CNTXMARK)) {
708 <      nam = getname();
709 <      ep1 = NULL;
710 <      if ((esupport&(E_VARIABLE|E_FUNCTION)) == (E_VARIABLE|E_FUNCTION)
711 <                        && curfunc != NULL)
712 <            for (i = 1, ep2 = curfunc->v.kid->sibling;
713 <                                ep2 != NULL; i++, ep2 = ep2->sibling)
714 <                if (!strcmp(ep2->v.name, nam)) {
715 <                    ep1 = newnode();
716 <                    ep1->type = ARG;
717 <                    ep1->v.chan = i;
718 <                    break;
706 >        if (esupport&(E_VARIABLE|E_FUNCTION) &&
707 >                        (isalpha(nextc) || nextc == CNTXMARK)) {
708 >                nam = getname();
709 >                ep1 = NULL;
710 >                if ((esupport&(E_VARIABLE|E_FUNCTION)) == (E_VARIABLE|E_FUNCTION)
711 >                                && curfunc != NULL)
712 >                        for (i = 1, ep2 = curfunc->v.kid->sibling;
713 >                                        ep2 != NULL; i++, ep2 = ep2->sibling)
714 >                                if (!strcmp(ep2->v.name, nam)) {
715 >                                        ep1 = newnode();
716 >                                        ep1->type = ARG;
717 >                                        ep1->v.chan = i;
718 >                                        break;
719 >                                }
720 >                if (ep1 == NULL) {
721 >                        ep1 = newnode();
722 >                        ep1->type = VAR;
723 >                        ep1->v.ln = varinsert(nam);
724                  }
725 <        if (ep1 == NULL) {
726 <            ep1 = newnode();
727 <            ep1->type = VAR;
728 <            ep1->v.ln = varinsert(nam);
725 >                if (esupport&E_FUNCTION && nextc == '(') {
726 >                        ep2 = newnode();
727 >                        ep2->type = FUNC;
728 >                        addekid(ep2, ep1);
729 >                        ep1 = ep2;
730 >                        do {
731 >                                scan();
732 >                                addekid(ep1, getE1());
733 >                        } while (nextc == ',');
734 >                        if (nextc != ')')
735 >                                syntax("')' expected");
736 >                        scan();
737 >                } else if (!(esupport&E_VARIABLE))
738 >                        syntax("'(' expected");
739 >                if (esupport&E_RCONST && isconstvar(ep1))
740 >                        ep1 = rconst(ep1);
741 >                return(ep1);
742          }
746 –        if (esupport&E_FUNCTION && nextc == '(') {
747 –            ep2 = newnode();
748 –            ep2->type = FUNC;
749 –            addekid(ep2, ep1);
750 –            ep1 = ep2;
751 –            do {
752 –                scan();
753 –                addekid(ep1, getE1());
754 –            } while (nextc == ',');
755 –            if (nextc != ')')
756 –                syntax("')' expected");
757 –            scan();
758 –        } else if (!(esupport&E_VARIABLE))
759 –            syntax("'(' expected");
760 –        if (esupport&E_RCONST && isconstvar(ep1))
761 –            ep1 = rconst(ep1);
762 –        return(ep1);
763 –    }
743  
744 <    if (isdecimal(nextc)) {
745 <        ep1 = newnode();
746 <        ep1->type = NUM;
747 <        ep1->v.num = getnum();
748 <        return(ep1);
749 <    }
750 <    syntax("unexpected character");
744 >        if (isdecimal(nextc)) {
745 >                ep1 = newnode();
746 >                ep1->type = NUM;
747 >                ep1->v.num = getnum();
748 >                return(ep1);
749 >        }
750 >        syntax("unexpected character");
751 >        return NULL; /* pro forma return */
752   }
753  
754  
755   EPNODE *
756 < rconst(epar)                    /* reduce a constant expression */
757 < register EPNODE  *epar;
756 > rconst(                 /* reduce a constant expression */
757 >    register EPNODE      *epar
758 > )
759   {
760      register EPNODE  *ep;
761  
# Line 782 | Line 763 | register EPNODE         *epar;
763      ep->type = NUM;
764      errno = 0;
765      ep->v.num = evalue(epar);
766 <    if (errno)
766 >    if (errno == EDOM || errno == ERANGE)
767          syntax("bad constant expression");
768      epfree(epar);
769  
# Line 791 | Line 772 | register EPNODE         *epar;
772  
773  
774   int
775 < isconstvar(ep)                  /* is ep linked to a constant expression? */
776 < register EPNODE  *ep;
775 > isconstvar(                     /* is ep linked to a constant expression? */
776 >    register EPNODE      *ep
777 > )
778   {
779      register EPNODE  *ep1;
780  
# Line 816 | Line 798 | register EPNODE         *ep;
798  
799  
800   int
801 < isconstfun(ep)                  /* is ep linked to a constant function? */
802 < register EPNODE  *ep;
801 > isconstfun(                     /* is ep linked to a constant function? */
802 >    register EPNODE      *ep
803 > )
804   {
805      register EPNODE  *dp;
806      register LIBR  *lp;
807  
808      if (ep->type != VAR)
809          return(0);
810 <    if ((dp = ep->v.ln->def) != NULL)
810 >    if ((dp = ep->v.ln->def) != NULL) {
811          if (dp->v.kid->type == FUNC)
812              return(dp->type == ':');
813          else
814              return(0);          /* don't identify masked library functions */
815 +    }
816      if ((lp = ep->v.ln->lib) != NULL)
817          return(lp->atyp == ':');
818      return(0);

Diff Legend

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