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

Comparing ray/src/common/rexpr.c (file contents):
Revision 2.8 by schorsch, Mon Jun 30 14:59:11 2003 UTC vs.
Revision 2.9 by schorsch, Thu Jul 17 09:21:29 2003 UTC

# Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14   #include <ctype.h>
15   #include <string.h>
16  
17 + #include "rtio.h"
18 +
19   /*
20   * rexpr.c - regular expression parser (ala grep)
21   */
# Line 33 | Line 35 | static const char      RCSid[] = "$Id$";
35   #define same(a,b) (a==b || (iflag && (a^b)==' ' && isalpha(a)))
36  
37  
38 < static int     advance(), cclass();
38 > static int     advance(char *, char *);
39 > static int     cclass(char *, int c, int af);
40  
41   static char    expbuf[ESIZE];
42   static int     iflag;
# Line 46 | Line 49 | ecompile(sp, iflg, wflag)               /* compile the
49   register char  *sp;
50   int iflg, wflag;
51   {
52 <        register c;
52 >        register int c;
53          register char *ep;
54 <        char *lastep;
54 >        char *lastep = NULL;
55          int cclcnt;
56          
57          iflag = iflg;
# Line 164 | Line 167 | register char *sp;
167                  return(NULL);
168          /* fast check for first character */
169          if (expbuf[0]==CCHR) {
170 <                register c = expbuf[1];
170 >                register int c = expbuf[1];
171                  while (*++sp)
172                          if (same(*sp, c) && advance(sp, expbuf))
173                                  return(sp);
# Line 268 | Line 271 | register char *ep;
271   static int
272   cclass(set, c, af)
273   register char *set;
274 < register c;
274 > register int c;
275   int af;
276   {
277 <        register n;
277 >        register int n;
278  
279          if (c == 0)
280                  return(0);

Diff Legend

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