diff --git a/dtool/src/cppparser/cppBison.cxx.prebuilt b/dtool/src/cppparser/cppBison.cxx.prebuilt
index 4bff774461..be3f2b4e95 100644
--- a/dtool/src/cppparser/cppBison.cxx.prebuilt
+++ b/dtool/src/cppparser/cppBison.cxx.prebuilt
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.0.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
    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
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.0.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -104,15 +104,15 @@ using std::string;
 // Defining the interface to the parser.
 ////////////////////////////////////////////////////////////////////
 
-CPPScope *current_scope = NULL;
-CPPScope *global_scope = NULL;
-CPPPreprocessor *current_lexer = NULL;
+CPPScope *current_scope = nullptr;
+CPPScope *global_scope = nullptr;
+CPPPreprocessor *current_lexer = nullptr;
 
-static CPPStructType *current_struct = NULL;
-static CPPEnumType *current_enum = NULL;
+static CPPStructType *current_struct = nullptr;
+static CPPEnumType *current_enum = nullptr;
 static int current_storage_class = 0;
-static CPPType *current_type = NULL;
-static CPPExpression *current_expr = NULL;
+static CPPType *current_type = nullptr;
+static CPPExpression *current_expr = nullptr;
 static int publish_nest_level = 0;
 static CPPVisibility publish_previous;
 static YYLTYPE publish_loc;
@@ -186,7 +186,7 @@ parse_const_expr(CPPPreprocessor *pp, CPPScope *new_current_scope,
 
   current_scope = new_current_scope;
   global_scope = new_global_scope;
-  current_expr = (CPPExpression *)NULL;
+  current_expr = nullptr;
   current_lexer = pp;
   yyparse();
 
@@ -210,7 +210,7 @@ parse_type(CPPPreprocessor *pp, CPPScope *new_current_scope,
 
   current_scope = new_current_scope;
   global_scope = new_global_scope;
-  current_type = (CPPType *)NULL;
+  current_type = nullptr;
   current_lexer = pp;
   yyparse();
 
@@ -227,7 +227,7 @@ parse_type(CPPPreprocessor *pp, CPPScope *new_current_scope,
 static void
 push_scope(CPPScope *new_scope) {
   last_scopes.push_back(current_scope);
-  if (new_scope != NULL) {
+  if (new_scope != nullptr) {
     current_scope = new_scope;
   }
 }
@@ -266,7 +266,7 @@ pop_struct() {
 }
 
 
-#line 268 "built/tmp/cppBison.yxx.c" /* yacc.c:339  */
+#line 270 "built/tmp/cppBison.yxx.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -617,7 +617,7 @@ int cppyyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 619 "built/tmp/cppBison.yxx.c" /* yacc.c:358  */
+#line 621 "built/tmp/cppBison.yxx.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -931,83 +931,83 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   450,   450,   451,   455,   462,   463,   464,   468,   469,
-     473,   477,   481,   494,   493,   505,   506,   507,   508,   509,
-     510,   511,   524,   533,   537,   545,   549,   553,   574,   601,
-     622,   651,   687,   730,   742,   763,   799,   833,   855,   891,
-     913,   924,   938,   937,   952,   956,   961,   965,   976,   980,
-     984,   988,   992,   996,  1000,  1004,  1008,  1012,  1016,  1020,
-    1025,  1029,  1036,  1037,  1041,  1042,  1043,  1048,  1047,  1063,
-    1073,  1072,  1089,  1097,  1105,  1116,  1132,  1131,  1146,  1161,
-    1170,  1185,  1184,  1209,  1208,  1236,  1235,  1266,  1265,  1284,
-    1283,  1304,  1303,  1335,  1334,  1360,  1373,  1377,  1381,  1385,
-    1398,  1402,  1406,  1410,  1414,  1419,  1424,  1428,  1432,  1436,
-    1443,  1447,  1451,  1455,  1459,  1463,  1467,  1471,  1475,  1479,
-    1483,  1487,  1491,  1495,  1499,  1503,  1507,  1511,  1515,  1519,
-    1523,  1527,  1531,  1535,  1539,  1543,  1547,  1551,  1555,  1559,
-    1563,  1567,  1571,  1575,  1579,  1583,  1587,  1591,  1595,  1602,
-    1603,  1604,  1608,  1610,  1609,  1617,  1618,  1622,  1623,  1627,
-    1633,  1642,  1643,  1647,  1651,  1655,  1659,  1665,  1671,  1677,
-    1684,  1689,  1698,  1702,  1707,  1715,  1727,  1731,  1745,  1760,
-    1765,  1770,  1775,  1780,  1785,  1790,  1795,  1801,  1800,  1831,
-    1841,  1851,  1855,  1859,  1868,  1872,  1880,  1884,  1889,  1893,
-    1898,  1906,  1911,  1919,  1923,  1928,  1932,  1937,  1945,  1950,
-    1958,  1962,  1969,  1973,  1980,  1984,  1988,  1992,  1996,  2003,
-    2007,  2011,  2015,  2019,  2023,  2030,  2031,  2032,  2036,  2039,
-    2040,  2041,  2045,  2050,  2056,  2062,  2067,  2073,  2079,  2083,
-    2094,  2098,  2108,  2112,  2116,  2121,  2126,  2131,  2136,  2141,
-    2146,  2154,  2158,  2162,  2167,  2172,  2177,  2182,  2187,  2192,
-    2197,  2203,  2211,  2216,  2221,  2226,  2231,  2236,  2241,  2246,
-    2251,  2256,  2262,  2270,  2274,  2279,  2284,  2289,  2294,  2299,
-    2304,  2309,  2314,  2322,  2326,  2331,  2336,  2341,  2346,  2351,
-    2356,  2361,  2366,  2371,  2377,  2384,  2391,  2401,  2405,  2413,
-    2417,  2421,  2425,  2429,  2445,  2461,  2470,  2474,  2484,  2491,
-    2502,  2506,  2514,  2518,  2522,  2526,  2530,  2546,  2562,  2580,
-    2589,  2593,  2603,  2610,  2614,  2622,  2626,  2642,  2658,  2667,
-    2677,  2684,  2688,  2696,  2700,  2705,  2709,  2717,  2718,  2719,
-    2720,  2725,  2724,  2749,  2748,  2778,  2779,  2786,  2787,  2791,
-    2792,  2796,  2800,  2804,  2808,  2812,  2816,  2820,  2824,  2828,
-    2832,  2839,  2847,  2851,  2855,  2860,  2868,  2872,  2879,  2880,
-    2885,  2892,  2893,  2898,  2906,  2910,  2914,  2921,  2925,  2929,
-    2937,  2936,  2959,  2958,  2981,  2982,  2986,  2992,  2999,  3008,
-    3009,  3010,  3014,  3018,  3022,  3026,  3030,  3034,  3039,  3044,
-    3049,  3054,  3058,  3063,  3072,  3077,  3085,  3089,  3093,  3101,
-    3111,  3111,  3121,  3122,  3126,  3127,  3128,  3129,  3130,  3131,
-    3132,  3133,  3134,  3135,  3136,  3137,  3137,  3137,  3138,  3138,
-    3138,  3138,  3139,  3139,  3139,  3139,  3139,  3140,  3140,  3140,
-    3141,  3141,  3141,  3141,  3141,  3142,  3142,  3142,  3142,  3142,
-    3143,  3143,  3144,  3144,  3144,  3144,  3144,  3145,  3145,  3145,
-    3145,  3145,  3146,  3146,  3146,  3146,  3147,  3147,  3147,  3147,
-    3147,  3148,  3148,  3148,  3148,  3148,  3149,  3149,  3149,  3149,
-    3149,  3149,  3150,  3150,  3150,  3150,  3150,  3151,  3151,  3151,
-    3151,  3152,  3152,  3152,  3152,  3153,  3153,  3153,  3153,  3153,
-    3154,  3154,  3154,  3154,  3155,  3155,  3155,  3155,  3155,  3156,
-    3156,  3156,  3156,  3157,  3157,  3157,  3157,  3157,  3158,  3158,
-    3161,  3161,  3161,  3161,  3161,  3161,  3161,  3161,  3161,  3161,
-    3161,  3162,  3162,  3162,  3162,  3162,  3162,  3162,  3162,  3162,
-    3162,  3163,  3163,  3167,  3171,  3178,  3182,  3189,  3193,  3200,
-    3204,  3208,  3212,  3216,  3220,  3224,  3228,  3240,  3244,  3248,
-    3252,  3256,  3260,  3264,  3268,  3272,  3276,  3280,  3284,  3288,
-    3292,  3296,  3300,  3304,  3308,  3312,  3316,  3320,  3324,  3328,
-    3332,  3336,  3340,  3344,  3348,  3352,  3356,  3360,  3368,  3372,
-    3376,  3380,  3384,  3388,  3392,  3402,  3412,  3418,  3424,  3430,
-    3436,  3442,  3448,  3455,  3462,  3469,  3476,  3482,  3488,  3492,
-    3504,  3508,  3512,  3516,  3520,  3531,  3542,  3546,  3550,  3554,
-    3558,  3562,  3566,  3570,  3574,  3578,  3582,  3586,  3590,  3594,
-    3598,  3602,  3606,  3610,  3614,  3618,  3622,  3626,  3630,  3634,
-    3638,  3642,  3646,  3650,  3654,  3658,  3662,  3669,  3673,  3677,
-    3681,  3685,  3689,  3693,  3697,  3701,  3707,  3713,  3717,  3723,
-    3730,  3734,  3738,  3742,  3746,  3750,  3754,  3758,  3762,  3766,
-    3770,  3774,  3778,  3782,  3786,  3790,  3794,  3808,  3812,  3816,
-    3820,  3824,  3828,  3832,  3836,  3848,  3852,  3856,  3860,  3864,
-    3875,  3886,  3890,  3894,  3898,  3902,  3906,  3910,  3914,  3918,
-    3922,  3926,  3930,  3934,  3938,  3942,  3946,  3950,  3954,  3958,
-    3962,  3966,  3970,  3974,  3978,  3982,  3986,  3990,  3994,  3998,
-    4002,  4009,  4013,  4017,  4021,  4025,  4029,  4033,  4037,  4041,
-    4047,  4053,  4061,  4065,  4069,  4073,  4080,  4090,  4096,  4102,
-    4112,  4124,  4132,  4136,  4166,  4170,  4174,  4178,  4182,  4186,
-    4192,  4196,  4200,  4204,  4208,  4219,  4223,  4227,  4231,  4239,
-    4243,  4247,  4253,  4264
+       0,   452,   452,   453,   457,   464,   465,   466,   470,   471,
+     475,   479,   483,   496,   495,   507,   508,   509,   510,   511,
+     512,   513,   526,   535,   539,   547,   551,   555,   576,   603,
+     624,   653,   689,   732,   744,   765,   801,   835,   857,   893,
+     915,   926,   940,   939,   954,   958,   963,   967,   978,   982,
+     986,   990,   994,   998,  1002,  1006,  1010,  1014,  1018,  1022,
+    1027,  1031,  1038,  1039,  1043,  1044,  1045,  1050,  1049,  1065,
+    1075,  1074,  1091,  1099,  1107,  1118,  1134,  1133,  1148,  1163,
+    1172,  1187,  1186,  1224,  1223,  1260,  1259,  1290,  1289,  1308,
+    1307,  1328,  1327,  1359,  1358,  1384,  1397,  1401,  1405,  1409,
+    1422,  1426,  1430,  1434,  1438,  1443,  1448,  1452,  1456,  1460,
+    1467,  1471,  1475,  1479,  1483,  1487,  1491,  1495,  1499,  1503,
+    1507,  1511,  1515,  1519,  1523,  1527,  1531,  1535,  1539,  1543,
+    1547,  1551,  1555,  1559,  1563,  1567,  1571,  1575,  1579,  1583,
+    1587,  1591,  1595,  1599,  1603,  1607,  1611,  1615,  1619,  1626,
+    1627,  1628,  1632,  1634,  1633,  1641,  1642,  1646,  1647,  1651,
+    1657,  1666,  1667,  1671,  1675,  1679,  1683,  1689,  1695,  1701,
+    1708,  1713,  1722,  1726,  1731,  1739,  1751,  1755,  1769,  1784,
+    1789,  1794,  1799,  1804,  1809,  1814,  1819,  1825,  1824,  1855,
+    1865,  1875,  1879,  1883,  1892,  1896,  1904,  1908,  1913,  1917,
+    1922,  1930,  1935,  1943,  1947,  1952,  1956,  1961,  1969,  1974,
+    1982,  1986,  1993,  1997,  2004,  2008,  2012,  2016,  2020,  2027,
+    2031,  2035,  2039,  2043,  2047,  2054,  2055,  2056,  2060,  2063,
+    2064,  2065,  2069,  2074,  2080,  2086,  2091,  2097,  2103,  2107,
+    2118,  2122,  2132,  2136,  2140,  2145,  2150,  2155,  2160,  2165,
+    2170,  2178,  2182,  2186,  2191,  2196,  2201,  2206,  2211,  2216,
+    2221,  2227,  2235,  2240,  2245,  2250,  2255,  2260,  2265,  2270,
+    2275,  2280,  2286,  2294,  2298,  2303,  2308,  2313,  2318,  2323,
+    2328,  2333,  2338,  2346,  2350,  2355,  2360,  2365,  2370,  2375,
+    2380,  2385,  2390,  2395,  2401,  2408,  2415,  2425,  2429,  2437,
+    2441,  2445,  2449,  2453,  2469,  2485,  2494,  2498,  2508,  2515,
+    2526,  2530,  2538,  2542,  2546,  2550,  2554,  2570,  2586,  2604,
+    2613,  2617,  2627,  2634,  2638,  2646,  2650,  2666,  2682,  2691,
+    2701,  2708,  2712,  2720,  2724,  2729,  2733,  2741,  2742,  2743,
+    2744,  2749,  2748,  2773,  2772,  2802,  2803,  2810,  2811,  2815,
+    2816,  2820,  2824,  2828,  2832,  2836,  2840,  2844,  2848,  2852,
+    2856,  2863,  2871,  2875,  2879,  2884,  2892,  2896,  2903,  2904,
+    2909,  2916,  2917,  2922,  2930,  2934,  2938,  2945,  2949,  2953,
+    2961,  2960,  2983,  2982,  3005,  3006,  3010,  3016,  3023,  3032,
+    3033,  3034,  3038,  3042,  3046,  3050,  3054,  3058,  3063,  3068,
+    3073,  3078,  3082,  3087,  3096,  3101,  3109,  3113,  3117,  3125,
+    3135,  3135,  3145,  3146,  3150,  3151,  3152,  3153,  3154,  3155,
+    3156,  3157,  3158,  3159,  3160,  3161,  3161,  3161,  3162,  3162,
+    3162,  3162,  3163,  3163,  3163,  3163,  3163,  3164,  3164,  3164,
+    3165,  3165,  3165,  3165,  3165,  3166,  3166,  3166,  3166,  3166,
+    3167,  3167,  3168,  3168,  3168,  3168,  3168,  3169,  3169,  3169,
+    3169,  3169,  3170,  3170,  3170,  3170,  3171,  3171,  3171,  3171,
+    3171,  3172,  3172,  3172,  3172,  3172,  3173,  3173,  3173,  3173,
+    3173,  3173,  3174,  3174,  3174,  3174,  3174,  3175,  3175,  3175,
+    3175,  3176,  3176,  3176,  3176,  3177,  3177,  3177,  3177,  3177,
+    3178,  3178,  3178,  3178,  3179,  3179,  3179,  3179,  3179,  3180,
+    3180,  3180,  3180,  3181,  3181,  3181,  3181,  3181,  3182,  3182,
+    3185,  3185,  3185,  3185,  3185,  3185,  3185,  3185,  3185,  3185,
+    3185,  3186,  3186,  3186,  3186,  3186,  3186,  3186,  3186,  3186,
+    3186,  3187,  3187,  3191,  3195,  3202,  3206,  3213,  3217,  3224,
+    3228,  3232,  3236,  3240,  3244,  3248,  3252,  3264,  3268,  3272,
+    3276,  3280,  3284,  3288,  3292,  3296,  3300,  3304,  3308,  3312,
+    3316,  3320,  3324,  3328,  3332,  3336,  3340,  3344,  3348,  3352,
+    3356,  3360,  3364,  3368,  3372,  3376,  3380,  3384,  3392,  3396,
+    3400,  3404,  3408,  3412,  3416,  3426,  3436,  3442,  3448,  3454,
+    3460,  3466,  3472,  3479,  3486,  3493,  3500,  3506,  3512,  3516,
+    3528,  3532,  3536,  3540,  3544,  3555,  3566,  3570,  3574,  3578,
+    3582,  3586,  3590,  3594,  3598,  3602,  3606,  3610,  3614,  3618,
+    3622,  3626,  3630,  3634,  3638,  3642,  3646,  3650,  3654,  3658,
+    3662,  3666,  3670,  3674,  3678,  3682,  3686,  3693,  3697,  3701,
+    3705,  3709,  3713,  3717,  3721,  3725,  3731,  3737,  3741,  3747,
+    3754,  3758,  3762,  3766,  3770,  3774,  3778,  3782,  3786,  3790,
+    3794,  3798,  3802,  3806,  3810,  3814,  3818,  3832,  3836,  3840,
+    3844,  3848,  3852,  3856,  3860,  3872,  3876,  3880,  3884,  3888,
+    3899,  3910,  3914,  3918,  3922,  3926,  3930,  3934,  3938,  3942,
+    3946,  3950,  3954,  3958,  3962,  3966,  3970,  3974,  3978,  3982,
+    3986,  3990,  3994,  3998,  4002,  4006,  4010,  4014,  4018,  4022,
+    4026,  4033,  4037,  4041,  4045,  4049,  4053,  4057,  4061,  4065,
+    4071,  4077,  4085,  4089,  4093,  4097,  4104,  4114,  4120,  4126,
+    4136,  4148,  4156,  4160,  4190,  4194,  4198,  4202,  4206,  4210,
+    4216,  4220,  4224,  4228,  4232,  4243,  4247,  4251,  4255,  4263,
+    4267,  4271,  4277,  4288
 };
 #endif
 
@@ -3673,6 +3673,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -4014,70 +4015,71 @@ yyreduce:
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-  /* Default location.  */
+  /* Default location. */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+  yyerror_range[1] = yyloc;
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
         case 3:
-#line 452 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 454 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_expr = (yyvsp[0].u.expr);
 }
-#line 4026 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4030 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 4:
-#line 456 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 458 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_type = (yyvsp[0].u.type);
 }
-#line 4034 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4038 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 10:
-#line 474 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 476 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   delete (yyvsp[-1].u.expr);
 }
