libcdecl: Remove unused YY_INPUT from scanner.

[cdecl99.git] / src / scan.l

diff --git a/src/scan.l b/src/scan.l
index 7549e6f7baee99cafb40a46d72f2211f10d511ce..bd1c5c5b267189f04dd13df3af3366391be5683a 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -1,7 +1,7 @@
 %top{
 /*
  *  Scanner for C declarations.
- *  Copyright © 2011, 2021, 2023 Nick Bowler
+ *  Copyright © 2011, 2021, 2023-2024 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #include <config.h>
 #include "parse.h"
 
+/* Disable various generated code we don't use */
+#define YY_INPUT(a, b, c) do {} while (0)
 #define YY_NO_INPUT 1
 #define YY_NO_UNPUT 1
 }
@@ -33,20 +35,7 @@
 #include "cdecl-internal.h"
 #include "cdecl.h"
 #include "errmsg.h"
-
-#if HAVE_STRTOUMAX
-/* Best case, implementation provides strtoumax. */
-#  define STRTOUMAX strtoumax
-#elif HAVE_STRTOULL
-/* Fall back to strtoull, with possibly reduced range. */
-#define STRTOUMAX strtoull
-#elif HAVE___STRTOULL
-/* HP-UX 11 has __strtoull in <inttypes.h> */
-#define STRTOUMAX __strtoull
-#else
-/* Fall back to strtoul, with possibly reduced range. */
-#define STRTOUMAX strtoul
-#endif
+#include "intconv.h"
 
 static char *to_octal(char *dst, unsigned val)
 {
@@ -111,11 +100,11 @@ static void to_readable_ch(char *dst, char c)
 %}
 
 IDENT [_[:alpha:]][-_[:alnum:]]*
-INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 
 %%
 
 %{
+       int intconv_base;
        char *c;
 %}
 
@@ -139,27 +128,35 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
        return UNPACK_TOKEN(match[sizeof tab[0]]);
 }
 
-{INTEGER} {
-       char *end;
-
-       errno = 0;
-       yylval->uintval = STRTOUMAX(yytext, &end, 0);
-       if (errno == ERANGE) {
-               cdecl__errmsg(CDECL__ERANGE);
-               return T_LEX_ERROR;
-       }
-       if (*end) {
-               cdecl__errmsg(CDECL__EBADINT);
-               return T_LEX_ERROR;
+0[0-7]* { intconv_base = INTCONV_OCTAL; goto int_parse; }
+[1-9][0-9]* { intconv_base = INTCONV_DECIMAL; goto int_parse; }
+0[Xx][[:xdigit:]]+ {
+       unsigned char d;
+       uintmax_t v;
+
+       yytext += 2;
+       intconv_base = INTCONV_HEXADECIMAL;
+int_parse:
+       for (v = 0; (d = *yytext++);) {
+               if (!intconv_shift(&v, intconv_base, intconv_digit(d))) {
+                       cdecl__errmsg(CDECL__ERANGE);
+                       return T_LEX_ERROR;
+               }
        }
 
+       yylval->uintval = v;
        return T_UINT;
 }
+0[Xx]|[0-9]+ {
+       cdecl__errmsg(CDECL__EBADINT);
+       return T_LEX_ERROR;
+}
 
 {IDENT} {
-       unsigned x = cdecl__to_keyword(yytext, yyleng, yyextra);
-       int tok;
+       int len = yyleng, tok;
+       unsigned x;
 
+       x = cdecl__to_keyword(yytext, len, yyextra);
        yylval->spectype = UNPACK_SPEC(x & 0xff);
        if ((tok = (x >> 8)) == PACK_TOKEN(T_IDENT)) {
                /*
@@ -173,14 +170,14 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
                 * downsides.
                 */
 #if 1
-               if ((c = strchr(yytext, '-')))
+               if ((c = memchr(yytext, '-', len)))
                        goto invalid_char;
 #else
                yyless(strcspn(yytext, "-"));
 #endif
-               if (!(yylval->item = cdecl__alloc_item(yyleng+1)))
-                       return T_LEX_ERROR; \
-               memcpy(yylval->item->s, yytext, yyleng+1);
+               if (!(yylval->item = cdecl__alloc_item(len+1)))
+                       return T_LEX_ERROR;
+               memcpy(yylval->item->s, yytext, len+1);
        }
        return UNPACK_TOKEN(tok);
 }