LexerParser: Regenerate parser files with GNU Bison 3.7.4

Adjust expected test output.

Source/LexerParser/cmCommandArgumentParserTokens.h

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.2.  */
+/* A Bison parser, made by GNU Bison 3.7.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,8 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED
 # define YY_CMCOMMANDARGUMENT_YY_CMCOMMANDARGUMENTPARSERTOKENS_H_INCLUDED
@@ -44,38 +45,30 @@
 extern int cmCommandArgument_yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    cal_ENVCURLY = 258,
-    cal_NCURLY = 259,
-    cal_DCURLY = 260,
-    cal_DOLLAR = 261,
-    cal_LCURLY = 262,
-    cal_RCURLY = 263,
-    cal_NAME = 264,
-    cal_BSLASH = 265,
-    cal_SYMBOL = 266,
-    cal_AT = 267,
-    cal_ERROR = 268,
-    cal_ATNAME = 269
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    cal_ENVCURLY = 258,            /* cal_ENVCURLY  */
+    cal_NCURLY = 259,              /* cal_NCURLY  */
+    cal_DCURLY = 260,              /* cal_DCURLY  */
+    cal_DOLLAR = 261,              /* "$"  */
+    cal_LCURLY = 262,              /* "{"  */
+    cal_RCURLY = 263,              /* "}"  */
+    cal_NAME = 264,                /* cal_NAME  */
+    cal_BSLASH = 265,              /* "\\"  */
+    cal_SYMBOL = 266,              /* cal_SYMBOL  */
+    cal_AT = 267,                  /* "@"  */
+    cal_ERROR = 268,               /* cal_ERROR  */
+    cal_ATNAME = 269               /* cal_ATNAME  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
-#define cal_ENVCURLY 258
-#define cal_NCURLY 259
-#define cal_DCURLY 260
-#define cal_DOLLAR 261
-#define cal_LCURLY 262
-#define cal_RCURLY 263
-#define cal_NAME 264
-#define cal_BSLASH 265
-#define cal_SYMBOL 266
-#define cal_AT 267
-#define cal_ERROR 268
-#define cal_ATNAME 269
 
 /* Value type.  */
 