-#line 4042 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4046 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 11:
-#line 478 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 480 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   delete (yyvsp[-2].u.expr);
 }
-#line 4050 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4054 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 12:
-#line 482 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 484 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   delete (yyvsp[-1].u.expr);
 }
-#line 4058 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4062 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 13:
-#line 494 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 496 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) |
                      ((yyvsp[-1].u.integer) & CPPInstance::SC_c_binding));
 }
-#line 4067 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4071 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 14:
-#line 499 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 501 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_storage_class();
 }
-#line 4075 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4079 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 21:
-#line 512 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 514 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (publish_nest_level != 0) {
     yyerror("Unclosed __begin_publish", publish_loc);
@@ -4090,11 +4092,11 @@ yyreduce:
   publish_nest_level++;
   current_scope->set_current_vis(V_published);
 }
-#line 4092 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4096 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 22:
-#line 525 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 527 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (publish_nest_level != 1) {
     yyerror("Unmatched __end_publish", (yylsp[0]));
@@ -4103,19 +4105,19 @@ yyreduce:
   }
   publish_nest_level = 0;
 }
-#line 4105 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4109 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 23:
-#line 534 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 536 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_scope->set_current_vis(V_published);
 }
-#line 4113 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4117 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 24:
-#line 538 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 540 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (publish_nest_level > 0) {
     current_scope->set_current_vis(V_published);
@@ -4123,27 +4125,27 @@ yyreduce:
     current_scope->set_current_vis(V_public);
   }
 }
-#line 4125 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4129 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 25:
-#line 546 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 548 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_scope->set_current_vis(V_protected);
 }
-#line 4133 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4137 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 26:
-#line 550 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 552 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_scope->set_current_vis(V_private);
 }
-#line 4141 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4145 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 27:
-#line 554 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 556 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-3].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4164,11 +4166,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-7]));
   }
 }
-#line 4166 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4170 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 28:
-#line 575 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 577 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-6].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4195,11 +4197,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-10]));
   }
 }
-#line 4197 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4201 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 29:
-#line 602 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 604 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-4].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4220,11 +4222,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-8]));
   }
 }
-#line 4222 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4226 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 30:
-#line 623 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 625 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-6].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4253,16 +4255,16 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-10]));
   }
 }
-#line 4255 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4259 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 31:
-#line 652 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 654 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-8].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
     yyerror("reference to non-existent or invalid length method: " + (yyvsp[-8].u.identifier)->get_fully_scoped_name(), (yylsp[-8]));
-    length_getter = NULL;
+    length_getter = nullptr;
   }
 
   CPPDeclaration *getter = (yyvsp[-6].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
@@ -4293,16 +4295,16 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-12]));
   }
 }
-#line 4295 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4299 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 32:
-#line 688 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 690 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-10].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
     yyerror("reference to non-existent or invalid length method: " + (yyvsp[-10].u.identifier)->get_fully_scoped_name(), (yylsp[-10]));
-    length_getter = NULL;
+    length_getter = nullptr;
   }
 
   CPPDeclaration *getter = (yyvsp[-8].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
@@ -4340,11 +4342,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-14]));
   }
 }
-#line 4342 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4346 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 33:
-#line 731 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 733 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-2].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4356,11 +4358,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-6]));
   }
 }
-#line 4358 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4362 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 34:
-#line 743 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 745 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-2].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4381,11 +4383,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-8]));
   }
 }
-#line 4383 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4387 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 35:
-#line 764 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 766 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-5].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4421,11 +4423,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-11]));
   }
 }
-#line 4423 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4427 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 36:
-#line 800 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 802 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-4].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4459,11 +4461,11 @@ yyreduce:
     }
   }
 }
-#line 4461 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4465 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 37:
-#line 834 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 836 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-2].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4485,11 +4487,11 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-8]));
   }
 }
-#line 4487 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4491 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 38:
-#line 856 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 858 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *getter = (yyvsp[-6].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
   if (getter == nullptr || getter->get_subtype() != CPPDeclaration::ST_function_group) {
@@ -4525,25 +4527,25 @@ yyreduce:
     current_scope->add_declaration(make_property, global_scope, current_lexer, (yylsp[-12]));
   }
 }
-#line 4527 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4531 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 39:
-#line 892 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 894 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *length_getter = (yyvsp[-4].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (length_getter == (CPPDeclaration *)NULL || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
+  if (length_getter == nullptr || length_getter->get_subtype() != CPPDeclaration::ST_function_group) {
     yyerror("reference to non-existent or invalid length method: " + (yyvsp[-4].u.identifier)->get_fully_scoped_name(), (yylsp[-4]));
-    length_getter = NULL;
+    length_getter = nullptr;
   }
 
   CPPDeclaration *element_getter = (yyvsp[-2].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (element_getter == (CPPDeclaration *)NULL || element_getter->get_subtype() != CPPDeclaration::ST_function_group) {
+  if (element_getter == nullptr || element_getter->get_subtype() != CPPDeclaration::ST_function_group) {
     yyerror("reference to non-existent or invalid element method: " + (yyvsp[-2].u.identifier)->get_fully_scoped_name(), (yylsp[-4]));
-    element_getter = NULL;
+    element_getter = nullptr;
   }
 
-  if (length_getter != (CPPDeclaration *)NULL && element_getter != (CPPDeclaration *)NULL) {
+  if (length_getter != nullptr && element_getter != nullptr) {
     CPPMakeSeq *make_seq = new CPPMakeSeq((yyvsp[-6].u.identifier),
                                           length_getter->as_function_group(),
                                           element_getter->as_function_group(),
@@ -4551,11 +4553,11 @@ yyreduce:
     current_scope->add_declaration(make_seq, global_scope, current_lexer, (yylsp[-8]));
   }
 }
-#line 4553 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4557 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 40:
-#line 914 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 916 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPExpression::Result result = (yyvsp[-4].u.expr)->evaluate();
   if (result._type == CPPExpression::RT_error) {
@@ -4566,11 +4568,11 @@ yyreduce:
     yywarning("static_assert failed: " + str.str(), (yylsp[-4]));
   }
 }
-#line 4568 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4572 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 41:
-#line 925 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 927 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // This alternative version of static_assert was introduced in C++17.
   CPPExpression::Result result = (yyvsp[-2].u.expr)->evaluate();
@@ -4580,55 +4582,55 @@ yyreduce:
     yywarning("static_assert failed", (yylsp[-2]));
   }
 }
-#line 4582 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4586 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 42:
-#line 938 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 940 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("temp"),
                                      V_public);
   push_scope(new_scope);
 }
-#line 4592 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4596 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 43:
-#line 944 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 946 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   delete current_scope;
   pop_scope();
 }
-#line 4601 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4605 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 44:
-#line 953 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 955 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = 0;
 }
-#line 4609 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4613 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 45:
-#line 957 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 959 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // This isn't really a storage class, but it helps with parsing.
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_const;
 }
-#line 4618 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4622 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 46:
-#line 962 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 964 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_extern;
 }
-#line 4626 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4630 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 47:
-#line 966 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 968 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_extern;
   if ((yyvsp[-1].str) == "C") {
@@ -4639,124 +4641,124 @@ yyreduce:
     yywarning("Ignoring unknown linkage type \"" + (yyvsp[-1].str) + "\"", (yylsp[-1]));
   }
 }
-#line 4641 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4645 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 48:
-#line 977 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 979 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_static;
 }
-#line 4649 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4653 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 49:
-#line 981 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 983 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_inline;
 }
-#line 4657 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4661 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 50:
-#line 985 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 987 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_virtual;
 }
-#line 4665 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4669 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 51:
-#line 989 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 991 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_explicit;
 }
-#line 4673 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4677 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 52:
-#line 993 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 995 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_register;
 }
-#line 4681 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4685 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 53:
-#line 997 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 999 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_volatile;
 }
-#line 4689 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4693 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 54:
-#line 1001 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1003 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_mutable;
 }
-#line 4697 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4701 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 55:
-#line 1005 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1007 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_constexpr;
 }
-#line 4705 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4709 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 56:
-#line 1009 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1011 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_blocking;
 }
-#line 4713 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4717 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 57:
-#line 1013 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1015 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_extension;
 }
-#line 4721 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4725 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 58:
-#line 1017 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1019 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer) | (int)CPPInstance::SC_thread_local;
 }
-#line 4729 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4733 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 59:
-#line 1021 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1023 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Ignore attribute specifiers for now.
   (yyval.u.integer) = (yyvsp[0].u.integer);
 }
-#line 4738 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4742 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 60:
-#line 1026 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1028 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer);
 }
-#line 4746 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4750 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 61:
-#line 1030 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1032 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[0].u.integer);
 }
-#line 4754 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4758 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 67:
-#line 1048 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1050 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // We don't need to push/pop type, because we can't nest
   // type_like_declaration.
@@ -4767,19 +4769,19 @@ yyreduce:
   }
   push_storage_class((yyvsp[-1].u.integer));
 }
-#line 4769 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4773 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 68:
-#line 1059 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1061 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_storage_class();
 }
