Provide strtoumax fallback in the scanner.

[cdecl99.git] / src / scan.l

diff --git a/src/scan.l b/src/scan.l
index ad90afecaa7d27f8f8032e8d14a260bb357e7371..1688873eea7a98744f68041bd16a858cfd82b332 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -1,7 +1,7 @@
 %top{
 /*
  *  Scanner for C declarations.
- *  Copyright © 2011 Nick Bowler
+ *  Copyright © 2011, 2021, 2023 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
@@ -17,23 +17,44 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "parse.h"
 }
 
-%option noyywrap bison-locations reentrant never-interactive
+%option nodefault noyywrap bison-locations reentrant never-interactive
 %option extra-type="_Bool"
 %option prefix="cdecl__yy"
 
 %{
-#define lex_error(msg) do { \
-       cdecl__yyerror(yylloc, NULL, NULL, (msg)); \
+#include <ctype.h>
+#include "cdecl-internal.h"
+#include "cdecl.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
+
+#define lex_error(...) do { \
+       cdecl__err(CDECL_ENOPARSE, __VA_ARGS__); \
        return T_LEX_ERROR; \
 } while(0)
 
 #define dup_token() do { \
        yylval->strval = malloc(yyleng+1); \
-       if (!yylval->strval) \
-               lex_error("failed to allocate memory"); \
+       if (!yylval->strval) { \
+               cdecl__err(CDECL_ENOMEM); \
+               return T_LEX_ERROR; \
+       } \
        strcpy(yylval->strval, yytext); \
 } while(0)
 %}
@@ -95,11 +116,11 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
        char *end;
 
        errno = 0;
-       yylval->uintval = strtoumax(yytext, &end, 0);
+       yylval->uintval = STRTOUMAX(yytext, &end, 0);
        if (errno == ERANGE)
-               lex_error("integer constant out of range");
+               lex_error(_("integer constant out of range"));
        if (*end)
-               lex_error("invalid integer constant");
+               lex_error(_("invalid integer constant"));
 
        return T_UINT;
 }
@@ -121,7 +142,28 @@ INTEGER 0x[[:xdigit:]]+|0[0-7]+|[[:digit:]]+
 
 [[:space:]]+
 . {
-       char buf[] = "syntax error, unexpected #";
-       *strchr(buf, '#') = *yytext;
-       lex_error(buf);
+       char buf[5] = { yytext[0] };
+       unsigned char c = buf[0];
+
+       if (!isprint(c) || c == '\\' || c == '\'') {
+               /* Encode nonprinting characters with C-style escapes */
+               buf[0] = '\\';
+               switch (c) {
+               case '\a': buf[1] = 'a'; break;
+               case '\b': buf[1] = 'b'; break;
+               case '\f': buf[1] = 'f'; break;
+               case '\n': buf[1] = 'n'; break;
+               case '\r': buf[1] = 'r'; break;
+               case '\t': buf[1] = 't'; break;
+               case '\v': buf[1] = 'v'; break;
+               case '\\': buf[1] = '\\'; break;
+               case '\'': buf[1] = '\''; break;
+               default:
+                       buf[1] = '0' + ((c >> 6) & 3);
+                       buf[2] = '0' + ((c >> 3) & 7);
+                       buf[3] = '0' + ((c >> 0) & 7);
+               }
+       }
+
+       lex_error(_("syntax error, unexpected '%s'"), buf);
 }