Source/LexerParser/cmDependsJavaParserTokens.h

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.2.  */
+/* A Bison parser, made by GNU Bison 3.7.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,8 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_CMDEPENDSJAVA_YY_CMDEPENDSJAVAPARSERTOKENS_H_INCLUDED
 # define YY_CMDEPENDSJAVA_YY_CMDEPENDSJAVAPARSERTOKENS_H_INCLUDED
@@ -44,220 +45,121 @@
 extern int cmDependsJava_yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    jp_ABSTRACT = 258,
-    jp_ASSERT = 259,
-    jp_BOOLEAN_TYPE = 260,
-    jp_BREAK = 261,
-    jp_BYTE_TYPE = 262,
-    jp_CASE = 263,
-    jp_CATCH = 264,
-    jp_CHAR_TYPE = 265,
-    jp_CLASS = 266,
-    jp_CONTINUE = 267,
-    jp_DEFAULT = 268,
-    jp_DO = 269,
-    jp_DOUBLE_TYPE = 270,
-    jp_ELSE = 271,
-    jp_EXTENDS = 272,
-    jp_FINAL = 273,
-    jp_FINALLY = 274,
-    jp_FLOAT_TYPE = 275,
-    jp_FOR = 276,
-    jp_IF = 277,
-    jp_IMPLEMENTS = 278,
-    jp_IMPORT = 279,
-    jp_INSTANCEOF = 280,
-    jp_INT_TYPE = 281,
-    jp_INTERFACE = 282,
-    jp_LONG_TYPE = 283,
-    jp_NATIVE = 284,
-    jp_NEW = 285,
-    jp_PACKAGE = 286,
-    jp_PRIVATE = 287,
-    jp_PROTECTED = 288,
-    jp_PUBLIC = 289,
-    jp_RETURN = 290,
-    jp_SHORT_TYPE = 291,
-    jp_STATIC = 292,
-    jp_STRICTFP = 293,
-    jp_SUPER = 294,
-    jp_SWITCH = 295,
-    jp_SYNCHRONIZED = 296,
-    jp_THIS = 297,
-    jp_THROW = 298,
-    jp_THROWS = 299,
-    jp_TRANSIENT = 300,
-    jp_TRY = 301,
-    jp_VOID = 302,
-    jp_VOLATILE = 303,
-    jp_WHILE = 304,
-    jp_BOOLEANLITERAL = 305,
-    jp_CHARACTERLITERAL = 306,
-    jp_DECIMALINTEGERLITERAL = 307,
-    jp_FLOATINGPOINTLITERAL = 308,
-    jp_HEXINTEGERLITERAL = 309,
-    jp_NULLLITERAL = 310,
-    jp_STRINGLITERAL = 311,
-    jp_NAME = 312,
-    jp_AND = 313,
-    jp_ANDAND = 314,
-    jp_ANDEQUALS = 315,
-    jp_BRACKETEND = 316,
-    jp_BRACKETSTART = 317,
-    jp_CARROT = 318,
-    jp_CARROTEQUALS = 319,
-    jp_COLON = 320,
-    jp_COMMA = 321,
-    jp_CURLYEND = 322,
-    jp_CURLYSTART = 323,
-    jp_DIVIDE = 324,
-    jp_DIVIDEEQUALS = 325,
-    jp_DOLLAR = 326,
-    jp_DOT = 327,
-    jp_EQUALS = 328,
-    jp_EQUALSEQUALS = 329,
-    jp_EXCLAMATION = 330,
-    jp_EXCLAMATIONEQUALS = 331,
-    jp_GREATER = 332,
-    jp_GTEQUALS = 333,
-    jp_GTGT = 334,
-    jp_GTGTEQUALS = 335,
-    jp_GTGTGT = 336,
-    jp_GTGTGTEQUALS = 337,
-    jp_LESLESEQUALS = 338,
-    jp_LESSTHAN = 339,
-    jp_LTEQUALS = 340,
-    jp_LTLT = 341,
-    jp_MINUS = 342,
-    jp_MINUSEQUALS = 343,
-    jp_MINUSMINUS = 344,
-    jp_PAREEND = 345,
-    jp_PARESTART = 346,
-    jp_PERCENT = 347,
-    jp_PERCENTEQUALS = 348,
-    jp_PIPE = 349,
-    jp_PIPEEQUALS = 350,
-    jp_PIPEPIPE = 351,
-    jp_PLUS = 352,
-    jp_PLUSEQUALS = 353,
-    jp_PLUSPLUS = 354,
-    jp_QUESTION = 355,
-    jp_SEMICOL = 356,
-    jp_TILDE = 357,
-    jp_TIMES = 358,
-    jp_TIMESEQUALS = 359,
-    jp_ERROR = 360
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    jp_ABSTRACT = 258,             /* jp_ABSTRACT  */
+    jp_ASSERT = 259,               /* jp_ASSERT  */
+    jp_BOOLEAN_TYPE = 260,         /* jp_BOOLEAN_TYPE  */
+    jp_BREAK = 261,                /* jp_BREAK  */
+    jp_BYTE_TYPE = 262,            /* jp_BYTE_TYPE  */
+    jp_CASE = 263,                 /* jp_CASE  */
+    jp_CATCH = 264,                /* jp_CATCH  */
+    jp_CHAR_TYPE = 265,            /* jp_CHAR_TYPE  */
+    jp_CLASS = 266,                /* jp_CLASS  */
+    jp_CONTINUE = 267,             /* jp_CONTINUE  */
+    jp_DEFAULT = 268,              /* jp_DEFAULT  */
+    jp_DO = 269,                   /* jp_DO  */
+    jp_DOUBLE_TYPE = 270,          /* jp_DOUBLE_TYPE  */
+    jp_ELSE = 271,                 /* jp_ELSE  */
+    jp_EXTENDS = 272,              /* jp_EXTENDS  */
+    jp_FINAL = 273,                /* jp_FINAL  */
+    jp_FINALLY = 274,              /* jp_FINALLY  */
+    jp_FLOAT_TYPE = 275,           /* jp_FLOAT_TYPE  */
+    jp_FOR = 276,                  /* jp_FOR  */
+    jp_IF = 277,                   /* jp_IF  */
+    jp_IMPLEMENTS = 278,           /* jp_IMPLEMENTS  */
+    jp_IMPORT = 279,               /* jp_IMPORT  */
+    jp_INSTANCEOF = 280,           /* jp_INSTANCEOF  */
+    jp_INT_TYPE = 281,             /* jp_INT_TYPE  */
+    jp_INTERFACE = 282,            /* jp_INTERFACE  */
+    jp_LONG_TYPE = 283,            /* jp_LONG_TYPE  */
+    jp_NATIVE = 284,               /* jp_NATIVE  */
+    jp_NEW = 285,                  /* jp_NEW  */
+    jp_PACKAGE = 286,              /* jp_PACKAGE  */
+    jp_PRIVATE = 287,              /* jp_PRIVATE  */
+    jp_PROTECTED = 288,            /* jp_PROTECTED  */
+    jp_PUBLIC = 289,               /* jp_PUBLIC  */
+    jp_RETURN = 290,               /* jp_RETURN  */
+    jp_SHORT_TYPE = 291,           /* jp_SHORT_TYPE  */
+    jp_STATIC = 292,               /* jp_STATIC  */
+    jp_STRICTFP = 293,             /* jp_STRICTFP  */
+    jp_SUPER = 294,                /* jp_SUPER  */
+    jp_SWITCH = 295,               /* jp_SWITCH  */
+    jp_SYNCHRONIZED = 296,         /* jp_SYNCHRONIZED  */
+    jp_THIS = 297,                 /* jp_THIS  */
+    jp_THROW = 298,                /* jp_THROW  */
+    jp_THROWS = 299,               /* jp_THROWS  */
+    jp_TRANSIENT = 300,            /* jp_TRANSIENT  */
+    jp_TRY = 301,                  /* jp_TRY  */
+    jp_VOID = 302,                 /* jp_VOID  */
+    jp_VOLATILE = 303,             /* jp_VOLATILE  */
+    jp_WHILE = 304,                /* jp_WHILE  */
+    jp_BOOLEANLITERAL = 305,       /* jp_BOOLEANLITERAL  */
+    jp_CHARACTERLITERAL = 306,     /* jp_CHARACTERLITERAL  */
+    jp_DECIMALINTEGERLITERAL = 307, /* jp_DECIMALINTEGERLITERAL  */
+    jp_FLOATINGPOINTLITERAL = 308, /* jp_FLOATINGPOINTLITERAL  */
+    jp_HEXINTEGERLITERAL = 309,    /* jp_HEXINTEGERLITERAL  */
+    jp_NULLLITERAL = 310,          /* jp_NULLLITERAL  */
+    jp_STRINGLITERAL = 311,        /* jp_STRINGLITERAL  */
+    jp_NAME = 312,                 /* jp_NAME  */
+    jp_AND = 313,                  /* jp_AND  */
+    jp_ANDAND = 314,               /* jp_ANDAND  */
+    jp_ANDEQUALS = 315,            /* jp_ANDEQUALS  */
+    jp_BRACKETEND = 316,           /* jp_BRACKETEND  */
+    jp_BRACKETSTART = 317,         /* jp_BRACKETSTART  */
+    jp_CARROT = 318,               /* jp_CARROT  */
+    jp_CARROTEQUALS = 319,         /* jp_CARROTEQUALS  */
+    jp_COLON = 320,                /* jp_COLON  */
+    jp_COMMA = 321,                /* jp_COMMA  */
+    jp_CURLYEND = 322,             /* jp_CURLYEND  */
+    jp_CURLYSTART = 323,           /* jp_CURLYSTART  */
+    jp_DIVIDE = 324,               /* jp_DIVIDE  */
+    jp_DIVIDEEQUALS = 325,         /* jp_DIVIDEEQUALS  */
+    jp_DOLLAR = 326,               /* jp_DOLLAR  */
+    jp_DOT = 327,                  /* jp_DOT  */
+    jp_EQUALS = 328,               /* jp_EQUALS  */
+    jp_EQUALSEQUALS = 329,         /* jp_EQUALSEQUALS  */
+    jp_EXCLAMATION = 330,          /* jp_EXCLAMATION  */
+    jp_EXCLAMATIONEQUALS = 331,    /* jp_EXCLAMATIONEQUALS  */
+    jp_GREATER = 332,              /* jp_GREATER  */
+    jp_GTEQUALS = 333,             /* jp_GTEQUALS  */
+    jp_GTGT = 334,                 /* jp_GTGT  */
+    jp_GTGTEQUALS = 335,           /* jp_GTGTEQUALS  */
+    jp_GTGTGT = 336,               /* jp_GTGTGT  */
+    jp_GTGTGTEQUALS = 337,         /* jp_GTGTGTEQUALS  */
+    jp_LESLESEQUALS = 338,         /* jp_LESLESEQUALS  */
+    jp_LESSTHAN = 339,             /* jp_LESSTHAN  */
+    jp_LTEQUALS = 340,             /* jp_LTEQUALS  */
+    jp_LTLT = 341,                 /* jp_LTLT  */
+    jp_MINUS = 342,                /* jp_MINUS  */
+    jp_MINUSEQUALS = 343,          /* jp_MINUSEQUALS  */
+    jp_MINUSMINUS = 344,           /* jp_MINUSMINUS  */
+    jp_PAREEND = 345,              /* jp_PAREEND  */
+    jp_PARESTART = 346,            /* jp_PARESTART  */
+    jp_PERCENT = 347,              /* jp_PERCENT  */
+    jp_PERCENTEQUALS = 348,        /* jp_PERCENTEQUALS  */
+    jp_PIPE = 349,                 /* jp_PIPE  */
+    jp_PIPEEQUALS = 350,           /* jp_PIPEEQUALS  */
+    jp_PIPEPIPE = 351,             /* jp_PIPEPIPE  */
+    jp_PLUS = 352,                 /* jp_PLUS  */
+    jp_PLUSEQUALS = 353,           /* jp_PLUSEQUALS  */
+    jp_PLUSPLUS = 354,             /* jp_PLUSPLUS  */
+    jp_QUESTION = 355,             /* jp_QUESTION  */
+    jp_SEMICOL = 356,              /* jp_SEMICOL  */
+    jp_TILDE = 357,                /* jp_TILDE  */
+    jp_TIMES = 358,                /* jp_TIMES  */
+    jp_TIMESEQUALS = 359,          /* jp_TIMESEQUALS  */
+    jp_ERROR = 360                 /* jp_ERROR  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
-#define jp_ABSTRACT 258
-#define jp_ASSERT 259
-#define jp_BOOLEAN_TYPE 260
-#define jp_BREAK 261
-#define jp_BYTE_TYPE 262
-#define jp_CASE 263
-#define jp_CATCH 264
-#define jp_CHAR_TYPE 265
-#define jp_CLASS 266
-#define jp_CONTINUE 267
-#define jp_DEFAULT 268
-#define jp_DO 269
-#define jp_DOUBLE_TYPE 270
-#define jp_ELSE 271
-#define jp_EXTENDS 272
-#define jp_FINAL 273
-#define jp_FINALLY 274
-#define jp_FLOAT_TYPE 275
-#define jp_FOR 276
-#define jp_IF 277
-#define jp_IMPLEMENTS 278
-#define jp_IMPORT 279
-#define jp_INSTANCEOF 280
-#define jp_INT_TYPE 281
-#define jp_INTERFACE 282
-#define jp_LONG_TYPE 283
-#define jp_NATIVE 284
-#define jp_NEW 285
-#define jp_PACKAGE 286
-#define jp_PRIVATE 287
-#define jp_PROTECTED 288
-#define jp_PUBLIC 289
-#define jp_RETURN 290
-#define jp_SHORT_TYPE 291
-#define jp_STATIC 292
-#define jp_STRICTFP 293
-#define jp_SUPER 294
-#define jp_SWITCH 295
-#define jp_SYNCHRONIZED 296
-#define jp_THIS 297
-#define jp_THROW 298
-#define jp_THROWS 299
-#define jp_TRANSIENT 300
-#define jp_TRY 301
-#define jp_VOID 302
-#define jp_VOLATILE 303
-#define jp_WHILE 304
-#define jp_BOOLEANLITERAL 305
-#define jp_CHARACTERLITERAL 306
-#define jp_DECIMALINTEGERLITERAL 307
-#define jp_FLOATINGPOINTLITERAL 308
-#define jp_HEXINTEGERLITERAL 309
-#define jp_NULLLITERAL 310
-#define jp_STRINGLITERAL 311
-#define jp_NAME 312
-#define jp_AND 313
-#define jp_ANDAND 314
-#define jp_ANDEQUALS 315
-#define jp_BRACKETEND 316
-#define jp_BRACKETSTART 317
-#define jp_CARROT 318
-#define jp_CARROTEQUALS 319
-#define jp_COLON 320
-#define jp_COMMA 321
-#define jp_CURLYEND 322
-#define jp_CURLYSTART 323
-#define jp_DIVIDE 324
-#define jp_DIVIDEEQUALS 325
-#define jp_DOLLAR 326
-#define jp_DOT 327
-#define jp_EQUALS 328
-#define jp_EQUALSEQUALS 329
-#define jp_EXCLAMATION 330
-#define jp_EXCLAMATIONEQUALS 331
-#define jp_GREATER 332
-#define jp_GTEQUALS 333
-#define jp_GTGT 334
-#define jp_GTGTEQUALS 335
-#define jp_GTGTGT 336
-#define jp_GTGTGTEQUALS 337
-#define jp_LESLESEQUALS 338
-#define jp_LESSTHAN 339
-#define jp_LTEQUALS 340
-#define jp_LTLT 341
-#define jp_MINUS 342
-#define jp_MINUSEQUALS 343
-#define jp_MINUSMINUS 344
-#define jp_PAREEND 345
-#define jp_PARESTART 346
-#define jp_PERCENT 347
-#define jp_PERCENTEQUALS 348
-#define jp_PIPE 349
-#define jp_PIPEEQUALS 350
-#define jp_PIPEPIPE 351
-#define jp_PLUS 352
-#define jp_PLUSEQUALS 353
-#define jp_PLUSPLUS 354
-#define jp_QUESTION 355
-#define jp_SEMICOL 356
-#define jp_TILDE 357
-#define jp_TIMES 358
-#define jp_TIMESEQUALS 359
-#define jp_ERROR 360
 
 /* Value type.  */
 