-#line 4777 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4781 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 69:
-#line 1064 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1066 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // We don't really care about the storage class here.  In fact, it's
   // not actually legal to define a class or struct using a particular
@@ -4788,48 +4790,48 @@ yyreduce:
 
   current_scope->add_declaration((yyvsp[-1].u.decl), global_scope, current_lexer, (yylsp[-1]));
 }
-#line 4790 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4794 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 70:
-#line 1073 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1075 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[0].u.instance) != (CPPInstance *)NULL) {
+  if ((yyvsp[0].u.instance) != nullptr) {
     // Push the scope so that the initializers can make use of things defined
     // in the class body.
     push_scope((yyvsp[0].u.instance)->get_scope(current_scope, global_scope));
     (yyvsp[0].u.instance)->_storage_class |= (current_storage_class | (yyvsp[-1].u.integer));
   }
 }
-#line 4803 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4807 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 71:
-#line 1082 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1084 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-2].u.instance) != (CPPInstance *)NULL) {
+  if ((yyvsp[-2].u.instance) != nullptr) {
     pop_scope();
     current_scope->add_declaration((yyvsp[-2].u.instance), global_scope, current_lexer, (yylsp[-2]));
     (yyvsp[-2].u.instance)->set_initializer((yyvsp[0].u.expr));
   }
 }
-#line 4815 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4819 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 72:
-#line 1090 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1092 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-1].u.instance) != (CPPInstance *)NULL) {
+  if ((yyvsp[-1].u.instance) != nullptr) {
     (yyvsp[-1].u.instance)->_storage_class |= (current_storage_class | (yyvsp[-2].u.integer));
     current_scope->add_declaration((yyvsp[-1].u.instance), global_scope, current_lexer, (yylsp[-1]));
     (yyvsp[-1].u.instance)->set_initializer((yyvsp[0].u.expr));
   }
 }
-#line 4827 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4831 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 74:
-#line 1106 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1108 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (current_storage_class & CPPInstance::SC_const) {
     (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
@@ -4840,11 +4842,11 @@ yyreduce:
   inst->set_initializer((yyvsp[0].u.expr));
   current_scope->add_declaration(inst, global_scope, current_lexer, (yylsp[-1]));
 }
-#line 4842 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4846 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 75:
-#line 1117 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1119 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (current_storage_class & CPPInstance::SC_const) {
     (yyvsp[-3].u.inst_ident)->add_modifier(IIT_const);
@@ -4855,11 +4857,11 @@ yyreduce:
   inst->set_initializer((yyvsp[-2].u.expr));
   current_scope->add_declaration(inst, global_scope, current_lexer, (yylsp[-3]));
 }
-#line 4857 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4861 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 76:
-#line 1132 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1134 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // We don't need to push/pop type, because we can't nest
   // multiple_var_declarations.
@@ -4870,23 +4872,23 @@ yyreduce:
   }
   push_storage_class((yyvsp[-1].u.integer));
 }
-#line 4872 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4876 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 77:
-#line 1143 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1145 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_storage_class();
 }
-#line 4880 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4884 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 78:
-#line 1147 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1149 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-1].u.instance) != (CPPDeclaration *)NULL) {
+  if ((yyvsp[-1].u.instance) != nullptr) {
     CPPInstance *inst = (yyvsp[-1].u.instance)->as_instance();
-    if (inst != (CPPInstance *)NULL) {
+    if (inst != nullptr) {
       inst->_storage_class |= (current_storage_class | (yyvsp[-2].u.integer));
       current_scope->add_declaration(inst, global_scope, current_lexer, (yylsp[-1]));
       CPPTypedefType *typedef_type = new CPPTypedefType(inst->_type, inst->_ident, current_scope);
@@ -4894,11 +4896,11 @@ yyreduce:
     }
   }
 }
-#line 4896 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4900 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 79:
-#line 1162 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1164 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (current_storage_class & CPPInstance::SC_const) {
     (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
@@ -4907,11 +4909,11 @@ yyreduce:
   CPPTypedefType *typedef_type = new CPPTypedefType(target_type, (yyvsp[-1].u.inst_ident), current_scope, (yylsp[-1]).file);
   current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, (yylsp[-1]));
 }
-#line 4909 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4913 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 80:
-#line 1171 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1173 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   if (current_storage_class & CPPInstance::SC_const) {
     (yyvsp[-3].u.inst_ident)->add_modifier(IIT_const);
@@ -4920,24 +4922,37 @@ yyreduce:
   CPPTypedefType *typedef_type = new CPPTypedefType(target_type, (yyvsp[-3].u.inst_ident), current_scope, (yylsp[-3]).file);
   current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, (yylsp[-3]));
 }
-#line 4922 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4926 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 81:
-#line 1185 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1187 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  push_scope((yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope));
+  // Create a scope for this function.
+  CPPScope *scope = new CPPScope((yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope),
+                                 (yyvsp[-1].u.identifier)->_names.back(), V_private);
+
+  // It still needs to be able to pick up any template arguments, if this is
+  // a definition for a method template.  Add a fake "using" declaration to
+  // accomplish this.
+  scope->_using.insert(current_scope);
+
+  push_scope(scope);
 }
-#line 4930 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4943 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 82:
-#line 1189 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1200 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
+  CPPScope *scope = (yyvsp[-5].u.identifier)->get_scope(current_scope, global_scope);
   CPPType *type;
-  if ((yyvsp[-5].u.identifier)->get_simple_name() == current_scope->get_simple_name() ||
-      (yyvsp[-5].u.identifier)->get_simple_name() == string("~") + current_scope->get_simple_name()) {
-    // This is a constructor, and has no return.
+  std::string simple_name = (yyvsp[-5].u.identifier)->get_simple_name();
+  if (!simple_name.empty() && simple_name[0] == '~') {
+    // A destructor has no return type.
+    type = new CPPSimpleType(CPPSimpleType::T_void);
+  } else if (scope != nullptr && simple_name == scope->get_simple_name()) {
+    // Neither does a constructor.
     type = new CPPSimpleType(CPPSimpleType::T_void);
   } else {
     // This isn't a constructor, so it has an implicit return type of
@@ -4952,19 +4967,28 @@ yyreduce:
 
   (yyval.u.instance) = new CPPInstance(type, ii, 0, (yylsp[-5]).file);
 }
-#line 4954 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4971 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 83:
-#line 1209 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1224 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  push_scope((yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope));
+  // Create a scope for this function.
+  CPPScope *scope = new CPPScope((yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope),
+                                 (yyvsp[-1].u.identifier)->_names.back(), V_private);
+
+  // It still needs to be able to pick up any template arguments, if this is
+  // a definition for a method template.  Add a fake "using" declaration to
+  // accomplish this.
+  scope->_using.insert(current_scope);
+
+  push_scope(scope);
 }
-#line 4962 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 4988 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 84:
-#line 1213 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1237 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
   CPPType *type;
@@ -4982,19 +5006,19 @@ yyreduce:
 
   (yyval.u.instance) = new CPPInstance(type, ii, 0, (yylsp[-5]).file);
 }
-#line 4984 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5010 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 85:
-#line 1236 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1260 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   push_scope((yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope));
 }
-#line 4992 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5018 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 86:
-#line 1240 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1264 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
   if ((yyvsp[-5].u.identifier)->is_scoped()) {
@@ -5013,75 +5037,75 @@ yyreduce:
     (yyval.u.instance) = new CPPInstance(type, ii, 0, (yylsp[-5]).file);
   }
 }
-#line 5015 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5041 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 87:
-#line 1266 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1290 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   push_scope((yyvsp[-2].u.inst_ident)->get_scope(current_scope, global_scope));
 }
-#line 5023 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5049 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 88:
-#line 1270 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1294 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
   CPPType *type = (yyvsp[-10].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type == NULL) {
+  if (type == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[-10].u.identifier)->get_fully_scoped_name(), (yylsp[-10]));
   }
-  assert(type != NULL);
+  assert(type != nullptr);
 
   CPPInstanceIdentifier *ii = (yyvsp[-7].u.inst_ident);
   ii->add_modifier(IIT_pointer);
   ii->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer));
   (yyval.u.instance) = new CPPInstance(type, ii, 0, (yylsp[-10]).file);
 }
-#line 5041 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5067 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 89:
-#line 1284 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1308 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   push_scope((yyvsp[-2].u.inst_ident)->get_scope(current_scope, global_scope));
 }
-#line 5049 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5075 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 90:
-#line 1288 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1312 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
   CPPType *type = (yyvsp[-11].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type == NULL) {
+  if (type == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[-11].u.identifier)->get_fully_scoped_name(), (yylsp[-11]));
   }
-  assert(type != NULL);
+  assert(type != nullptr);
 
   CPPInstanceIdentifier *ii = (yyvsp[-7].u.inst_ident);
   ii->add_scoped_pointer_modifier((yyvsp[-9].u.identifier));
   ii->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer));
   (yyval.u.instance) = new CPPInstance(type, ii, 0, (yylsp[-11]).file);
 }
-#line 5067 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5093 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 91:
-#line 1304 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1328 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-3].u.identifier) != NULL) {
+  if ((yyvsp[-3].u.identifier) != nullptr) {
     push_scope((yyvsp[-3].u.identifier)->get_scope(current_scope, global_scope));
   }
 }
-#line 5077 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5103 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 92:
-#line 1310 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1334 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-7].u.identifier) != NULL) {
+  if ((yyvsp[-7].u.identifier) != nullptr) {
     pop_scope();
   }
 
@@ -5096,7 +5120,7 @@ yyreduce:
   // the method's return type to determine the full type description.
   string name = "operator typecast " + (yyvsp[-6].u.type)->get_simple_name();
   CPPIdentifier *ident = (yyvsp[-7].u.identifier);
-  if (ident == NULL) {
+  if (ident == nullptr) {
     ident = new CPPIdentifier(name, (yylsp[-6]));
   } else {
     ident->add_name(name);
@@ -5104,28 +5128,28 @@ yyreduce:
   (yyval.u.instance) = CPPInstance::make_typecast_function
     (new CPPInstance((yyvsp[-6].u.type), (yyvsp[-5].u.inst_ident), 0, (yylsp[-5]).file), ident, (yyvsp[-2].u.param_list), (yyvsp[0].u.integer));
 }
-#line 5106 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5132 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 93:
-#line 1335 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1359 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-4].u.identifier) != NULL) {
+  if ((yyvsp[-4].u.identifier) != nullptr) {
     push_scope((yyvsp[-4].u.identifier)->get_scope(current_scope, global_scope));
   }
 }
-#line 5116 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5142 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 94:
-#line 1341 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1365 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  if ((yyvsp[-8].u.identifier) != NULL) {
+  if ((yyvsp[-8].u.identifier) != nullptr) {
     pop_scope();
   }
 
   CPPIdentifier *ident = (yyvsp[-8].u.identifier);
-  if (ident == NULL) {
+  if (ident == nullptr) {
     ident = new CPPIdentifier("operator typecast", (yylsp[-5]));
   } else {
     ident->add_name("operator typecast");
@@ -5134,626 +5158,626 @@ yyreduce:
   (yyval.u.instance) = CPPInstance::make_typecast_function
     (new CPPInstance((yyvsp[-6].u.type), (yyvsp[-5].u.inst_ident), 0, (yylsp[-5]).file), ident, (yyvsp[-2].u.param_list), (yyvsp[0].u.integer));
 }
-#line 5136 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5162 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 95:
-#line 1361 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1385 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *decl =
     (yyvsp[0].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (decl != (CPPDeclaration *)NULL) {
+  if (decl != nullptr) {
     (yyval.u.instance) = decl->as_instance();
   } else {
-    (yyval.u.instance) = (CPPInstance *)NULL;
+    (yyval.u.instance) = nullptr;
   }
 }
-#line 5150 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5176 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 96:
-#line 1374 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1398 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = 0;
 }
-#line 5158 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5184 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 97:
-#line 1378 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1402 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_const_method;
 }
-#line 5166 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5192 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 98:
-#line 1382 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1406 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_volatile_method;
 }
-#line 5174 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5200 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 99:
-#line 1386 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1410 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_noexcept;
 }
-#line 5182 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5208 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 100:
-#line 1399 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1423 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_final;
 }
-#line 5190 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5216 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 101:
-#line 1403 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1427 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_override;
 }
-#line 5198 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5224 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 102:
-#line 1407 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1431 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_lvalue_method;
 }
-#line 5206 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5232 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 103:
-#line 1411 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1435 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-1].u.integer) | (int)CPPFunctionType::F_rvalue_method;
 }
-#line 5214 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5240 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 104:
-#line 1415 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1439 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Used for lambdas, currently ignored.
   (yyval.u.integer) = (yyvsp[-1].u.integer);
 }
-#line 5223 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5249 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 105:
-#line 1420 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1444 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Used for lambdas in C++17, currently ignored.
   (yyval.u.integer) = (yyvsp[-1].u.integer);
 }
-#line 5232 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5258 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 106:
-#line 1425 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1449 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-3].u.integer);
 }
-#line 5240 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5266 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 107:
-#line 1429 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1453 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-4].u.integer);
 }
-#line 5248 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5274 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 108:
-#line 1433 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1457 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-5].u.integer);
 }
-#line 5256 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5282 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 109:
-#line 1437 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1461 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.integer) = (yyvsp[-3].u.integer);
 }
-#line 5264 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5290 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 110:
-#line 1444 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1468 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "!";
 }
-#line 5272 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5298 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 111:
-#line 1448 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1472 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "~";
 }
-#line 5280 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5306 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 112:
-#line 1452 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1476 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "*";
 }
-#line 5288 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5314 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 113:
-#line 1456 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1480 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "/";
 }
-#line 5296 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5322 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 114:
-#line 1460 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1484 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "%";
 }
-#line 5304 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5330 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 115:
-#line 1464 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1488 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "+";
 }
-#line 5312 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5338 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 116:
-#line 1468 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1492 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "-";
 }
