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.7 by greg, Mon Mar 10 17:26:26 2003 UTC vs.
Revision 2.13 by greg, Fri Jan 1 02:10:32 2021 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char RCSid[] = "$Id";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   * Routines for recognizing and moving about words in strings.
# Line 10 | Line 10 | static const char RCSid[] = "$Id";
10   #include "copyright.h"
11  
12   #include  <ctype.h>
13 – #include  <string.h>
13  
14 + #include  "rtio.h"
15  
16   char *
17 < atos(rs, nb, s)                 /* get word from string, returning rs */
18 < char  *rs;
19 < register int  nb;
20 < register char  *s;
17 > atos(char *rs, int nb, char *s)         /* get word from string, returning rs */
18   {
19 <        register char  *cp = rs;
19 >        char  *cp = rs;
20  
21          while (isspace(*s))
22                  s++;
# Line 31 | Line 28 | register char  *s;
28  
29  
30   char *
31 < nextword(cp, nb, s)             /* get (quoted) word, returning new s */
35 < register char  *cp;
36 < register int  nb;
37 < register char  *s;
31 > nextword(char *cp, int nb, char *s)     /* get (quoted) word, returning new s */
32   {
33          int     quote = 0;
34  
# Line 58 | Line 52 | register char  *s;
52  
53  
54   char *
55 < sskip(s)                        /* skip word in string, leaving on space */
62 < register char  *s;
55 > sskip(char *s)                  /* skip word in string, leaving on space */
56   {
57          while (isspace(*s))
58                  s++;
# Line 70 | Line 63 | register char  *s;
63  
64  
65   char *
66 < sskip2(s, n)                    /* skip word(s) in string, leaving on word */
74 < register char  *s;
75 < register int    n;
66 > sskip2(char *s, int n)          /* skip word(s) in string, leaving on word */
67   {
68          while (isspace(*s))
69                  s++;
# Line 87 | Line 78 | register int   n;
78  
79  
80   char *
81 < iskip(s)                        /* skip integer in string */
91 < register char  *s;
81 > iskip(char *s)                  /* skip integer in string */
82   {
83          while (isspace(*s))
84                  s++;
85 <        if (*s == '-' || *s == '+')
96 <                s++;
85 >        s += (*s == '-') | (*s == '+');
86          if (!isdigit(*s))
87                  return(NULL);
88          do
# Line 104 | Line 93 | register char  *s;
93  
94  
95   char *
96 < fskip(s)                        /* skip float in string */
108 < register char  *s;
96 > fskip(char *s)                  /* skip float in string */
97   {
98 <        register char  *cp;
98 >        char  *cp;
99  
100          while (isspace(*s))
101                  s++;
102 <        if (*s == '-' || *s == '+')
115 <                s++;
102 >        s += (*s == '-') | (*s == '+');
103          cp = s;
104          while (isdigit(*cp))
105                  cp++;
# Line 123 | Line 110 | register char  *s;
110          }
111          if (cp == s)
112                  return(NULL);
113 <        if (*cp == 'e' || *cp == 'E')
114 <                return(iskip(cp+1));
113 >        if ((*cp == 'e') | (*cp == 'E'))
114 >                return(isspace(*++cp) ? NULL : iskip(cp));
115          return(cp);
116   }
117  
118  
119   int
120 < isint(s)                        /* check integer format */
134 < char  *s;
120 > isint(char *s)                  /* check integer format */
121   {
122 <        register char  *cp;
122 >        char  *cp;
123  
124          cp = iskip(s);
125          return(cp != NULL && *cp == '\0');
# Line 141 | Line 127 | char  *s;
127  
128  
129   int
130 < isintd(s, ds)                   /* check integer format with delimiter set */
145 < char  *s, *ds;
130 > isintd(char *s, char *ds)       /* check integer format with delimiter set */
131   {
132 <        register char  *cp;
132 >        char  *cp;
133  
134          cp = iskip(s);
135          return(cp != NULL && strchr(ds, *cp) != NULL);
# Line 152 | Line 137 | char  *s, *ds;
137  
138  
139   int
140 < isflt(s)                        /* check float format */
156 < char  *s;
140 > isflt(char *s)                  /* check float format */
141   {
142 <        register char  *cp;
142 >        char  *cp;
143  
144          cp = fskip(s);
145          return(cp != NULL && *cp == '\0');
# Line 163 | Line 147 | char  *s;
147  
148  
149   int
150 < isfltd(s, ds)                   /* check integer format with delimiter set */
167 < char  *s, *ds;
150 > isfltd(char *s, char *ds)       /* check integer format with delimiter set */
151   {
152 <        register char  *cp;
152 >        char  *cp;
153  
154          cp = fskip(s);
155          return(cp != NULL && strchr(ds, *cp) != NULL);
156 + }
157 +
158 +
159 + int
160 + isname(char *s)                 /* check for legal identifier name */
161 + {
162 +        while (*s == '_')                       /* skip leading underscores */
163 +                s++;
164 +        if (!isascii(*s) | !isalpha(*s))        /* start with a letter */
165 +                return(0);
166 +        while (isascii(*++s) && isgraph(*s))    /* all visible characters */
167 +                ;
168 +        return(*s == '\0');                     /* ending in nul */
169   }

Diff Legend

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