Source/LexerParser/cmExprParserTokens.h

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.2.  */
+/* A Bison parser, made by GNU Bison 3.7.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,8 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_CMEXPR_YY_CMEXPRPARSERTOKENS_H_INCLUDED
 # define YY_CMEXPR_YY_CMEXPRPARSERTOKENS_H_INCLUDED
@@ -44,42 +45,32 @@
 extern int cmExpr_yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    exp_PLUS = 258,
-    exp_MINUS = 259,
-    exp_TIMES = 260,
-    exp_DIVIDE = 261,
-    exp_MOD = 262,
-    exp_SHIFTLEFT = 263,
-    exp_SHIFTRIGHT = 264,
-    exp_OPENPARENT = 265,
-    exp_CLOSEPARENT = 266,
-    exp_OR = 267,
-    exp_AND = 268,
-    exp_XOR = 269,
-    exp_NOT = 270,
-    exp_NUMBER = 271
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    exp_PLUS = 258,                /* exp_PLUS  */
+    exp_MINUS = 259,               /* exp_MINUS  */
+    exp_TIMES = 260,               /* exp_TIMES  */
+    exp_DIVIDE = 261,              /* exp_DIVIDE  */
+    exp_MOD = 262,                 /* exp_MOD  */
+    exp_SHIFTLEFT = 263,           /* exp_SHIFTLEFT  */
+    exp_SHIFTRIGHT = 264,          /* exp_SHIFTRIGHT  */
+    exp_OPENPARENT = 265,          /* exp_OPENPARENT  */
+    exp_CLOSEPARENT = 266,         /* exp_CLOSEPARENT  */
+    exp_OR = 267,                  /* exp_OR  */
+    exp_AND = 268,                 /* exp_AND  */
+    exp_XOR = 269,                 /* exp_XOR  */
+    exp_NOT = 270,                 /* exp_NOT  */
+    exp_NUMBER = 271               /* exp_NUMBER  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
-#define exp_PLUS 258
-#define exp_MINUS 259
-#define exp_TIMES 260
-#define exp_DIVIDE 261
-#define exp_MOD 262
-#define exp_SHIFTLEFT 263
-#define exp_SHIFTRIGHT 264
-#define exp_OPENPARENT 265
-#define exp_CLOSEPARENT 266
-#define exp_OR 267
-#define exp_AND 268
-#define exp_XOR 269
-#define exp_NOT 270
-#define exp_NUMBER 271
 
 /* Value type.  */
 