-#line 5320 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5346 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 117:
-#line 1472 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1496 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "|";
 }
-#line 5328 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5354 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 118:
-#line 1476 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1500 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "&";
 }
-#line 5336 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5362 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 119:
-#line 1480 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1504 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "^";
 }
-#line 5344 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5370 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 120:
-#line 1484 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1508 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "||";
 }
-#line 5352 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5378 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 121:
-#line 1488 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1512 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "&&";
 }
-#line 5360 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5386 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 122:
-#line 1492 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1516 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "==";
 }
-#line 5368 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5394 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 123:
-#line 1496 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1520 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "!=";
 }
-#line 5376 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5402 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 124:
-#line 1500 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1524 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "<=";
 }
-#line 5384 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5410 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 125:
-#line 1504 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1528 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = ">=";
 }
-#line 5392 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5418 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 126:
-#line 1508 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1532 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "<";
 }
-#line 5400 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5426 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 127:
-#line 1512 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1536 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = ">";
 }
-#line 5408 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5434 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 128:
-#line 1516 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1540 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "<<";
 }
-#line 5416 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5442 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 129:
-#line 1520 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1544 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = ">>";
 }
-#line 5424 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5450 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 130:
-#line 1524 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1548 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "=";
 }
-#line 5432 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5458 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 131:
-#line 1528 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1552 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = ",";
 }
-#line 5440 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5466 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 132:
-#line 1532 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1556 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "++";
 }
-#line 5448 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5474 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 133:
-#line 1536 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1560 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "--";
 }
-#line 5456 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5482 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 134:
-#line 1540 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1564 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "*=";
 }
-#line 5464 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5490 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 135:
-#line 1544 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1568 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "/=";
 }
-#line 5472 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5498 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 136:
-#line 1548 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1572 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "%=";
 }
-#line 5480 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5506 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 137:
-#line 1552 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1576 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "+=";
 }
-#line 5488 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5514 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 138:
-#line 1556 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1580 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "-=";
 }
-#line 5496 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5522 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 139:
-#line 1560 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1584 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "|=";
 }
-#line 5504 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5530 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 140:
-#line 1564 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1588 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "&=";
 }
-#line 5512 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5538 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 141:
-#line 1568 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1592 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "^=";
 }
-#line 5520 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5546 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 142:
-#line 1572 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1596 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "<<=";
 }
-#line 5528 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5554 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 143:
-#line 1576 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1600 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = ">>=";
 }
-#line 5536 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5562 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 144:
-#line 1580 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1604 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "->";
 }
-#line 5544 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5570 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 145:
-#line 1584 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1608 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "[]";
 }
-#line 5552 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5578 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 146:
-#line 1588 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1612 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "()";
 }
-#line 5560 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5586 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 147:
-#line 1592 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1616 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "new";
 }
-#line 5568 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5594 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 148:
-#line 1596 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1620 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.str) = "delete";
 }
-#line 5576 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5602 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 153:
-#line 1610 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1634 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   push_scope(new CPPTemplateScope(current_scope));
 }
-#line 5584 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5610 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 154:
-#line 1614 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1638 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
 }
-#line 5592 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5618 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 159:
-#line 1628 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1652 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPTemplateScope *ts = current_scope->as_template_scope();
-  assert(ts != NULL);
+  assert(ts != nullptr);
   ts->add_template_parameter((yyvsp[0].u.decl));
 }
-#line 5602 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5628 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 160:
-#line 1634 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1658 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPTemplateScope *ts = current_scope->as_template_scope();
-  assert(ts != NULL);
+  assert(ts != nullptr);
   ts->add_template_parameter((yyvsp[0].u.decl));
 }
-#line 5612 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5638 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 163:
-#line 1648 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1672 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((CPPIdentifier *)NULL));
+  (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter(nullptr));
 }
-#line 5620 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5646 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 164:
-#line 1652 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1676 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[0].u.identifier)));
 }
-#line 5628 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5654 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 165:
-#line 1656 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1680 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[-2].u.identifier), (yyvsp[0].u.type)));
 }
-#line 5636 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5662 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 166:
-#line 1660 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1684 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  CPPClassTemplateParameter *ctp = new CPPClassTemplateParameter((CPPIdentifier *)NULL);
+  CPPClassTemplateParameter *ctp = new CPPClassTemplateParameter(nullptr);
   ctp->_packed = true;
   (yyval.u.decl) = CPPType::new_type(ctp);
 }
-#line 5646 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5672 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 167:
-#line 1666 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1690 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPClassTemplateParameter *ctp = new CPPClassTemplateParameter((yyvsp[0].u.identifier));
   ctp->_packed = true;
   (yyval.u.decl) = CPPType::new_type(ctp);
 }
-#line 5656 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5682 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 168:
-#line 1672 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1696 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPInstance *inst = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   inst->set_initializer((yyvsp[0].u.expr));
   (yyval.u.decl) = inst;
 }
-#line 5666 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5692 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 169:
-#line 1678 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1702 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   inst->set_initializer((yyvsp[0].u.expr));
   (yyval.u.decl) = inst;
 }
-#line 5677 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5703 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 170:
-#line 1685 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1709 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPInstance *inst = new CPPInstance((yyvsp[-1].u.type), (yyvsp[0].u.inst_ident), 0, (yylsp[0]).file);
   (yyval.u.decl) = inst;
 }
-#line 5686 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5712 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 171:
-#line 1690 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1714 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[0].u.inst_ident)->add_modifier(IIT_const);
   CPPInstance *inst = new CPPInstance((yyvsp[-1].u.type), (yyvsp[0].u.inst_ident), 0, (yylsp[0]).file);
   (yyval.u.decl) = inst;
 }
-#line 5696 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5722 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 172:
-#line 1699 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1723 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.simple_type));
 }
-#line 5704 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5730 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 173:
-#line 1703 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1727 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   yywarning("Not a type: " + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown));
 }
-#line 5713 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5739 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 174:
-#line 1708 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1732 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.type) == NULL) {
+  if ((yyval.u.type) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.type) != NULL);
+  assert((yyval.u.type) != nullptr);
 }
-#line 5725 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5751 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 175:
-#line 1716 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1740 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.type) == NULL) {
+  if ((yyval.u.type) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.type) != NULL);
+  assert((yyval.u.type) != nullptr);
 }
-#line 5737 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5763 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 176:
-#line 1728 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1752 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
 }
-#line 5745 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5771 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 177:
-#line 1732 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1756 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // For an operator function.  We implement this simply by building a
   // ficticious name for the function; in other respects it's just
   // like a regular function.
   CPPIdentifier *ident = (yyvsp[-1].u.identifier);
-  if (ident == NULL) {
+  if (ident == nullptr) {
     ident = new CPPIdentifier("operator "+(yyvsp[0].str), (yylsp[0]));
   } else {
     ident->_names.push_back("operator "+(yyvsp[0].str));
@@ -5761,18 +5785,18 @@ yyreduce:
 
   (yyval.u.inst_ident) = new CPPInstanceIdentifier(ident);
 }
-#line 5763 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5789 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 178:
-#line 1746 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1770 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A C++11 literal operator.
   if (!(yyvsp[-1].str).empty()) {
     yyerror("expected empty string", (yylsp[-1]));
   }
   CPPIdentifier *ident = (yyvsp[-2].u.identifier);
-  if (ident == NULL) {
+  if (ident == nullptr) {
     ident = new CPPIdentifier("operator \"\" "+(yyvsp[0].u.identifier)->get_simple_name(), (yylsp[0]));
   } else {
     ident->_names.push_back("operator \"\" "+(yyvsp[0].u.identifier)->get_simple_name());
@@ -5780,83 +5804,83 @@ yyreduce:
 
   (yyval.u.inst_ident) = new CPPInstanceIdentifier(ident);
 }
-#line 5782 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5808 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 179:
-#line 1761 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1785 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 5791 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5817 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 180:
-#line 1766 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1790 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 5800 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5826 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 181:
-#line 1771 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1795 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 5809 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5835 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 182:
-#line 1776 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1800 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 5818 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5844 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 183:
-#line 1781 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1805 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 5827 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5853 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 184:
-#line 1786 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1810 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 5836 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5862 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 185:
-#line 1791 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1815 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 5845 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5871 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 186:
-#line 1796 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1820 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-1].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
 }
-#line 5854 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5880 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 187:
-#line 1801 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1825 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Create a scope for this function (in case it is a function)
   CPPScope *scope = new CPPScope((yyvsp[-1].u.inst_ident)->get_scope(current_scope, global_scope),
@@ -5869,11 +5893,11 @@ yyreduce:
 
   push_scope(scope);
 }
-#line 5871 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5897 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 188:
-#line 1814 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1838 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
   (yyval.u.inst_ident) = (yyvsp[-5].u.inst_ident);
@@ -5887,1410 +5911,1410 @@ yyreduce:
     (yyval.u.inst_ident)->add_func_modifier((yyvsp[-2].u.param_list), (yyvsp[0].u.integer));
   }
 }
-#line 5889 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5915 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 189:
-#line 1832 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1856 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // This is handled a bit awkwardly right now.  Ideally it'd be wrapped
   // up in the instance_identifier rule, but then more needs to happen in
   // order to avoid shift/reduce conflicts.
-  if ((yyvsp[0].u.type) != NULL) {
+  if ((yyvsp[0].u.type) != nullptr) {
     (yyvsp[-1].u.inst_ident)->add_trailing_return_type((yyvsp[0].u.type));
   }
   (yyval.u.inst_ident) = (yyvsp[-1].u.inst_ident);
 }
-#line 5903 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5929 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 190:
-#line 1842 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1866 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Bitfield definition.
   (yyvsp[-2].u.inst_ident)->_bit_width = (yyvsp[0].u.integer);
   (yyval.u.inst_ident) = (yyvsp[-2].u.inst_ident);
 }
-#line 5913 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5939 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 191:
-#line 1852 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1876 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.type) = NULL;
+  (yyval.u.type) = nullptr;
 }
-#line 5921 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5947 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 192:
-#line 1856 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1880 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 5929 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5955 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 193:
-#line 1860 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1884 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[0].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 5938 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5964 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 194:
-#line 1869 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1893 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.identifier) = NULL;
+  (yyval.u.identifier) = nullptr;
 }
-#line 5946 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5972 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 195:
-#line 1873 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1897 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 5954 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5980 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 196:
-#line 1881 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1905 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
 }
-#line 5962 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5988 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 197:
-#line 1885 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1909 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 5971 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 5997 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 198:
-#line 1890 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1914 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[0].u.param_list);
 }
-#line 5979 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6005 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 199:
-#line 1894 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1918 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-2].u.param_list);
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 5988 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6014 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 200:
-#line 1899 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1923 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-1].u.param_list);
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 5997 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6023 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 201:
-#line 1907 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1931 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_parameters.push_back((yyvsp[0].u.instance));
 }
-#line 6006 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6032 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 202:
-#line 1912 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1936 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-2].u.param_list);
   (yyval.u.param_list)->_parameters.push_back((yyvsp[0].u.instance));
 }
-#line 6015 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6041 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 203:
-#line 1920 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1944 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
 }
-#line 6023 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6049 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 204:
-#line 1924 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1948 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 6032 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6058 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 205:
-#line 1929 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1953 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[0].u.param_list);
 }
-#line 6040 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6066 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 206:
-#line 1933 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1957 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-2].u.param_list);
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 6049 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6075 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 207:
-#line 1938 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1962 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-1].u.param_list);
   (yyval.u.param_list)->_includes_ellipsis = true;
 }
-#line 6058 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6084 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 208:
-#line 1946 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1970 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = new CPPParameterList;
   (yyval.u.param_list)->_parameters.push_back((yyvsp[0].u.instance));
 }
-#line 6067 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6093 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 209:
-#line 1951 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1975 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.param_list) = (yyvsp[-2].u.param_list);
   (yyval.u.param_list)->_parameters.push_back((yyvsp[0].u.instance));
 }
-#line 6076 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6102 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 210:
-#line 1959 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1983 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6084 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6110 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 211:
-#line 1963 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1987 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 6092 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6118 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 212:
-#line 1970 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1994 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6100 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6126 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 213:
-#line 1974 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 1998 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 6108 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6134 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 214:
-#line 1981 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2005 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6116 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6142 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 215:
-#line 1985 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2009 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6124 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6150 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 216:
-#line 1989 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2013 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6132 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6158 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 217:
-#line 1993 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2017 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_default());
 }
-#line 6140 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6166 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 218:
-#line 1997 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2021 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_delete());
 }
-#line 6148 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6174 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 219:
-#line 2004 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2028 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6156 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6182 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 220:
-#line 2008 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2032 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6164 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6190 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 221:
-#line 2012 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2036 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[-1].u.expr);
 }
-#line 6172 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6198 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 222:
-#line 2016 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2040 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_default());
 }
-#line 6180 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6206 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 223:
-#line 2020 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2044 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_delete());
 }
-#line 6188 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6214 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 224:
-#line 2024 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2048 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 6196 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6222 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 228:
-#line 2037 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2061 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
 }
-#line 6203 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6229 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 232:
-#line 2046 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2070 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6212 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6238 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 233:
-#line 2051 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2075 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6222 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6248 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 234:
-#line 2057 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2081 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-2]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6232 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6258 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 235:
-#line 2063 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2087 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6241 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6267 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 236:
-#line 2068 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2092 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-1]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6251 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6277 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 237:
-#line 2074 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2098 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-1].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.instance) = new CPPInstance((yyvsp[-2].u.type), (yyvsp[-1].u.inst_ident), 0, (yylsp[-2]).file);
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6261 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6287 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 238:
-#line 2080 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2104 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.instance) = (yyvsp[0].u.instance);
 }
-#line 6269 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6295 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 239:
-#line 2084 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2108 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.instance) = (yyvsp[0].u.instance);
 }
