summaryrefslogtreecommitdiff
path: root/src/skel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/skel.c')
-rw-r--r--src/skel.c99
1 files changed, 42 insertions, 57 deletions
diff --git a/src/skel.c b/src/skel.c
index bf4c289..b22060a 100644
--- a/src/skel.c
+++ b/src/skel.c
@@ -90,7 +90,7 @@ const char *skel[] = {
"#define FLEX_SCANNER",
"#define YY_FLEX_MAJOR_VERSION 2",
"#define YY_FLEX_MINOR_VERSION 6",
- "#define YY_FLEX_SUBMINOR_VERSION 0",
+ "#define YY_FLEX_SUBMINOR_VERSION 1",
"#if YY_FLEX_SUBMINOR_VERSION > 0",
"#define FLEX_BETA",
"#endif",
@@ -290,25 +290,13 @@ const char *skel[] = {
"/* end standard C++ headers. */",
"%endif",
"",
- "#ifdef __cplusplus",
- "",
- "/* The \"const\" storage-class-modifier is valid. */",
- "#define YY_USE_CONST",
- "",
- "#else /* ! __cplusplus */",
- "",
- "/* C99 requires __STDC__ to be defined as 1. */",
- "#if defined (__STDC__)",
- "",
- "#define YY_USE_CONST",
- "",
- "#endif /* defined (__STDC__) */",
- "#endif /* ! __cplusplus */",
- "",
- "#ifdef YY_USE_CONST",
+ "/* TODO: this is always defined, so inline it */",
"#define yyconst const",
+ "",
+ "#if defined(__GNUC__) && __GNUC__ >= 3",
+ "#define yynoreturn __attribute__((__noreturn__))",
"#else",
- "#define yyconst",
+ "#define yynoreturn",
"#endif",
"",
"%# For compilers that can not handle prototypes.",
@@ -544,7 +532,7 @@ const char *skel[] = {
"#endif",
"",
"%if-not-reentrant",
- "extern yy_size_t yyleng;",
+ "extern int yyleng;",
"%endif",
"",
"%if-c-only",
@@ -633,7 +621,7 @@ const char *skel[] = {
" /* Size of input buffer in bytes, not including room for EOB",
" * characters.",
" */",
- " yy_size_t yy_buf_size;",
+ " int yy_buf_size;",
"",
" /* Number of characters read into yy_ch_buf, not including EOB",
" * characters.",
@@ -695,7 +683,7 @@ const char *skel[] = {
"/* Stack of input buffers. */",
"static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */",
"static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */",
- "static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */",
+ "static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */",
"%endif",
"%ok-for-header",
"%endif",
@@ -728,10 +716,10 @@ const char *skel[] = {
"/* yy_hold_char holds the character lost when yytext is formed. */",
"static char yy_hold_char;",
"static int yy_n_chars; /* number of characters read into yy_ch_buf */",
- "yy_size_t yyleng;",
+ "int yyleng;",
"",
"/* Points to current character in buffer. */",
- "static char *yy_c_buf_p = (char *) 0;",
+ "static char *yy_c_buf_p = NULL;",
"static int yy_init = 0; /* whether we need to initialize */",
"static int yy_start = 0; /* start state number */",
"",
@@ -764,7 +752,7 @@ const char *skel[] = {
"",
"YY_BUFFER_STATE yy_scan_buffer M4_YY_PARAMS( char *base, yy_size_t size M4_YY_PROTO_LAST_ARG );",
"YY_BUFFER_STATE yy_scan_string M4_YY_PARAMS( yyconst char *yy_str M4_YY_PROTO_LAST_ARG );",
- "YY_BUFFER_STATE yy_scan_bytes M4_YY_PARAMS( yyconst char *bytes, yy_size_t len M4_YY_PROTO_LAST_ARG );",
+ "YY_BUFFER_STATE yy_scan_bytes M4_YY_PARAMS( yyconst char *bytes, int len M4_YY_PROTO_LAST_ARG );",
"",
"%endif",
"",
@@ -822,10 +810,7 @@ const char *skel[] = {
"static yy_state_type yy_get_previous_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
"static yy_state_type yy_try_NUL_trans M4_YY_PARAMS( yy_state_type current_state M4_YY_PROTO_LAST_ARG);",
"static int yy_get_next_buffer M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
- "#if defined(__GNUC__) && __GNUC__ >= 3",
- "__attribute__((__noreturn__))",
- "#endif",
- "static void yy_fatal_error M4_YY_PARAMS( yyconst char msg[] M4_YY_PROTO_LAST_ARG );",
+ "static void yynoreturn yy_fatal_error M4_YY_PARAMS( yyconst char* msg M4_YY_PROTO_LAST_ARG );",
"]])",
"",
"%endif",
@@ -899,7 +884,7 @@ const char *skel[] = {
" YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */",
" char yy_hold_char;",
" int yy_n_chars;",
- " yy_size_t yyleng_r;",
+ " int yyleng_r;",
" char *yy_c_buf_p;",
" int yy_init;",
" int yy_start;",
@@ -1036,7 +1021,7 @@ const char *skel[] = {
"",
"m4_ifdef( [[M4_YY_NO_GET_LENG]],,",
"[[",
- "yy_size_t yyget_leng M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
+ " int yyget_leng M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
"]])",
"",
"m4_ifdef( [[M4_YY_NO_GET_TEXT]],,",
@@ -1192,7 +1177,7 @@ const char *skel[] = {
"/* This used to be an fputs(), but since the string might contain NUL's,",
" * we now use fwrite().",
" */",
- "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
+ "#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)",
"%endif",
"%if-c++-only C++ definition",
"#define ECHO LexerOutput( yytext, yyleng )",
@@ -1744,7 +1729,7 @@ const char *skel[] = {
" * This constructor simply maintains backward compatibility.",
" * DEPRECATED",
" */",
- "yyFlexLexer::yyFlexLexer( FLEX_STD istream* arg_yyin, FLEX_STD ostream* arg_yyout ):",
+ "yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ):",
" yyin(arg_yyin ? arg_yyin->rdbuf() : std::cin.rdbuf()),",
" yyout(arg_yyout ? arg_yyout->rdbuf() : std::cout.rdbuf())",
"{",
@@ -1780,7 +1765,7 @@ const char *skel[] = {
" yy_start_stack_ptr = yy_start_stack_depth = 0;",
" yy_start_stack = NULL;",
"",
- " yy_buffer_stack = 0;",
+ " yy_buffer_stack = NULL;",
" yy_buffer_stack_top = 0;",
" yy_buffer_stack_max = 0;",
"",
@@ -1929,7 +1914,7 @@ const char *skel[] = {
"",
" else",
" {",
- " yy_size_t num_to_read =",
+ " int num_to_read =",
" YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;",
"",
" while ( num_to_read <= 0 )",
@@ -1948,7 +1933,7 @@ const char *skel[] = {
"",
" if ( b->yy_is_our_buffer )",
" {",
- " yy_size_t new_size = b->yy_buf_size * 2;",
+ " int new_size = b->yy_buf_size * 2;",
"",
" if ( new_size <= 0 )",
" b->yy_buf_size += b->yy_buf_size / 8;",
@@ -1962,7 +1947,7 @@ const char *skel[] = {
" }",
" else",
" /* Can't grow it, we don't own it. */",
- " b->yy_ch_buf = 0;",
+ " b->yy_ch_buf = NULL;",
"",
" if ( ! b->yy_ch_buf )",
" YY_FATAL_ERROR(",
@@ -2090,7 +2075,7 @@ const char *skel[] = {
" if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )",
" { /* need to shift things up to make room */",
" /* +2 for EOB chars. */",
- " yy_size_t number_to_move = YY_G(yy_n_chars) + 2;",
+ " int number_to_move = YY_G(yy_n_chars) + 2;",
" char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[",
" YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];",
" char *source =",
@@ -2102,7 +2087,7 @@ const char *skel[] = {
" yy_cp += (int) (dest - source);",
" yy_bp += (int) (dest - source);",
" YY_CURRENT_BUFFER_LVALUE->yy_n_chars =",
- " YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;",
+ " YY_G(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;",
"",
" if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )",
" YY_FATAL_ERROR( \"flex scanner push-back overflow\" );",
@@ -2157,7 +2142,7 @@ const char *skel[] = {
"",
" else",
" { /* need more input */",
- " yy_size_t offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);",
+ " int offset = YY_G(yy_c_buf_p) - YY_G(yytext_ptr);",
" ++YY_G(yy_c_buf_p);",
"",
" switch ( yy_get_next_buffer( M4_YY_CALL_ONLY_ARG ) )",
@@ -2181,7 +2166,7 @@ const char *skel[] = {
" case EOB_ACT_END_OF_FILE:",
" {",
" if ( yywrap( M4_YY_CALL_ONLY_ARG ) )",
- " return EOF;",
+ " return 0;",
"",
" if ( ! YY_G(yy_did_buffer_switch_on_eof) )",
" YY_NEW_FILE;",
@@ -2552,7 +2537,7 @@ const char *skel[] = {
"void yyFlexLexer::yyensure_buffer_stack(void)",
"%endif",
"{",
- " yy_size_t num_to_alloc;",
+ " int num_to_alloc;",
" M4_YY_DECL_GUTS_VAR();",
"",
" if (!YY_G(yy_buffer_stack)) {",
@@ -2561,7 +2546,7 @@ const char *skel[] = {
" * scanner will even need a stack. We use 2 instead of 1 to avoid an",
" * immediate realloc on the next call.",
" */",
- " num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */",
+ " num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */",
" YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc",
" (num_to_alloc * sizeof(struct yy_buffer_state*)",
" M4_YY_CALL_LAST_ARG);",
@@ -2617,7 +2602,7 @@ const char *skel[] = {
" base[size-2] != YY_END_OF_BUFFER_CHAR ||",
" base[size-1] != YY_END_OF_BUFFER_CHAR )",
" /* They forgot to leave room for the EOB's. */",
- " return 0;",
+ " return NULL;",
"",
" b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) M4_YY_CALL_LAST_ARG );",
" if ( ! b )",
@@ -2626,7 +2611,7 @@ const char *skel[] = {
" b->yy_buf_size = size - 2; /* \"- 2\" to take care of EOB's */",
" b->yy_buf_pos = b->yy_ch_buf = base;",
" b->yy_is_our_buffer = 0;",
- " b->yy_input_file = 0;",
+ " b->yy_input_file = NULL;",
" b->yy_n_chars = b->yy_buf_size;",
" b->yy_is_interactive = 0;",
" b->yy_at_bol = 1;",
@@ -2656,7 +2641,7 @@ const char *skel[] = {
"{",
" m4_dnl M4_YY_DECL_GUTS_VAR();",
"",
- " return yy_scan_bytes( yystr, strlen(yystr) M4_YY_CALL_LAST_ARG);",
+ " return yy_scan_bytes( yystr, (int) strlen(yystr) M4_YY_CALL_LAST_ARG);",
"}",
"%endif",
"]])",
@@ -2672,7 +2657,7 @@ const char *skel[] = {
" * M4_YY_DOC_PARAM",
" * @return the newly allocated buffer state object.",
" */",
- "YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, yy_size_t ,_yybytes_len)",
+ "YY_BUFFER_STATE yy_scan_bytes YYFARGS2( yyconst char *,yybytes, int ,_yybytes_len)",
"{",
" YY_BUFFER_STATE b;",
" char *buf;",
@@ -2681,7 +2666,7 @@ const char *skel[] = {
" m4_dnl M4_YY_DECL_GUTS_VAR();",
"",
" /* Get memory for full buffer, including space for trailing EOB's. */",
- " n = _yybytes_len + 2;",
+ " n = (yy_size_t) _yybytes_len + 2;",
" buf = (char *) yyalloc( n M4_YY_CALL_LAST_ARG );",
" if ( ! buf )",
" YY_FATAL_ERROR( \"out of dynamic memory in yy_scan_bytes()\" );",
@@ -2721,7 +2706,7 @@ const char *skel[] = {
" yy_size_t new_size;",
"",
" YY_G(yy_start_stack_depth) += YY_START_STACK_INCR;",
- " new_size = YY_G(yy_start_stack_depth) * sizeof( int );",
+ " new_size = (yy_size_t) YY_G(yy_start_stack_depth) * sizeof( int );",
"",
" if ( ! YY_G(yy_start_stack) )",
" YY_G(yy_start_stack) = (int *) yyalloc( new_size M4_YY_CALL_LAST_ARG );",
@@ -2778,7 +2763,7 @@ const char *skel[] = {
"#endif",
"",
"%if-c-only",
- "static void yy_fatal_error YYFARGS1(yyconst char*, msg)",
+ "static void yynoreturn yy_fatal_error YYFARGS1(yyconst char*, msg)",
"{",
" M4_YY_DECL_GUTS_VAR();",
" M4_YY_NOOP_GUTS_VAR();",
@@ -2787,7 +2772,7 @@ const char *skel[] = {
"}",
"%endif",
"%if-c++-only",
- "void yyFlexLexer::LexerError( yyconst char msg[] )",
+ "void yyFlexLexer::LexerError( yyconst char* msg )",
"{",
" M4_YY_DECL_GUTS_VAR();",
" std::cerr << msg << std::endl;",
@@ -2899,7 +2884,7 @@ const char *skel[] = {
"/** Get the length of the current token.",
" * M4_YY_DOC_PARAM",
" */",
- "yy_size_t yyget_leng YYFARGS0(void)",
+ "int yyget_leng YYFARGS0(void)",
"{",
" M4_YY_DECL_GUTS_VAR();",
" return yyleng;",
@@ -3162,10 +3147,10 @@ const char *skel[] = {
" yylineno = 1;",
" ]])",
"]])",
- " YY_G(yy_buffer_stack) = 0;",
+ " YY_G(yy_buffer_stack) = NULL;",
" YY_G(yy_buffer_stack_top) = 0;",
" YY_G(yy_buffer_stack_max) = 0;",
- " YY_G(yy_c_buf_p) = (char *) 0;",
+ " YY_G(yy_c_buf_p) = NULL;",
" YY_G(yy_init) = 0;",
" YY_G(yy_start) = 0;",
"",
@@ -3196,8 +3181,8 @@ const char *skel[] = {
" yyin = stdin;",
" yyout = stdout;",
"#else",
- " yyin = (FILE *) 0;",
- " yyout = (FILE *) 0;",
+ " yyin = NULL;",
+ " yyout = NULL;",
"#endif",
"",
" /* For future reference: Set errno on error, since we are called by",
@@ -3294,7 +3279,7 @@ const char *skel[] = {
"{",
" M4_YY_DECL_GUTS_VAR();",
" M4_YY_NOOP_GUTS_VAR();",
- " return (void *) malloc( size );",
+ " return malloc(size);",
"}",
"]])",
"",
@@ -3312,7 +3297,7 @@ const char *skel[] = {
" * any pointer type to void*, and deal with argument conversions",
" * as though doing an assignment.",
" */",
- " return (void *) realloc( (char *) ptr, size );",
+ " return realloc(ptr, size);",
"}",
"]])",
"",
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:03:35 +0000