diff --git a/etc/icinga2/icinga2.conf.dist b/etc/icinga2/icinga2.conf.dist index 02a475914..1a9986e46 100644 --- a/etc/icinga2/icinga2.conf.dist +++ b/etc/icinga2/icinga2.conf.dist @@ -7,8 +7,8 @@ * description of what configuration options are available. */ -#include -#include +include +include /** * Global configuration settings @@ -24,7 +24,7 @@ local object IcingaApplication "icinga" { * files. These are used by the Icinga 1.x CGIs to display the state of * hosts and services. */ -#library "compat" +library "compat" local object CompatComponent "compat" { } /** diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32 index 89a32de8a..ac9f037b7 100644 --- a/etc/icinga2/icinga2.conf.win32 +++ b/etc/icinga2/icinga2.conf.win32 @@ -18,7 +18,7 @@ local object IcingaApplication "icinga" { state_path = "icinga2.state", macros = { - plugindir = "C:\Plugins" + plugindir = "C:\\Plugins" } } @@ -27,7 +27,7 @@ local object IcingaApplication "icinga" { * files. These are used by the Icinga 1.x CGIs to display the state of * hosts and services. */ -#library "compat" +library "compat" local object Component "compat" { status_path = "status.dat", objects_path = "objects.cache", diff --git a/itl/itl.conf b/itl/itl.conf index 0ba84e41e..b7915bcb7 100644 --- a/itl/itl.conf +++ b/itl/itl.conf @@ -22,7 +22,7 @@ * configuration templates. */ -#include "host.conf" -#include "service.conf" -#include "service-common.conf" -#include "notification.conf" +include "host.conf" +include "service.conf" +include "service-common.conf" +include "notification.conf" diff --git a/itl/standalone.conf b/itl/standalone.conf index 2ba784c78..0da22a8c0 100644 --- a/itl/standalone.conf +++ b/itl/standalone.conf @@ -17,11 +17,11 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ******************************************************************************/ -#library "checker" +library "checker" local object CheckerComponent "checker" {} -#library "delegation" +library "delegation" local object DelegationComponent "delegation" {} -#library "notification" +library "notification" local object NotificationComponent "notification" {} diff --git a/lib/config/config_lexer.cc b/lib/config/config_lexer.cc index 4a1023fd2..7e979fc6d 100644 --- a/lib/config/config_lexer.cc +++ b/lib/config/config_lexer.cc @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -158,7 +158,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -170,11 +178,6 @@ typedef void* yyscan_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -210,6 +213,11 @@ typedef size_t yy_size_t; #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -227,7 +235,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -306,7 +314,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); void *yyalloc (yy_size_t ,yyscan_t yyscanner ); void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -338,7 +346,7 @@ void yyfree (void * ,yyscan_t yyscanner ); /* Begin user sect3 */ -#define yywrap(yyscanner) 1 +#define yywrap(n) 1 #define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; @@ -371,29 +379,29 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[197] = +static yyconst flex_int16_t yy_accept[193] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 57, 55, - 21, 21, 1, 55, 55, 43, 55, 55, 55, 49, - 55, 50, 43, 43, 43, 43, 43, 43, 43, 43, - 43, 43, 43, 55, 18, 19, 12, 3, 2, 56, - 15, 15, 21, 0, 0, 0, 0, 0, 43, 53, - 51, 49, 52, 16, 20, 54, 0, 46, 47, 48, - 0, 44, 43, 43, 43, 43, 43, 43, 43, 43, - 43, 43, 43, 43, 43, 43, 43, 0, 18, 17, - 12, 11, 4, 5, 9, 10, 6, 8, 7, 0, - 0, 0, 0, 0, 0, 20, 49, 45, 43, 28, + 21, 21, 1, 55, 43, 55, 55, 55, 49, 55, + 50, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 55, 18, 19, 12, 3, 2, 56, 15, + 15, 21, 0, 0, 0, 43, 53, 51, 49, 52, + 16, 20, 54, 0, 46, 47, 48, 0, 44, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 0, 18, 17, 12, 11, + 4, 5, 9, 10, 6, 8, 7, 0, 0, 0, + 0, 20, 49, 45, 43, 28, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, - 43, 43, 43, 43, 13, 4, 5, 14, 0, 0, - 0, 0, 0, 43, 43, 43, 43, 43, 43, 39, - 43, 43, 43, 43, 43, 43, 41, 22, 4, 0, - 0, 0, 0, 0, 43, 24, 43, 42, 43, 33, - 43, 43, 43, 43, 43, 43, 0, 0, 0, 0, - 0, 43, 43, 43, 25, 34, 43, 27, 26, 43, - 0, 0, 0, 0, 0, 43, 43, 43, 40, 43, - 36, 37, 0, 30, 0, 32, 43, 38, 35, 0, - 0, 43, 31, 29, 23, 0 + 43, 43, 13, 4, 5, 14, 0, 0, 0, 43, + 43, 43, 43, 43, 43, 43, 43, 39, 43, 43, + 43, 43, 43, 43, 41, 22, 4, 0, 0, 0, + 43, 24, 43, 42, 43, 43, 43, 33, 43, 43, + 43, 43, 43, 43, 0, 0, 0, 43, 43, 43, + 43, 43, 25, 34, 43, 27, 26, 43, 0, 0, + 0, 43, 43, 36, 43, 37, 40, 43, 0, 30, + 0, 32, 43, 38, 35, 0, 0, 43, 31, 29, + 23, 0 } ; @@ -402,17 +410,17 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 4, 5, 1, 6, 1, 1, 1, - 1, 7, 8, 1, 9, 10, 11, 12, 12, 12, - 12, 12, 12, 12, 12, 13, 13, 14, 1, 15, - 16, 17, 1, 1, 18, 18, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, - 1, 19, 1, 1, 18, 1, 20, 21, 22, 23, + 1, 2, 1, 4, 1, 1, 5, 1, 1, 1, + 1, 6, 7, 1, 8, 9, 10, 11, 11, 11, + 11, 11, 11, 11, 11, 12, 12, 13, 1, 14, + 15, 16, 1, 1, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 1, 18, 1, 1, 17, 1, 19, 20, 21, 22, - 24, 25, 26, 27, 28, 29, 18, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 18, 18, - 41, 18, 42, 1, 43, 1, 1, 1, 1, 1, + 23, 24, 25, 26, 27, 28, 17, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 17, 17, + 40, 17, 41, 1, 42, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -429,165 +437,165 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[44] = +static yyconst flex_int32_t yy_meta[43] = { 0, - 1, 1, 2, 3, 1, 1, 4, 1, 5, 1, - 1, 5, 5, 5, 1, 5, 1, 5, 3, 5, + 1, 1, 2, 3, 1, 4, 1, 5, 1, 1, + 5, 5, 5, 1, 5, 1, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 1, 1 + 1, 1 } ; -static yyconst flex_int16_t yy_base[206] = +static yyconst flex_int16_t yy_base[202] = { 0, - 0, 0, 350, 349, 41, 43, 312, 311, 353, 358, - 46, 48, 358, 24, 33, 336, 335, 43, 50, 55, - 333, 358, 333, 42, 48, 55, 56, 54, 61, 63, - 65, 67, 74, 306, 0, 336, 0, 358, 358, 104, - 358, 303, 91, 313, 316, 305, 318, 321, 324, 358, - 358, 91, 358, 358, 0, 358, 83, 358, 302, 358, - 321, 358, 75, 83, 90, 86, 81, 93, 91, 103, - 98, 105, 115, 107, 114, 116, 122, 295, 0, 358, - 0, 358, 134, 136, 358, 358, 358, 358, 358, 293, - 313, 313, 295, 297, 301, 0, 138, 358, 121, 314, + 0, 0, 358, 357, 40, 42, 320, 319, 360, 365, + 45, 47, 365, 32, 344, 343, 41, 49, 54, 341, + 365, 341, 42, 54, 53, 39, 59, 60, 63, 70, + 67, 72, 314, 0, 344, 0, 365, 365, 102, 365, + 311, 90, 315, 328, 331, 334, 365, 365, 85, 365, + 365, 0, 365, 88, 365, 312, 365, 331, 365, 87, + 61, 90, 88, 91, 103, 112, 95, 113, 102, 116, + 119, 120, 126, 121, 46, 305, 0, 365, 0, 365, + 133, 135, 365, 365, 365, 365, 365, 303, 307, 309, + 313, 0, 137, 365, 125, 326, 135, 137, 142, 143, - 137, 123, 136, 138, 144, 128, 147, 150, 151, 154, - 155, 156, 161, 162, 358, 167, 169, 358, 299, 292, - 291, 287, 297, 160, 171, 172, 175, 177, 176, 308, - 178, 179, 181, 187, 182, 188, 307, 306, 198, 282, - 300, 291, 290, 294, 199, 300, 189, 299, 192, 298, - 200, 201, 205, 207, 208, 210, 287, 265, 279, 261, - 250, 211, 212, 213, 253, 252, 215, 251, 250, 216, - 241, 223, 224, 237, 222, 219, 221, 222, 242, 224, - 358, 358, 218, 358, 222, 237, 226, 236, 234, 225, - 211, 230, 358, 358, 64, 358, 271, 276, 281, 283, + 138, 145, 149, 150, 151, 154, 155, 160, 161, 166, + 167, 168, 365, 173, 175, 365, 305, 301, 311, 178, + 179, 180, 181, 182, 183, 186, 185, 322, 187, 188, + 196, 193, 191, 200, 321, 320, 205, 307, 306, 310, + 206, 316, 209, 315, 211, 212, 213, 311, 215, 216, + 217, 219, 220, 223, 297, 281, 294, 222, 225, 229, + 231, 232, 271, 270, 234, 269, 268, 236, 244, 258, + 241, 240, 242, 261, 243, 260, 259, 244, 234, 365, + 238, 254, 245, 251, 250, 241, 84, 247, 365, 365, + 93, 365, 287, 292, 297, 299, 304, 309, 314, 319, - 288, 293, 298, 303, 308 + 324 } ; -static yyconst flex_int16_t yy_def[206] = +static yyconst flex_int16_t yy_def[202] = { 0, - 196, 1, 197, 197, 198, 198, 199, 199, 196, 196, - 196, 196, 196, 196, 196, 200, 196, 196, 196, 196, - 201, 196, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 196, 202, 196, 203, 196, 196, 204, - 196, 196, 196, 196, 196, 196, 196, 196, 200, 196, - 196, 196, 196, 196, 205, 196, 196, 196, 196, 196, - 201, 196, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 196, 202, 196, - 203, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 205, 196, 196, 200, 200, + 192, 1, 193, 193, 194, 194, 195, 195, 192, 192, + 192, 192, 192, 192, 196, 192, 192, 192, 192, 197, + 192, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 192, 198, 192, 199, 192, 192, 200, 192, + 192, 192, 192, 192, 192, 196, 192, 192, 192, 192, + 192, 201, 192, 192, 192, 192, 192, 197, 192, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 192, 198, 192, 199, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 201, 192, 192, 196, 196, 196, 196, 196, 196, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 196, 196, - 196, 196, 196, 196, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 196, 196, 196, 196, - 196, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 196, 196, 196, 196, 196, 200, 200, 200, 200, 200, - 196, 196, 196, 196, 196, 200, 200, 200, 200, 196, - 196, 200, 196, 196, 200, 0, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 192, 192, 192, 192, 192, 192, 192, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 192, 192, 192, 192, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 192, 192, 192, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 192, 192, + 192, 196, 196, 196, 196, 196, 196, 196, 192, 192, + 192, 196, 196, 196, 196, 192, 192, 196, 192, 192, + 196, 0, 192, 192, 192, 192, 192, 192, 192, 192, - 196, 196, 196, 196, 196 + 192 } ; -static yyconst flex_int16_t yy_nxt[402] = +static yyconst flex_int16_t yy_nxt[408] = { 0, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 10, - 19, 20, 20, 10, 21, 22, 10, 23, 10, 24, - 23, 23, 25, 23, 26, 23, 23, 27, 23, 28, - 23, 29, 30, 31, 23, 23, 32, 33, 23, 23, - 23, 34, 10, 38, 39, 38, 39, 43, 43, 43, - 43, 44, 46, 45, 52, 52, 54, 196, 53, 40, - 55, 40, 63, 196, 57, 56, 52, 52, 47, 196, - 196, 196, 48, 64, 67, 66, 196, 65, 196, 196, - 196, 58, 196, 71, 72, 59, 69, 68, 73, 196, - 196, 60, 43, 43, 97, 97, 196, 75, 196, 70, + 10, 11, 12, 13, 14, 15, 16, 17, 10, 18, + 19, 19, 10, 20, 21, 10, 22, 10, 23, 22, + 22, 24, 22, 25, 22, 22, 26, 22, 27, 22, + 28, 29, 30, 22, 22, 31, 32, 22, 22, 22, + 33, 10, 37, 38, 37, 38, 42, 42, 42, 42, + 43, 49, 49, 192, 51, 50, 192, 39, 52, 39, + 192, 60, 54, 53, 49, 49, 44, 192, 192, 65, + 45, 64, 61, 192, 192, 192, 62, 192, 112, 55, + 63, 192, 69, 56, 192, 66, 192, 71, 70, 57, + 67, 42, 42, 54, 73, 49, 49, 68, 93, 93, - 57, 196, 52, 52, 74, 196, 196, 102, 196, 76, - 103, 99, 105, 196, 77, 83, 84, 58, 196, 104, - 196, 59, 196, 100, 85, 101, 108, 60, 86, 196, - 196, 196, 106, 107, 110, 87, 196, 196, 196, 88, - 109, 89, 111, 196, 112, 116, 117, 117, 117, 97, - 97, 196, 196, 196, 113, 114, 125, 130, 124, 196, - 126, 128, 196, 129, 58, 196, 196, 131, 59, 196, - 196, 196, 127, 132, 60, 196, 196, 196, 139, 117, - 117, 117, 135, 134, 137, 138, 196, 196, 133, 136, - 196, 196, 196, 196, 196, 145, 196, 196, 148, 147, + 96, 192, 192, 72, 192, 192, 74, 192, 98, 192, + 55, 75, 81, 82, 56, 103, 192, 192, 190, 99, + 57, 83, 95, 100, 97, 84, 192, 192, 101, 106, + 192, 102, 85, 192, 192, 192, 86, 108, 87, 192, + 192, 104, 105, 114, 115, 115, 115, 93, 93, 192, + 107, 192, 192, 121, 109, 110, 192, 192, 111, 192, + 125, 120, 55, 192, 192, 192, 56, 127, 192, 192, + 129, 124, 57, 122, 192, 192, 130, 123, 128, 126, + 192, 192, 192, 137, 115, 115, 115, 133, 132, 135, + 136, 131, 192, 192, 192, 192, 192, 192, 134, 192, - 152, 151, 196, 196, 196, 150, 154, 196, 153, 117, - 117, 146, 149, 155, 196, 196, 196, 156, 162, 164, - 196, 163, 196, 196, 167, 196, 196, 196, 196, 170, - 196, 196, 176, 169, 196, 165, 196, 196, 166, 196, - 187, 196, 168, 177, 179, 196, 194, 189, 193, 196, - 178, 196, 196, 180, 191, 190, 186, 196, 188, 185, - 184, 192, 183, 182, 181, 196, 196, 196, 196, 175, - 195, 35, 35, 35, 35, 35, 37, 37, 37, 37, - 37, 41, 41, 41, 41, 41, 49, 49, 61, 61, - 61, 61, 61, 79, 79, 79, 174, 79, 81, 173, + 192, 192, 192, 144, 147, 192, 143, 192, 150, 149, + 192, 152, 141, 148, 192, 115, 115, 146, 142, 145, + 192, 153, 151, 192, 158, 192, 192, 192, 154, 192, + 192, 192, 160, 192, 192, 165, 192, 192, 161, 192, + 159, 168, 172, 192, 167, 192, 192, 162, 192, 163, + 192, 174, 164, 166, 192, 173, 192, 192, 192, 192, + 183, 192, 177, 189, 192, 192, 185, 175, 192, 187, + 186, 176, 178, 192, 192, 192, 182, 181, 184, 188, + 180, 179, 192, 192, 192, 192, 191, 34, 34, 34, + 34, 34, 36, 36, 36, 36, 36, 40, 40, 40, - 172, 81, 81, 82, 82, 82, 82, 82, 96, 171, - 96, 96, 96, 196, 196, 196, 161, 160, 159, 158, - 157, 196, 196, 196, 144, 143, 142, 141, 140, 196, - 123, 122, 121, 120, 119, 118, 115, 62, 98, 196, - 95, 94, 93, 92, 91, 90, 80, 78, 196, 62, - 51, 50, 196, 42, 42, 36, 36, 9, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 40, 40, 46, 46, 58, 58, 58, 58, 58, 77, + 77, 77, 171, 77, 79, 170, 169, 79, 79, 80, + 80, 80, 80, 80, 92, 192, 92, 92, 92, 192, + 192, 157, 156, 155, 192, 192, 192, 140, 139, 138, + 192, 119, 118, 117, 116, 113, 59, 94, 192, 91, + 90, 89, 88, 78, 76, 192, 59, 48, 47, 192, + 41, 41, 35, 35, 9, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 196 + 192, 192, 192, 192, 192, 192, 192 } ; -static yyconst flex_int16_t yy_chk[402] = +static yyconst flex_int16_t yy_chk[408] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 5, 5, 6, 6, 11, 11, 12, - 12, 14, 15, 14, 18, 18, 19, 24, 18, 5, - 19, 6, 24, 25, 20, 19, 20, 20, 15, 28, - 26, 27, 15, 24, 26, 25, 29, 24, 30, 195, - 31, 20, 32, 30, 31, 20, 28, 27, 32, 33, - 63, 20, 43, 43, 57, 57, 67, 33, 64, 29, + 1, 1, 5, 5, 6, 6, 11, 11, 12, 12, + 14, 17, 17, 26, 18, 17, 23, 5, 18, 6, + 75, 23, 19, 18, 19, 19, 14, 25, 24, 26, + 14, 25, 23, 27, 28, 61, 23, 29, 75, 19, + 24, 31, 29, 19, 30, 27, 32, 31, 30, 19, + 27, 42, 42, 49, 32, 49, 49, 28, 54, 54, - 52, 66, 52, 52, 32, 65, 69, 66, 68, 33, - 67, 63, 69, 71, 33, 40, 40, 52, 70, 68, - 72, 52, 74, 64, 40, 65, 71, 52, 40, 75, - 73, 76, 70, 70, 73, 40, 99, 77, 102, 40, - 72, 40, 74, 106, 75, 83, 83, 84, 84, 97, - 97, 103, 101, 104, 76, 77, 101, 106, 99, 105, - 102, 104, 107, 105, 97, 108, 109, 107, 97, 110, - 111, 112, 103, 108, 97, 124, 113, 114, 116, 116, - 117, 117, 111, 110, 113, 114, 125, 126, 109, 112, - 127, 129, 128, 131, 132, 124, 133, 135, 127, 126, + 61, 60, 63, 31, 62, 64, 32, 191, 63, 67, + 49, 32, 39, 39, 49, 67, 69, 65, 187, 64, + 49, 39, 60, 65, 62, 39, 66, 68, 65, 69, + 70, 66, 39, 71, 72, 74, 39, 71, 39, 95, + 73, 68, 68, 81, 81, 82, 82, 93, 93, 97, + 70, 98, 101, 97, 72, 73, 99, 100, 74, 102, + 101, 95, 93, 103, 104, 105, 93, 103, 106, 107, + 105, 100, 93, 98, 108, 109, 106, 99, 104, 102, + 110, 111, 112, 114, 114, 115, 115, 109, 108, 111, + 112, 107, 120, 121, 122, 123, 124, 125, 110, 127, - 132, 131, 134, 136, 147, 129, 134, 149, 133, 139, - 139, 125, 128, 135, 145, 151, 152, 136, 145, 149, - 153, 147, 154, 155, 153, 156, 162, 163, 164, 156, - 167, 170, 162, 155, 176, 151, 177, 178, 152, 180, - 177, 187, 154, 163, 167, 192, 191, 180, 190, 189, - 164, 188, 186, 170, 185, 183, 176, 179, 178, 175, - 174, 187, 173, 172, 171, 169, 168, 166, 165, 161, - 192, 197, 197, 197, 197, 197, 198, 198, 198, 198, - 198, 199, 199, 199, 199, 199, 200, 200, 201, 201, - 201, 201, 201, 202, 202, 202, 160, 202, 203, 159, + 126, 129, 130, 123, 126, 133, 122, 132, 130, 129, + 131, 132, 120, 127, 134, 137, 137, 125, 121, 124, + 141, 133, 131, 143, 141, 145, 146, 147, 134, 149, + 150, 151, 145, 152, 153, 151, 158, 154, 146, 159, + 143, 154, 158, 160, 153, 161, 162, 147, 165, 149, + 168, 160, 150, 152, 172, 159, 173, 175, 178, 183, + 173, 188, 165, 186, 185, 184, 178, 161, 182, 181, + 179, 162, 168, 177, 176, 174, 172, 171, 175, 183, + 170, 169, 167, 166, 164, 163, 188, 193, 193, 193, + 193, 193, 194, 194, 194, 194, 194, 195, 195, 195, - 158, 203, 203, 204, 204, 204, 204, 204, 205, 157, - 205, 205, 205, 150, 148, 146, 144, 143, 142, 141, - 140, 138, 137, 130, 123, 122, 121, 120, 119, 100, - 95, 94, 93, 92, 91, 90, 78, 61, 59, 49, - 48, 47, 46, 45, 44, 42, 36, 34, 23, 21, - 17, 16, 9, 8, 7, 4, 3, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 195, 195, 196, 196, 197, 197, 197, 197, 197, 198, + 198, 198, 157, 198, 199, 156, 155, 199, 199, 200, + 200, 200, 200, 200, 201, 148, 201, 201, 201, 144, + 142, 140, 139, 138, 136, 135, 128, 119, 118, 117, + 96, 91, 90, 89, 88, 76, 58, 56, 46, 45, + 44, 43, 41, 35, 33, 22, 20, 16, 15, 9, + 8, 7, 4, 3, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, - 196 + 192, 192, 192, 192, 192, 192, 192 } ; /* Table of booleans, true if rule could match eol. */ @@ -693,7 +701,7 @@ static void lb_append_char(lex_buf *lb, char new_char) -#line 697 "config_lexer.cc" +#line 705 "config_lexer.cc" #define INITIAL 0 #define C_COMMENT 1 @@ -725,8 +733,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; + int yy_n_chars; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -783,7 +791,7 @@ FILE *yyget_out (yyscan_t yyscanner ); void yyset_out (FILE * out_str ,yyscan_t yyscanner ); -yy_size_t yyget_leng (yyscan_t yyscanner ); +int yyget_leng (yyscan_t yyscanner ); char *yyget_text (yyscan_t yyscanner ); @@ -837,7 +845,12 @@ static int input (yyscan_t yyscanner ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -945,7 +958,7 @@ YY_DECL lex_buf string_buf; -#line 949 "config_lexer.cc" +#line 962 "config_lexer.cc" yylval = yylval_param; @@ -1002,13 +1015,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 >= 197 ) + if ( yy_current_state >= 193 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 196 ); + while ( yy_current_state != 192 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -1379,7 +1392,7 @@ YY_RULE_SETUP #line 221 "config_lexer.ll" ECHO; YY_BREAK -#line 1383 "config_lexer.cc" +#line 1396 "config_lexer.cc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(C_COMMENT): case YY_STATE_EOF(STRING): @@ -1570,21 +1583,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = (int) (yyg->yy_c_buf_p - b->yy_ch_buf); 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; @@ -1615,7 +1628,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); + yyg->yy_n_chars, (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1677,7 +1690,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 >= 197 ) + if ( yy_current_state >= 193 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1706,13 +1719,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner) 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 >= 197 ) + if ( yy_current_state >= 193 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 196); + yy_is_jam = (yy_current_state == 192); - (void)yyg; return yy_is_jam ? 0 : yy_current_state; } @@ -1729,7 +1741,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = yyg->yy_n_chars + 2; + register int number_to_move = yyg->yy_n_chars + 2; register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = @@ -1783,7 +1795,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = yyg->yy_c_buf_p - yyg->yytext_ptr; ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -2070,7 +2082,7 @@ void yypop_buffer_state (yyscan_t yyscanner) */ static void yyensure_buffer_stack (yyscan_t yyscanner) { - yy_size_t num_to_alloc; + int num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -2168,7 +2180,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; @@ -2283,7 +2295,7 @@ FILE *yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2319,7 +2331,7 @@ void yyset_lineno (int line_number , yyscan_t yyscanner) /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); + yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); yylineno = line_number; } @@ -2334,7 +2346,7 @@ void yyset_column (int column_no , yyscan_t yyscanner) /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_column called with no buffer" ); + yy_fatal_error( "yyset_column called with no buffer" , yyscanner); yycolumn = column_no; } diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll index 6a785e026..3ea4633a8 100644 --- a/lib/config/config_lexer.ll +++ b/lib/config/config_lexer.ll @@ -195,8 +195,8 @@ abstract return T_ABSTRACT; local return T_LOCAL; object return T_OBJECT; template return T_TEMPLATE; -#include return T_INCLUDE; -#library return T_LIBRARY; +include return T_INCLUDE; +library return T_LIBRARY; inherits return T_INHERITS; null return T_NULL; partial return T_PARTIAL;