-#line 6277 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6303 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 240:
-#line 2095 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2119 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.instance) = (yyvsp[0].u.instance);
 }
-#line 6285 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6311 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 241:
-#line 2099 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2123 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_parameter));
   (yyval.u.instance) = new CPPInstance(type, "expr");
   (yyval.u.instance)->set_initializer((yyvsp[0].u.expr));
 }
-#line 6296 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6322 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 242:
-#line 2109 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2133 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
 }
-#line 6304 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6330 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 243:
-#line 2113 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2137 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
 }
-#line 6312 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6338 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 244:
-#line 2117 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2141 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 6321 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6347 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 245:
-#line 2122 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2146 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 6330 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6356 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 246:
-#line 2127 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2151 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 6339 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6365 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 247:
-#line 2132 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2156 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 6348 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6374 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 248:
-#line 2137 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2161 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 6357 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6383 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 249:
-#line 2142 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2166 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 6366 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6392 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 250:
-#line 2147 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2171 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 6375 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6401 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 251:
-#line 2155 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2179 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
 }
-#line 6383 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6409 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 252:
-#line 2159 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2183 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
 }
-#line 6391 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6417 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 253:
-#line 2163 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2187 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 6400 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6426 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 254:
-#line 2168 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2192 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 6409 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6435 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 255:
-#line 2173 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2197 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 6418 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6444 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 256:
-#line 2178 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2202 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 6427 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6453 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 257:
-#line 2183 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2207 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 6436 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6462 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 258:
-#line 2188 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2212 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 6445 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6471 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 259:
-#line 2193 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2217 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 6454 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6480 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 260:
-#line 2198 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2222 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-5].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-2].u.param_list), (yyvsp[0].u.integer));
 }
-#line 6464 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6490 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 261:
-#line 2204 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2228 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-1].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
 }
-#line 6473 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6499 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 262:
-#line 2212 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2236 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6482 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6508 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 263:
-#line 2217 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2241 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6491 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6517 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 264:
-#line 2222 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2246 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 6500 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6526 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 265:
-#line 2227 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2251 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 6509 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6535 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 266:
-#line 2232 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2256 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 6518 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6544 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 267:
-#line 2237 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2261 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 6527 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6553 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 268:
-#line 2242 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2266 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 6536 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6562 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 269:
-#line 2247 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2271 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 6545 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6571 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 270:
-#line 2252 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2276 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 6554 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6580 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 271:
-#line 2257 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2281 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-5].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-2].u.param_list), (yyvsp[0].u.integer));
 }
-#line 6564 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6590 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 272:
-#line 2263 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2287 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-1].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
 }
-#line 6573 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6599 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 273:
-#line 2271 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2295 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
 }
-#line 6581 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6607 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 274:
-#line 2275 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2299 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6590 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6616 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 275:
-#line 2280 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2304 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6599 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6625 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 276:
-#line 2285 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2309 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 6608 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6634 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 277:
-#line 2290 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2314 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 6617 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6643 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 278:
-#line 2295 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2319 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 6626 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6652 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 279:
-#line 2300 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2324 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 6635 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6661 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 280:
-#line 2305 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2329 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 6644 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6670 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 281:
-#line 2310 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2334 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 6653 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6679 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 282:
-#line 2315 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2339 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 6662 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6688 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 283:
-#line 2323 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2347 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
 }
-#line 6670 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6696 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 284:
-#line 2327 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2351 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6679 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6705 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 285:
-#line 2332 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2356 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[0].u.identifier));
   (yyval.u.inst_ident)->_packed = true;
 }
-#line 6688 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6714 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 286:
-#line 2337 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2361 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_const);
 }
-#line 6697 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6723 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 287:
-#line 2342 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2366 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_volatile);
 }
-#line 6706 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6732 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 288:
-#line 2347 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2371 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
 }
-#line 6715 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6741 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 289:
-#line 2352 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2376 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
 }
-#line 6724 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6750 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 290:
-#line 2357 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2381 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
 }
-#line 6733 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6759 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 291:
-#line 2362 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2386 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[0].u.inst_ident);
   (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[-2].u.identifier));
 }
-#line 6742 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6768 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 292:
-#line 2367 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2391 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-3].u.inst_ident);
   (yyval.u.inst_ident)->add_array_modifier((yyvsp[-1].u.expr));
 }
-#line 6751 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6777 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 293:
-#line 2372 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2396 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL);
+  (yyval.u.inst_ident) = new CPPInstanceIdentifier(nullptr);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer), (yyvsp[0].u.type));
 }
-#line 6761 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6787 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 294:
-#line 2378 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2402 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-6].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_pointer);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer), (yyvsp[0].u.type));
 }
-#line 6772 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6798 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 295:
-#line 2385 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2409 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-6].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_reference);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer), (yyvsp[0].u.type));
 }
-#line 6783 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6809 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 296:
-#line 2392 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2416 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.inst_ident) = (yyvsp[-6].u.inst_ident);
   (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference);
   (yyval.u.inst_ident)->add_modifier(IIT_paren);
   (yyval.u.inst_ident)->add_func_modifier((yyvsp[-3].u.param_list), (yyvsp[-1].u.integer), (yyvsp[0].u.type));
 }
-#line 6794 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6820 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 297:
-#line 2402 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2426 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.simple_type));
 }
-#line 6802 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6828 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 298:
-#line 2406 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2430 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.type) == NULL) {
+  if ((yyval.u.type) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.type) != NULL);
+  assert((yyval.u.type) != nullptr);
 }
-#line 6814 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6840 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 299:
-#line 2414 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2438 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[0].u.identifier)));
 }
-#line 6822 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6848 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 300:
-#line 2418 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2442 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.struct_type));
 }
-#line 6830 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6856 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 301:
-#line 2422 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2446 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.struct_type));
 }
-#line 6838 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6864 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 302:
-#line 2426 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2450 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.enum_type));
 }
-#line 6846 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6872 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 303:
-#line 2430 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2454 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.type) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-2].u.extension_enum), (yyvsp[0].u.identifier), current_scope, (yylsp[-2]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.type) = et;
   }
 }
-#line 6866 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6892 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 304:
-#line 2446 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2470 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[-2].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.type) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-3].u.extension_enum), (yyvsp[-2].u.identifier), current_scope, (yylsp[-3]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[-2].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.type) = et;
   }
 }
-#line 6886 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6912 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 305:
-#line 2462 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2486 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[-1].u.expr)->determine_type();
-  if ((yyval.u.type) == (CPPType *)NULL) {
+  if ((yyval.u.type) == nullptr) {
     stringstream str;
     str << *(yyvsp[-1].u.expr);
     yyerror("could not determine type of " + str.str(), (yylsp[-1]));
   }
 }
-#line 6899 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6925 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 306:
-#line 2471 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2495 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_auto));
 }
-#line 6907 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6933 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 307:
-#line 2475 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2499 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPEnumType *enum_type = (yyvsp[-1].u.type)->as_enum_type();
-  if (enum_type == NULL) {
+  if (enum_type == nullptr) {
     yyerror("an enumeration type is required", (yylsp[-1]));
     (yyval.u.type) = (yyvsp[-1].u.type);
   } else {
     (yyval.u.type) = enum_type->get_underlying_type();
   }
 }
-#line 6921 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6947 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 308:
-#line 2485 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2509 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_auto));
 }
-#line 6929 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6955 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 309:
-#line 2492 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2516 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.type) == NULL) {
+  if ((yyval.u.type) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.type) != NULL);
+  assert((yyval.u.type) != nullptr);
 }
-#line 6941 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6967 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 310:
-#line 2503 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2527 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type((yyvsp[0].u.simple_type));
 }
-#line 6949 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6975 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 311:
-#line 2507 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2531 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.decl) == NULL) {
+  if ((yyval.u.decl) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.decl) != NULL);
+  assert((yyval.u.decl) != nullptr);
 }
-#line 6961 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6987 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 312:
-#line 2515 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2539 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type(new CPPTBDType((yyvsp[0].u.identifier)));
 }
-#line 6969 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 6995 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 313:
-#line 2519 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2543 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type((yyvsp[0].u.struct_type));
 }
-#line 6977 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7003 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 314:
-#line 2523 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2547 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[0].u.struct_type)));
 }
-#line 6985 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7011 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 315:
-#line 2527 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2551 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[0].u.enum_type)));
 }
-#line 6993 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7019 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 316:
-#line 2531 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2555 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.decl) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-2].u.extension_enum), (yyvsp[0].u.identifier), current_scope, (yylsp[-2]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.decl) = et;
   }
 }
-#line 7013 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7039 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 317:
-#line 2547 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2571 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[-2].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.decl) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-3].u.extension_enum), (yyvsp[-2].u.identifier), current_scope, (yylsp[-3]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[-2].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.decl) = et;
   }
 }
-#line 7033 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7059 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 318:
-#line 2563 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2587 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   yywarning(string("C++ does not permit forward declaration of untyped enum ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[-1]));
 
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.decl) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-1].u.extension_enum), (yyvsp[0].u.identifier), current_scope, (yylsp[-1]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.decl) = et;
   }
 }
-#line 7055 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7081 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 319:
-#line 2581 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2605 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = (yyvsp[-1].u.expr)->determine_type();
-  if ((yyval.u.decl) == (CPPType *)NULL) {
+  if ((yyval.u.decl) == nullptr) {
     stringstream str;
     str << *(yyvsp[-1].u.expr);
     yyerror("could not determine type of " + str.str(), (yylsp[-1]));
   }
 }
-#line 7068 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7094 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 320:
-#line 2590 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2614 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_auto));
 }
-#line 7076 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7102 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 321:
-#line 2594 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2618 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPEnumType *enum_type = (yyvsp[-1].u.type)->as_enum_type();
-  if (enum_type == NULL) {
+  if (enum_type == nullptr) {
     yyerror("an enumeration type is required", (yylsp[-1]));
     (yyval.u.decl) = (yyvsp[-1].u.type);
   } else {
     (yyval.u.decl) = enum_type->get_underlying_type();
   }
 }
-#line 7090 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7116 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 322:
-#line 2604 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2628 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_auto));
 }
-#line 7098 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7124 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 323:
-#line 2611 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2635 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.simple_type));
 }
-#line 7106 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7132 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 324:
-#line 2615 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2639 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if ((yyval.u.type) == NULL) {
+  if ((yyval.u.type) == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[0].u.identifier)->get_fully_scoped_name(), (yylsp[0]));
   }
-  assert((yyval.u.type) != NULL);
+  assert((yyval.u.type) != nullptr);
 }
-#line 7118 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7144 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 325:
-#line 2623 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2647 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[0].u.identifier)));
 }
-#line 7126 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7152 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 326:
-#line 2627 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2651 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.type) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-2].u.extension_enum), (yyvsp[0].u.identifier), current_scope, (yylsp[-2]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.type) = et;
   }
 }
-#line 7146 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7172 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 327:
-#line 2643 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2667 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type != NULL) {
+  if (type != nullptr) {
     (yyval.u.type) = type;
   } else {
     CPPExtensionType *et =
       CPPType::new_type(new CPPExtensionType((yyvsp[-1].u.extension_enum), (yyvsp[0].u.identifier), current_scope, (yylsp[-1]).file))
       ->as_extension_type();
     CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope);
-    if (scope != NULL) {
+    if (scope != nullptr) {
       scope->define_extension_type(et);
     }
     (yyval.u.type) = et;
   }
 }
-#line 7166 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7192 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 328:
-#line 2659 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2683 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[-1].u.expr)->determine_type();
-  if ((yyval.u.type) == (CPPType *)NULL) {
+  if ((yyval.u.type) == nullptr) {
     stringstream str;
     str << *(yyvsp[-1].u.expr);
     yyerror("could not determine type of " + str.str(), (yylsp[-1]));
   }
 }
-#line 7179 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7205 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 329:
-#line 2668 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2692 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPEnumType *enum_type = (yyvsp[-1].u.type)->as_enum_type();
-  if (enum_type == NULL) {
+  if (enum_type == nullptr) {
     yyerror("an enumeration type is required", (yylsp[-1]));
     (yyval.u.type) = (yyvsp[-1].u.type);
   } else {
     (yyval.u.type) = enum_type->get_underlying_type();
   }
 }
-#line 7193 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7219 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 330:
-#line 2678 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2702 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_auto));
 }
-#line 7201 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7227 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 331:
-#line 2685 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2709 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.decl) = (yyvsp[0].u.decl);
 }
-#line 7209 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7235 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 332:
-#line 2689 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2713 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   yyerror(string("unknown type '") + (yyvsp[0].u.identifier)->get_fully_scoped_name() + "'", (yylsp[0]));
 
   (yyval.u.decl) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown));
 }
-#line 7219 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7245 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 333:
-#line 2697 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2721 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 7227 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7253 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 334:
-#line 2701 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2725 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[0].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 7236 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7262 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 335:
-#line 2706 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2730 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 7244 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7270 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 336:
-#line 2710 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2734 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[0].u.inst_ident)->add_modifier(IIT_const);
   (yyval.u.type) = (yyvsp[0].u.inst_ident)->unroll_type((yyvsp[-1].u.type));
 }
-#line 7253 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7279 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 341:
-#line 2725 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2749 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPVisibility starting_vis =
   ((yyvsp[-2].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public;
 
   CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("anon"),
                                      starting_vis);
-  CPPStructType *st = new CPPStructType((yyvsp[-2].u.extension_enum), NULL, current_scope,
+  CPPStructType *st = new CPPStructType((yyvsp[-2].u.extension_enum), nullptr, current_scope,
                                         new_scope, (yylsp[-2]).file);
   new_scope->set_struct_type(st);
 
   push_scope(new_scope);
   push_struct(st);
 }
-#line 7271 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7297 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 342:
-#line 2739 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2763 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.struct_type) = current_struct;
   current_struct->_incomplete = false;
   pop_struct();
   pop_scope();
 }
