Changed all the licence notices in all the files.

[pspp-builds.git] / src / lexer.c

diff --git a/src/lexer.c b/src/lexer.c
index f676375e9409ac4478ec8bf5e5c333277a90a888..1aa5454b525e8a08386f0ba65486dc57df057549 100644 (file)
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "lexer.h"
@@ -48,10 +48,10 @@ int token;
 double tokval;
 
 /* T_ID: the identifier. */
-char tokid[9];
+char tokid[LONG_NAME_LEN + 1];
 
 /* T_ID, T_STRING: token string value.
-   For T_ID, this is not truncated to 8 characters as is tokid. */
+   For T_ID, this is not truncated to SHORT_NAME_LEN characters as is tokid. */
 struct string tokstr;
 \f
 /* Static variables. */
@@ -81,7 +81,6 @@ static struct string put_tokstr;
 static double put_tokval;
 
 static void unexpected_eof (void);
-static inline int check_id (const char *id, size_t len);
 static void convert_numeric_string_to_char_string (int type);
 static int parse_string (int type);
 
@@ -117,8 +116,8 @@ restore_token (void)
   assert (put_token != 0);
   token = put_token;
   ds_replace (&tokstr, ds_c_str (&put_tokstr));
-  strncpy (tokid, ds_c_str (&put_tokstr), 8);
-  tokid[8] = 0;
+  strncpy (tokid, ds_c_str (&put_tokstr), SHORT_NAME_LEN);
+  tokid[SHORT_NAME_LEN] = 0;
   tokval = put_tokval;
   put_token = 0;
 }
@@ -138,6 +137,8 @@ save_token (void)
 void
 lex_get (void)
 {
+  int i;
+
   /* If a token was pushed ahead, return it. */
   if (put_token)
     {
@@ -355,15 +356,19 @@ lex_get (void)
            }
 
          /* Copy id to tokstr. */
-         ds_putc (&tokstr, toupper ((unsigned char) *prog++));
+         ds_putc (&tokstr, *prog++);
          while (CHAR_IS_IDN (*prog))
-           ds_putc (&tokstr, toupper ((unsigned char) *prog++));
+           ds_putc (&tokstr, *prog++);
 
-         /* Copy tokstr to tokid, truncating it to 8 characters. */
-         strncpy (tokid, ds_c_str (&tokstr), 8);
-         tokid[8] = 0;
+         /* Copy tokstr to tokid, truncating it to LONG_NAME_LEN characters.*/
+         strncpy (tokid, ds_c_str (&tokstr), LONG_NAME_LEN);
+         tokid[LONG_NAME_LEN] = 0;
 
-         token = check_id (ds_c_str (&tokstr), ds_length (&tokstr));
+         /* Convert to upper case */
+         for ( i = 0 ; i < ds_length(&tokstr) ; ++i ) 
+                 tokstr.string[i] = toupper(tokstr.string[i]);
+
+         token = lex_id_to_token (ds_c_str (&tokstr), ds_length (&tokstr));
          break;
 
        default:
@@ -636,6 +641,23 @@ lex_id_match (const char *kw, const char *tok)
 {
   return lex_id_match_len (kw, strlen (kw), tok, strlen (tok));
 }
+
+/* Returns the proper token type, either T_ID or a reserved keyword
+   enum, for ID[], which must contain LEN characters. */
+int
+lex_id_to_token (const char *id, size_t len)
+{
+  const char **kwp;
+
+  if (len < 2 || len > 4)
+    return T_ID;
+  
+  for (kwp = keywords; *kwp; kwp++)
+    if (!strcasecmp (*kwp, id))
+      return T_FIRST_KEYWORD + (kwp - keywords);
+
+  return T_ID;
+}
 \f
 /* Weird token functions. */
 
@@ -698,8 +720,8 @@ lex_put_back_id (const char *id)
   save_token ();
   token = T_ID;
   ds_replace (&tokstr, id);
-  strncpy (tokid, ds_c_str (&tokstr), 8);
-  tokid[8] = 0;
+  strncpy (tokid, ds_c_str (&tokstr), SHORT_NAME_LEN);
+  tokid[SHORT_NAME_LEN] = 0;
 }
 \f
 /* Weird line processing functions. */
@@ -1002,23 +1024,6 @@ unexpected_eof (void)
   msg (FE, _("Unexpected end of file."));
 }
 
-/* Returns the proper token type, either T_ID or a reserved keyword
-   enum, for ID[], which must contain LEN characters. */
-static inline int
-check_id (const char *id, size_t len)
-{
-  const char **kwp;
-
-  if (len < 2 || len > 4)
-    return T_ID;
-  
-  for (kwp = keywords; *kwp; kwp++)
-    if (!strcmp (*kwp, id))
-      return T_FIRST_KEYWORD + (kwp - keywords);
-
-  return T_ID;
-}
-
 /* When invoked, tokstr contains a string of binary, octal, or hex
    digits, for values of TYPE of 0, 1, or 2, respectively.  The string
    is converted to characters having the specified values. */