Source/LexerParser/cmFortranParserTokens.h

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.4.2.  */
+/* A Bison parser, made by GNU Bison 3.7.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -31,8 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Undocumented macros, especially those whose name start with YY_,
-   are private implementation details.  Do not rely on them.  */
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
 #ifndef YY_CMFORTRAN_YY_CMFORTRANPARSERTOKENS_H_INCLUDED
 # define YY_CMFORTRAN_YY_CMFORTRANPARSERTOKENS_H_INCLUDED
@@ -44,100 +45,66 @@
 extern int cmFortran_yydebug;
 #endif
 
-/* Token type.  */
+/* Token kinds.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
   enum yytokentype
   {
-    EOSTMT = 258,
-    ASSIGNMENT_OP = 259,
-    GARBAGE = 260,
-    CPP_LINE_DIRECTIVE = 261,
-    CPP_INCLUDE = 262,
-    F90PPR_INCLUDE = 263,
-    COCO_INCLUDE = 264,
-    F90PPR_DEFINE = 265,
-    CPP_DEFINE = 266,
-    F90PPR_UNDEF = 267,
-    CPP_UNDEF = 268,
-    CPP_IFDEF = 269,
-    CPP_IFNDEF = 270,
-    CPP_IF = 271,
-    CPP_ELSE = 272,
-    CPP_ELIF = 273,
-    CPP_ENDIF = 274,
-    F90PPR_IFDEF = 275,
-    F90PPR_IFNDEF = 276,
-    F90PPR_IF = 277,
-    F90PPR_ELSE = 278,
-    F90PPR_ELIF = 279,
-    F90PPR_ENDIF = 280,
-    COMMA = 281,
-    COLON = 282,
-    DCOLON = 283,
-    LPAREN = 284,
-    RPAREN = 285,
-    UNTERMINATED_STRING = 286,
-    STRING = 287,
-    WORD = 288,
-    CPP_INCLUDE_ANGLE = 289,
-    END = 290,
-    INCLUDE = 291,
-    INTERFACE = 292,
-    MODULE = 293,
-    SUBMODULE = 294,
-    USE = 295
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    EOSTMT = 258,                  /* EOSTMT  */
+    ASSIGNMENT_OP = 259,           /* ASSIGNMENT_OP  */
+    GARBAGE = 260,                 /* GARBAGE  */
+    CPP_LINE_DIRECTIVE = 261,      /* CPP_LINE_DIRECTIVE  */
+    CPP_INCLUDE = 262,             /* CPP_INCLUDE  */
+    F90PPR_INCLUDE = 263,          /* F90PPR_INCLUDE  */
+    COCO_INCLUDE = 264,            /* COCO_INCLUDE  */
+    F90PPR_DEFINE = 265,           /* F90PPR_DEFINE  */
+    CPP_DEFINE = 266,              /* CPP_DEFINE  */
+    F90PPR_UNDEF = 267,            /* F90PPR_UNDEF  */
+    CPP_UNDEF = 268,               /* CPP_UNDEF  */
+    CPP_IFDEF = 269,               /* CPP_IFDEF  */
+    CPP_IFNDEF = 270,              /* CPP_IFNDEF  */
+    CPP_IF = 271,                  /* CPP_IF  */
+    CPP_ELSE = 272,                /* CPP_ELSE  */
+    CPP_ELIF = 273,                /* CPP_ELIF  */
+    CPP_ENDIF = 274,               /* CPP_ENDIF  */
+    F90PPR_IFDEF = 275,            /* F90PPR_IFDEF  */
+    F90PPR_IFNDEF = 276,           /* F90PPR_IFNDEF  */
+    F90PPR_IF = 277,               /* F90PPR_IF  */
+    F90PPR_ELSE = 278,             /* F90PPR_ELSE  */
+    F90PPR_ELIF = 279,             /* F90PPR_ELIF  */
+    F90PPR_ENDIF = 280,            /* F90PPR_ENDIF  */
+    COMMA = 281,                   /* COMMA  */
+    COLON = 282,                   /* COLON  */
+    DCOLON = 283,                  /* DCOLON  */
+    LPAREN = 284,                  /* LPAREN  */
+    RPAREN = 285,                  /* RPAREN  */
+    UNTERMINATED_STRING = 286,     /* UNTERMINATED_STRING  */
+    STRING = 287,                  /* STRING  */
+    WORD = 288,                    /* WORD  */
+    CPP_INCLUDE_ANGLE = 289,       /* CPP_INCLUDE_ANGLE  */
+    END = 290,                     /* END  */
+    INCLUDE = 291,                 /* INCLUDE  */
+    INTERFACE = 292,               /* INTERFACE  */
+    MODULE = 293,                  /* MODULE  */
+    SUBMODULE = 294,               /* SUBMODULE  */
+    USE = 295                      /* USE  */
   };
