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.5 by greg, Sat Feb 22 02:07:23 2003 UTC vs.
Revision 2.11 by greg, Thu Apr 28 17:46:25 2011 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 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   * External symbols declared in standard.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include  <ctype.h>
13   #include  <string.h>
14  
15 < #ifdef  BSD
71 < #define  strchr         index
72 < #endif
15 > #include  "rtio.h"
16  
74 –
17   char *
18 < atos(rs, nb, s)                 /* get word from string, returning rs */
77 < char  *rs;
78 < register int  nb;
79 < 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 90 | Line 29 | register char  *s;
29  
30  
31   char *
32 < nextword(cp, nb, s)             /* get (quoted) word, returning new s */
94 < register char  *cp;
95 < register int  nb;
96 < register char  *s;
32 > nextword(char *cp, int nb, char *s)     /* get (quoted) word, returning new s */
33   {
34          int     quote = 0;
35  
# Line 117 | Line 53 | register char  *s;
53  
54  
55   char *
56 < sskip(s)                        /* skip word in string, leaving on space */
121 < register char  *s;
56 > sskip(char *s)                  /* skip word in string, leaving on space */
57   {
58          while (isspace(*s))
59                  s++;
# Line 129 | Line 64 | register char  *s;
64  
65  
66   char *
67 < sskip2(s, n)                    /* skip word(s) in string, leaving on word */
133 < register char  *s;
134 < 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 146 | Line 79 | register int   n;
79  
80  
81   char *
82 < iskip(s)                        /* skip integer in string */
150 < 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 163 | Line 95 | register char  *s;
95  
96  
97   char *
98 < fskip(s)                        /* skip float in string */
167 < 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 182 | 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 */
193 < 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 200 | Line 130 | char  *s;
130  
131  
132   int
133 < isintd(s, ds)                   /* check integer format with delimiter set */
204 < 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 211 | Line 140 | char  *s, *ds;
140  
141  
142   int
143 < isflt(s)                        /* check float format */
215 < 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 222 | Line 150 | char  *s;
150  
151  
152   int
153 < isfltd(s, ds)                   /* check integer format with delimiter set */
226 < 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