-#line 7282 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7308 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 343:
-#line 2749 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2773 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPVisibility starting_vis =
   ((yyvsp[-2].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public;
 
   CPPScope *scope = (yyvsp[0].u.identifier)->get_scope(current_scope, global_scope, current_lexer);
-  if (scope == NULL) {
+  if (scope == nullptr) {
     scope = current_scope;
   }
   CPPScope *new_scope = new CPPScope(scope, (yyvsp[0].u.identifier)->_names.back(),
@@ -7304,260 +7328,260 @@ yyreduce:
   push_scope(new_scope);
   push_struct(st);
 }
-#line 7306 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7332 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 344:
-#line 2769 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2793 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.struct_type) = current_struct;
   current_struct->_incomplete = false;
   pop_struct();
   pop_scope();
 }
-#line 7317 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7343 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 346:
-#line 2780 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2804 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->_final = true;
 }
-#line 7325 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7351 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 351:
-#line 2797 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2821 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_unknown, false);
 }
-#line 7333 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7359 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 352:
-#line 2801 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2825 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_public, false);
 }
-#line 7341 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7367 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 353:
-#line 2805 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2829 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_protected, false);
 }
-#line 7349 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7375 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 354:
-#line 2809 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2833 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_private, false);
 }
-#line 7357 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7383 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 355:
-#line 2813 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2837 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_public, true);
 }
-#line 7365 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7391 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 356:
-#line 2817 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2841 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_protected, true);
 }
-#line 7373 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7399 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 357:
-#line 2821 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2845 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_private, true);
 }
-#line 7381 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7407 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 358:
-#line 2825 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2849 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_public, true);
 }
-#line 7389 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7415 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 359:
-#line 2829 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2853 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_protected, true);
 }
-#line 7397 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7423 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 360:
-#line 2833 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2857 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_struct->append_derivation((yyvsp[0].u.type), V_private, true);
 }
-#line 7405 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7431 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 361:
-#line 2840 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2864 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.enum_type) = current_enum;
-  current_enum = NULL;
+  current_enum = nullptr;
 }
-#line 7414 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7440 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 362:
-#line 2848 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2872 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  current_enum = new CPPEnumType((yyvsp[-2].u.extension_enum), NULL, (yyvsp[0].u.type), current_scope, NULL, (yylsp[-2]).file);
+  current_enum = new CPPEnumType((yyvsp[-2].u.extension_enum), nullptr, (yyvsp[0].u.type), current_scope, nullptr, (yylsp[-2]).file);
 }
-#line 7422 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7448 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 363:
-#line 2852 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2876 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  current_enum = new CPPEnumType((yyvsp[0].u.extension_enum), NULL, current_scope, NULL, (yylsp[0]).file);
+  current_enum = new CPPEnumType((yyvsp[0].u.extension_enum), nullptr, current_scope, nullptr, (yylsp[0]).file);
 }
-#line 7430 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7456 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 364:
-#line 2856 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2880 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPScope *new_scope = new CPPScope(current_scope, (yyvsp[-2].u.identifier)->_names.back(), V_public);
   current_enum = new CPPEnumType((yyvsp[-3].u.extension_enum), (yyvsp[-2].u.identifier), (yyvsp[0].u.type), current_scope, new_scope, (yylsp[-3]).file);
 }
-#line 7439 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7465 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 365:
-#line 2861 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2885 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPScope *new_scope = new CPPScope(current_scope, (yyvsp[0].u.identifier)->_names.back(), V_public);
   current_enum = new CPPEnumType((yyvsp[-1].u.extension_enum), (yyvsp[0].u.identifier), current_scope, new_scope, (yylsp[-1]).file);
 }
-#line 7448 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7474 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 366:
-#line 2869 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2893 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type((yyvsp[0].u.simple_type));
 }
-#line 7456 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7482 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 367:
-#line 2873 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2897 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
 }
-#line 7464 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7490 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 369:
-#line 2881 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2905 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  assert(current_enum != NULL);
-  current_enum->add_element((yyvsp[-1].u.identifier)->get_simple_name(), NULL, current_lexer, (yylsp[-1]));
+  assert(current_enum != nullptr);
+  current_enum->add_element((yyvsp[-1].u.identifier)->get_simple_name(), nullptr, current_lexer, (yylsp[-1]));
 }
-#line 7473 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7499 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 370:
-#line 2886 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2910 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  assert(current_enum != NULL);
+  assert(current_enum != nullptr);
   current_enum->add_element((yyvsp[-3].u.identifier)->get_simple_name(), (yyvsp[-1].u.expr), current_lexer, (yylsp[-3]));
 }
-#line 7482 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7508 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 372:
-#line 2894 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2918 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  assert(current_enum != NULL);
-  current_enum->add_element((yyvsp[0].u.identifier)->get_simple_name(), NULL, current_lexer, (yylsp[0]));
+  assert(current_enum != nullptr);
+  current_enum->add_element((yyvsp[0].u.identifier)->get_simple_name(), nullptr, current_lexer, (yylsp[0]));
 }
-#line 7491 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7517 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 373:
-#line 2899 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2923 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  assert(current_enum != NULL);
+  assert(current_enum != nullptr);
   current_enum->add_element((yyvsp[-2].u.identifier)->get_simple_name(), (yyvsp[0].u.expr), current_lexer, (yylsp[-2]));
 }
-#line 7500 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7526 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 374:
-#line 2907 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2931 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_enum;
 }
-#line 7508 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7534 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 375:
-#line 2911 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2935 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_enum_class;
 }
-#line 7516 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7542 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 376:
-#line 2915 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2939 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_enum_struct;
 }
-#line 7524 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7550 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 377:
-#line 2922 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2946 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_class;
 }
-#line 7532 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7558 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 378:
-#line 2926 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2950 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_struct;
 }
-#line 7540 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7566 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 379:
-#line 2930 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2954 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.extension_enum) = CPPExtensionType::T_union;
 }
-#line 7548 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7574 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 380:
-#line 2937 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2961 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPScope *scope = (yyvsp[-1].u.identifier)->find_scope(current_scope, global_scope, current_lexer);
-  if (scope == NULL) {
+  if (scope == nullptr) {
     // This must be a new namespace declaration.
     CPPScope *parent_scope =
       (yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope, current_lexer);
-    if (parent_scope == NULL) {
+    if (parent_scope == nullptr) {
       parent_scope = current_scope;
     }
     scope = new CPPScope(parent_scope, (yyvsp[-1].u.identifier)->_names.back(), V_public);
@@ -7568,26 +7592,26 @@ yyreduce:
   current_scope->define_namespace(nspace);
   push_scope(scope);
 }
-#line 7570 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7596 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 381:
-#line 2955 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2979 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
 }
-#line 7578 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7604 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 382:
-#line 2959 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 2983 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPScope *scope = (yyvsp[-1].u.identifier)->find_scope(current_scope, global_scope, current_lexer);
-  if (scope == NULL) {
+  if (scope == nullptr) {
     // This must be a new namespace declaration.
     CPPScope *parent_scope =
       (yyvsp[-1].u.identifier)->get_scope(current_scope, global_scope, current_lexer);
-    if (parent_scope == NULL) {
+    if (parent_scope == nullptr) {
       parent_scope = current_scope;
     }
     scope = new CPPScope(parent_scope, (yyvsp[-1].u.identifier)->_names.back(), V_public);
@@ -7599,143 +7623,143 @@ yyreduce:
   current_scope->define_namespace(nspace);
   push_scope(scope);
 }
-#line 7601 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7627 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 383:
-#line 2978 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3002 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   pop_scope();
 }
-#line 7609 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7635 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 386:
-#line 2987 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3011 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPUsing *using_decl = new CPPUsing((yyvsp[-1].u.identifier), false, (yylsp[-2]).file);
   current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[-2]));
   current_scope->add_using(using_decl, global_scope, current_lexer);
 }
-#line 7619 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7645 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 387:
-#line 2993 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3017 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // This is really just an alternative way to declare a typedef.
   CPPTypedefType *typedef_type = new CPPTypedefType((yyvsp[-1].u.type), (yyvsp[-3].u.identifier), current_scope);
   typedef_type->_using = true;
   current_scope->add_declaration(CPPType::new_type(typedef_type), global_scope, current_lexer, (yylsp[-4]));
 }
-#line 7630 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7656 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 388:
-#line 3000 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3024 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPUsing *using_decl = new CPPUsing((yyvsp[-1].u.identifier), true, (yylsp[-3]).file);
   current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[-3]));
   current_scope->add_using(using_decl, global_scope, current_lexer);
 }
-#line 7640 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7666 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 392:
-#line 3015 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3039 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_bool);
 }
-#line 7648 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7674 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 393:
-#line 3019 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3043 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char);
 }
-#line 7656 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7682 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 394:
-#line 3023 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3047 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t);
 }
-#line 7664 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7690 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 395:
-#line 3027 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3051 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char16_t);
 }
-#line 7672 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7698 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 396:
-#line 3031 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3055 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char32_t);
 }
-#line 7680 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7706 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 397:
-#line 3035 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3059 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
                          CPPSimpleType::F_short);
 }
-#line 7689 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7715 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 398:
-#line 3040 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3064 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
                          CPPSimpleType::F_long);
 }
-#line 7698 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7724 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 399:
-#line 3045 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3069 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
                          CPPSimpleType::F_unsigned);
 }
-#line 7707 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7733 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 400:
-#line 3050 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3074 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int,
                          CPPSimpleType::F_signed);
 }
-#line 7716 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7742 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 401:
-#line 3055 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3079 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int);
 }
-#line 7724 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7750 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 402:
-#line 3059 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3083 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = (yyvsp[0].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_short;
 }
-#line 7733 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7759 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 403:
-#line 3064 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3088 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = (yyvsp[0].u.simple_type);
   if ((yyval.u.simple_type)->_flags & CPPSimpleType::F_long) {
@@ -7744,192 +7768,192 @@ yyreduce:
     (yyval.u.simple_type)->_flags |= CPPSimpleType::F_long;
   }
 }
-#line 7746 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7772 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 404:
-#line 3073 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3097 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = (yyvsp[0].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_unsigned;
 }
-#line 7755 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7781 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 405:
-#line 3078 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3102 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = (yyvsp[0].u.simple_type);
   (yyval.u.simple_type)->_flags |= CPPSimpleType::F_signed;
 }
-#line 7764 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7790 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 406:
-#line 3086 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3110 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float);
 }
-#line 7772 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7798 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 407:
-#line 3090 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3114 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double);
 }
-#line 7780 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7806 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 408:
-#line 3094 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3118 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double,
                          CPPSimpleType::F_long);
 }
-#line 7789 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7815 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 409:
-#line 3102 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3126 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_void);
 }
-#line 7797 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7823 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 410:
-#line 3111 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3135 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_lexer->_resolve_identifiers = false;
 }
-#line 7805 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7831 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 411:
-#line 3115 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3139 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   current_lexer->_resolve_identifiers = true;
 }
-#line 7813 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7839 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 519:
-#line 3159 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3183 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
 }
-#line 7820 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7846 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 543:
-#line 3168 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3192 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 7828 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7854 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 544:
-#line 3172 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3196 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 7836 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7862 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 545:
-#line 3179 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3203 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
-  (yyval.u.expr) = (CPPExpression *)NULL;
+  (yyval.u.expr) = nullptr;
 }
-#line 7844 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7870 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 546:
-#line 3183 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3207 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 7852 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7878 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 547:
-#line 3190 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3214 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 7860 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7886 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 548:
-#line 3194 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3218 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(',', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 7868 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7894 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 549:
-#line 3201 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3225 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 7876 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7902 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 550:
-#line 3205 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3229 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-2].u.type), (yyvsp[0].u.expr)));
 }
-#line 7884 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7910 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 551:
-#line 3209 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3233 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_static_cast));
 }
-#line 7892 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7918 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 552:
-#line 3213 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3237 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_dynamic_cast));
 }
-#line 7900 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7926 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 553:
-#line 3217 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3241 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_const_cast));
 }
-#line 7908 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7934 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 554:
-#line 3221 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3245 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_reinterpret_cast));
 }
-#line 7916 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7942 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 555:
-#line 3225 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3249 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[-1].u.type)));
 }
-#line 7924 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7950 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 556:
-#line 3229 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3253 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *arg = (yyvsp[-1].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (arg == (CPPDeclaration *)NULL) {
+  if (arg == nullptr) {
     yyerror("undefined sizeof argument: " + (yyvsp[-1].u.identifier)->get_fully_scoped_name(), (yylsp[-1]));
   } else if (arg->get_subtype() == CPPDeclaration::ST_instance) {
     CPPInstance *inst = arg->as_instance();
@@ -7938,470 +7962,470 @@ yyreduce:
     (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func(arg->as_type()));
   }
 }
-#line 7940 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7966 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 557:
-#line 3241 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3265 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_ellipsis_func((yyvsp[-1].u.identifier)));
 }
-#line 7948 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7974 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 558:
-#line 3245 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3269 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[-1].u.type)));
 }
-#line 7956 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7982 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 559:
-#line 3249 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3273 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[0].u.expr));
 }
-#line 7964 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7990 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 560:
-#line 3253 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3277 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[0].u.expr));
 }
-#line 7972 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 7998 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 561:
-#line 3257 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3281 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[0].u.expr));
 }
-#line 7980 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8006 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 562:
-#line 3261 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3285 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_PLUS, (yyvsp[0].u.expr));
 }
-#line 7988 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8014 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 563:
-#line 3265 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3289 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[0].u.expr));
 }
-#line 7996 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8022 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 564:
-#line 3269 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3293 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[0].u.expr));
 }
