From f2d3211150779f770e579945bdce97b483bf308e Mon Sep 17 00:00:00 2001 From: glasseyes Date: Mon, 9 Jul 2018 11:02:37 +0700 Subject: [PATCH 1/9] search more dirs for kmn and kmfl keyboards /usr/share/keyman/* /usr/local/keyman/* ~/.local/share/keyman/* --- linux/ibus-kmfl/src/kmflutil.c | 44 ++++++++++++++++++++++++++-------- linux/ibus-kmfl/src/kmflutil.h | 1 + 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/linux/ibus-kmfl/src/kmflutil.c b/linux/ibus-kmfl/src/kmflutil.c index 415fe88198..a2c21bfae0 100644 --- a/linux/ibus-kmfl/src/kmflutil.c +++ b/linux/ibus-kmfl/src/kmflutil.c @@ -72,10 +72,9 @@ static gchar * get_dirname(const gchar * path) } } -GList * kmfl_get_keyboard_list( const gchar * path) +GList * kmfl_get_keyboard_fromdir( GList *keyboard_list, const gchar * path) { - GList * keyboard_list=NULL; - +// g_message("KMFL: getting from dir: %s", path); DIR *dir = opendir(path); if (dir != NULL) { @@ -85,14 +84,24 @@ GList * kmfl_get_keyboard_list( const gchar * path) gchar * absfn = g_strdup_printf("%s/%s", path, file->d_name); stat(absfn, &filestat); + if (S_ISDIR(filestat.st_mode)) + { + if(strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0) + keyboard_list = kmfl_get_keyboard_fromdir(keyboard_list, absfn); + g_free(absfn); + } // Only .kmfl and .kmn extensions are valid keyboard files - if (S_ISREG(filestat.st_mode) + else if (S_ISREG(filestat.st_mode) && ((g_str_has_suffix(absfn, ".kmfl") && kmfl_check_keyboard(absfn) == 0) || g_str_has_suffix(absfn, ".kmn"))) { keyboard_list=g_list_append(keyboard_list, absfn); } + else + { + g_free(absfn); + } file = readdir(dir); } @@ -101,6 +110,13 @@ GList * kmfl_get_keyboard_list( const gchar * path) return keyboard_list; } +GList * kmfl_get_keyboard_list( const gchar * path) +{ + GList * keyboard_list=NULL; + keyboard_list = kmfl_get_keyboard_fromdir(keyboard_list, path); + return keyboard_list; +} + gchar * kmfl_get_icon_file(KInputMethod * im) { const char * icon_file = kmfl_icon_file(im->keyboard_number); @@ -242,21 +258,29 @@ ibus_kmfl_list_engines (void) gchar *local_keyboard_path; keyboard_list = kmfl_get_keyboard_list("/usr/share/kmfl"); - engines = ibus_kmfl_add_engines(engines, keyboard_list); + g_list_free(keyboard_list); + keyboard_list = kmfl_get_keyboard_list("/usr/share/keyman"); + engines = ibus_kmfl_add_engines(engines, keyboard_list); + g_list_free(keyboard_list); + + keyboard_list = kmfl_get_keyboard_list("/usr/local/share/keyman"); + engines = ibus_kmfl_add_engines(engines, keyboard_list); g_list_free(keyboard_list); local_keyboard_path= g_strdup_printf("%s/.kmfl", getenv("HOME")); - keyboard_list = kmfl_get_keyboard_list(local_keyboard_path); - engines = ibus_kmfl_add_engines(engines, keyboard_list); - g_free(local_keyboard_path); - g_list_free(keyboard_list); - + + local_keyboard_path= g_strdup_printf("%s/.local/share/keyman", getenv("HOME")); + keyboard_list = kmfl_get_keyboard_list(local_keyboard_path); + engines = ibus_kmfl_add_engines(engines, keyboard_list); + g_free(local_keyboard_path); + g_list_free(keyboard_list); + return engines; } diff --git a/linux/ibus-kmfl/src/kmflutil.h b/linux/ibus-kmfl/src/kmflutil.h index 1332cde33f..3937aa8aa2 100644 --- a/linux/ibus-kmfl/src/kmflutil.h +++ b/linux/ibus-kmfl/src/kmflutil.h @@ -75,6 +75,7 @@ typedef struct int keyboard_number; gchar * keyboard_filename; gchar * keyboard_icon_filename; + gchar * keyboard_id; gchar * keyboard_name; gchar * keyboard_language; gchar * keyboard_author; From 8e8b15dabef84891d0ab3220b6af7b34de37c110 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Fri, 24 Aug 2018 13:36:14 +0700 Subject: [PATCH 2/9] update kmflcomp to handle TARGETS abort compilation if mobile only TARGETS ignore other new (since 6.0) special stores --- linux/kmflcomp/include/kmfl.h | 3 +- linux/kmflcomp/src/kmflcomp.c | 52 +- linux/kmflcomp/src/lex.c | 2167 ++++++++++++++++--------------- linux/kmflcomp/src/lex.l | 1 + linux/kmflcomp/src/yacc.c | 2275 ++++++++++++++++----------------- linux/kmflcomp/src/yacc.h | 175 +-- linux/kmflcomp/src/yacc.y | 5 + 7 files changed, 2345 insertions(+), 2333 deletions(-) diff --git a/linux/kmflcomp/include/kmfl.h b/linux/kmflcomp/include/kmfl.h index 6846332133..39075c4c1f 100644 --- a/linux/kmflcomp/include/kmfl.h +++ b/linux/kmflcomp/include/kmfl.h @@ -107,7 +107,8 @@ enum {ITEM_CHAR=0,ITEM_KEYSYM,ITEM_ANY,ITEM_INDEX,ITEM_OUTS,ITEM_DEADKEY,ITEM_CO // Enumerate special stores with reserved names (prefixed by &) enum TAG_SS {SS_UNDEFINED=-1,SS_NAME,SS_VERSION,SS_HOTKEY,SS_LANGUAGE,SS_LAYOUT,SS_COPYRIGHT, - SS_MESSAGE,SS_BITMAP,SS_MNEMONIC,SS_ETHNOLOGUE,SS_CAPSOFF,SS_CAPSON,SS_CAPSFREE,SS_AUTHOR}; + SS_MESSAGE,SS_BITMAP,SS_MNEMONIC,SS_ETHNOLOGUE,SS_CAPSOFF,SS_CAPSON,SS_CAPSFREE,SS_AUTHOR, + SS_TARGETS}; // The following compiled keyboard structures and types are used by both the compiler // and the interpreter diff --git a/linux/kmflcomp/src/kmflcomp.c b/linux/kmflcomp/src/kmflcomp.c index b6ba93c160..d1770f4872 100644 --- a/linux/kmflcomp/src/kmflcomp.c +++ b/linux/kmflcomp/src/kmflcomp.c @@ -1114,7 +1114,13 @@ char *items_to_string(ITEM *p) char *special_stores[] = { "&name","&version","&hotkey","&language","&layout","©right","&message", "&bitmap","&mnemoniclayout","ðnologuecode", - "&capsalwaysoff","&capsononly","&shiftfreescaps","&author"}; + "&capsalwaysoff","&capsononly","&shiftfreescaps","&author","&targets"}; + +// stores new from keyman 7.0 onwards that can safely be ignored for kmfl 11 for now +char *ignored_stores[] = { + "&visualkeyboard","&layoutfile","&kmw_helpfile","&kmw_embedjs", + "&windowslanguages","&kmw_rtl","&keyboardversion", + "&kmw_embedcss","&kmw_helptext","&includecodes"}; // Initialize special stores (create dummy entries) void initialize_special_stores(void) @@ -1129,7 +1135,7 @@ void initialize_special_stores(void) // Copy special store contents to keyboard header as required void process_special_store(char *name, STORE *sp, int line) { - int n, kbver; + int n, p, kbver; // Identify store by name for(n=0; nitems)); + //kmflcomp_warn(line, "No valid linux target."); + break; case SS_COPYRIGHT: case SS_MESSAGE: case SS_LAYOUT: @@ -1172,7 +1183,12 @@ void process_special_store(char *name, STORE *sp, int line) case SS_ETHNOLOGUE: break; default: - kmflcomp_warn(line-1,"unrecognized special store '&%s'",name); + for(p=0; pitems; + p2 = (UTF8*)tname; + IConvertUTF32toUTF8((const UTF32 **)&p1,(const UTF32 *)(sp->items+sp->len),&p2,(UTF8 *)(tname+127)); + *p2 = 0; + p = (char *)tname; + ptr = strtok(p, delim); + while(ptr != NULL) + { + for(n=0; n 0 #define FLEX_BETA #endif @@ -83,60 +83,48 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus +/* begin standard C++ headers. */ -/* 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 /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -166,14 +154,14 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -190,7 +178,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -205,7 +192,7 @@ struct yy_buffer_state /* 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. @@ -233,7 +220,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -261,7 +248,7 @@ struct yy_buffer_state /* 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. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -272,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -281,10 +267,10 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* 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 */ @@ -293,63 +279,57 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) #define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; @@ -358,26 +338,22 @@ extern char *yytext; #endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -#if defined(__GNUC__) && __GNUC__ >= 3 -__attribute__((__noreturn__)) -#endif -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 233 -#define YY_END_OF_BUFFER 234 +#define YY_NUM_RULES 234 +#define YY_END_OF_BUFFER 235 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -385,92 +361,93 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[738] = +static const flex_int16_t yy_accept[745] = { 0, - 41, 41, 41, 41, 0, 0, 79, 79, 89, 89, - 82, 82, 57, 57, 0, 0, 71, 71, 0, 0, - 0, 0, 234, 232, 41, 1, 2, 232, 232, 232, - 232, 230, 39, 46, 38, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 50, 232, 41, 228, 231, 233, 41, - 2, 233, 233, 233, 46, 56, 56, 56, 56, 56, - 56, 56, 56, 50, 233, 78, 78, 2, 78, 81, - 79, 2, 80, 81, 89, 213, 212, 233, 233, 233, - 233, 233, 233, 233, 233, 214, 86, 82, 2, 84, + 42, 42, 42, 42, 0, 0, 80, 80, 90, 90, + 83, 83, 58, 58, 0, 0, 72, 72, 0, 0, + 0, 0, 235, 233, 42, 1, 2, 233, 233, 233, + 233, 231, 40, 47, 39, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 51, 233, 42, 229, 232, 234, + 42, 2, 234, 234, 234, 47, 57, 57, 57, 57, + 57, 57, 57, 57, 51, 234, 79, 79, 2, 79, + 82, 80, 2, 81, 82, 90, 214, 213, 234, 234, + 234, 234, 234, 234, 234, 234, 215, 87, 83, 2, - 85, 83, 86, 63, 57, 2, 60, 62, 61, 63, - 63, 68, 68, 2, 68, 68, 68, 68, 71, 77, - 74, 233, 233, 233, 229, 229, 2, 229, 88, 88, - 2, 87, 88, 41, 0, 0, 45, 40, 0, 44, - 0, 43, 46, 231, 231, 231, 231, 231, 42, 231, - 231, 47, 231, 34, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 0, 231, 231, 48, 0, 215, 0, 41, 0, 40, - 228, 40, 42, 220, 219, 41, 0, 56, 56, 47, - 56, 53, 56, 56, 48, 0, 79, 89, 0, 0, + 85, 86, 84, 87, 64, 58, 2, 61, 63, 62, + 64, 64, 69, 69, 2, 69, 69, 69, 69, 72, + 78, 75, 234, 234, 234, 230, 230, 2, 230, 89, + 89, 2, 88, 89, 42, 0, 0, 46, 41, 0, + 45, 0, 44, 47, 232, 232, 232, 232, 232, 43, + 232, 232, 48, 232, 35, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 232, 0, 232, 232, 49, 0, 216, 0, 42, + 0, 41, 229, 41, 43, 221, 220, 42, 0, 57, + 57, 48, 57, 54, 57, 57, 49, 0, 80, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 57, 0, 0, 0, 65, 64, 0, - 0, 67, 0, 66, 0, 70, 69, 71, 74, 0, - 75, 76, 0, 224, 223, 26, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 32, 231, 231, - 231, 231, 231, 49, 24, 231, 231, 216, 225, 228, - 228, 228, 0, 222, 221, 56, 56, 55, 56, 100, - 0, 0, 0, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 0, 0, 0, 0, 83, 58, 0, 0, 0, 66, + 65, 0, 0, 68, 0, 67, 0, 71, 70, 72, + 75, 0, 76, 77, 0, 225, 224, 27, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 232, 33, + 232, 232, 232, 232, 232, 232, 50, 25, 232, 232, + 217, 226, 229, 229, 229, 0, 223, 222, 57, 57, + 56, 57, 101, 0, 0, 0, 104, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 59, - 58, 0, 0, 73, 72, 0, 0, 231, 28, 231, - 231, 36, 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 231, 231, 3, 231, 231, 21, 231, - 231, 231, 231, 231, 231, 228, 228, 51, 56, 54, - 0, 91, 0, 99, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 180, 181, 182, 183, 184, 185, - 186, 187, 188, 211, 211, 211, 211, 211, 211, 211, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 60, 59, 0, 0, 74, 73, 0, 0, + 232, 29, 232, 232, 37, 232, 232, 232, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 232, 3, 232, + 232, 22, 232, 232, 232, 232, 232, 232, 232, 229, + 229, 52, 57, 55, 0, 92, 0, 100, 212, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 212, 212, 212, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 157, 93, 0, 0, 0, 97, 0, 0, - 0, 210, 0, 64, 0, 0, 217, 0, 231, 19, - 231, 0, 231, 231, 231, 231, 231, 231, 22, 231, - 29, 231, 231, 31, 231, 231, 231, 231, 231, 231, - 20, 231, 231, 231, 228, 227, 56, 97, 0, 207, - 211, 211, 211, 211, 211, 211, 208, 211, 162, 211, - 211, 154, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 211, 211, 163, - 211, 211, 170, 171, 172, 173, 174, 175, 176, 177, + 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, + 212, 212, 212, 212, 212, 212, 158, 94, 0, 0, + 0, 98, 0, 0, 0, 211, 0, 65, 0, 0, + 218, 0, 232, 20, 232, 0, 232, 232, 232, 232, + 232, 232, 23, 232, 30, 232, 232, 32, 232, 232, + 232, 232, 232, 232, 21, 232, 232, 232, 232, 229, + 228, 57, 98, 0, 208, 212, 212, 212, 212, 212, + 212, 209, 212, 163, 212, 212, 155, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 212, 212, 164, 212, 212, 171, 172, 173, - 178, 179, 211, 211, 211, 211, 211, 209, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 150, - 92, 0, 95, 96, 0, 98, 0, 65, 64, 218, - 16, 0, 4, 0, 0, 231, 231, 231, 231, 231, - 231, 5, 231, 8, 231, 231, 231, 27, 35, 0, - 231, 37, 0, 231, 228, 227, 56, 0, 211, 211, - 149, 206, 211, 211, 211, 159, 211, 211, 155, 211, - 211, 156, 211, 211, 211, 211, 211, 211, 211, 211, - 161, 160, 211, 211, 211, 211, 211, 211, 211, 90, - 94, 65, 0, 0, 4, 4, 0, 0, 231, 0, + 174, 175, 176, 177, 178, 179, 180, 212, 212, 212, + 212, 212, 210, 212, 212, 212, 212, 212, 212, 212, + 212, 212, 212, 212, 151, 93, 0, 96, 97, 0, + 99, 0, 66, 65, 219, 16, 0, 4, 0, 0, + 232, 232, 232, 232, 232, 232, 5, 232, 8, 232, + 232, 232, 28, 36, 0, 232, 38, 232, 0, 232, + 229, 228, 57, 0, 212, 212, 150, 207, 212, 212, + 212, 160, 212, 212, 156, 212, 212, 157, 212, 212, + 212, 212, 212, 212, 212, 212, 162, 161, 212, 212, + 212, 212, 212, 212, 212, 91, 95, 66, 0, 0, - 231, 25, 231, 33, 231, 231, 13, 231, 30, 0, - 231, 0, 6, 226, 52, 99, 211, 211, 144, 140, - 211, 151, 145, 211, 146, 168, 211, 211, 211, 211, - 211, 152, 211, 102, 148, 158, 211, 204, 143, 101, - 0, 0, 0, 0, 231, 231, 231, 231, 7, 231, - 0, 231, 0, 226, 211, 211, 211, 141, 211, 166, - 211, 165, 211, 142, 153, 0, 0, 0, 0, 231, - 231, 12, 231, 0, 231, 0, 231, 0, 139, 147, - 205, 167, 169, 164, 17, 0, 0, 0, 231, 10, - 231, 0, 231, 0, 231, 23, 0, 0, 10, 0, + 4, 4, 0, 0, 232, 0, 232, 26, 232, 34, + 232, 232, 13, 232, 31, 0, 232, 17, 0, 6, + 227, 53, 100, 212, 212, 145, 141, 212, 152, 146, + 212, 147, 169, 212, 212, 212, 212, 212, 153, 212, + 103, 149, 159, 212, 205, 144, 102, 0, 0, 0, + 0, 232, 232, 232, 232, 7, 232, 0, 232, 0, + 227, 212, 212, 212, 142, 212, 167, 212, 166, 212, + 143, 154, 0, 0, 0, 0, 232, 232, 12, 232, + 0, 232, 0, 232, 0, 140, 148, 206, 168, 170, + 165, 18, 0, 0, 0, 232, 10, 232, 0, 232, - 231, 0, 231, 0, 231, 0, 0, 231, 0, 0, - 231, 0, 231, 0, 231, 0, 231, 18, 0, 9, - 0, 231, 0, 231, 0, 231, 9, 0, 15, 0, - 14, 0, 11, 15, 14, 11, 0 + 0, 232, 24, 0, 0, 10, 0, 232, 0, 232, + 0, 232, 0, 0, 232, 0, 0, 232, 0, 232, + 0, 232, 0, 232, 19, 0, 9, 0, 232, 0, + 232, 0, 232, 9, 0, 15, 0, 14, 0, 11, + 15, 14, 11, 0 } ; -static yyconst YY_CHAR yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -502,7 +479,7 @@ static yyconst YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst YY_CHAR yy_meta[82] = +static const YY_CHAR yy_meta[82] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, @@ -515,411 +492,415 @@ static yyconst YY_CHAR yy_meta[82] = 5 } ; -static yyconst flex_uint16_t yy_base[766] = +static const flex_int16_t yy_base[773] = { 0, 0, 77, 135, 0, 215, 219, 223, 227, 279, 357, 236, 247, 435, 492, 258, 289, 549, 0, 322, 336, - 628, 683, 718, 1953, 308, 1953, 1953, 700, 0, 697, - 601, 1953, 1953, 71, 1953, 54, 64, 294, 725, 38, + 628, 683, 718, 1974, 308, 1974, 1974, 700, 0, 697, + 601, 1974, 1974, 71, 1974, 54, 64, 294, 725, 38, 0, 52, 56, 58, 73, 317, 328, 55, 72, 324, - 275, 73, 778, 1953, 104, 377, 211, 463, 1953, 386, - 1953, 585, 577, 508, 100, 0, 74, 253, 826, 197, - 198, 493, 879, 1953, 414, 1953, 441, 1953, 457, 1953, - 472, 1953, 1953, 468, 473, 1953, 1953, 241, 352, 437, - 499, 251, 500, 281, 285, 1953, 1953, 474, 1953, 1953, + 77, 275, 74, 778, 1974, 104, 377, 211, 463, 1974, + 386, 1974, 585, 577, 508, 100, 0, 213, 253, 826, + 198, 232, 493, 879, 1974, 414, 1974, 441, 1974, 457, + 1974, 472, 1974, 1974, 468, 473, 1974, 1974, 242, 352, + 437, 499, 286, 500, 288, 354, 1974, 1974, 474, 1974, - 1953, 1953, 478, 1953, 532, 1953, 1953, 1953, 1953, 301, - 482, 1953, 584, 1953, 441, 437, 107, 519, 534, 1953, - 599, 365, 640, 0, 1953, 619, 1953, 544, 1953, 620, - 1953, 1953, 577, 621, 591, 422, 415, 1953, 401, 399, - 366, 361, 650, 0, 340, 350, 613, 358, 1953, 534, - 605, 667, 386, 0, 401, 489, 497, 547, 680, 552, - 628, 668, 661, 712, 664, 659, 676, 688, 683, 690, - 0, 752, 683, 0, 707, 1953, 352, 760, 711, 307, - 1953, 743, 766, 1953, 1953, 761, 427, 0, 742, 754, - 757, 0, 784, 777, 0, 822, 826, 827, 778, 789, + 1974, 1974, 1974, 478, 1974, 532, 1974, 1974, 1974, 1974, + 301, 482, 1974, 584, 1974, 441, 437, 107, 519, 534, + 1974, 599, 365, 640, 0, 1974, 619, 1974, 544, 1974, + 620, 1974, 1974, 577, 621, 591, 422, 415, 1974, 401, + 399, 366, 361, 650, 0, 345, 358, 613, 367, 1974, + 534, 605, 667, 408, 0, 496, 502, 531, 568, 680, + 627, 654, 669, 663, 712, 667, 676, 677, 689, 684, + 692, 689, 0, 752, 715, 0, 707, 1974, 352, 761, + 711, 307, 1974, 743, 766, 1974, 1974, 774, 427, 0, + 753, 754, 795, 0, 785, 778, 0, 822, 826, 853, - 794, 814, 927, 821, 814, 828, 847, 837, 836, 849, - 849, 257, 862, 923, 250, 326, 1007, 1953, 377, 772, - 298, 296, 290, 282, 487, 1953, 513, 924, 999, 537, - 1007, 0, 235, 1953, 1953, 0, 998, 991, 999, 996, - 999, 993, 993, 989, 1011, 1002, 996, 1007, 1014, 1013, - 1006, 1019, 1004, 1011, 1020, 1025, 1026, 0, 1009, 1008, - 1024, 1013, 1012, 0, 0, 1019, 1015, 1953, 222, 247, - 1066, 1067, 866, 1953, 1953, 1051, 1064, 0, 1050, 1063, - 1052, 1052, 1062, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1063, 1065, 1077, 1072, 1065, 1133, 0, + 784, 789, 794, 814, 927, 824, 828, 841, 856, 846, + 840, 855, 855, 257, 862, 923, 250, 326, 1007, 1974, + 377, 866, 298, 296, 290, 282, 487, 1974, 513, 924, + 999, 537, 1007, 0, 235, 1974, 1974, 0, 998, 991, + 999, 996, 999, 993, 993, 989, 1011, 1002, 996, 1007, + 1014, 1013, 1006, 1019, 1004, 1011, 1020, 1025, 1026, 0, + 1009, 1008, 1024, 1013, 1012, 1026, 0, 0, 1020, 1016, + 1974, 222, 247, 1067, 1068, 873, 1974, 1974, 1052, 1065, + 0, 1051, 1064, 1053, 1053, 1063, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1064, 1066, 1078, 1073, - 1065, 1067, 0, 0, 1081, 0, 1116, 1080, 1133, 1067, - 1133, 1133, 1088, 1117, 0, 0, 0, 0, 0, 1119, - 1125, 1135, 1130, 1127, 1130, 1141, 1145, 0, 580, 1953, - 596, 647, 600, 1953, 606, 216, 874, 1137, 0, 1139, - 1153, 0, 1205, 1151, 1139, 1147, 1144, 1144, 1156, 1168, - 1172, 1173, 1187, 1195, 1182, 0, 1178, 1185, 0, 1182, - 1181, 1197, 1200, 1197, 1196, 1208, 1240, 0, 1197, 0, - 1192, 1953, 1193, 1953, 0, 1192, 1196, 1198, 1204, 1207, - 1214, 1249, 1233, 1252, 1267, 900, 0, 0, 0, 0, - 0, 0, 0, 1253, 1252, 1251, 1253, 1266, 1314, 1273, + 1066, 1134, 0, 1066, 1068, 0, 0, 1082, 0, 1117, + 1081, 1134, 1068, 1134, 1134, 1089, 1118, 0, 0, 0, + 0, 0, 1120, 1126, 1136, 1131, 1128, 1131, 1142, 1146, + 0, 580, 1974, 596, 647, 600, 1974, 606, 216, 1176, + 1142, 0, 1144, 1158, 0, 1182, 1155, 1143, 1173, 1170, + 1170, 1187, 1169, 1173, 1174, 1188, 1197, 1184, 0, 1180, + 1187, 0, 1184, 1183, 1200, 1203, 1202, 1201, 1200, 1221, + 1241, 0, 1200, 0, 1194, 1974, 1199, 1974, 0, 1198, + 1202, 1227, 1232, 1238, 1229, 1250, 1234, 1253, 1298, 916, + 0, 0, 0, 0, 0, 0, 0, 1254, 1252, 1250, - 249, 1266, 1271, 1310, 1275, 1273, 1285, 1275, 1285, 1294, - 1312, 1313, 0, 1953, 1314, 1322, 1310, 1953, 1320, 1328, - 1315, 0, 822, 927, 1359, 1372, 1953, 264, 1322, 237, - 1325, 1366, 1330, 1333, 1329, 1345, 1350, 1354, 0, 1343, - 0, 1368, 1353, 0, 1367, 1361, 1373, 1353, 1365, 1406, - 0, 1372, 533, 1373, 1390, 212, 1385, 1953, 1377, 0, - 1372, 1401, 1375, 1380, 1388, 1382, 0, 1393, 0, 1409, - 1414, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1411, 1411, 0, - 1415, 1407, 0, 0, 0, 0, 0, 0, 0, 0, + 1253, 1266, 1314, 1300, 249, 1293, 1297, 1313, 1301, 1301, + 1313, 1303, 1313, 1322, 1323, 1323, 0, 1974, 1314, 1322, + 1310, 1974, 1319, 1326, 1315, 0, 1358, 1360, 1389, 1393, + 1974, 264, 1356, 237, 1359, 1396, 1365, 1364, 1355, 1371, + 1377, 1371, 0, 1359, 0, 1384, 1369, 0, 1383, 1378, + 1390, 1369, 1381, 1420, 0, 1390, 1379, 533, 1386, 1417, + 212, 1397, 1974, 1388, 0, 1385, 1418, 1416, 1422, 1425, + 1419, 0, 1426, 0, 1437, 1442, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1439, 1437, 0, 1435, 1427, 0, 0, 0, - 0, 0, 1413, 1420, 1418, 1421, 1422, 0, 1416, 1427, - 1424, 1423, 1420, 1437, 1442, 1436, 1446, 1434, 1451, 0, - 1953, 1435, 1953, 1953, 1441, 1953, 1495, 1953, 1498, 1953, - 0, 1487, 1509, 1450, 1465, 1464, 1510, 1474, 1490, 1474, - 1485, 0, 1494, 0, 1497, 1494, 1496, 0, 0, 1513, - 1487, 0, 1530, 1492, 1499, 1953, 1487, 1502, 1500, 1515, - 0, 0, 1506, 1520, 1504, 0, 1519, 1527, 0, 1535, - 1527, 0, 1528, 1539, 1533, 1555, 1556, 1544, 1555, 1546, - 0, 0, 1557, 1543, 1544, 1553, 1546, 1560, 1567, 1953, - 1953, 1953, 1559, 1560, 715, 917, 1552, 1596, 1578, 1600, + 0, 0, 0, 0, 0, 0, 0, 1434, 1441, 1439, + 1441, 1440, 0, 1435, 1446, 1443, 1442, 1439, 1451, 1455, + 1451, 1465, 1459, 1483, 0, 1974, 1470, 1974, 1974, 1474, + 1974, 1520, 1974, 1363, 1974, 0, 1522, 1526, 1483, 1490, + 1482, 1527, 1489, 1503, 1486, 1499, 0, 1510, 0, 1514, + 1512, 1514, 0, 0, 1532, 1508, 0, 1508, 1551, 1515, + 1516, 1974, 1508, 1524, 1522, 1545, 0, 0, 1536, 1553, + 1537, 0, 1540, 1549, 0, 1559, 1545, 0, 1549, 1556, + 1550, 1573, 1576, 1563, 1574, 1566, 0, 0, 1577, 1563, + 1566, 1575, 1569, 1582, 1588, 1974, 1974, 1974, 1582, 1583, - 1568, 0, 1580, 0, 1590, 1594, 0, 1597, 0, 1583, - 1601, 1602, 0, 210, 0, 1953, 1588, 1591, 0, 0, - 1598, 0, 0, 1600, 0, 0, 1595, 1598, 1600, 1602, - 1618, 0, 1618, 0, 0, 0, 1611, 0, 0, 0, - 1605, 1616, 1625, 1614, 1607, 1621, 1614, 1614, 0, 1659, - 1637, 1643, 1632, 1953, 1654, 1652, 1649, 0, 1647, 0, - 1659, 0, 1657, 0, 0, 1660, 1667, 1648, 1662, 1656, - 1651, 0, 1672, 1699, 1679, 1677, 1664, 1665, 0, 0, - 0, 0, 0, 0, 1953, 1670, 1667, 1663, 1712, 0, - 1714, 1692, 1670, 1683, 1728, 1953, 1705, 1739, 1953, 1740, + 715, 770, 1575, 1622, 1602, 1625, 1592, 0, 1606, 0, + 1608, 1613, 0, 1618, 0, 1604, 1619, 0, 1620, 0, + 210, 0, 1974, 1609, 1611, 0, 0, 1616, 0, 0, + 1618, 0, 0, 1613, 1616, 1619, 1621, 1638, 0, 1638, + 0, 0, 0, 1631, 0, 0, 0, 1627, 1638, 1648, + 1636, 1628, 1644, 1637, 1637, 0, 1683, 1661, 1669, 1650, + 1974, 1673, 1673, 1670, 0, 1665, 0, 1677, 0, 1678, + 0, 0, 1681, 1688, 1667, 1681, 1675, 1672, 0, 1693, + 1719, 1699, 1697, 1684, 1687, 0, 0, 0, 0, 0, + 0, 1974, 1692, 1690, 1685, 1733, 0, 1738, 1715, 1692, - 1715, 1742, 1711, 1703, 1714, 1750, 1757, 1732, 1729, 1729, - 1730, 1723, 1736, 1727, 1722, 1743, 1730, 1953, 1742, 0, - 1745, 1745, 1731, 1742, 1751, 1750, 1953, 1766, 0, 1757, - 0, 1762, 0, 1953, 1953, 1953, 1953, 1836, 1841, 1846, - 1851, 1856, 1861, 1866, 1871, 1876, 1879, 1884, 1889, 1892, - 1895, 1898, 1903, 1908, 1913, 1918, 119, 109, 1921, 1926, - 1931, 1936, 1939, 1942, 1947 + 1707, 1749, 1974, 1730, 1755, 1974, 1758, 1736, 1763, 1729, + 1720, 1734, 1773, 1774, 1749, 1746, 1749, 1751, 1743, 1755, + 1745, 1741, 1762, 1749, 1974, 1761, 0, 1764, 1764, 1762, + 1764, 1770, 1772, 1974, 1789, 0, 1781, 0, 1783, 0, + 1974, 1974, 1974, 1974, 1857, 1862, 1867, 1872, 1877, 1882, + 1887, 1892, 1897, 1900, 1905, 1910, 1913, 1916, 1919, 1924, + 1929, 1934, 1939, 119, 109, 1942, 1947, 1952, 1957, 1960, + 1963, 1968 } ; -static yyconst flex_int16_t yy_def[766] = +static const flex_int16_t yy_def[773] = { 0, - 737, 1, 737, 3, 738, 738, 739, 739, 740, 740, - 741, 741, 742, 742, 743, 743, 740, 17, 744, 744, - 745, 745, 737, 737, 737, 737, 737, 746, 747, 748, - 749, 737, 737, 737, 737, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 737, 737, 737, 751, 750, 737, 737, - 737, 746, 748, 749, 737, 752, 752, 752, 752, 752, - 752, 752, 752, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, + 744, 1, 744, 3, 745, 745, 746, 746, 747, 747, + 748, 748, 749, 749, 750, 750, 747, 17, 751, 751, + 752, 752, 744, 744, 744, 744, 744, 753, 754, 755, + 756, 744, 744, 744, 744, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 744, 744, 744, 758, 757, 744, + 744, 744, 753, 755, 756, 744, 759, 759, 759, 759, + 759, 759, 759, 759, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 753, 737, 754, 755, 756, 737, 737, 737, - 737, 737, 737, 757, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 746, 746, 737, 748, 748, - 749, 749, 737, 750, 750, 750, 750, 750, 737, 750, - 750, 39, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 758, 750, 750, 53, 737, 737, 737, 737, 737, 759, - 737, 759, 737, 737, 737, 737, 737, 752, 752, 69, - 752, 752, 752, 752, 73, 737, 737, 737, 737, 737, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 760, 744, 761, 762, 763, 744, 744, + 744, 744, 744, 744, 764, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 753, 753, 744, 755, + 755, 756, 756, 744, 757, 757, 757, 757, 757, 744, + 757, 757, 39, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 765, 757, 757, 54, 744, 744, 744, 744, + 744, 766, 744, 766, 744, 744, 744, 744, 744, 759, + 759, 70, 759, 759, 759, 759, 74, 744, 744, 744, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 760, 753, 753, 737, 753, 753, - 754, 754, 755, 755, 756, 737, 756, 737, 737, 761, - 737, 757, 762, 737, 737, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 758, 750, 750, 750, 737, 762, 759, - 759, 759, 737, 737, 737, 752, 752, 752, 752, 737, - 737, 737, 737, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 767, 760, 760, 744, + 760, 760, 761, 761, 762, 762, 763, 744, 763, 744, + 744, 768, 744, 764, 769, 744, 744, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 765, 757, 757, 757, + 744, 769, 766, 766, 766, 744, 744, 744, 759, 759, + 759, 759, 744, 744, 744, 744, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 737, - 737, 737, 737, 737, 737, 737, 737, 764, 760, 737, - 760, 765, 761, 737, 761, 762, 762, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 759, 759, 752, 752, 752, - 737, 737, 737, 737, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 744, 744, 744, 744, 744, 744, 744, 744, + 771, 767, 744, 767, 772, 768, 744, 768, 769, 769, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 766, + 766, 759, 759, 759, 744, 744, 744, 744, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 737, 737, 737, 737, 737, 737, 737, - 737, 764, 765, 765, 765, 762, 737, 762, 750, 750, - 750, 737, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 759, 759, 752, 737, 737, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 744, 744, 744, + 744, 744, 744, 744, 744, 771, 772, 772, 772, 769, + 744, 769, 757, 757, 757, 744, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 766, + 766, 759, 744, 744, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 737, 737, 737, 737, 737, 737, 765, 737, 765, 737, - 750, 737, 750, 737, 737, 750, 750, 750, 750, 750, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 737, - 750, 750, 737, 750, 759, 737, 752, 737, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 737, - 737, 737, 737, 737, 737, 750, 737, 737, 750, 737, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 744, 744, 744, 744, 744, + 744, 772, 744, 772, 744, 757, 744, 757, 744, 744, + 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, + 757, 757, 757, 757, 744, 757, 757, 757, 744, 757, + 766, 744, 759, 744, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 744, 744, 744, 744, 744, - 750, 750, 750, 750, 750, 750, 750, 750, 750, 737, - 750, 737, 750, 759, 752, 737, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 763, 763, 763, 763, 763, - 737, 737, 737, 737, 750, 750, 750, 750, 750, 750, - 737, 750, 737, 737, 763, 763, 763, 763, 763, 763, - 763, 763, 763, 763, 763, 737, 737, 737, 737, 750, - 750, 750, 750, 737, 750, 737, 750, 737, 763, 763, - 763, 763, 763, 763, 737, 737, 737, 737, 750, 750, - 750, 737, 750, 737, 750, 737, 737, 737, 737, 737, + 744, 757, 744, 744, 757, 744, 757, 757, 757, 757, + 757, 757, 757, 757, 757, 744, 757, 757, 744, 757, + 766, 759, 744, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 770, 770, 770, 770, 770, 744, 744, 744, + 744, 757, 757, 757, 757, 757, 757, 744, 757, 744, + 744, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 770, 770, 744, 744, 744, 744, 757, 757, 757, 757, + 744, 757, 744, 757, 744, 770, 770, 770, 770, 770, + 770, 744, 744, 744, 744, 757, 757, 757, 744, 757, - 750, 737, 750, 737, 750, 737, 737, 750, 737, 737, - 750, 737, 750, 737, 750, 737, 750, 737, 737, 750, - 737, 750, 737, 750, 737, 750, 737, 737, 750, 737, - 750, 737, 750, 737, 737, 737, 0, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737 + 744, 757, 744, 744, 744, 744, 744, 757, 744, 757, + 744, 757, 744, 744, 757, 744, 744, 757, 744, 757, + 744, 757, 744, 757, 744, 744, 757, 744, 757, 744, + 757, 744, 757, 744, 744, 757, 744, 757, 744, 757, + 744, 744, 744, 0, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744 } ; -static yyconst flex_uint16_t yy_nxt[2035] = +static const flex_int16_t yy_nxt[2056] = { 0, 24, 25, 26, 27, 25, 28, 29, 30, 31, 32, 33, 24, 24, 34, 34, 34, 34, 34, 34, 34, 34, 24, 24, 24, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 41, 41, 45, 46, 47, 48, - 41, 41, 49, 50, 41, 51, 52, 41, 53, 41, - 41, 54, 55, 24, 24, 36, 37, 38, 39, 40, + 41, 41, 49, 50, 51, 52, 53, 41, 54, 41, + 41, 55, 56, 24, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 41, 41, 45, 46, 47, 48, - 41, 41, 49, 50, 41, 51, 52, 41, 53, 41, - 41, 56, 155, 57, 143, 143, 143, 143, 143, 143, - 143, 143, 145, 147, 156, 157, 158, 148, 159, 146, + 41, 41, 49, 50, 51, 52, 53, 41, 54, 41, + 41, 57, 156, 58, 144, 144, 144, 144, 144, 144, + 144, 144, 146, 148, 157, 158, 159, 149, 160, 147, - 166, 167, 173, 189, 58, 175, 176, 177, 175, 226, - 227, 264, 155, 143, 143, 143, 143, 143, 143, 143, - 143, 232, 145, 147, 156, 157, 158, 148, 159, 146, - 166, 167, 173, 189, 58, 59, 60, 26, 61, 60, - 62, 59, 63, 64, 59, 59, 59, 59, 65, 65, - 65, 65, 65, 65, 65, 65, 59, 59, 59, 59, - 66, 67, 68, 69, 66, 66, 66, 66, 66, 66, - 66, 66, 66, 70, 71, 66, 66, 66, 66, 66, - 72, 66, 66, 73, 66, 66, 74, 75, 59, 59, - 66, 67, 68, 69, 66, 66, 66, 66, 66, 66, + 167, 168, 172, 175, 59, 177, 178, 179, 177, 228, + 229, 267, 156, 144, 144, 144, 144, 144, 144, 144, + 144, 234, 146, 148, 157, 158, 159, 149, 160, 147, + 167, 168, 172, 175, 59, 60, 61, 26, 62, 61, + 63, 60, 64, 65, 60, 60, 60, 60, 66, 66, + 66, 66, 66, 66, 66, 66, 60, 60, 60, 60, + 67, 68, 69, 70, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 71, 72, 67, 67, 67, 67, 67, + 73, 67, 67, 74, 67, 67, 75, 76, 60, 60, + 67, 68, 69, 70, 67, 67, 67, 67, 67, 67, - 66, 66, 66, 70, 71, 66, 66, 66, 66, 66, - 72, 66, 66, 73, 66, 66, 77, 26, 78, 77, - 77, 26, 78, 77, 81, 26, 82, 81, 81, 26, - 82, 81, 83, 654, 181, 556, 83, 98, 26, 99, - 98, 532, 193, 194, 100, 101, 182, 102, 98, 26, - 99, 98, 330, 331, 149, 100, 101, 149, 102, 113, - 26, 114, 113, 115, 508, 116, 530, 79, 337, 117, - 181, 79, 193, 194, 337, 84, 182, 199, 207, 84, - 85, 26, 61, 85, 86, 171, 87, 337, 103, 224, - 113, 26, 114, 113, 115, 149, 116, 224, 149, 103, + 67, 67, 67, 71, 72, 67, 67, 67, 67, 67, + 73, 67, 67, 74, 67, 67, 78, 26, 79, 78, + 78, 26, 79, 78, 82, 26, 83, 82, 82, 26, + 83, 82, 84, 661, 183, 562, 84, 99, 26, 100, + 99, 537, 191, 195, 101, 102, 184, 103, 99, 26, + 100, 99, 333, 334, 150, 101, 102, 150, 103, 114, + 26, 115, 114, 116, 513, 117, 535, 80, 340, 118, + 183, 80, 191, 195, 340, 85, 184, 196, 201, 85, + 86, 26, 62, 86, 87, 173, 88, 340, 104, 226, + 114, 26, 115, 114, 116, 150, 117, 226, 150, 104, - 117, 222, 215, 222, 88, 215, 89, 199, 207, 134, - 118, 328, 134, 211, 90, 91, 337, 92, 172, 150, - 212, 93, 94, 126, 26, 127, 126, 95, 218, 219, - 181, 75, 96, 151, 88, 135, 89, 126, 26, 127, - 126, 118, 160, 211, 90, 91, 161, 92, 172, 150, - 212, 93, 94, 163, 268, 162, 168, 95, 85, 26, - 61, 85, 86, 151, 87, 135, 230, 164, 169, 230, - 142, 170, 160, 165, 128, 142, 161, 200, 134, 218, - 219, 178, 88, 163, 89, 162, 168, 186, 128, 236, - 186, 201, 90, 91, 237, 92, 202, 164, 169, 93, + 118, 224, 217, 224, 89, 217, 90, 196, 201, 135, + 119, 331, 135, 209, 91, 92, 340, 93, 174, 151, + 213, 94, 95, 127, 26, 128, 127, 96, 220, 221, + 183, 76, 97, 152, 89, 136, 90, 127, 26, 128, + 127, 119, 161, 209, 91, 92, 162, 93, 174, 151, + 213, 94, 95, 164, 271, 163, 169, 96, 86, 26, + 62, 86, 87, 152, 88, 136, 232, 165, 170, 232, + 143, 171, 161, 166, 129, 143, 162, 202, 135, 220, + 221, 180, 89, 164, 90, 163, 169, 188, 129, 214, + 188, 203, 91, 92, 238, 93, 204, 165, 170, 94, - 94, 170, 240, 165, 179, 95, 140, 200, 140, 75, - 96, 245, 88, 187, 89, 175, 176, 177, 175, 236, - 137, 201, 90, 91, 237, 92, 202, 137, 233, 93, - 94, 233, 240, 246, 179, 95, 105, 26, 106, 105, - 107, 245, 196, 187, 224, 196, 222, 108, 109, 109, - 109, 109, 109, 109, 109, 109, 109, 109, 175, 176, - 177, 175, 110, 246, 183, 184, 185, 183, 187, 175, - 176, 177, 175, 197, 198, 213, 197, 198, 213, 175, - 176, 177, 175, 175, 176, 177, 175, 111, 150, 226, - 227, 203, 110, 105, 26, 106, 105, 107, 187, 187, + 95, 171, 239, 166, 181, 96, 141, 202, 141, 76, + 97, 242, 89, 189, 90, 177, 178, 179, 177, 214, + 138, 203, 91, 92, 238, 93, 204, 138, 235, 94, + 95, 235, 239, 247, 181, 96, 106, 26, 107, 106, + 108, 242, 198, 189, 226, 198, 224, 109, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 177, 178, + 179, 177, 111, 247, 185, 186, 187, 185, 189, 177, + 178, 179, 177, 199, 200, 215, 199, 200, 215, 177, + 178, 179, 177, 177, 178, 179, 177, 112, 151, 228, + 229, 205, 111, 106, 26, 107, 106, 108, 189, 189, - 187, 187, 151, 171, 108, 109, 109, 109, 109, 109, - 109, 109, 109, 109, 109, 226, 227, 142, 150, 110, - 175, 176, 177, 175, 204, 208, 205, 209, 247, 187, - 187, 187, 151, 214, 553, 228, 214, 553, 228, 334, - 335, 248, 206, 210, 111, 175, 176, 177, 175, 110, - 119, 26, 61, 119, 204, 208, 205, 209, 247, 187, - 120, 187, 121, 121, 121, 121, 121, 121, 121, 121, - 241, 248, 206, 210, 242, 249, 122, 123, 175, 176, - 177, 175, 330, 331, 140, 217, 218, 219, 217, 187, - 137, 187, 233, 234, 235, 233, 252, 124, 330, 331, + 189, 189, 152, 173, 109, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110, 228, 229, 143, 151, 111, + 177, 178, 179, 177, 206, 210, 207, 211, 248, 189, + 189, 189, 152, 216, 559, 230, 216, 559, 230, 337, + 338, 249, 208, 212, 112, 177, 178, 179, 177, 111, + 120, 26, 62, 120, 206, 210, 207, 211, 248, 189, + 121, 189, 122, 122, 122, 122, 122, 122, 122, 122, + 243, 249, 208, 212, 244, 250, 123, 124, 177, 178, + 179, 177, 333, 334, 141, 219, 220, 221, 219, 189, + 138, 189, 235, 236, 237, 235, 251, 125, 333, 334, - 241, 75, 334, 335, 242, 249, 122, 123, 334, 335, - 142, 220, 229, 229, 229, 229, 229, 229, 229, 229, - 196, 196, 134, 196, 196, 134, 252, 124, 129, 130, - 26, 131, 130, 129, 129, 129, 129, 129, 129, 129, - 129, 220, 238, 243, 239, 244, 187, 187, 135, 218, - 424, 129, 129, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 143, 143, 143, 143, 143, 143, 143, - 143, 253, 238, 243, 239, 244, 187, 187, 135, 129, - 133, 129, 129, 129, 130, 26, 131, 130, 129, 129, - 129, 129, 129, 129, 129, 129, 144, 254, 255, 425, + 243, 76, 337, 338, 244, 250, 123, 124, 337, 338, + 143, 222, 231, 231, 231, 231, 231, 231, 231, 231, + 198, 198, 135, 198, 198, 135, 251, 125, 130, 131, + 26, 132, 131, 130, 130, 130, 130, 130, 130, 130, + 130, 222, 240, 245, 241, 246, 189, 189, 136, 220, + 428, 130, 130, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 144, 144, 144, 144, 144, 144, 144, + 144, 254, 240, 245, 241, 246, 189, 189, 136, 130, + 134, 130, 130, 130, 131, 26, 132, 131, 130, 130, + 130, 130, 130, 130, 130, 130, 145, 255, 256, 429, - 258, 253, 144, 259, 140, 137, 129, 129, 175, 176, - 177, 175, 269, 234, 235, 269, 595, 737, 250, 595, - 260, 261, 262, 263, 737, 267, 144, 254, 255, 251, - 258, 737, 144, 259, 129, 133, 129, 129, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 250, 256, - 260, 261, 262, 263, 153, 267, 257, 737, 737, 251, - 154, 134, 186, 737, 178, 186, 181, 273, 274, 275, - 273, 276, 271, 332, 218, 219, 332, 737, 737, 256, - 272, 265, 277, 188, 153, 266, 257, 179, 187, 188, - 154, 174, 174, 174, 174, 174, 174, 174, 174, 174, + 257, 254, 145, 260, 141, 138, 130, 130, 177, 178, + 179, 177, 272, 236, 237, 272, 601, 744, 252, 601, + 261, 262, 263, 264, 744, 265, 145, 255, 256, 253, + 257, 266, 145, 260, 130, 134, 130, 130, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 153, 252, 258, + 261, 262, 263, 264, 154, 265, 259, 270, 744, 253, + 155, 266, 135, 744, 744, 180, 183, 276, 277, 278, + 276, 601, 274, 744, 601, 188, 744, 744, 188, 258, + 275, 268, 279, 190, 154, 269, 259, 270, 181, 190, + 155, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 174, 276, 271, 174, 174, 174, 174, 174, 174, 737, - 272, 265, 277, 188, 737, 266, 737, 179, 187, 188, - 278, 279, 280, 196, 218, 424, 196, 197, 198, 281, - 197, 198, 282, 174, 174, 174, 174, 174, 174, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 187, - 278, 279, 280, 187, 187, 191, 283, 320, 321, 281, - 322, 192, 282, 213, 737, 737, 213, 273, 274, 275, - 273, 737, 323, 324, 425, 426, 427, 428, 426, 187, - 325, 326, 327, 187, 187, 191, 283, 320, 321, 187, - 322, 192, 195, 195, 195, 195, 195, 195, 195, 195, + 176, 189, 274, 176, 176, 176, 176, 176, 176, 744, + 275, 268, 279, 190, 744, 269, 744, 744, 181, 190, + 280, 281, 282, 198, 744, 744, 198, 199, 283, 284, + 199, 189, 285, 176, 176, 176, 176, 176, 176, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 189, + 280, 281, 282, 189, 200, 193, 286, 200, 283, 284, + 323, 194, 285, 215, 744, 744, 215, 335, 220, 221, + 335, 744, 324, 325, 276, 277, 278, 276, 744, 189, + 189, 326, 327, 189, 328, 193, 286, 329, 330, 189, + 323, 194, 197, 197, 197, 197, 197, 197, 197, 197, - 195, 195, 323, 324, 195, 195, 195, 195, 195, 195, - 325, 326, 327, 483, 484, 485, 486, 487, 595, 187, - 737, 595, 737, 737, 214, 228, 337, 214, 228, 218, - 424, 737, 737, 737, 195, 195, 195, 195, 195, 195, - 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, - 187, 187, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, 319, 737, 425, - 187, 187, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, + 197, 197, 324, 325, 197, 197, 197, 197, 197, 197, + 189, 326, 327, 744, 328, 744, 744, 329, 330, 189, + 744, 744, 744, 744, 216, 230, 744, 216, 230, 488, + 489, 490, 491, 492, 197, 197, 197, 197, 197, 197, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 189, 189, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 744, 744, + 189, 189, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 312, 313, 314, 315, 316, 317, 318, 319, 217, 218, - 219, 217, 229, 229, 229, 229, 229, 229, 229, 229, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 338, 339, 340, 341, 220, 342, 343, 344, 345, 346, - 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, - 357, 358, 359, 360, 361, 362, 363, 364, 365, 737, - 338, 339, 340, 341, 220, 342, 343, 344, 345, 346, - 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, - 357, 358, 359, 360, 361, 362, 363, 364, 365, 181, - 181, 368, 369, 370, 371, 372, 373, 367, 374, 376, + 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, + 221, 219, 231, 231, 231, 231, 231, 231, 231, 231, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 341, 342, 343, 344, 222, 345, 346, 347, 348, 349, + 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + 341, 342, 343, 344, 222, 345, 346, 347, 348, 349, + 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, + 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, + 183, 183, 372, 373, 374, 375, 376, 377, 371, 378, - 377, 380, 378, 382, 394, 396, 383, 397, 384, 401, - 398, 381, 405, 412, 395, 366, 379, 737, 737, 737, - 737, 368, 369, 370, 371, 372, 373, 367, 374, 376, - 377, 380, 378, 382, 394, 396, 383, 397, 384, 401, - 398, 381, 405, 412, 395, 366, 379, 385, 386, 387, - 388, 389, 390, 391, 392, 393, 399, 413, 402, 406, - 408, 400, 403, 414, 404, 409, 407, 415, 416, 410, - 417, 418, 419, 411, 420, 421, 429, 430, 431, 737, - 435, 436, 437, 438, 439, 440, 399, 413, 402, 406, - 408, 400, 403, 414, 404, 409, 407, 415, 416, 410, + 380, 381, 384, 382, 386, 398, 400, 387, 401, 388, + 405, 402, 385, 409, 416, 399, 370, 383, 744, 744, + 744, 744, 372, 373, 374, 375, 376, 377, 371, 378, + 380, 381, 384, 382, 386, 398, 400, 387, 401, 388, + 405, 402, 385, 409, 416, 399, 370, 383, 389, 390, + 391, 392, 393, 394, 395, 396, 397, 403, 417, 406, + 410, 412, 404, 407, 418, 408, 413, 411, 419, 420, + 414, 421, 422, 423, 415, 424, 425, 430, 431, 432, + 430, 433, 434, 435, 439, 440, 436, 403, 417, 406, + 410, 412, 404, 407, 418, 408, 413, 411, 419, 420, - 417, 418, 419, 411, 420, 421, 429, 430, 431, 432, - 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, - 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 433, 181, 457, 737, 458, 459, 460, 461, 463, 462, - 464, 465, 466, 467, 434, 455, 441, 442, 443, 444, - 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, - 433, 468, 457, 181, 458, 459, 460, 461, 463, 462, - 464, 465, 466, 467, 434, 455, 456, 469, 471, 472, - 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, - 488, 468, 489, 470, 490, 491, 492, 737, 737, 737, + 414, 421, 422, 423, 415, 424, 425, 437, 441, 442, + 443, 433, 434, 435, 439, 440, 444, 445, 446, 447, + 448, 438, 449, 450, 451, 452, 453, 454, 340, 455, + 456, 457, 458, 459, 744, 462, 463, 437, 441, 442, + 443, 464, 465, 466, 183, 467, 444, 445, 446, 447, + 448, 438, 449, 450, 451, 452, 453, 454, 460, 455, + 456, 457, 458, 459, 183, 462, 463, 468, 469, 470, + 471, 464, 465, 466, 472, 467, 473, 461, 474, 476, + 477, 744, 744, 744, 744, 744, 744, 744, 460, 744, + 744, 493, 494, 495, 475, 496, 497, 468, 469, 470, - 737, 737, 737, 737, 737, 737, 456, 469, 471, 472, - 507, 509, 737, 510, 513, 514, 515, 516, 517, 518, - 488, 737, 489, 470, 490, 491, 492, 493, 494, 495, - 496, 497, 498, 499, 500, 501, 502, 519, 511, 520, - 507, 509, 503, 510, 513, 514, 515, 516, 517, 518, - 521, 504, 522, 523, 505, 512, 524, 506, 525, 526, - 527, 528, 529, 527, 531, 533, 536, 519, 511, 520, - 432, 537, 503, 426, 427, 428, 426, 538, 539, 540, - 521, 504, 522, 523, 505, 512, 524, 506, 525, 526, - 541, 534, 542, 543, 531, 533, 536, 544, 545, 546, + 471, 744, 744, 744, 472, 744, 473, 461, 474, 476, + 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, + 487, 493, 494, 495, 475, 496, 497, 498, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 512, 514, 515, + 518, 516, 508, 519, 520, 521, 522, 523, 524, 525, + 526, 509, 527, 528, 510, 529, 530, 511, 517, 531, + 220, 428, 220, 428, 744, 598, 428, 512, 514, 515, + 518, 516, 508, 519, 520, 521, 522, 523, 524, 525, + 526, 509, 527, 528, 510, 529, 530, 511, 517, 531, + 532, 533, 534, 532, 430, 431, 432, 430, 536, 538, - 547, 537, 548, 549, 552, 535, 737, 538, 539, 540, - 550, 425, 554, 181, 557, 555, 558, 559, 562, 563, - 541, 534, 542, 543, 337, 564, 565, 544, 545, 546, - 547, 566, 548, 549, 552, 535, 551, 560, 567, 568, - 569, 561, 554, 570, 557, 555, 558, 559, 562, 563, - 571, 572, 573, 574, 575, 564, 565, 576, 578, 579, - 580, 566, 581, 582, 583, 577, 551, 560, 567, 568, - 569, 561, 584, 570, 585, 586, 587, 588, 589, 590, - 571, 572, 573, 574, 575, 591, 597, 576, 578, 579, - 580, 532, 581, 582, 583, 577, 527, 528, 529, 527, + 436, 541, 542, 543, 544, 744, 545, 546, 547, 548, + 429, 744, 429, 549, 550, 429, 551, 552, 553, 554, + 744, 539, 557, 558, 555, 560, 563, 564, 536, 538, + 565, 541, 542, 543, 544, 540, 545, 546, 547, 548, + 183, 429, 561, 549, 550, 340, 551, 552, 553, 554, + 556, 539, 557, 558, 566, 560, 563, 564, 567, 568, + 565, 569, 570, 571, 572, 540, 573, 574, 575, 576, + 577, 578, 561, 579, 580, 581, 584, 582, 585, 586, + 556, 587, 588, 589, 566, 583, 590, 591, 567, 568, + 592, 569, 570, 571, 572, 593, 573, 574, 575, 576, - 592, 424, 584, 598, 585, 586, 587, 588, 589, 590, - 595, 599, 593, 595, 600, 591, 597, 550, 602, 737, - 737, 603, 181, 604, 605, 606, 607, 608, 609, 611, - 613, 553, 594, 598, 553, 737, 615, 614, 616, 617, - 618, 599, 593, 610, 619, 620, 621, 425, 602, 601, - 425, 603, 596, 604, 605, 606, 607, 608, 609, 611, - 613, 622, 594, 623, 624, 612, 615, 614, 616, 617, - 618, 625, 626, 610, 619, 620, 621, 627, 628, 601, - 629, 630, 596, 631, 632, 633, 634, 635, 636, 637, - 638, 622, 639, 623, 624, 612, 640, 641, 642, 643, + 577, 578, 594, 579, 580, 581, 584, 582, 585, 586, + 595, 587, 588, 589, 596, 583, 590, 591, 597, 603, + 592, 532, 533, 534, 532, 593, 537, 601, 604, 605, + 601, 606, 594, 608, 609, 610, 555, 744, 611, 183, + 595, 612, 744, 613, 596, 614, 615, 599, 597, 603, + 617, 618, 559, 620, 621, 559, 744, 622, 604, 605, + 623, 624, 616, 608, 609, 610, 607, 600, 611, 602, + 625, 612, 429, 613, 626, 614, 615, 599, 627, 628, + 617, 618, 629, 620, 621, 630, 619, 622, 631, 632, + 623, 624, 616, 633, 634, 635, 607, 600, 636, 602, - 600, 625, 626, 645, 600, 737, 646, 627, 628, 737, - 629, 630, 647, 631, 632, 633, 634, 635, 636, 637, - 638, 648, 639, 649, 650, 651, 640, 641, 642, 643, - 652, 653, 655, 645, 656, 644, 646, 657, 658, 644, - 659, 660, 647, 661, 662, 663, 664, 665, 666, 667, - 668, 648, 669, 649, 650, 651, 670, 671, 672, 673, - 652, 653, 655, 674, 656, 644, 676, 657, 658, 644, - 659, 660, 677, 661, 662, 663, 664, 665, 666, 667, - 668, 678, 669, 679, 680, 681, 670, 671, 672, 673, - 682, 683, 684, 685, 686, 675, 676, 687, 688, 689, + 625, 637, 638, 639, 626, 640, 641, 642, 627, 628, + 643, 644, 629, 645, 646, 630, 619, 647, 631, 632, + 648, 649, 650, 633, 634, 635, 606, 652, 636, 606, + 653, 637, 638, 639, 744, 640, 641, 642, 654, 655, + 643, 644, 656, 645, 646, 657, 658, 647, 659, 660, + 648, 649, 650, 662, 663, 664, 665, 652, 666, 667, + 653, 651, 668, 669, 651, 670, 671, 672, 654, 655, + 673, 674, 656, 675, 676, 657, 658, 677, 659, 660, + 678, 679, 680, 662, 663, 664, 665, 681, 666, 667, + 683, 651, 668, 669, 651, 670, 671, 672, 684, 685, - 690, 691, 677, 674, 693, 737, 694, 695, 696, 697, - 698, 678, 699, 679, 680, 681, 700, 704, 702, 705, - 682, 683, 684, 685, 686, 675, 706, 687, 688, 689, - 690, 691, 707, 709, 693, 692, 694, 695, 696, 697, - 698, 703, 699, 700, 700, 711, 702, 704, 737, 705, - 713, 701, 714, 715, 707, 708, 706, 717, 718, 719, - 720, 707, 721, 709, 722, 692, 723, 724, 725, 712, - 726, 703, 727, 728, 729, 711, 730, 716, 710, 710, - 713, 701, 714, 715, 716, 708, 731, 717, 718, 719, - 720, 732, 721, 733, 722, 734, 723, 724, 725, 712, + 673, 674, 686, 675, 676, 687, 688, 677, 689, 690, + 678, 679, 680, 691, 692, 693, 694, 695, 696, 682, + 683, 697, 698, 681, 700, 744, 701, 702, 684, 685, + 703, 704, 686, 705, 706, 687, 688, 707, 689, 690, + 711, 712, 709, 691, 692, 693, 694, 695, 696, 682, + 713, 697, 698, 714, 700, 699, 701, 702, 716, 707, + 703, 704, 707, 705, 706, 710, 718, 709, 720, 721, + 711, 712, 708, 722, 724, 725, 715, 714, 714, 726, + 713, 727, 728, 729, 730, 699, 731, 732, 716, 733, + 719, 734, 735, 736, 717, 710, 718, 717, 720, 721, - 726, 735, 727, 728, 729, 736, 730, 716, 710, 710, - 737, 737, 737, 737, 716, 737, 731, 737, 737, 737, - 737, 732, 737, 733, 737, 734, 737, 737, 737, 737, - 737, 735, 737, 737, 737, 736, 76, 76, 76, 76, - 76, 80, 80, 80, 80, 80, 59, 59, 59, 59, - 59, 97, 97, 97, 97, 97, 104, 104, 104, 104, - 104, 112, 112, 112, 112, 112, 125, 125, 125, 125, - 125, 132, 132, 132, 132, 132, 136, 737, 136, 136, - 136, 138, 737, 138, 139, 737, 139, 139, 139, 141, - 737, 141, 141, 141, 144, 737, 144, 180, 180, 180, + 723, 723, 708, 722, 724, 725, 715, 737, 738, 726, + 739, 727, 728, 729, 730, 740, 731, 732, 741, 733, + 719, 734, 735, 736, 717, 742, 743, 717, 744, 744, + 723, 723, 744, 744, 744, 744, 744, 737, 738, 744, + 739, 744, 744, 744, 744, 740, 744, 744, 741, 744, + 744, 744, 744, 744, 744, 742, 743, 77, 77, 77, + 77, 77, 81, 81, 81, 81, 81, 60, 60, 60, + 60, 60, 98, 98, 98, 98, 98, 105, 105, 105, + 105, 105, 113, 113, 113, 113, 113, 126, 126, 126, + 126, 126, 133, 133, 133, 133, 133, 137, 744, 137, - 188, 737, 188, 216, 216, 216, 216, 216, 221, 737, - 221, 221, 221, 223, 737, 223, 223, 223, 225, 225, - 225, 225, 225, 270, 270, 270, 329, 329, 329, 329, - 329, 333, 333, 333, 333, 333, 336, 737, 336, 336, - 336, 375, 737, 375, 422, 737, 422, 423, 423, 423, - 423, 423, 23, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, + 137, 137, 139, 744, 139, 140, 744, 140, 140, 140, + 142, 744, 142, 142, 142, 145, 744, 145, 182, 182, + 182, 190, 744, 190, 218, 218, 218, 218, 218, 223, + 744, 223, 223, 223, 225, 744, 225, 225, 225, 227, + 227, 227, 227, 227, 273, 273, 273, 332, 332, 332, + 332, 332, 336, 336, 336, 336, 336, 339, 744, 339, + 339, 339, 379, 744, 379, 426, 744, 426, 427, 427, + 427, 427, 427, 23, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737 + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744 } ; -static yyconst flex_int16_t yy_chk[2035] = +static const flex_int16_t yy_chk[2056] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -932,10 +913,10 @@ static yyconst flex_int16_t yy_chk[2035] = 1, 2, 40, 2, 34, 34, 34, 34, 34, 34, 34, 34, 36, 37, 42, 43, 44, 37, 45, 36, - 48, 49, 52, 67, 2, 55, 55, 55, 55, 117, - 117, 758, 40, 65, 65, 65, 65, 65, 65, 65, - 65, 757, 36, 37, 42, 43, 44, 37, 45, 36, - 48, 49, 52, 67, 2, 3, 3, 3, 3, 3, + 48, 49, 51, 53, 2, 56, 56, 56, 56, 118, + 118, 765, 40, 66, 66, 66, 66, 66, 66, 66, + 66, 764, 36, 37, 42, 43, 44, 37, 45, 36, + 48, 49, 51, 53, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -946,205 +927,207 @@ static yyconst flex_int16_t yy_chk[2035] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, - 8, 8, 7, 614, 57, 456, 8, 11, 11, 11, - 11, 430, 70, 71, 11, 11, 57, 11, 12, 12, - 12, 12, 215, 215, 68, 12, 12, 68, 12, 15, - 15, 15, 15, 15, 401, 15, 428, 5, 336, 15, - 270, 6, 70, 71, 269, 7, 57, 88, 92, 8, - 9, 9, 9, 9, 9, 51, 9, 233, 11, 224, - 16, 16, 16, 16, 16, 38, 16, 223, 38, 12, + 8, 8, 7, 621, 58, 461, 8, 11, 11, 11, + 11, 434, 68, 71, 11, 11, 58, 11, 12, 12, + 12, 12, 217, 217, 69, 12, 12, 69, 12, 15, + 15, 15, 15, 15, 405, 15, 432, 5, 339, 15, + 273, 6, 68, 71, 272, 7, 58, 72, 89, 8, + 9, 9, 9, 9, 9, 52, 9, 235, 11, 226, + 16, 16, 16, 16, 16, 38, 16, 225, 38, 12, - 16, 222, 110, 221, 9, 110, 9, 88, 92, 25, - 15, 212, 25, 94, 9, 9, 428, 9, 51, 38, - 95, 9, 9, 19, 19, 19, 19, 9, 216, 216, - 180, 9, 9, 38, 9, 25, 9, 20, 20, 20, - 20, 16, 46, 94, 9, 9, 46, 9, 51, 38, - 95, 9, 9, 47, 177, 46, 50, 9, 10, 10, - 10, 10, 10, 38, 10, 25, 122, 47, 50, 122, - 142, 50, 46, 47, 19, 141, 46, 89, 56, 219, - 219, 56, 10, 47, 10, 46, 50, 60, 20, 145, - 60, 89, 10, 10, 146, 10, 89, 47, 50, 10, + 16, 224, 111, 223, 9, 111, 9, 72, 89, 25, + 15, 214, 25, 93, 9, 9, 432, 9, 52, 38, + 95, 9, 9, 19, 19, 19, 19, 9, 218, 218, + 182, 9, 9, 38, 9, 25, 9, 20, 20, 20, + 20, 16, 46, 93, 9, 9, 46, 9, 52, 38, + 95, 9, 9, 47, 179, 46, 50, 9, 10, 10, + 10, 10, 10, 38, 10, 25, 123, 47, 50, 123, + 143, 50, 46, 47, 19, 142, 46, 90, 57, 221, + 221, 57, 10, 47, 10, 46, 50, 61, 20, 96, + 61, 90, 10, 10, 146, 10, 90, 47, 50, 10, - 10, 50, 148, 47, 56, 10, 140, 89, 139, 10, - 10, 153, 10, 60, 10, 75, 75, 75, 75, 145, - 137, 89, 10, 10, 146, 10, 89, 136, 187, 10, - 10, 187, 148, 155, 56, 10, 13, 13, 13, 13, - 13, 153, 77, 60, 116, 77, 115, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 79, 79, - 79, 79, 13, 155, 58, 58, 58, 58, 77, 84, - 84, 84, 84, 81, 85, 98, 81, 85, 98, 103, - 103, 103, 103, 111, 111, 111, 111, 13, 58, 225, - 225, 90, 13, 14, 14, 14, 14, 14, 77, 81, + 10, 50, 147, 47, 57, 10, 141, 90, 140, 10, + 10, 149, 10, 61, 10, 76, 76, 76, 76, 96, + 138, 90, 10, 10, 146, 10, 90, 137, 189, 10, + 10, 189, 147, 154, 57, 10, 13, 13, 13, 13, + 13, 149, 78, 61, 117, 78, 116, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 80, 80, + 80, 80, 13, 154, 59, 59, 59, 59, 78, 85, + 85, 85, 85, 82, 86, 99, 82, 86, 99, 104, + 104, 104, 104, 112, 112, 112, 112, 13, 59, 227, + 227, 91, 13, 14, 14, 14, 14, 14, 78, 82, - 85, 98, 58, 72, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 227, 227, 64, 58, 14, - 118, 118, 118, 118, 91, 93, 91, 93, 156, 81, - 85, 98, 58, 105, 453, 119, 105, 453, 119, 230, - 230, 157, 91, 93, 14, 128, 128, 128, 128, 14, - 17, 17, 17, 17, 91, 93, 91, 93, 156, 105, - 17, 119, 17, 17, 17, 17, 17, 17, 17, 17, - 150, 157, 91, 93, 150, 158, 17, 17, 133, 133, - 133, 133, 329, 329, 63, 113, 113, 113, 113, 105, - 62, 119, 135, 135, 135, 135, 160, 17, 331, 331, + 86, 99, 59, 73, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 229, 229, 65, 59, 14, + 119, 119, 119, 119, 92, 94, 92, 94, 156, 82, + 86, 99, 59, 106, 458, 120, 106, 458, 120, 232, + 232, 157, 92, 94, 14, 129, 129, 129, 129, 14, + 17, 17, 17, 17, 92, 94, 92, 94, 156, 106, + 17, 120, 17, 17, 17, 17, 17, 17, 17, 17, + 151, 157, 92, 94, 151, 158, 17, 17, 134, 134, + 134, 134, 332, 332, 64, 114, 114, 114, 114, 106, + 63, 120, 136, 136, 136, 136, 159, 17, 334, 334, - 150, 17, 333, 333, 150, 158, 17, 17, 335, 335, - 31, 113, 121, 121, 121, 121, 121, 121, 121, 121, - 126, 130, 134, 126, 130, 134, 160, 17, 21, 21, + 151, 17, 336, 336, 151, 158, 17, 17, 338, 338, + 31, 114, 122, 122, 122, 122, 122, 122, 122, 122, + 127, 131, 135, 127, 131, 135, 159, 17, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 113, 147, 151, 147, 151, 126, 130, 134, 332, - 332, 21, 21, 123, 123, 123, 123, 123, 123, 123, - 123, 123, 123, 143, 143, 143, 143, 143, 143, 143, - 143, 161, 147, 151, 147, 151, 126, 130, 134, 21, + 21, 114, 148, 152, 148, 152, 127, 131, 135, 335, + 335, 21, 21, 124, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 144, 144, 144, 144, 144, 144, 144, + 144, 161, 148, 152, 148, 152, 127, 131, 135, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 152, 162, 163, 332, + 22, 22, 22, 22, 22, 22, 153, 162, 163, 335, - 165, 161, 152, 166, 30, 28, 22, 22, 175, 175, - 175, 175, 179, 179, 179, 179, 595, 23, 159, 595, - 167, 168, 169, 170, 0, 173, 152, 162, 163, 159, - 165, 0, 152, 166, 22, 22, 22, 22, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 159, 164, - 167, 168, 169, 170, 39, 173, 164, 0, 0, 159, - 39, 178, 186, 0, 178, 186, 182, 183, 183, 183, - 183, 189, 182, 220, 220, 220, 220, 0, 0, 164, - 182, 172, 191, 190, 39, 172, 164, 178, 186, 190, - 39, 53, 53, 53, 53, 53, 53, 53, 53, 53, + 164, 161, 153, 166, 30, 28, 22, 22, 177, 177, + 177, 177, 181, 181, 181, 181, 601, 23, 160, 601, + 167, 168, 169, 170, 0, 171, 153, 162, 163, 160, + 164, 172, 153, 166, 22, 22, 22, 22, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 160, 165, + 167, 168, 169, 170, 39, 171, 165, 175, 0, 160, + 39, 172, 180, 0, 0, 180, 184, 185, 185, 185, + 185, 602, 184, 0, 602, 188, 0, 0, 188, 165, + 184, 174, 191, 192, 39, 174, 165, 175, 180, 192, + 39, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 53, 189, 182, 53, 53, 53, 53, 53, 53, 0, - 182, 172, 191, 190, 0, 172, 0, 178, 186, 190, - 193, 194, 199, 196, 423, 423, 196, 197, 198, 200, - 197, 198, 201, 53, 53, 53, 53, 53, 53, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 196, - 193, 194, 199, 197, 198, 69, 202, 204, 205, 200, - 206, 69, 201, 213, 0, 0, 213, 273, 273, 273, - 273, 0, 207, 208, 423, 337, 337, 337, 337, 196, - 209, 210, 211, 197, 198, 69, 202, 204, 205, 213, - 206, 69, 73, 73, 73, 73, 73, 73, 73, 73, + 54, 188, 184, 54, 54, 54, 54, 54, 54, 0, + 184, 174, 191, 192, 0, 174, 0, 0, 180, 192, + 193, 195, 196, 198, 0, 0, 198, 199, 201, 202, + 199, 188, 203, 54, 54, 54, 54, 54, 54, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 198, + 193, 195, 196, 199, 200, 70, 204, 200, 201, 202, + 206, 70, 203, 215, 0, 0, 215, 222, 222, 222, + 222, 0, 207, 208, 276, 276, 276, 276, 0, 198, + 200, 209, 210, 199, 211, 70, 204, 212, 213, 215, + 206, 70, 74, 74, 74, 74, 74, 74, 74, 74, - 73, 73, 207, 208, 73, 73, 73, 73, 73, 73, - 209, 210, 211, 386, 386, 386, 386, 386, 596, 213, - 0, 596, 0, 0, 214, 228, 337, 214, 228, 424, - 424, 0, 0, 0, 73, 73, 73, 73, 73, 73, - 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 214, 228, 203, 203, 203, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 203, 203, 203, 0, 424, - 214, 228, 203, 203, 203, 203, 203, 203, 203, 203, - 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 74, 74, 207, 208, 74, 74, 74, 74, 74, 74, + 200, 209, 210, 0, 211, 0, 0, 212, 213, 215, + 0, 0, 0, 0, 216, 230, 0, 216, 230, 390, + 390, 390, 390, 390, 74, 74, 74, 74, 74, 74, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 216, 230, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 0, 0, + 216, 230, 205, 205, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, - 203, 203, 203, 203, 203, 203, 203, 203, 217, 217, - 217, 217, 229, 229, 229, 229, 229, 229, 229, 229, - 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, - 237, 238, 239, 240, 217, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 259, 260, 261, 262, 263, 266, 267, 0, - 237, 238, 239, 240, 217, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 259, 260, 261, 262, 263, 266, 267, 271, - 272, 276, 277, 279, 280, 281, 282, 272, 283, 294, + 205, 205, 205, 205, 205, 205, 205, 205, 219, 219, + 219, 219, 231, 231, 231, 231, 231, 231, 231, 231, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 239, 240, 241, 242, 219, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 261, 262, 263, 264, 265, 266, 269, 270, + 239, 240, 241, 242, 219, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 261, 262, 263, 264, 265, 266, 269, 270, + 274, 275, 279, 280, 282, 283, 284, 285, 275, 286, - 295, 297, 296, 298, 301, 302, 298, 305, 298, 308, - 305, 297, 310, 313, 301, 271, 296, 0, 0, 0, - 0, 276, 277, 279, 280, 281, 282, 272, 283, 294, - 295, 297, 296, 298, 301, 302, 298, 305, 298, 308, - 305, 297, 310, 313, 301, 271, 296, 299, 299, 299, - 299, 299, 299, 299, 299, 299, 307, 314, 309, 311, - 312, 307, 309, 320, 309, 312, 311, 321, 322, 312, - 323, 324, 325, 312, 326, 327, 338, 340, 341, 0, - 344, 345, 346, 347, 348, 349, 307, 314, 309, 311, - 312, 307, 309, 320, 309, 312, 311, 321, 322, 312, + 297, 298, 300, 299, 301, 304, 305, 301, 308, 301, + 311, 308, 300, 313, 316, 304, 274, 299, 0, 0, + 0, 0, 279, 280, 282, 283, 284, 285, 275, 286, + 297, 298, 300, 299, 301, 304, 305, 301, 308, 301, + 311, 308, 300, 313, 316, 304, 274, 299, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 310, 317, 312, + 314, 315, 310, 312, 323, 312, 315, 314, 324, 325, + 315, 326, 327, 328, 315, 329, 330, 340, 340, 340, + 340, 341, 343, 344, 347, 348, 346, 310, 317, 312, + 314, 315, 310, 312, 323, 312, 315, 314, 324, 325, - 323, 324, 325, 312, 326, 327, 338, 340, 341, 343, - 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, - 354, 355, 357, 358, 360, 361, 362, 363, 364, 365, - 343, 366, 369, 0, 371, 373, 376, 377, 378, 377, - 379, 379, 379, 380, 343, 366, 350, 351, 352, 353, - 354, 355, 357, 358, 360, 361, 362, 363, 364, 365, - 343, 381, 369, 367, 371, 373, 376, 377, 378, 377, - 379, 379, 379, 380, 343, 366, 367, 382, 383, 384, - 385, 385, 385, 385, 385, 385, 385, 385, 385, 385, - 394, 381, 395, 382, 396, 397, 398, 0, 0, 0, + 315, 326, 327, 328, 315, 329, 330, 346, 349, 350, + 351, 341, 343, 344, 347, 348, 352, 353, 354, 355, + 356, 346, 357, 358, 360, 361, 363, 364, 340, 365, + 366, 367, 368, 369, 0, 373, 375, 346, 349, 350, + 351, 377, 380, 381, 370, 381, 352, 353, 354, 355, + 356, 346, 357, 358, 360, 361, 363, 364, 370, 365, + 366, 367, 368, 369, 371, 373, 375, 382, 383, 383, + 383, 377, 380, 381, 384, 381, 385, 371, 386, 387, + 388, 0, 0, 0, 0, 0, 0, 0, 370, 0, + 0, 398, 399, 400, 386, 401, 402, 382, 383, 383, - 0, 0, 0, 0, 0, 0, 367, 382, 383, 384, - 400, 402, 0, 403, 405, 406, 407, 408, 409, 410, - 394, 0, 395, 382, 396, 397, 398, 399, 399, 399, - 399, 399, 399, 399, 399, 399, 399, 411, 404, 412, - 400, 402, 399, 403, 405, 406, 407, 408, 409, 410, - 415, 399, 416, 417, 399, 404, 419, 399, 420, 421, - 425, 425, 425, 425, 429, 431, 433, 411, 404, 412, - 432, 434, 399, 426, 426, 426, 426, 435, 436, 437, - 415, 399, 416, 417, 399, 404, 419, 399, 420, 421, - 438, 432, 440, 442, 429, 431, 433, 443, 445, 446, + 383, 0, 0, 0, 384, 0, 385, 371, 386, 387, + 388, 389, 389, 389, 389, 389, 389, 389, 389, 389, + 389, 398, 399, 400, 386, 401, 402, 403, 403, 403, + 403, 403, 403, 403, 403, 403, 403, 404, 406, 407, + 409, 408, 403, 410, 411, 412, 413, 414, 415, 416, + 419, 403, 420, 421, 403, 423, 424, 403, 408, 425, + 427, 427, 428, 428, 0, 534, 534, 404, 406, 407, + 409, 408, 403, 410, 411, 412, 413, 414, 415, 416, + 419, 403, 420, 421, 403, 423, 424, 403, 408, 425, + 429, 429, 429, 429, 430, 430, 430, 430, 433, 435, - 447, 434, 448, 449, 452, 432, 0, 435, 436, 437, - 450, 425, 454, 455, 457, 455, 459, 461, 463, 464, - 438, 432, 440, 442, 426, 465, 466, 443, 445, 446, - 447, 468, 448, 449, 452, 432, 450, 462, 470, 471, - 488, 462, 454, 489, 457, 455, 459, 461, 463, 464, - 491, 492, 503, 504, 505, 465, 466, 506, 507, 509, - 510, 468, 511, 512, 513, 506, 450, 462, 470, 471, - 488, 462, 514, 489, 515, 516, 517, 518, 519, 522, - 491, 492, 503, 504, 505, 525, 534, 506, 507, 509, - 510, 532, 511, 512, 513, 506, 527, 527, 527, 527, + 436, 437, 438, 439, 440, 0, 441, 442, 444, 446, + 427, 0, 428, 447, 449, 534, 450, 451, 452, 453, + 0, 436, 456, 457, 454, 459, 462, 464, 433, 435, + 466, 437, 438, 439, 440, 436, 441, 442, 444, 446, + 460, 429, 460, 447, 449, 430, 450, 451, 452, 453, + 454, 436, 456, 457, 467, 459, 462, 464, 467, 468, + 466, 469, 470, 471, 473, 436, 475, 476, 493, 494, + 496, 497, 460, 508, 509, 510, 512, 511, 514, 515, + 454, 516, 517, 518, 467, 511, 519, 520, 467, 468, + 521, 469, 470, 471, 473, 522, 475, 476, 493, 494, - 529, 529, 514, 535, 515, 516, 517, 518, 519, 522, - 533, 536, 532, 533, 537, 525, 534, 550, 538, 0, - 0, 539, 555, 540, 541, 543, 545, 546, 547, 551, - 554, 553, 532, 535, 553, 0, 557, 555, 558, 559, - 560, 536, 532, 550, 563, 564, 565, 527, 538, 537, - 529, 539, 533, 540, 541, 543, 545, 546, 547, 551, - 554, 567, 532, 568, 570, 553, 557, 555, 558, 559, - 560, 571, 573, 550, 563, 564, 565, 574, 575, 537, - 576, 577, 533, 578, 579, 580, 583, 584, 585, 586, - 587, 567, 588, 568, 570, 553, 589, 593, 594, 597, + 496, 497, 523, 508, 509, 510, 512, 511, 514, 515, + 524, 516, 517, 518, 527, 511, 519, 520, 530, 539, + 521, 532, 532, 532, 532, 522, 537, 538, 540, 541, + 538, 542, 523, 543, 544, 545, 555, 0, 546, 561, + 524, 548, 0, 550, 527, 551, 552, 537, 530, 539, + 556, 558, 559, 560, 561, 559, 0, 563, 540, 541, + 564, 565, 555, 543, 544, 545, 542, 537, 546, 538, + 566, 548, 532, 550, 569, 551, 552, 537, 570, 571, + 556, 558, 573, 560, 561, 574, 559, 563, 576, 577, + 564, 565, 555, 579, 580, 581, 542, 537, 582, 538, - 598, 571, 573, 599, 600, 0, 601, 574, 575, 0, - 576, 577, 603, 578, 579, 580, 583, 584, 585, 586, - 587, 605, 588, 606, 608, 610, 589, 593, 594, 597, - 611, 612, 617, 599, 618, 598, 601, 621, 624, 600, - 627, 628, 603, 629, 630, 631, 633, 637, 641, 642, - 643, 605, 644, 606, 608, 610, 645, 646, 647, 648, - 611, 612, 617, 650, 618, 598, 651, 621, 624, 600, - 627, 628, 652, 629, 630, 631, 633, 637, 641, 642, - 643, 653, 644, 655, 656, 657, 645, 646, 647, 648, - 659, 661, 663, 666, 667, 650, 651, 668, 669, 670, + 566, 583, 584, 585, 569, 586, 589, 590, 570, 571, + 591, 592, 573, 593, 594, 574, 559, 595, 576, 577, + 599, 600, 603, 579, 580, 581, 604, 605, 582, 606, + 607, 583, 584, 585, 0, 586, 589, 590, 609, 611, + 591, 592, 612, 593, 594, 614, 616, 595, 617, 619, + 599, 600, 603, 624, 625, 628, 631, 605, 634, 635, + 607, 604, 636, 637, 606, 638, 640, 644, 609, 611, + 648, 649, 612, 650, 651, 614, 616, 652, 617, 619, + 653, 654, 655, 624, 625, 628, 631, 657, 634, 635, + 658, 604, 636, 637, 606, 638, 640, 644, 659, 660, - 671, 673, 652, 674, 675, 0, 676, 677, 678, 686, - 687, 653, 688, 655, 656, 657, 689, 692, 691, 693, - 659, 661, 663, 666, 667, 650, 694, 668, 669, 670, - 671, 673, 695, 697, 675, 674, 676, 677, 678, 686, - 687, 691, 688, 698, 700, 701, 702, 692, 0, 693, - 703, 689, 704, 705, 706, 695, 694, 708, 709, 710, - 711, 707, 712, 697, 713, 674, 714, 715, 716, 702, - 717, 691, 719, 721, 722, 701, 723, 706, 698, 700, - 703, 689, 704, 705, 707, 695, 724, 708, 709, 710, - 711, 725, 712, 726, 713, 728, 714, 715, 716, 702, + 648, 649, 662, 650, 651, 663, 664, 652, 666, 668, + 653, 654, 655, 670, 673, 674, 675, 676, 677, 657, + 658, 678, 680, 681, 682, 0, 683, 684, 659, 660, + 685, 693, 662, 694, 695, 663, 664, 696, 666, 668, + 699, 700, 698, 670, 673, 674, 675, 676, 677, 657, + 701, 678, 680, 702, 682, 681, 683, 684, 704, 705, + 685, 693, 707, 694, 695, 698, 708, 709, 710, 711, + 699, 700, 696, 712, 715, 716, 702, 713, 714, 717, + 701, 718, 719, 720, 721, 681, 722, 723, 704, 724, + 709, 726, 728, 729, 705, 698, 708, 707, 710, 711, - 717, 730, 719, 721, 722, 732, 723, 706, 698, 700, - 0, 0, 0, 0, 707, 0, 724, 0, 0, 0, - 0, 725, 0, 726, 0, 728, 0, 0, 0, 0, - 0, 730, 0, 0, 0, 732, 738, 738, 738, 738, - 738, 739, 739, 739, 739, 739, 740, 740, 740, 740, - 740, 741, 741, 741, 741, 741, 742, 742, 742, 742, - 742, 743, 743, 743, 743, 743, 744, 744, 744, 744, - 744, 745, 745, 745, 745, 745, 746, 0, 746, 746, - 746, 747, 0, 747, 748, 0, 748, 748, 748, 749, - 0, 749, 749, 749, 750, 0, 750, 751, 751, 751, + 713, 714, 696, 712, 715, 716, 702, 730, 731, 717, + 732, 718, 719, 720, 721, 733, 722, 723, 735, 724, + 709, 726, 728, 729, 705, 737, 739, 707, 0, 0, + 713, 714, 0, 0, 0, 0, 0, 730, 731, 0, + 732, 0, 0, 0, 0, 733, 0, 0, 735, 0, + 0, 0, 0, 0, 0, 737, 739, 745, 745, 745, + 745, 745, 746, 746, 746, 746, 746, 747, 747, 747, + 747, 747, 748, 748, 748, 748, 748, 749, 749, 749, + 749, 749, 750, 750, 750, 750, 750, 751, 751, 751, + 751, 751, 752, 752, 752, 752, 752, 753, 0, 753, - 752, 0, 752, 753, 753, 753, 753, 753, 754, 0, - 754, 754, 754, 755, 0, 755, 755, 755, 756, 756, - 756, 756, 756, 759, 759, 759, 760, 760, 760, 760, - 760, 761, 761, 761, 761, 761, 762, 0, 762, 762, - 762, 763, 0, 763, 764, 0, 764, 765, 765, 765, - 765, 765, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, + 753, 753, 754, 0, 754, 755, 0, 755, 755, 755, + 756, 0, 756, 756, 756, 757, 0, 757, 758, 758, + 758, 759, 0, 759, 760, 760, 760, 760, 760, 761, + 0, 761, 761, 761, 762, 0, 762, 762, 762, 763, + 763, 763, 763, 763, 766, 766, 766, 767, 767, 767, + 767, 767, 768, 768, 768, 768, 768, 769, 0, 769, + 769, 769, 770, 0, 770, 771, 0, 771, 772, 772, + 772, 772, 772, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737, 737, 737, 737, 737, 737, 737, - 737, 737, 737, 737 + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 744, 744, 744, 744, 744 } ; static yy_state_type yy_last_accepting_state; @@ -1198,17 +1181,9 @@ int yyterminate(void) return YY_NULL; } +#line 1185 "lex.c" - - - - - - - - - -#line 1212 "lex.c" +#line 1187 "lex.c" #define INITIAL 0 #define STOR 1 @@ -1234,36 +1209,36 @@ int yyterminate(void) #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * _in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * _out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int _line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1271,32 +1246,31 @@ void yyset_lineno (int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif #ifndef YY_NO_UNPUT - static void yyunput (int c,char *buf_ptr ); + static void yyunput ( int c, char *buf_ptr ); #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif @@ -1316,7 +1290,7 @@ static int input (void ); /* 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 /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1327,7 +1301,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1340,7 +1314,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1432,17 +1406,17 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { #line 53 "../../kmflcomp/src/lex.l" -#line 1446 "lex.c" +#line 1420 "lex.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1470,13 +1444,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 745 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1953 ); + while ( yy_base[yy_current_state] != 1974 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1601,87 +1575,87 @@ YY_RULE_SETUP case 17: YY_RULE_SETUP #line 77 "../../kmflcomp/src/lex.l" -{return TOK_ANSI;} +{return TOK_TARGETS;} YY_BREAK case 18: YY_RULE_SETUP #line 78 "../../kmflcomp/src/lex.l" -{return TOK_UNICODE;} +{return TOK_ANSI;} YY_BREAK case 19: YY_RULE_SETUP #line 79 "../../kmflcomp/src/lex.l" -{return TOK_ANSI;} +{return TOK_UNICODE;} YY_BREAK case 20: YY_RULE_SETUP #line 80 "../../kmflcomp/src/lex.l" -{caller=STOR;BEGIN(STOR);return TOK_STORE;} +{return TOK_ANSI;} YY_BREAK case 21: YY_RULE_SETUP #line 81 "../../kmflcomp/src/lex.l" -{return TOK_OUTS;} +{caller=STOR;BEGIN(STOR);return TOK_STORE;} YY_BREAK case 22: YY_RULE_SETUP #line 82 "../../kmflcomp/src/lex.l" -{return TOK_GROUP;} +{return TOK_OUTS;} YY_BREAK case 23: YY_RULE_SETUP #line 83 "../../kmflcomp/src/lex.l" -{return TOK_USINGKEYS;} +{return TOK_GROUP;} YY_BREAK case 24: YY_RULE_SETUP #line 84 "../../kmflcomp/src/lex.l" -{return TOK_USE;} +{return TOK_USINGKEYS;} YY_BREAK case 25: YY_RULE_SETUP #line 85 "../../kmflcomp/src/lex.l" -{return TOK_CONTEXT;} +{return TOK_USE;} YY_BREAK case 26: YY_RULE_SETUP #line 86 "../../kmflcomp/src/lex.l" -{return TOK_ANY;} +{return TOK_CONTEXT;} YY_BREAK case 27: YY_RULE_SETUP #line 87 "../../kmflcomp/src/lex.l" -{return TOK_NOTANY;} +{return TOK_ANY;} YY_BREAK case 28: YY_RULE_SETUP #line 88 "../../kmflcomp/src/lex.l" -{return TOK_BEEP;} +{return TOK_NOTANY;} YY_BREAK case 29: YY_RULE_SETUP #line 89 "../../kmflcomp/src/lex.l" -{BEGIN(PLIST);return TOK_INDEX;} +{return TOK_BEEP;} YY_BREAK case 30: YY_RULE_SETUP #line 90 "../../kmflcomp/src/lex.l" -{return TOK_NOMATCH;} +{BEGIN(PLIST);return TOK_INDEX;} YY_BREAK case 31: YY_RULE_SETUP #line 91 "../../kmflcomp/src/lex.l" -{return TOK_MATCH;} +{return TOK_NOMATCH;} YY_BREAK case 32: YY_RULE_SETUP #line 92 "../../kmflcomp/src/lex.l" -{return TOK_NUL;} +{return TOK_MATCH;} YY_BREAK case 33: YY_RULE_SETUP #line 93 "../../kmflcomp/src/lex.l" -{return TOK_DEADKEY;} +{return TOK_NUL;} YY_BREAK case 34: YY_RULE_SETUP @@ -1691,54 +1665,51 @@ YY_RULE_SETUP case 35: YY_RULE_SETUP #line 95 "../../kmflcomp/src/lex.l" -{return TOK_RTN;} +{return TOK_DEADKEY;} YY_BREAK case 36: YY_RULE_SETUP #line 96 "../../kmflcomp/src/lex.l" -{return TOK_CALL; /* not implemented */} +{return TOK_RTN;} YY_BREAK case 37: YY_RULE_SETUP #line 97 "../../kmflcomp/src/lex.l" -{return TOK_SWITCH;/* (obsolete) */} +{return TOK_CALL; /* not implemented */} YY_BREAK case 38: YY_RULE_SETUP #line 98 "../../kmflcomp/src/lex.l" -{return TOK_GT;} +{return TOK_SWITCH;/* (obsolete) */} YY_BREAK case 39: YY_RULE_SETUP #line 99 "../../kmflcomp/src/lex.l" -{return TOK_PLUS;} +{return TOK_GT;} YY_BREAK case 40: +YY_RULE_SETUP +#line 100 "../../kmflcomp/src/lex.l" +{return TOK_PLUS;} + YY_BREAK +case 41: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 100 "../../kmflcomp/src/lex.l" +#line 101 "../../kmflcomp/src/lex.l" {BEGIN(NAME);return TOK_DOLLAR;} YY_BREAK -case 41: -YY_RULE_SETUP -#line 103 "../../kmflcomp/src/lex.l" -{/* ignore spaces */} - YY_BREAK case 42: YY_RULE_SETUP #line 104 "../../kmflcomp/src/lex.l" -{BEGIN(SKIP);} +{/* ignore spaces */} YY_BREAK case 43: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 105 "../../kmflcomp/src/lex.l" -{BEGIN(PARENS);return(TOK_BRKT);} +{BEGIN(SKIP);} YY_BREAK case 44: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ @@ -1746,7 +1717,7 @@ case 44: YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 106 "../../kmflcomp/src/lex.l" -{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{BEGIN(PARENS);return(TOK_BRKT);} YY_BREAK case 45: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ @@ -1754,45 +1725,48 @@ case 45: YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 107 "../../kmflcomp/src/lex.l" -{qchar='"';BEGIN(QUOTE);return(TOK_QM);} +{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 46: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 108 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext,NULL,8);return(TOK_NUMBER);} +{qchar='"';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 47: YY_RULE_SETUP #line 109 "../../kmflcomp/src/lex.l" -{yylval.number=atoi(yytext+1);return(TOK_NUMBER);} +{yylval.number=strtol(yytext,NULL,8);return(TOK_NUMBER);} YY_BREAK case 48: YY_RULE_SETUP #line 110 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext+1,NULL,16);return(TOK_NUMBER);} +{yylval.number=atoi(yytext+1);return(TOK_NUMBER);} YY_BREAK case 49: YY_RULE_SETUP #line 111 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext+2,NULL,16);return(TOK_NUMBER);} +{yylval.number=strtol(yytext+1,NULL,16);return(TOK_NUMBER);} YY_BREAK case 50: YY_RULE_SETUP #line 112 "../../kmflcomp/src/lex.l" -{BEGIN(KEYNAME);return(TOK_SB);} +{yylval.number=strtol(yytext+2,NULL,16);return(TOK_NUMBER);} YY_BREAK case 51: YY_RULE_SETUP #line 113 "../../kmflcomp/src/lex.l" +{BEGIN(KEYNAME);return(TOK_SB);} + YY_BREAK +case 52: +YY_RULE_SETUP +#line 114 "../../kmflcomp/src/lex.l" {return(TOK_BEEP);} YY_BREAK -case 52: -YY_RULE_SETUP -#line 117 "../../kmflcomp/src/lex.l" -{return(TOK_DEADKEY);} - YY_BREAK case 53: YY_RULE_SETUP #line 118 "../../kmflcomp/src/lex.l" @@ -1801,52 +1775,52 @@ YY_RULE_SETUP case 54: YY_RULE_SETUP #line 119 "../../kmflcomp/src/lex.l" -{return(TOK_OUTS);} +{return(TOK_DEADKEY);} YY_BREAK case 55: YY_RULE_SETUP #line 120 "../../kmflcomp/src/lex.l" -{return(TOK_NUL);} +{return(TOK_OUTS);} YY_BREAK case 56: YY_RULE_SETUP #line 121 "../../kmflcomp/src/lex.l" +{return(TOK_NUL);} + YY_BREAK +case 57: +YY_RULE_SETUP +#line 122 "../../kmflcomp/src/lex.l" {return(TOK_ERROR);} YY_BREAK -case 57: +case 58: YY_RULE_SETUP -#line 125 "../../kmflcomp/src/lex.l" +#line 126 "../../kmflcomp/src/lex.l" {/* ignore spaces */} YY_BREAK -case 58: +case 59: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 126 "../../kmflcomp/src/lex.l" +#line 127 "../../kmflcomp/src/lex.l" {/* ignore comments */} YY_BREAK -case 59: -/* rule 59 can match eol */ +case 60: +/* rule 60 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 127 "../../kmflcomp/src/lex.l" -{/* before either EOL */} - YY_BREAK -case 60: -YY_RULE_SETUP #line 128 "../../kmflcomp/src/lex.l" -{return TOK_QM;} +{/* before either EOL */} YY_BREAK case 61: YY_RULE_SETUP #line 129 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return TOK_CHAR;} +{return TOK_QM;} YY_BREAK case 62: YY_RULE_SETUP @@ -1856,35 +1830,32 @@ YY_RULE_SETUP case 63: YY_RULE_SETUP #line 131 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return TOK_CHAR;} + YY_BREAK +case 64: +YY_RULE_SETUP +#line 132 "../../kmflcomp/src/lex.l" {BEGIN(SKIP);} YY_BREAK -case 64: +case 65: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 135 "../../kmflcomp/src/lex.l" +#line 136 "../../kmflcomp/src/lex.l" {/* ignore anything after a space */} YY_BREAK -case 65: -/* rule 65 can match eol */ +case 66: +/* rule 66 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 136 "../../kmflcomp/src/lex.l" -{/* including comments */} - YY_BREAK -case 66: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP #line 137 "../../kmflcomp/src/lex.l" -{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{/* including comments */} YY_BREAK case 67: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ @@ -1892,81 +1863,89 @@ case 67: YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 138 "../../kmflcomp/src/lex.l" -{qchar='"';BEGIN(QUOTE);return(TOK_QM);} +{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 68: -YY_RULE_SETUP -#line 139 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return TOK_CHAR;} - YY_BREAK -case 69: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; +(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP +#line 139 "../../kmflcomp/src/lex.l" +{qchar='"';BEGIN(QUOTE);return(TOK_QM);} + YY_BREAK +case 69: +YY_RULE_SETUP #line 140 "../../kmflcomp/src/lex.l" -{/* also ignore anything after a comma */} +{yylval.number=*yytext;return TOK_CHAR;} YY_BREAK case 70: -/* rule 70 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 141 "../../kmflcomp/src/lex.l" -{/* before either EOL */} +{/* also ignore anything after a comma */} YY_BREAK - - case 71: -YY_RULE_SETUP -#line 145 "../../kmflcomp/src/lex.l" -{/* ignore spaces */} - YY_BREAK -case 72: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP -#line 146 "../../kmflcomp/src/lex.l" -{/* ignore comments */} - YY_BREAK -case 73: -/* rule 73 can match eol */ +/* rule 71 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 147 "../../kmflcomp/src/lex.l" +#line 142 "../../kmflcomp/src/lex.l" {/* before either EOL */} YY_BREAK + + +case 72: +YY_RULE_SETUP +#line 146 "../../kmflcomp/src/lex.l" +{/* ignore spaces */} + YY_BREAK +case 73: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 147 "../../kmflcomp/src/lex.l" +{/* ignore comments */} + YY_BREAK case 74: +/* rule 74 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 148 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext,NULL,8);return(TOK_NUMBER);} +{/* before either EOL */} YY_BREAK case 75: YY_RULE_SETUP #line 149 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext+1,NULL,10);return(TOK_NUMBER);} +{yylval.number=strtoul(yytext,NULL,8);return(TOK_NUMBER);} YY_BREAK case 76: YY_RULE_SETUP #line 150 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext+1,NULL,16);return(TOK_NUMBER);} +{yylval.number=strtoul(yytext+1,NULL,10);return(TOK_NUMBER);} YY_BREAK case 77: YY_RULE_SETUP #line 151 "../../kmflcomp/src/lex.l" +{yylval.number=strtoul(yytext+1,NULL,16);return(TOK_NUMBER);} + YY_BREAK +case 78: +YY_RULE_SETUP +#line 152 "../../kmflcomp/src/lex.l" {/* ignore comma separator */} YY_BREAK -case 78: +case 79: YY_RULE_SETUP -#line 155 "../../kmflcomp/src/lex.l" +#line 156 "../../kmflcomp/src/lex.l" {if (*yytext==qchar) {BEGIN(caller);return(TOK_QM);} else @@ -1975,702 +1954,696 @@ YY_RULE_SETUP YY_BREAK -case 79: -YY_RULE_SETUP -#line 163 "../../kmflcomp/src/lex.l" - - YY_BREAK case 80: YY_RULE_SETUP #line 164 "../../kmflcomp/src/lex.l" -{BEGIN(caller);return(TOK_BRKT);} + YY_BREAK case 81: YY_RULE_SETUP #line 165 "../../kmflcomp/src/lex.l" +{BEGIN(caller);return(TOK_BRKT);} + YY_BREAK +case 82: +YY_RULE_SETUP +#line 166 "../../kmflcomp/src/lex.l" {yylval.number=*yytext;return(TOK_CHAR);} YY_BREAK -case 82: -YY_RULE_SETUP -#line 169 "../../kmflcomp/src/lex.l" -{/* ignore */} - YY_BREAK case 83: YY_RULE_SETUP #line 170 "../../kmflcomp/src/lex.l" -{ return(TOK_COMMA);} +{/* ignore */} YY_BREAK case 84: YY_RULE_SETUP #line 171 "../../kmflcomp/src/lex.l" -{ return(TOK_BRKT);} +{ return(TOK_COMMA);} YY_BREAK case 85: YY_RULE_SETUP #line 172 "../../kmflcomp/src/lex.l" -{BEGIN(caller);return(TOK_BRKT);} +{ return(TOK_BRKT);} YY_BREAK case 86: YY_RULE_SETUP #line 173 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return(TOK_CHAR);} +{BEGIN(caller);return(TOK_BRKT);} YY_BREAK - - case 87: YY_RULE_SETUP -#line 177 "../../kmflcomp/src/lex.l" +#line 174 "../../kmflcomp/src/lex.l" {yylval.number=*yytext;return(TOK_CHAR);} YY_BREAK + + case 88: YY_RULE_SETUP #line 178 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return(TOK_CHAR);} + YY_BREAK +case 89: +YY_RULE_SETUP +#line 179 "../../kmflcomp/src/lex.l" {BEGIN(caller);} YY_BREAK -case 89: -YY_RULE_SETUP -#line 182 "../../kmflcomp/src/lex.l" -{/* ignore */} - YY_BREAK case 90: YY_RULE_SETUP #line 183 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LSHIFT;return(TOK_SHIFT);} +{/* ignore */} YY_BREAK case 91: YY_RULE_SETUP #line 184 "../../kmflcomp/src/lex.l" -{yylval.number=KS_CAPS;return(TOK_SHIFT);} +{yylval.number=KS_LSHIFT;return(TOK_SHIFT);} YY_BREAK case 92: YY_RULE_SETUP #line 185 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LCTRL;return(TOK_SHIFT);} +{yylval.number=KS_CAPS;return(TOK_SHIFT);} YY_BREAK case 93: YY_RULE_SETUP #line 186 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LALT;return(TOK_SHIFT);} +{yylval.number=KS_LCTRL;return(TOK_SHIFT);} YY_BREAK case 94: YY_RULE_SETUP #line 187 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RSHIFT;return(TOK_SHIFT);} +{yylval.number=KS_LALT;return(TOK_SHIFT);} YY_BREAK case 95: YY_RULE_SETUP #line 188 "../../kmflcomp/src/lex.l" -{yylval.number=KS_NCAPS;return(TOK_SHIFT);} +{yylval.number=KS_RSHIFT;return(TOK_SHIFT);} YY_BREAK case 96: YY_RULE_SETUP #line 189 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RCTRL;return(TOK_SHIFT);} +{yylval.number=KS_NCAPS;return(TOK_SHIFT);} YY_BREAK case 97: YY_RULE_SETUP #line 190 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RALT;return(TOK_SHIFT);} +{yylval.number=KS_RCTRL;return(TOK_SHIFT);} YY_BREAK case 98: YY_RULE_SETUP #line 191 "../../kmflcomp/src/lex.l" -{yylval.number=KS_SHIFT;return(TOK_SHIFT);} +{yylval.number=KS_RALT;return(TOK_SHIFT);} YY_BREAK case 99: YY_RULE_SETUP #line 192 "../../kmflcomp/src/lex.l" -{yylval.number=KS_CTRL;return(TOK_SHIFT);} +{yylval.number=KS_SHIFT;return(TOK_SHIFT);} YY_BREAK case 100: YY_RULE_SETUP #line 193 "../../kmflcomp/src/lex.l" -{yylval.number=KS_ALT;return(TOK_SHIFT);} +{yylval.number=KS_CTRL;return(TOK_SHIFT);} YY_BREAK case 101: YY_RULE_SETUP -#line 195 "../../kmflcomp/src/lex.l" -{yylval.number=0x20;return(TOK_RAWKEY);} +#line 194 "../../kmflcomp/src/lex.l" +{yylval.number=KS_ALT;return(TOK_SHIFT);} YY_BREAK case 102: YY_RULE_SETUP #line 196 "../../kmflcomp/src/lex.l" -{yylval.number=0x27;return(TOK_RAWKEY);} +{yylval.number=0x20;return(TOK_RAWKEY);} YY_BREAK case 103: YY_RULE_SETUP #line 197 "../../kmflcomp/src/lex.l" -{yylval.number=0x30;return(TOK_RAWKEY);} +{yylval.number=0x27;return(TOK_RAWKEY);} YY_BREAK case 104: YY_RULE_SETUP #line 198 "../../kmflcomp/src/lex.l" -{yylval.number=0x31;return(TOK_RAWKEY);} +{yylval.number=0x30;return(TOK_RAWKEY);} YY_BREAK case 105: YY_RULE_SETUP #line 199 "../../kmflcomp/src/lex.l" -{yylval.number=0x32;return(TOK_RAWKEY);} +{yylval.number=0x31;return(TOK_RAWKEY);} YY_BREAK case 106: YY_RULE_SETUP #line 200 "../../kmflcomp/src/lex.l" -{yylval.number=0x33;return(TOK_RAWKEY);} +{yylval.number=0x32;return(TOK_RAWKEY);} YY_BREAK case 107: YY_RULE_SETUP #line 201 "../../kmflcomp/src/lex.l" -{yylval.number=0x34;return(TOK_RAWKEY);} +{yylval.number=0x33;return(TOK_RAWKEY);} YY_BREAK case 108: YY_RULE_SETUP #line 202 "../../kmflcomp/src/lex.l" -{yylval.number=0x35;return(TOK_RAWKEY);} +{yylval.number=0x34;return(TOK_RAWKEY);} YY_BREAK case 109: YY_RULE_SETUP #line 203 "../../kmflcomp/src/lex.l" -{yylval.number=0x36;return(TOK_RAWKEY);} +{yylval.number=0x35;return(TOK_RAWKEY);} YY_BREAK case 110: YY_RULE_SETUP #line 204 "../../kmflcomp/src/lex.l" -{yylval.number=0x37;return(TOK_RAWKEY);} +{yylval.number=0x36;return(TOK_RAWKEY);} YY_BREAK case 111: YY_RULE_SETUP #line 205 "../../kmflcomp/src/lex.l" -{yylval.number=0x38;return(TOK_RAWKEY);} +{yylval.number=0x37;return(TOK_RAWKEY);} YY_BREAK case 112: YY_RULE_SETUP #line 206 "../../kmflcomp/src/lex.l" -{yylval.number=0x39;return(TOK_RAWKEY);} +{yylval.number=0x38;return(TOK_RAWKEY);} YY_BREAK case 113: YY_RULE_SETUP #line 207 "../../kmflcomp/src/lex.l" -{yylval.number=0x41;return(TOK_RAWKEY);} +{yylval.number=0x39;return(TOK_RAWKEY);} YY_BREAK case 114: YY_RULE_SETUP #line 208 "../../kmflcomp/src/lex.l" -{yylval.number=0x42;return(TOK_RAWKEY);} +{yylval.number=0x41;return(TOK_RAWKEY);} YY_BREAK case 115: YY_RULE_SETUP #line 209 "../../kmflcomp/src/lex.l" -{yylval.number=0x43;return(TOK_RAWKEY);} +{yylval.number=0x42;return(TOK_RAWKEY);} YY_BREAK case 116: YY_RULE_SETUP #line 210 "../../kmflcomp/src/lex.l" -{yylval.number=0x44;return(TOK_RAWKEY);} +{yylval.number=0x43;return(TOK_RAWKEY);} YY_BREAK case 117: YY_RULE_SETUP #line 211 "../../kmflcomp/src/lex.l" -{yylval.number=0x45;return(TOK_RAWKEY);} +{yylval.number=0x44;return(TOK_RAWKEY);} YY_BREAK case 118: YY_RULE_SETUP #line 212 "../../kmflcomp/src/lex.l" -{yylval.number=0x46;return(TOK_RAWKEY);} +{yylval.number=0x45;return(TOK_RAWKEY);} YY_BREAK case 119: YY_RULE_SETUP #line 213 "../../kmflcomp/src/lex.l" -{yylval.number=0x47;return(TOK_RAWKEY);} +{yylval.number=0x46;return(TOK_RAWKEY);} YY_BREAK case 120: YY_RULE_SETUP #line 214 "../../kmflcomp/src/lex.l" -{yylval.number=0x48;return(TOK_RAWKEY);} +{yylval.number=0x47;return(TOK_RAWKEY);} YY_BREAK case 121: YY_RULE_SETUP #line 215 "../../kmflcomp/src/lex.l" -{yylval.number=0x49;return(TOK_RAWKEY);} +{yylval.number=0x48;return(TOK_RAWKEY);} YY_BREAK case 122: YY_RULE_SETUP #line 216 "../../kmflcomp/src/lex.l" -{yylval.number=0x4a;return(TOK_RAWKEY);} +{yylval.number=0x49;return(TOK_RAWKEY);} YY_BREAK case 123: YY_RULE_SETUP #line 217 "../../kmflcomp/src/lex.l" -{yylval.number=0x4b;return(TOK_RAWKEY);} +{yylval.number=0x4a;return(TOK_RAWKEY);} YY_BREAK case 124: YY_RULE_SETUP #line 218 "../../kmflcomp/src/lex.l" -{yylval.number=0x4c;return(TOK_RAWKEY);} +{yylval.number=0x4b;return(TOK_RAWKEY);} YY_BREAK case 125: YY_RULE_SETUP #line 219 "../../kmflcomp/src/lex.l" -{yylval.number=0x4d;return(TOK_RAWKEY);} +{yylval.number=0x4c;return(TOK_RAWKEY);} YY_BREAK case 126: YY_RULE_SETUP #line 220 "../../kmflcomp/src/lex.l" -{yylval.number=0x4e;return(TOK_RAWKEY);} +{yylval.number=0x4d;return(TOK_RAWKEY);} YY_BREAK case 127: YY_RULE_SETUP #line 221 "../../kmflcomp/src/lex.l" -{yylval.number=0x4f;return(TOK_RAWKEY);} +{yylval.number=0x4e;return(TOK_RAWKEY);} YY_BREAK case 128: YY_RULE_SETUP #line 222 "../../kmflcomp/src/lex.l" -{yylval.number=0x50;return(TOK_RAWKEY);} +{yylval.number=0x4f;return(TOK_RAWKEY);} YY_BREAK case 129: YY_RULE_SETUP #line 223 "../../kmflcomp/src/lex.l" -{yylval.number=0x51;return(TOK_RAWKEY);} +{yylval.number=0x50;return(TOK_RAWKEY);} YY_BREAK case 130: YY_RULE_SETUP #line 224 "../../kmflcomp/src/lex.l" -{yylval.number=0x52;return(TOK_RAWKEY);} +{yylval.number=0x51;return(TOK_RAWKEY);} YY_BREAK case 131: YY_RULE_SETUP #line 225 "../../kmflcomp/src/lex.l" -{yylval.number=0x53;return(TOK_RAWKEY);} +{yylval.number=0x52;return(TOK_RAWKEY);} YY_BREAK case 132: YY_RULE_SETUP #line 226 "../../kmflcomp/src/lex.l" -{yylval.number=0x54;return(TOK_RAWKEY);} +{yylval.number=0x53;return(TOK_RAWKEY);} YY_BREAK case 133: YY_RULE_SETUP #line 227 "../../kmflcomp/src/lex.l" -{yylval.number=0x55;return(TOK_RAWKEY);} +{yylval.number=0x54;return(TOK_RAWKEY);} YY_BREAK case 134: YY_RULE_SETUP #line 228 "../../kmflcomp/src/lex.l" -{yylval.number=0x56;return(TOK_RAWKEY);} +{yylval.number=0x55;return(TOK_RAWKEY);} YY_BREAK case 135: YY_RULE_SETUP #line 229 "../../kmflcomp/src/lex.l" -{yylval.number=0x57;return(TOK_RAWKEY);} +{yylval.number=0x56;return(TOK_RAWKEY);} YY_BREAK case 136: YY_RULE_SETUP #line 230 "../../kmflcomp/src/lex.l" -{yylval.number=0x58;return(TOK_RAWKEY);} +{yylval.number=0x57;return(TOK_RAWKEY);} YY_BREAK case 137: YY_RULE_SETUP #line 231 "../../kmflcomp/src/lex.l" -{yylval.number=0x59;return(TOK_RAWKEY);} +{yylval.number=0x58;return(TOK_RAWKEY);} YY_BREAK case 138: YY_RULE_SETUP #line 232 "../../kmflcomp/src/lex.l" -{yylval.number=0x5a;return(TOK_RAWKEY);} +{yylval.number=0x59;return(TOK_RAWKEY);} YY_BREAK case 139: YY_RULE_SETUP #line 233 "../../kmflcomp/src/lex.l" -{yylval.number=0x60;return(TOK_RAWKEY);} +{yylval.number=0x5a;return(TOK_RAWKEY);} YY_BREAK case 140: YY_RULE_SETUP #line 234 "../../kmflcomp/src/lex.l" -{yylval.number=0x2c;return(TOK_RAWKEY);} +{yylval.number=0x60;return(TOK_RAWKEY);} YY_BREAK case 141: YY_RULE_SETUP #line 235 "../../kmflcomp/src/lex.l" -{yylval.number=0x2d;return(TOK_RAWKEY);} +{yylval.number=0x2c;return(TOK_RAWKEY);} YY_BREAK case 142: YY_RULE_SETUP #line 236 "../../kmflcomp/src/lex.l" -{yylval.number=0x2e;return(TOK_RAWKEY);} +{yylval.number=0x2d;return(TOK_RAWKEY);} YY_BREAK case 143: YY_RULE_SETUP #line 237 "../../kmflcomp/src/lex.l" -{yylval.number=0x2f;return(TOK_RAWKEY);} +{yylval.number=0x2e;return(TOK_RAWKEY);} YY_BREAK case 144: YY_RULE_SETUP #line 238 "../../kmflcomp/src/lex.l" -{yylval.number=0x3a;return(TOK_RAWKEY);} +{yylval.number=0x2f;return(TOK_RAWKEY);} YY_BREAK case 145: YY_RULE_SETUP #line 239 "../../kmflcomp/src/lex.l" -{yylval.number=0x3d;return(TOK_RAWKEY);} +{yylval.number=0x3a;return(TOK_RAWKEY);} YY_BREAK case 146: YY_RULE_SETUP #line 240 "../../kmflcomp/src/lex.l" -{yylval.number=0x5b;return(TOK_RAWKEY);} +{yylval.number=0x3d;return(TOK_RAWKEY);} YY_BREAK case 147: YY_RULE_SETUP #line 241 "../../kmflcomp/src/lex.l" -{yylval.number=0x5c;return(TOK_RAWKEY);} +{yylval.number=0x5b;return(TOK_RAWKEY);} YY_BREAK case 148: YY_RULE_SETUP #line 242 "../../kmflcomp/src/lex.l" -{yylval.number=0x5d;return(TOK_RAWKEY);} +{yylval.number=0x5c;return(TOK_RAWKEY);} YY_BREAK case 149: YY_RULE_SETUP #line 243 "../../kmflcomp/src/lex.l" -{yylval.number=0xff08;return(TOK_RAWKEY);} +{yylval.number=0x5d;return(TOK_RAWKEY);} YY_BREAK case 150: YY_RULE_SETUP #line 244 "../../kmflcomp/src/lex.l" -{yylval.number=0xff09;return(TOK_RAWKEY);} +{yylval.number=0xff08;return(TOK_RAWKEY);} YY_BREAK case 151: YY_RULE_SETUP #line 245 "../../kmflcomp/src/lex.l" -{yylval.number=0xff0d;return(TOK_RAWKEY);} +{yylval.number=0xff09;return(TOK_RAWKEY);} YY_BREAK case 152: YY_RULE_SETUP #line 246 "../../kmflcomp/src/lex.l" -{yylval.number=0xff13;return(TOK_RAWKEY);} +{yylval.number=0xff0d;return(TOK_RAWKEY);} YY_BREAK case 153: YY_RULE_SETUP #line 247 "../../kmflcomp/src/lex.l" -{yylval.number=0xff14;return(TOK_RAWKEY);} +{yylval.number=0xff13;return(TOK_RAWKEY);} YY_BREAK case 154: YY_RULE_SETUP #line 248 "../../kmflcomp/src/lex.l" -{yylval.number=0xff1b;return(TOK_RAWKEY);} +{yylval.number=0xff14;return(TOK_RAWKEY);} YY_BREAK case 155: YY_RULE_SETUP #line 249 "../../kmflcomp/src/lex.l" -{yylval.number=0xff50;return(TOK_RAWKEY);} +{yylval.number=0xff1b;return(TOK_RAWKEY);} YY_BREAK case 156: YY_RULE_SETUP #line 250 "../../kmflcomp/src/lex.l" -{yylval.number=0xff51;return(TOK_RAWKEY);} +{yylval.number=0xff50;return(TOK_RAWKEY);} YY_BREAK case 157: YY_RULE_SETUP #line 251 "../../kmflcomp/src/lex.l" -{yylval.number=0xff52;return(TOK_RAWKEY);} +{yylval.number=0xff51;return(TOK_RAWKEY);} YY_BREAK case 158: YY_RULE_SETUP #line 252 "../../kmflcomp/src/lex.l" -{yylval.number=0xff53;return(TOK_RAWKEY);} +{yylval.number=0xff52;return(TOK_RAWKEY);} YY_BREAK case 159: YY_RULE_SETUP #line 253 "../../kmflcomp/src/lex.l" -{yylval.number=0xff54;return(TOK_RAWKEY);} +{yylval.number=0xff53;return(TOK_RAWKEY);} YY_BREAK case 160: YY_RULE_SETUP #line 254 "../../kmflcomp/src/lex.l" -{yylval.number=0xff55;return(TOK_RAWKEY);} +{yylval.number=0xff54;return(TOK_RAWKEY);} YY_BREAK case 161: YY_RULE_SETUP #line 255 "../../kmflcomp/src/lex.l" -{yylval.number=0xff56;return(TOK_RAWKEY);} +{yylval.number=0xff55;return(TOK_RAWKEY);} YY_BREAK case 162: YY_RULE_SETUP #line 256 "../../kmflcomp/src/lex.l" -{yylval.number=0xff57;return(TOK_RAWKEY);} +{yylval.number=0xff56;return(TOK_RAWKEY);} YY_BREAK case 163: YY_RULE_SETUP #line 257 "../../kmflcomp/src/lex.l" -{yylval.number=0xff63;return(TOK_RAWKEY);} +{yylval.number=0xff57;return(TOK_RAWKEY);} YY_BREAK case 164: YY_RULE_SETUP #line 258 "../../kmflcomp/src/lex.l" -{yylval.number=0xff7f;return(TOK_RAWKEY);} +{yylval.number=0xff63;return(TOK_RAWKEY);} YY_BREAK case 165: YY_RULE_SETUP #line 259 "../../kmflcomp/src/lex.l" -{yylval.number=0xffaa;return(TOK_RAWKEY);} +{yylval.number=0xff7f;return(TOK_RAWKEY);} YY_BREAK case 166: YY_RULE_SETUP #line 260 "../../kmflcomp/src/lex.l" -{yylval.number=0xffab;return(TOK_RAWKEY);} +{yylval.number=0xffaa;return(TOK_RAWKEY);} YY_BREAK case 167: YY_RULE_SETUP #line 261 "../../kmflcomp/src/lex.l" -{yylval.number=0xffad;return(TOK_RAWKEY);} +{yylval.number=0xffab;return(TOK_RAWKEY);} YY_BREAK case 168: YY_RULE_SETUP #line 262 "../../kmflcomp/src/lex.l" -{yylval.number=0xffae;return(TOK_RAWKEY);} +{yylval.number=0xffad;return(TOK_RAWKEY);} YY_BREAK case 169: YY_RULE_SETUP #line 263 "../../kmflcomp/src/lex.l" -{yylval.number=0xffaf;return(TOK_RAWKEY);} +{yylval.number=0xffae;return(TOK_RAWKEY);} YY_BREAK case 170: YY_RULE_SETUP #line 264 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb0;return(TOK_RAWKEY);} +{yylval.number=0xffaf;return(TOK_RAWKEY);} YY_BREAK case 171: YY_RULE_SETUP #line 265 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb1;return(TOK_RAWKEY);} +{yylval.number=0xffb0;return(TOK_RAWKEY);} YY_BREAK case 172: YY_RULE_SETUP #line 266 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb2;return(TOK_RAWKEY);} +{yylval.number=0xffb1;return(TOK_RAWKEY);} YY_BREAK case 173: YY_RULE_SETUP #line 267 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb3;return(TOK_RAWKEY);} +{yylval.number=0xffb2;return(TOK_RAWKEY);} YY_BREAK case 174: YY_RULE_SETUP #line 268 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb4;return(TOK_RAWKEY);} +{yylval.number=0xffb3;return(TOK_RAWKEY);} YY_BREAK case 175: YY_RULE_SETUP #line 269 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb5;return(TOK_RAWKEY);} +{yylval.number=0xffb4;return(TOK_RAWKEY);} YY_BREAK case 176: YY_RULE_SETUP #line 270 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb6;return(TOK_RAWKEY);} +{yylval.number=0xffb5;return(TOK_RAWKEY);} YY_BREAK case 177: YY_RULE_SETUP #line 271 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb7;return(TOK_RAWKEY);} +{yylval.number=0xffb6;return(TOK_RAWKEY);} YY_BREAK case 178: YY_RULE_SETUP #line 272 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb8;return(TOK_RAWKEY);} +{yylval.number=0xffb7;return(TOK_RAWKEY);} YY_BREAK case 179: YY_RULE_SETUP #line 273 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb9;return(TOK_RAWKEY);} +{yylval.number=0xffb8;return(TOK_RAWKEY);} YY_BREAK case 180: YY_RULE_SETUP #line 274 "../../kmflcomp/src/lex.l" -{yylval.number=0xffbe;return(TOK_RAWKEY);} +{yylval.number=0xffb9;return(TOK_RAWKEY);} YY_BREAK case 181: YY_RULE_SETUP #line 275 "../../kmflcomp/src/lex.l" -{yylval.number=0xffbf;return(TOK_RAWKEY);} +{yylval.number=0xffbe;return(TOK_RAWKEY);} YY_BREAK case 182: YY_RULE_SETUP #line 276 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc0;return(TOK_RAWKEY);} +{yylval.number=0xffbf;return(TOK_RAWKEY);} YY_BREAK case 183: YY_RULE_SETUP #line 277 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc1;return(TOK_RAWKEY);} +{yylval.number=0xffc0;return(TOK_RAWKEY);} YY_BREAK case 184: YY_RULE_SETUP #line 278 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc2;return(TOK_RAWKEY);} +{yylval.number=0xffc1;return(TOK_RAWKEY);} YY_BREAK case 185: YY_RULE_SETUP #line 279 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc3;return(TOK_RAWKEY);} +{yylval.number=0xffc2;return(TOK_RAWKEY);} YY_BREAK case 186: YY_RULE_SETUP #line 280 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc4;return(TOK_RAWKEY);} +{yylval.number=0xffc3;return(TOK_RAWKEY);} YY_BREAK case 187: YY_RULE_SETUP #line 281 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc5;return(TOK_RAWKEY);} +{yylval.number=0xffc4;return(TOK_RAWKEY);} YY_BREAK case 188: YY_RULE_SETUP #line 282 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc6;return(TOK_RAWKEY);} +{yylval.number=0xffc5;return(TOK_RAWKEY);} YY_BREAK case 189: YY_RULE_SETUP #line 283 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc7;return(TOK_RAWKEY);} +{yylval.number=0xffc6;return(TOK_RAWKEY);} YY_BREAK case 190: YY_RULE_SETUP #line 284 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc8;return(TOK_RAWKEY);} +{yylval.number=0xffc7;return(TOK_RAWKEY);} YY_BREAK case 191: YY_RULE_SETUP #line 285 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc9;return(TOK_RAWKEY);} +{yylval.number=0xffc8;return(TOK_RAWKEY);} YY_BREAK case 192: YY_RULE_SETUP #line 286 "../../kmflcomp/src/lex.l" -{yylval.number=0xffca;return(TOK_RAWKEY);} +{yylval.number=0xffc9;return(TOK_RAWKEY);} YY_BREAK case 193: YY_RULE_SETUP #line 287 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcb;return(TOK_RAWKEY);} +{yylval.number=0xffca;return(TOK_RAWKEY);} YY_BREAK case 194: YY_RULE_SETUP #line 288 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcc;return(TOK_RAWKEY);} +{yylval.number=0xffcb;return(TOK_RAWKEY);} YY_BREAK case 195: YY_RULE_SETUP #line 289 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcd;return(TOK_RAWKEY);} +{yylval.number=0xffcc;return(TOK_RAWKEY);} YY_BREAK case 196: YY_RULE_SETUP #line 290 "../../kmflcomp/src/lex.l" -{yylval.number=0xffce;return(TOK_RAWKEY);} +{yylval.number=0xffcd;return(TOK_RAWKEY);} YY_BREAK case 197: YY_RULE_SETUP #line 291 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcf;return(TOK_RAWKEY);} +{yylval.number=0xffce;return(TOK_RAWKEY);} YY_BREAK case 198: YY_RULE_SETUP #line 292 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd0;return(TOK_RAWKEY);} +{yylval.number=0xffcf;return(TOK_RAWKEY);} YY_BREAK case 199: YY_RULE_SETUP #line 293 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd1;return(TOK_RAWKEY);} +{yylval.number=0xffd0;return(TOK_RAWKEY);} YY_BREAK case 200: YY_RULE_SETUP #line 294 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd2;return(TOK_RAWKEY);} +{yylval.number=0xffd1;return(TOK_RAWKEY);} YY_BREAK case 201: YY_RULE_SETUP #line 295 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd3;return(TOK_RAWKEY);} +{yylval.number=0xffd2;return(TOK_RAWKEY);} YY_BREAK case 202: YY_RULE_SETUP #line 296 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd4;return(TOK_RAWKEY);} +{yylval.number=0xffd3;return(TOK_RAWKEY);} YY_BREAK case 203: YY_RULE_SETUP #line 297 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd5;return(TOK_RAWKEY);} +{yylval.number=0xffd4;return(TOK_RAWKEY);} YY_BREAK case 204: YY_RULE_SETUP #line 298 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe1;return(TOK_RAWKEY);} +{yylval.number=0xffd5;return(TOK_RAWKEY);} YY_BREAK case 205: YY_RULE_SETUP #line 299 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe3;return(TOK_RAWKEY);} +{yylval.number=0xffe1;return(TOK_RAWKEY);} YY_BREAK case 206: YY_RULE_SETUP #line 300 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe5;return(TOK_RAWKEY);} +{yylval.number=0xffe3;return(TOK_RAWKEY);} YY_BREAK case 207: YY_RULE_SETUP #line 301 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe9;return(TOK_RAWKEY);} +{yylval.number=0xffe5;return(TOK_RAWKEY);} YY_BREAK case 208: YY_RULE_SETUP #line 302 "../../kmflcomp/src/lex.l" -{yylval.number=0xffff;return(TOK_RAWKEY);} +{yylval.number=0xffe9;return(TOK_RAWKEY);} YY_BREAK case 209: YY_RULE_SETUP #line 303 "../../kmflcomp/src/lex.l" -{yylval.number=0x3c;return(TOK_RAWKEY); /* on German kbds only!*/} +{yylval.number=0xffff;return(TOK_RAWKEY);} YY_BREAK case 210: YY_RULE_SETUP -#line 305 "../../kmflcomp/src/lex.l" -{yylval.number=text_to_keysym(yytext); if (yylval.number == -1) yyerror("unrecognised raw key"); else return(TOK_XKEYSYM);} +#line 304 "../../kmflcomp/src/lex.l" +{yylval.number=0x3c;return(TOK_RAWKEY); /* on German kbds only!*/} YY_BREAK case 211: YY_RULE_SETUP #line 306 "../../kmflcomp/src/lex.l" -{ yyerror("unrecognised raw key");} +{yylval.number=text_to_keysym(yytext); if (yylval.number == -1) yyerror("unrecognised raw key"); else return(TOK_XKEYSYM);} YY_BREAK case 212: YY_RULE_SETUP #line 307 "../../kmflcomp/src/lex.l" -{caller0=caller;caller=KEYNAME;qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{ yyerror("unrecognised raw key");} YY_BREAK case 213: YY_RULE_SETUP #line 308 "../../kmflcomp/src/lex.l" -{caller0=caller;caller=KEYNAME;qchar='\"';BEGIN(QUOTE);return(TOK_QM);} +{caller0=caller;caller=KEYNAME;qchar='\'';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 214: YY_RULE_SETUP -#line 310 "../../kmflcomp/src/lex.l" +#line 309 "../../kmflcomp/src/lex.l" +{caller0=caller;caller=KEYNAME;qchar='\"';BEGIN(QUOTE);return(TOK_QM);} + YY_BREAK +case 215: +YY_RULE_SETUP +#line 311 "../../kmflcomp/src/lex.l" { if(caller==KEYNAME) caller=caller0; BEGIN(caller);return(TOK_SB); } YY_BREAK -case 215: -/* rule 215 can match eol */ -YY_RULE_SETUP -#line 316 "../../kmflcomp/src/lex.l" -{lineno++; /* Join lines */} - YY_BREAK case 216: /* rule 216 can match eol */ YY_RULE_SETUP @@ -2690,35 +2663,31 @@ YY_RULE_SETUP {lineno++; /* Join lines */} YY_BREAK case 219: +/* rule 219 can match eol */ +YY_RULE_SETUP +#line 320 "../../kmflcomp/src/lex.l" +{lineno++; /* Join lines */} + YY_BREAK +case 220: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 321 "../../kmflcomp/src/lex.l" +#line 322 "../../kmflcomp/src/lex.l" {/* ignore, use both /\r and /\n, not to work $ */} YY_BREAK -case 220: -/* rule 220 can match eol */ +case 221: +/* rule 221 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_bp + 1); (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 322 "../../kmflcomp/src/lex.l" +#line 323 "../../kmflcomp/src/lex.l" {/* with either CR or CR/LF line ending */} YY_BREAK -case 221: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP -#line 323 "../../kmflcomp/src/lex.l" -{/* ignore */} - YY_BREAK case 222: -/* rule 222 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP @@ -2726,7 +2695,9 @@ YY_RULE_SETUP {/* ignore */} YY_BREAK case 223: +/* rule 223 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP @@ -2734,9 +2705,7 @@ YY_RULE_SETUP {/* ignore */} YY_BREAK case 224: -/* rule 224 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP @@ -2744,55 +2713,65 @@ YY_RULE_SETUP {/* ignore */} YY_BREAK case 225: +/* rule 225 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 328 "../../kmflcomp/src/lex.l" -{BEGIN(SKIP);} +#line 327 "../../kmflcomp/src/lex.l" +{/* ignore */} YY_BREAK case 226: YY_RULE_SETUP -#line 330 "../../kmflcomp/src/lex.l" -{/* Keyman platform conditional - just drop marker */} +#line 329 "../../kmflcomp/src/lex.l" +{BEGIN(SKIP);} YY_BREAK case 227: YY_RULE_SETUP #line 331 "../../kmflcomp/src/lex.l" -{/* Kmfl platform conditional - just drop marker */} +{/* Keyman platform conditional - just drop marker */} YY_BREAK case 228: YY_RULE_SETUP #line 332 "../../kmflcomp/src/lex.l" -{BEGIN(SKIP);} /* Platform Conditional */ +{/* Kmfl platform conditional - just drop marker */} YY_BREAK - case 229: YY_RULE_SETUP -#line 335 "../../kmflcomp/src/lex.l" -{/* ignore everything until nl or EOF */} +#line 333 "../../kmflcomp/src/lex.l" +{BEGIN(SKIP);} /* Platform Conditional */ YY_BREAK case 230: YY_RULE_SETUP -#line 338 "../../kmflcomp/src/lex.l" -{fprintf(stderr,"Line %d: Unmatched closing parenthesis\n",lineno);return(TOK_BRKT);} +#line 336 "../../kmflcomp/src/lex.l" +{/* ignore everything until nl or EOF */} YY_BREAK + case 231: YY_RULE_SETUP #line 339 "../../kmflcomp/src/lex.l" -{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unrecognized keyword '%s'\n", - (int)lineno, yytext);errcount++;return(TOK_ERROR);} +{fprintf(stderr,"Line %d: Unmatched closing parenthesis\n",lineno);return(TOK_BRKT);} YY_BREAK case 232: YY_RULE_SETUP -#line 341 "../../kmflcomp/src/lex.l" -{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unexpected char (%d) `%c'\n", - (int)lineno, (int) yytext[0],(char) yytext[0]);errcount++;return(TOK_CHAR);} +#line 340 "../../kmflcomp/src/lex.l" +{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unrecognized keyword '%s'\n", + (int)lineno, yytext);errcount++;return(TOK_ERROR);} YY_BREAK case 233: YY_RULE_SETUP -#line 343 "../../kmflcomp/src/lex.l" +#line 342 "../../kmflcomp/src/lex.l" +{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unexpected char (%d) `%c'\n", + (int)lineno, (int) yytext[0],(char) yytext[0]);errcount++;return(TOK_CHAR);} + YY_BREAK +case 234: +YY_RULE_SETUP +#line 344 "../../kmflcomp/src/lex.l" ECHO; YY_BREAK -#line 2796 "lex.c" +#line 2775 "lex.c" case YY_END_OF_BUFFER: { @@ -2868,7 +2847,7 @@ ECHO; { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -2935,7 +2914,7 @@ static int yy_get_next_buffer (void) { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); - yy_size_t number_to_move, i; + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2964,7 +2943,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2977,7 +2956,7 @@ static int yy_get_next_buffer (void) 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 ) @@ -2991,7 +2970,7 @@ static int yy_get_next_buffer (void) 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; @@ -3000,11 +2979,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } 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( @@ -3032,7 +3012,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -3046,12 +3026,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -3084,10 +3067,10 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 745 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -3112,11 +3095,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 738 ) - yy_c = yy_meta[(unsigned int) yy_c]; + if ( yy_current_state >= 745 ) + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 737); + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; + yy_is_jam = (yy_current_state == 744); return yy_is_jam ? 0 : yy_current_state; } @@ -3135,7 +3118,7 @@ static int yy_get_next_buffer (void) 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_n_chars) + 2; + int number_to_move = (yy_n_chars) + 2; char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; char *source = @@ -3147,7 +3130,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (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" ); @@ -3186,7 +3169,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -3203,14 +3186,14 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) - return EOF; + if ( yywrap( ) ) + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -3249,11 +3232,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -3281,7 +3264,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -3309,22 +3292,22 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = (yy_size_t)size; + b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -3343,9 +3326,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } /* Initializes or reinitializes a buffer. @@ -3357,7 +3340,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -3400,7 +3383,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -3431,7 +3414,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -3450,7 +3433,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -3468,15 +3451,15 @@ static void yyensure_buffer_stack (void) * 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_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -3505,7 +3488,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -3515,23 +3498,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) 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 ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (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; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -3544,10 +3527,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -3557,16 +3540,16 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -3575,7 +3558,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -3591,9 +3574,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -3621,7 +3604,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -3644,7 +3627,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -3700,10 +3683,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -3712,8 +3695,8 @@ static int yy_init_globals (void) 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 @@ -3728,7 +3711,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -3749,7 +3732,7 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { int i; @@ -3759,7 +3742,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { int n; for ( n = 0; s[n]; ++n ) @@ -3771,7 +3754,7 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) @@ -3784,7 +3767,7 @@ void *yyrealloc (void * ptr, yy_size_t size ) * 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); } void yyfree (void * ptr ) @@ -3794,4 +3777,4 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 343 "../../kmflcomp/src/lex.l" +#line 344 "../../kmflcomp/src/lex.l" diff --git a/linux/kmflcomp/src/lex.l b/linux/kmflcomp/src/lex.l index 4e58cdcee4..b733ed21b7 100755 --- a/linux/kmflcomp/src/lex.l +++ b/linux/kmflcomp/src/lex.l @@ -74,6 +74,7 @@ MESSAGE {return TOK_MESSAGE;} MNEMONIC[ ]*LAYOUT {return TOK_MNEMONIC;} ETHNOLOGUE[ ]*CODE {return TOK_ETHNOLOGUE;} AUTHOR {return TOK_AUTHOR;} +TARGETS {return TOK_TARGETS;} begin[ ]+ansi {return TOK_ANSI;} begin[ ]+unicode {return TOK_UNICODE;} begin {return TOK_ANSI;} diff --git a/linux/kmflcomp/src/yacc.c b/linux/kmflcomp/src/yacc.c index a694a37e80..1aed1e4cde 100644 --- a/linux/kmflcomp/src/yacc.c +++ b/linux/kmflcomp/src/yacc.c @@ -1,14 +1,13 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +15,7 @@ GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -47,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,67 +52,125 @@ /* Pure parsers. */ #define YYPURE 0 -/* Using locations. */ -#define YYLSP_NEEDED 0 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 -/* Tokens. */ + +/* Copy the first part of user declarations. */ +#line 1 "../../kmflcomp/src/yacc.y" /* yacc.c:339 */ + +/* + YACC grammar for reading Keyman-style keyboard definition files + and outputting UTF-8 byte code for the Linux interpreter +*/ +#include +#include +#include + +#include "compiler.h" + +extern char *fname; /* Current file name */ +extern int yylex(); /* Reference needed by yacc.c */ + +int lineno = 1; /* Current line number in file */ +int errcount = 0; /* Count of errors */ + +int n; /* Temporary index value */ +GROUP *gp = NULL; /* Temporary group pointer */ + +#define YYDEBUG 1 /* Allow compiler debugging (if yydebug true) */ + +#line 89 "yacc.c" /* yacc.c:339 */ + +# ifndef YY_NULLPTR +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_YACC_H_INCLUDED +# define YY_YY_YACC_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOK_ANY = 258, - TOK_ANSI = 259, - TOK_AUTHOR = 260, - TOK_BEEP = 261, - TOK_BITMAP = 262, - TOK_BRKT = 263, - TOK_CALL = 264, - TOK_CAPSFREE = 265, - TOK_CAPSOFF = 266, - TOK_CAPSON = 267, - TOK_COMMA = 268, - TOK_CONTEXT = 269, - TOK_COPYRIGHT = 270, - TOK_CHAR = 271, - TOK_DEADKEY = 272, - TOK_DOLLAR = 273, - TOK_ERROR = 274, - TOK_ETHNOLOGUE = 275, - TOK_GROUP = 276, - TOK_GT = 277, - TOK_HOTKEY = 278, - TOK_INDEX = 279, - TOK_LANGUAGE = 280, - TOK_LAYOUT = 281, - TOK_MATCH = 282, - TOK_MESSAGE = 283, - TOK_MNEMONIC = 284, - TOK_NOMATCH = 285, - TOK_NAME = 286, - TOK_NOTANY = 287, - TOK_NUL = 288, - TOK_NUMBER = 289, - TOK_NL = 290, - TOK_OUTS = 291, - TOK_RAWKEY = 292, - TOK_PLUS = 293, - TOK_QM = 294, - TOK_RTN = 295, - TOK_SB = 296, - TOK_SHIFT = 297, - TOK_STORE = 298, - TOK_STOREINSTORE = 299, - TOK_SWITCH = 300, - TOK_UNICODE = 301, - TOK_USE = 302, - TOK_USINGKEYS = 303, - TOK_UTF = 304, - TOK_VERSION = 305, - TOK_XKEYSYM = 306 - }; + enum yytokentype + { + TOK_ANY = 258, + TOK_ANSI = 259, + TOK_AUTHOR = 260, + TOK_BEEP = 261, + TOK_BITMAP = 262, + TOK_BRKT = 263, + TOK_CALL = 264, + TOK_CAPSFREE = 265, + TOK_CAPSOFF = 266, + TOK_CAPSON = 267, + TOK_COMMA = 268, + TOK_CONTEXT = 269, + TOK_COPYRIGHT = 270, + TOK_CHAR = 271, + TOK_DEADKEY = 272, + TOK_DOLLAR = 273, + TOK_ERROR = 274, + TOK_ETHNOLOGUE = 275, + TOK_GROUP = 276, + TOK_GT = 277, + TOK_HOTKEY = 278, + TOK_INDEX = 279, + TOK_LANGUAGE = 280, + TOK_LAYOUT = 281, + TOK_MATCH = 282, + TOK_MESSAGE = 283, + TOK_MNEMONIC = 284, + TOK_NOMATCH = 285, + TOK_NAME = 286, + TOK_NOTANY = 287, + TOK_NUL = 288, + TOK_NUMBER = 289, + TOK_NL = 290, + TOK_OUTS = 291, + TOK_RAWKEY = 292, + TOK_PLUS = 293, + TOK_QM = 294, + TOK_RTN = 295, + TOK_SB = 296, + TOK_SHIFT = 297, + TOK_STORE = 298, + TOK_STOREINSTORE = 299, + TOK_SWITCH = 300, + TOK_TARGETS = 301, + TOK_UNICODE = 302, + TOK_USE = 303, + TOK_USINGKEYS = 304, + TOK_UTF = 305, + TOK_VERSION = 306, + TOK_XKEYSYM = 307 + }; #endif /* Tokens. */ #define TOK_ANY 258 @@ -161,85 +216,47 @@ #define TOK_STORE 298 #define TOK_STOREINSTORE 299 #define TOK_SWITCH 300 -#define TOK_UNICODE 301 -#define TOK_USE 302 -#define TOK_USINGKEYS 303 -#define TOK_UTF 304 -#define TOK_VERSION 305 -#define TOK_XKEYSYM 306 - - - - -/* Copy the first part of user declarations. */ -#line 1 "yacc.y" - -/* - YACC grammar for reading Keyman-style keyboard definition files - and outputting UTF-8 byte code for the Linux interpreter -*/ -#include -#include -#include - -#include "compiler.h" - -extern char *fname; /* Current file name */ -extern int yylex(); /* Reference needed by yacc.c */ - -int lineno = 1; /* Current line number in file */ -int errcount = 0; /* Count of errors */ - -int n; /* Temporary index value */ -GROUP *gp = NULL; /* Temporary group pointer */ - -#define YYDEBUG 1 /* Allow compiler debugging (if yydebug true) */ - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif +#define TOK_TARGETS 301 +#define TOK_UNICODE 302 +#define TOK_USE 303 +#define TOK_USINGKEYS 304 +#define TOK_UTF 305 +#define TOK_VERSION 306 +#define TOK_XKEYSYM 307 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 25 "yacc.y" + +union YYSTYPE { +#line 25 "../../kmflcomp/src/yacc.y" /* yacc.c:355 */ + int simple; ITEM number; char *string; ITEM *items; RULE *rule; GROUP *group; - } -/* Line 187 of yacc.c. */ -#line 230 "yacc.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + + +#line 243 "yacc.c" /* yacc.c:355 */ +}; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; + +int yyparse (void); + +#endif /* !YY_YY_YACC_H_INCLUDED */ /* Copy the second part of user declarations. */ - -/* Line 216 of yacc.c. */ -#line 243 "yacc.c" +#line 260 "yacc.c" /* yacc.c:358 */ #ifdef short # undef short @@ -253,11 +270,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -277,8 +291,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -289,41 +302,70 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + #if ! defined yyoverflow || YYERROR_VERBOSE @@ -342,11 +384,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -354,8 +396,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -369,25 +411,23 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -397,14 +437,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) @@ -415,64 +455,70 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 75 +#define YYFINAL 77 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 274 +#define YYLAST 244 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 52 +#define YYNTOKENS 53 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 16 /* YYNRULES -- Number of rules. */ -#define YYNRULES 79 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 160 +#define YYNRULES 80 +/* YYNSTATES -- Number of states. */ +#define YYNSTATES 163 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 306 +#define YYMAXUTOK 307 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -505,71 +551,26 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51 + 45, 46, 47, 48, 49, 50, 51, 52 }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 6, 8, 10, 13, 17, 21, 27, - 31, 35, 39, 43, 47, 51, 55, 59, 63, 67, - 70, 73, 76, 81, 87, 93, 101, 105, 109, 113, - 117, 119, 121, 124, 126, 129, 133, 138, 140, 143, - 148, 153, 155, 157, 159, 162, 165, 167, 171, 173, - 176, 179, 182, 185, 187, 194, 199, 201, 203, 205, - 210, 213, 215, 217, 220, 223, 226, 228, 232, 235, - 239, 241, 244, 247, 249, 252, 254, 257, 259, 261 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 53, 0, -1, 54, 56, -1, 56, -1, 55, -1, - 55, 54, -1, 31, 67, 35, -1, 31, 63, 35, - -1, 23, 41, 65, 41, 35, -1, 23, 63, 35, - -1, 50, 67, 35, -1, 50, 63, 35, -1, 7, - 67, 35, -1, 7, 63, 35, -1, 15, 63, 35, - -1, 28, 63, 35, -1, 25, 61, 35, -1, 26, - 63, 35, -1, 26, 67, 35, -1, 11, 35, -1, - 12, 35, -1, 10, 35, -1, 43, 64, 61, 35, - -1, 4, 22, 47, 64, 35, -1, 46, 22, 47, - 64, 35, -1, 4, 22, 47, 64, 47, 64, 35, - -1, 5, 63, 35, -1, 29, 63, 35, -1, 20, - 63, 35, -1, 19, 67, 35, -1, 35, -1, 57, - -1, 57, 56, -1, 58, -1, 58, 59, -1, 21, - 64, 35, -1, 21, 64, 48, 35, -1, 60, -1, - 60, 59, -1, 61, 22, 61, 35, -1, 43, 64, - 61, 35, -1, 35, -1, 62, -1, 63, -1, 62, - 61, -1, 63, 61, -1, 34, -1, 41, 65, 41, - -1, 38, -1, 3, 64, -1, 32, 64, -1, 36, - 64, -1, 17, 64, -1, 33, -1, 24, 8, 67, - 13, 67, 8, -1, 24, 8, 67, 8, -1, 40, - -1, 6, -1, 14, -1, 14, 8, 67, 8, -1, - 47, 64, -1, 27, -1, 30, -1, 9, 64, -1, - 45, 64, -1, 18, 67, -1, 19, -1, 39, 67, - 39, -1, 39, 39, -1, 8, 67, 8, -1, 63, - -1, 66, 63, -1, 66, 37, -1, 37, -1, 66, - 51, -1, 51, -1, 66, 42, -1, 42, -1, 16, - -1, 16, 67, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 102, 102, 108, 117, 118, 122, 126, 130, 134, - 138, 142, 146, 150, 154, 158, 162, 166, 170, 174, - 178, 182, 186, 190, 194, 198, 203, 207, 211, 215, - 216, 220, 224, 231, 238, 249, 255, 263, 267, 274, - 278, 282, 289, 293, 297, 301, 308, 312, 316, 320, - 332, 344, 356, 360, 364, 376, 381, 385, 389, 393, - 397, 401, 405, 409, 414, 419, 433, 440, 445, 452, - 459, 464, 469, 473, 477, 481, 488, 492, 499, 503 + 0, 103, 103, 109, 118, 119, 123, 127, 131, 135, + 139, 143, 147, 151, 155, 159, 163, 167, 171, 175, + 179, 183, 187, 191, 195, 199, 204, 208, 212, 216, + 220, 221, 225, 229, 236, 243, 254, 260, 268, 272, + 279, 283, 287, 294, 298, 302, 306, 313, 317, 321, + 325, 337, 349, 361, 365, 369, 381, 386, 390, 394, + 398, 402, 406, 410, 414, 419, 424, 438, 445, 450, + 457, 464, 469, 474, 478, 482, 486, 493, 497, 504, + 508 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -582,17 +583,17 @@ static const char *const yytname[] = "TOK_LAYOUT", "TOK_MATCH", "TOK_MESSAGE", "TOK_MNEMONIC", "TOK_NOMATCH", "TOK_NAME", "TOK_NOTANY", "TOK_NUL", "TOK_NUMBER", "TOK_NL", "TOK_OUTS", "TOK_RAWKEY", "TOK_PLUS", "TOK_QM", "TOK_RTN", "TOK_SB", "TOK_SHIFT", - "TOK_STORE", "TOK_STOREINSTORE", "TOK_SWITCH", "TOK_UNICODE", "TOK_USE", - "TOK_USINGKEYS", "TOK_UTF", "TOK_VERSION", "TOK_XKEYSYM", "$accept", - "T_FILE", "T_HEADER", "T_HEADLINE", "T_GROUPS", "T_GROUP", "T_GHEADER", - "T_RULES", "T_RULELINE", "T_ITEMS", "T_ITEM", "T_STRING", "T_PARAMETER", - "T_KEYDEF", "T_KEYMODS", "T_BYTES", 0 + "TOK_STORE", "TOK_STOREINSTORE", "TOK_SWITCH", "TOK_TARGETS", + "TOK_UNICODE", "TOK_USE", "TOK_USINGKEYS", "TOK_UTF", "TOK_VERSION", + "TOK_XKEYSYM", "$accept", "T_FILE", "T_HEADER", "T_HEADLINE", "T_GROUPS", + "T_GROUP", "T_GHEADER", "T_RULES", "T_RULELINE", "T_ITEMS", "T_ITEM", + "T_STRING", "T_PARAMETER", "T_KEYDEF", "T_KEYMODS", "T_BYTES", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -600,276 +601,228 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306 + 305, 306, 307 }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +#define YYPACT_NINF -34 + +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-34))) + +#define YYTABLE_NINF -1 + +#define yytable_value_is_error(Yytable_value) \ + 0 + + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +static const yytype_int16 yypact[] = { - 0, 52, 53, 53, 54, 54, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 56, 56, 57, 57, 58, 58, 59, 59, 60, - 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 63, 63, 64, - 65, 65, 65, 65, 65, 65, 66, 66, 67, 67 + 120, -2, -5, -13, 0, 3, 4, -5, 26, -5, + 35, -23, 74, -13, -5, -5, -13, -34, 35, -5, + 24, -13, 47, 27, 165, -34, 27, 196, 1, -9, + 15, 26, 16, 17, -34, -34, -34, 18, 21, 22, + 26, -21, -33, 23, 35, -34, 35, 53, 35, 26, + -34, 55, -34, -34, 35, -34, -34, 35, -34, -34, + -33, 35, 35, 32, 74, 74, 39, 40, 44, 46, + 49, 50, 74, 51, 34, 52, 54, -34, -34, -34, + -34, -34, 35, -34, 196, 68, 35, -34, 56, -34, + -34, -34, -34, -34, -34, -34, 86, -34, 61, -34, + -34, -34, -34, 64, -27, -34, -34, -34, 26, -34, + -34, 26, -34, -34, 75, -34, -34, -34, -34, -34, + -34, -34, -34, -34, -34, -34, 62, -34, 35, -34, + -34, 74, -34, 74, -24, -34, -34, -34, 67, -34, + -34, -34, -34, 101, 9, -34, -34, 83, 85, 91, + -34, 35, -34, -34, -34, 26, -34, -34, -34, 93, + 121, -34, -34 }; -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, + 0, 0, 0, 0, 4, 3, 32, 34, 0, 0, + 0, 79, 0, 0, 21, 19, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 58, 0, 59, 0, 0, + 67, 0, 62, 63, 0, 54, 47, 0, 49, 57, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 2, 5, + 33, 42, 0, 35, 38, 0, 0, 69, 0, 26, + 80, 13, 12, 14, 30, 29, 0, 36, 0, 74, + 78, 76, 71, 0, 0, 9, 50, 64, 0, 53, + 66, 0, 51, 52, 0, 65, 61, 16, 45, 46, + 17, 18, 15, 28, 7, 6, 0, 27, 0, 11, + 10, 0, 39, 0, 0, 68, 70, 37, 0, 73, + 77, 75, 72, 0, 0, 48, 22, 0, 0, 0, + 23, 0, 8, 60, 56, 0, 24, 41, 40, 0, + 0, 25, 55 +}; + + /* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -34, -34, 109, -34, 10, -34, -34, 58, -34, -10, + -34, 57, -17, 76, -34, -8 +}; + + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 22, 23, 24, 25, 26, 27, 83, 84, 85, + 64, 65, 41, 103, 104, 33 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_uint8 yytable[] = +{ + 38, 72, 63, 31, 99, 67, 29, 31, 71, 100, + 139, 150, 29, 76, 97, 140, 29, 154, 42, 101, + 28, 88, 155, 90, 151, 141, 29, 106, 98, 107, + 87, 109, 96, 78, 29, 34, 80, 112, 35, 36, + 113, 110, 31, 40, 115, 116, 74, 77, 10, 86, + 89, 91, 92, 93, 118, 119, 94, 95, 105, 30, + 32, 108, 126, 111, 37, 131, 39, 117, 43, 134, + 66, 68, 69, 70, 120, 121, 73, 44, 75, 122, + 45, 123, 128, 46, 124, 125, 127, 129, 47, 130, + 133, 48, 49, 50, 136, 135, 137, 146, 51, 102, + 143, 52, 152, 144, 53, 138, 54, 55, 56, 153, + 57, 147, 58, 29, 59, 60, 145, 102, 156, 61, + 157, 148, 62, 149, 1, 2, 158, 3, 161, 162, + 4, 5, 6, 79, 159, 7, 114, 0, 0, 8, + 9, 10, 132, 11, 0, 12, 13, 160, 14, 15, + 0, 16, 0, 0, 0, 17, 0, 0, 0, 0, + 0, 142, 0, 18, 0, 0, 19, 20, 0, 1, + 2, 21, 3, 0, 0, 4, 5, 6, 0, 0, + 7, 0, 0, 0, 8, 9, 0, 0, 11, 0, + 12, 13, 0, 14, 15, 0, 16, 0, 0, 44, + 17, 0, 45, 0, 0, 46, 0, 0, 18, 0, + 47, 19, 20, 48, 49, 50, 21, 0, 0, 0, + 51, 0, 0, 52, 0, 0, 53, 0, 54, 55, + 56, 81, 57, 0, 58, 29, 59, 60, 0, 82, + 0, 61, 0, 0, 62 +}; + +static const yytype_int16 yycheck[] = +{ + 8, 18, 12, 16, 37, 13, 39, 16, 16, 42, + 37, 35, 39, 21, 35, 42, 39, 8, 41, 52, + 22, 29, 13, 31, 48, 52, 39, 44, 49, 46, + 39, 48, 40, 23, 39, 35, 26, 54, 35, 35, + 57, 49, 16, 8, 61, 62, 22, 0, 21, 48, + 35, 35, 35, 35, 64, 65, 35, 35, 35, 2, + 3, 8, 72, 8, 7, 82, 9, 35, 11, 86, + 13, 14, 15, 16, 35, 35, 19, 3, 21, 35, + 6, 35, 48, 9, 35, 35, 35, 35, 14, 35, + 22, 17, 18, 19, 8, 39, 35, 35, 24, 42, + 108, 27, 35, 111, 30, 41, 32, 33, 34, 8, + 36, 128, 38, 39, 40, 41, 41, 60, 35, 45, + 35, 131, 48, 133, 4, 5, 35, 7, 35, 8, + 10, 11, 12, 24, 151, 15, 60, -1, -1, 19, + 20, 21, 84, 23, -1, 25, 26, 155, 28, 29, + -1, 31, -1, -1, -1, 35, -1, -1, -1, -1, + -1, 104, -1, 43, -1, -1, 46, 47, -1, 4, + 5, 51, 7, -1, -1, 10, 11, 12, -1, -1, + 15, -1, -1, -1, 19, 20, -1, -1, 23, -1, + 25, 26, -1, 28, 29, -1, 31, -1, -1, 3, + 35, -1, 6, -1, -1, 9, -1, -1, 43, -1, + 14, 46, 47, 17, 18, 19, 51, -1, -1, -1, + 24, -1, -1, 27, -1, -1, 30, -1, 32, 33, + 34, 35, 36, -1, 38, 39, 40, 41, -1, 43, + -1, 45, -1, -1, 48 +}; + + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 4, 5, 7, 10, 11, 12, 15, 19, 20, + 21, 23, 25, 26, 28, 29, 31, 35, 43, 46, + 47, 51, 54, 55, 56, 57, 58, 59, 22, 39, + 64, 16, 64, 68, 35, 35, 35, 64, 68, 64, + 8, 65, 41, 64, 3, 6, 9, 14, 17, 18, + 19, 24, 27, 30, 32, 33, 34, 36, 38, 40, + 41, 45, 48, 62, 63, 64, 64, 68, 64, 64, + 64, 68, 65, 64, 22, 64, 68, 0, 57, 55, + 57, 35, 43, 60, 61, 62, 48, 39, 68, 35, + 68, 35, 35, 35, 35, 35, 68, 35, 49, 37, + 42, 52, 64, 66, 67, 35, 65, 65, 8, 65, + 68, 8, 65, 65, 66, 65, 65, 35, 62, 62, + 35, 35, 35, 35, 35, 35, 62, 35, 48, 35, + 35, 65, 60, 22, 65, 39, 8, 35, 41, 37, + 42, 52, 64, 68, 68, 41, 35, 65, 62, 62, + 35, 48, 35, 8, 8, 13, 35, 35, 35, 65, + 68, 35, 8 +}; + + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 53, 54, 54, 55, 55, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 57, 57, 58, 58, 59, 59, 60, 60, + 61, 61, 61, 62, 62, 62, 62, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 64, 64, + 65, 66, 66, 66, 66, 66, 66, 67, 67, 68, + 68 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 2, 1, 1, 2, 3, 3, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 4, 5, 5, 7, 3, 3, 3, 3, - 1, 1, 2, 1, 2, 3, 4, 1, 2, 4, - 4, 1, 1, 1, 2, 2, 1, 3, 1, 2, - 2, 2, 2, 1, 6, 4, 1, 1, 1, 4, - 2, 1, 1, 2, 2, 2, 1, 3, 2, 3, - 1, 2, 2, 1, 2, 1, 2, 1, 1, 2 + 3, 1, 1, 2, 1, 2, 3, 4, 1, 2, + 4, 4, 1, 1, 1, 2, 2, 1, 3, 1, + 2, 2, 2, 2, 1, 6, 4, 1, 1, 1, + 4, 2, 1, 1, 2, 2, 2, 1, 3, 2, + 3, 1, 2, 2, 1, 2, 1, 2, 1, 1, + 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 30, 0, 0, - 0, 0, 0, 4, 3, 31, 33, 0, 0, 0, - 78, 0, 0, 21, 19, 20, 0, 0, 0, 0, - 0, 0, 0, 0, 57, 0, 58, 0, 0, 66, - 0, 61, 62, 0, 53, 46, 0, 48, 56, 0, - 0, 0, 0, 42, 43, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 2, 5, 32, 41, - 0, 34, 37, 0, 0, 68, 0, 26, 79, 13, - 12, 14, 29, 28, 0, 35, 0, 73, 77, 75, - 70, 0, 0, 9, 49, 63, 0, 52, 65, 0, - 50, 51, 0, 64, 60, 16, 44, 45, 17, 18, - 15, 27, 7, 6, 0, 0, 11, 10, 0, 38, - 0, 0, 67, 69, 36, 0, 72, 76, 74, 71, - 0, 0, 47, 22, 0, 0, 0, 23, 0, 8, - 59, 55, 0, 24, 40, 39, 0, 0, 25, 54 -}; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 21, 22, 23, 24, 25, 26, 81, 82, 83, - 63, 64, 40, 101, 102, 32 -}; +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -33 -static const yytype_int16 yypact[] = -{ - 117, -16, -22, -12, -28, -21, 2, -22, 25, -22, - 10, 6, 227, -12, -22, -22, -12, -33, 10, 20, - -12, 46, 27, 154, -33, 27, 184, 3, -7, 14, - 25, 16, 17, -33, -33, -33, 24, 30, 37, 25, - -25, -26, 38, 10, -33, 10, 47, 10, 25, -33, - 48, -33, -33, 10, -33, -33, 10, -33, -33, -26, - 10, 10, 39, 227, 227, 41, 42, 43, 44, 45, - 49, 227, 34, 50, 51, -33, -33, -33, -33, -33, - 10, -33, 184, 60, 10, -33, 52, -33, -33, -33, - -33, -33, -33, -33, 75, -33, 53, -33, -33, -33, - -33, 19, -18, -33, -33, -33, 25, -33, -33, 25, - -33, -33, 54, -33, -33, -33, -33, -33, -33, -33, - -33, -33, -33, -33, 57, 10, -33, -33, 227, -33, - 227, -32, -33, -33, -33, 58, -33, -33, -33, -33, - 79, 21, -33, -33, 59, 62, 64, -33, 10, -33, - -33, -33, 25, -33, -33, -33, 65, 81, -33, -33 -}; +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -33, -33, 67, -33, 13, -33, -33, 22, -33, -10, - -33, 55, -17, 56, -33, -8 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 37, 71, 62, 147, 30, 66, 27, 33, 70, 30, - 95, 97, 74, 28, 34, 148, 98, 28, 39, 136, - 86, 28, 88, 96, 137, 99, 104, 28, 105, 151, - 107, 94, 85, 138, 152, 76, 110, 35, 78, 111, - 108, 30, 72, 113, 114, 28, 75, 41, 10, 87, - 84, 89, 90, 116, 117, 106, 109, 29, 31, 91, - 135, 124, 36, 128, 38, 92, 42, 131, 65, 67, - 68, 69, 93, 103, 115, 73, 118, 119, 120, 121, - 122, 125, 130, 133, 123, 126, 127, 150, 134, 159, - 77, 132, 143, 149, 153, 142, 100, 154, 140, 155, - 158, 141, 0, 0, 129, 0, 0, 0, 144, 0, - 0, 0, 0, 0, 100, 112, 0, 0, 145, 0, - 146, 1, 2, 0, 3, 0, 0, 4, 5, 6, - 0, 156, 7, 0, 0, 0, 8, 9, 10, 0, - 11, 0, 12, 13, 157, 14, 15, 0, 16, 0, - 0, 0, 17, 0, 0, 0, 0, 139, 1, 2, - 18, 3, 0, 19, 4, 5, 6, 20, 0, 7, - 0, 0, 0, 8, 9, 0, 0, 11, 0, 12, - 13, 0, 14, 15, 0, 16, 0, 43, 0, 17, - 44, 0, 0, 45, 0, 0, 0, 18, 46, 0, - 19, 47, 48, 49, 20, 0, 0, 0, 50, 0, - 0, 51, 0, 0, 52, 0, 53, 54, 55, 79, - 56, 0, 57, 28, 58, 59, 0, 80, 0, 60, - 43, 61, 0, 44, 0, 0, 45, 0, 0, 0, - 0, 46, 0, 0, 47, 48, 49, 0, 0, 0, - 0, 50, 0, 0, 51, 0, 0, 52, 0, 53, - 54, 55, 0, 56, 0, 57, 28, 58, 59, 0, - 0, 0, 60, 0, 61 -}; - -static const yytype_int16 yycheck[] = -{ - 8, 18, 12, 35, 16, 13, 22, 35, 16, 16, - 35, 37, 20, 39, 35, 47, 42, 39, 8, 37, - 28, 39, 30, 48, 42, 51, 43, 39, 45, 8, - 47, 39, 39, 51, 13, 22, 53, 35, 25, 56, - 48, 16, 22, 60, 61, 39, 0, 41, 21, 35, - 47, 35, 35, 63, 64, 8, 8, 2, 3, 35, - 41, 71, 7, 80, 9, 35, 11, 84, 13, 14, - 15, 16, 35, 35, 35, 20, 35, 35, 35, 35, - 35, 47, 22, 8, 35, 35, 35, 8, 35, 8, - 23, 39, 35, 35, 35, 41, 41, 35, 106, 35, - 35, 109, -1, -1, 82, -1, -1, -1, 125, -1, - -1, -1, -1, -1, 59, 59, -1, -1, 128, -1, - 130, 4, 5, -1, 7, -1, -1, 10, 11, 12, - -1, 148, 15, -1, -1, -1, 19, 20, 21, -1, - 23, -1, 25, 26, 152, 28, 29, -1, 31, -1, - -1, -1, 35, -1, -1, -1, -1, 102, 4, 5, - 43, 7, -1, 46, 10, 11, 12, 50, -1, 15, - -1, -1, -1, 19, 20, -1, -1, 23, -1, 25, - 26, -1, 28, 29, -1, 31, -1, 3, -1, 35, - 6, -1, -1, 9, -1, -1, -1, 43, 14, -1, - 46, 17, 18, 19, 50, -1, -1, -1, 24, -1, - -1, 27, -1, -1, 30, -1, 32, 33, 34, 35, - 36, -1, 38, 39, 40, 41, -1, 43, -1, 45, - 3, 47, -1, 6, -1, -1, 9, -1, -1, -1, - -1, 14, -1, -1, 17, 18, 19, -1, -1, -1, - -1, 24, -1, -1, 27, -1, -1, 30, -1, 32, - 33, 34, -1, 36, -1, 38, 39, 40, 41, -1, - -1, -1, 45, -1, 47 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 4, 5, 7, 10, 11, 12, 15, 19, 20, - 21, 23, 25, 26, 28, 29, 31, 35, 43, 46, - 50, 53, 54, 55, 56, 57, 58, 22, 39, 63, - 16, 63, 67, 35, 35, 35, 63, 67, 63, 8, - 64, 41, 63, 3, 6, 9, 14, 17, 18, 19, - 24, 27, 30, 32, 33, 34, 36, 38, 40, 41, - 45, 47, 61, 62, 63, 63, 67, 63, 63, 63, - 67, 64, 22, 63, 67, 0, 56, 54, 56, 35, - 43, 59, 60, 61, 47, 39, 67, 35, 67, 35, - 35, 35, 35, 35, 67, 35, 48, 37, 42, 51, - 63, 65, 66, 35, 64, 64, 8, 64, 67, 8, - 64, 64, 65, 64, 64, 35, 61, 61, 35, 35, - 35, 35, 35, 35, 61, 47, 35, 35, 64, 59, - 22, 64, 39, 8, 35, 41, 37, 42, 51, 63, - 67, 67, 41, 35, 64, 61, 61, 35, 47, 35, - 8, 8, 13, 35, 35, 35, 64, 67, 35, 8 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) + +/* Error token number */ +#define YYTERROR 1 +#define YYERRCODE 256 -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -879,54 +832,46 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -934,22 +879,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -960,66 +894,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1033,7 +955,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1048,7 +970,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1057,15 +978,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1081,16 +995,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1120,27 +1026,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1151,211 +1057,209 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. + + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) { - int yyn = yypact[yystate]; + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = YY_NULLPTR; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + /* There are many possibilities here to consider: + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } } + + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } + + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; + } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ -/* The look-ahead symbol. */ + +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; - /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { - - int yystate; + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + + /* The stacks and their tools: + 'yyss': related to states. + 'yyvs': related to semantic values. + + Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYSIZE_T yystacksize; + int yyn; int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead token as an internal (translated) token number. */ int yytoken = 0; + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + #if YYERROR_VERBOSE /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; @@ -1363,54 +1267,22 @@ yyparse () YYSIZE_T yymsg_alloc = sizeof yymsgbuf; #endif - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - - #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - YYSIZE_T yystacksize = YYINITDEPTH; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - - /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yystacksize = YYINITDEPTH; + YYDPRINTF ((stderr, "Starting parse\n")); yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; /*------------------------------------------------------------. @@ -1431,25 +1303,23 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -1457,23 +1327,22 @@ yyparse () # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -1481,16 +1350,18 @@ yyparse () yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + if (yystate == YYFINAL) + YYACCEPT; + goto yybackup; /*-----------. @@ -1499,20 +1370,20 @@ yyparse () yybackup: /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (); } if (yychar <= YYEOF) @@ -1534,29 +1405,27 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; + /* Discard the shifted token. */ + yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -1579,7 +1448,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1593,472 +1462,539 @@ yyreduce: switch (yyn) { case 2: -#line 103 "yacc.y" +#line 104 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - kbp->groups = (yyvsp[(2) - (2)].group); - kbp->ngroups = count_groups((yyvsp[(2) - (2)].group)); + kbp->groups = (yyvsp[0].group); + kbp->ngroups = count_groups((yyvsp[0].group)); kbp->nstores = count_stores(kbp->stores); } +#line 1472 "yacc.c" /* yacc.c:1646 */ break; case 3: -#line 109 "yacc.y" +#line 110 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - kbp->groups = (yyvsp[(1) - (1)].group); - kbp->ngroups = count_groups((yyvsp[(1) - (1)].group)); + kbp->groups = (yyvsp[0].group); + kbp->ngroups = count_groups((yyvsp[0].group)); kbp->nstores = count_stores(kbp->stores); } +#line 1482 "yacc.c" /* yacc.c:1646 */ break; case 6: -#line 123 "yacc.y" +#line 124 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&name",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&name",(yyvsp[-1].string),lineno); } +#line 1490 "yacc.c" /* yacc.c:1646 */ break; case 7: -#line 127 "yacc.y" +#line 128 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&name",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&name",(yyvsp[-1].string),lineno); } +#line 1498 "yacc.c" /* yacc.c:1646 */ break; case 8: -#line 131 "yacc.y" +#line 132 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store("&hotkey",new_list((yyvsp[(3) - (5)].number)),lineno); + new_store("&hotkey",new_list((yyvsp[-2].number)),lineno); } +#line 1506 "yacc.c" /* yacc.c:1646 */ break; case 9: -#line 135 "yacc.y" +#line 136 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&hotkey",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&hotkey",(yyvsp[-1].string),lineno); } +#line 1514 "yacc.c" /* yacc.c:1646 */ break; case 10: -#line 139 "yacc.y" +#line 140 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&version",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&version",(yyvsp[-1].string),lineno); } +#line 1522 "yacc.c" /* yacc.c:1646 */ break; case 11: -#line 143 "yacc.y" +#line 144 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&version",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&version",(yyvsp[-1].string),lineno); } +#line 1530 "yacc.c" /* yacc.c:1646 */ break; case 12: -#line 147 "yacc.y" +#line 148 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&bitmap",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); } +#line 1538 "yacc.c" /* yacc.c:1646 */ break; case 13: -#line 151 "yacc.y" +#line 152 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&bitmap",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); } +#line 1546 "yacc.c" /* yacc.c:1646 */ break; case 14: -#line 155 "yacc.y" +#line 156 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("©right",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("©right",(yyvsp[-1].string),lineno); } +#line 1554 "yacc.c" /* yacc.c:1646 */ break; case 15: -#line 159 "yacc.y" +#line 160 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&message",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&message",(yyvsp[-1].string),lineno); } +#line 1562 "yacc.c" /* yacc.c:1646 */ break; case 16: -#line 163 "yacc.y" +#line 164 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&language",(yyvsp[(2) - (3)].items),lineno); + new_store_from_string("&language",(yyvsp[-1].items),lineno); } +#line 1570 "yacc.c" /* yacc.c:1646 */ break; case 17: -#line 167 "yacc.y" +#line 168 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&layout",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&layout",(yyvsp[-1].string),lineno); } +#line 1578 "yacc.c" /* yacc.c:1646 */ break; case 18: -#line 171 "yacc.y" +#line 172 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&layout",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&layout",(yyvsp[-1].string),lineno); } +#line 1586 "yacc.c" /* yacc.c:1646 */ break; case 19: -#line 175 "yacc.y" +#line 176 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&capsalwaysoff","1",lineno); } +#line 1594 "yacc.c" /* yacc.c:1646 */ break; case 20: -#line 179 "yacc.y" +#line 180 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&capsononly","1",lineno); } +#line 1602 "yacc.c" /* yacc.c:1646 */ break; case 21: -#line 183 "yacc.y" +#line 184 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&shiftfreescaps","1",lineno); } +#line 1610 "yacc.c" /* yacc.c:1646 */ break; case 22: -#line 187 "yacc.y" +#line 188 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store((yyvsp[(2) - (4)].string),(yyvsp[(3) - (4)].items),lineno); + new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); } +#line 1618 "yacc.c" /* yacc.c:1646 */ break; case 23: -#line 191 "yacc.y" +#line 192 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - set_start_group((yyvsp[(4) - (5)].string),KF_ANSI, lineno); + set_start_group((yyvsp[-1].string),KF_ANSI, lineno); } +#line 1626 "yacc.c" /* yacc.c:1646 */ break; case 24: -#line 195 "yacc.y" +#line 196 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - set_start_group((yyvsp[(4) - (5)].string),KF_UNICODE, lineno); + set_start_group((yyvsp[-1].string),KF_UNICODE, lineno); } +#line 1634 "yacc.c" /* yacc.c:1646 */ break; case 25: -#line 199 "yacc.y" +#line 200 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kmflcomp_error(lineno,"alternate starting groups not supported"); fail(11,"obsolete syntax"); } +#line 1643 "yacc.c" /* yacc.c:1646 */ break; case 26: -#line 204 "yacc.y" +#line 205 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&author",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&author",(yyvsp[-1].string),lineno); } +#line 1651 "yacc.c" /* yacc.c:1646 */ break; case 27: -#line 208 "yacc.y" +#line 209 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&mnemoniclayout",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&targets",(yyvsp[-1].string),lineno); } +#line 1659 "yacc.c" /* yacc.c:1646 */ break; case 28: -#line 212 "yacc.y" +#line 213 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("ðnologuecode",(yyvsp[(2) - (3)].string),lineno); + new_store_from_string("&mnemoniclayout",(yyvsp[-1].string),lineno); } +#line 1667 "yacc.c" /* yacc.c:1646 */ break; - case 31: -#line 221 "yacc.y" - { - (yyval.group) = kbp->groups; + case 29: +#line 217 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("ðnologuecode",(yyvsp[-1].string),lineno); } +#line 1675 "yacc.c" /* yacc.c:1646 */ break; case 32: -#line 225 "yacc.y" +#line 226 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = kbp->groups; } +#line 1683 "yacc.c" /* yacc.c:1646 */ break; case 33: -#line 232 "yacc.y" +#line 230 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.group) = (yyvsp[(1) - (1)].group); - ((yyval.group))->rules = NULL; - ((yyval.group))->nrules = 0; - kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[(1) - (1)].group))->name); + (yyval.group) = kbp->groups; } +#line 1691 "yacc.c" /* yacc.c:1646 */ break; case 34: -#line 239 "yacc.y" +#line 237 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.group) = (yyvsp[(1) - (2)].group); - ((yyval.group))->rules = (yyvsp[(2) - (2)].rule); - ((yyval.group))->nrules = count_rules((yyvsp[(2) - (2)].rule)); - if(((yyval.group))->nrules == 0) - kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[(1) - (2)].group))->name); + (yyval.group) = (yyvsp[0].group); + ((yyval.group))->rules = NULL; + ((yyval.group))->nrules = 0; + kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[0].group))->name); } +#line 1702 "yacc.c" /* yacc.c:1646 */ break; case 35: -#line 250 "yacc.y" +#line 244 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.group) = gp = new_group((yyvsp[(2) - (3)].string), lineno); - if(gp) gp->flags = 0; + (yyval.group) = (yyvsp[-1].group); + ((yyval.group))->rules = (yyvsp[0].rule); + ((yyval.group))->nrules = count_rules((yyvsp[0].rule)); + if(((yyval.group))->nrules == 0) + kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[-1].group))->name); } +#line 1714 "yacc.c" /* yacc.c:1646 */ break; case 36: -#line 256 "yacc.y" +#line 255 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.group) = gp = new_group((yyvsp[(2) - (4)].string), lineno); - if(gp) gp->flags = GF_USEKEYS; + (yyval.group) = gp = new_group((yyvsp[-1].string), lineno); + if(gp) gp->flags = 0; } +#line 1723 "yacc.c" /* yacc.c:1646 */ break; case 37: -#line 264 "yacc.y" +#line 261 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.rule) = (yyvsp[(1) - (1)].rule); + (yyval.group) = gp = new_group((yyvsp[-2].string), lineno); + if(gp) gp->flags = GF_USEKEYS; } +#line 1732 "yacc.c" /* yacc.c:1646 */ break; case 38: -#line 268 "yacc.y" +#line 269 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.rule) = add_rule((yyvsp[(1) - (2)].rule), (yyvsp[(2) - (2)].rule)); + (yyval.rule) = (yyvsp[0].rule); } +#line 1740 "yacc.c" /* yacc.c:1646 */ break; case 39: -#line 275 "yacc.y" +#line 273 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.rule) = new_rule(gp, (yyvsp[(1) - (4)].items), (yyvsp[(3) - (4)].items), lineno); + (yyval.rule) = add_rule((yyvsp[-1].rule), (yyvsp[0].rule)); } +#line 1748 "yacc.c" /* yacc.c:1646 */ break; case 40: -#line 279 "yacc.y" +#line 280 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store((yyvsp[(2) - (4)].string),(yyvsp[(3) - (4)].items),lineno); (yyval.rule) = NULL; + (yyval.rule) = new_rule(gp, (yyvsp[-3].items), (yyvsp[-1].items), lineno); } +#line 1756 "yacc.c" /* yacc.c:1646 */ break; case 41: -#line 283 "yacc.y" +#line 284 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.rule) = NULL; + new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); (yyval.rule) = NULL; } +#line 1764 "yacc.c" /* yacc.c:1646 */ break; case 42: -#line 290 "yacc.y" +#line 288 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = new_list((yyvsp[(1) - (1)].number)); + (yyval.rule) = NULL; } +#line 1772 "yacc.c" /* yacc.c:1646 */ break; case 43: -#line 294 "yacc.y" +#line 295 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = items_from_string((yyvsp[(1) - (1)].string),lineno); + (yyval.items) = new_list((yyvsp[0].number)); } +#line 1780 "yacc.c" /* yacc.c:1646 */ break; case 44: -#line 298 "yacc.y" +#line 299 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = add_item_to_list((yyvsp[(2) - (2)].items),(yyvsp[(1) - (2)].number)); + (yyval.items) = items_from_string((yyvsp[0].string),lineno); } +#line 1788 "yacc.c" /* yacc.c:1646 */ break; case 45: -#line 302 "yacc.y" +#line 303 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = add_lists((yyvsp[(2) - (2)].items),items_from_string((yyvsp[(1) - (2)].string),lineno)); + (yyval.items) = add_item_to_list((yyvsp[0].items),(yyvsp[-1].number)); } +#line 1796 "yacc.c" /* yacc.c:1646 */ break; case 46: -#line 309 "yacc.y" +#line 307 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_CHAR,(yyvsp[(1) - (1)].number)); + (yyval.items) = add_lists((yyvsp[0].items),items_from_string((yyvsp[-1].string),lineno)); } +#line 1804 "yacc.c" /* yacc.c:1646 */ break; case 47: -#line 313 "yacc.y" +#line 314 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_KEYSYM,(yyvsp[(2) - (3)].number)); + (yyval.number) = MAKE_ITEM(ITEM_CHAR,(yyvsp[0].number)); } +#line 1812 "yacc.c" /* yacc.c:1646 */ break; case 48: -#line 317 "yacc.y" +#line 318 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_PLUS,0); /* include in item list - remove later when testing validity */ + (yyval.number) = MAKE_ITEM(ITEM_KEYSYM,(yyvsp[-1].number)); } +#line 1820 "yacc.c" /* yacc.c:1646 */ break; case 49: -#line 321 "yacc.y" +#line 322 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - if((n=store_number((yyvsp[(2) - (2)].string),lineno)) != UNDEFINED) + (yyval.number) = MAKE_ITEM(ITEM_PLUS,0); /* include in item list - remove later when testing validity */ + } +#line 1828 "yacc.c" /* yacc.c:1646 */ + break; + + case 50: +#line 326 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { (yyval.number) = MAKE_ITEM(ITEM_ANY,n); } else { - kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[(2) - (2)].string)); + kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[0].string)); (yyval.number) = 0; } } +#line 1844 "yacc.c" /* yacc.c:1646 */ break; - case 50: -#line 333 "yacc.y" + case 51: +#line 338 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - if((n=store_number((yyvsp[(2) - (2)].string),lineno)) != UNDEFINED) + if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { (yyval.number) = MAKE_ITEM(ITEM_NOTANY,n); } else { - kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[(2) - (2)].string)); + kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[0].string)); (yyval.number) = 0; } } +#line 1860 "yacc.c" /* yacc.c:1646 */ break; - case 51: -#line 345 "yacc.y" + case 52: +#line 350 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - if((n=store_number((yyvsp[(2) - (2)].string),lineno)) != UNDEFINED) + if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { (yyval.number) = MAKE_ITEM(ITEM_OUTS,n); } else { - kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[(2) - (2)].string)); + kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[0].string)); (yyval.number) = 0; } } - break; - - case 52: -#line 357 "yacc.y" - { - (yyval.number) = MAKE_ITEM(ITEM_DEADKEY,deadkey_number((yyvsp[(2) - (2)].string), lineno)); - } +#line 1876 "yacc.c" /* yacc.c:1646 */ break; case 53: -#line 361 "yacc.y" +#line 362 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_NUL,0); + (yyval.number) = MAKE_ITEM(ITEM_DEADKEY,deadkey_number((yyvsp[0].string), lineno)); } +#line 1884 "yacc.c" /* yacc.c:1646 */ break; case 54: -#line 365 "yacc.y" +#line 366 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - if((n=store_number((yyvsp[(3) - (6)].string),lineno)) != UNDEFINED) - { - (yyval.number) = MAKE_PARAMETER_ITEM(ITEM_INDEX,atoi((yyvsp[(5) - (6)].string)),n); - } - else - { - kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[(3) - (6)].string)); - (yyval.number) = 0; - } + (yyval.number) = MAKE_ITEM(ITEM_NUL,0); } +#line 1892 "yacc.c" /* yacc.c:1646 */ break; case 55: -#line 377 "yacc.y" +#line 370 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - kmflcomp_warn(lineno,"index(%s) must have TWO parameters!",(yyvsp[(3) - (4)].string)); - (yyval.number) = 0; + if((n=store_number((yyvsp[-3].string),lineno)) != UNDEFINED) + { + (yyval.number) = MAKE_PARAMETER_ITEM(ITEM_INDEX,atoi((yyvsp[-1].string)),n); + } + else + { + kmflcomp_warn(lineno,"store (%s) is undefined!",(yyvsp[-3].string)); + (yyval.number) = 0; + } } +#line 1908 "yacc.c" /* yacc.c:1646 */ break; case 56: -#line 382 "yacc.y" +#line 382 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_RETURN,0); + kmflcomp_warn(lineno,"index(%s) must have TWO parameters!",(yyvsp[-1].string)); + (yyval.number) = 0; } +#line 1917 "yacc.c" /* yacc.c:1646 */ break; case 57: -#line 386 "yacc.y" +#line 387 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_BEEP,0); + (yyval.number) = MAKE_ITEM(ITEM_RETURN,0); } +#line 1925 "yacc.c" /* yacc.c:1646 */ break; case 58: -#line 390 "yacc.y" +#line 391 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,0); + (yyval.number) = MAKE_ITEM(ITEM_BEEP,0); } +#line 1933 "yacc.c" /* yacc.c:1646 */ break; case 59: -#line 394 "yacc.y" +#line 395 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,atoi((yyvsp[(3) - (4)].string))); + (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,0); } +#line 1941 "yacc.c" /* yacc.c:1646 */ break; case 60: -#line 398 "yacc.y" +#line 399 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_USE,group_number((yyvsp[(2) - (2)].string), lineno)); + (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,atoi((yyvsp[-1].string))); } +#line 1949 "yacc.c" /* yacc.c:1646 */ break; case 61: -#line 402 "yacc.y" +#line 403 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_MATCH,0); + (yyval.number) = MAKE_ITEM(ITEM_USE,group_number((yyvsp[0].string), lineno)); } +#line 1957 "yacc.c" /* yacc.c:1646 */ break; case 62: -#line 406 "yacc.y" +#line 407 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_NOMATCH,0); + (yyval.number) = MAKE_ITEM(ITEM_MATCH,0); } +#line 1965 "yacc.c" /* yacc.c:1646 */ break; case 63: -#line 410 "yacc.y" +#line 411 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = MAKE_ITEM(ITEM_NOMATCH,0); + } +#line 1973 "yacc.c" /* yacc.c:1646 */ + break; + + case 64: +#line 415 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kmflcomp_error(lineno,"call keyword not implemented"); fail(12,"unsupported keyword"); } +#line 1982 "yacc.c" /* yacc.c:1646 */ break; - case 64: -#line 415 "yacc.y" + case 65: +#line 420 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kmflcomp_error(lineno,"switch keyword not implemented"); fail(11,"obsolete syntax"); } +#line 1991 "yacc.c" /* yacc.c:1646 */ break; - case 65: -#line 420 "yacc.y" + case 66: +#line 425 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { STORE *sp; /* check for named constants */ - sp = find_store((yyvsp[(2) - (2)].string)); + sp = find_store((yyvsp[0].string)); if(sp) { (yyval.number) = *sp->items; @@ -2069,111 +2005,136 @@ yyreduce: kmflcomp_error(lineno,"undefined constant"); } } - break; - - case 66: -#line 434 "yacc.y" - { - kmflcomp_error(lineno,"illegal or unrecognized item in rule or store"); - } +#line 2009 "yacc.c" /* yacc.c:1646 */ break; case 67: -#line 441 "yacc.y" - { - (yyval.string) = (yyvsp[(2) - (3)].string); +#line 439 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + kmflcomp_error(lineno,"illegal or unrecognized item in rule or store"); } +#line 2017 "yacc.c" /* yacc.c:1646 */ break; case 68: -#line 446 "yacc.y" - { - (yyval.string) = new_string(0); /* allow for empty strings */ +#line 446 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = (yyvsp[-1].string); } +#line 2025 "yacc.c" /* yacc.c:1646 */ break; case 69: -#line 453 "yacc.y" +#line 451 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.string) = (yyvsp[(2) - (3)].string); + (yyval.string) = new_string(0); /* allow for empty strings */ } +#line 2033 "yacc.c" /* yacc.c:1646 */ break; case 70: -#line 460 "yacc.y" - { - (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[(1) - (1)].string),lineno)); +#line 458 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = (yyvsp[-1].string); } +#line 2041 "yacc.c" /* yacc.c:1646 */ break; case 71: -#line 465 "yacc.y" +#line 465 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[(2) - (2)].string),lineno)); + (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); } +#line 2049 "yacc.c" /* yacc.c:1646 */ break; case 72: -#line 470 "yacc.y" - { - (yyval.number) = make_keysym(lineno, (yyvsp[(1) - (2)].number),(yyvsp[(2) - (2)].number)); +#line 470 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); } +#line 2057 "yacc.c" /* yacc.c:1646 */ break; case 73: -#line 474 "yacc.y" +#line 475 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_keysym(lineno, 0,(yyvsp[(1) - (1)].number)); + (yyval.number) = make_keysym(lineno, (yyvsp[-1].number),(yyvsp[0].number)); } +#line 2065 "yacc.c" /* yacc.c:1646 */ break; case 74: -#line 478 "yacc.y" +#line 479 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_xkeysym(lineno, (yyvsp[(1) - (2)].number), (yyvsp[(2) - (2)].number)); + (yyval.number) = make_keysym(lineno, 0,(yyvsp[0].number)); } +#line 2073 "yacc.c" /* yacc.c:1646 */ break; case 75: -#line 482 "yacc.y" +#line 483 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_xkeysym(lineno, 0, (yyvsp[(1) - (1)].number)); + (yyval.number) = make_xkeysym(lineno, (yyvsp[-1].number), (yyvsp[0].number)); } +#line 2081 "yacc.c" /* yacc.c:1646 */ break; case 76: -#line 489 "yacc.y" +#line 487 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = (yyvsp[(1) - (2)].number) | (yyvsp[(2) - (2)].number); + (yyval.number) = make_xkeysym(lineno, 0, (yyvsp[0].number)); } +#line 2089 "yacc.c" /* yacc.c:1646 */ break; case 77: -#line 493 "yacc.y" +#line 494 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = (yyvsp[(1) - (1)].number); + (yyval.number) = (yyvsp[-1].number) | (yyvsp[0].number); } +#line 2097 "yacc.c" /* yacc.c:1646 */ break; case 78: -#line 500 "yacc.y" - { - (yyval.string) = new_string((yyvsp[(1) - (1)].number)); +#line 498 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = (yyvsp[0].number); } +#line 2105 "yacc.c" /* yacc.c:1646 */ break; case 79: -#line 504 "yacc.y" - { - (yyval.string) = add_char((yyvsp[(2) - (2)].string),(yyvsp[(1) - (2)].number)); +#line 505 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = new_string((yyvsp[0].number)); } +#line 2113 "yacc.c" /* yacc.c:1646 */ + break; + + case 80: +#line 509 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = add_char((yyvsp[0].string),(yyvsp[-1].number)); + } +#line 2121 "yacc.c" /* yacc.c:1646 */ break; -/* Line 1267 of yacc.c. */ -#line 2175 "yacc.c" +#line 2125 "yacc.c" /* yacc.c:1646 */ default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -2182,8 +2143,7 @@ yyreduce: *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -2198,10 +2158,14 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -2209,37 +2173,36 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -2247,24 +2210,24 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2280,7 +2243,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2293,38 +2256,37 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -2348,7 +2310,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#ifndef yyoverflow +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2359,17 +2321,22 @@ yyexhaustedlab: #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -2380,12 +2347,9 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -#line 510 "yacc.y" +#line 515 "../../kmflcomp/src/yacc.y" /* yacc.c:1906 */ void yyerror(char *str) @@ -2401,4 +2365,3 @@ int yywrap(void) return 1; } #endif - diff --git a/linux/kmflcomp/src/yacc.h b/linux/kmflcomp/src/yacc.h index f978859565..9d5ceecc88 100644 --- a/linux/kmflcomp/src/yacc.h +++ b/linux/kmflcomp/src/yacc.h @@ -1,14 +1,13 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +15,7 @@ GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,62 +30,72 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Tokens. */ +#ifndef YY_YY_YACC_H_INCLUDED +# define YY_YY_YACC_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - TOK_ANY = 258, - TOK_ANSI = 259, - TOK_AUTHOR = 260, - TOK_BEEP = 261, - TOK_BITMAP = 262, - TOK_BRKT = 263, - TOK_CALL = 264, - TOK_CAPSFREE = 265, - TOK_CAPSOFF = 266, - TOK_CAPSON = 267, - TOK_COMMA = 268, - TOK_CONTEXT = 269, - TOK_COPYRIGHT = 270, - TOK_CHAR = 271, - TOK_DEADKEY = 272, - TOK_DOLLAR = 273, - TOK_ERROR = 274, - TOK_ETHNOLOGUE = 275, - TOK_GROUP = 276, - TOK_GT = 277, - TOK_HOTKEY = 278, - TOK_INDEX = 279, - TOK_LANGUAGE = 280, - TOK_LAYOUT = 281, - TOK_MATCH = 282, - TOK_MESSAGE = 283, - TOK_MNEMONIC = 284, - TOK_NOMATCH = 285, - TOK_NAME = 286, - TOK_NOTANY = 287, - TOK_NUL = 288, - TOK_NUMBER = 289, - TOK_NL = 290, - TOK_OUTS = 291, - TOK_RAWKEY = 292, - TOK_PLUS = 293, - TOK_QM = 294, - TOK_RTN = 295, - TOK_SB = 296, - TOK_SHIFT = 297, - TOK_STORE = 298, - TOK_STOREINSTORE = 299, - TOK_SWITCH = 300, - TOK_UNICODE = 301, - TOK_USE = 302, - TOK_USINGKEYS = 303, - TOK_UTF = 304, - TOK_VERSION = 305, - TOK_XKEYSYM = 306 - }; + enum yytokentype + { + TOK_ANY = 258, + TOK_ANSI = 259, + TOK_AUTHOR = 260, + TOK_BEEP = 261, + TOK_BITMAP = 262, + TOK_BRKT = 263, + TOK_CALL = 264, + TOK_CAPSFREE = 265, + TOK_CAPSOFF = 266, + TOK_CAPSON = 267, + TOK_COMMA = 268, + TOK_CONTEXT = 269, + TOK_COPYRIGHT = 270, + TOK_CHAR = 271, + TOK_DEADKEY = 272, + TOK_DOLLAR = 273, + TOK_ERROR = 274, + TOK_ETHNOLOGUE = 275, + TOK_GROUP = 276, + TOK_GT = 277, + TOK_HOTKEY = 278, + TOK_INDEX = 279, + TOK_LANGUAGE = 280, + TOK_LAYOUT = 281, + TOK_MATCH = 282, + TOK_MESSAGE = 283, + TOK_MNEMONIC = 284, + TOK_NOMATCH = 285, + TOK_NAME = 286, + TOK_NOTANY = 287, + TOK_NUL = 288, + TOK_NUMBER = 289, + TOK_NL = 290, + TOK_OUTS = 291, + TOK_RAWKEY = 292, + TOK_PLUS = 293, + TOK_QM = 294, + TOK_RTN = 295, + TOK_SB = 296, + TOK_SHIFT = 297, + TOK_STORE = 298, + TOK_STOREINSTORE = 299, + TOK_SWITCH = 300, + TOK_TARGETS = 301, + TOK_UNICODE = 302, + TOK_USE = 303, + TOK_USINGKEYS = 304, + TOK_UTF = 305, + TOK_VERSION = 306, + TOK_XKEYSYM = 307 + }; #endif /* Tokens. */ #define TOK_ANY 258 @@ -134,34 +141,40 @@ #define TOK_STORE 298 #define TOK_STOREINSTORE 299 #define TOK_SWITCH 300 -#define TOK_UNICODE 301 -#define TOK_USE 302 -#define TOK_USINGKEYS 303 -#define TOK_UTF 304 -#define TOK_VERSION 305 -#define TOK_XKEYSYM 306 - - - +#define TOK_TARGETS 301 +#define TOK_UNICODE 302 +#define TOK_USE 303 +#define TOK_USINGKEYS 304 +#define TOK_UTF 305 +#define TOK_VERSION 306 +#define TOK_XKEYSYM 307 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 25 "yacc.y" + +union YYSTYPE { +#line 25 "../../kmflcomp/src/yacc.y" /* yacc.c:1909 */ + int simple; ITEM number; char *string; ITEM *items; RULE *rule; GROUP *group; - } -/* Line 1489 of yacc.c. */ -#line 160 "yacc.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + + +#line 168 "yacc.h" /* yacc.c:1909 */ +}; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; +int yyparse (void); + +#endif /* !YY_YY_YACC_H_INCLUDED */ diff --git a/linux/kmflcomp/src/yacc.y b/linux/kmflcomp/src/yacc.y index c412e9b662..02f586d444 100755 --- a/linux/kmflcomp/src/yacc.y +++ b/linux/kmflcomp/src/yacc.y @@ -90,6 +90,7 @@ GROUP *gp = NULL; /* Temporary group pointer */ %token TOK_STORE %token TOK_STOREINSTORE %token TOK_SWITCH +%token TOK_TARGETS %token TOK_UNICODE %token TOK_USE %token TOK_USINGKEYS @@ -204,6 +205,10 @@ T_HEADLINE : { new_store_from_string("&author",$2,lineno); } + | TOK_TARGETS T_STRING TOK_NL + { + new_store_from_string("&targets",$2,lineno); + } | TOK_MNEMONIC T_STRING TOK_NL { new_store_from_string("&mnemoniclayout",$2,lineno); From 7f90d9cedec6de84e3e6f6e6444d8a6c9e72580b Mon Sep 17 00:00:00 2001 From: glasseyes Date: Fri, 24 Aug 2018 16:41:40 +0700 Subject: [PATCH 3/9] handle keyman format version numbers > 10 --- linux/kmflcomp/include/kmfl.h | 6 +++--- linux/kmflcomp/src/compiler.h | 2 +- linux/kmflcomp/src/kmflcomp.c | 18 +++++++++--------- linux/libkmfl/src/kmfl_load_keyboard.c | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/linux/kmflcomp/include/kmfl.h b/linux/kmflcomp/include/kmfl.h index 39075c4c1f..4dae01dfb4 100644 --- a/linux/kmflcomp/include/kmfl.h +++ b/linux/kmflcomp/include/kmfl.h @@ -37,8 +37,8 @@ extern "C" { #include #define FILE_VERSION "1" -#define BASE_VERSION "320" -#define LAST_VERSION "700" +#define BASE_VERSION "0320" +#define LAST_VERSION "1000" // Undefine some Windows constants so we can use them (even on Windows) #ifdef UNDEFINED @@ -147,7 +147,7 @@ typedef struct _xgroup XGROUP; // Compiled keyboard structure struct _xkeyboard { char id[4]; // always KMFL - char version[4]; // keyboard version(3) and file version(1) + char version[5]; // keyboard version(4) and file version(1) char name[NAMELEN+1]; // utf8 version of keyboard name UINT mode:1; // Keyboard Flags: Unicode (0) or ANSI (1) UINT layout:1; // positional(0) or mnemonic(1) diff --git a/linux/kmflcomp/src/compiler.h b/linux/kmflcomp/src/compiler.h index 5272b875bd..cca110ee1c 100644 --- a/linux/kmflcomp/src/compiler.h +++ b/linux/kmflcomp/src/compiler.h @@ -65,7 +65,7 @@ typedef struct _group GROUP; // Keyboard structure struct _keyboard { char id[4]; // always KMFL - char version[4]; // initially 1000 + char version[5]; // initially 1000 char name[NAMELEN+1]; // utf8 version of keyboard name UINT mode:1; // Keyboard Flags: Unicode (0) or ANSI (1) UINT layout:1; // positional(0) or mnemonic(1) diff --git a/linux/kmflcomp/src/kmflcomp.c b/linux/kmflcomp/src/kmflcomp.c index d1770f4872..1f9b52c287 100644 --- a/linux/kmflcomp/src/kmflcomp.c +++ b/linux/kmflcomp/src/kmflcomp.c @@ -114,12 +114,12 @@ void write_keyboard(char * infile, void *keyboard_buffer, int keyboard_buffer_si fprintf(stderr," Total warnings: %d\n",warncount); } - if(Version[2] > '0') - fprintf(stderr,"Keyboard '%s' (Version %c.%c%c) compiled to %ld bytes\n", - kbp->name,Version[0],Version[1],Version[2],filesize); + if(Version[3] > '0') + fprintf(stderr,"Keyboard '%s' (Version %c%c.%c%c) compiled to %ld bytes\n", + kbp->name,Version[0],Version[1],Version[2],Version[3],filesize); else - fprintf(stderr,"Keyboard '%s' (Version %c.%c) compiled to %ld bytes\n", - kbp->name,Version[0],Version[1],filesize); + fprintf(stderr,"Keyboard '%s' (Version %c%c.%c) compiled to %ld bytes\n", + kbp->name,Version[0],Version[1],Version[2],filesize); } else fail(3,"unable to save output file!"); @@ -285,7 +285,7 @@ unsigned long create_keyboard_buffer(const char *infile, void ** kb_buf) // Set tag and version memcpy(&xkbd.id,"KMFL",4); - memcpy(&xkbd.version,Version,4); + memcpy(&xkbd.version,Version,5); // add the keyboard header keyboard_buffer = append_to_buffer(keyboard_buffer, &keyboard_buffer_size, &xkbd, sizeof(XKEYBOARD)); @@ -572,14 +572,14 @@ ITEM *check_lhs(ITEM *lhs, unsigned int ilen, GROUP *gp, int line) } *p = 0; // ensure rule string terminated after compacting - if((gp->flags & GF_USEKEYS) && !goodplus && (Version[0] > '3')) + if((gp->flags & GF_USEKEYS) && !goodplus && (Version[1] > '3' || Version[0] >= '1')) // needs review { kmflcomp_warn(line,"'+' should be used before the keystroke"); } if(badplus) { - if(Version[0] > '5') + if(Version[1] > '5' || Version[0] >= '1') // needs review kmflcomp_error(line,"use '+' only immediately before keystroke"); else kmflcomp_warn(line,"'+' used incorrectly (but ignored)"); @@ -1165,7 +1165,7 @@ void process_special_store(char *name, STORE *sp, int line) break; case SS_VERSION: kbver = (int)(100.0*atof(items_to_string(sp->items))+0.5); - sprintf(Version,"%3.3d%1.1s",kbver,FILE_VERSION); + sprintf(Version,"%4.4d%1.1s",kbver,FILE_VERSION); break; case SS_BITMAP: check_bitmap_file(sp,line); diff --git a/linux/libkmfl/src/kmfl_load_keyboard.c b/linux/libkmfl/src/kmfl_load_keyboard.c index d9bb670f3e..5656c573f6 100644 --- a/linux/libkmfl/src/kmfl_load_keyboard.c +++ b/linux/libkmfl/src/kmfl_load_keyboard.c @@ -191,7 +191,7 @@ XKEYBOARD * kmfl_load_keyboard_from_file(const char *filename) if (errcode == 0) { compile_keyboard_to_buffer(filename, (void *) &p_kbd); - memcpy(version_string,p_kbd->version,3); // Copy to ensure terminated + memcpy(version_string,p_kbd->version,4); // Copy to ensure terminated kbver = (unsigned)atoi(version_string); } else @@ -219,17 +219,17 @@ XKEYBOARD * kmfl_load_keyboard_from_file(const char *filename) return NULL; } fclose(fp); - memcpy(version_string,p_kbd->version,3); // Copy to ensure terminated + memcpy(version_string,p_kbd->version,4); // Copy to ensure terminated kbver = (unsigned)atoi(version_string); } } // Check the loaded file is valid and has the correct version if((memcmp(p_kbd->id,"KMFL",4) != 0) - || (p_kbd->version[3] != *FILE_VERSION) + || (p_kbd->version[4] != *FILE_VERSION) || (kbver < (unsigned)atoi(BASE_VERSION)) || (kbver > (unsigned)atoi(LAST_VERSION))) { - DBGMSG(1, "Invalid version\n"); + DBGMSG(1, "Invalid version %s\n", version_string); free(p_kbd); return NULL; } From 0063cc4ba1ec151dbfefc92b012574e1127cb3c1 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Tue, 28 Aug 2018 14:18:04 +0700 Subject: [PATCH 4/9] update check_bitmap check for icons dir and .ico converted to .bmp yacc.y LANGUAGE is handled as a string some linux .gitignore don't search fof icons dir or .ico in ibus-kmfl --- .gitignore | 4 ++ linux/ibus-kmfl/src/kmflutil.c | 4 +- linux/kmflcomp/src/kmflcomp.c | 68 +++++++++++++++++++++++++++++----- linux/kmflcomp/src/yacc.y | 2 +- 4 files changed, 66 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index b1e97c9773..d6af8974e8 100644 --- a/.gitignore +++ b/.gitignore @@ -226,6 +226,10 @@ # /test/wm_unichar/ +# linux +autom4te.cache +*.orig + .DS_Store *.kpj.user diff --git a/linux/ibus-kmfl/src/kmflutil.c b/linux/ibus-kmfl/src/kmflutil.c index a2c21bfae0..9af72adef6 100644 --- a/linux/ibus-kmfl/src/kmflutil.c +++ b/linux/ibus-kmfl/src/kmflutil.c @@ -122,12 +122,12 @@ gchar * kmfl_get_icon_file(KInputMethod * im) const char * icon_file = kmfl_icon_file(im->keyboard_number); gchar * full_path_to_icon_file=NULL; struct stat filestat; - char * valid_extensions[]= {"", ".png", ".bmp", ".jpg", ".ico", NULL}; + char * valid_extensions[]= {"", ".png", ".bmp", ".jpg", NULL}; int valid_extension_index; if (strlen(icon_file) > 0) { for (valid_extension_index=0; valid_extensions[valid_extension_index] != NULL; valid_extension_index++) { - full_path_to_icon_file=g_strdup_printf("%s/icons/%s%s", get_dirname(im->keyboard_filename), icon_file, valid_extensions[valid_extension_index]); + full_path_to_icon_file=g_strdup_printf("%s/%s%s", get_dirname(im->keyboard_filename), icon_file, valid_extensions[valid_extension_index]); stat(full_path_to_icon_file, &filestat); diff --git a/linux/kmflcomp/src/kmflcomp.c b/linux/kmflcomp/src/kmflcomp.c index 1f9b52c287..07de33750f 100644 --- a/linux/kmflcomp/src/kmflcomp.c +++ b/linux/kmflcomp/src/kmflcomp.c @@ -1045,8 +1045,8 @@ char *items_to_string(ITEM *p) static char temp[256]; char *sp, *sp1; - int n; - n = count_items(p); + //int n; + //n = count_items(p); for(sp=temp,sp1=temp+240,*sp=0; (*p) && (spitems; p2 = (UTF8*)tname; - IConvertUTF32toUTF8((const UTF32 **)&p1,(const UTF32 *)(sp->items+sp->len),&p2,(UTF8 *)(tname+63)); + IConvertUTF32toUTF8((const UTF32 **)&p1,(const UTF32 *)(sp->items+sp->len),&p2,(UTF8 *)(tname+255)); *p2 = 0; if((p=rindex(fname,DIRDELIM)) != NULL) { - bmp_path = (char *)checked_alloc((p-fname+1)+strlen(tname)+6,1); + bmp_path = (char *)checked_alloc((p-fname+1)+strlen(tname)+10,1); strncpy(bmp_path,fname,p-fname+1); strcpy(bmp_path+(p-fname+1),tname); } else { - bmp_path = (char *)checked_alloc(strlen(tname)+6,1); + bmp_path = (char *)checked_alloc(strlen(tname)+10,1); strcpy(bmp_path,tname); } + if (strncmp(bmp_path+strlen(bmp_path)-4, ".ico", 4) == 0) + { + strcat(bmp_path,".bmp"); + } // First test if the file exists exactly as in BITMAP statement - if(stat(bmp_path,&fstat) == 0) + else if(stat(bmp_path,&fstat) == 0) { mem_free(bmp_path); // file exists return 0; @@ -1486,18 +1490,61 @@ int check_bitmap_file(STORE *sp, int line) // Search for a case-variation (irrelevant for Windows) p = find_first_match(bmp_path); + // Search in icons dir + if(p == NULL) + { + icons_path = (char *)checked_alloc(strlen(bmp_path)+12,1); + if((p=rindex(fname,DIRDELIM)) != NULL) + { + strncpy(icons_path,fname,p-fname+1); + strcpy(icons_path+(p-fname+1),"icons/"); + strcpy(icons_path+(p-fname+1+6),tname); + } + else + { + strcpy(icons_path,"icons/"); + strcat(icons_path, bmp_path); + } + p = find_first_match(icons_path); + } + // If no extension specified, search next for files with extensions .bmp and .png if((p == NULL) && (strchr(tname,'.') == NULL)) { // Add .bmp strcat(bmp_path,".bmp"); p = find_first_match(bmp_path); + if ((p == NULL) && icons_path) + { + // Add .bmp in icons dir + strcat(icons_path,".bmp"); + p = find_first_match(icons_path); + } if(p == NULL) { // Add .png strcpy(bmp_path+strlen(bmp_path)-4,".png"); p = find_first_match(bmp_path); } + if ((p == NULL) && icons_path) + { + // Add .png in icons dir + strcpy(icons_path+strlen(icons_path)-4,".png"); + p = find_first_match(icons_path); + } + if(p == NULL) + { + // Add .ico.bmp (ico converted to bmp) + strcpy(bmp_path+strlen(bmp_path)-4,".ico.bmp"); + p = find_first_match(bmp_path); + } + } + + // If there is an extension but not found, try .bmp added (converted from .ico) + if(p == NULL) + { + strcat(bmp_path, ".bmp"); + p = find_first_match(bmp_path); } // Issue appropriate warnings and replace file name in store @@ -1505,11 +1552,13 @@ int check_bitmap_file(STORE *sp, int line) { kmflcomp_warn(line,"The bitmap file '%s' was not found. Create a suitable bitmap of that name " "and copy it with the compiled keyboard",tname); - - } else { + if (icons_path) + { + p = p - 6; // include 'icons/' in name + } kmflcomp_warn(line,"A bitmap named '%s' was found and will be referred to in the compiled keyboard " "instead of '%s'",p,tname); @@ -1525,6 +1574,7 @@ int check_bitmap_file(STORE *sp, int line) } if(bmp_path) mem_free(bmp_path); + if(icons_path) mem_free(icons_path); return 1; } diff --git a/linux/kmflcomp/src/yacc.y b/linux/kmflcomp/src/yacc.y index 02f586d444..bcf94c7b33 100755 --- a/linux/kmflcomp/src/yacc.y +++ b/linux/kmflcomp/src/yacc.y @@ -160,7 +160,7 @@ T_HEADLINE : { new_store_from_string("&message",$2,lineno); } - | TOK_LANGUAGE T_ITEMS TOK_NL + | TOK_LANGUAGE T_STRING TOK_NL { new_store_from_string("&language",$2,lineno); } From 7ff76a567020a7d20de753bcc4f3b336300ec5fb Mon Sep 17 00:00:00 2001 From: glasseyes Date: Tue, 28 Aug 2018 15:16:16 +0700 Subject: [PATCH 5/9] add visualkeyboard and keyboardversion stores --- linux/kmflcomp/include/kmfl.h | 2 +- linux/kmflcomp/src/kmflcomp.c | 9 ++++++--- linux/kmflcomp/src/lex.l | 2 ++ linux/kmflcomp/src/yacc.y | 10 ++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/linux/kmflcomp/include/kmfl.h b/linux/kmflcomp/include/kmfl.h index 4dae01dfb4..c8b4fa2c27 100644 --- a/linux/kmflcomp/include/kmfl.h +++ b/linux/kmflcomp/include/kmfl.h @@ -108,7 +108,7 @@ enum {ITEM_CHAR=0,ITEM_KEYSYM,ITEM_ANY,ITEM_INDEX,ITEM_OUTS,ITEM_DEADKEY,ITEM_CO // Enumerate special stores with reserved names (prefixed by &) enum TAG_SS {SS_UNDEFINED=-1,SS_NAME,SS_VERSION,SS_HOTKEY,SS_LANGUAGE,SS_LAYOUT,SS_COPYRIGHT, SS_MESSAGE,SS_BITMAP,SS_MNEMONIC,SS_ETHNOLOGUE,SS_CAPSOFF,SS_CAPSON,SS_CAPSFREE,SS_AUTHOR, - SS_TARGETS}; + SS_TARGETS,SS_VISUALKEYBOARD,SS_KEYBOARDVERSION}; // The following compiled keyboard structures and types are used by both the compiler // and the interpreter diff --git a/linux/kmflcomp/src/kmflcomp.c b/linux/kmflcomp/src/kmflcomp.c index 07de33750f..7a7f2e3c97 100644 --- a/linux/kmflcomp/src/kmflcomp.c +++ b/linux/kmflcomp/src/kmflcomp.c @@ -1114,12 +1114,13 @@ char *items_to_string(ITEM *p) char *special_stores[] = { "&name","&version","&hotkey","&language","&layout","©right","&message", "&bitmap","&mnemoniclayout","ðnologuecode", - "&capsalwaysoff","&capsononly","&shiftfreescaps","&author","&targets"}; + "&capsalwaysoff","&capsononly","&shiftfreescaps","&author", + "&targets","&visualkeyboard","&keyboardversion"}; // stores new from keyman 7.0 onwards that can safely be ignored for kmfl 11 for now char *ignored_stores[] = { - "&visualkeyboard","&layoutfile","&kmw_helpfile","&kmw_embedjs", - "&windowslanguages","&kmw_rtl","&keyboardversion", + "&layoutfile","&kmw_helpfile","&kmw_embedjs", + "&windowslanguages","&kmw_rtl", "&kmw_embedcss","&kmw_helptext","&includecodes"}; // Initialize special stores (create dummy entries) @@ -1181,6 +1182,8 @@ void process_special_store(char *name, STORE *sp, int line) case SS_AUTHOR: case SS_LANGUAGE: case SS_ETHNOLOGUE: + case SS_KEYBOARDVERSION: + case SS_VISUALKEYBOARD: break; default: for(p=0; p TOK_INDEX %token TOK_LANGUAGE %token TOK_LAYOUT +%token TOK_KEYBOARDVERSION %token TOK_MATCH %token TOK_MESSAGE %token TOK_MNEMONIC @@ -96,6 +97,7 @@ GROUP *gp = NULL; /* Temporary group pointer */ %token TOK_USINGKEYS %token TOK_UTF %token TOK_VERSION +%token TOK_VISUALKEYBOARD %token TOK_XKEYSYM %% @@ -140,6 +142,10 @@ T_HEADLINE : { new_store_from_string("&version",$2,lineno); } + | TOK_KEYBOARDVERSION T_BYTES TOK_NL + { + new_store_from_string("&keyboardversion",$2,lineno); + } | TOK_VERSION T_STRING TOK_NL { new_store_from_string("&version",$2,lineno); @@ -209,6 +215,10 @@ T_HEADLINE : { new_store_from_string("&targets",$2,lineno); } + | TOK_VISUALKEYBOARD T_STRING TOK_NL + { + new_store_from_string("&visualkeyboard",$2,lineno); + } | TOK_MNEMONIC T_STRING TOK_NL { new_store_from_string("&mnemoniclayout",$2,lineno); From 222a107d552d1529b7d9c77b92327e02dc2f41d9 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Tue, 28 Aug 2018 16:55:06 +0700 Subject: [PATCH 6/9] autotool update --- linux/kmflcomp/Makefile.in | 14 +++---- linux/kmflcomp/aclocal.m4 | 49 ++++++++++++------------ linux/kmflcomp/configure | 1 - linux/kmflcomp/include/Makefile.in | 4 +- linux/kmflcomp/kmfl_compiler/Makefile.in | 4 +- linux/kmflcomp/src/Makefile.in | 4 +- linux/libkmfl/Makefile.in | 14 +++---- linux/libkmfl/aclocal.m4 | 46 +++++++++++----------- linux/libkmfl/include/Makefile.in | 4 +- linux/libkmfl/src/Makefile.in | 4 +- 10 files changed, 71 insertions(+), 73 deletions(-) diff --git a/linux/kmflcomp/Makefile.in b/linux/kmflcomp/Makefile.in index f326cc2711..c44820a04a 100644 --- a/linux/kmflcomp/Makefile.in +++ b/linux/kmflcomp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -370,7 +370,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = include src kmfl_compiler -kmflcompdocdir = ${prefix}/doc/kmflcomp +kmflcompdocdir = ${docdir} kmflcompdoc_DATA = \ README\ COPYING\ @@ -638,7 +638,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -664,7 +664,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -682,7 +682,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -692,7 +692,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/linux/kmflcomp/aclocal.m4 b/linux/kmflcomp/aclocal.m4 index 63688c0e34..e60218ab76 100644 --- a/linux/kmflcomp/aclocal.m4 +++ b/linux/kmflcomp/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -744,7 +744,6 @@ _LT_CONFIG_SAVE_COMMANDS([ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -9068,7 +9067,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9083,7 +9082,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9099,14 +9098,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9158,7 +9157,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9189,7 +9188,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9380,7 +9379,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9456,7 +9455,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9653,7 +9652,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9674,7 +9673,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9693,7 +9692,7 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9713,7 +9712,7 @@ fi]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9763,7 +9762,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9804,7 +9803,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9831,7 +9830,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9860,7 +9859,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9907,7 +9906,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9926,7 +9925,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10007,7 +10006,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10067,7 +10066,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10095,7 +10094,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10114,7 +10113,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/kmflcomp/configure b/linux/kmflcomp/configure index 31e61b6035..7a5eefd6ff 100755 --- a/linux/kmflcomp/configure +++ b/linux/kmflcomp/configure @@ -15483,7 +15483,6 @@ $as_echo X"$file" | cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff --git a/linux/kmflcomp/include/Makefile.in b/linux/kmflcomp/include/Makefile.in index 02296d252e..f58faab643 100644 --- a/linux/kmflcomp/include/Makefile.in +++ b/linux/kmflcomp/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/kmflcomp/kmfl_compiler/Makefile.in b/linux/kmflcomp/kmfl_compiler/Makefile.in index f7e9b2fe4b..01d819baf4 100644 --- a/linux/kmflcomp/kmfl_compiler/Makefile.in +++ b/linux/kmflcomp/kmfl_compiler/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/kmflcomp/src/Makefile.in b/linux/kmflcomp/src/Makefile.in index 8ebe325912..c1c1202d83 100644 --- a/linux/kmflcomp/src/Makefile.in +++ b/linux/kmflcomp/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/libkmfl/Makefile.in b/linux/libkmfl/Makefile.in index 23c04e6e59..20dcf602cc 100644 --- a/linux/libkmfl/Makefile.in +++ b/linux/libkmfl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -363,7 +363,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = include src ACLOCAL_AMFLAGS = -I m4 -libkmfldocdir = ${prefix}/doc/libkmfl +libkmfldocdir = ${docdir} libkmfldoc_DATA = \ README\ COPYING\ @@ -631,7 +631,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -657,7 +657,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -675,7 +675,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -685,7 +685,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/linux/libkmfl/aclocal.m4 b/linux/libkmfl/aclocal.m4 index d3f9f029a5..f37812b9b8 100644 --- a/linux/libkmfl/aclocal.m4 +++ b/linux/libkmfl/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -605,7 +605,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +626,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -647,7 +647,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -697,7 +697,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -738,7 +738,7 @@ fi # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -765,7 +765,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -794,7 +794,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -841,7 +841,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -860,7 +860,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -941,7 +941,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1001,7 +1001,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1029,7 +1029,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1048,7 +1048,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/libkmfl/include/Makefile.in b/linux/libkmfl/include/Makefile.in index 8e6076a3d0..2eccdb293c 100644 --- a/linux/libkmfl/include/Makefile.in +++ b/linux/libkmfl/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/linux/libkmfl/src/Makefile.in b/linux/libkmfl/src/Makefile.in index 37776af20d..6e41a99319 100644 --- a/linux/libkmfl/src/Makefile.in +++ b/linux/libkmfl/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, From c7c183597fac8ef47361c1f1ce0d3f7bde2f0339 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Wed, 29 Aug 2018 15:54:19 +0700 Subject: [PATCH 7/9] minor warning fixes --- linux/kmflcomp/src/compiler.h | 1 + linux/kmflcomp/src/yacc.y | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/linux/kmflcomp/src/compiler.h b/linux/kmflcomp/src/compiler.h index cca110ee1c..78ef588081 100644 --- a/linux/kmflcomp/src/compiler.h +++ b/linux/kmflcomp/src/compiler.h @@ -132,6 +132,7 @@ void initialize_special_stores(void); void process_special_store(char *name, STORE *sp, int line); void check_keyboard(KEYBOARD *kbp); int check_bitmap_file(STORE *sp, int line); +int check_linux_target(STORE *sp, int line); void *checked_alloc(size_t n, size_t sz); void sort_rules(GROUP *gp); diff --git a/linux/kmflcomp/src/yacc.y b/linux/kmflcomp/src/yacc.y index d77c0ddc6c..d0f3b5232e 100755 --- a/linux/kmflcomp/src/yacc.y +++ b/linux/kmflcomp/src/yacc.y @@ -142,13 +142,17 @@ T_HEADLINE : { new_store_from_string("&version",$2,lineno); } + | TOK_VERSION T_STRING TOK_NL + { + new_store_from_string("&version",$2,lineno); + } | TOK_KEYBOARDVERSION T_BYTES TOK_NL { new_store_from_string("&keyboardversion",$2,lineno); } - | TOK_VERSION T_STRING TOK_NL + | TOK_KEYBOARDVERSION T_STRING TOK_NL { - new_store_from_string("&version",$2,lineno); + new_store_from_string("&keyboardversion",$2,lineno); } | TOK_BITMAP T_BYTES TOK_NL { From 97c9ef2d9c1251a839e79e72b488405982eaf1b7 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Wed, 29 Aug 2018 16:20:26 +0700 Subject: [PATCH 8/9] update generated lex and yacc files --- linux/kmflcomp/src/lex.c | 1983 +++++++++++++++++++------------------ linux/kmflcomp/src/yacc.c | 996 ++++++++++--------- linux/kmflcomp/src/yacc.h | 110 +- 3 files changed, 1580 insertions(+), 1509 deletions(-) diff --git a/linux/kmflcomp/src/lex.c b/linux/kmflcomp/src/lex.c index c4a8f13736..a9edf3d7da 100644 --- a/linux/kmflcomp/src/lex.c +++ b/linux/kmflcomp/src/lex.c @@ -352,8 +352,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 234 -#define YY_END_OF_BUFFER 235 +#define YY_NUM_RULES 236 +#define YY_END_OF_BUFFER 237 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -361,90 +361,93 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[745] = +static const flex_int16_t yy_accept[773] = { 0, - 42, 42, 42, 42, 0, 0, 80, 80, 90, 90, - 83, 83, 58, 58, 0, 0, 72, 72, 0, 0, - 0, 0, 235, 233, 42, 1, 2, 233, 233, 233, - 233, 231, 40, 47, 39, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 51, 233, 42, 229, 232, 234, - 42, 2, 234, 234, 234, 47, 57, 57, 57, 57, - 57, 57, 57, 57, 51, 234, 79, 79, 2, 79, - 82, 80, 2, 81, 82, 90, 214, 213, 234, 234, - 234, 234, 234, 234, 234, 234, 215, 87, 83, 2, + 44, 44, 44, 44, 0, 0, 82, 82, 92, 92, + 85, 85, 60, 60, 0, 0, 74, 74, 0, 0, + 0, 0, 237, 235, 44, 1, 2, 235, 235, 235, + 235, 233, 42, 49, 41, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 53, 235, 44, 231, 234, + 236, 44, 2, 236, 236, 236, 49, 59, 59, 59, + 59, 59, 59, 59, 59, 53, 236, 81, 81, 2, + 81, 84, 82, 2, 83, 84, 92, 216, 215, 236, + 236, 236, 236, 236, 236, 236, 236, 217, 89, 85, - 85, 86, 84, 87, 64, 58, 2, 61, 63, 62, - 64, 64, 69, 69, 2, 69, 69, 69, 69, 72, - 78, 75, 234, 234, 234, 230, 230, 2, 230, 89, - 89, 2, 88, 89, 42, 0, 0, 46, 41, 0, - 45, 0, 44, 47, 232, 232, 232, 232, 232, 43, - 232, 232, 48, 232, 35, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 0, 232, 232, 49, 0, 216, 0, 42, - 0, 41, 229, 41, 43, 221, 220, 42, 0, 57, - 57, 48, 57, 54, 57, 57, 49, 0, 80, 90, + 2, 87, 88, 86, 89, 66, 60, 2, 63, 65, + 64, 66, 66, 71, 71, 2, 71, 71, 71, 71, + 74, 80, 77, 236, 236, 236, 232, 232, 2, 232, + 91, 91, 2, 90, 91, 44, 0, 0, 48, 43, + 0, 47, 0, 46, 49, 234, 234, 234, 234, 234, + 45, 234, 234, 50, 234, 37, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 0, 234, 234, 234, 51, 0, + 218, 0, 44, 0, 43, 231, 43, 45, 223, 222, + 44, 0, 59, 59, 50, 59, 56, 59, 59, 51, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 83, 58, 0, 0, 0, 66, - 65, 0, 0, 68, 0, 67, 0, 71, 70, 72, - 75, 0, 76, 77, 0, 225, 224, 27, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 33, - 232, 232, 232, 232, 232, 232, 50, 25, 232, 232, - 217, 226, 229, 229, 229, 0, 223, 222, 57, 57, - 56, 57, 101, 0, 0, 0, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 0, 82, 92, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 85, 60, 0, + 0, 0, 68, 67, 0, 0, 70, 0, 69, 0, + 73, 72, 74, 77, 0, 78, 79, 0, 227, 226, + 29, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 35, 234, 234, 234, 234, 234, 234, + 52, 27, 234, 234, 234, 219, 228, 231, 231, 231, + 0, 225, 224, 59, 59, 58, 59, 103, 0, 0, + 0, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 60, 59, 0, 0, 74, 73, 0, 0, - 232, 29, 232, 232, 37, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 3, 232, - 232, 22, 232, 232, 232, 232, 232, 232, 232, 229, - 229, 52, 57, 55, 0, 92, 0, 100, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 212, 212, 212, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 62, 61, 0, + 0, 76, 75, 0, 0, 234, 31, 234, 234, 39, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 3, 234, 234, 24, 234, 234, + 234, 234, 234, 234, 234, 234, 231, 231, 54, 59, + 57, 0, 94, 0, 102, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 183, 184, 185, 186, 187, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 158, 94, 0, 0, - 0, 98, 0, 0, 0, 211, 0, 65, 0, 0, - 218, 0, 232, 20, 232, 0, 232, 232, 232, 232, - 232, 232, 23, 232, 30, 232, 232, 32, 232, 232, - 232, 232, 232, 232, 21, 232, 232, 232, 232, 229, - 228, 57, 98, 0, 208, 212, 212, 212, 212, 212, - 212, 209, 212, 163, 212, 212, 155, 190, 191, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 212, 212, 164, 212, 212, 171, 172, 173, + 188, 189, 190, 191, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 160, 96, 0, 0, 0, 100, 0, + 0, 0, 213, 0, 67, 0, 0, 220, 0, 234, + 22, 234, 0, 234, 234, 234, 234, 234, 234, 25, + 234, 32, 234, 234, 234, 34, 234, 234, 234, 234, + 234, 234, 23, 234, 234, 234, 234, 234, 231, 230, + 59, 100, 0, 210, 214, 214, 214, 214, 214, 214, + 211, 214, 165, 214, 214, 157, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 174, 175, 176, 177, 178, 179, 180, 212, 212, 212, - 212, 212, 210, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 151, 93, 0, 96, 97, 0, - 99, 0, 66, 65, 219, 16, 0, 4, 0, 0, - 232, 232, 232, 232, 232, 232, 5, 232, 8, 232, - 232, 232, 28, 36, 0, 232, 38, 232, 0, 232, - 229, 228, 57, 0, 212, 212, 150, 207, 212, 212, - 212, 160, 212, 212, 156, 212, 212, 157, 212, 212, - 212, 212, 212, 212, 212, 212, 162, 161, 212, 212, - 212, 212, 212, 212, 212, 91, 95, 66, 0, 0, + 206, 214, 214, 166, 214, 214, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 214, 214, 214, 214, + 214, 212, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 153, 95, 0, 98, 99, 0, 101, + 0, 68, 67, 221, 16, 0, 4, 0, 0, 234, + 234, 234, 234, 234, 234, 5, 234, 234, 8, 234, + 234, 234, 30, 38, 0, 234, 40, 234, 0, 234, + 234, 231, 230, 59, 0, 214, 214, 152, 209, 214, + 214, 214, 162, 214, 214, 158, 214, 214, 159, 214, + 214, 214, 214, 214, 214, 214, 214, 164, 163, 214, - 4, 4, 0, 0, 232, 0, 232, 26, 232, 34, - 232, 232, 13, 232, 31, 0, 232, 17, 0, 6, - 227, 53, 100, 212, 212, 145, 141, 212, 152, 146, - 212, 147, 169, 212, 212, 212, 212, 212, 153, 212, - 103, 149, 159, 212, 205, 144, 102, 0, 0, 0, - 0, 232, 232, 232, 232, 7, 232, 0, 232, 0, - 227, 212, 212, 212, 142, 212, 167, 212, 166, 212, - 143, 154, 0, 0, 0, 0, 232, 232, 12, 232, - 0, 232, 0, 232, 0, 140, 148, 206, 168, 170, - 165, 18, 0, 0, 0, 232, 10, 232, 0, 232, + 214, 214, 214, 214, 214, 214, 93, 97, 68, 0, + 0, 4, 4, 0, 0, 234, 0, 234, 28, 234, + 36, 234, 234, 234, 13, 234, 33, 0, 234, 17, + 0, 6, 234, 229, 55, 102, 214, 214, 147, 143, + 214, 154, 148, 214, 149, 171, 214, 214, 214, 214, + 214, 155, 214, 105, 151, 161, 214, 207, 146, 104, + 0, 0, 0, 0, 234, 234, 234, 234, 234, 7, + 234, 0, 234, 0, 234, 229, 214, 214, 214, 144, + 214, 169, 214, 168, 214, 145, 156, 0, 0, 0, + 0, 234, 234, 12, 234, 234, 0, 234, 0, 234, - 0, 232, 24, 0, 0, 10, 0, 232, 0, 232, - 0, 232, 0, 0, 232, 0, 0, 232, 0, 232, - 0, 232, 0, 232, 19, 0, 9, 0, 232, 0, - 232, 0, 232, 9, 0, 15, 0, 14, 0, 11, - 15, 14, 11, 0 + 0, 234, 142, 150, 208, 170, 172, 167, 20, 0, + 0, 0, 234, 10, 234, 234, 0, 234, 0, 234, + 26, 234, 0, 0, 10, 0, 234, 0, 234, 234, + 0, 234, 0, 0, 234, 234, 0, 0, 234, 0, + 234, 234, 0, 234, 0, 234, 234, 21, 0, 9, + 0, 234, 234, 0, 234, 0, 234, 234, 9, 0, + 15, 234, 0, 14, 0, 11, 18, 15, 19, 14, + 11, 0 } ; static const YY_CHAR yy_ec[256] = @@ -492,415 +495,426 @@ static const YY_CHAR yy_meta[82] = 5 } ; -static const flex_int16_t yy_base[773] = +static const flex_int16_t yy_base[801] = { 0, 0, 77, 135, 0, 215, 219, 223, 227, 279, 357, 236, 247, 435, 492, 258, 289, 549, 0, 322, 336, - 628, 683, 718, 1974, 308, 1974, 1974, 700, 0, 697, - 601, 1974, 1974, 71, 1974, 54, 64, 294, 725, 38, - 0, 52, 56, 58, 73, 317, 328, 55, 72, 324, - 77, 275, 74, 778, 1974, 104, 377, 211, 463, 1974, - 386, 1974, 585, 577, 508, 100, 0, 213, 253, 826, - 198, 232, 493, 879, 1974, 414, 1974, 441, 1974, 457, - 1974, 472, 1974, 1974, 468, 473, 1974, 1974, 242, 352, - 437, 499, 286, 500, 288, 354, 1974, 1974, 474, 1974, + 628, 683, 765, 2012, 308, 2012, 2012, 719, 0, 709, + 696, 2012, 2012, 71, 2012, 54, 64, 294, 725, 38, + 0, 52, 56, 58, 69, 75, 317, 328, 56, 73, + 324, 78, 275, 213, 778, 2012, 104, 377, 243, 463, + 2012, 386, 2012, 699, 603, 581, 100, 0, 205, 253, + 826, 198, 232, 574, 879, 2012, 414, 2012, 441, 2012, + 457, 2012, 472, 2012, 2012, 468, 473, 2012, 2012, 277, + 352, 463, 499, 293, 500, 357, 359, 2012, 2012, 474, - 1974, 1974, 1974, 478, 1974, 532, 1974, 1974, 1974, 1974, - 301, 482, 1974, 584, 1974, 441, 437, 107, 519, 534, - 1974, 599, 365, 640, 0, 1974, 619, 1974, 544, 1974, - 620, 1974, 1974, 577, 621, 591, 422, 415, 1974, 401, - 399, 366, 361, 650, 0, 345, 358, 613, 367, 1974, - 534, 605, 667, 408, 0, 496, 502, 531, 568, 680, - 627, 654, 669, 663, 712, 667, 676, 677, 689, 684, - 692, 689, 0, 752, 715, 0, 707, 1974, 352, 761, - 711, 307, 1974, 743, 766, 1974, 1974, 774, 427, 0, - 753, 754, 795, 0, 785, 778, 0, 822, 826, 853, + 2012, 2012, 2012, 2012, 478, 2012, 532, 2012, 2012, 2012, + 2012, 301, 482, 2012, 584, 2012, 498, 484, 107, 519, + 534, 2012, 599, 365, 640, 0, 2012, 619, 2012, 544, + 2012, 620, 2012, 2012, 577, 621, 591, 441, 439, 2012, + 420, 401, 397, 366, 650, 0, 353, 367, 613, 389, + 2012, 534, 605, 667, 503, 0, 509, 536, 552, 643, + 648, 680, 654, 657, 674, 682, 713, 685, 678, 679, + 692, 692, 723, 716, 0, 750, 729, 729, 0, 707, + 2012, 352, 762, 711, 307, 2012, 791, 766, 2012, 2012, + 822, 427, 0, 752, 792, 757, 0, 749, 778, 0, - 784, 789, 794, 814, 927, 824, 828, 841, 856, 846, - 840, 855, 855, 257, 862, 923, 250, 326, 1007, 1974, - 377, 866, 298, 296, 290, 282, 487, 1974, 513, 924, - 999, 537, 1007, 0, 235, 1974, 1974, 0, 998, 991, - 999, 996, 999, 993, 993, 989, 1011, 1002, 996, 1007, - 1014, 1013, 1006, 1019, 1004, 1011, 1020, 1025, 1026, 0, - 1009, 1008, 1024, 1013, 1012, 1026, 0, 0, 1020, 1016, - 1974, 222, 247, 1067, 1068, 873, 1974, 1974, 1052, 1065, - 0, 1051, 1064, 1053, 1053, 1063, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1064, 1066, 1078, 1073, + 855, 859, 861, 780, 813, 834, 831, 927, 844, 837, + 852, 862, 853, 846, 889, 917, 262, 1007, 1008, 250, + 326, 1012, 2012, 377, 772, 306, 298, 294, 290, 487, + 2012, 513, 1016, 909, 537, 1008, 0, 237, 2012, 2012, + 0, 978, 978, 986, 994, 996, 990, 992, 988, 1010, + 1003, 997, 1009, 1016, 1020, 1016, 1011, 1024, 1009, 1016, + 1025, 1030, 1031, 0, 1014, 1013, 1029, 1018, 1026, 1047, + 0, 0, 1041, 1048, 1047, 2012, 235, 251, 1070, 1071, + 828, 2012, 2012, 1055, 1068, 0, 1054, 1067, 1056, 1058, + 1067, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1066, 1134, 0, 1066, 1068, 0, 0, 1082, 0, 1117, - 1081, 1134, 1068, 1134, 1134, 1089, 1118, 0, 0, 0, - 0, 0, 1120, 1126, 1136, 1131, 1128, 1131, 1142, 1146, - 0, 580, 1974, 596, 647, 600, 1974, 606, 216, 1176, - 1142, 0, 1144, 1158, 0, 1182, 1155, 1143, 1173, 1170, - 1170, 1187, 1169, 1173, 1174, 1188, 1197, 1184, 0, 1180, - 1187, 0, 1184, 1183, 1200, 1203, 1202, 1201, 1200, 1221, - 1241, 0, 1200, 0, 1194, 1974, 1199, 1974, 0, 1198, - 1202, 1227, 1232, 1238, 1229, 1250, 1234, 1253, 1298, 916, - 0, 0, 0, 0, 0, 0, 0, 1254, 1252, 1250, + 0, 1068, 1070, 1081, 1078, 1072, 1137, 0, 1099, 1073, + 0, 0, 1113, 0, 1120, 1085, 1142, 1071, 1137, 1147, + 1136, 1122, 0, 0, 0, 0, 0, 1120, 1124, 1142, + 1136, 1133, 1138, 1148, 1152, 0, 580, 2012, 596, 647, + 600, 2012, 606, 218, 929, 1145, 0, 1147, 1161, 0, + 1194, 1159, 1157, 1167, 1169, 1180, 1192, 1174, 1184, 1179, + 1180, 1194, 1202, 1189, 0, 1186, 1193, 0, 1192, 1191, + 1207, 1210, 1210, 1209, 1208, 1217, 1222, 1239, 0, 1208, + 0, 1202, 2012, 1204, 2012, 0, 1203, 1237, 1228, 1245, + 1243, 1237, 1257, 1241, 1260, 1305, 853, 0, 0, 0, - 1253, 1266, 1314, 1300, 249, 1293, 1297, 1313, 1301, 1301, - 1313, 1303, 1313, 1322, 1323, 1323, 0, 1974, 1314, 1322, - 1310, 1974, 1319, 1326, 1315, 0, 1358, 1360, 1389, 1393, - 1974, 264, 1356, 237, 1359, 1396, 1365, 1364, 1355, 1371, - 1377, 1371, 0, 1359, 0, 1384, 1369, 0, 1383, 1378, - 1390, 1369, 1381, 1420, 0, 1390, 1379, 533, 1386, 1417, - 212, 1397, 1974, 1388, 0, 1385, 1418, 1416, 1422, 1425, - 1419, 0, 1426, 0, 1437, 1442, 0, 0, 0, 0, + 0, 0, 0, 0, 1262, 1260, 1259, 1261, 1274, 1322, + 1291, 253, 1300, 1304, 1319, 1309, 1307, 1320, 1310, 1320, + 1329, 1330, 1330, 0, 2012, 1321, 1330, 1318, 2012, 1327, + 1336, 1323, 0, 1366, 1368, 1397, 1401, 2012, 368, 1364, + 237, 1367, 1404, 1373, 1372, 1363, 1379, 1385, 1379, 0, + 1367, 0, 1392, 1396, 1378, 0, 1393, 1387, 1399, 1378, + 1390, 1430, 0, 1399, 1388, 533, 1394, 1399, 1425, 212, + 1409, 2012, 1425, 0, 1421, 1431, 1426, 1431, 1435, 1430, + 0, 1437, 0, 1447, 1452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1439, 1437, 0, 1435, 1427, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1434, 1441, 1439, - 1441, 1440, 0, 1435, 1446, 1443, 1442, 1439, 1451, 1455, - 1451, 1465, 1459, 1483, 0, 1974, 1470, 1974, 1974, 1474, - 1974, 1520, 1974, 1363, 1974, 0, 1522, 1526, 1483, 1490, - 1482, 1527, 1489, 1503, 1486, 1499, 0, 1510, 0, 1514, - 1512, 1514, 0, 0, 1532, 1508, 0, 1508, 1551, 1515, - 1516, 1974, 1508, 1524, 1522, 1545, 0, 0, 1536, 1553, - 1537, 0, 1540, 1549, 0, 1559, 1545, 0, 1549, 1556, - 1550, 1573, 1576, 1563, 1574, 1566, 0, 0, 1577, 1563, - 1566, 1575, 1569, 1582, 1588, 1974, 1974, 1974, 1582, 1583, + 0, 1449, 1447, 0, 1446, 1438, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1444, 1451, 1449, 1451, + 1450, 0, 1445, 1456, 1453, 1452, 1449, 1463, 1471, 1471, + 1490, 1481, 1499, 0, 2012, 1483, 2012, 2012, 1485, 2012, + 1533, 2012, 1371, 2012, 0, 1526, 1537, 1495, 1494, 1492, + 1538, 1499, 1513, 1496, 1507, 0, 1506, 1518, 0, 1523, + 1520, 1526, 0, 0, 1556, 1521, 0, 1521, 1564, 1528, + 1532, 1532, 2012, 1523, 1548, 1548, 1564, 0, 0, 1552, + 1566, 1550, 0, 1553, 1562, 0, 1574, 1560, 0, 1561, + 1568, 1563, 1584, 1586, 1573, 1584, 1576, 0, 0, 1589, - 715, 770, 1575, 1622, 1602, 1625, 1592, 0, 1606, 0, - 1608, 1613, 0, 1618, 0, 1604, 1619, 0, 1620, 0, - 210, 0, 1974, 1609, 1611, 0, 0, 1616, 0, 0, - 1618, 0, 0, 1613, 1616, 1619, 1621, 1638, 0, 1638, - 0, 0, 0, 1631, 0, 0, 0, 1627, 1638, 1648, - 1636, 1628, 1644, 1637, 1637, 0, 1683, 1661, 1669, 1650, - 1974, 1673, 1673, 1670, 0, 1665, 0, 1677, 0, 1678, - 0, 0, 1681, 1688, 1667, 1681, 1675, 1672, 0, 1693, - 1719, 1699, 1697, 1684, 1687, 0, 0, 0, 0, 0, - 0, 1974, 1692, 1690, 1685, 1733, 0, 1738, 1715, 1692, + 1579, 1580, 1590, 1583, 1598, 1602, 2012, 2012, 2012, 1594, + 1599, 716, 761, 1593, 1640, 1621, 1643, 1612, 0, 1619, + 0, 1624, 1630, 1630, 0, 1636, 0, 1622, 1636, 0, + 1637, 0, 1639, 210, 0, 2012, 1625, 1628, 0, 0, + 1633, 0, 0, 1635, 0, 0, 1629, 1632, 1634, 1636, + 1656, 0, 1656, 0, 0, 0, 1650, 0, 0, 0, + 1644, 1657, 1666, 1654, 1648, 1664, 1662, 1665, 1665, 0, + 1711, 1689, 1690, 1674, 1675, 2012, 1696, 1694, 1692, 0, + 1686, 0, 1699, 0, 1697, 0, 0, 1700, 1707, 1686, + 1701, 1695, 1690, 0, 1713, 1714, 1740, 1720, 1721, 1708, + + 1709, 1731, 0, 0, 0, 0, 0, 0, 2012, 1721, + 1723, 1721, 1770, 0, 1767, 1736, 1758, 1735, 1742, 1775, + 2012, 1747, 1760, 1787, 2012, 1788, 1759, 1793, 1754, 1752, + 1749, 1760, 1803, 1806, 1776, 1779, 1776, 1781, 1782, 1778, + 1793, 1789, 1797, 1792, 1813, 1800, 1801, 2012, 1814, 0, + 1817, 1817, 1809, 1804, 1809, 1814, 1812, 1830, 2012, 1830, + 0, 1823, 1818, 0, 1821, 0, 0, 2012, 0, 2012, + 2012, 2012, 1895, 1900, 1905, 1910, 1915, 1920, 1925, 1930, + 1935, 1938, 1943, 1948, 1951, 1954, 1957, 1962, 1967, 1972, + 1977, 119, 109, 1980, 1985, 1990, 1995, 1998, 2001, 2006 - 1707, 1749, 1974, 1730, 1755, 1974, 1758, 1736, 1763, 1729, - 1720, 1734, 1773, 1774, 1749, 1746, 1749, 1751, 1743, 1755, - 1745, 1741, 1762, 1749, 1974, 1761, 0, 1764, 1764, 1762, - 1764, 1770, 1772, 1974, 1789, 0, 1781, 0, 1783, 0, - 1974, 1974, 1974, 1974, 1857, 1862, 1867, 1872, 1877, 1882, - 1887, 1892, 1897, 1900, 1905, 1910, 1913, 1916, 1919, 1924, - 1929, 1934, 1939, 119, 109, 1942, 1947, 1952, 1957, 1960, - 1963, 1968 } ; -static const flex_int16_t yy_def[773] = +static const flex_int16_t yy_def[801] = { 0, - 744, 1, 744, 3, 745, 745, 746, 746, 747, 747, - 748, 748, 749, 749, 750, 750, 747, 17, 751, 751, - 752, 752, 744, 744, 744, 744, 744, 753, 754, 755, - 756, 744, 744, 744, 744, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 744, 744, 744, 758, 757, 744, - 744, 744, 753, 755, 756, 744, 759, 759, 759, 759, - 759, 759, 759, 759, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 772, 1, 772, 3, 773, 773, 774, 774, 775, 775, + 776, 776, 777, 777, 778, 778, 775, 17, 779, 779, + 780, 780, 772, 772, 772, 772, 772, 781, 782, 783, + 784, 772, 772, 772, 772, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 772, 772, 772, 786, 785, + 772, 772, 772, 781, 783, 784, 772, 787, 787, 787, + 787, 787, 787, 787, 787, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 760, 744, 761, 762, 763, 744, 744, - 744, 744, 744, 744, 764, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 753, 753, 744, 755, - 755, 756, 756, 744, 757, 757, 757, 757, 757, 744, - 757, 757, 39, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 765, 757, 757, 54, 744, 744, 744, 744, - 744, 766, 744, 766, 744, 744, 744, 744, 744, 759, - 759, 70, 759, 759, 759, 759, 74, 744, 744, 744, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 788, 772, 789, 790, 791, 772, + 772, 772, 772, 772, 772, 792, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 781, 781, 772, + 783, 783, 784, 784, 772, 785, 785, 785, 785, 785, + 772, 785, 785, 39, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 793, 785, 785, 785, 55, 772, + 772, 772, 772, 772, 794, 772, 794, 772, 772, 772, + 772, 772, 787, 787, 71, 787, 787, 787, 787, 75, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 767, 760, 760, 744, - 760, 760, 761, 761, 762, 762, 763, 744, 763, 744, - 744, 768, 744, 764, 769, 744, 744, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 765, 757, 757, 757, - 744, 769, 766, 766, 766, 744, 744, 744, 759, 759, - 759, 759, 744, 744, 744, 744, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 795, + 788, 788, 772, 788, 788, 789, 789, 790, 790, 791, + 772, 791, 772, 772, 796, 772, 792, 797, 772, 772, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 793, 785, 785, 785, 785, 772, 797, 794, 794, 794, + 772, 772, 772, 787, 787, 787, 787, 772, 772, 772, + 772, 798, 798, 798, 798, 798, 798, 798, 798, 798, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 744, 744, 744, 744, 744, 744, 744, 744, - 771, 767, 744, 767, 772, 768, 744, 768, 769, 769, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 766, - 766, 759, 759, 759, 744, 744, 744, 744, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 772, 772, 772, + 772, 772, 772, 772, 772, 799, 795, 772, 795, 800, + 796, 772, 796, 797, 797, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 794, 794, 787, 787, + 787, 772, 772, 772, 772, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 744, 744, 744, - 744, 744, 744, 744, 744, 771, 772, 772, 772, 769, - 744, 769, 757, 757, 757, 744, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 766, - 766, 759, 744, 744, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 772, 772, 772, 772, 772, 772, + 772, 772, 799, 800, 800, 800, 797, 772, 797, 785, + 785, 785, 772, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 794, 794, + 787, 772, 772, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 744, 744, 744, 744, 744, - 744, 772, 744, 772, 744, 757, 744, 757, 744, 744, - 757, 757, 757, 757, 757, 757, 757, 757, 757, 757, - 757, 757, 757, 757, 744, 757, 757, 757, 744, 757, - 766, 744, 759, 744, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 744, 744, 744, 744, 744, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 772, 772, 772, 772, 772, 772, + 800, 772, 800, 772, 785, 772, 785, 772, 772, 785, + 785, 785, 785, 785, 785, 785, 785, 785, 785, 785, + 785, 785, 785, 785, 772, 785, 785, 785, 772, 785, + 785, 794, 772, 787, 772, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, - 744, 757, 744, 744, 757, 744, 757, 757, 757, 757, - 757, 757, 757, 757, 757, 744, 757, 757, 744, 757, - 766, 759, 744, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 770, 770, 770, 770, 770, 744, 744, 744, - 744, 757, 757, 757, 757, 757, 757, 744, 757, 744, - 744, 770, 770, 770, 770, 770, 770, 770, 770, 770, - 770, 770, 744, 744, 744, 744, 757, 757, 757, 757, - 744, 757, 744, 757, 744, 770, 770, 770, 770, 770, - 770, 744, 744, 744, 744, 757, 757, 757, 744, 757, + 798, 798, 798, 798, 798, 798, 772, 772, 772, 772, + 772, 772, 785, 772, 772, 785, 772, 785, 785, 785, + 785, 785, 785, 785, 785, 785, 785, 772, 785, 785, + 772, 785, 785, 794, 787, 772, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 772, 772, 772, 772, 785, 785, 785, 785, 785, 785, + 785, 772, 785, 772, 785, 772, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 772, 772, 772, + 772, 785, 785, 785, 785, 785, 772, 785, 772, 785, + + 772, 785, 798, 798, 798, 798, 798, 798, 772, 772, + 772, 772, 785, 785, 785, 785, 772, 785, 772, 785, + 772, 785, 772, 772, 772, 772, 785, 772, 785, 785, + 772, 785, 772, 772, 785, 785, 772, 772, 785, 772, + 785, 785, 772, 785, 772, 785, 785, 772, 772, 785, + 772, 785, 785, 772, 785, 772, 785, 785, 772, 772, + 785, 785, 772, 785, 772, 785, 785, 772, 785, 772, + 772, 0, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772 - 744, 757, 744, 744, 744, 744, 744, 757, 744, 757, - 744, 757, 744, 744, 757, 744, 744, 757, 744, 757, - 744, 757, 744, 757, 744, 744, 757, 744, 757, 744, - 757, 744, 757, 744, 744, 757, 744, 757, 744, 757, - 744, 744, 744, 0, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744 } ; -static const flex_int16_t yy_nxt[2056] = +static const flex_int16_t yy_nxt[2094] = { 0, 24, 25, 26, 27, 25, 28, 29, 30, 31, 32, 33, 24, 24, 34, 34, 34, 34, 34, 34, 34, 34, 24, 24, 24, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 41, 41, 45, 46, 47, 48, - 41, 41, 49, 50, 51, 52, 53, 41, 54, 41, - 41, 55, 56, 24, 24, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 41, 41, 45, 46, 47, 48, - 41, 41, 49, 50, 51, 52, 53, 41, 54, 41, - 41, 57, 156, 58, 144, 144, 144, 144, 144, 144, - 144, 144, 146, 148, 157, 158, 159, 149, 160, 147, + 41, 42, 43, 44, 41, 45, 46, 47, 48, 49, + 41, 41, 50, 51, 52, 53, 54, 41, 55, 41, + 41, 56, 57, 24, 24, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 41, 45, 46, 47, 48, 49, + 41, 41, 50, 51, 52, 53, 54, 41, 55, 41, + 41, 58, 157, 59, 145, 145, 145, 145, 145, 145, + 145, 145, 147, 149, 158, 159, 160, 150, 161, 148, - 167, 168, 172, 175, 59, 177, 178, 179, 177, 228, - 229, 267, 156, 144, 144, 144, 144, 144, 144, 144, - 144, 234, 146, 148, 157, 158, 159, 149, 160, 147, - 167, 168, 172, 175, 59, 60, 61, 26, 62, 61, - 63, 60, 64, 65, 60, 60, 60, 60, 66, 66, - 66, 66, 66, 66, 66, 66, 60, 60, 60, 60, - 67, 68, 69, 70, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 71, 72, 67, 67, 67, 67, 67, - 73, 67, 67, 74, 67, 67, 75, 76, 60, 60, - 67, 68, 69, 70, 67, 67, 67, 67, 67, 67, + 162, 169, 170, 174, 60, 180, 181, 182, 180, 231, + 232, 271, 157, 145, 145, 145, 145, 145, 145, 145, + 145, 237, 147, 149, 158, 159, 160, 150, 161, 148, + 162, 169, 170, 174, 60, 61, 62, 26, 63, 62, + 64, 61, 65, 66, 61, 61, 61, 61, 67, 67, + 67, 67, 67, 67, 67, 67, 61, 61, 61, 61, + 68, 69, 70, 71, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 72, 73, 68, 68, 68, 68, 68, + 74, 68, 68, 75, 68, 68, 76, 77, 61, 61, + 68, 69, 70, 71, 68, 68, 68, 68, 68, 68, - 67, 67, 67, 71, 72, 67, 67, 67, 67, 67, - 73, 67, 67, 74, 67, 67, 78, 26, 79, 78, - 78, 26, 79, 78, 82, 26, 83, 82, 82, 26, - 83, 82, 84, 661, 183, 562, 84, 99, 26, 100, - 99, 537, 191, 195, 101, 102, 184, 103, 99, 26, - 100, 99, 333, 334, 150, 101, 102, 150, 103, 114, - 26, 115, 114, 116, 513, 117, 535, 80, 340, 118, - 183, 80, 191, 195, 340, 85, 184, 196, 201, 85, - 86, 26, 62, 86, 87, 173, 88, 340, 104, 226, - 114, 26, 115, 114, 116, 150, 117, 226, 150, 104, + 68, 68, 68, 72, 73, 68, 68, 68, 68, 68, + 74, 68, 68, 75, 68, 68, 79, 26, 80, 79, + 79, 26, 80, 79, 83, 26, 84, 83, 83, 26, + 84, 83, 85, 676, 194, 573, 85, 100, 26, 101, + 100, 546, 177, 198, 102, 103, 178, 104, 100, 26, + 101, 100, 338, 339, 151, 102, 103, 151, 104, 115, + 26, 116, 115, 117, 194, 118, 186, 81, 522, 119, + 345, 81, 177, 198, 186, 86, 178, 199, 187, 86, + 87, 26, 63, 87, 88, 175, 89, 345, 105, 345, + 115, 26, 116, 115, 117, 151, 118, 229, 151, 105, - 118, 224, 217, 224, 89, 217, 90, 196, 201, 135, - 119, 331, 135, 209, 91, 92, 340, 93, 174, 151, - 213, 94, 95, 127, 26, 128, 127, 96, 220, 221, - 183, 76, 97, 152, 89, 136, 90, 127, 26, 128, - 127, 119, 161, 209, 91, 92, 162, 93, 174, 151, - 213, 94, 95, 164, 271, 163, 169, 96, 86, 26, - 62, 86, 87, 152, 88, 136, 232, 165, 170, 232, - 143, 171, 161, 166, 129, 143, 162, 202, 135, 220, - 221, 180, 89, 164, 90, 163, 169, 188, 129, 214, - 188, 203, 91, 92, 238, 93, 204, 165, 170, 94, + 119, 229, 220, 227, 90, 220, 91, 199, 187, 136, + 120, 227, 136, 204, 92, 93, 336, 94, 176, 152, + 212, 95, 96, 128, 26, 129, 128, 97, 223, 224, + 186, 77, 98, 153, 90, 137, 91, 128, 26, 129, + 128, 120, 163, 204, 92, 93, 164, 94, 176, 152, + 212, 95, 96, 166, 276, 165, 171, 97, 87, 26, + 63, 87, 88, 153, 89, 137, 235, 167, 172, 235, + 544, 173, 163, 168, 130, 144, 164, 205, 136, 223, + 224, 183, 90, 166, 91, 165, 171, 191, 130, 216, + 191, 206, 92, 93, 217, 94, 207, 167, 172, 95, - 95, 171, 239, 166, 181, 96, 141, 202, 141, 76, - 97, 242, 89, 189, 90, 177, 178, 179, 177, 214, - 138, 203, 91, 92, 238, 93, 204, 138, 235, 94, - 95, 235, 239, 247, 181, 96, 106, 26, 107, 106, - 108, 242, 198, 189, 226, 198, 224, 109, 110, 110, - 110, 110, 110, 110, 110, 110, 110, 110, 177, 178, - 179, 177, 111, 247, 185, 186, 187, 185, 189, 177, - 178, 179, 177, 199, 200, 215, 199, 200, 215, 177, - 178, 179, 177, 177, 178, 179, 177, 112, 151, 228, - 229, 205, 111, 106, 26, 107, 106, 108, 189, 189, + 96, 173, 241, 168, 184, 97, 144, 205, 142, 77, + 98, 242, 90, 192, 91, 180, 181, 182, 180, 216, + 345, 206, 92, 93, 217, 94, 207, 142, 238, 95, + 96, 238, 241, 245, 184, 97, 107, 26, 108, 107, + 109, 242, 201, 192, 139, 201, 139, 110, 111, 111, + 111, 111, 111, 111, 111, 111, 111, 111, 180, 181, + 182, 180, 112, 245, 188, 189, 190, 188, 192, 180, + 181, 182, 180, 202, 203, 218, 202, 203, 218, 180, + 181, 182, 180, 180, 181, 182, 180, 113, 152, 231, + 232, 229, 112, 107, 26, 108, 107, 109, 192, 192, - 189, 189, 152, 173, 109, 110, 110, 110, 110, 110, - 110, 110, 110, 110, 110, 228, 229, 143, 151, 111, - 177, 178, 179, 177, 206, 210, 207, 211, 248, 189, - 189, 189, 152, 216, 559, 230, 216, 559, 230, 337, - 338, 249, 208, 212, 112, 177, 178, 179, 177, 111, - 120, 26, 62, 120, 206, 210, 207, 211, 248, 189, - 121, 189, 122, 122, 122, 122, 122, 122, 122, 122, - 243, 249, 208, 212, 244, 250, 123, 124, 177, 178, - 179, 177, 333, 334, 141, 219, 220, 221, 219, 189, - 138, 189, 235, 236, 237, 235, 251, 125, 333, 334, + 192, 192, 153, 227, 110, 111, 111, 111, 111, 111, + 111, 111, 111, 111, 111, 231, 232, 208, 152, 112, + 180, 181, 182, 180, 209, 213, 210, 214, 250, 192, + 192, 192, 153, 219, 569, 233, 219, 569, 233, 342, + 343, 251, 211, 215, 113, 180, 181, 182, 180, 112, + 121, 26, 63, 121, 209, 213, 210, 214, 250, 192, + 122, 192, 123, 123, 123, 123, 123, 123, 123, 123, + 246, 251, 211, 215, 247, 252, 124, 125, 180, 181, + 182, 180, 338, 339, 175, 222, 223, 224, 222, 192, + 144, 192, 238, 239, 240, 238, 253, 126, 338, 339, - 243, 76, 337, 338, 244, 250, 123, 124, 337, 338, - 143, 222, 231, 231, 231, 231, 231, 231, 231, 231, - 198, 198, 135, 198, 198, 135, 251, 125, 130, 131, - 26, 132, 131, 130, 130, 130, 130, 130, 130, 130, - 130, 222, 240, 245, 241, 246, 189, 189, 136, 220, - 428, 130, 130, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 144, 144, 144, 144, 144, 144, 144, - 144, 254, 240, 245, 241, 246, 189, 189, 136, 130, - 134, 130, 130, 130, 131, 26, 132, 131, 130, 130, - 130, 130, 130, 130, 130, 130, 145, 255, 256, 429, + 246, 77, 342, 343, 247, 252, 124, 125, 342, 343, + 142, 225, 234, 234, 234, 234, 234, 234, 234, 234, + 201, 201, 136, 201, 201, 136, 253, 126, 131, 132, + 26, 133, 132, 131, 131, 131, 131, 131, 131, 131, + 131, 225, 243, 248, 244, 249, 192, 192, 137, 223, + 435, 131, 131, 236, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 145, 145, 145, 145, 145, 145, 145, + 145, 254, 243, 248, 244, 249, 192, 192, 137, 131, + 135, 131, 131, 131, 132, 26, 133, 132, 131, 131, + 131, 131, 131, 131, 131, 131, 146, 255, 258, 436, - 257, 254, 145, 260, 141, 138, 130, 130, 177, 178, - 179, 177, 272, 236, 237, 272, 601, 744, 252, 601, - 261, 262, 263, 264, 744, 265, 145, 255, 256, 253, - 257, 266, 145, 260, 130, 134, 130, 130, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 252, 258, - 261, 262, 263, 264, 154, 265, 259, 270, 744, 253, - 155, 266, 135, 744, 744, 180, 183, 276, 277, 278, - 276, 601, 274, 744, 601, 188, 744, 744, 188, 258, - 275, 268, 279, 190, 154, 269, 259, 270, 181, 190, - 155, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 259, 254, 146, 260, 139, 144, 131, 131, 180, 181, + 182, 180, 277, 239, 240, 277, 142, 612, 256, 261, + 612, 264, 265, 266, 139, 267, 146, 255, 258, 257, + 259, 268, 146, 260, 131, 135, 131, 131, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 256, 261, + 262, 264, 265, 266, 155, 267, 269, 263, 270, 257, + 156, 268, 612, 136, 772, 612, 183, 281, 282, 283, + 281, 274, 275, 340, 223, 224, 340, 772, 772, 272, + 262, 284, 285, 273, 155, 286, 269, 263, 270, 184, + 156, 179, 179, 179, 179, 179, 179, 179, 179, 179, - 176, 189, 274, 176, 176, 176, 176, 176, 176, 744, - 275, 268, 279, 190, 744, 269, 744, 744, 181, 190, - 280, 281, 282, 198, 744, 744, 198, 199, 283, 284, - 199, 189, 285, 176, 176, 176, 176, 176, 176, 192, - 192, 192, 192, 192, 192, 192, 192, 192, 192, 189, - 280, 281, 282, 189, 200, 193, 286, 200, 283, 284, - 323, 194, 285, 215, 744, 744, 215, 335, 220, 221, - 335, 744, 324, 325, 276, 277, 278, 276, 744, 189, - 189, 326, 327, 189, 328, 193, 286, 329, 330, 189, - 323, 194, 197, 197, 197, 197, 197, 197, 197, 197, + 179, 274, 275, 179, 179, 179, 179, 179, 179, 272, + 772, 284, 285, 273, 186, 286, 772, 772, 772, 184, + 279, 193, 287, 191, 288, 772, 191, 193, 280, 281, + 282, 283, 281, 179, 179, 179, 179, 179, 179, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 192, + 279, 193, 287, 289, 288, 196, 201, 193, 280, 201, + 202, 197, 203, 202, 772, 203, 497, 498, 499, 500, + 501, 772, 290, 291, 772, 772, 772, 772, 772, 192, + 328, 329, 192, 289, 330, 196, 192, 331, 192, 332, + 333, 197, 200, 200, 200, 200, 200, 200, 200, 200, - 197, 197, 324, 325, 197, 197, 197, 197, 197, 197, - 189, 326, 327, 744, 328, 744, 744, 329, 330, 189, - 744, 744, 744, 744, 216, 230, 744, 216, 230, 488, - 489, 490, 491, 492, 197, 197, 197, 197, 197, 197, - 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, - 189, 189, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 744, 744, - 189, 189, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 200, 200, 290, 291, 200, 200, 200, 200, 200, 200, + 328, 329, 192, 772, 330, 772, 192, 331, 192, 332, + 333, 334, 234, 234, 234, 234, 234, 234, 234, 234, + 437, 438, 439, 437, 200, 200, 200, 200, 200, 200, + 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, + 335, 334, 302, 303, 304, 305, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 772, 772, + 335, 345, 302, 303, 304, 305, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 315, 316, 317, 318, 319, 320, 321, 322, 219, 220, - 221, 219, 231, 231, 231, 231, 231, 231, 231, 231, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 341, 342, 343, 344, 222, 345, 346, 347, 348, 349, - 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, - 341, 342, 343, 344, 222, 345, 346, 347, 348, 349, - 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, - 183, 183, 372, 373, 374, 375, 376, 377, 371, 378, + 320, 321, 322, 323, 324, 325, 326, 327, 218, 219, + 346, 218, 219, 222, 223, 224, 222, 233, 347, 348, + 233, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 236, 349, 350, 351, 192, 192, 352, 353, 354, 225, + 346, 355, 356, 192, 357, 358, 359, 360, 347, 348, + 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, + 371, 349, 350, 351, 192, 192, 352, 353, 354, 225, + 372, 355, 356, 192, 357, 358, 359, 360, 373, 374, + 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, + 371, 375, 376, 186, 186, 379, 380, 381, 382, 383, - 380, 381, 384, 382, 386, 398, 400, 387, 401, 388, - 405, 402, 385, 409, 416, 399, 370, 383, 744, 744, - 744, 744, 372, 373, 374, 375, 376, 377, 371, 378, - 380, 381, 384, 382, 386, 398, 400, 387, 401, 388, - 405, 402, 385, 409, 416, 399, 370, 383, 389, 390, - 391, 392, 393, 394, 395, 396, 397, 403, 417, 406, - 410, 412, 404, 407, 418, 408, 413, 411, 419, 420, - 414, 421, 422, 423, 415, 424, 425, 430, 431, 432, - 430, 433, 434, 435, 439, 440, 436, 403, 417, 406, - 410, 412, 404, 407, 418, 408, 413, 411, 419, 420, + 372, 378, 384, 385, 387, 388, 389, 391, 373, 374, + 393, 407, 772, 394, 412, 395, 416, 392, 772, 377, + 390, 375, 376, 772, 772, 379, 380, 381, 382, 383, + 772, 378, 384, 385, 387, 388, 389, 391, 405, 408, + 393, 407, 409, 394, 412, 395, 416, 392, 406, 377, + 390, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 410, 423, 424, 417, 425, 411, 426, 413, 405, 408, + 418, 414, 409, 415, 419, 427, 428, 429, 406, 420, + 430, 431, 432, 421, 440, 441, 442, 422, 446, 772, + 410, 423, 424, 417, 425, 411, 426, 413, 443, 447, - 414, 421, 422, 423, 415, 424, 425, 437, 441, 442, - 443, 433, 434, 435, 439, 440, 444, 445, 446, 447, - 448, 438, 449, 450, 451, 452, 453, 454, 340, 455, - 456, 457, 458, 459, 744, 462, 463, 437, 441, 442, - 443, 464, 465, 466, 183, 467, 444, 445, 446, 447, - 448, 438, 449, 450, 451, 452, 453, 454, 460, 455, - 456, 457, 458, 459, 183, 462, 463, 468, 469, 470, - 471, 464, 465, 466, 472, 467, 473, 461, 474, 476, - 477, 744, 744, 744, 744, 744, 744, 744, 460, 744, - 744, 493, 494, 495, 475, 496, 497, 468, 469, 470, + 418, 414, 448, 415, 419, 427, 428, 429, 449, 420, + 430, 431, 432, 421, 440, 441, 442, 422, 446, 444, + 450, 451, 452, 453, 454, 455, 456, 457, 458, 447, + 459, 460, 448, 445, 461, 462, 463, 464, 449, 465, + 466, 467, 468, 471, 472, 186, 473, 474, 772, 444, + 450, 451, 452, 453, 454, 455, 456, 457, 458, 469, + 459, 460, 186, 445, 461, 462, 463, 464, 477, 465, + 466, 467, 468, 471, 472, 470, 473, 474, 475, 481, + 476, 478, 479, 480, 482, 483, 485, 486, 772, 469, + 772, 772, 772, 772, 772, 772, 772, 772, 477, 502, - 471, 744, 744, 744, 472, 744, 473, 461, 474, 476, - 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, - 487, 493, 494, 495, 475, 496, 497, 498, 499, 500, - 501, 502, 503, 504, 505, 506, 507, 512, 514, 515, - 518, 516, 508, 519, 520, 521, 522, 523, 524, 525, - 526, 509, 527, 528, 510, 529, 530, 511, 517, 531, - 220, 428, 220, 428, 744, 598, 428, 512, 514, 515, - 518, 516, 508, 519, 520, 521, 522, 523, 524, 525, - 526, 509, 527, 528, 510, 529, 530, 511, 517, 531, - 532, 533, 534, 532, 430, 431, 432, 430, 536, 538, + 503, 484, 504, 505, 506, 470, 772, 772, 475, 481, + 476, 478, 479, 480, 482, 483, 485, 486, 487, 488, + 489, 490, 491, 492, 493, 494, 495, 496, 521, 502, + 503, 484, 504, 505, 506, 507, 508, 509, 510, 511, + 512, 513, 514, 515, 516, 523, 524, 525, 527, 528, + 517, 529, 530, 531, 532, 533, 534, 535, 521, 518, + 536, 537, 519, 538, 526, 520, 539, 540, 223, 435, + 223, 435, 772, 609, 435, 523, 524, 525, 527, 528, + 517, 529, 530, 531, 532, 533, 534, 535, 772, 518, + 536, 537, 519, 538, 526, 520, 539, 540, 541, 542, - 436, 541, 542, 543, 544, 744, 545, 546, 547, 548, - 429, 744, 429, 549, 550, 429, 551, 552, 553, 554, - 744, 539, 557, 558, 555, 560, 563, 564, 536, 538, - 565, 541, 542, 543, 544, 540, 545, 546, 547, 548, - 183, 429, 561, 549, 550, 340, 551, 552, 553, 554, - 556, 539, 557, 558, 566, 560, 563, 564, 567, 568, - 565, 569, 570, 571, 572, 540, 573, 574, 575, 576, - 577, 578, 561, 579, 580, 581, 584, 582, 585, 586, - 556, 587, 588, 589, 566, 583, 590, 591, 567, 568, - 592, 569, 570, 571, 572, 593, 573, 574, 575, 576, + 543, 541, 437, 438, 439, 437, 545, 547, 443, 550, + 551, 552, 553, 772, 554, 555, 556, 557, 436, 772, + 436, 558, 559, 436, 560, 561, 562, 563, 564, 548, + 772, 567, 568, 570, 565, 571, 545, 547, 574, 550, + 551, 552, 553, 549, 554, 555, 556, 557, 186, 436, + 572, 558, 559, 345, 560, 561, 562, 563, 564, 548, + 566, 567, 568, 570, 575, 571, 576, 577, 574, 579, + 580, 578, 581, 549, 582, 583, 584, 585, 586, 587, + 572, 588, 589, 590, 591, 592, 595, 593, 596, 597, + 566, 598, 599, 600, 575, 594, 576, 577, 601, 579, - 577, 578, 594, 579, 580, 581, 584, 582, 585, 586, - 595, 587, 588, 589, 596, 583, 590, 591, 597, 603, - 592, 532, 533, 534, 532, 593, 537, 601, 604, 605, - 601, 606, 594, 608, 609, 610, 555, 744, 611, 183, - 595, 612, 744, 613, 596, 614, 615, 599, 597, 603, - 617, 618, 559, 620, 621, 559, 744, 622, 604, 605, - 623, 624, 616, 608, 609, 610, 607, 600, 611, 602, - 625, 612, 429, 613, 626, 614, 615, 599, 627, 628, - 617, 618, 629, 620, 621, 630, 619, 622, 631, 632, - 623, 624, 616, 633, 634, 635, 607, 600, 636, 602, + 580, 578, 581, 602, 582, 583, 584, 585, 586, 587, + 603, 588, 589, 590, 591, 592, 595, 593, 596, 597, + 604, 598, 599, 600, 605, 594, 606, 607, 601, 608, + 546, 614, 615, 602, 541, 542, 543, 541, 612, 616, + 603, 612, 617, 619, 620, 621, 622, 772, 623, 624, + 604, 610, 625, 626, 605, 186, 606, 607, 627, 608, + 565, 614, 615, 629, 630, 569, 632, 633, 569, 616, + 634, 611, 635, 619, 620, 621, 622, 618, 623, 624, + 613, 610, 625, 626, 636, 436, 628, 637, 627, 638, + 639, 640, 641, 629, 630, 642, 632, 633, 643, 631, - 625, 637, 638, 639, 626, 640, 641, 642, 627, 628, - 643, 644, 629, 645, 646, 630, 619, 647, 631, 632, - 648, 649, 650, 633, 634, 635, 606, 652, 636, 606, - 653, 637, 638, 639, 744, 640, 641, 642, 654, 655, - 643, 644, 656, 645, 646, 657, 658, 647, 659, 660, - 648, 649, 650, 662, 663, 664, 665, 652, 666, 667, - 653, 651, 668, 669, 651, 670, 671, 672, 654, 655, - 673, 674, 656, 675, 676, 657, 658, 677, 659, 660, - 678, 679, 680, 662, 663, 664, 665, 681, 666, 667, - 683, 651, 668, 669, 651, 670, 671, 672, 684, 685, + 634, 611, 635, 644, 645, 646, 647, 618, 648, 649, + 613, 650, 651, 652, 636, 653, 628, 637, 654, 638, + 639, 640, 641, 655, 656, 642, 657, 658, 643, 631, + 659, 660, 661, 644, 645, 646, 647, 662, 648, 649, + 663, 650, 651, 652, 617, 653, 665, 617, 654, 772, + 666, 667, 772, 655, 656, 668, 657, 658, 669, 670, + 659, 660, 661, 671, 672, 673, 674, 662, 675, 677, + 663, 678, 679, 680, 681, 682, 665, 683, 684, 664, + 666, 667, 664, 685, 686, 668, 687, 688, 669, 670, + 689, 690, 691, 671, 672, 673, 674, 692, 675, 677, - 673, 674, 686, 675, 676, 687, 688, 677, 689, 690, - 678, 679, 680, 691, 692, 693, 694, 695, 696, 682, - 683, 697, 698, 681, 700, 744, 701, 702, 684, 685, - 703, 704, 686, 705, 706, 687, 688, 707, 689, 690, - 711, 712, 709, 691, 692, 693, 694, 695, 696, 682, - 713, 697, 698, 714, 700, 699, 701, 702, 716, 707, - 703, 704, 707, 705, 706, 710, 718, 709, 720, 721, - 711, 712, 708, 722, 724, 725, 715, 714, 714, 726, - 713, 727, 728, 729, 730, 699, 731, 732, 716, 733, - 719, 734, 735, 736, 717, 710, 718, 717, 720, 721, + 693, 678, 679, 680, 681, 682, 694, 683, 684, 664, + 695, 696, 664, 685, 686, 697, 687, 688, 699, 700, + 689, 690, 691, 701, 702, 703, 704, 692, 705, 706, + 693, 707, 708, 709, 710, 711, 694, 712, 713, 714, + 695, 696, 715, 716, 697, 718, 772, 698, 699, 700, + 719, 720, 721, 701, 702, 703, 704, 722, 705, 706, + 723, 707, 708, 709, 710, 711, 724, 712, 713, 714, + 725, 728, 715, 716, 726, 718, 717, 698, 730, 734, + 719, 720, 721, 731, 732, 733, 736, 722, 737, 739, + 723, 726, 726, 741, 729, 742, 724, 728, 743, 744, - 723, 723, 708, 722, 724, 725, 715, 737, 738, 726, - 739, 727, 728, 729, 730, 740, 731, 732, 741, 733, - 719, 734, 735, 736, 717, 742, 743, 717, 744, 744, - 723, 723, 744, 744, 744, 744, 744, 737, 738, 744, - 739, 744, 744, 744, 744, 740, 744, 744, 741, 744, - 744, 744, 744, 744, 744, 742, 743, 77, 77, 77, - 77, 77, 81, 81, 81, 81, 81, 60, 60, 60, - 60, 60, 98, 98, 98, 98, 98, 105, 105, 105, - 105, 105, 113, 113, 113, 113, 113, 126, 126, 126, - 126, 126, 133, 133, 133, 133, 133, 137, 744, 137, + 725, 746, 735, 772, 747, 748, 717, 734, 730, 727, + 734, 749, 750, 731, 732, 733, 736, 751, 737, 739, + 740, 752, 753, 741, 729, 742, 738, 738, 743, 744, + 745, 746, 735, 745, 747, 748, 754, 755, 756, 727, + 757, 749, 750, 758, 759, 760, 761, 751, 762, 763, + 740, 752, 753, 764, 765, 766, 738, 738, 767, 768, + 745, 769, 770, 745, 771, 772, 754, 755, 756, 772, + 757, 772, 772, 758, 759, 760, 761, 772, 762, 763, + 772, 772, 772, 764, 765, 766, 772, 772, 767, 768, + 772, 769, 770, 772, 771, 78, 78, 78, 78, 78, - 137, 137, 139, 744, 139, 140, 744, 140, 140, 140, - 142, 744, 142, 142, 142, 145, 744, 145, 182, 182, - 182, 190, 744, 190, 218, 218, 218, 218, 218, 223, - 744, 223, 223, 223, 225, 744, 225, 225, 225, 227, - 227, 227, 227, 227, 273, 273, 273, 332, 332, 332, - 332, 332, 336, 336, 336, 336, 336, 339, 744, 339, - 339, 339, 379, 744, 379, 426, 744, 426, 427, 427, - 427, 427, 427, 23, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 82, 82, 82, 82, 82, 61, 61, 61, 61, 61, + 99, 99, 99, 99, 99, 106, 106, 106, 106, 106, + 114, 114, 114, 114, 114, 127, 127, 127, 127, 127, + 134, 134, 134, 134, 134, 138, 772, 138, 138, 138, + 140, 772, 140, 141, 772, 141, 141, 141, 143, 772, + 143, 143, 143, 146, 772, 146, 185, 185, 185, 193, + 772, 193, 221, 221, 221, 221, 221, 226, 772, 226, + 226, 226, 228, 772, 228, 228, 228, 230, 230, 230, + 230, 230, 278, 278, 278, 337, 337, 337, 337, 337, + 341, 341, 341, 341, 341, 344, 772, 344, 344, 344, + + 386, 772, 386, 433, 772, 433, 434, 434, 434, 434, + 434, 23, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772 - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744 } ; -static const flex_int16_t yy_chk[2056] = +static const flex_int16_t yy_chk[2094] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -913,10 +927,10 @@ static const flex_int16_t yy_chk[2056] = 1, 2, 40, 2, 34, 34, 34, 34, 34, 34, 34, 34, 36, 37, 42, 43, 44, 37, 45, 36, - 48, 49, 51, 53, 2, 56, 56, 56, 56, 118, - 118, 765, 40, 66, 66, 66, 66, 66, 66, 66, - 66, 764, 36, 37, 42, 43, 44, 37, 45, 36, - 48, 49, 51, 53, 2, 3, 3, 3, 3, 3, + 46, 49, 50, 52, 2, 57, 57, 57, 57, 119, + 119, 793, 40, 67, 67, 67, 67, 67, 67, 67, + 67, 792, 36, 37, 42, 43, 44, 37, 45, 36, + 46, 49, 50, 52, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -927,207 +941,212 @@ static const flex_int16_t yy_chk[2056] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, - 8, 8, 7, 621, 58, 461, 8, 11, 11, 11, - 11, 434, 68, 71, 11, 11, 58, 11, 12, 12, - 12, 12, 217, 217, 69, 12, 12, 69, 12, 15, - 15, 15, 15, 15, 405, 15, 432, 5, 339, 15, - 273, 6, 68, 71, 272, 7, 58, 72, 89, 8, - 9, 9, 9, 9, 9, 52, 9, 235, 11, 226, - 16, 16, 16, 16, 16, 38, 16, 225, 38, 12, + 8, 8, 7, 634, 69, 470, 8, 11, 11, 11, + 11, 441, 54, 72, 11, 11, 54, 11, 12, 12, + 12, 12, 220, 220, 70, 12, 12, 70, 12, 15, + 15, 15, 15, 15, 69, 15, 59, 5, 412, 15, + 344, 6, 54, 72, 278, 7, 54, 73, 59, 8, + 9, 9, 9, 9, 9, 53, 9, 277, 11, 238, + 16, 16, 16, 16, 16, 38, 16, 229, 38, 12, - 16, 224, 111, 223, 9, 111, 9, 72, 89, 25, - 15, 214, 25, 93, 9, 9, 432, 9, 52, 38, - 95, 9, 9, 19, 19, 19, 19, 9, 218, 218, - 182, 9, 9, 38, 9, 25, 9, 20, 20, 20, - 20, 16, 46, 93, 9, 9, 46, 9, 52, 38, - 95, 9, 9, 47, 179, 46, 50, 9, 10, 10, - 10, 10, 10, 38, 10, 25, 123, 47, 50, 123, - 143, 50, 46, 47, 19, 142, 46, 90, 57, 221, - 221, 57, 10, 47, 10, 46, 50, 61, 20, 96, - 61, 90, 10, 10, 146, 10, 90, 47, 50, 10, + 16, 228, 112, 227, 9, 112, 9, 73, 59, 25, + 15, 226, 25, 90, 9, 9, 217, 9, 53, 38, + 94, 9, 9, 19, 19, 19, 19, 9, 221, 221, + 185, 9, 9, 38, 9, 25, 9, 20, 20, 20, + 20, 16, 47, 90, 9, 9, 47, 9, 53, 38, + 94, 9, 9, 48, 182, 47, 51, 9, 10, 10, + 10, 10, 10, 38, 10, 25, 124, 48, 51, 124, + 439, 51, 47, 48, 19, 144, 47, 91, 58, 224, + 224, 58, 10, 48, 10, 47, 51, 62, 20, 96, + 62, 91, 10, 10, 97, 10, 91, 48, 51, 10, - 10, 50, 147, 47, 57, 10, 141, 90, 140, 10, - 10, 149, 10, 61, 10, 76, 76, 76, 76, 96, - 138, 90, 10, 10, 146, 10, 90, 137, 189, 10, - 10, 189, 147, 154, 57, 10, 13, 13, 13, 13, - 13, 149, 78, 61, 117, 78, 116, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 80, 80, - 80, 80, 13, 154, 59, 59, 59, 59, 78, 85, - 85, 85, 85, 82, 86, 99, 82, 86, 99, 104, - 104, 104, 104, 112, 112, 112, 112, 13, 59, 227, - 227, 91, 13, 14, 14, 14, 14, 14, 78, 82, + 10, 51, 147, 48, 58, 10, 143, 91, 142, 10, + 10, 148, 10, 62, 10, 77, 77, 77, 77, 96, + 439, 91, 10, 10, 97, 10, 91, 141, 192, 10, + 10, 192, 147, 150, 58, 10, 13, 13, 13, 13, + 13, 148, 79, 62, 139, 79, 138, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 81, 81, + 81, 81, 13, 150, 60, 60, 60, 60, 79, 86, + 86, 86, 86, 83, 87, 100, 83, 87, 100, 105, + 105, 105, 105, 113, 113, 113, 113, 13, 60, 230, + 230, 118, 13, 14, 14, 14, 14, 14, 79, 83, - 86, 99, 59, 73, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 229, 229, 65, 59, 14, - 119, 119, 119, 119, 92, 94, 92, 94, 156, 82, - 86, 99, 59, 106, 458, 120, 106, 458, 120, 232, - 232, 157, 92, 94, 14, 129, 129, 129, 129, 14, - 17, 17, 17, 17, 92, 94, 92, 94, 156, 106, - 17, 120, 17, 17, 17, 17, 17, 17, 17, 17, - 151, 157, 92, 94, 151, 158, 17, 17, 134, 134, - 134, 134, 332, 332, 64, 114, 114, 114, 114, 106, - 63, 120, 136, 136, 136, 136, 159, 17, 334, 334, + 87, 100, 60, 117, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 232, 232, 92, 60, 14, + 120, 120, 120, 120, 93, 95, 93, 95, 155, 83, + 87, 100, 60, 107, 466, 121, 107, 466, 121, 235, + 235, 157, 93, 95, 14, 130, 130, 130, 130, 14, + 17, 17, 17, 17, 93, 95, 93, 95, 155, 107, + 17, 121, 17, 17, 17, 17, 17, 17, 17, 17, + 152, 157, 93, 95, 152, 158, 17, 17, 135, 135, + 135, 135, 337, 337, 74, 115, 115, 115, 115, 107, + 66, 121, 137, 137, 137, 137, 159, 17, 339, 339, - 151, 17, 336, 336, 151, 158, 17, 17, 338, 338, - 31, 114, 122, 122, 122, 122, 122, 122, 122, 122, - 127, 131, 135, 127, 131, 135, 159, 17, 21, 21, + 152, 17, 341, 341, 152, 158, 17, 17, 343, 343, + 65, 115, 123, 123, 123, 123, 123, 123, 123, 123, + 128, 132, 136, 128, 132, 136, 159, 17, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 114, 148, 152, 148, 152, 127, 131, 135, 335, - 335, 21, 21, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 144, 144, 144, 144, 144, 144, 144, - 144, 161, 148, 152, 148, 152, 127, 131, 135, 21, + 21, 115, 149, 153, 149, 153, 128, 132, 136, 340, + 340, 21, 21, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 145, 145, 145, 145, 145, 145, 145, + 145, 160, 149, 153, 149, 153, 128, 132, 136, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 153, 162, 163, 335, + 22, 22, 22, 22, 22, 22, 154, 161, 163, 340, - 164, 161, 153, 166, 30, 28, 22, 22, 177, 177, - 177, 177, 181, 181, 181, 181, 601, 23, 160, 601, - 167, 168, 169, 170, 0, 171, 153, 162, 163, 160, - 164, 172, 153, 166, 22, 22, 22, 22, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 160, 165, - 167, 168, 169, 170, 39, 171, 165, 175, 0, 160, - 39, 172, 180, 0, 0, 180, 184, 185, 185, 185, - 185, 602, 184, 0, 602, 188, 0, 0, 188, 165, - 184, 174, 191, 192, 39, 174, 165, 175, 180, 192, - 39, 54, 54, 54, 54, 54, 54, 54, 54, 54, + 164, 160, 154, 165, 64, 31, 22, 22, 180, 180, + 180, 180, 184, 184, 184, 184, 30, 612, 162, 166, + 612, 168, 169, 170, 28, 171, 154, 161, 163, 162, + 164, 172, 154, 165, 22, 22, 22, 22, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 162, 166, + 167, 168, 169, 170, 39, 171, 173, 167, 174, 162, + 39, 172, 613, 183, 23, 613, 183, 188, 188, 188, + 188, 177, 178, 225, 225, 225, 225, 0, 0, 176, + 167, 194, 196, 176, 39, 198, 173, 167, 174, 183, + 39, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 54, 188, 184, 54, 54, 54, 54, 54, 54, 0, - 184, 174, 191, 192, 0, 174, 0, 0, 180, 192, - 193, 195, 196, 198, 0, 0, 198, 199, 201, 202, - 199, 188, 203, 54, 54, 54, 54, 54, 54, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 198, - 193, 195, 196, 199, 200, 70, 204, 200, 201, 202, - 206, 70, 203, 215, 0, 0, 215, 222, 222, 222, - 222, 0, 207, 208, 276, 276, 276, 276, 0, 198, - 200, 209, 210, 199, 211, 70, 204, 212, 213, 215, - 206, 70, 74, 74, 74, 74, 74, 74, 74, 74, + 55, 177, 178, 55, 55, 55, 55, 55, 55, 176, + 0, 194, 196, 176, 187, 198, 0, 0, 0, 183, + 187, 195, 199, 191, 204, 0, 191, 195, 187, 281, + 281, 281, 281, 55, 55, 55, 55, 55, 55, 71, + 71, 71, 71, 71, 71, 71, 71, 71, 71, 191, + 187, 195, 199, 205, 204, 71, 201, 195, 187, 201, + 202, 71, 203, 202, 0, 203, 397, 397, 397, 397, + 397, 0, 206, 207, 0, 0, 0, 0, 0, 191, + 209, 210, 201, 205, 211, 71, 202, 212, 203, 213, + 214, 71, 75, 75, 75, 75, 75, 75, 75, 75, - 74, 74, 207, 208, 74, 74, 74, 74, 74, 74, - 200, 209, 210, 0, 211, 0, 0, 212, 213, 215, - 0, 0, 0, 0, 216, 230, 0, 216, 230, 390, - 390, 390, 390, 390, 74, 74, 74, 74, 74, 74, - 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, - 216, 230, 205, 205, 205, 205, 205, 205, 205, 205, - 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, - 205, 205, 205, 205, 205, 205, 205, 205, 0, 0, - 216, 230, 205, 205, 205, 205, 205, 205, 205, 205, - 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, + 75, 75, 206, 207, 75, 75, 75, 75, 75, 75, + 209, 210, 201, 0, 211, 0, 202, 212, 203, 213, + 214, 215, 234, 234, 234, 234, 234, 234, 234, 234, + 345, 345, 345, 345, 75, 75, 75, 75, 75, 75, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 216, 215, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 0, 0, + 216, 345, 208, 208, 208, 208, 208, 208, 208, 208, + 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 205, 205, 205, 205, 205, 205, 205, 205, 219, 219, - 219, 219, 231, 231, 231, 231, 231, 231, 231, 231, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 239, 240, 241, 242, 219, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 258, 259, 261, 262, 263, 264, 265, 266, 269, 270, - 239, 240, 241, 242, 219, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 258, 259, 261, 262, 263, 264, 265, 266, 269, 270, - 274, 275, 279, 280, 282, 283, 284, 285, 275, 286, + 208, 208, 208, 208, 208, 208, 208, 208, 218, 219, + 242, 218, 219, 222, 222, 222, 222, 233, 243, 244, + 233, 236, 236, 236, 236, 236, 236, 236, 236, 236, + 236, 245, 246, 247, 218, 219, 248, 249, 250, 222, + 242, 251, 252, 233, 253, 254, 255, 256, 243, 244, + 257, 258, 259, 260, 261, 262, 263, 265, 266, 267, + 268, 245, 246, 247, 218, 219, 248, 249, 250, 222, + 269, 251, 252, 233, 253, 254, 255, 256, 270, 273, + 257, 258, 259, 260, 261, 262, 263, 265, 266, 267, + 268, 274, 275, 279, 280, 284, 285, 287, 288, 289, - 297, 298, 300, 299, 301, 304, 305, 301, 308, 301, - 311, 308, 300, 313, 316, 304, 274, 299, 0, 0, - 0, 0, 279, 280, 282, 283, 284, 285, 275, 286, - 297, 298, 300, 299, 301, 304, 305, 301, 308, 301, - 311, 308, 300, 313, 316, 304, 274, 299, 302, 302, - 302, 302, 302, 302, 302, 302, 302, 310, 317, 312, - 314, 315, 310, 312, 323, 312, 315, 314, 324, 325, - 315, 326, 327, 328, 315, 329, 330, 340, 340, 340, - 340, 341, 343, 344, 347, 348, 346, 310, 317, 312, - 314, 315, 310, 312, 323, 312, 315, 314, 324, 325, + 269, 280, 290, 291, 302, 303, 304, 305, 270, 273, + 306, 310, 0, 306, 316, 306, 318, 305, 0, 279, + 304, 274, 275, 0, 0, 284, 285, 287, 288, 289, + 0, 280, 290, 291, 302, 303, 304, 305, 309, 313, + 306, 310, 313, 306, 316, 306, 318, 305, 309, 279, + 304, 307, 307, 307, 307, 307, 307, 307, 307, 307, + 315, 321, 322, 319, 328, 315, 329, 317, 309, 313, + 319, 317, 313, 317, 320, 330, 331, 332, 309, 320, + 333, 334, 335, 320, 346, 348, 349, 320, 352, 0, + 315, 321, 322, 319, 328, 315, 329, 317, 351, 353, - 315, 326, 327, 328, 315, 329, 330, 346, 349, 350, - 351, 341, 343, 344, 347, 348, 352, 353, 354, 355, - 356, 346, 357, 358, 360, 361, 363, 364, 340, 365, - 366, 367, 368, 369, 0, 373, 375, 346, 349, 350, - 351, 377, 380, 381, 370, 381, 352, 353, 354, 355, - 356, 346, 357, 358, 360, 361, 363, 364, 370, 365, - 366, 367, 368, 369, 371, 373, 375, 382, 383, 383, - 383, 377, 380, 381, 384, 381, 385, 371, 386, 387, - 388, 0, 0, 0, 0, 0, 0, 0, 370, 0, - 0, 398, 399, 400, 386, 401, 402, 382, 383, 383, + 319, 317, 354, 317, 320, 330, 331, 332, 355, 320, + 333, 334, 335, 320, 346, 348, 349, 320, 352, 351, + 356, 357, 358, 359, 360, 361, 362, 363, 364, 353, + 366, 367, 354, 351, 369, 370, 371, 372, 355, 373, + 374, 375, 376, 380, 382, 377, 384, 387, 0, 351, + 356, 357, 358, 359, 360, 361, 362, 363, 364, 377, + 366, 367, 378, 351, 369, 370, 371, 372, 389, 373, + 374, 375, 376, 380, 382, 378, 384, 387, 388, 391, + 388, 390, 390, 390, 392, 393, 394, 395, 0, 377, + 0, 0, 0, 0, 0, 0, 0, 0, 389, 405, - 383, 0, 0, 0, 384, 0, 385, 371, 386, 387, - 388, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 398, 399, 400, 386, 401, 402, 403, 403, 403, - 403, 403, 403, 403, 403, 403, 403, 404, 406, 407, - 409, 408, 403, 410, 411, 412, 413, 414, 415, 416, - 419, 403, 420, 421, 403, 423, 424, 403, 408, 425, - 427, 427, 428, 428, 0, 534, 534, 404, 406, 407, - 409, 408, 403, 410, 411, 412, 413, 414, 415, 416, - 419, 403, 420, 421, 403, 423, 424, 403, 408, 425, - 429, 429, 429, 429, 430, 430, 430, 430, 433, 435, + 406, 393, 407, 408, 409, 378, 0, 0, 388, 391, + 388, 390, 390, 390, 392, 393, 394, 395, 396, 396, + 396, 396, 396, 396, 396, 396, 396, 396, 411, 405, + 406, 393, 407, 408, 409, 410, 410, 410, 410, 410, + 410, 410, 410, 410, 410, 413, 414, 415, 416, 417, + 410, 418, 419, 420, 421, 422, 423, 426, 411, 410, + 427, 428, 410, 430, 415, 410, 431, 432, 434, 434, + 435, 435, 0, 543, 543, 413, 414, 415, 416, 417, + 410, 418, 419, 420, 421, 422, 423, 426, 0, 410, + 427, 428, 410, 430, 415, 410, 431, 432, 436, 436, - 436, 437, 438, 439, 440, 0, 441, 442, 444, 446, - 427, 0, 428, 447, 449, 534, 450, 451, 452, 453, - 0, 436, 456, 457, 454, 459, 462, 464, 433, 435, - 466, 437, 438, 439, 440, 436, 441, 442, 444, 446, - 460, 429, 460, 447, 449, 430, 450, 451, 452, 453, - 454, 436, 456, 457, 467, 459, 462, 464, 467, 468, - 466, 469, 470, 471, 473, 436, 475, 476, 493, 494, - 496, 497, 460, 508, 509, 510, 512, 511, 514, 515, - 454, 516, 517, 518, 467, 511, 519, 520, 467, 468, - 521, 469, 470, 471, 473, 522, 475, 476, 493, 494, + 436, 436, 437, 437, 437, 437, 440, 442, 443, 444, + 445, 446, 447, 0, 448, 449, 451, 453, 434, 0, + 435, 454, 455, 543, 457, 458, 459, 460, 461, 443, + 0, 464, 465, 467, 462, 468, 440, 442, 471, 444, + 445, 446, 447, 443, 448, 449, 451, 453, 469, 436, + 469, 454, 455, 437, 457, 458, 459, 460, 461, 443, + 462, 464, 465, 467, 473, 468, 475, 476, 471, 477, + 478, 476, 479, 443, 480, 482, 484, 485, 502, 503, + 469, 505, 506, 517, 518, 519, 521, 520, 523, 524, + 462, 525, 526, 527, 473, 520, 475, 476, 528, 477, - 496, 497, 523, 508, 509, 510, 512, 511, 514, 515, - 524, 516, 517, 518, 527, 511, 519, 520, 530, 539, - 521, 532, 532, 532, 532, 522, 537, 538, 540, 541, - 538, 542, 523, 543, 544, 545, 555, 0, 546, 561, - 524, 548, 0, 550, 527, 551, 552, 537, 530, 539, - 556, 558, 559, 560, 561, 559, 0, 563, 540, 541, - 564, 565, 555, 543, 544, 545, 542, 537, 546, 538, - 566, 548, 532, 550, 569, 551, 552, 537, 570, 571, - 556, 558, 573, 560, 561, 574, 559, 563, 576, 577, - 564, 565, 555, 579, 580, 581, 542, 537, 582, 538, + 478, 476, 479, 529, 480, 482, 484, 485, 502, 503, + 530, 505, 506, 517, 518, 519, 521, 520, 523, 524, + 531, 525, 526, 527, 532, 520, 533, 536, 528, 539, + 546, 548, 549, 529, 541, 541, 541, 541, 547, 550, + 530, 547, 551, 552, 553, 554, 555, 0, 557, 558, + 531, 546, 560, 561, 532, 572, 533, 536, 562, 539, + 565, 548, 549, 566, 568, 569, 570, 571, 569, 550, + 572, 546, 574, 552, 553, 554, 555, 551, 557, 558, + 547, 546, 560, 561, 575, 541, 565, 576, 562, 577, + 580, 581, 582, 566, 568, 584, 570, 571, 585, 569, - 566, 583, 584, 585, 569, 586, 589, 590, 570, 571, - 591, 592, 573, 593, 594, 574, 559, 595, 576, 577, - 599, 600, 603, 579, 580, 581, 604, 605, 582, 606, - 607, 583, 584, 585, 0, 586, 589, 590, 609, 611, - 591, 592, 612, 593, 594, 614, 616, 595, 617, 619, - 599, 600, 603, 624, 625, 628, 631, 605, 634, 635, - 607, 604, 636, 637, 606, 638, 640, 644, 609, 611, - 648, 649, 612, 650, 651, 614, 616, 652, 617, 619, - 653, 654, 655, 624, 625, 628, 631, 657, 634, 635, - 658, 604, 636, 637, 606, 638, 640, 644, 659, 660, + 572, 546, 574, 587, 588, 590, 591, 551, 592, 593, + 547, 594, 595, 596, 575, 597, 565, 576, 600, 577, + 580, 581, 582, 601, 602, 584, 603, 604, 585, 569, + 605, 606, 610, 587, 588, 590, 591, 611, 592, 593, + 614, 594, 595, 596, 615, 597, 616, 617, 600, 0, + 618, 620, 0, 601, 602, 622, 603, 604, 623, 624, + 605, 606, 610, 626, 628, 629, 631, 611, 633, 637, + 614, 638, 641, 644, 647, 648, 616, 649, 650, 615, + 618, 620, 617, 651, 653, 622, 657, 661, 623, 624, + 662, 663, 664, 626, 628, 629, 631, 665, 633, 637, - 648, 649, 662, 650, 651, 663, 664, 652, 666, 668, - 653, 654, 655, 670, 673, 674, 675, 676, 677, 657, - 658, 678, 680, 681, 682, 0, 683, 684, 659, 660, - 685, 693, 662, 694, 695, 663, 664, 696, 666, 668, - 699, 700, 698, 670, 673, 674, 675, 676, 677, 657, - 701, 678, 680, 702, 682, 681, 683, 684, 704, 705, - 685, 693, 707, 694, 695, 698, 708, 709, 710, 711, - 699, 700, 696, 712, 715, 716, 702, 713, 714, 717, - 701, 718, 719, 720, 721, 681, 722, 723, 704, 724, - 709, 726, 728, 729, 705, 698, 708, 707, 710, 711, + 666, 638, 641, 644, 647, 648, 667, 649, 650, 615, + 668, 669, 617, 651, 653, 671, 657, 661, 672, 673, + 662, 663, 664, 674, 675, 677, 678, 665, 679, 681, + 666, 683, 685, 688, 689, 690, 667, 691, 692, 693, + 668, 669, 695, 696, 697, 698, 0, 671, 672, 673, + 699, 700, 701, 674, 675, 677, 678, 702, 679, 681, + 710, 683, 685, 688, 689, 690, 711, 691, 692, 693, + 712, 715, 695, 696, 713, 698, 697, 671, 716, 720, + 699, 700, 701, 717, 718, 719, 722, 702, 723, 727, + 710, 724, 726, 729, 715, 730, 711, 728, 731, 732, - 713, 714, 696, 712, 715, 716, 702, 730, 731, 717, - 732, 718, 719, 720, 721, 733, 722, 723, 735, 724, - 709, 726, 728, 729, 705, 737, 739, 707, 0, 0, - 713, 714, 0, 0, 0, 0, 0, 730, 731, 0, - 732, 0, 0, 0, 0, 733, 0, 0, 735, 0, - 0, 0, 0, 0, 0, 737, 739, 745, 745, 745, - 745, 745, 746, 746, 746, 746, 746, 747, 747, 747, - 747, 747, 748, 748, 748, 748, 748, 749, 749, 749, - 749, 749, 750, 750, 750, 750, 750, 751, 751, 751, - 751, 751, 752, 752, 752, 752, 752, 753, 0, 753, + 712, 735, 720, 0, 736, 737, 697, 733, 716, 713, + 734, 738, 739, 717, 718, 719, 722, 740, 723, 727, + 728, 741, 742, 729, 715, 730, 724, 726, 731, 732, + 733, 735, 720, 734, 736, 737, 743, 744, 745, 713, + 746, 738, 739, 747, 749, 751, 752, 740, 753, 754, + 728, 741, 742, 755, 756, 757, 724, 726, 758, 760, + 733, 762, 763, 734, 765, 0, 743, 744, 745, 0, + 746, 0, 0, 747, 749, 751, 752, 0, 753, 754, + 0, 0, 0, 755, 756, 757, 0, 0, 758, 760, + 0, 762, 763, 0, 765, 773, 773, 773, 773, 773, - 753, 753, 754, 0, 754, 755, 0, 755, 755, 755, - 756, 0, 756, 756, 756, 757, 0, 757, 758, 758, - 758, 759, 0, 759, 760, 760, 760, 760, 760, 761, - 0, 761, 761, 761, 762, 0, 762, 762, 762, 763, - 763, 763, 763, 763, 766, 766, 766, 767, 767, 767, - 767, 767, 768, 768, 768, 768, 768, 769, 0, 769, - 769, 769, 770, 0, 770, 771, 0, 771, 772, 772, - 772, 772, 772, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, + 774, 774, 774, 774, 774, 775, 775, 775, 775, 775, + 776, 776, 776, 776, 776, 777, 777, 777, 777, 777, + 778, 778, 778, 778, 778, 779, 779, 779, 779, 779, + 780, 780, 780, 780, 780, 781, 0, 781, 781, 781, + 782, 0, 782, 783, 0, 783, 783, 783, 784, 0, + 784, 784, 784, 785, 0, 785, 786, 786, 786, 787, + 0, 787, 788, 788, 788, 788, 788, 789, 0, 789, + 789, 789, 790, 0, 790, 790, 790, 791, 791, 791, + 791, 791, 794, 794, 794, 795, 795, 795, 795, 795, + 796, 796, 796, 796, 796, 797, 0, 797, 797, 797, + + 798, 0, 798, 799, 0, 799, 800, 800, 800, 800, + 800, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772, 772, 772, 772, 772, 772, 772, 772, + 772, 772, 772 - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744, 744, 744, 744, 744, 744, - 744, 744, 744, 744, 744 } ; static yy_state_type yy_last_accepting_state; @@ -1181,9 +1200,9 @@ int yyterminate(void) return YY_NULL; } -#line 1185 "lex.c" +#line 1204 "lex.c" -#line 1187 "lex.c" +#line 1206 "lex.c" #define INITIAL 0 #define STOR 1 @@ -1416,7 +1435,7 @@ YY_DECL #line 53 "../../kmflcomp/src/lex.l" -#line 1420 "lex.c" +#line 1439 "lex.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1444,13 +1463,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 745 ) + if ( yy_current_state >= 773 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1974 ); + while ( yy_base[yy_current_state] != 2012 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1580,12 +1599,12 @@ YY_RULE_SETUP case 18: YY_RULE_SETUP #line 78 "../../kmflcomp/src/lex.l" -{return TOK_ANSI;} +{return TOK_VISUALKEYBOARD;} YY_BREAK case 19: YY_RULE_SETUP #line 79 "../../kmflcomp/src/lex.l" -{return TOK_UNICODE;} +{BEGIN(KBDVER);return TOK_KEYBOARDVERSION;} YY_BREAK case 20: YY_RULE_SETUP @@ -1595,137 +1614,131 @@ YY_RULE_SETUP case 21: YY_RULE_SETUP #line 81 "../../kmflcomp/src/lex.l" -{caller=STOR;BEGIN(STOR);return TOK_STORE;} +{return TOK_UNICODE;} YY_BREAK case 22: YY_RULE_SETUP #line 82 "../../kmflcomp/src/lex.l" -{return TOK_OUTS;} +{return TOK_ANSI;} YY_BREAK case 23: YY_RULE_SETUP #line 83 "../../kmflcomp/src/lex.l" -{return TOK_GROUP;} +{caller=STOR;BEGIN(STOR);return TOK_STORE;} YY_BREAK case 24: YY_RULE_SETUP #line 84 "../../kmflcomp/src/lex.l" -{return TOK_USINGKEYS;} +{return TOK_OUTS;} YY_BREAK case 25: YY_RULE_SETUP #line 85 "../../kmflcomp/src/lex.l" -{return TOK_USE;} +{return TOK_GROUP;} YY_BREAK case 26: YY_RULE_SETUP #line 86 "../../kmflcomp/src/lex.l" -{return TOK_CONTEXT;} +{return TOK_USINGKEYS;} YY_BREAK case 27: YY_RULE_SETUP #line 87 "../../kmflcomp/src/lex.l" -{return TOK_ANY;} +{return TOK_USE;} YY_BREAK case 28: YY_RULE_SETUP #line 88 "../../kmflcomp/src/lex.l" -{return TOK_NOTANY;} +{return TOK_CONTEXT;} YY_BREAK case 29: YY_RULE_SETUP #line 89 "../../kmflcomp/src/lex.l" -{return TOK_BEEP;} +{return TOK_ANY;} YY_BREAK case 30: YY_RULE_SETUP #line 90 "../../kmflcomp/src/lex.l" -{BEGIN(PLIST);return TOK_INDEX;} +{return TOK_NOTANY;} YY_BREAK case 31: YY_RULE_SETUP #line 91 "../../kmflcomp/src/lex.l" -{return TOK_NOMATCH;} +{return TOK_BEEP;} YY_BREAK case 32: YY_RULE_SETUP #line 92 "../../kmflcomp/src/lex.l" -{return TOK_MATCH;} +{BEGIN(PLIST);return TOK_INDEX;} YY_BREAK case 33: YY_RULE_SETUP #line 93 "../../kmflcomp/src/lex.l" -{return TOK_NUL;} +{return TOK_NOMATCH;} YY_BREAK case 34: YY_RULE_SETUP #line 94 "../../kmflcomp/src/lex.l" -{return TOK_DEADKEY;} +{return TOK_MATCH;} YY_BREAK case 35: YY_RULE_SETUP #line 95 "../../kmflcomp/src/lex.l" -{return TOK_DEADKEY;} +{return TOK_NUL;} YY_BREAK case 36: YY_RULE_SETUP #line 96 "../../kmflcomp/src/lex.l" -{return TOK_RTN;} +{return TOK_DEADKEY;} YY_BREAK case 37: YY_RULE_SETUP #line 97 "../../kmflcomp/src/lex.l" -{return TOK_CALL; /* not implemented */} +{return TOK_DEADKEY;} YY_BREAK case 38: YY_RULE_SETUP #line 98 "../../kmflcomp/src/lex.l" -{return TOK_SWITCH;/* (obsolete) */} +{return TOK_RTN;} YY_BREAK case 39: YY_RULE_SETUP #line 99 "../../kmflcomp/src/lex.l" -{return TOK_GT;} +{return TOK_CALL; /* not implemented */} YY_BREAK case 40: YY_RULE_SETUP #line 100 "../../kmflcomp/src/lex.l" -{return TOK_PLUS;} +{return TOK_SWITCH;/* (obsolete) */} YY_BREAK case 41: +YY_RULE_SETUP +#line 101 "../../kmflcomp/src/lex.l" +{return TOK_GT;} + YY_BREAK +case 42: +YY_RULE_SETUP +#line 102 "../../kmflcomp/src/lex.l" +{return TOK_PLUS;} + YY_BREAK +case 43: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 101 "../../kmflcomp/src/lex.l" +#line 103 "../../kmflcomp/src/lex.l" {BEGIN(NAME);return TOK_DOLLAR;} YY_BREAK -case 42: -YY_RULE_SETUP -#line 104 "../../kmflcomp/src/lex.l" -{/* ignore spaces */} - YY_BREAK -case 43: -YY_RULE_SETUP -#line 105 "../../kmflcomp/src/lex.l" -{BEGIN(SKIP);} - YY_BREAK case 44: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 106 "../../kmflcomp/src/lex.l" -{BEGIN(PARENS);return(TOK_BRKT);} +{/* ignore spaces */} YY_BREAK case 45: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 107 "../../kmflcomp/src/lex.l" -{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{BEGIN(SKIP);} YY_BREAK case 46: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ @@ -1733,219 +1746,235 @@ case 46: YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 108 "../../kmflcomp/src/lex.l" -{qchar='"';BEGIN(QUOTE);return(TOK_QM);} +{BEGIN(PARENS);return(TOK_BRKT);} YY_BREAK case 47: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 109 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext,NULL,8);return(TOK_NUMBER);} +{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 48: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 110 "../../kmflcomp/src/lex.l" -{yylval.number=atoi(yytext+1);return(TOK_NUMBER);} +{qchar='"';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 49: YY_RULE_SETUP #line 111 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext+1,NULL,16);return(TOK_NUMBER);} +{yylval.number=strtol(yytext,NULL,8);return(TOK_NUMBER);} YY_BREAK case 50: YY_RULE_SETUP #line 112 "../../kmflcomp/src/lex.l" -{yylval.number=strtol(yytext+2,NULL,16);return(TOK_NUMBER);} +{yylval.number=atoi(yytext+1);return(TOK_NUMBER);} YY_BREAK case 51: YY_RULE_SETUP #line 113 "../../kmflcomp/src/lex.l" -{BEGIN(KEYNAME);return(TOK_SB);} +{yylval.number=strtol(yytext+1,NULL,16);return(TOK_NUMBER);} YY_BREAK case 52: YY_RULE_SETUP #line 114 "../../kmflcomp/src/lex.l" +{yylval.number=strtol(yytext+2,NULL,16);return(TOK_NUMBER);} + YY_BREAK +case 53: +YY_RULE_SETUP +#line 115 "../../kmflcomp/src/lex.l" +{BEGIN(KEYNAME);return(TOK_SB);} + YY_BREAK +case 54: +YY_RULE_SETUP +#line 116 "../../kmflcomp/src/lex.l" {return(TOK_BEEP);} YY_BREAK -case 53: -YY_RULE_SETUP -#line 118 "../../kmflcomp/src/lex.l" -{return(TOK_DEADKEY);} - YY_BREAK -case 54: -YY_RULE_SETUP -#line 119 "../../kmflcomp/src/lex.l" -{return(TOK_DEADKEY);} - YY_BREAK case 55: YY_RULE_SETUP #line 120 "../../kmflcomp/src/lex.l" -{return(TOK_OUTS);} +{return(TOK_DEADKEY);} YY_BREAK case 56: YY_RULE_SETUP #line 121 "../../kmflcomp/src/lex.l" -{return(TOK_NUL);} +{return(TOK_DEADKEY);} YY_BREAK case 57: YY_RULE_SETUP #line 122 "../../kmflcomp/src/lex.l" +{return(TOK_OUTS);} + YY_BREAK +case 58: +YY_RULE_SETUP +#line 123 "../../kmflcomp/src/lex.l" +{return(TOK_NUL);} + YY_BREAK +case 59: +YY_RULE_SETUP +#line 124 "../../kmflcomp/src/lex.l" {return(TOK_ERROR);} YY_BREAK -case 58: +case 60: YY_RULE_SETUP -#line 126 "../../kmflcomp/src/lex.l" +#line 128 "../../kmflcomp/src/lex.l" {/* ignore spaces */} YY_BREAK -case 59: +case 61: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 127 "../../kmflcomp/src/lex.l" +#line 129 "../../kmflcomp/src/lex.l" {/* ignore comments */} YY_BREAK -case 60: -/* rule 60 can match eol */ +case 62: +/* rule 62 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 128 "../../kmflcomp/src/lex.l" -{/* before either EOL */} - YY_BREAK -case 61: -YY_RULE_SETUP -#line 129 "../../kmflcomp/src/lex.l" -{return TOK_QM;} - YY_BREAK -case 62: -YY_RULE_SETUP #line 130 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return TOK_CHAR;} +{/* before either EOL */} YY_BREAK case 63: YY_RULE_SETUP #line 131 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return TOK_CHAR;} +{return TOK_QM;} YY_BREAK case 64: YY_RULE_SETUP #line 132 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return TOK_CHAR;} + YY_BREAK +case 65: +YY_RULE_SETUP +#line 133 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return TOK_CHAR;} + YY_BREAK +case 66: +YY_RULE_SETUP +#line 134 "../../kmflcomp/src/lex.l" {BEGIN(SKIP);} YY_BREAK -case 65: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP -#line 136 "../../kmflcomp/src/lex.l" -{/* ignore anything after a space */} - YY_BREAK -case 66: -/* rule 66 can match eol */ -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP -#line 137 "../../kmflcomp/src/lex.l" -{/* including comments */} - YY_BREAK case 67: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp = yy_bp + 1; +(yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 138 "../../kmflcomp/src/lex.l" -{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{/* ignore anything after a space */} YY_BREAK case 68: +/* rule 68 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ +YY_RULE_SETUP +#line 139 "../../kmflcomp/src/lex.l" +{/* including comments */} + YY_BREAK +case 69: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 139 "../../kmflcomp/src/lex.l" -{qchar='"';BEGIN(QUOTE);return(TOK_QM);} - YY_BREAK -case 69: -YY_RULE_SETUP #line 140 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return TOK_CHAR;} +{qchar='\'';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 70: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; +(yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 141 "../../kmflcomp/src/lex.l" -{/* also ignore anything after a comma */} +{qchar='"';BEGIN(QUOTE);return(TOK_QM);} YY_BREAK case 71: -/* rule 71 can match eol */ -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 142 "../../kmflcomp/src/lex.l" -{/* before either EOL */} +{yylval.number=*yytext;return TOK_CHAR;} YY_BREAK - - case 72: -YY_RULE_SETUP -#line 146 "../../kmflcomp/src/lex.l" -{/* ignore spaces */} - YY_BREAK -case 73: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 147 "../../kmflcomp/src/lex.l" -{/* ignore comments */} +#line 143 "../../kmflcomp/src/lex.l" +{/* also ignore anything after a comma */} YY_BREAK -case 74: -/* rule 74 can match eol */ +case 73: +/* rule 73 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 148 "../../kmflcomp/src/lex.l" +#line 144 "../../kmflcomp/src/lex.l" {/* before either EOL */} YY_BREAK + + +case 74: +YY_RULE_SETUP +#line 148 "../../kmflcomp/src/lex.l" +{/* ignore spaces */} + YY_BREAK case 75: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 149 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext,NULL,8);return(TOK_NUMBER);} +{/* ignore comments */} YY_BREAK case 76: +/* rule 76 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP #line 150 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext+1,NULL,10);return(TOK_NUMBER);} +{/* before either EOL */} YY_BREAK case 77: YY_RULE_SETUP #line 151 "../../kmflcomp/src/lex.l" -{yylval.number=strtoul(yytext+1,NULL,16);return(TOK_NUMBER);} +{yylval.number=strtoul(yytext,NULL,8);return(TOK_NUMBER);} YY_BREAK case 78: YY_RULE_SETUP #line 152 "../../kmflcomp/src/lex.l" +{yylval.number=strtoul(yytext+1,NULL,10);return(TOK_NUMBER);} + YY_BREAK +case 79: +YY_RULE_SETUP +#line 153 "../../kmflcomp/src/lex.l" +{yylval.number=strtoul(yytext+1,NULL,16);return(TOK_NUMBER);} + YY_BREAK +case 80: +YY_RULE_SETUP +#line 154 "../../kmflcomp/src/lex.l" {/* ignore comma separator */} YY_BREAK -case 79: +case 81: YY_RULE_SETUP -#line 156 "../../kmflcomp/src/lex.l" +#line 158 "../../kmflcomp/src/lex.l" {if (*yytext==qchar) {BEGIN(caller);return(TOK_QM);} else @@ -1954,708 +1983,696 @@ YY_RULE_SETUP YY_BREAK -case 80: -YY_RULE_SETUP -#line 164 "../../kmflcomp/src/lex.l" - - YY_BREAK -case 81: -YY_RULE_SETUP -#line 165 "../../kmflcomp/src/lex.l" -{BEGIN(caller);return(TOK_BRKT);} - YY_BREAK case 82: YY_RULE_SETUP #line 166 "../../kmflcomp/src/lex.l" + + YY_BREAK +case 83: +YY_RULE_SETUP +#line 167 "../../kmflcomp/src/lex.l" +{BEGIN(caller);return(TOK_BRKT);} + YY_BREAK +case 84: +YY_RULE_SETUP +#line 168 "../../kmflcomp/src/lex.l" {yylval.number=*yytext;return(TOK_CHAR);} YY_BREAK -case 83: -YY_RULE_SETUP -#line 170 "../../kmflcomp/src/lex.l" -{/* ignore */} - YY_BREAK -case 84: -YY_RULE_SETUP -#line 171 "../../kmflcomp/src/lex.l" -{ return(TOK_COMMA);} - YY_BREAK case 85: YY_RULE_SETUP #line 172 "../../kmflcomp/src/lex.l" -{ return(TOK_BRKT);} +{/* ignore */} YY_BREAK case 86: YY_RULE_SETUP #line 173 "../../kmflcomp/src/lex.l" -{BEGIN(caller);return(TOK_BRKT);} +{ return(TOK_COMMA);} YY_BREAK case 87: YY_RULE_SETUP #line 174 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return(TOK_CHAR);} +{ return(TOK_BRKT);} YY_BREAK - - case 88: YY_RULE_SETUP -#line 178 "../../kmflcomp/src/lex.l" -{yylval.number=*yytext;return(TOK_CHAR);} +#line 175 "../../kmflcomp/src/lex.l" +{BEGIN(caller);return(TOK_BRKT);} YY_BREAK case 89: YY_RULE_SETUP -#line 179 "../../kmflcomp/src/lex.l" -{BEGIN(caller);} +#line 176 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return(TOK_CHAR);} YY_BREAK case 90: YY_RULE_SETUP -#line 183 "../../kmflcomp/src/lex.l" -{/* ignore */} +#line 180 "../../kmflcomp/src/lex.l" +{yylval.number=*yytext;return(TOK_CHAR);} YY_BREAK case 91: YY_RULE_SETUP -#line 184 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LSHIFT;return(TOK_SHIFT);} +#line 181 "../../kmflcomp/src/lex.l" +{BEGIN(caller);} YY_BREAK + + case 92: YY_RULE_SETUP #line 185 "../../kmflcomp/src/lex.l" -{yylval.number=KS_CAPS;return(TOK_SHIFT);} +{/* ignore */} YY_BREAK case 93: YY_RULE_SETUP #line 186 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LCTRL;return(TOK_SHIFT);} +{yylval.number=KS_LSHIFT;return(TOK_SHIFT);} YY_BREAK case 94: YY_RULE_SETUP #line 187 "../../kmflcomp/src/lex.l" -{yylval.number=KS_LALT;return(TOK_SHIFT);} +{yylval.number=KS_CAPS;return(TOK_SHIFT);} YY_BREAK case 95: YY_RULE_SETUP #line 188 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RSHIFT;return(TOK_SHIFT);} +{yylval.number=KS_LCTRL;return(TOK_SHIFT);} YY_BREAK case 96: YY_RULE_SETUP #line 189 "../../kmflcomp/src/lex.l" -{yylval.number=KS_NCAPS;return(TOK_SHIFT);} +{yylval.number=KS_LALT;return(TOK_SHIFT);} YY_BREAK case 97: YY_RULE_SETUP #line 190 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RCTRL;return(TOK_SHIFT);} +{yylval.number=KS_RSHIFT;return(TOK_SHIFT);} YY_BREAK case 98: YY_RULE_SETUP #line 191 "../../kmflcomp/src/lex.l" -{yylval.number=KS_RALT;return(TOK_SHIFT);} +{yylval.number=KS_NCAPS;return(TOK_SHIFT);} YY_BREAK case 99: YY_RULE_SETUP #line 192 "../../kmflcomp/src/lex.l" -{yylval.number=KS_SHIFT;return(TOK_SHIFT);} +{yylval.number=KS_RCTRL;return(TOK_SHIFT);} YY_BREAK case 100: YY_RULE_SETUP #line 193 "../../kmflcomp/src/lex.l" -{yylval.number=KS_CTRL;return(TOK_SHIFT);} +{yylval.number=KS_RALT;return(TOK_SHIFT);} YY_BREAK case 101: YY_RULE_SETUP #line 194 "../../kmflcomp/src/lex.l" -{yylval.number=KS_ALT;return(TOK_SHIFT);} +{yylval.number=KS_SHIFT;return(TOK_SHIFT);} YY_BREAK case 102: YY_RULE_SETUP -#line 196 "../../kmflcomp/src/lex.l" -{yylval.number=0x20;return(TOK_RAWKEY);} +#line 195 "../../kmflcomp/src/lex.l" +{yylval.number=KS_CTRL;return(TOK_SHIFT);} YY_BREAK case 103: YY_RULE_SETUP -#line 197 "../../kmflcomp/src/lex.l" -{yylval.number=0x27;return(TOK_RAWKEY);} +#line 196 "../../kmflcomp/src/lex.l" +{yylval.number=KS_ALT;return(TOK_SHIFT);} YY_BREAK case 104: YY_RULE_SETUP #line 198 "../../kmflcomp/src/lex.l" -{yylval.number=0x30;return(TOK_RAWKEY);} +{yylval.number=0x20;return(TOK_RAWKEY);} YY_BREAK case 105: YY_RULE_SETUP #line 199 "../../kmflcomp/src/lex.l" -{yylval.number=0x31;return(TOK_RAWKEY);} +{yylval.number=0x27;return(TOK_RAWKEY);} YY_BREAK case 106: YY_RULE_SETUP #line 200 "../../kmflcomp/src/lex.l" -{yylval.number=0x32;return(TOK_RAWKEY);} +{yylval.number=0x30;return(TOK_RAWKEY);} YY_BREAK case 107: YY_RULE_SETUP #line 201 "../../kmflcomp/src/lex.l" -{yylval.number=0x33;return(TOK_RAWKEY);} +{yylval.number=0x31;return(TOK_RAWKEY);} YY_BREAK case 108: YY_RULE_SETUP #line 202 "../../kmflcomp/src/lex.l" -{yylval.number=0x34;return(TOK_RAWKEY);} +{yylval.number=0x32;return(TOK_RAWKEY);} YY_BREAK case 109: YY_RULE_SETUP #line 203 "../../kmflcomp/src/lex.l" -{yylval.number=0x35;return(TOK_RAWKEY);} +{yylval.number=0x33;return(TOK_RAWKEY);} YY_BREAK case 110: YY_RULE_SETUP #line 204 "../../kmflcomp/src/lex.l" -{yylval.number=0x36;return(TOK_RAWKEY);} +{yylval.number=0x34;return(TOK_RAWKEY);} YY_BREAK case 111: YY_RULE_SETUP #line 205 "../../kmflcomp/src/lex.l" -{yylval.number=0x37;return(TOK_RAWKEY);} +{yylval.number=0x35;return(TOK_RAWKEY);} YY_BREAK case 112: YY_RULE_SETUP #line 206 "../../kmflcomp/src/lex.l" -{yylval.number=0x38;return(TOK_RAWKEY);} +{yylval.number=0x36;return(TOK_RAWKEY);} YY_BREAK case 113: YY_RULE_SETUP #line 207 "../../kmflcomp/src/lex.l" -{yylval.number=0x39;return(TOK_RAWKEY);} +{yylval.number=0x37;return(TOK_RAWKEY);} YY_BREAK case 114: YY_RULE_SETUP #line 208 "../../kmflcomp/src/lex.l" -{yylval.number=0x41;return(TOK_RAWKEY);} +{yylval.number=0x38;return(TOK_RAWKEY);} YY_BREAK case 115: YY_RULE_SETUP #line 209 "../../kmflcomp/src/lex.l" -{yylval.number=0x42;return(TOK_RAWKEY);} +{yylval.number=0x39;return(TOK_RAWKEY);} YY_BREAK case 116: YY_RULE_SETUP #line 210 "../../kmflcomp/src/lex.l" -{yylval.number=0x43;return(TOK_RAWKEY);} +{yylval.number=0x41;return(TOK_RAWKEY);} YY_BREAK case 117: YY_RULE_SETUP #line 211 "../../kmflcomp/src/lex.l" -{yylval.number=0x44;return(TOK_RAWKEY);} +{yylval.number=0x42;return(TOK_RAWKEY);} YY_BREAK case 118: YY_RULE_SETUP #line 212 "../../kmflcomp/src/lex.l" -{yylval.number=0x45;return(TOK_RAWKEY);} +{yylval.number=0x43;return(TOK_RAWKEY);} YY_BREAK case 119: YY_RULE_SETUP #line 213 "../../kmflcomp/src/lex.l" -{yylval.number=0x46;return(TOK_RAWKEY);} +{yylval.number=0x44;return(TOK_RAWKEY);} YY_BREAK case 120: YY_RULE_SETUP #line 214 "../../kmflcomp/src/lex.l" -{yylval.number=0x47;return(TOK_RAWKEY);} +{yylval.number=0x45;return(TOK_RAWKEY);} YY_BREAK case 121: YY_RULE_SETUP #line 215 "../../kmflcomp/src/lex.l" -{yylval.number=0x48;return(TOK_RAWKEY);} +{yylval.number=0x46;return(TOK_RAWKEY);} YY_BREAK case 122: YY_RULE_SETUP #line 216 "../../kmflcomp/src/lex.l" -{yylval.number=0x49;return(TOK_RAWKEY);} +{yylval.number=0x47;return(TOK_RAWKEY);} YY_BREAK case 123: YY_RULE_SETUP #line 217 "../../kmflcomp/src/lex.l" -{yylval.number=0x4a;return(TOK_RAWKEY);} +{yylval.number=0x48;return(TOK_RAWKEY);} YY_BREAK case 124: YY_RULE_SETUP #line 218 "../../kmflcomp/src/lex.l" -{yylval.number=0x4b;return(TOK_RAWKEY);} +{yylval.number=0x49;return(TOK_RAWKEY);} YY_BREAK case 125: YY_RULE_SETUP #line 219 "../../kmflcomp/src/lex.l" -{yylval.number=0x4c;return(TOK_RAWKEY);} +{yylval.number=0x4a;return(TOK_RAWKEY);} YY_BREAK case 126: YY_RULE_SETUP #line 220 "../../kmflcomp/src/lex.l" -{yylval.number=0x4d;return(TOK_RAWKEY);} +{yylval.number=0x4b;return(TOK_RAWKEY);} YY_BREAK case 127: YY_RULE_SETUP #line 221 "../../kmflcomp/src/lex.l" -{yylval.number=0x4e;return(TOK_RAWKEY);} +{yylval.number=0x4c;return(TOK_RAWKEY);} YY_BREAK case 128: YY_RULE_SETUP #line 222 "../../kmflcomp/src/lex.l" -{yylval.number=0x4f;return(TOK_RAWKEY);} +{yylval.number=0x4d;return(TOK_RAWKEY);} YY_BREAK case 129: YY_RULE_SETUP #line 223 "../../kmflcomp/src/lex.l" -{yylval.number=0x50;return(TOK_RAWKEY);} +{yylval.number=0x4e;return(TOK_RAWKEY);} YY_BREAK case 130: YY_RULE_SETUP #line 224 "../../kmflcomp/src/lex.l" -{yylval.number=0x51;return(TOK_RAWKEY);} +{yylval.number=0x4f;return(TOK_RAWKEY);} YY_BREAK case 131: YY_RULE_SETUP #line 225 "../../kmflcomp/src/lex.l" -{yylval.number=0x52;return(TOK_RAWKEY);} +{yylval.number=0x50;return(TOK_RAWKEY);} YY_BREAK case 132: YY_RULE_SETUP #line 226 "../../kmflcomp/src/lex.l" -{yylval.number=0x53;return(TOK_RAWKEY);} +{yylval.number=0x51;return(TOK_RAWKEY);} YY_BREAK case 133: YY_RULE_SETUP #line 227 "../../kmflcomp/src/lex.l" -{yylval.number=0x54;return(TOK_RAWKEY);} +{yylval.number=0x52;return(TOK_RAWKEY);} YY_BREAK case 134: YY_RULE_SETUP #line 228 "../../kmflcomp/src/lex.l" -{yylval.number=0x55;return(TOK_RAWKEY);} +{yylval.number=0x53;return(TOK_RAWKEY);} YY_BREAK case 135: YY_RULE_SETUP #line 229 "../../kmflcomp/src/lex.l" -{yylval.number=0x56;return(TOK_RAWKEY);} +{yylval.number=0x54;return(TOK_RAWKEY);} YY_BREAK case 136: YY_RULE_SETUP #line 230 "../../kmflcomp/src/lex.l" -{yylval.number=0x57;return(TOK_RAWKEY);} +{yylval.number=0x55;return(TOK_RAWKEY);} YY_BREAK case 137: YY_RULE_SETUP #line 231 "../../kmflcomp/src/lex.l" -{yylval.number=0x58;return(TOK_RAWKEY);} +{yylval.number=0x56;return(TOK_RAWKEY);} YY_BREAK case 138: YY_RULE_SETUP #line 232 "../../kmflcomp/src/lex.l" -{yylval.number=0x59;return(TOK_RAWKEY);} +{yylval.number=0x57;return(TOK_RAWKEY);} YY_BREAK case 139: YY_RULE_SETUP #line 233 "../../kmflcomp/src/lex.l" -{yylval.number=0x5a;return(TOK_RAWKEY);} +{yylval.number=0x58;return(TOK_RAWKEY);} YY_BREAK case 140: YY_RULE_SETUP #line 234 "../../kmflcomp/src/lex.l" -{yylval.number=0x60;return(TOK_RAWKEY);} +{yylval.number=0x59;return(TOK_RAWKEY);} YY_BREAK case 141: YY_RULE_SETUP #line 235 "../../kmflcomp/src/lex.l" -{yylval.number=0x2c;return(TOK_RAWKEY);} +{yylval.number=0x5a;return(TOK_RAWKEY);} YY_BREAK case 142: YY_RULE_SETUP #line 236 "../../kmflcomp/src/lex.l" -{yylval.number=0x2d;return(TOK_RAWKEY);} +{yylval.number=0x60;return(TOK_RAWKEY);} YY_BREAK case 143: YY_RULE_SETUP #line 237 "../../kmflcomp/src/lex.l" -{yylval.number=0x2e;return(TOK_RAWKEY);} +{yylval.number=0x2c;return(TOK_RAWKEY);} YY_BREAK case 144: YY_RULE_SETUP #line 238 "../../kmflcomp/src/lex.l" -{yylval.number=0x2f;return(TOK_RAWKEY);} +{yylval.number=0x2d;return(TOK_RAWKEY);} YY_BREAK case 145: YY_RULE_SETUP #line 239 "../../kmflcomp/src/lex.l" -{yylval.number=0x3a;return(TOK_RAWKEY);} +{yylval.number=0x2e;return(TOK_RAWKEY);} YY_BREAK case 146: YY_RULE_SETUP #line 240 "../../kmflcomp/src/lex.l" -{yylval.number=0x3d;return(TOK_RAWKEY);} +{yylval.number=0x2f;return(TOK_RAWKEY);} YY_BREAK case 147: YY_RULE_SETUP #line 241 "../../kmflcomp/src/lex.l" -{yylval.number=0x5b;return(TOK_RAWKEY);} +{yylval.number=0x3a;return(TOK_RAWKEY);} YY_BREAK case 148: YY_RULE_SETUP #line 242 "../../kmflcomp/src/lex.l" -{yylval.number=0x5c;return(TOK_RAWKEY);} +{yylval.number=0x3d;return(TOK_RAWKEY);} YY_BREAK case 149: YY_RULE_SETUP #line 243 "../../kmflcomp/src/lex.l" -{yylval.number=0x5d;return(TOK_RAWKEY);} +{yylval.number=0x5b;return(TOK_RAWKEY);} YY_BREAK case 150: YY_RULE_SETUP #line 244 "../../kmflcomp/src/lex.l" -{yylval.number=0xff08;return(TOK_RAWKEY);} +{yylval.number=0x5c;return(TOK_RAWKEY);} YY_BREAK case 151: YY_RULE_SETUP #line 245 "../../kmflcomp/src/lex.l" -{yylval.number=0xff09;return(TOK_RAWKEY);} +{yylval.number=0x5d;return(TOK_RAWKEY);} YY_BREAK case 152: YY_RULE_SETUP #line 246 "../../kmflcomp/src/lex.l" -{yylval.number=0xff0d;return(TOK_RAWKEY);} +{yylval.number=0xff08;return(TOK_RAWKEY);} YY_BREAK case 153: YY_RULE_SETUP #line 247 "../../kmflcomp/src/lex.l" -{yylval.number=0xff13;return(TOK_RAWKEY);} +{yylval.number=0xff09;return(TOK_RAWKEY);} YY_BREAK case 154: YY_RULE_SETUP #line 248 "../../kmflcomp/src/lex.l" -{yylval.number=0xff14;return(TOK_RAWKEY);} +{yylval.number=0xff0d;return(TOK_RAWKEY);} YY_BREAK case 155: YY_RULE_SETUP #line 249 "../../kmflcomp/src/lex.l" -{yylval.number=0xff1b;return(TOK_RAWKEY);} +{yylval.number=0xff13;return(TOK_RAWKEY);} YY_BREAK case 156: YY_RULE_SETUP #line 250 "../../kmflcomp/src/lex.l" -{yylval.number=0xff50;return(TOK_RAWKEY);} +{yylval.number=0xff14;return(TOK_RAWKEY);} YY_BREAK case 157: YY_RULE_SETUP #line 251 "../../kmflcomp/src/lex.l" -{yylval.number=0xff51;return(TOK_RAWKEY);} +{yylval.number=0xff1b;return(TOK_RAWKEY);} YY_BREAK case 158: YY_RULE_SETUP #line 252 "../../kmflcomp/src/lex.l" -{yylval.number=0xff52;return(TOK_RAWKEY);} +{yylval.number=0xff50;return(TOK_RAWKEY);} YY_BREAK case 159: YY_RULE_SETUP #line 253 "../../kmflcomp/src/lex.l" -{yylval.number=0xff53;return(TOK_RAWKEY);} +{yylval.number=0xff51;return(TOK_RAWKEY);} YY_BREAK case 160: YY_RULE_SETUP #line 254 "../../kmflcomp/src/lex.l" -{yylval.number=0xff54;return(TOK_RAWKEY);} +{yylval.number=0xff52;return(TOK_RAWKEY);} YY_BREAK case 161: YY_RULE_SETUP #line 255 "../../kmflcomp/src/lex.l" -{yylval.number=0xff55;return(TOK_RAWKEY);} +{yylval.number=0xff53;return(TOK_RAWKEY);} YY_BREAK case 162: YY_RULE_SETUP #line 256 "../../kmflcomp/src/lex.l" -{yylval.number=0xff56;return(TOK_RAWKEY);} +{yylval.number=0xff54;return(TOK_RAWKEY);} YY_BREAK case 163: YY_RULE_SETUP #line 257 "../../kmflcomp/src/lex.l" -{yylval.number=0xff57;return(TOK_RAWKEY);} +{yylval.number=0xff55;return(TOK_RAWKEY);} YY_BREAK case 164: YY_RULE_SETUP #line 258 "../../kmflcomp/src/lex.l" -{yylval.number=0xff63;return(TOK_RAWKEY);} +{yylval.number=0xff56;return(TOK_RAWKEY);} YY_BREAK case 165: YY_RULE_SETUP #line 259 "../../kmflcomp/src/lex.l" -{yylval.number=0xff7f;return(TOK_RAWKEY);} +{yylval.number=0xff57;return(TOK_RAWKEY);} YY_BREAK case 166: YY_RULE_SETUP #line 260 "../../kmflcomp/src/lex.l" -{yylval.number=0xffaa;return(TOK_RAWKEY);} +{yylval.number=0xff63;return(TOK_RAWKEY);} YY_BREAK case 167: YY_RULE_SETUP #line 261 "../../kmflcomp/src/lex.l" -{yylval.number=0xffab;return(TOK_RAWKEY);} +{yylval.number=0xff7f;return(TOK_RAWKEY);} YY_BREAK case 168: YY_RULE_SETUP #line 262 "../../kmflcomp/src/lex.l" -{yylval.number=0xffad;return(TOK_RAWKEY);} +{yylval.number=0xffaa;return(TOK_RAWKEY);} YY_BREAK case 169: YY_RULE_SETUP #line 263 "../../kmflcomp/src/lex.l" -{yylval.number=0xffae;return(TOK_RAWKEY);} +{yylval.number=0xffab;return(TOK_RAWKEY);} YY_BREAK case 170: YY_RULE_SETUP #line 264 "../../kmflcomp/src/lex.l" -{yylval.number=0xffaf;return(TOK_RAWKEY);} +{yylval.number=0xffad;return(TOK_RAWKEY);} YY_BREAK case 171: YY_RULE_SETUP #line 265 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb0;return(TOK_RAWKEY);} +{yylval.number=0xffae;return(TOK_RAWKEY);} YY_BREAK case 172: YY_RULE_SETUP #line 266 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb1;return(TOK_RAWKEY);} +{yylval.number=0xffaf;return(TOK_RAWKEY);} YY_BREAK case 173: YY_RULE_SETUP #line 267 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb2;return(TOK_RAWKEY);} +{yylval.number=0xffb0;return(TOK_RAWKEY);} YY_BREAK case 174: YY_RULE_SETUP #line 268 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb3;return(TOK_RAWKEY);} +{yylval.number=0xffb1;return(TOK_RAWKEY);} YY_BREAK case 175: YY_RULE_SETUP #line 269 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb4;return(TOK_RAWKEY);} +{yylval.number=0xffb2;return(TOK_RAWKEY);} YY_BREAK case 176: YY_RULE_SETUP #line 270 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb5;return(TOK_RAWKEY);} +{yylval.number=0xffb3;return(TOK_RAWKEY);} YY_BREAK case 177: YY_RULE_SETUP #line 271 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb6;return(TOK_RAWKEY);} +{yylval.number=0xffb4;return(TOK_RAWKEY);} YY_BREAK case 178: YY_RULE_SETUP #line 272 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb7;return(TOK_RAWKEY);} +{yylval.number=0xffb5;return(TOK_RAWKEY);} YY_BREAK case 179: YY_RULE_SETUP #line 273 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb8;return(TOK_RAWKEY);} +{yylval.number=0xffb6;return(TOK_RAWKEY);} YY_BREAK case 180: YY_RULE_SETUP #line 274 "../../kmflcomp/src/lex.l" -{yylval.number=0xffb9;return(TOK_RAWKEY);} +{yylval.number=0xffb7;return(TOK_RAWKEY);} YY_BREAK case 181: YY_RULE_SETUP #line 275 "../../kmflcomp/src/lex.l" -{yylval.number=0xffbe;return(TOK_RAWKEY);} +{yylval.number=0xffb8;return(TOK_RAWKEY);} YY_BREAK case 182: YY_RULE_SETUP #line 276 "../../kmflcomp/src/lex.l" -{yylval.number=0xffbf;return(TOK_RAWKEY);} +{yylval.number=0xffb9;return(TOK_RAWKEY);} YY_BREAK case 183: YY_RULE_SETUP #line 277 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc0;return(TOK_RAWKEY);} +{yylval.number=0xffbe;return(TOK_RAWKEY);} YY_BREAK case 184: YY_RULE_SETUP #line 278 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc1;return(TOK_RAWKEY);} +{yylval.number=0xffbf;return(TOK_RAWKEY);} YY_BREAK case 185: YY_RULE_SETUP #line 279 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc2;return(TOK_RAWKEY);} +{yylval.number=0xffc0;return(TOK_RAWKEY);} YY_BREAK case 186: YY_RULE_SETUP #line 280 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc3;return(TOK_RAWKEY);} +{yylval.number=0xffc1;return(TOK_RAWKEY);} YY_BREAK case 187: YY_RULE_SETUP #line 281 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc4;return(TOK_RAWKEY);} +{yylval.number=0xffc2;return(TOK_RAWKEY);} YY_BREAK case 188: YY_RULE_SETUP #line 282 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc5;return(TOK_RAWKEY);} +{yylval.number=0xffc3;return(TOK_RAWKEY);} YY_BREAK case 189: YY_RULE_SETUP #line 283 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc6;return(TOK_RAWKEY);} +{yylval.number=0xffc4;return(TOK_RAWKEY);} YY_BREAK case 190: YY_RULE_SETUP #line 284 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc7;return(TOK_RAWKEY);} +{yylval.number=0xffc5;return(TOK_RAWKEY);} YY_BREAK case 191: YY_RULE_SETUP #line 285 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc8;return(TOK_RAWKEY);} +{yylval.number=0xffc6;return(TOK_RAWKEY);} YY_BREAK case 192: YY_RULE_SETUP #line 286 "../../kmflcomp/src/lex.l" -{yylval.number=0xffc9;return(TOK_RAWKEY);} +{yylval.number=0xffc7;return(TOK_RAWKEY);} YY_BREAK case 193: YY_RULE_SETUP #line 287 "../../kmflcomp/src/lex.l" -{yylval.number=0xffca;return(TOK_RAWKEY);} +{yylval.number=0xffc8;return(TOK_RAWKEY);} YY_BREAK case 194: YY_RULE_SETUP #line 288 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcb;return(TOK_RAWKEY);} +{yylval.number=0xffc9;return(TOK_RAWKEY);} YY_BREAK case 195: YY_RULE_SETUP #line 289 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcc;return(TOK_RAWKEY);} +{yylval.number=0xffca;return(TOK_RAWKEY);} YY_BREAK case 196: YY_RULE_SETUP #line 290 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcd;return(TOK_RAWKEY);} +{yylval.number=0xffcb;return(TOK_RAWKEY);} YY_BREAK case 197: YY_RULE_SETUP #line 291 "../../kmflcomp/src/lex.l" -{yylval.number=0xffce;return(TOK_RAWKEY);} +{yylval.number=0xffcc;return(TOK_RAWKEY);} YY_BREAK case 198: YY_RULE_SETUP #line 292 "../../kmflcomp/src/lex.l" -{yylval.number=0xffcf;return(TOK_RAWKEY);} +{yylval.number=0xffcd;return(TOK_RAWKEY);} YY_BREAK case 199: YY_RULE_SETUP #line 293 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd0;return(TOK_RAWKEY);} +{yylval.number=0xffce;return(TOK_RAWKEY);} YY_BREAK case 200: YY_RULE_SETUP #line 294 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd1;return(TOK_RAWKEY);} +{yylval.number=0xffcf;return(TOK_RAWKEY);} YY_BREAK case 201: YY_RULE_SETUP #line 295 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd2;return(TOK_RAWKEY);} +{yylval.number=0xffd0;return(TOK_RAWKEY);} YY_BREAK case 202: YY_RULE_SETUP #line 296 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd3;return(TOK_RAWKEY);} +{yylval.number=0xffd1;return(TOK_RAWKEY);} YY_BREAK case 203: YY_RULE_SETUP #line 297 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd4;return(TOK_RAWKEY);} +{yylval.number=0xffd2;return(TOK_RAWKEY);} YY_BREAK case 204: YY_RULE_SETUP #line 298 "../../kmflcomp/src/lex.l" -{yylval.number=0xffd5;return(TOK_RAWKEY);} +{yylval.number=0xffd3;return(TOK_RAWKEY);} YY_BREAK case 205: YY_RULE_SETUP #line 299 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe1;return(TOK_RAWKEY);} +{yylval.number=0xffd4;return(TOK_RAWKEY);} YY_BREAK case 206: YY_RULE_SETUP #line 300 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe3;return(TOK_RAWKEY);} +{yylval.number=0xffd5;return(TOK_RAWKEY);} YY_BREAK case 207: YY_RULE_SETUP #line 301 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe5;return(TOK_RAWKEY);} +{yylval.number=0xffe1;return(TOK_RAWKEY);} YY_BREAK case 208: YY_RULE_SETUP #line 302 "../../kmflcomp/src/lex.l" -{yylval.number=0xffe9;return(TOK_RAWKEY);} +{yylval.number=0xffe3;return(TOK_RAWKEY);} YY_BREAK case 209: YY_RULE_SETUP #line 303 "../../kmflcomp/src/lex.l" -{yylval.number=0xffff;return(TOK_RAWKEY);} +{yylval.number=0xffe5;return(TOK_RAWKEY);} YY_BREAK case 210: YY_RULE_SETUP #line 304 "../../kmflcomp/src/lex.l" -{yylval.number=0x3c;return(TOK_RAWKEY); /* on German kbds only!*/} +{yylval.number=0xffe9;return(TOK_RAWKEY);} YY_BREAK case 211: YY_RULE_SETUP -#line 306 "../../kmflcomp/src/lex.l" -{yylval.number=text_to_keysym(yytext); if (yylval.number == -1) yyerror("unrecognised raw key"); else return(TOK_XKEYSYM);} +#line 305 "../../kmflcomp/src/lex.l" +{yylval.number=0xffff;return(TOK_RAWKEY);} YY_BREAK case 212: YY_RULE_SETUP -#line 307 "../../kmflcomp/src/lex.l" -{ yyerror("unrecognised raw key");} +#line 306 "../../kmflcomp/src/lex.l" +{yylval.number=0x3c;return(TOK_RAWKEY); /* on German kbds only!*/} YY_BREAK case 213: YY_RULE_SETUP #line 308 "../../kmflcomp/src/lex.l" -{caller0=caller;caller=KEYNAME;qchar='\'';BEGIN(QUOTE);return(TOK_QM);} +{yylval.number=text_to_keysym(yytext); if (yylval.number == -1) yyerror("unrecognised raw key"); else return(TOK_XKEYSYM);} YY_BREAK case 214: YY_RULE_SETUP #line 309 "../../kmflcomp/src/lex.l" -{caller0=caller;caller=KEYNAME;qchar='\"';BEGIN(QUOTE);return(TOK_QM);} +{ yyerror("unrecognised raw key");} YY_BREAK case 215: YY_RULE_SETUP +#line 310 "../../kmflcomp/src/lex.l" +{caller0=caller;caller=KEYNAME;qchar='\'';BEGIN(QUOTE);return(TOK_QM);} + YY_BREAK +case 216: +YY_RULE_SETUP #line 311 "../../kmflcomp/src/lex.l" +{caller0=caller;caller=KEYNAME;qchar='\"';BEGIN(QUOTE);return(TOK_QM);} + YY_BREAK +case 217: +YY_RULE_SETUP +#line 313 "../../kmflcomp/src/lex.l" { if(caller==KEYNAME) caller=caller0; BEGIN(caller);return(TOK_SB); } YY_BREAK -case 216: -/* rule 216 can match eol */ -YY_RULE_SETUP -#line 317 "../../kmflcomp/src/lex.l" -{lineno++; /* Join lines */} - YY_BREAK -case 217: -/* rule 217 can match eol */ -YY_RULE_SETUP -#line 318 "../../kmflcomp/src/lex.l" -{lineno++; /* Join lines */} - YY_BREAK case 218: /* rule 218 can match eol */ YY_RULE_SETUP @@ -2669,40 +2686,34 @@ YY_RULE_SETUP {lineno++; /* Join lines */} YY_BREAK case 220: +/* rule 220 can match eol */ +YY_RULE_SETUP +#line 321 "../../kmflcomp/src/lex.l" +{lineno++; /* Join lines */} + YY_BREAK +case 221: +/* rule 221 can match eol */ +YY_RULE_SETUP +#line 322 "../../kmflcomp/src/lex.l" +{lineno++; /* Join lines */} + YY_BREAK +case 222: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 322 "../../kmflcomp/src/lex.l" +#line 324 "../../kmflcomp/src/lex.l" {/* ignore, use both /\r and /\n, not to work $ */} YY_BREAK -case 221: -/* rule 221 can match eol */ +case 223: +/* rule 223 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ YY_LINENO_REWIND_TO(yy_bp + 1); (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 323 "../../kmflcomp/src/lex.l" -{/* with either CR or CR/LF line ending */} - YY_BREAK -case 222: -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP -#line 324 "../../kmflcomp/src/lex.l" -{/* ignore */} - YY_BREAK -case 223: -/* rule 223 can match eol */ -*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ -YY_LINENO_REWIND_TO(yy_cp - 1); -(yy_c_buf_p) = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ -YY_RULE_SETUP #line 325 "../../kmflcomp/src/lex.l" -{/* ignore */} +{/* with either CR or CR/LF line ending */} YY_BREAK case 224: *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ @@ -2723,55 +2734,73 @@ YY_RULE_SETUP {/* ignore */} YY_BREAK case 226: +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 329 "../../kmflcomp/src/lex.l" -{BEGIN(SKIP);} +#line 328 "../../kmflcomp/src/lex.l" +{/* ignore */} YY_BREAK case 227: +/* rule 227 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ +YY_LINENO_REWIND_TO(yy_cp - 1); +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 331 "../../kmflcomp/src/lex.l" -{/* Keyman platform conditional - just drop marker */} +#line 329 "../../kmflcomp/src/lex.l" +{/* ignore */} YY_BREAK case 228: YY_RULE_SETUP -#line 332 "../../kmflcomp/src/lex.l" -{/* Kmfl platform conditional - just drop marker */} +#line 331 "../../kmflcomp/src/lex.l" +{BEGIN(SKIP);} YY_BREAK case 229: YY_RULE_SETUP #line 333 "../../kmflcomp/src/lex.l" +{/* Keyman platform conditional - just drop marker */} + YY_BREAK +case 230: +YY_RULE_SETUP +#line 334 "../../kmflcomp/src/lex.l" +{/* Kmfl platform conditional - just drop marker */} + YY_BREAK +case 231: +YY_RULE_SETUP +#line 335 "../../kmflcomp/src/lex.l" {BEGIN(SKIP);} /* Platform Conditional */ YY_BREAK -case 230: +case 232: YY_RULE_SETUP -#line 336 "../../kmflcomp/src/lex.l" +#line 338 "../../kmflcomp/src/lex.l" {/* ignore everything until nl or EOF */} YY_BREAK -case 231: -YY_RULE_SETUP -#line 339 "../../kmflcomp/src/lex.l" -{fprintf(stderr,"Line %d: Unmatched closing parenthesis\n",lineno);return(TOK_BRKT);} - YY_BREAK -case 232: -YY_RULE_SETUP -#line 340 "../../kmflcomp/src/lex.l" -{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unrecognized keyword '%s'\n", - (int)lineno, yytext);errcount++;return(TOK_ERROR);} - YY_BREAK case 233: YY_RULE_SETUP -#line 342 "../../kmflcomp/src/lex.l" -{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unexpected char (%d) `%c'\n", - (int)lineno, (int) yytext[0],(char) yytext[0]);errcount++;return(TOK_CHAR);} +#line 341 "../../kmflcomp/src/lex.l" +{fprintf(stderr,"Line %d: Unmatched closing parenthesis\n",lineno);return(TOK_BRKT);} YY_BREAK case 234: YY_RULE_SETUP +#line 342 "../../kmflcomp/src/lex.l" +{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unrecognized keyword '%s'\n", + (int)lineno, yytext);errcount++;return(TOK_ERROR);} + YY_BREAK +case 235: +YY_RULE_SETUP #line 344 "../../kmflcomp/src/lex.l" +{yylval.number=yytext[0];fprintf(stderr,"Line %d: Unexpected char (%d) `%c'\n", + (int)lineno, (int) yytext[0],(char) yytext[0]);errcount++;return(TOK_CHAR);} + YY_BREAK +case 236: +YY_RULE_SETUP +#line 346 "../../kmflcomp/src/lex.l" ECHO; YY_BREAK -#line 2775 "lex.c" +#line 2804 "lex.c" case YY_END_OF_BUFFER: { @@ -3067,7 +3096,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 745 ) + if ( yy_current_state >= 773 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -3095,11 +3124,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 745 ) + if ( yy_current_state >= 773 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 744); + yy_is_jam = (yy_current_state == 772); return yy_is_jam ? 0 : yy_current_state; } @@ -3777,4 +3806,4 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 344 "../../kmflcomp/src/lex.l" +#line 346 "../../kmflcomp/src/lex.l" diff --git a/linux/kmflcomp/src/yacc.c b/linux/kmflcomp/src/yacc.c index 1aed1e4cde..fbd29ab91d 100644 --- a/linux/kmflcomp/src/yacc.c +++ b/linux/kmflcomp/src/yacc.c @@ -144,32 +144,34 @@ extern int yydebug; TOK_INDEX = 279, TOK_LANGUAGE = 280, TOK_LAYOUT = 281, - TOK_MATCH = 282, - TOK_MESSAGE = 283, - TOK_MNEMONIC = 284, - TOK_NOMATCH = 285, - TOK_NAME = 286, - TOK_NOTANY = 287, - TOK_NUL = 288, - TOK_NUMBER = 289, - TOK_NL = 290, - TOK_OUTS = 291, - TOK_RAWKEY = 292, - TOK_PLUS = 293, - TOK_QM = 294, - TOK_RTN = 295, - TOK_SB = 296, - TOK_SHIFT = 297, - TOK_STORE = 298, - TOK_STOREINSTORE = 299, - TOK_SWITCH = 300, - TOK_TARGETS = 301, - TOK_UNICODE = 302, - TOK_USE = 303, - TOK_USINGKEYS = 304, - TOK_UTF = 305, - TOK_VERSION = 306, - TOK_XKEYSYM = 307 + TOK_KEYBOARDVERSION = 282, + TOK_MATCH = 283, + TOK_MESSAGE = 284, + TOK_MNEMONIC = 285, + TOK_NOMATCH = 286, + TOK_NAME = 287, + TOK_NOTANY = 288, + TOK_NUL = 289, + TOK_NUMBER = 290, + TOK_NL = 291, + TOK_OUTS = 292, + TOK_RAWKEY = 293, + TOK_PLUS = 294, + TOK_QM = 295, + TOK_RTN = 296, + TOK_SB = 297, + TOK_SHIFT = 298, + TOK_STORE = 299, + TOK_STOREINSTORE = 300, + TOK_SWITCH = 301, + TOK_TARGETS = 302, + TOK_UNICODE = 303, + TOK_USE = 304, + TOK_USINGKEYS = 305, + TOK_UTF = 306, + TOK_VERSION = 307, + TOK_VISUALKEYBOARD = 308, + TOK_XKEYSYM = 309 }; #endif /* Tokens. */ @@ -197,32 +199,34 @@ extern int yydebug; #define TOK_INDEX 279 #define TOK_LANGUAGE 280 #define TOK_LAYOUT 281 -#define TOK_MATCH 282 -#define TOK_MESSAGE 283 -#define TOK_MNEMONIC 284 -#define TOK_NOMATCH 285 -#define TOK_NAME 286 -#define TOK_NOTANY 287 -#define TOK_NUL 288 -#define TOK_NUMBER 289 -#define TOK_NL 290 -#define TOK_OUTS 291 -#define TOK_RAWKEY 292 -#define TOK_PLUS 293 -#define TOK_QM 294 -#define TOK_RTN 295 -#define TOK_SB 296 -#define TOK_SHIFT 297 -#define TOK_STORE 298 -#define TOK_STOREINSTORE 299 -#define TOK_SWITCH 300 -#define TOK_TARGETS 301 -#define TOK_UNICODE 302 -#define TOK_USE 303 -#define TOK_USINGKEYS 304 -#define TOK_UTF 305 -#define TOK_VERSION 306 -#define TOK_XKEYSYM 307 +#define TOK_KEYBOARDVERSION 282 +#define TOK_MATCH 283 +#define TOK_MESSAGE 284 +#define TOK_MNEMONIC 285 +#define TOK_NOMATCH 286 +#define TOK_NAME 287 +#define TOK_NOTANY 288 +#define TOK_NUL 289 +#define TOK_NUMBER 290 +#define TOK_NL 291 +#define TOK_OUTS 292 +#define TOK_RAWKEY 293 +#define TOK_PLUS 294 +#define TOK_QM 295 +#define TOK_RTN 296 +#define TOK_SB 297 +#define TOK_SHIFT 298 +#define TOK_STORE 299 +#define TOK_STOREINSTORE 300 +#define TOK_SWITCH 301 +#define TOK_TARGETS 302 +#define TOK_UNICODE 303 +#define TOK_USE 304 +#define TOK_USINGKEYS 305 +#define TOK_UTF 306 +#define TOK_VERSION 307 +#define TOK_VISUALKEYBOARD 308 +#define TOK_XKEYSYM 309 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -239,7 +243,7 @@ union YYSTYPE GROUP *group; -#line 243 "yacc.c" /* yacc.c:355 */ +#line 247 "yacc.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -256,7 +260,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 260 "yacc.c" /* yacc.c:358 */ +#line 264 "yacc.c" /* yacc.c:358 */ #ifdef short # undef short @@ -496,23 +500,23 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 77 +#define YYFINAL 61 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 244 +#define YYLAST 279 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 53 +#define YYNTOKENS 55 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 16 /* YYNRULES -- Number of rules. */ -#define YYNRULES 80 +#define YYNRULES 83 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 163 +#define YYNSTATES 171 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 307 +#define YYMAXUTOK 309 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -551,22 +555,22 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52 + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 103, 103, 109, 118, 119, 123, 127, 131, 135, - 139, 143, 147, 151, 155, 159, 163, 167, 171, 175, - 179, 183, 187, 191, 195, 199, 204, 208, 212, 216, - 220, 221, 225, 229, 236, 243, 254, 260, 268, 272, - 279, 283, 287, 294, 298, 302, 306, 313, 317, 321, - 325, 337, 349, 361, 365, 369, 381, 386, 390, 394, - 398, 402, 406, 410, 414, 419, 424, 438, 445, 450, - 457, 464, 469, 474, 478, 482, 486, 493, 497, 504, - 508 + 0, 105, 105, 111, 120, 121, 125, 129, 133, 137, + 141, 145, 149, 153, 157, 161, 165, 169, 173, 177, + 181, 185, 189, 193, 197, 201, 205, 209, 214, 218, + 222, 226, 230, 234, 235, 239, 243, 250, 257, 268, + 274, 282, 286, 293, 297, 301, 308, 312, 316, 320, + 327, 331, 335, 339, 351, 363, 375, 379, 383, 395, + 400, 404, 408, 412, 416, 420, 424, 428, 433, 438, + 452, 459, 464, 471, 478, 483, 488, 492, 496, 500, + 507, 511, 518, 522 }; #endif @@ -580,14 +584,15 @@ static const char *const yytname[] = "TOK_CAPSOFF", "TOK_CAPSON", "TOK_COMMA", "TOK_CONTEXT", "TOK_COPYRIGHT", "TOK_CHAR", "TOK_DEADKEY", "TOK_DOLLAR", "TOK_ERROR", "TOK_ETHNOLOGUE", "TOK_GROUP", "TOK_GT", "TOK_HOTKEY", "TOK_INDEX", "TOK_LANGUAGE", - "TOK_LAYOUT", "TOK_MATCH", "TOK_MESSAGE", "TOK_MNEMONIC", "TOK_NOMATCH", - "TOK_NAME", "TOK_NOTANY", "TOK_NUL", "TOK_NUMBER", "TOK_NL", "TOK_OUTS", - "TOK_RAWKEY", "TOK_PLUS", "TOK_QM", "TOK_RTN", "TOK_SB", "TOK_SHIFT", - "TOK_STORE", "TOK_STOREINSTORE", "TOK_SWITCH", "TOK_TARGETS", - "TOK_UNICODE", "TOK_USE", "TOK_USINGKEYS", "TOK_UTF", "TOK_VERSION", - "TOK_XKEYSYM", "$accept", "T_FILE", "T_HEADER", "T_HEADLINE", "T_GROUPS", - "T_GROUP", "T_GHEADER", "T_RULES", "T_RULELINE", "T_ITEMS", "T_ITEM", - "T_STRING", "T_PARAMETER", "T_KEYDEF", "T_KEYMODS", "T_BYTES", YY_NULLPTR + "TOK_LAYOUT", "TOK_KEYBOARDVERSION", "TOK_MATCH", "TOK_MESSAGE", + "TOK_MNEMONIC", "TOK_NOMATCH", "TOK_NAME", "TOK_NOTANY", "TOK_NUL", + "TOK_NUMBER", "TOK_NL", "TOK_OUTS", "TOK_RAWKEY", "TOK_PLUS", "TOK_QM", + "TOK_RTN", "TOK_SB", "TOK_SHIFT", "TOK_STORE", "TOK_STOREINSTORE", + "TOK_SWITCH", "TOK_TARGETS", "TOK_UNICODE", "TOK_USE", "TOK_USINGKEYS", + "TOK_UTF", "TOK_VERSION", "TOK_VISUALKEYBOARD", "TOK_XKEYSYM", "$accept", + "T_FILE", "T_HEADER", "T_HEADLINE", "T_GROUPS", "T_GROUP", "T_GHEADER", + "T_RULES", "T_RULELINE", "T_ITEMS", "T_ITEM", "T_STRING", "T_PARAMETER", + "T_KEYDEF", "T_KEYMODS", "T_BYTES", YY_NULLPTR }; #endif @@ -601,14 +606,14 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307 + 305, 306, 307, 308, 309 }; # endif -#define YYPACT_NINF -34 +#define YYPACT_NINF -49 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-34))) + (!!((Yystate) == (-49))) #define YYTABLE_NINF -1 @@ -619,23 +624,24 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 120, -2, -5, -13, 0, 3, 4, -5, 26, -5, - 35, -23, 74, -13, -5, -5, -13, -34, 35, -5, - 24, -13, 47, 27, 165, -34, 27, 196, 1, -9, - 15, 26, 16, 17, -34, -34, -34, 18, 21, 22, - 26, -21, -33, 23, 35, -34, 35, 53, 35, 26, - -34, 55, -34, -34, 35, -34, -34, 35, -34, -34, - -33, 35, 35, 32, 74, 74, 39, 40, 44, 46, - 49, 50, 74, 51, 34, 52, 54, -34, -34, -34, - -34, -34, 35, -34, 196, 68, 35, -34, 56, -34, - -34, -34, -34, -34, -34, -34, 86, -34, 61, -34, - -34, -34, -34, 64, -27, -34, -34, -34, 26, -34, - -34, 26, -34, -34, 75, -34, -34, -34, -34, -34, - -34, -34, -34, -34, -34, -34, 62, -34, 35, -34, - -34, 74, -34, 74, -24, -34, -34, -34, 67, -34, - -34, -34, -34, 101, 9, -34, -34, 83, 85, 91, - -34, 35, -34, -34, -34, 26, -34, -34, -34, 93, - 121, -34, -34 + 106, -19, -36, -4, -25, -17, -16, -36, 17, -36, + 35, 4, -36, -4, -4, -36, -36, -4, -49, 35, + -36, 30, -4, -36, 54, 34, 156, -49, 34, 188, + 7, -1, 33, 17, 36, 39, -49, -49, -49, 40, + 41, 42, 17, -34, 10, 43, 44, 45, 46, 47, + 48, 49, 50, 52, 53, 230, 56, 19, 57, 58, + 59, -49, -49, -49, -49, 35, -49, 35, 62, 35, + 17, -49, 63, -49, -49, 35, -49, -49, -49, 35, + -49, -49, 10, 35, 35, 35, -49, 188, 68, 230, + 230, 35, -49, 60, -49, -49, -49, -49, -49, -49, + -49, 88, -49, 65, -49, -49, -49, -49, 61, 20, + -49, -49, -49, -49, -49, -49, -49, -49, -49, -49, + 66, -49, 35, -49, -49, -49, -49, -49, 17, -49, + -49, 17, -49, -49, 64, 230, -49, -49, -49, 230, + -49, -49, -28, -49, -49, -49, 69, -49, -49, -49, + -49, -49, 71, 90, 32, -49, 72, 73, -49, 35, + -49, -49, -49, -49, 17, -49, -49, 76, 91, -49, + -49 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -644,36 +650,37 @@ static const yytype_int16 yypact[] = static const yytype_uint8 yydefact[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, - 0, 0, 0, 0, 4, 3, 32, 34, 0, 0, - 0, 79, 0, 0, 21, 19, 20, 0, 0, 0, - 0, 0, 0, 0, 0, 58, 0, 59, 0, 0, - 67, 0, 62, 63, 0, 54, 47, 0, 49, 57, - 0, 0, 0, 0, 43, 44, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, 2, 5, - 33, 42, 0, 35, 38, 0, 0, 69, 0, 26, - 80, 13, 12, 14, 30, 29, 0, 36, 0, 74, - 78, 76, 71, 0, 0, 9, 50, 64, 0, 53, - 66, 0, 51, 52, 0, 65, 61, 16, 45, 46, - 17, 18, 15, 28, 7, 6, 0, 27, 0, 11, - 10, 0, 39, 0, 0, 68, 70, 37, 0, 73, - 77, 75, 72, 0, 0, 48, 22, 0, 0, 0, - 23, 0, 8, 60, 56, 0, 24, 41, 40, 0, - 0, 25, 55 + 0, 0, 0, 0, 0, 0, 0, 0, 34, 0, + 0, 0, 0, 0, 0, 0, 4, 3, 35, 37, + 0, 0, 0, 82, 0, 0, 23, 21, 22, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 5, 36, 0, 61, 0, 62, 0, + 0, 70, 0, 65, 66, 0, 57, 50, 45, 0, + 52, 60, 0, 0, 0, 0, 38, 41, 0, 46, + 47, 0, 72, 0, 28, 83, 15, 14, 16, 33, + 32, 0, 39, 0, 77, 81, 79, 74, 0, 0, + 9, 18, 19, 20, 13, 12, 17, 31, 7, 6, + 0, 29, 0, 11, 10, 30, 53, 67, 0, 56, + 69, 0, 54, 55, 0, 0, 68, 64, 42, 0, + 48, 49, 0, 71, 73, 40, 0, 76, 80, 78, + 75, 24, 0, 0, 0, 51, 0, 0, 25, 0, + 8, 26, 63, 59, 0, 44, 43, 0, 0, 27, + 58 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -34, -34, 109, -34, 10, -34, -34, 58, -34, -10, - -34, 57, -17, 76, -34, -8 + -49, -49, 89, -49, -15, -49, -49, 27, -49, -48, + -49, 15, -18, 37, -49, -8 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 22, 23, 24, 25, 26, 27, 83, 84, 85, - 64, 65, 41, 103, 104, 33 + -1, 24, 25, 26, 27, 28, 29, 86, 87, 88, + 89, 90, 43, 108, 109, 35 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -681,60 +688,66 @@ static const yytype_int8 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint8 yytable[] = { - 38, 72, 63, 31, 99, 67, 29, 31, 71, 100, - 139, 150, 29, 76, 97, 140, 29, 154, 42, 101, - 28, 88, 155, 90, 151, 141, 29, 106, 98, 107, - 87, 109, 96, 78, 29, 34, 80, 112, 35, 36, - 113, 110, 31, 40, 115, 116, 74, 77, 10, 86, - 89, 91, 92, 93, 118, 119, 94, 95, 105, 30, - 32, 108, 126, 111, 37, 131, 39, 117, 43, 134, - 66, 68, 69, 70, 120, 121, 73, 44, 75, 122, - 45, 123, 128, 46, 124, 125, 127, 129, 47, 130, - 133, 48, 49, 50, 136, 135, 137, 146, 51, 102, - 143, 52, 152, 144, 53, 138, 54, 55, 56, 153, - 57, 147, 58, 29, 59, 60, 145, 102, 156, 61, - 157, 148, 62, 149, 1, 2, 158, 3, 161, 162, - 4, 5, 6, 79, 159, 7, 114, 0, 0, 8, - 9, 10, 132, 11, 0, 12, 13, 160, 14, 15, - 0, 16, 0, 0, 0, 17, 0, 0, 0, 0, - 0, 142, 0, 18, 0, 0, 19, 20, 0, 1, - 2, 21, 3, 0, 0, 4, 5, 6, 0, 0, - 7, 0, 0, 0, 8, 9, 0, 0, 11, 0, - 12, 13, 0, 14, 15, 0, 16, 0, 0, 44, - 17, 0, 45, 0, 0, 46, 0, 0, 18, 0, - 47, 19, 20, 48, 49, 50, 21, 0, 0, 0, - 51, 0, 0, 52, 0, 0, 53, 0, 54, 55, - 56, 81, 57, 0, 58, 29, 59, 60, 0, 82, - 0, 61, 0, 0, 62 + 40, 55, 102, 30, 31, 48, 50, 120, 158, 54, + 62, 36, 33, 64, 59, 33, 103, 32, 34, 37, + 38, 159, 39, 93, 41, 95, 45, 46, 47, 49, + 51, 52, 53, 33, 101, 56, 31, 58, 60, 92, + 163, 140, 141, 42, 31, 164, 44, 126, 104, 127, + 31, 129, 57, 105, 61, 10, 91, 132, 147, 107, + 31, 133, 130, 148, 106, 135, 136, 137, 122, 94, + 128, 131, 96, 142, 149, 97, 98, 99, 100, 110, + 111, 112, 113, 114, 115, 116, 117, 156, 118, 119, + 139, 157, 121, 123, 124, 125, 144, 107, 162, 170, + 143, 145, 151, 146, 152, 160, 155, 161, 165, 166, + 1, 2, 169, 3, 138, 63, 4, 5, 6, 134, + 153, 7, 0, 154, 150, 8, 9, 10, 0, 11, + 0, 12, 13, 14, 0, 15, 16, 0, 17, 0, + 0, 167, 18, 0, 0, 0, 0, 0, 0, 0, + 19, 0, 0, 20, 21, 0, 168, 0, 22, 23, + 1, 2, 0, 3, 0, 0, 4, 5, 6, 0, + 0, 7, 0, 0, 0, 8, 9, 0, 0, 11, + 0, 12, 13, 14, 0, 15, 16, 0, 17, 0, + 0, 65, 18, 0, 66, 0, 0, 67, 0, 0, + 19, 0, 68, 20, 21, 69, 70, 71, 22, 23, + 0, 0, 72, 0, 0, 0, 73, 0, 0, 74, + 0, 75, 76, 77, 78, 79, 0, 80, 31, 81, + 82, 0, 83, 65, 84, 0, 66, 85, 0, 67, + 0, 0, 0, 0, 68, 0, 0, 69, 70, 71, + 0, 0, 0, 0, 72, 0, 0, 0, 73, 0, + 0, 74, 0, 75, 76, 77, 0, 79, 0, 80, + 31, 81, 82, 0, 0, 0, 84, 0, 0, 85 }; static const yytype_int16 yycheck[] = { - 8, 18, 12, 16, 37, 13, 39, 16, 16, 42, - 37, 35, 39, 21, 35, 42, 39, 8, 41, 52, - 22, 29, 13, 31, 48, 52, 39, 44, 49, 46, - 39, 48, 40, 23, 39, 35, 26, 54, 35, 35, - 57, 49, 16, 8, 61, 62, 22, 0, 21, 48, - 35, 35, 35, 35, 64, 65, 35, 35, 35, 2, - 3, 8, 72, 8, 7, 82, 9, 35, 11, 86, - 13, 14, 15, 16, 35, 35, 19, 3, 21, 35, - 6, 35, 48, 9, 35, 35, 35, 35, 14, 35, - 22, 17, 18, 19, 8, 39, 35, 35, 24, 42, - 108, 27, 35, 111, 30, 41, 32, 33, 34, 8, - 36, 128, 38, 39, 40, 41, 41, 60, 35, 45, - 35, 131, 48, 133, 4, 5, 35, 7, 35, 8, - 10, 11, 12, 24, 151, 15, 60, -1, -1, 19, - 20, 21, 84, 23, -1, 25, 26, 155, 28, 29, - -1, 31, -1, -1, -1, 35, -1, -1, -1, -1, - -1, 104, -1, 43, -1, -1, 46, 47, -1, 4, - 5, 51, 7, -1, -1, 10, 11, 12, -1, -1, - 15, -1, -1, -1, 19, 20, -1, -1, 23, -1, - 25, 26, -1, 28, 29, -1, 31, -1, -1, 3, - 35, -1, 6, -1, -1, 9, -1, -1, 43, -1, - 14, 46, 47, 17, 18, 19, 51, -1, -1, -1, - 24, -1, -1, 27, -1, -1, 30, -1, 32, 33, - 34, 35, 36, -1, 38, 39, 40, 41, -1, 43, - -1, 45, -1, -1, 48 + 8, 19, 36, 22, 40, 13, 14, 55, 36, 17, + 25, 36, 16, 28, 22, 16, 50, 2, 3, 36, + 36, 49, 7, 31, 9, 33, 11, 12, 13, 14, + 15, 16, 17, 16, 42, 20, 40, 22, 23, 40, + 8, 89, 90, 8, 40, 13, 42, 65, 38, 67, + 40, 69, 22, 43, 0, 21, 49, 75, 38, 44, + 40, 79, 70, 43, 54, 83, 84, 85, 49, 36, + 8, 8, 36, 91, 54, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 135, 36, 36, + 22, 139, 36, 36, 36, 36, 8, 82, 8, 8, + 40, 36, 36, 42, 122, 36, 42, 36, 36, 36, + 4, 5, 36, 7, 87, 26, 10, 11, 12, 82, + 128, 15, -1, 131, 109, 19, 20, 21, -1, 23, + -1, 25, 26, 27, -1, 29, 30, -1, 32, -1, + -1, 159, 36, -1, -1, -1, -1, -1, -1, -1, + 44, -1, -1, 47, 48, -1, 164, -1, 52, 53, + 4, 5, -1, 7, -1, -1, 10, 11, 12, -1, + -1, 15, -1, -1, -1, 19, 20, -1, -1, 23, + -1, 25, 26, 27, -1, 29, 30, -1, 32, -1, + -1, 3, 36, -1, 6, -1, -1, 9, -1, -1, + 44, -1, 14, 47, 48, 17, 18, 19, 52, 53, + -1, -1, 24, -1, -1, -1, 28, -1, -1, 31, + -1, 33, 34, 35, 36, 37, -1, 39, 40, 41, + 42, -1, 44, 3, 46, -1, 6, 49, -1, 9, + -1, -1, -1, -1, 14, -1, -1, 17, 18, 19, + -1, -1, -1, -1, 24, -1, -1, -1, 28, -1, + -1, 31, -1, 33, 34, 35, -1, 37, -1, 39, + 40, 41, 42, -1, -1, -1, 46, -1, -1, 49 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -742,50 +755,51 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 4, 5, 7, 10, 11, 12, 15, 19, 20, - 21, 23, 25, 26, 28, 29, 31, 35, 43, 46, - 47, 51, 54, 55, 56, 57, 58, 59, 22, 39, - 64, 16, 64, 68, 35, 35, 35, 64, 68, 64, - 8, 65, 41, 64, 3, 6, 9, 14, 17, 18, - 19, 24, 27, 30, 32, 33, 34, 36, 38, 40, - 41, 45, 48, 62, 63, 64, 64, 68, 64, 64, - 64, 68, 65, 64, 22, 64, 68, 0, 57, 55, - 57, 35, 43, 60, 61, 62, 48, 39, 68, 35, - 68, 35, 35, 35, 35, 35, 68, 35, 49, 37, - 42, 52, 64, 66, 67, 35, 65, 65, 8, 65, - 68, 8, 65, 65, 66, 65, 65, 35, 62, 62, - 35, 35, 35, 35, 35, 35, 62, 35, 48, 35, - 35, 65, 60, 22, 65, 39, 8, 35, 41, 37, - 42, 52, 64, 68, 68, 41, 35, 65, 62, 62, - 35, 48, 35, 8, 8, 13, 35, 35, 35, 65, - 68, 35, 8 + 21, 23, 25, 26, 27, 29, 30, 32, 36, 44, + 47, 48, 52, 53, 56, 57, 58, 59, 60, 61, + 22, 40, 66, 16, 66, 70, 36, 36, 36, 66, + 70, 66, 8, 67, 42, 66, 66, 66, 70, 66, + 70, 66, 66, 66, 70, 67, 66, 22, 66, 70, + 66, 0, 59, 57, 59, 3, 6, 9, 14, 17, + 18, 19, 24, 28, 31, 33, 34, 35, 36, 37, + 39, 41, 42, 44, 46, 49, 62, 63, 64, 65, + 66, 49, 40, 70, 36, 70, 36, 36, 36, 36, + 36, 70, 36, 50, 38, 43, 54, 66, 68, 69, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 64, 36, 49, 36, 36, 36, 67, 67, 8, 67, + 70, 8, 67, 67, 68, 67, 67, 67, 62, 22, + 64, 64, 67, 40, 8, 36, 42, 38, 43, 54, + 66, 36, 67, 70, 70, 42, 64, 64, 36, 49, + 36, 36, 8, 8, 13, 36, 36, 67, 70, 36, + 8 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 53, 54, 54, 55, 55, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 57, 57, 58, 58, 59, 59, 60, 60, - 61, 61, 61, 62, 62, 62, 62, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 64, 64, - 65, 66, 66, 66, 66, 66, 66, 67, 67, 68, - 68 + 0, 55, 56, 56, 57, 57, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 59, 59, 60, 60, 61, + 61, 62, 62, 63, 63, 63, 64, 64, 64, 64, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, + 65, 66, 66, 67, 68, 68, 68, 68, 68, 68, + 69, 69, 70, 70 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 2, 1, 1, 2, 3, 3, 5, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 2, 2, 4, 5, 5, 7, 3, 3, 3, 3, - 3, 1, 1, 2, 1, 2, 3, 4, 1, 2, - 4, 4, 1, 1, 1, 2, 2, 1, 3, 1, - 2, 2, 2, 2, 1, 6, 4, 1, 1, 1, - 4, 2, 1, 1, 2, 2, 2, 1, 3, 2, - 3, 1, 2, 2, 1, 2, 1, 2, 1, 1, - 2 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 2, 2, 2, 4, 5, 5, 7, 3, 3, + 3, 3, 3, 3, 1, 1, 2, 1, 2, 3, + 4, 1, 2, 4, 4, 1, 1, 1, 2, 2, + 1, 3, 1, 2, 2, 2, 2, 1, 6, 4, + 1, 1, 1, 4, 2, 1, 1, 2, 2, 2, + 1, 3, 2, 3, 1, 2, 2, 1, 2, 1, + 2, 1, 1, 2 }; @@ -1462,247 +1476,271 @@ yyreduce: switch (yyn) { case 2: -#line 104 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 106 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kbp->groups = (yyvsp[0].group); kbp->ngroups = count_groups((yyvsp[0].group)); kbp->nstores = count_stores(kbp->stores); } -#line 1472 "yacc.c" /* yacc.c:1646 */ +#line 1486 "yacc.c" /* yacc.c:1646 */ break; case 3: -#line 110 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 112 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kbp->groups = (yyvsp[0].group); kbp->ngroups = count_groups((yyvsp[0].group)); kbp->nstores = count_stores(kbp->stores); } -#line 1482 "yacc.c" /* yacc.c:1646 */ +#line 1496 "yacc.c" /* yacc.c:1646 */ break; case 6: -#line 124 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 126 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&name",(yyvsp[-1].string),lineno); } -#line 1490 "yacc.c" /* yacc.c:1646 */ +#line 1504 "yacc.c" /* yacc.c:1646 */ break; case 7: -#line 128 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 130 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&name",(yyvsp[-1].string),lineno); } -#line 1498 "yacc.c" /* yacc.c:1646 */ +#line 1512 "yacc.c" /* yacc.c:1646 */ break; case 8: -#line 132 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 134 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store("&hotkey",new_list((yyvsp[-2].number)),lineno); } -#line 1506 "yacc.c" /* yacc.c:1646 */ +#line 1520 "yacc.c" /* yacc.c:1646 */ break; case 9: -#line 136 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 138 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&hotkey",(yyvsp[-1].string),lineno); } -#line 1514 "yacc.c" /* yacc.c:1646 */ +#line 1528 "yacc.c" /* yacc.c:1646 */ break; case 10: -#line 140 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 142 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&version",(yyvsp[-1].string),lineno); } -#line 1522 "yacc.c" /* yacc.c:1646 */ +#line 1536 "yacc.c" /* yacc.c:1646 */ break; case 11: -#line 144 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 146 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { new_store_from_string("&version",(yyvsp[-1].string),lineno); } -#line 1530 "yacc.c" /* yacc.c:1646 */ +#line 1544 "yacc.c" /* yacc.c:1646 */ break; case 12: -#line 148 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); +#line 150 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&keyboardversion",(yyvsp[-1].string),lineno); } -#line 1538 "yacc.c" /* yacc.c:1646 */ +#line 1552 "yacc.c" /* yacc.c:1646 */ break; case 13: -#line 152 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); +#line 154 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&keyboardversion",(yyvsp[-1].string),lineno); } -#line 1546 "yacc.c" /* yacc.c:1646 */ +#line 1560 "yacc.c" /* yacc.c:1646 */ break; case 14: -#line 156 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 158 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("©right",(yyvsp[-1].string),lineno); + new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); } -#line 1554 "yacc.c" /* yacc.c:1646 */ +#line 1568 "yacc.c" /* yacc.c:1646 */ break; case 15: -#line 160 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 162 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&message",(yyvsp[-1].string),lineno); + new_store_from_string("&bitmap",(yyvsp[-1].string),lineno); } -#line 1562 "yacc.c" /* yacc.c:1646 */ +#line 1576 "yacc.c" /* yacc.c:1646 */ break; case 16: -#line 164 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 166 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&language",(yyvsp[-1].items),lineno); + new_store_from_string("©right",(yyvsp[-1].string),lineno); } -#line 1570 "yacc.c" /* yacc.c:1646 */ +#line 1584 "yacc.c" /* yacc.c:1646 */ break; case 17: -#line 168 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 170 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&layout",(yyvsp[-1].string),lineno); + new_store_from_string("&message",(yyvsp[-1].string),lineno); } -#line 1578 "yacc.c" /* yacc.c:1646 */ +#line 1592 "yacc.c" /* yacc.c:1646 */ break; case 18: -#line 172 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 174 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&layout",(yyvsp[-1].string),lineno); + new_store_from_string("&language",(yyvsp[-1].string),lineno); } -#line 1586 "yacc.c" /* yacc.c:1646 */ +#line 1600 "yacc.c" /* yacc.c:1646 */ break; case 19: -#line 176 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 178 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&capsalwaysoff","1",lineno); + new_store_from_string("&layout",(yyvsp[-1].string),lineno); } -#line 1594 "yacc.c" /* yacc.c:1646 */ +#line 1608 "yacc.c" /* yacc.c:1646 */ break; case 20: -#line 180 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 182 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&capsononly","1",lineno); + new_store_from_string("&layout",(yyvsp[-1].string),lineno); } -#line 1602 "yacc.c" /* yacc.c:1646 */ +#line 1616 "yacc.c" /* yacc.c:1646 */ break; case 21: -#line 184 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 186 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&shiftfreescaps","1",lineno); + new_store_from_string("&capsalwaysoff","1",lineno); } -#line 1610 "yacc.c" /* yacc.c:1646 */ +#line 1624 "yacc.c" /* yacc.c:1646 */ break; case 22: -#line 188 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); +#line 190 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&capsononly","1",lineno); } -#line 1618 "yacc.c" /* yacc.c:1646 */ +#line 1632 "yacc.c" /* yacc.c:1646 */ break; case 23: -#line 192 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - set_start_group((yyvsp[-1].string),KF_ANSI, lineno); +#line 194 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&shiftfreescaps","1",lineno); } -#line 1626 "yacc.c" /* yacc.c:1646 */ +#line 1640 "yacc.c" /* yacc.c:1646 */ break; case 24: -#line 196 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 198 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - set_start_group((yyvsp[-1].string),KF_UNICODE, lineno); + new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); } -#line 1634 "yacc.c" /* yacc.c:1646 */ +#line 1648 "yacc.c" /* yacc.c:1646 */ break; case 25: -#line 200 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 202 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + set_start_group((yyvsp[-1].string),KF_ANSI, lineno); + } +#line 1656 "yacc.c" /* yacc.c:1646 */ + break; + + case 26: +#line 206 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + set_start_group((yyvsp[-1].string),KF_UNICODE, lineno); + } +#line 1664 "yacc.c" /* yacc.c:1646 */ + break; + + case 27: +#line 210 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kmflcomp_error(lineno,"alternate starting groups not supported"); fail(11,"obsolete syntax"); } -#line 1643 "yacc.c" /* yacc.c:1646 */ - break; - - case 26: -#line 205 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - new_store_from_string("&author",(yyvsp[-1].string),lineno); - } -#line 1651 "yacc.c" /* yacc.c:1646 */ - break; - - case 27: -#line 209 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - new_store_from_string("&targets",(yyvsp[-1].string),lineno); - } -#line 1659 "yacc.c" /* yacc.c:1646 */ +#line 1673 "yacc.c" /* yacc.c:1646 */ break; case 28: -#line 213 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 215 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("&mnemoniclayout",(yyvsp[-1].string),lineno); + new_store_from_string("&author",(yyvsp[-1].string),lineno); } -#line 1667 "yacc.c" /* yacc.c:1646 */ +#line 1681 "yacc.c" /* yacc.c:1646 */ break; case 29: -#line 217 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 219 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store_from_string("ðnologuecode",(yyvsp[-1].string),lineno); + new_store_from_string("&targets",(yyvsp[-1].string),lineno); } -#line 1675 "yacc.c" /* yacc.c:1646 */ +#line 1689 "yacc.c" /* yacc.c:1646 */ + break; + + case 30: +#line 223 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&visualkeyboard",(yyvsp[-1].string),lineno); + } +#line 1697 "yacc.c" /* yacc.c:1646 */ + break; + + case 31: +#line 227 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("&mnemoniclayout",(yyvsp[-1].string),lineno); + } +#line 1705 "yacc.c" /* yacc.c:1646 */ break; case 32: -#line 226 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 231 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + new_store_from_string("ðnologuecode",(yyvsp[-1].string),lineno); + } +#line 1713 "yacc.c" /* yacc.c:1646 */ + break; + + case 35: +#line 240 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = kbp->groups; } -#line 1683 "yacc.c" /* yacc.c:1646 */ +#line 1721 "yacc.c" /* yacc.c:1646 */ break; - case 33: -#line 230 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 36: +#line 244 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = kbp->groups; } -#line 1691 "yacc.c" /* yacc.c:1646 */ +#line 1729 "yacc.c" /* yacc.c:1646 */ break; - case 34: -#line 237 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 37: +#line 251 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = (yyvsp[0].group); ((yyval.group))->rules = NULL; ((yyval.group))->nrules = 0; kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[0].group))->name); } -#line 1702 "yacc.c" /* yacc.c:1646 */ +#line 1740 "yacc.c" /* yacc.c:1646 */ break; - case 35: -#line 244 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 38: +#line 258 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = (yyvsp[-1].group); ((yyval.group))->rules = (yyvsp[0].rule); @@ -1710,125 +1748,125 @@ yyreduce: if(((yyval.group))->nrules == 0) kmflcomp_warn(0,"group(%s) is empty!",((yyvsp[-1].group))->name); } -#line 1714 "yacc.c" /* yacc.c:1646 */ +#line 1752 "yacc.c" /* yacc.c:1646 */ break; - case 36: -#line 255 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 39: +#line 269 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = gp = new_group((yyvsp[-1].string), lineno); if(gp) gp->flags = 0; } -#line 1723 "yacc.c" /* yacc.c:1646 */ +#line 1761 "yacc.c" /* yacc.c:1646 */ break; - case 37: -#line 261 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 40: +#line 275 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.group) = gp = new_group((yyvsp[-2].string), lineno); if(gp) gp->flags = GF_USEKEYS; } -#line 1732 "yacc.c" /* yacc.c:1646 */ - break; - - case 38: -#line 269 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.rule) = (yyvsp[0].rule); - } -#line 1740 "yacc.c" /* yacc.c:1646 */ - break; - - case 39: -#line 273 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.rule) = add_rule((yyvsp[-1].rule), (yyvsp[0].rule)); - } -#line 1748 "yacc.c" /* yacc.c:1646 */ - break; - - case 40: -#line 280 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.rule) = new_rule(gp, (yyvsp[-3].items), (yyvsp[-1].items), lineno); - } -#line 1756 "yacc.c" /* yacc.c:1646 */ +#line 1770 "yacc.c" /* yacc.c:1646 */ break; case 41: -#line 284 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 283 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); (yyval.rule) = NULL; + (yyval.rule) = (yyvsp[0].rule); } -#line 1764 "yacc.c" /* yacc.c:1646 */ +#line 1778 "yacc.c" /* yacc.c:1646 */ break; case 42: -#line 288 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 287 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.rule) = NULL; + (yyval.rule) = add_rule((yyvsp[-1].rule), (yyvsp[0].rule)); } -#line 1772 "yacc.c" /* yacc.c:1646 */ +#line 1786 "yacc.c" /* yacc.c:1646 */ break; case 43: -#line 295 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 294 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = new_list((yyvsp[0].number)); + (yyval.rule) = new_rule(gp, (yyvsp[-3].items), (yyvsp[-1].items), lineno); } -#line 1780 "yacc.c" /* yacc.c:1646 */ +#line 1794 "yacc.c" /* yacc.c:1646 */ break; case 44: -#line 299 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 298 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = items_from_string((yyvsp[0].string),lineno); + new_store((yyvsp[-2].string),(yyvsp[-1].items),lineno); (yyval.rule) = NULL; } -#line 1788 "yacc.c" /* yacc.c:1646 */ +#line 1802 "yacc.c" /* yacc.c:1646 */ break; case 45: -#line 303 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 302 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = add_item_to_list((yyvsp[0].items),(yyvsp[-1].number)); + (yyval.rule) = NULL; } -#line 1796 "yacc.c" /* yacc.c:1646 */ +#line 1810 "yacc.c" /* yacc.c:1646 */ break; case 46: -#line 307 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 309 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.items) = add_lists((yyvsp[0].items),items_from_string((yyvsp[-1].string),lineno)); + (yyval.items) = new_list((yyvsp[0].number)); } -#line 1804 "yacc.c" /* yacc.c:1646 */ +#line 1818 "yacc.c" /* yacc.c:1646 */ break; case 47: -#line 314 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 313 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_CHAR,(yyvsp[0].number)); + (yyval.items) = items_from_string((yyvsp[0].string),lineno); } -#line 1812 "yacc.c" /* yacc.c:1646 */ +#line 1826 "yacc.c" /* yacc.c:1646 */ break; case 48: -#line 318 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 317 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_KEYSYM,(yyvsp[-1].number)); + (yyval.items) = add_item_to_list((yyvsp[0].items),(yyvsp[-1].number)); } -#line 1820 "yacc.c" /* yacc.c:1646 */ +#line 1834 "yacc.c" /* yacc.c:1646 */ break; case 49: -#line 322 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 321 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_PLUS,0); /* include in item list - remove later when testing validity */ + (yyval.items) = add_lists((yyvsp[0].items),items_from_string((yyvsp[-1].string),lineno)); } -#line 1828 "yacc.c" /* yacc.c:1646 */ +#line 1842 "yacc.c" /* yacc.c:1646 */ break; case 50: -#line 326 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 328 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = MAKE_ITEM(ITEM_CHAR,(yyvsp[0].number)); + } +#line 1850 "yacc.c" /* yacc.c:1646 */ + break; + + case 51: +#line 332 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = MAKE_ITEM(ITEM_KEYSYM,(yyvsp[-1].number)); + } +#line 1858 "yacc.c" /* yacc.c:1646 */ + break; + + case 52: +#line 336 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = MAKE_ITEM(ITEM_PLUS,0); /* include in item list - remove later when testing validity */ + } +#line 1866 "yacc.c" /* yacc.c:1646 */ + break; + + case 53: +#line 340 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { @@ -1840,11 +1878,11 @@ yyreduce: (yyval.number) = 0; } } -#line 1844 "yacc.c" /* yacc.c:1646 */ +#line 1882 "yacc.c" /* yacc.c:1646 */ break; - case 51: -#line 338 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 54: +#line 352 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { @@ -1856,11 +1894,11 @@ yyreduce: (yyval.number) = 0; } } -#line 1860 "yacc.c" /* yacc.c:1646 */ +#line 1898 "yacc.c" /* yacc.c:1646 */ break; - case 52: -#line 350 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 55: +#line 364 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { if((n=store_number((yyvsp[0].string),lineno)) != UNDEFINED) { @@ -1872,27 +1910,27 @@ yyreduce: (yyval.number) = 0; } } -#line 1876 "yacc.c" /* yacc.c:1646 */ +#line 1914 "yacc.c" /* yacc.c:1646 */ break; - case 53: -#line 362 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 56: +#line 376 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.number) = MAKE_ITEM(ITEM_DEADKEY,deadkey_number((yyvsp[0].string), lineno)); } -#line 1884 "yacc.c" /* yacc.c:1646 */ +#line 1922 "yacc.c" /* yacc.c:1646 */ break; - case 54: -#line 366 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 57: +#line 380 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.number) = MAKE_ITEM(ITEM_NUL,0); } -#line 1892 "yacc.c" /* yacc.c:1646 */ +#line 1930 "yacc.c" /* yacc.c:1646 */ break; - case 55: -#line 370 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 58: +#line 384 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { if((n=store_number((yyvsp[-3].string),lineno)) != UNDEFINED) { @@ -1904,94 +1942,94 @@ yyreduce: (yyval.number) = 0; } } -#line 1908 "yacc.c" /* yacc.c:1646 */ +#line 1946 "yacc.c" /* yacc.c:1646 */ break; - case 56: -#line 382 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + case 59: +#line 396 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { kmflcomp_warn(lineno,"index(%s) must have TWO parameters!",(yyvsp[-1].string)); (yyval.number) = 0; } -#line 1917 "yacc.c" /* yacc.c:1646 */ - break; - - case 57: -#line 387 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = MAKE_ITEM(ITEM_RETURN,0); - } -#line 1925 "yacc.c" /* yacc.c:1646 */ - break; - - case 58: -#line 391 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = MAKE_ITEM(ITEM_BEEP,0); - } -#line 1933 "yacc.c" /* yacc.c:1646 */ - break; - - case 59: -#line 395 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,0); - } -#line 1941 "yacc.c" /* yacc.c:1646 */ +#line 1955 "yacc.c" /* yacc.c:1646 */ break; case 60: -#line 399 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 401 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,atoi((yyvsp[-1].string))); + (yyval.number) = MAKE_ITEM(ITEM_RETURN,0); } -#line 1949 "yacc.c" /* yacc.c:1646 */ +#line 1963 "yacc.c" /* yacc.c:1646 */ break; case 61: -#line 403 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 405 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_USE,group_number((yyvsp[0].string), lineno)); + (yyval.number) = MAKE_ITEM(ITEM_BEEP,0); } -#line 1957 "yacc.c" /* yacc.c:1646 */ +#line 1971 "yacc.c" /* yacc.c:1646 */ break; case 62: -#line 407 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 409 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_MATCH,0); + (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,0); } -#line 1965 "yacc.c" /* yacc.c:1646 */ +#line 1979 "yacc.c" /* yacc.c:1646 */ break; case 63: -#line 411 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 413 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = MAKE_ITEM(ITEM_NOMATCH,0); + (yyval.number) = MAKE_ITEM(ITEM_CONTEXT,atoi((yyvsp[-1].string))); } -#line 1973 "yacc.c" /* yacc.c:1646 */ +#line 1987 "yacc.c" /* yacc.c:1646 */ break; case 64: -#line 415 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 417 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - kmflcomp_error(lineno,"call keyword not implemented"); - fail(12,"unsupported keyword"); + (yyval.number) = MAKE_ITEM(ITEM_USE,group_number((yyvsp[0].string), lineno)); } -#line 1982 "yacc.c" /* yacc.c:1646 */ +#line 1995 "yacc.c" /* yacc.c:1646 */ break; case 65: -#line 420 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 421 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - kmflcomp_error(lineno,"switch keyword not implemented"); - fail(11,"obsolete syntax"); + (yyval.number) = MAKE_ITEM(ITEM_MATCH,0); } -#line 1991 "yacc.c" /* yacc.c:1646 */ +#line 2003 "yacc.c" /* yacc.c:1646 */ break; case 66: #line 425 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = MAKE_ITEM(ITEM_NOMATCH,0); + } +#line 2011 "yacc.c" /* yacc.c:1646 */ + break; + + case 67: +#line 429 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + kmflcomp_error(lineno,"call keyword not implemented"); + fail(12,"unsupported keyword"); + } +#line 2020 "yacc.c" /* yacc.c:1646 */ + break; + + case 68: +#line 434 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + kmflcomp_error(lineno,"switch keyword not implemented"); + fail(11,"obsolete syntax"); + } +#line 2029 "yacc.c" /* yacc.c:1646 */ + break; + + case 69: +#line 439 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { STORE *sp; /* check for named constants */ sp = find_store((yyvsp[0].string)); @@ -2005,123 +2043,123 @@ yyreduce: kmflcomp_error(lineno,"undefined constant"); } } -#line 2009 "yacc.c" /* yacc.c:1646 */ - break; - - case 67: -#line 439 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - kmflcomp_error(lineno,"illegal or unrecognized item in rule or store"); - } -#line 2017 "yacc.c" /* yacc.c:1646 */ - break; - - case 68: -#line 446 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.string) = (yyvsp[-1].string); - } -#line 2025 "yacc.c" /* yacc.c:1646 */ - break; - - case 69: -#line 451 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.string) = new_string(0); /* allow for empty strings */ - } -#line 2033 "yacc.c" /* yacc.c:1646 */ +#line 2047 "yacc.c" /* yacc.c:1646 */ break; case 70: -#line 458 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 453 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.string) = (yyvsp[-1].string); + kmflcomp_error(lineno,"illegal or unrecognized item in rule or store"); } -#line 2041 "yacc.c" /* yacc.c:1646 */ +#line 2055 "yacc.c" /* yacc.c:1646 */ break; case 71: -#line 465 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); +#line 460 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = (yyvsp[-1].string); } -#line 2049 "yacc.c" /* yacc.c:1646 */ +#line 2063 "yacc.c" /* yacc.c:1646 */ break; case 72: -#line 470 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); +#line 465 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = new_string(0); /* allow for empty strings */ } -#line 2057 "yacc.c" /* yacc.c:1646 */ +#line 2071 "yacc.c" /* yacc.c:1646 */ break; case 73: -#line 475 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 472 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_keysym(lineno, (yyvsp[-1].number),(yyvsp[0].number)); + (yyval.string) = (yyvsp[-1].string); } -#line 2065 "yacc.c" /* yacc.c:1646 */ +#line 2079 "yacc.c" /* yacc.c:1646 */ break; case 74: #line 479 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = make_keysym(lineno, 0,(yyvsp[0].number)); + { + (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); } -#line 2073 "yacc.c" /* yacc.c:1646 */ +#line 2087 "yacc.c" /* yacc.c:1646 */ break; case 75: -#line 483 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.number) = make_xkeysym(lineno, (yyvsp[-1].number), (yyvsp[0].number)); +#line 484 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = make_keysym(lineno, 0,string_to_keysym((yyvsp[0].string),lineno)); } -#line 2081 "yacc.c" /* yacc.c:1646 */ +#line 2095 "yacc.c" /* yacc.c:1646 */ break; case 76: -#line 487 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 489 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = make_xkeysym(lineno, 0, (yyvsp[0].number)); + (yyval.number) = make_keysym(lineno, (yyvsp[-1].number),(yyvsp[0].number)); } -#line 2089 "yacc.c" /* yacc.c:1646 */ +#line 2103 "yacc.c" /* yacc.c:1646 */ break; case 77: -#line 494 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 493 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = (yyvsp[-1].number) | (yyvsp[0].number); + (yyval.number) = make_keysym(lineno, 0,(yyvsp[0].number)); } -#line 2097 "yacc.c" /* yacc.c:1646 */ +#line 2111 "yacc.c" /* yacc.c:1646 */ break; case 78: -#line 498 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 497 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { - (yyval.number) = (yyvsp[0].number); + (yyval.number) = make_xkeysym(lineno, (yyvsp[-1].number), (yyvsp[0].number)); } -#line 2105 "yacc.c" /* yacc.c:1646 */ +#line 2119 "yacc.c" /* yacc.c:1646 */ break; case 79: -#line 505 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ - { - (yyval.string) = new_string((yyvsp[0].number)); +#line 501 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = make_xkeysym(lineno, 0, (yyvsp[0].number)); } -#line 2113 "yacc.c" /* yacc.c:1646 */ +#line 2127 "yacc.c" /* yacc.c:1646 */ break; case 80: -#line 509 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ +#line 508 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = (yyvsp[-1].number) | (yyvsp[0].number); + } +#line 2135 "yacc.c" /* yacc.c:1646 */ + break; + + case 81: +#line 512 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.number) = (yyvsp[0].number); + } +#line 2143 "yacc.c" /* yacc.c:1646 */ + break; + + case 82: +#line 519 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ + { + (yyval.string) = new_string((yyvsp[0].number)); + } +#line 2151 "yacc.c" /* yacc.c:1646 */ + break; + + case 83: +#line 523 "../../kmflcomp/src/yacc.y" /* yacc.c:1646 */ { (yyval.string) = add_char((yyvsp[0].string),(yyvsp[-1].number)); } -#line 2121 "yacc.c" /* yacc.c:1646 */ +#line 2159 "yacc.c" /* yacc.c:1646 */ break; -#line 2125 "yacc.c" /* yacc.c:1646 */ +#line 2163 "yacc.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2349,7 +2387,7 @@ yyreturn: #endif return yyresult; } -#line 515 "../../kmflcomp/src/yacc.y" /* yacc.c:1906 */ +#line 529 "../../kmflcomp/src/yacc.y" /* yacc.c:1906 */ void yyerror(char *str) diff --git a/linux/kmflcomp/src/yacc.h b/linux/kmflcomp/src/yacc.h index 9d5ceecc88..8b7a4ebc55 100644 --- a/linux/kmflcomp/src/yacc.h +++ b/linux/kmflcomp/src/yacc.h @@ -69,32 +69,34 @@ extern int yydebug; TOK_INDEX = 279, TOK_LANGUAGE = 280, TOK_LAYOUT = 281, - TOK_MATCH = 282, - TOK_MESSAGE = 283, - TOK_MNEMONIC = 284, - TOK_NOMATCH = 285, - TOK_NAME = 286, - TOK_NOTANY = 287, - TOK_NUL = 288, - TOK_NUMBER = 289, - TOK_NL = 290, - TOK_OUTS = 291, - TOK_RAWKEY = 292, - TOK_PLUS = 293, - TOK_QM = 294, - TOK_RTN = 295, - TOK_SB = 296, - TOK_SHIFT = 297, - TOK_STORE = 298, - TOK_STOREINSTORE = 299, - TOK_SWITCH = 300, - TOK_TARGETS = 301, - TOK_UNICODE = 302, - TOK_USE = 303, - TOK_USINGKEYS = 304, - TOK_UTF = 305, - TOK_VERSION = 306, - TOK_XKEYSYM = 307 + TOK_KEYBOARDVERSION = 282, + TOK_MATCH = 283, + TOK_MESSAGE = 284, + TOK_MNEMONIC = 285, + TOK_NOMATCH = 286, + TOK_NAME = 287, + TOK_NOTANY = 288, + TOK_NUL = 289, + TOK_NUMBER = 290, + TOK_NL = 291, + TOK_OUTS = 292, + TOK_RAWKEY = 293, + TOK_PLUS = 294, + TOK_QM = 295, + TOK_RTN = 296, + TOK_SB = 297, + TOK_SHIFT = 298, + TOK_STORE = 299, + TOK_STOREINSTORE = 300, + TOK_SWITCH = 301, + TOK_TARGETS = 302, + TOK_UNICODE = 303, + TOK_USE = 304, + TOK_USINGKEYS = 305, + TOK_UTF = 306, + TOK_VERSION = 307, + TOK_VISUALKEYBOARD = 308, + TOK_XKEYSYM = 309 }; #endif /* Tokens. */ @@ -122,32 +124,34 @@ extern int yydebug; #define TOK_INDEX 279 #define TOK_LANGUAGE 280 #define TOK_LAYOUT 281 -#define TOK_MATCH 282 -#define TOK_MESSAGE 283 -#define TOK_MNEMONIC 284 -#define TOK_NOMATCH 285 -#define TOK_NAME 286 -#define TOK_NOTANY 287 -#define TOK_NUL 288 -#define TOK_NUMBER 289 -#define TOK_NL 290 -#define TOK_OUTS 291 -#define TOK_RAWKEY 292 -#define TOK_PLUS 293 -#define TOK_QM 294 -#define TOK_RTN 295 -#define TOK_SB 296 -#define TOK_SHIFT 297 -#define TOK_STORE 298 -#define TOK_STOREINSTORE 299 -#define TOK_SWITCH 300 -#define TOK_TARGETS 301 -#define TOK_UNICODE 302 -#define TOK_USE 303 -#define TOK_USINGKEYS 304 -#define TOK_UTF 305 -#define TOK_VERSION 306 -#define TOK_XKEYSYM 307 +#define TOK_KEYBOARDVERSION 282 +#define TOK_MATCH 283 +#define TOK_MESSAGE 284 +#define TOK_MNEMONIC 285 +#define TOK_NOMATCH 286 +#define TOK_NAME 287 +#define TOK_NOTANY 288 +#define TOK_NUL 289 +#define TOK_NUMBER 290 +#define TOK_NL 291 +#define TOK_OUTS 292 +#define TOK_RAWKEY 293 +#define TOK_PLUS 294 +#define TOK_QM 295 +#define TOK_RTN 296 +#define TOK_SB 297 +#define TOK_SHIFT 298 +#define TOK_STORE 299 +#define TOK_STOREINSTORE 300 +#define TOK_SWITCH 301 +#define TOK_TARGETS 302 +#define TOK_UNICODE 303 +#define TOK_USE 304 +#define TOK_USINGKEYS 305 +#define TOK_UTF 306 +#define TOK_VERSION 307 +#define TOK_VISUALKEYBOARD 308 +#define TOK_XKEYSYM 309 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -164,7 +168,7 @@ union YYSTYPE GROUP *group; -#line 168 "yacc.h" /* yacc.c:1909 */ +#line 172 "yacc.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; From 0096cf2fe7668322984022117a98ad000c8c919b Mon Sep 17 00:00:00 2001 From: glasseyes Date: Wed, 29 Aug 2018 17:01:59 +0700 Subject: [PATCH 9/9] Debian packaging changes for 10.99.1 --- linux/kmflcomp/debian/changelog | 5 ++++- linux/kmflcomp/debian/control | 2 +- linux/kmflcomp/debian/libkmflcomp0.symbols | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/linux/kmflcomp/debian/changelog b/linux/kmflcomp/debian/changelog index 96d2e442c4..8341d4330a 100644 --- a/linux/kmflcomp/debian/changelog +++ b/linux/kmflcomp/debian/changelog @@ -2,8 +2,11 @@ kmflcomp (10.99.1-1) UNRELEASED; urgency=medium * Change license to MIT as kmflcomp is being moved into Keyman 11 * Keyman is now owned by SIL + * new upstream pre-release + - add new symbols to d/libkmflcomp0.symbols + * d/control remove build-dep on autotools-dev (compat 10) - -- Daniel Glassey Thu, 17 May 2018 11:39:04 +0700 + -- Daniel Glassey Wed, 29 Aug 2018 16:37:58 +0700 kmflcomp (0.9.10-1) unstable; urgency=low diff --git a/linux/kmflcomp/debian/control b/linux/kmflcomp/debian/control index b8f694f157..81d0788b76 100644 --- a/linux/kmflcomp/debian/control +++ b/linux/kmflcomp/debian/control @@ -4,7 +4,7 @@ Section: utils Maintainer: Doug Rintoul Uploaders: Torsten Werner Homepage: http://kmfl.sourceforge.net/ -Build-Depends: cdbs (>= 0.4.27), debhelper (>= 10), libx11-dev, autotools-dev +Build-Depends: cdbs (>= 0.4.27), debhelper (>= 10), libx11-dev Standards-Version: 3.9.8.0 Package: libkmflcomp-dev diff --git a/linux/kmflcomp/debian/libkmflcomp0.symbols b/linux/kmflcomp/debian/libkmflcomp0.symbols index 493b6a1cfa..f9dafbc36e 100644 --- a/linux/kmflcomp/debian/libkmflcomp0.symbols +++ b/linux/kmflcomp/debian/libkmflcomp0.symbols @@ -17,6 +17,7 @@ libkmflcomp.so.0 libkmflcomp0 #MINVER# caller@Base 0.9.10 check_bitmap_file@Base 0.9.10 check_keyboard@Base 0.9.10 + check_linux_target@Base 10.99.1 check_lhs@Base 0.9.10 check_rhs@Base 0.9.10 check_rule@Base 0.9.10 @@ -44,6 +45,7 @@ libkmflcomp.so.0 libkmflcomp0 #MINVER# find_store@Base 0.9.10 gp@Base 0.9.10 group_number@Base 0.9.10 + ignored_stores@Base 10.99.1 initialize_special_stores@Base 0.9.10 items_from_string@Base 0.9.10 items_to_string@Base 0.9.10 @@ -83,6 +85,7 @@ libkmflcomp.so.0 libkmflcomp0 #MINVER# store_number@Base 0.9.10 string_to_keysym@Base 0.9.10 text_to_keysym@Base 0.9.10 + valid_targets@Base 10.99.1 warncount@Base 0.9.10 warnlimit@Base 0.9.10 write_keyboard@Base 0.9.10