+  typedef enum yytokentype yytoken_kind_t;
 #endif
-/* Tokens.  */
-#define EOSTMT 258
-#define ASSIGNMENT_OP 259
-#define GARBAGE 260
-#define CPP_LINE_DIRECTIVE 261
-#define CPP_INCLUDE 262
-#define F90PPR_INCLUDE 263
-#define COCO_INCLUDE 264
-#define F90PPR_DEFINE 265
-#define CPP_DEFINE 266
-#define F90PPR_UNDEF 267
-#define CPP_UNDEF 268
-#define CPP_IFDEF 269
-#define CPP_IFNDEF 270
-#define CPP_IF 271
-#define CPP_ELSE 272
-#define CPP_ELIF 273
-#define CPP_ENDIF 274
-#define F90PPR_IFDEF 275
-#define F90PPR_IFNDEF 276
-#define F90PPR_IF 277
-#define F90PPR_ELSE 278
-#define F90PPR_ELIF 279
-#define F90PPR_ENDIF 280
-#define COMMA 281
-#define COLON 282
-#define DCOLON 283
-#define LPAREN 284
-#define RPAREN 285
-#define UNTERMINATED_STRING 286
-#define STRING 287
-#define WORD 288
-#define CPP_INCLUDE_ANGLE 289
-#define END 290
-#define INCLUDE 291
-#define INTERFACE 292
-#define MODULE 293
-#define SUBMODULE 294
-#define USE 295
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 73 "cmFortranParser.y"
+#line 71 "cmFortranParser.y"
 
   char* string;
 