-#line 8004 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8030 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 565:
-#line 3273 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3297 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('*', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8012 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8038 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 566:
-#line 3277 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3301 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('/', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8020 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8046 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 567:
-#line 3281 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3305 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('%', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8028 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8054 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 568:
-#line 3285 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3309 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('+', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8036 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8062 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 569:
-#line 3289 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3313 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('-', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8044 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8070 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 570:
-#line 3293 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3317 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('|', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8052 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8078 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 571:
-#line 3297 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3321 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('^', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8060 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8086 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 572:
-#line 3301 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3325 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('&', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8068 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8094 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 573:
-#line 3305 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3329 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8076 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8102 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 574:
-#line 3309 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3333 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8084 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8110 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 575:
-#line 3313 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3337 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8092 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8118 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 576:
-#line 3317 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3341 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8100 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8126 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 577:
-#line 3321 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3345 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8108 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8134 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 578:
-#line 3325 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3349 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8116 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8142 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 579:
-#line 3329 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3353 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8124 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8150 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 580:
-#line 3333 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3357 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8132 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8158 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 581:
-#line 3337 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3361 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('?', (yyvsp[-4].u.expr), (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8140 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8166 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 582:
-#line 3341 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3365 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('[', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 8148 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8174 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 583:
-#line 3345 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3369 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 8156 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8182 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 584:
-#line 3349 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3373 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-2].u.expr));
 }
-#line 8164 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8190 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 585:
-#line 3353 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3377 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('.', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8172 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8198 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 586:
-#line 3357 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3381 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8180 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8206 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 587:
-#line 3361 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3385 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[-1].u.expr);
 }
-#line 8188 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8214 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 588:
-#line 3369 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3393 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 8196 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8222 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 589:
-#line 3373 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3397 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-2].u.type), (yyvsp[0].u.expr)));
 }
-#line 8204 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8230 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 590:
-#line 3377 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3401 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_static_cast));
 }
-#line 8212 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8238 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 591:
-#line 3381 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3405 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_dynamic_cast));
 }
-#line 8220 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8246 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 592:
-#line 3385 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3409 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_const_cast));
 }
-#line 8228 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8254 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 593:
-#line 3389 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3413 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_reinterpret_cast));
 }
-#line 8236 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8262 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 594:
-#line 3393 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3417 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A constructor call.
   CPPType *type = (yyvsp[-3].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type == NULL) {
+  if (type == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[-3].u.identifier)->get_fully_scoped_name(), (yylsp[-3]));
   }
-  assert(type != NULL);
+  assert(type != nullptr);
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8250 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8276 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 595:
-#line 3403 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3427 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // Aggregate initialization.
   CPPType *type = (yyvsp[-3].u.identifier)->find_type(current_scope, global_scope, false, current_lexer);
-  if (type == NULL) {
+  if (type == nullptr) {
     yyerror(string("internal error resolving type ") + (yyvsp[-3].u.identifier)->get_fully_scoped_name(), (yylsp[-3]));
   }
-  assert(type != NULL);
+  assert(type != nullptr);
   (yyval.u.expr) = new CPPExpression(CPPExpression::aggregate_init_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8264 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8290 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 596:
-#line 3413 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3437 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8274 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8300 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 597:
-#line 3419 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3443 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8284 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8310 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 598:
-#line 3425 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3449 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8294 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8320 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 599:
-#line 3431 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3455 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char16_t));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8304 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8330 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 600:
-#line 3437 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3461 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char32_t));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8314 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8340 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 601:
-#line 3443 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3467 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8324 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8350 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 602:
-#line 3449 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3473 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_short));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8335 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8361 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 603:
-#line 3456 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3480 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_long));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8346 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8372 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 604:
-#line 3463 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3487 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_unsigned));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8357 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8383 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 605:
-#line 3470 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3494 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int,
                                         CPPSimpleType::F_signed));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8368 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8394 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 606:
-#line 3477 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3501 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8378 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8404 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 607:
-#line 3483 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3507 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type =
     CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double));
   (yyval.u.expr) = new CPPExpression(CPPExpression::construct_op(type, (yyvsp[-1].u.expr)));
 }
-#line 8388 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8414 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 608:
-#line 3489 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3513 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[-1].u.type)));
 }
-#line 8396 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8422 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 609:
-#line 3493 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3517 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *arg = (yyvsp[-1].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (arg == (CPPDeclaration *)NULL) {
+  if (arg == nullptr) {
     yyerror("undefined sizeof argument: " + (yyvsp[-1].u.identifier)->get_fully_scoped_name(), (yylsp[-1]));
   } else if (arg->get_subtype() == CPPDeclaration::ST_instance) {
     CPPInstance *inst = arg->as_instance();
@@ -8410,43 +8434,43 @@ yyreduce:
     (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func(arg->as_type()));
   }
 }
-#line 8412 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8438 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 610:
-#line 3505 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3529 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_ellipsis_func((yyvsp[-1].u.identifier)));
 }
-#line 8420 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8446 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 611:
-#line 3509 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3533 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[-1].u.type)));
 }
-#line 8428 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8454 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 612:
-#line 3513 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3537 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[0].u.type)));
 }
-#line 8436 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8462 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 613:
-#line 3517 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3541 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[-3].u.type), (yyvsp[-1].u.expr)));
 }
-#line 8444 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8470 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 614:
-#line 3521 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3545 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPIdentifier ident("");
   ident.add_name("std");
@@ -8457,11 +8481,11 @@ yyreduce:
   }
   (yyval.u.expr) = new CPPExpression(CPPExpression::typeid_op((yyvsp[-1].u.type), std_type_info));
 }
-#line 8459 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8485 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 615:
-#line 3532 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3556 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPIdentifier ident("");
   ident.add_name("std");
@@ -8472,567 +8496,567 @@ yyreduce:
   }
   (yyval.u.expr) = new CPPExpression(CPPExpression::typeid_op((yyvsp[-1].u.expr), std_type_info));
 }
-#line 8474 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8500 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 616:
-#line 3543 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3567 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[0].u.expr));
 }
-#line 8482 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8508 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 617:
-#line 3547 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3571 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[0].u.expr));
 }
-#line 8490 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8516 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 618:
-#line 3551 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3575 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[0].u.expr));
 }
-#line 8498 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8524 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 619:
-#line 3555 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3579 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_PLUS, (yyvsp[0].u.expr));
 }
-#line 8506 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8532 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 620:
-#line 3559 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3583 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[0].u.expr));
 }
-#line 8514 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8540 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 621:
-#line 3563 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3587 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[0].u.expr));
 }
-#line 8522 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8548 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 622:
-#line 3567 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3591 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('*', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8530 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8556 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 623:
-#line 3571 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3595 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('/', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8538 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8564 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 624:
-#line 3575 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3599 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('%', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8546 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8572 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 625:
-#line 3579 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3603 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('+', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8554 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8580 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 626:
-#line 3583 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3607 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('-', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8562 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8588 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 627:
-#line 3587 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3611 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('|', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8570 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8596 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 628:
-#line 3591 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3615 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('^', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8578 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8604 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 629:
-#line 3595 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3619 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('&', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8586 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8612 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 630:
-#line 3599 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3623 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8594 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8620 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 631:
-#line 3603 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3627 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8602 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8628 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 632:
-#line 3607 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3631 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8610 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8636 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 633:
-#line 3611 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3635 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8618 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8644 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 634:
-#line 3615 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3639 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8626 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8652 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 635:
-#line 3619 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3643 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8634 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8660 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 636:
-#line 3623 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3647 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('<', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8642 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8668 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 637:
-#line 3627 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3651 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('>', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8650 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8676 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 638:
-#line 3631 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3655 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8658 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8684 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 639:
-#line 3635 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3659 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8666 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8692 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 640:
-#line 3639 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3663 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('?', (yyvsp[-4].u.expr), (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8674 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8700 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 641:
-#line 3643 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3667 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('[', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 8682 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8708 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 642:
-#line 3647 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3671 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 8690 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8716 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 643:
-#line 3651 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3675 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-2].u.expr));
 }
-#line 8698 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8724 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 644:
-#line 3655 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3679 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('.', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8706 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8732 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 645:
-#line 3659 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3683 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 8714 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8740 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 646:
-#line 3663 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3687 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[-1].u.expr);
 }
-#line 8722 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8748 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 647:
-#line 3670 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3694 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.integer));
 }
-#line 8730 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8756 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 648:
-#line 3674 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3698 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(true);
 }
-#line 8738 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8764 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 649:
-#line 3678 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3702 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(false);
 }
-#line 8746 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8772 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 650:
-#line 3682 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3706 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.integer));
 }
-#line 8754 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8780 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 651:
-#line 3686 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3710 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.real));
 }
-#line 8762 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8788 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 652:
-#line 3690 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3714 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 8770 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8796 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 653:
-#line 3694 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3718 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 8778 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8804 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 654:
-#line 3698 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3722 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.identifier), current_scope, global_scope, current_lexer);
 }
-#line 8786 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8812 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 655:
-#line 3702 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3726 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A variable named "final".  C++11 explicitly permits this.
   CPPIdentifier *ident = new CPPIdentifier("final", (yylsp[0]));
   (yyval.u.expr) = new CPPExpression(ident, current_scope, global_scope, current_lexer);
 }
-#line 8796 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8822 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 656:
-#line 3708 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3732 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A variable named "override".  C++11 explicitly permits this.
   CPPIdentifier *ident = new CPPIdentifier("override", (yylsp[0]));
   (yyval.u.expr) = new CPPExpression(ident, current_scope, global_scope, current_lexer);
 }
-#line 8806 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8832 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 657:
-#line 3714 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3738 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr());
 }
-#line 8814 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8840 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 658:
-#line 3718 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3742 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-6].u.closure_type)->_flags = (yyvsp[-4].u.integer);
   (yyvsp[-6].u.closure_type)->_return_type = (yyvsp[-3].u.type);
   (yyval.u.expr) = new CPPExpression(CPPExpression::lambda((yyvsp[-6].u.closure_type)));
 }
-#line 8824 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8850 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 659:
-#line 3724 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3748 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyvsp[-9].u.closure_type)->_parameters = (yyvsp[-6].u.param_list);
   (yyvsp[-9].u.closure_type)->_flags = (yyvsp[-4].u.integer);
   (yyvsp[-9].u.closure_type)->_return_type = (yyvsp[-3].u.type);
   (yyval.u.expr) = new CPPExpression(CPPExpression::lambda((yyvsp[-9].u.closure_type)));
 }
-#line 8835 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8861 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 660:
-#line 3731 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3755 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_HAS_VIRTUAL_DESTRUCTOR, (yyvsp[-1].u.type)));
 }
-#line 8843 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8869 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 661:
-#line 3735 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3759 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_ABSTRACT, (yyvsp[-1].u.type)));
 }
-#line 8851 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8877 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 662:
-#line 3739 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3763 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_CLASS, (yyvsp[-3].u.type), (yyvsp[-1].u.type)));
 }
-#line 8859 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8885 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 663:
-#line 3743 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3767 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_CLASS, (yyvsp[-1].u.type)));
 }
-#line 8867 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8893 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 664:
-#line 3747 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3771 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_CONSTRUCTIBLE, (yyvsp[-1].u.type)));
 }
-#line 8875 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8901 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 665:
-#line 3751 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3775 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_CONSTRUCTIBLE, (yyvsp[-3].u.type), (yyvsp[-1].u.type)));
 }
-#line 8883 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8909 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 666:
-#line 3755 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3779 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_CONVERTIBLE_TO, (yyvsp[-3].u.type), (yyvsp[-1].u.type)));
 }
-#line 8891 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8917 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 667:
-#line 3759 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3783 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_DESTRUCTIBLE, (yyvsp[-1].u.type)));
 }
-#line 8899 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8925 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 668:
-#line 3763 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3787 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_EMPTY, (yyvsp[-1].u.type)));
 }
-#line 8907 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8933 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 669:
-#line 3767 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3791 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_ENUM, (yyvsp[-1].u.type)));
 }
-#line 8915 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8941 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 670:
-#line 3771 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3795 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_FINAL, (yyvsp[-1].u.type)));
 }
-#line 8923 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8949 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 671:
-#line 3775 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3799 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_FUNDAMENTAL, (yyvsp[-1].u.type)));
 }
-#line 8931 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8957 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 672:
-#line 3779 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3803 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_POD, (yyvsp[-1].u.type)));
 }
-#line 8939 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8965 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 673:
-#line 3783 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3807 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_POLYMORPHIC, (yyvsp[-1].u.type)));
 }
-#line 8947 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8973 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 674:
-#line 3787 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3811 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_STANDARD_LAYOUT, (yyvsp[-1].u.type)));
 }
-#line 8955 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8981 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 675:
-#line 3791 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3815 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_TRIVIAL, (yyvsp[-1].u.type)));
 }
-#line 8963 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8989 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 676:
-#line 3795 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3819 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::type_trait(KW_IS_UNION, (yyvsp[-1].u.type)));
 }
-#line 8971 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 8997 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 677:
-#line 3809 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3833 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 8979 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9005 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 678:
-#line 3813 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3837 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-2].u.type), (yyvsp[0].u.expr)));
 }
-#line 8987 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9013 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 679:
-#line 3817 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3841 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_static_cast));
 }
-#line 8995 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9021 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 680:
-#line 3821 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3845 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_dynamic_cast));
 }
-#line 9003 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9029 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 681:
-#line 3825 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3849 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_const_cast));
 }
-#line 9011 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9037 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 682:
-#line 3829 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3853 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[-4].u.type), (yyvsp[-1].u.expr), CPPExpression::T_reinterpret_cast));
 }
-#line 9019 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9045 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 683:
-#line 3833 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3857 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[-1].u.type)));
 }
-#line 9027 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9053 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 684:
-#line 3837 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3861 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPDeclaration *arg = (yyvsp[-1].u.identifier)->find_symbol(current_scope, global_scope, current_lexer);
-  if (arg == (CPPDeclaration *)NULL) {
+  if (arg == nullptr) {
     yyerror("undefined sizeof argument: " + (yyvsp[-1].u.identifier)->get_fully_scoped_name(), (yylsp[-1]));
   } else if (arg->get_subtype() == CPPDeclaration::ST_instance) {
     CPPInstance *inst = arg->as_instance();
@@ -9041,43 +9065,43 @@ yyreduce:
     (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func(arg->as_type()));
   }
 }
