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

Comparing ray/src/common/words.c (file contents):
Revision 2.9 by greg, Tue Sep 28 17:54:18 2004 UTC vs.
Revision 2.11 by greg, Thu Apr 28 17:46:25 2011 UTC

# Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15   #include  "rtio.h"
16  
17   char *
18 < atos(rs, nb, s)                 /* get word from string, returning rs */
19 < char  *rs;
20 < register int  nb;
21 < register char  *s;
18 > atos(char *rs, int nb, char *s)         /* get word from string, returning rs */
19   {
20 <        register char  *cp = rs;
20 >        char  *cp = rs;
21  
22          while (isspace(*s))
23                  s++;
# Line 32 | Line 29 | register char  *s;
29  
30  
31   char *
32 < nextword(cp, nb, s)             /* get (quoted) word, returning new s */
36 < register char  *cp;
37 < register int  nb;
38 < register char  *s;
32 > nextword(char *cp, int nb, char *s)     /* get (quoted) word, returning new s */
33   {
34          int     quote = 0;
35  
# Line 59 | Line 53 | register char  *s;
53  
54  
55   char *
56 < sskip(s)                        /* skip word in string, leaving on space */
63 < register char  *s;
56 > sskip(char *s)                  /* skip word in string, leaving on space */
57   {
58          while (isspace(*s))
59                  s++;
# Line 71 | Line 64 | register char  *s;
64  
65  
66   char *
67 < sskip2(s, n)                    /* skip word(s) in string, leaving on word */
75 < register char  *s;
76 < register int    n;
67 > sskip2(char *s, int n)          /* skip word(s) in string, leaving on word */
68   {
69          while (isspace(*s))
70                  s++;
# Line 88 | Line 79 | register int   n;
79  
80  
81   char *
82 < iskip(s)                        /* skip integer in string */
92 < register char  *s;
82 > iskip(char *s)                  /* skip integer in string */
83   {
84          while (isspace(*s))
85                  s++;
86 <        if (*s == '-' || *s == '+')
86 >        if ((*s == '-') | (*s == '+'))
87                  s++;
88          if (!isdigit(*s))
89                  return(NULL);
# Line 105 | Line 95 | register char  *s;
95  
96  
97   char *
98 < fskip(s)                        /* skip float in string */
109 < register char  *s;
98 > fskip(char *s)                  /* skip float in string */
99   {
100 <        register char  *cp;
100 >        char  *cp;
101  
102          while (isspace(*s))
103                  s++;
104 <        if (*s == '-' || *s == '+')
104 >        if ((*s == '-') | (*s == '+'))
105                  s++;
106          cp = s;
107          while (isdigit(*cp))
# Line 124 | Line 113 | register char  *s;
113          }
114          if (cp == s)
115                  return(NULL);
116 <        if (*cp == 'e' || *cp == 'E')
117 <                return(iskip(cp+1));
116 >        if ((*cp == 'e') | (*cp == 'E'))
117 >                return(isspace(*++cp) ? NULL : iskip(cp));
118          return(cp);
119   }
120  
121  
122   int
123 < isint(s)                        /* check integer format */
135 < char  *s;
123 > isint(char *s)                  /* check integer format */
124   {
125 <        register char  *cp;
125 >        char  *cp;
126  
127          cp = iskip(s);
128          return(cp != NULL && *cp == '\0');
# Line 142 | Line 130 | char  *s;
130  
131  
132   int
133 < isintd(s, ds)                   /* check integer format with delimiter set */
146 < char  *s, *ds;
133 > isintd(char *s, char *ds)       /* check integer format with delimiter set */
134   {
135 <        register char  *cp;
135 >        char  *cp;
136  
137          cp = iskip(s);
138          return(cp != NULL && strchr(ds, *cp) != NULL);
# Line 153 | Line 140 | char  *s, *ds;
140  
141  
142   int
143 < isflt(s)                        /* check float format */
157 < char  *s;
143 > isflt(char *s)                  /* check float format */
144   {
145 <        register char  *cp;
145 >        char  *cp;
146  
147          cp = fskip(s);
148          return(cp != NULL && *cp == '\0');
# Line 164 | Line 150 | char  *s;
150  
151  
152   int
153 < isfltd(s, ds)                   /* check integer format with delimiter set */
168 < char  *s, *ds;
153 > isfltd(char *s, char *ds)       /* check integer format with delimiter set */
154   {
155 <        register char  *cp;
155 >        char  *cp;
156  
157          cp = fskip(s);
158          return(cp != NULL && strchr(ds, *cp) != NULL);
159 + }
160 +
161 +
162 + int
163 + isname(char *s)                 /* check for legal identifier name */
164 + {
165 +        while (*s == '_')                       /* skip leading underscores */
166 +                s++;
167 +        if (!isascii(*s) || !isalpha(*s))       /* start with a letter */
168 +                return(0);
169 +        while (isascii(*++s) && isgraph(*s))    /* all visible characters */
170 +                ;
171 +        return(*s == '\0');                     /* ending in nul */
172   }

Diff Legend

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