-#line 141 "cmFortranParserTokens.h"
+#line 108 "cmFortranParserTokens.h"
 
 };
 typedef union YYSTYPE YYSTYPE;

Tests/RunCMake/Syntax/NameWithSpaces-stderr.txt

@@ -7,6 +7,6 @@
 
     \${var
 
-  syntax error, unexpected \$end, expecting } \(6\)
+  syntax error, unexpected end of file, expecting } \(6\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)$

Tests/RunCMake/Syntax/NameWithTabs-stderr.txt

@@ -7,6 +7,6 @@
 
     \${var
 
-  syntax error, unexpected \$end, expecting } \(6\)
+  syntax error, unexpected end of file, expecting } \(6\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)$

Tests/RunCMake/Syntax/ParenInENV-stderr.txt

@@ -9,12 +9,12 @@ This warning is for project developers.  Use -Wno-dev to suppress it.
 CMake Error at ParenInENV.cmake:2 \(message\):
   Syntax error in cmake code at
 
-    .*Tests/RunCMake/Syntax/ParenInENV.cmake:2
+    .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2
 
   when parsing string
 
     -->\$ENV{e
 
-  syntax error, unexpected \$end, expecting } \(10\)
+  syntax error, unexpected end of file, expecting } \(10\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

Tests/RunCMake/Syntax/UnterminatedBrace0-stderr.txt

@@ -7,6 +7,6 @@ CMake Error at UnterminatedBrace0.cmake:2 \(set\):
 
     \${
 
-  syntax error, unexpected \$end, expecting } \(3\)
+  syntax error, unexpected end of file, expecting } \(3\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

Tests/RunCMake/Syntax/UnterminatedBrace1-stderr.txt

@@ -7,7 +7,7 @@ CMake Warning \(dev\) at UnterminatedBrace1.cmake:3 \(set\):
 
     \${
 
-  syntax error, unexpected \$end, expecting } \(3\)
+  syntax error, unexpected end of file, expecting } \(3\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 This warning is for project developers.  Use -Wno-dev to suppress it.

Tests/RunCMake/math/MATH-InvalidExpression-stderr.txt

@@ -1,5 +1,5 @@
 ^CMake Error at MATH-InvalidExpression.cmake:1 \(math\):
-  math cannot parse the expression: "INVALID": syntax error, unexpected \$end
-  \(7\).
+  math cannot parse the expression: "INVALID": syntax error, unexpected end
+  of file \(7\).
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)$