-#line 9043 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9069 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 685:
-#line 3849 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3873 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_ellipsis_func((yyvsp[-1].u.identifier)));
 }
-#line 9051 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9077 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 686:
-#line 3853 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3877 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[-1].u.type)));
 }
-#line 9059 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9085 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 687:
-#line 3857 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3881 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[0].u.type)));
 }
-#line 9067 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9093 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 688:
-#line 3861 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3885 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[-3].u.type), (yyvsp[-1].u.expr)));
 }
-#line 9075 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9101 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 689:
-#line 3865 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3889 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPIdentifier ident("");
   ident.add_name("std");
@@ -9088,11 +9112,11 @@ yyreduce:
   }
   (yyval.u.expr) = new CPPExpression(CPPExpression::typeid_op((yyvsp[-1].u.type), std_type_info));
 }
-#line 9090 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9116 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 690:
-#line 3876 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3900 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPIdentifier ident("");
   ident.add_name("std");
@@ -9103,409 +9127,409 @@ yyreduce:
   }
   (yyval.u.expr) = new CPPExpression(CPPExpression::typeid_op((yyvsp[-1].u.expr), std_type_info));
 }
-#line 9105 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9131 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 691:
-#line 3887 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3911 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[0].u.expr));
 }
-#line 9113 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9139 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 692:
-#line 3891 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3915 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[0].u.expr));
 }
-#line 9121 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9147 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 693:
-#line 3895 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3919 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[0].u.expr));
 }
-#line 9129 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9155 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 694:
-#line 3899 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3923 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_PLUS, (yyvsp[0].u.expr));
 }
-#line 9137 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9163 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 695:
-#line 3903 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3927 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[0].u.expr));
 }
-#line 9145 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9171 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 696:
-#line 3907 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3931 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('*', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9153 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9179 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 697:
-#line 3911 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3935 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('/', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9161 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9187 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 698:
-#line 3915 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3939 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('%', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9169 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9195 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 699:
-#line 3919 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3943 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('+', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9177 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9203 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 700:
-#line 3923 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3947 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('-', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9185 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9211 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 701:
-#line 3927 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3951 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('|', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9193 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9219 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 702:
-#line 3931 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3955 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('^', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9201 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9227 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 703:
-#line 3935 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3959 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('&', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9209 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9235 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 704:
-#line 3939 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3963 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9217 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9243 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 705:
-#line 3943 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3967 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9225 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9251 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 706:
-#line 3947 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3971 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9233 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9259 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 707:
-#line 3951 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3975 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9241 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9267 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 708:
-#line 3955 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3979 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9249 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9275 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 709:
-#line 3959 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3983 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9257 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9283 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 710:
-#line 3963 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3987 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('<', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9265 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9291 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 711:
-#line 3967 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3991 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('>', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9273 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9299 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 712:
-#line 3971 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3995 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9281 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9307 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 713:
-#line 3975 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 3999 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9289 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9315 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 714:
-#line 3979 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4003 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('?', (yyvsp[-4].u.expr), (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9297 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9323 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 715:
-#line 3983 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4007 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('[', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 9305 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9331 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 716:
-#line 3987 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4011 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-3].u.expr), (yyvsp[-1].u.expr));
 }
-#line 9313 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9339 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 717:
-#line 3991 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4015 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('f', (yyvsp[-2].u.expr));
 }
-#line 9321 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9347 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 718:
-#line 3995 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4019 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression('.', (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9329 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9355 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 719:
-#line 3999 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4023 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[-2].u.expr), (yyvsp[0].u.expr));
 }
-#line 9337 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9363 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 720:
-#line 4003 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4027 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[-1].u.expr);
 }
-#line 9345 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9371 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 721:
-#line 4010 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4034 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.integer));
 }
-#line 9353 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9379 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 722:
-#line 4014 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4038 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(true);
 }
-#line 9361 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9387 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 723:
-#line 4018 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4042 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(false);
 }
-#line 9369 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9395 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 724:
-#line 4022 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4046 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.integer));
 }
-#line 9377 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9403 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 725:
-#line 4026 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4050 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.real));
 }
-#line 9385 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9411 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 726:
-#line 4030 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4054 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 9393 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9419 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 727:
-#line 4034 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4058 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 9401 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9427 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 728:
-#line 4038 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4062 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].u.identifier), current_scope, global_scope, current_lexer);
 }
-#line 9409 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9435 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 729:
-#line 4042 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4066 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A variable named "final".  C++11 explicitly permits this.
   CPPIdentifier *ident = new CPPIdentifier("final", (yylsp[0]));
   (yyval.u.expr) = new CPPExpression(ident, current_scope, global_scope, current_lexer);
 }
-#line 9419 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9445 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 730:
-#line 4048 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4072 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // A variable named "override".  C++11 explicitly permits this.
   CPPIdentifier *ident = new CPPIdentifier("override", (yylsp[0]));
   (yyval.u.expr) = new CPPExpression(ident, current_scope, global_scope, current_lexer);
 }
-#line 9429 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9455 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 731:
-#line 4054 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4078 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr());
 }
-#line 9437 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9463 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 732:
-#line 4062 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4086 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.closure_type) = new CPPClosureType();
 }
-#line 9445 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9471 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 733:
-#line 4066 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4090 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.closure_type) = new CPPClosureType(CPPClosureType::CT_by_value);
 }
-#line 9453 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9479 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 734:
-#line 4070 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4094 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.closure_type) = new CPPClosureType(CPPClosureType::CT_by_reference);
 }
-#line 9461 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9487 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 735:
-#line 4074 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4098 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.closure_type) = new CPPClosureType();
   (yyvsp[-1].u.capture)->_initializer = (yyvsp[0].u.expr);
   (yyval.u.closure_type)->_captures.push_back(*(yyvsp[-1].u.capture));
   delete (yyvsp[-1].u.capture);
 }
-#line 9472 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9498 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 736:
-#line 4081 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4105 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.closure_type) = (yyvsp[-3].u.closure_type);
   (yyvsp[-1].u.capture)->_initializer = (yyvsp[0].u.expr);
   (yyval.u.closure_type)->_captures.push_back(*(yyvsp[-1].u.capture));
   delete (yyvsp[-1].u.capture);
 }
-#line 9483 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9509 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 737:
-#line 4091 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4115 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.capture) = new CPPClosureType::Capture;
   (yyval.u.capture)->_name = (yyvsp[0].u.identifier)->get_simple_name();
   (yyval.u.capture)->_type = CPPClosureType::CT_by_reference;
 }
-#line 9493 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9519 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 738:
-#line 4097 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4121 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.capture) = new CPPClosureType::Capture;
   (yyval.u.capture)->_name = (yyvsp[-1].u.identifier)->get_simple_name();
   (yyval.u.capture)->_type = CPPClosureType::CT_by_reference;
 }
-#line 9503 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9529 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 739:
-#line 4103 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4127 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.capture) = new CPPClosureType::Capture;
   (yyval.u.capture)->_name = (yyvsp[0].u.identifier)->get_simple_name();
@@ -9515,11 +9539,11 @@ yyreduce:
     (yyval.u.capture)->_type = CPPClosureType::CT_by_value;
   }
 }
-#line 9517 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9543 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 740:
-#line 4113 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4137 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.capture) = new CPPClosureType::Capture;
   (yyval.u.capture)->_name = (yyvsp[0].u.identifier)->get_simple_name();
@@ -9528,189 +9552,189 @@ yyreduce:
     yywarning("only capture name 'this' may be preceded by an asterisk", (yylsp[0]));
   }
 }
-#line 9530 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9556 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 741:
-#line 4125 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4149 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPType *type = (yyvsp[0].u.identifier)->find_type(current_scope, global_scope, true);
-  if (type == NULL) {
+  if (type == nullptr) {
     type = CPPType::new_type(new CPPTBDType((yyvsp[0].u.identifier)));
   }
   (yyval.u.type) = type;
 }
-#line 9542 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9568 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 742:
-#line 4133 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4157 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[0].u.identifier)));
 }
-#line 9550 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9576 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 743:
-#line 4137 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4161 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   CPPClassTemplateParameter *ctp = new CPPClassTemplateParameter((yyvsp[-1].u.identifier));
   ctp->_packed = true;
   (yyval.u.type) = CPPType::new_type(ctp);
 }
-#line 9560 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9586 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 744:
-#line 4167 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4191 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9568 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9594 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 745:
-#line 4171 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4195 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9576 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9602 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 746:
-#line 4175 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4199 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9584 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9610 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 747:
-#line 4179 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4203 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("final", (yylsp[0]));
 }
-#line 9592 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9618 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 748:
-#line 4183 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4207 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("override", (yylsp[0]));
 }
-#line 9600 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9626 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 749:
-#line 4187 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4211 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // This is not a keyword in Python, so it is useful to be able to use this
   // in MAKE_PROPERTY definitions, etc.
   (yyval.u.identifier) = new CPPIdentifier("signed", (yylsp[0]));
 }
-#line 9610 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9636 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 750:
-#line 4193 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4217 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("float", (yylsp[0]));
 }
-#line 9618 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9644 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 751:
-#line 4197 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4221 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("public", (yylsp[0]));
 }
-#line 9626 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9652 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 752:
-#line 4201 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4225 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("private", (yylsp[0]));
 }
-#line 9634 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9660 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 753:
-#line 4205 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4229 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("static", (yylsp[0]));
 }
-#line 9642 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9668 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 754:
-#line 4209 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4233 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("default", (yylsp[0]));
 }
-#line 9650 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9676 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 755:
-#line 4220 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4244 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9658 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9684 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 756:
-#line 4224 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4248 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9666 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9692 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 757:
-#line 4228 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4252 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = (yyvsp[0].u.identifier);
 }
-#line 9674 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9700 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 758:
-#line 4232 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4256 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.identifier) = new CPPIdentifier("override", (yylsp[0]));
 }
-#line 9682 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9708 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 759:
-#line 4240 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4264 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = new CPPExpression((yyvsp[0].str));
 }
-#line 9690 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9716 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 760:
-#line 4244 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4268 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   (yyval.u.expr) = (yyvsp[0].u.expr);
 }
-#line 9698 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9724 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 761:
-#line 4248 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4272 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // The right string takes on the literal type of the left.
   (yyval.u.expr) = (yyvsp[-1].u.expr);
   (yyval.u.expr)->_str += (yyvsp[0].str);
 }
-#line 9708 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9734 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
   case 762:
-#line 4254 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1646  */
+#line 4278 "dtool/src/cppparser/cppBison.yxx" /* yacc.c:1648  */
     {
   // We have to check that the two literal types match up.
   (yyval.u.expr) = (yyvsp[-1].u.expr);
@@ -9719,11 +9743,11 @@ yyreduce:
   }
   (yyval.u.expr)->_str += (yyvsp[0].u.expr)->_str;
 }
-#line 9721 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9747 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
     break;
 
 
-#line 9725 "built/tmp/cppBison.yxx.c" /* yacc.c:1646  */
+#line 9751 "built/tmp/cppBison.yxx.c" /* yacc.c:1648  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -9846,7 +9870,6 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  yyerror_range[1] = yylsp[1-yylen];
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
diff --git a/dtool/src/cppparser/cppBison.h.prebuilt b/dtool/src/cppparser/cppBison.h.prebuilt
index a2ec1fca8c..c33ce691eb 100644
--- a/dtool/src/cppparser/cppBison.h.prebuilt
+++ b/dtool/src/cppparser/cppBison.h.prebuilt
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.0.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
    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
diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx
index 5c2721eea7..5a82fa5d9f 100644
--- a/dtool/src/cppparser/cppBison.yxx
+++ b/dtool/src/cppparser/cppBison.yxx
@@ -1185,14 +1185,27 @@ constructor_prototype:
 /* Functions with implicit return types, and constructors */
         IDENTIFIER '('
 {
-  push_scope($1->get_scope(current_scope, global_scope));
+  // Create a scope for this function.
+  CPPScope *scope = new CPPScope($1->get_scope(current_scope, global_scope),
+                                 $1->_names.back(), V_private);
+
+  // It still needs to be able to pick up any template arguments, if this is
+  // a definition for a method template.  Add a fake "using" declaration to
+  // accomplish this.
+  scope->_using.insert(current_scope);
+
+  push_scope(scope);
 }
         function_parameter_list ')' function_post
 {
+  CPPScope *scope = $1->get_scope(current_scope, global_scope);
   CPPType *type;
-  if ($1->get_simple_name() == current_scope->get_simple_name() ||
-      $1->get_simple_name() == string("~") + current_scope->get_simple_name()) {
-    // This is a constructor, and has no return.
+  std::string simple_name = $1->get_simple_name();
+  if (!simple_name.empty() && simple_name[0] == '~') {
+    // A destructor has no return type.
+    type = new CPPSimpleType(CPPSimpleType::T_void);
+  } else if (scope != nullptr && simple_name == scope->get_simple_name()) {
+    // Neither does a constructor.
     type = new CPPSimpleType(CPPSimpleType::T_void);
   } else {
     // This isn't a constructor, so it has an implicit return type of
@@ -1209,7 +1222,16 @@ constructor_prototype:
 }
         | TYPENAME_IDENTIFIER '('
 {
-  push_scope($1->get_scope(current_scope, global_scope));
+  // Create a scope for this function.
+  CPPScope *scope = new CPPScope($1->get_scope(current_scope, global_scope),
+                                 $1->_names.back(), V_private);
+
+  // It still needs to be able to pick up any template arguments, if this is
+  // a definition for a method template.  Add a fake "using" declaration to
+  // accomplish this.
+  scope->_using.insert(current_scope);
+
+  push_scope(scope);
 }
         function_parameter_list ')' function_post
 {