github-linguist 7.20.0 → 7.22.1

data/ext/linguist/lex.linguist_yy.c

@@ -541,13 +541,12 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
  */
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
-	yyg->yytext_ptr -= yyg->yy_more_len; \
-	yyleng = (int) (yy_cp - yyg->yytext_ptr); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 45
-#define YY_END_OF_BUFFER 46
+#define YY_NUM_RULES 79
+#define YY_END_OF_BUFFER 80
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -555,64 +554,36 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_acclist[262] =
+static const flex_int16_t yy_accept[255] =
     {   0,
-       46,   44,   45,   42,   44,   45,16422,   31,   44,   45,
-       42,   44,   45,16422,   32,   44,   45,   36,   44,   45,
-       36,   44,   45,   43,   44,   45,   33,   34,   44,   45,
-       33,   34,   44,   45,   43,   44,   45,   34,   44,   45,
-       36,   44,   45,   34,   42,   44,   45,16422,   36,   44,
-       45,   44,   45,   31,   44,   45,   42,   44,   45,16422,
-       42,   44,   45,16422,   32,   44,   45,   42,   44,   45,
-    16422,   42,   44,   45,16422,   43,   44,   45,   42,   44,
-       45,16422,   22,   45,   22,   45,   22,   45,   22,   45,
-       22,   45,   22,   45,   22,   45,   22,   45,   45,   42,
-
-       45,16422,   43,   45,   37,   42,16422,   30,   34,   37,
-       34,   42,16422,   30,   35,   18,   39,   15,   33,   33,
-       34,   34,   34,   33,   34,   33,   34,   34,   17,    8,
-        8,    3,   37,    3,   37,   42,16422,   42,16422,    7,
-       37,    7,   37,   42,16422,   42,16422,   37,   42,16422,
-       34,   37,    5,    9,   37,    9,   37,   42,16422,   23,
-       25,   26, 8230,   19,   20,   14,   13,   41,   33,   33,
-       33,   33,   34,   33,   34,    3,    3,    7,    7,    5,
-        9,    9,    8,    3,   37,    2,   37,    2,   37,    2,
-       42,16422,    2,   37,    7,   11,    6,   37,    6,   37,
-
-       10,   37,   34,    5,   39,    5,   39,    5,    5,    5,
-       41,    5,    5,    9,   24,   27,   28,   29,   12,   33,
-       33,   33,   34,   33,   33,   34,   33,   34,   33,   34,
-       16,    6,    6,    5,    2,    2,    2,    2,   11,   11,
-        6,   10,   10,   10,   21,    4,    5,    4,    5,    5,
-       40,   33,   33,   33,    2,    4,    5,    5,    5,   40,
-        1
-    } ;
-
-static const flex_int16_t yy_accept[211] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-        4,    8,   11,   15,   18,   21,   24,   27,   31,   35,
-       38,   41,   44,   49,   52,   54,   57,   61,   65,   68,
-       72,   76,   79,   83,   85,   87,   89,   91,   93,   95,
-       97,   99,  100,  103,  105,  106,  108,  108,  108,  109,
-      111,  114,  115,  116,  117,  118,  119,  119,  119,  120,
-      122,  123,  124,  126,  128,  129,  129,  130,  130,  130,
-      130,  130,  130,  130,  130,  131,  132,  134,  136,  138,
-      140,  142,  144,  146,  146,  146,  148,  149,  151,  153,
-
-      154,  156,  158,  160,  161,  161,  162,  163,  163,  163,
-      163,  164,  164,  165,  166,  167,  168,  169,  169,  169,
-      170,  171,  172,  174,  176,  176,  177,  178,  179,  180,
-      180,  181,  182,  183,  184,  185,  186,  187,  188,  190,
-      193,  195,  196,  197,  199,  201,  201,  201,  203,  204,
-      206,  208,  209,  210,  212,  213,  214,  215,  216,  217,
-      218,  219,  219,  220,  220,  221,  222,  224,  225,  227,
-      229,  231,  232,  233,  234,  235,  235,  236,  236,  237,
-      238,  238,  239,  240,  241,  242,  243,  244,  245,  246,
-      248,  250,  251,  252,  253,  254,  255,  255,  256,  258,
-
-      259,  259,  259,  261,  261,  261,  261,  262,  262,  262
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   80,   78,   60,   32,
+       61,   62,   63,   64,   33,   39,   39,   65,   66,   67,
+       59,   68,   52,   34,   34,   69,   70,   52,   49,   52,
+       71,   72,   35,   41,   73,   41,   74,   75,   40,   76,
+       40,   77,   78,   32,   61,   62,   63,   33,   59,   68,
+       52,   70,   23,   23,   23,   23,   23,   23,   23,   23,
+       60,   48,   51,   54,   31,   61,   35,   62,   42,    0,
+       42,   63,   53,   64,   44,   45,   31,   39,   36,   19,
+        0,    0,   39,   65,   66,   67,   59,   46,   56,   57,
+
+       68,   16,   52,   34,   34,   35,   34,   34,   35,   55,
+       69,   70,   50,   50,   44,   47,   52,   52,   49,   52,
+       49,   44,   71,   72,    0,   41,   38,   73,   41,   74,
+       75,   18,    0,   40,   37,   76,   40,   77,    0,    0,
+        0,    0,    0,    0,    0,    8,    8,    3,    3,    0,
+       61,    0,    7,    7,   63,    0,    0,   59,    0,    0,
+       35,    5,    9,    9,   70,   24,    0,   26,   27,    0,
+        0,    0,   20,   42,   21,    0,   58,   56,   57,   15,
+       14,    0,   34,   34,   34,   34,   34,    0,    0,    0,
+        0,    5,    8,    3,    0,    2,    0,    2,    2,   12,
+
+        7,   11,    6,    6,   10,   35,    5,    5,    5,    5,
+        9,   25,   28,   29,   30,    0,   13,   34,   34,   34,
+       34,   34,   34,   34,   17,    0,    0,    0,    2,   12,
+       12,   11,   11,    6,   10,   10,   22,    4,    4,   43,
+       34,   34,   34,    0,    2,    4,    0,    0,    0,    0,
+        0,    1,    0,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -620,17 +591,17 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    5,    6,    7,    8,    9,    8,   10,   11,
-       12,   13,   14,    8,   15,   16,   17,   18,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,    8,   20,   21,
-       22,   23,    8,   24,   25,   25,   25,   25,   26,   27,
-       28,   28,   28,   28,   28,   29,   28,   28,   28,   28,
-       28,   28,   28,   28,   30,   28,   28,   28,   28,   28,
-       31,   32,   33,    8,   34,    8,   25,   25,   25,   25,
-
-       35,   27,   36,   28,   37,   28,   28,   29,   28,   38,
-       28,   28,   28,   28,   28,   28,   30,   39,   28,   40,
-       28,   28,   41,    8,   42,    8,    1,    1,    1,    1,
+        1,    4,    5,    6,    7,    8,    9,   10,   11,   12,
+       13,   14,   15,   16,   17,   18,   19,   20,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   22,   23,   24,
+       25,   26,   27,   28,   29,   29,   29,   29,   30,   31,
+       32,   32,   32,   32,   32,   33,   32,   32,   32,   32,
+       32,   32,   32,   32,   34,   32,   32,   32,   32,   32,
+       35,   36,   37,   38,   32,   39,   29,   29,   29,   29,
+
+       40,   31,   41,   32,   42,   32,   32,   33,   32,   43,
+       32,   32,   32,   32,   32,   32,   34,   44,   32,   45,
+       32,   32,   46,   47,   48,   49,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -647,256 +618,243 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[43] =
+static const YY_CHAR yy_meta[50] =
     {   0,
-        1,    2,    3,    2,    4,    1,    4,    4,    4,    1,
-        1,    1,    1,    4,    4,    4,    5,    6,    6,    4,
-        1,    4,    4,    4,    6,    6,    6,    6,    6,    6,
-        1,    4,    1,    7,    6,    6,    6,    6,    6,    6,
-        1,    1
+        1,    2,    3,    2,    4,    1,    5,    1,    4,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    6,    7,
+        7,    1,    1,    4,    1,    4,    4,    4,    7,    7,
+        7,    7,    7,    7,    1,    1,    1,    1,    1,    7,
+        7,    7,    7,    7,    7,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[228] =
+static const flex_int16_t yy_base[272] =
     {   0,
-        0,   41,  521,  520,  517,  516,  515,  514,  514,  505,
-      511,  510,  499,  498,  490,  489,   57,   87,  504,  680,
-      117,  497,  151,  492,   40,  680,   42,  178,  461,  206,
-        0,  467,    0,   34,  226,   79,   83,  244,   65,  114,
-      110,  208,  235,  680,  482,  483,  455,  484,  489,  484,
-      477,  680,  141,  256,  680,  233,  479,  486,  484,    0,
-        0,  478,  680,  680,  680,   41,  258,  267,  273,  445,
-        0,   84,   86,  455,  279,  468,  680,    0,  102,  195,
-      278,  467,  462,  206,  680,    0,  680,    0,  313,  309,
-      680,    0,    0,  218,  469,  292,  305,  316,  438,  353,
-
-      680,    0,  324,  680,  448,  680,  680,  462,  455,  461,
-      680,  448,  680,  680,  680,  445,  680,  446,  113,  119,
-      427,  378,  417,  392,  397,  680,    0,  680,    0,  132,
-      251,  680,    0,    0,    0,  396,  431,  392,  227,  399,
-      386,    0,  403,  680,    0,  421,  396,  333,  326,  318,
-      680,  197,  307,  280,  269,   55,    0,  680,  680,  680,
-      680,  255,  680,  219,  202,  410,    0,  451,    0,  271,
-        0,  680,  680,    0,  680,  322,  211,  178,  310,  403,
-      228,  391,  140,  680,    0,  117,  113,  680,  680,  680,
-       90,  331,  680,  680,  279,    0,  273,  438,   81,  440,
-
-      419,  485,   41,  443,  450,  418,  524,  455,  680,  564,
-      571,  578,  585,  586,  593,  600,  607,  614,  621,  627,
-      630,  637,  644,  651,  658,  665,  672
+        0,   48,  598,  597,  593,  592,  591,  590,  592,  591,
+      566,  543,  524,  519,  511,  510,  522,  613,   48,  509,
+      501,   56,   51,   59,  482,   68,  479,   37,   63,  475,
+       73,   86,   89,   98,  445,   95,  466,  139,   85,  126,
+       95,   51,  475,   52,  445,  443,   58,  439,  107,  137,
+      429,  108,  183,  165,  169,  471,  179,  175,  182,  176,
+      195,  190,  613,  456,  457,  425,  459,  465,  459,  451,
+       67,  443,  613,  613,  461,  459,  458,  456,  451,  425,
+      415,  451,  434,  447,  423,  613,  437,  147,  434,  613,
+      428,  423,  425,  423,  421,  418,  109,  407,   80,  176,
+
+      414,  156,  191,  204,  386,  216,  209,  168,  225,  613,
+      408,  406,  411,  613,  410,  409,  217,  233,  171,  242,
+      202,  613,  398,  396,  405,  192,  385,  385,  383,  381,
+      379,  613,  399,  201,  368,  368,  365,  361,    0,  259,
+      266,  268,  392,  389,  271,  613,    0,  613,    0,  276,
+      278,  403,  613,    0,  280,  284,  400,  287,  296,  397,
+      223,  298,  613,    0,  289,  613,  373,  613,  613,  392,
+      386,  391,  613,  353,  613,  369,  613,  613,  613,  613,
+      367,  236,  274,  352,  288,  269,  315,  367,  365,  355,
+      307,  320,    0,    0,  348,  324,  324,  325,  299,  331,
+
+        0,  312,  613,    0,  303,  311,  296,  613,  327,  351,
+        0,  613,  613,  613,  613,  274,  613,  246,  320,  241,
+      371,    0,  322,    0,  613,  161,  133,  220,  110,  134,
+      613,  120,  613,    0,  102,  613,  613,  613,   72,  613,
+      613,  346,    0,  319,  362,   58,  352,  410,  374,  370,
+      377,  454,  378,  613,  499,  502,  506,  512,  519,  525,
+      532,  539,  546,  548,  555,  562,  569,  576,  583,  590,
+      597
     } ;
 
-static const flex_int16_t yy_def[228] =
+static const flex_int16_t yy_def[272] =
     {   0,
-      209,    1,  210,  210,  210,  210,  210,  210,  210,  210,
-      210,  210,  210,  210,  210,  210,  211,  211,  209,  209,
-      212,  209,  209,  209,  209,  209,  213,  209,   28,  213,
-      214,  209,   23,  209,  209,  209,   23,  212,  209,   38,
-       23,  213,   38,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,   38,  213,  209,   38,  209,  209,  209,  214,
-       23,  209,  209,  209,  209,  209,  213,  213,  209,   28,
-      214,  214,  214,  214,  214,  209,  209,   35,  209,  209,
-      209,  209,  209,  209,  209,  215,  209,  216,   23,   38,
-      209,  217,   38,  209,  209,   38,  209,   38,  214,  209,
-
-      209,  218,   38,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  214,   28,  209,  209,  216,  209,  217,  209,
-      219,  209,  218,  215,  216,  220,  220,  221,  137,   89,
-      137,  217,  222,  209,  223,  209,  209,  224,  214,  219,
-      209,  219,  219,  219,  100,  100,  218,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  214,  209,  124,  124,
-      124,  209,  209,  223,  209,  137,  137,  221,  137,  137,
-      221,  137,  222,  209,  223,  224,  224,  209,  209,  209,
-      225,  219,  209,  209,  168,  168,  221,  137,  225,  219,
-
-      221,  226,  219,  221,  226,  227,  226,  227,    0,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209
+      254,    1,  255,  255,  255,  255,  255,  255,  255,  255,
+      255,  255,  255,  255,  255,  255,  254,  254,  254,  254,
+      256,  256,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  256,  254,  254,   34,  254,  254,  254,  254,  254,
+      254,  256,  256,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  256,   22,  254,  254,  254,   32,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  256,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+
+      254,  254,  254,  254,   34,  256,  256,  256,  256,  254,
+      254,  254,  254,  254,  254,  254,  257,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,   53,  254,
+      254,  254,  254,  254,  254,  254,  258,  254,  259,  260,
+      254,  254,  254,  261,  254,  254,  254,  254,  254,  254,
+      256,  262,  254,  263,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  256,  254,  254,  254,  254,
+      254,  262,  258,  259,  260,  195,  264,  195,  198,  265,
+
+      261,  266,  254,  267,  268,  256,  262,  254,  262,  262,
+      263,  254,  254,  254,  254,  254,  254,  254,  254,  256,
+      254,  187,  187,  187,  254,  254,  254,  264,  198,  265,
+      254,  266,  254,  267,  268,  254,  254,  254,  269,  254,
+      254,  221,  221,  264,  198,  269,  264,  270,  264,  270,
+      271,  270,  271,    0,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254
     } ;
 
-static const flex_int16_t yy_nxt[723] =
+static const flex_int16_t yy_nxt[663] =
     {   0,
-       20,   20,   20,   20,   21,   22,   23,   21,   21,   24,
-       25,   26,   21,   21,   21,   23,   27,   28,   29,   21,
-       30,   21,   21,   23,   31,   31,   31,   31,   31,   31,
-       32,   21,   26,   33,   31,   31,   31,   31,   31,   31,
-       34,   26,   35,  175,   35,  115,   36,   37,   77,   38,
-       39,   63,   64,  116,   66,   40,   41,   42,   67,  192,
-       43,   53,   68,   53,   53,   53,   94,  153,   94,   53,
-       53,   53,   53,   54,   62,   63,   53,   54,   53,   53,
-       53,   85,   86,  175,   59,   87,   88,   89,   53,   90,
-       53,   53,  175,   53,   53,   53,   95,  122,  122,   53,
-
-       53,   53,   53,   54,   85,   86,   53,   54,   53,   53,
-       53,   97,   73,   97,   73,  209,   55,   55,   53,  188,
-       53,   56,   56,   56,   56,   56,  122,  122,   96,   56,
-       56,   56,   56,   57,  173,  174,   56,   58,   56,   56,
-       56,   98,  209,   55,   55,  120,   99,  120,   56,   56,
-       56,   55,   55,   55,   55,   56,   55,   56,   56,   56,
-       55,   55,   55,   56,   56,   56,   56,   57,   60,   60,
-       56,   58,   56,   56,   56,   60,   60,   60,   60,   60,
-       60,   55,   56,   55,   61,   60,   60,   60,   60,   60,
-       60,   55,   55,   69,  181,   70,   70,  126,  127,  190,
-
-      191,   80,   71,   72,   73,   71,   73,   74,  132,  133,
-       76,   71,   72,   71,   71,   71,   71,   75,  209,   94,
-       66,   94,   67,  209,  100,   84,   68,   78,   68,   78,
-      194,   79,   80,  193,   81,   55,   55,  101,  102,  209,
-       82,   56,   83,   56,  181,   84,   91,   92,   56,   95,
-       56,   56,   93,  175,  103,  152,   56,   56,   56,   56,
-       57,  179,  197,   56,   58,   56,   56,   56,  209,  111,
-      117,  118,   67,  153,   67,   56,   68,   56,   68,  209,
-      128,  129,  175,   67,  122,  122,   81,   68,   69,  181,
-       69,   69,  122,  122,  144,  145,  124,  124,  119,  120,
-
-       56,  120,  121,  124,  124,  124,  146,  119,  146,  175,
-      201,   87,   88,  124,  136,   90,  136,   56,   55,   55,
-      175,  148,  209,  176,   56,  176,  101,  102,  189,  137,
-      138,  138,   56,  175,  209,  188,  147,  139,  139,  139,
-      139,  139,  139,  103,  179,  200,  140,  141,  139,  139,
-      139,  139,  139,  150,  150,  151,  150,  152,  150,  153,
-      153,  153,  150,  150,  150,  154,  153,  153,  153,  155,
-      150,  150,  153,  156,  153,  153,  153,  150,  150,  150,
-      150,  150,  150,  150,  153,  150,  153,  150,  150,  150,
-      150,  150,  150,  150,  150,  166,  166,  176,  209,  176,
-
-       55,  186,   55,  209,  120,  184,  120,  168,  181,  169,
-      169,  172,  177,  178,  178,  209,  169,  170,  171,  202,
-      179,  202,  146,  182,  146,  179,  170,  166,  166,  198,
-      180,   71,  209,  139,  209,  181,  120,  179,  120,  202,
-      182,  202,  175,  111,  202,  167,  202,  177,  178,  178,
-      209,  209,  147,  209,  203,  165,  202,  204,  202,  181,
-      164,  163,  162,  161,  160,  180,  168,  159,  168,  168,
-      158,  206,  179,  149,  143,  168,  195,  196,  131,  120,
-      121,  130,  125,  123,   71,  195,  202,  114,  202,  113,
-      112,  111,  110,  109,  108,  107,  106,  105,  104,   63,
-
-       71,   62,   59,  209,   51,   51,  206,   50,   50,  207,
-      207,  207,  207,  207,  207,   49,   49,   48,  207,  207,
-      207,  207,  207,  207,  207,  209,   48,  209,   47,   47,
-       46,   46,   45,   45,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  206,  209,  209,  207,  207,
-      207,  207,  207,  207,  209,  209,  209,  207,  207,  207,
-      207,  207,  207,  207,   44,   44,   44,   44,   44,   44,
-       44,   52,   52,   52,   52,   52,   52,   52,   55,   55,
-       55,   55,   55,   55,   55,   65,   65,   65,  209,   65,
-       65,   71,   71,  134,  134,  209,  134,  134,  134,  134,
-
-      135,  135,  209,  135,  135,  135,  135,  142,  142,  209,
-      142,  142,  142,  142,  157,  157,  209,  157,  157,  157,
-      157,  153,  153,  153,  153,  153,  153,  153,  179,  209,
-      209,  179,  179,  179,  178,  178,  178,  183,  183,  183,
-      183,  183,  183,  183,  185,  185,  209,  185,  185,  185,
-      185,  187,  187,  187,  187,  187,  187,  187,  199,  199,
-      199,  199,  199,  199,  199,  205,  205,  205,  205,  205,
-      205,  205,  208,  208,  208,  208,  208,  208,  208,   19,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209
+       18,   18,   18,   18,   19,   20,   21,   22,   23,   24,
+       25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
+       35,   36,   37,   38,   39,   40,   41,   42,   43,   43,
+       43,   43,   43,   43,   44,   45,   46,   47,   48,   43,
+       43,   43,   43,   43,   43,   49,   50,   51,   52,   53,
+       94,   53,   71,   54,   55,   56,   57,  254,   58,   82,
+      208,   83,  254,   78,   59,   60,   61,   79,   84,  125,
+       62,   71,   72,   73,  208,   83,   73,   95,  124,   88,
+       89,   90,   83,   83,   85,   91,  126,   83,  127,   97,
+       80,   72,  254,   99,   92,  130,   74,   83,   98,   99,
+
+      100,   81,  102,  101,  254,   86,  178,  103,  121,  119,
+      121,  110,  103,   83,  103,  104,  111,  105,  105,   83,
+       73,  123,  254,  132,  133,   97,   77,  106,  107,   77,
+      107,  108,   83,   74,   98,  122,  254,  106,   77,   77,
+       77,   77,  109,  113,  103,  114,   86,  114,  115,  120,
+      119,  120,  134,  245,  135,  116,  138,  117,   88,   89,
+      180,   83,  118,  119,  120,  114,  114,  146,  147,  181,
+       75,  148,  149,  150,  254,  151,  156,  159,  156,  159,
+      240,  153,  154,  136,  139,   87,  139,  155,  140,  141,
+      100,  142,  163,  164,  121,  119,  121,  240,  158,  143,
+
+      186,  144,  179,   83,   73,  145,   83,   98,  102,  103,
+      157,  160,  165,  162,  103,  254,  103,  161,  103,   83,
+      103,  104,  254,  104,  104,  121,  126,  121,  127,  254,
+      185,  254,  185,  182,  183,  103,  183,  184,  228,  107,
+      103,  107,  103,  182,  187,  187,  134,  254,  135,  116,
+      185,  103,  185,  187,  187,  187,  118,  119,  120,  244,
+      103,  146,  147,  206,  187,  120,  119,  120,  148,  149,
+      153,  154,  141,  163,  164,  254,  142,  195,  241,  195,
+      148,  149,  153,  154,  151,  156,  240,  156,  155,  203,
+      204,  163,  164,  145,  196,  197,  197,  159,  208,  159,
+
+      208,  220,  209,   97,  183,  236,  183,  219,  219,  203,
+      204,  165,   98,  237,  233,  199,  210,  254,  183,  157,
+      183,  210,  208,  210,  209,  254,  254,  254,  254,  238,
+      239,  160,  221,  231,  222,  222,  185,  228,  185,  219,
+      219,  229,  228,  222,  223,  224,   77,  107,  108,  195,
+      183,  195,  183,  208,  223,   77,   77,   77,   77,   77,
+      185,  247,  185,  248,  198,  248,  196,  197,  197,  210,
+      228,  254,  227,  254,  210,  248,  210,  248,  248,  248,
+      248,  248,  226,  225,  218,  217,  216,  199,  221,  174,
+      221,  221,  228,  215,  251,  249,  214,  213,  212,  221,
+
+      242,  243,  205,  183,  184,  202,  200,  192,  191,  138,
+      242,  248,  137,  248,  136,  135,  190,  131,  130,  129,
+      128,  127,  189,  124,  123,  116,  122,  188,  112,  111,
+       77,  101,   98,   96,  251,   95,   94,   93,  252,  252,
+      252,  252,  252,  252,  177,  176,   89,  175,  122,  252,
+      252,  252,  252,  252,  252,  254,   84,  254,   83,   82,
+       81,  174,   79,   78,  254,   76,  173,   72,  172,  171,
+      170,  169,  168,  167,  166,  152,  137,  131,  251,  129,
+      128,  254,  252,  252,  252,  252,  252,  252,  112,   77,
+       96,   93,   87,  252,  252,  252,  252,  252,  252,   63,
+
+       63,   63,   63,   63,   63,   63,   77,   76,   77,  114,
+      114,  114,  193,  193,   75,  193,  193,  193,  193,  194,
+      194,  254,  194,  194,  194,  194,  198,   70,   70,   69,
+      198,  198,  201,  201,   69,  201,  201,  201,  201,  207,
+      207,  207,  207,  207,  207,  207,  211,  211,   68,  211,
+      211,  211,  211,  197,  197,  230,  230,  230,  230,  230,
+      230,  230,  232,  232,  232,  232,  232,  232,  232,  234,
+      234,   68,  234,  234,  234,  234,  235,  235,  235,  235,
+      235,  235,  235,  246,  246,  246,  246,  246,  246,  246,
+      250,  250,  250,  250,  250,  250,  250,  253,  253,  253,
+
+      253,  253,  253,  253,   67,   67,   66,   66,   65,   65,
+       64,   64,   17,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254
     } ;
 
-static const flex_int16_t yy_chk[723] =
+static const flex_int16_t yy_chk[663] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    2,  203,    2,   66,    2,    2,   34,    2,
-        2,   25,   25,   66,   27,    2,    2,    2,   27,  156,
-        2,   17,   27,   17,   17,   17,   39,  156,   39,   17,
-       17,   17,   17,   17,   39,   34,   17,   17,   17,   17,
-       17,   36,   36,  199,   36,   37,   37,   37,   17,   37,
-       17,   18,  191,   18,   18,   18,   39,   72,   72,   18,
-
-       18,   18,   18,   18,   79,   79,   18,   18,   18,   18,
-       18,   41,   73,   41,   73,  187,   40,   40,   18,  186,
-       18,   21,   40,   21,   21,   21,  119,  119,   40,   21,
-       21,   21,   21,   21,  130,  130,   21,   21,   21,   21,
-       21,   41,  183,   53,   53,  120,   41,  120,   21,   53,
-       21,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   28,  178,   28,   28,   80,   80,  152,
-
-      152,   80,   28,   28,   28,   28,   28,   28,   84,   84,
-       30,   28,   28,   28,   28,   28,   28,   28,   30,   94,
-       42,   94,   30,  177,   42,   84,   30,   35,   42,   35,
-      165,   35,   35,  164,   35,   56,   56,   43,   43,  139,
-       35,   56,   35,   43,  181,   35,   38,   38,   38,   94,
-       38,   38,   38,  131,   43,  131,   38,   38,   38,   38,
-       38,  139,  181,   38,   38,   38,   38,   38,   54,  162,
-       67,   68,   54,  155,   67,   38,   54,   38,   67,   68,
-       81,   81,  154,   68,  170,  170,   81,   68,   69,  197,
-       69,   69,  195,  195,   96,   96,   75,   75,   69,   69,
-
-       96,   69,   69,   75,   75,   75,   97,   69,   97,  153,
-      197,   90,   90,   75,   89,   90,   89,   90,   98,   98,
-      150,   98,  179,  176,   98,  176,  103,  103,  149,   89,
-       89,   89,  103,  192,  176,  148,   97,   89,   89,   89,
-       89,   89,   89,  103,  179,  192,   89,   89,   89,   89,
-       89,   89,   89,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  100,  122,  122,  136,  141,  136,
-
-      140,  147,  140,  182,  122,  143,  122,  124,  138,  124,
-      124,  125,  136,  136,  136,  180,  124,  124,  124,  206,
-      141,  206,  146,  141,  146,  182,  124,  166,  166,  182,
-      136,  124,  137,  140,  137,  201,  166,  180,  166,  198,
-      180,  198,  200,  137,  204,  123,  204,  137,  137,  137,
-      198,  205,  146,  205,  200,  121,  208,  201,  208,  204,
-      118,  116,  112,  110,  109,  137,  168,  108,  168,  168,
-      105,  205,  198,   99,   95,  168,  168,  168,   83,  168,
-      168,   82,   76,   74,   70,  168,  202,   62,  202,   59,
-       58,   57,   51,   50,   49,   48,   47,   46,   45,   32,
-
-       29,   24,   22,   19,   16,   15,  202,   14,   13,  202,
-      202,  202,  202,  202,  202,   12,   11,   10,  202,  202,
-      202,  202,  202,  202,  202,  207,    9,  207,    8,    7,
-        6,    5,    4,    3,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  207,    0,    0,  207,  207,
-      207,  207,  207,  207,    0,    0,    0,  207,  207,  207,
-      207,  207,  207,  207,  210,  210,  210,  210,  210,  210,
-      210,  211,  211,  211,  211,  211,  211,  211,  212,  212,
-      212,  212,  212,  212,  212,  213,  213,  213,    0,  213,
-      213,  214,  214,  215,  215,    0,  215,  215,  215,  215,
-
-      216,  216,    0,  216,  216,  216,  216,  217,  217,    0,
-      217,  217,  217,  217,  218,  218,    0,  218,  218,  218,
-      218,  219,  219,  219,  219,  219,  219,  219,  220,    0,
-        0,  220,  220,  220,  221,  221,  221,  222,  222,  222,
-      222,  222,  222,  222,  223,  223,    0,  223,  223,  223,
-      223,  224,  224,  224,  224,  224,  224,  224,  225,  225,
-      225,  225,  225,  225,  225,  226,  226,  226,  226,  226,
-      226,  226,  227,  227,  227,  227,  227,  227,  227,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  209,  209,
-      209,  209
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+       28,    2,   19,    2,    2,    2,    2,   42,    2,   23,
+      246,   28,   22,   22,    2,    2,    2,   22,   24,   44,
+        2,   71,   19,   19,  239,   23,   23,   29,   42,   26,
+       26,   26,   47,   24,   24,   26,   44,   29,   44,   31,
+       22,   71,   32,   99,   26,   47,   19,   31,   31,   32,
+
+       32,   22,   33,   32,  235,   24,   99,   33,   39,   39,
+       39,   36,   33,   33,   33,   34,   36,   34,   34,   36,
+       41,   41,  232,   49,   49,   97,   34,   34,   34,   34,
+       34,   34,   52,   39,   97,   40,  230,   34,   34,   34,
+       34,   34,   34,   38,   40,   38,   50,   38,   38,   40,
+       40,   40,   49,  229,   49,   38,   52,   38,   88,   88,
+      102,   50,   38,   38,   38,   38,   38,   54,   54,  102,
+       54,   55,   55,   55,  108,   55,   58,   60,   58,   60,
+      227,   57,   57,   50,   53,   58,   53,   57,   53,   53,
+      100,   53,   62,   62,  119,  119,  119,  226,   59,   53,
+
+      108,   53,  100,   57,   57,   53,   59,   59,   61,  103,
+       58,   60,   62,   61,  103,  107,  103,   60,   61,   61,
+       61,  104,  106,  104,  104,  121,  126,  121,  126,  161,
+      106,  109,  106,  104,  104,  117,  104,  104,  228,  107,
+      117,  107,  117,  104,  109,  109,  134,  220,  134,  118,
+      182,  118,  182,  109,  109,  109,  118,  118,  118,  228,
+      120,  140,  140,  161,  109,  120,  120,  120,  141,  141,
+      142,  142,  141,  145,  145,  186,  142,  150,  218,  150,
+      151,  151,  155,  155,  151,  156,  216,  156,  155,  158,
+      158,  165,  165,  145,  150,  150,  150,  159,  207,  159,
+
+      162,  186,  162,  158,  183,  205,  183,  185,  185,  191,
+      191,  165,  158,  206,  202,  150,  162,  206,  185,  156,
+      185,  162,  192,  162,  192,  196,  198,  196,  198,  209,
+      209,  159,  187,  200,  187,  187,  223,  244,  223,  219,
+      219,  199,  197,  187,  187,  187,  187,  187,  187,  195,
+      219,  195,  219,  210,  187,  187,  187,  187,  187,  187,
+      242,  244,  242,  245,  198,  245,  195,  195,  195,  210,
+      247,  250,  190,  250,  210,  249,  210,  249,  251,  253,
+      251,  253,  189,  188,  184,  181,  176,  195,  221,  174,
+      221,  221,  249,  172,  250,  247,  171,  170,  167,  221,
+
+      221,  221,  160,  221,  221,  157,  152,  144,  143,  138,
+      221,  248,  137,  248,  136,  135,  133,  131,  130,  129,
+      128,  127,  125,  124,  123,  116,  115,  113,  112,  111,
+      105,  101,   98,   96,  248,   95,   94,   93,  248,  248,
+      248,  248,  248,  248,   92,   91,   89,   87,   85,  248,
+      248,  248,  248,  248,  248,  252,   84,  252,   83,   82,
+       81,   80,   79,   78,   77,   76,   75,   72,   70,   69,
+       68,   67,   66,   65,   64,   56,   51,   48,  252,   46,
+       45,   43,  252,  252,  252,  252,  252,  252,   37,   35,
+       30,   27,   25,  252,  252,  252,  252,  252,  252,  255,
+
+      255,  255,  255,  255,  255,  255,  256,   21,  256,  257,
+      257,  257,  258,  258,   20,  258,  258,  258,  258,  259,
+      259,   17,  259,  259,  259,  259,  260,   16,   15,   14,
+      260,  260,  261,  261,   13,  261,  261,  261,  261,  262,
+      262,  262,  262,  262,  262,  262,  263,  263,   12,  263,
+      263,  263,  263,  264,  264,  265,  265,  265,  265,  265,
+      265,  265,  266,  266,  266,  266,  266,  266,  266,  267,
+      267,   11,  267,  267,  267,  267,  268,  268,  268,  268,
+      268,  268,  268,  269,  269,  269,  269,  269,  269,  269,
+      270,  270,  270,  270,  270,  270,  270,  271,  271,  271,
+
+      271,  271,  271,  271,   10,    9,    8,    7,    6,    5,
+        4,    3,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254,  254,  254,  254,  254,  254,  254,  254,  254,
+      254,  254
     } ;
 
-#define YY_TRAILING_MASK 0x2000
-#define YY_TRAILING_HEAD_MASK 0x4000
-#define REJECT \
-{ \
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yyg->yy_full_match; /* restore poss. backed-over text */ \
-yyg->yy_lp = yyg->yy_full_lp; /* restore orig. accepting pos. */ \
-yyg->yy_state_ptr = yyg->yy_full_state; /* restore orig. state */ \
-yy_current_state = *yyg->yy_state_ptr; /* restore curr. state */ \
-++yyg->yy_lp; \
-goto find_rule; \
-}
-
-#define yymore() (yyg->yy_more_flag = 1)
-#define YY_MORE_ADJ yyg->yy_more_len
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 #line 1 "tokenizer.l"
 #line 2 "tokenizer.l"
@@ -949,9 +907,9 @@ goto find_rule; \
       return 0; \
   } while (0)
 
-#line 953 "lex.linguist_yy.c"
+#line 911 "lex.linguist_yy.c"
 
-#line 955 "lex.linguist_yy.c"
+#line 913 "lex.linguist_yy.c"
 
 #define INITIAL 0
 #define c_comment 1
@@ -961,7 +919,6 @@ goto find_rule; \
 #define python_dcomment 5
 #define python_scomment 6
 #define roff_comment 7
-#define punct 8
 
 #ifndef YY_NO_UNISTD_H
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -1001,17 +958,6 @@ struct yyguts_t
     int yylineno_r;
     int yy_flex_debug_r;
 
-    yy_state_type *yy_state_buf;
-    yy_state_type *yy_state_ptr;
-    char *yy_full_match;
-    int yy_lp;
-
-    /* These are only needed for trailing context rules,
-     * but there's no conditional variable for that yet. */
-    int yy_looking_for_trail_begin;
-    int yy_full_lp;
-    int *yy_full_state;
-
     char *yytext_r;
     int yy_more_flag;
     int yy_more_len;
@@ -1210,12 +1156,6 @@ YY_DECL
 		YY_USER_INIT;
 #endif
 
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! yyg->yy_state_buf )
-            yyg->yy_state_buf = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  , yyscanner);
-            if ( ! yyg->yy_state_buf )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
 		if ( ! yyg->yy_start )
 			yyg->yy_start = 1;	/* first start state */
 
@@ -1235,19 +1175,13 @@ YY_DECL
 		}
 
 	{
-#line 58 "tokenizer.l"
+#line 56 "tokenizer.l"
 
 
-#line 1242 "lex.linguist_yy.c"
+#line 1182 "lex.linguist_yy.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
-		yyg->yy_more_len = 0;
-		if ( yyg->yy_more_flag )
-			{
-			yyg->yy_more_len = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr);
-			yyg->yy_more_flag = 0;
-			}
 		yy_cp = yyg->yy_c_buf_p;
 
 		/* Support of yytext. */
@@ -1260,64 +1194,30 @@ YY_DECL
 
 		yy_current_state = yyg->yy_start;
 		yy_current_state += YY_AT_BOL();
-
-		yyg->yy_state_ptr = yyg->yy_state_buf;
-		*yyg->yy_state_ptr++ = yy_current_state;
-
 yy_match:
 		do
 			{
 			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				yyg->yy_last_accepting_state = yy_current_state;
+				yyg->yy_last_accepting_cpos = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 210 )
+				if ( yy_current_state >= 255 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-			*yyg->yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 209 );
+		while ( yy_current_state != 254 );
+		yy_cp = yyg->yy_last_accepting_cpos;
+		yy_current_state = yyg->yy_last_accepting_state;
 
 yy_find_action:
-		yy_current_state = *--yyg->yy_state_ptr;
-		yyg->yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yyg->yy_lp && yyg->yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yyg->yy_lp];
-				if ( yy_act & YY_TRAILING_HEAD_MASK ||
-				     yyg->yy_looking_for_trail_begin )
-					{
-					if ( yy_act == yyg->yy_looking_for_trail_begin )
-						{
-						yyg->yy_looking_for_trail_begin = 0;
-						yy_act &= ~YY_TRAILING_HEAD_MASK;
-						break;
-						}
-					}
-				else if ( yy_act & YY_TRAILING_MASK )
-					{
-					yyg->yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK;
-					yyg->yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK;
-					}
-				else
-					{
-					yyg->yy_full_match = yy_cp;
-					yyg->yy_full_state = yyg->yy_state_ptr;
-					yyg->yy_full_lp = yyg->yy_lp;
-					break;
-					}
-				++yyg->yy_lp;
-				goto find_rule;
-				}
-			--yy_cp;
-			yy_current_state = *--yyg->yy_state_ptr;
-			yyg->yy_lp = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
@@ -1325,10 +1225,17 @@ do_action:	/* This label is used only to access EOF actions. */
 
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = yyg->yy_hold_char;
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			goto yy_find_action;
+
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 60 "tokenizer.l"
+#line 58 "tokenizer.l"
 {
   const char *off = strrchr(yytext, ' ');
   if (!off)
@@ -1342,7 +1249,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 71 "tokenizer.l"
+#line 69 "tokenizer.l"
 {
   const char *off = strrchr(yytext, '/');
   if (!off)
@@ -1361,261 +1268,412 @@ YY_RULE_SETUP
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 86 "tokenizer.l"
+#line 84 "tokenizer.l"
 { FEED_STATIC("COMMENT#"); return 1; }
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 87 "tokenizer.l"
+#line 85 "tokenizer.l"
 { FEED_STATIC("COMMENT//!"); return 1; }
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 88 "tokenizer.l"
+#line 86 "tokenizer.l"
 { FEED_STATIC("COMMENT//"); return 1; }
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 89 "tokenizer.l"
+#line 87 "tokenizer.l"
 { FEED_STATIC("COMMENT--"); return 1; }
 	YY_BREAK
 case 7:
 /* rule 7 can match eol */
 YY_RULE_SETUP
-#line 90 "tokenizer.l"
+#line 88 "tokenizer.l"
 { FEED_STATIC("COMMENT%"); return 1; }
 	YY_BREAK
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 91 "tokenizer.l"
+#line 89 "tokenizer.l"
 { FEED_STATIC("COMMENT\""); return 1; }
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 92 "tokenizer.l"
+#line 90 "tokenizer.l"
 { FEED_STATIC("COMMENT;"); return 1; }
 	YY_BREAK
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 93 "tokenizer.l"
+#line 91 "tokenizer.l"
 { FEED_STATIC("COMMENT.\\\""); return 1; }
 	YY_BREAK
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 94 "tokenizer.l"
+#line 92 "tokenizer.l"
 { FEED_STATIC("COMMENT'\\\""); return 1; }
 	YY_BREAK
 case 12:
+/* rule 12 can match eol */
 YY_RULE_SETUP
-#line 96 "tokenizer.l"
-{ FEED_STATIC("COMMENT/*"); return 1; }
+#line 93 "tokenizer.l"
+{ FEED_STATIC("COMMENT$!"); return 1; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 97 "tokenizer.l"
-{ FEED_STATIC("COMMENT/**"); BEGIN(c_comment); return 1; }
+#line 95 "tokenizer.l"
+{ FEED_STATIC("COMMENT/*"); return 1; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 98 "tokenizer.l"
-{ FEED_STATIC("COMMENT/*!"); BEGIN(c_comment); return 1; }
+#line 96 "tokenizer.l"
+{ FEED_STATIC("COMMENT/**"); BEGIN(c_comment); return 1; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 99 "tokenizer.l"
-{ FEED_STATIC("COMMENT/*"); BEGIN(c_comment); return 1; }
+#line 97 "tokenizer.l"
+{ FEED_STATIC("COMMENT/*!"); BEGIN(c_comment); return 1; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 100 "tokenizer.l"
-{ FEED_STATIC("COMMENT<!--"); BEGIN(xml_comment); return 1; }
+#line 98 "tokenizer.l"
+{ FEED_STATIC("COMMENT/*"); BEGIN(c_comment); return 1; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 101 "tokenizer.l"
-{ FEED_STATIC("COMMENT{-"); BEGIN(haskell_comment); return 1; }
+#line 99 "tokenizer.l"
+{ FEED_STATIC("COMMENT<!--"); BEGIN(xml_comment); return 1; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 102 "tokenizer.l"
-{ FEED_STATIC("COMMENT(*"); BEGIN(ocaml_comment); return 1; }
+#line 100 "tokenizer.l"
+{ FEED_STATIC("COMMENT{-"); BEGIN(haskell_comment); return 1; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 103 "tokenizer.l"
-{ FEED_STATIC("COMMENT\"\"\""); BEGIN(python_dcomment); return 1; }
+#line 101 "tokenizer.l"
+{ FEED_STATIC("COMMENT(*"); BEGIN(ocaml_comment); return 1; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 104 "tokenizer.l"
-{ FEED_STATIC("COMMENT'''"); BEGIN(python_scomment); return 1; }
+#line 102 "tokenizer.l"
+{ FEED_STATIC("COMMENT\"\"\""); BEGIN(python_dcomment); return 1; }
 	YY_BREAK
 case 21:
-/* rule 21 can match eol */
 YY_RULE_SETUP
-#line 105 "tokenizer.l"
-{ FEED_STATIC("COMMENT.ig"); BEGIN(roff_comment); return 1; }
+#line 103 "tokenizer.l"
+{ FEED_STATIC("COMMENT'''"); BEGIN(python_scomment); return 1; }
 	YY_BREAK
 case 22:
 /* rule 22 can match eol */
 YY_RULE_SETUP
-#line 107 "tokenizer.l"
-{ /* nothing */ }
+#line 104 "tokenizer.l"
+{ FEED_STATIC("COMMENT.ig"); BEGIN(roff_comment); return 1; }
 	YY_BREAK
 case 23:
+/* rule 23 can match eol */
 YY_RULE_SETUP
-#line 108 "tokenizer.l"
-{ BEGIN(INITIAL); }
+#line 106 "tokenizer.l"
+{ /* nothing */ }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 109 "tokenizer.l"
+#line 107 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 110 "tokenizer.l"
+#line 108 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 111 "tokenizer.l"
+#line 109 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 112 "tokenizer.l"
+#line 110 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 113 "tokenizer.l"
+#line 111 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 29:
-/* rule 29 can match eol */
 YY_RULE_SETUP
-#line 114 "tokenizer.l"
+#line 112 "tokenizer.l"
 { BEGIN(INITIAL); }
 	YY_BREAK
 case 30:
+/* rule 30 can match eol */
 YY_RULE_SETUP
-#line 116 "tokenizer.l"
-{ /* nothing */ }
+#line 113 "tokenizer.l"
+{ BEGIN(INITIAL); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 117 "tokenizer.l"
-{ eat_until_unescaped('"'); }
+#line 115 "tokenizer.l"
+{ /* nothing */ }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 118 "tokenizer.l"
-{ eat_until_unescaped('\''); }
+#line 116 "tokenizer.l"
+{ eat_until_unescaped('"'); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 119 "tokenizer.l"
-{ /* nothing */ }
+#line 117 "tokenizer.l"
+{ eat_until_unescaped('\''); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 121 "tokenizer.l"
-{ FEED(); return 1; }
+#line 118 "tokenizer.l"
+{ /* nothing */ }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 122 "tokenizer.l"
+#line 120 "tokenizer.l"
 { FEED(); return 1; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 123 "tokenizer.l"
+#line 122 "tokenizer.l"
 { FEED(); return 1; }
 	YY_BREAK
 case 37:
-/* rule 37 can match eol */
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-YY_LINENO_REWIND_TO(yy_cp - 1);
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 125 "tokenizer.l"
-{ FEED(); BEGIN(INITIAL); return 1; }
+#line 123 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 126 "tokenizer.l"
-{ FEED(); BEGIN(INITIAL); return 1; }
+#line 124 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 39:
-/* rule 39 can match eol */
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-YY_LINENO_REWIND_TO(yy_cp - 1);
-yyg->yy_c_buf_p = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 127 "tokenizer.l"
-{ FEED(); BEGIN(INITIAL); return 1; }
+#line 125 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 40:
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 4;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 128 "tokenizer.l"
-{ FEED(); BEGIN(INITIAL); return 1; }
+#line 126 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 41:
-*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
-yyg->yy_c_buf_p = yy_cp -= 2;
-YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 129 "tokenizer.l"
-{ FEED(); BEGIN(INITIAL); return 1; }
+#line 127 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 130 "tokenizer.l"
-{ yymore(); BEGIN(punct); }
+#line 128 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 131 "tokenizer.l"
-{ yymore(); BEGIN(punct); }
-	YY_BREAK
-case YY_STATE_EOF(punct):
-#line 132 "tokenizer.l"
-{ FEED2(yytext, yyleng - 1); BEGIN(INITIAL); return 1; }
+#line 130 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 44:
-/* rule 44 can match eol */
 YY_RULE_SETUP
-#line 134 "tokenizer.l"
-{ /* nothing */ }
+#line 132 "tokenizer.l"
+{ FEED(); return 1; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
+#line 133 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 135 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
 #line 136 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 138 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 139 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 140 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 141 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 142 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 143 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 144 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 145 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 147 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+#line 148 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 58:
+YY_RULE_SETUP
+#line 149 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 151 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 60:
+YY_RULE_SETUP
+#line 152 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 153 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 154 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 63:
+YY_RULE_SETUP
+#line 155 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 64:
+YY_RULE_SETUP
+#line 156 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 65:
+YY_RULE_SETUP
+#line 157 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 66:
+YY_RULE_SETUP
+#line 158 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 67:
+YY_RULE_SETUP
+#line 159 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 68:
+YY_RULE_SETUP
+#line 160 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 69:
+YY_RULE_SETUP
+#line 161 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 70:
+YY_RULE_SETUP
+#line 162 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 71:
+YY_RULE_SETUP
+#line 163 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 72:
+YY_RULE_SETUP
+#line 164 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 73:
+YY_RULE_SETUP
+#line 165 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 74:
+YY_RULE_SETUP
+#line 166 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 75:
+YY_RULE_SETUP
+#line 167 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 76:
+YY_RULE_SETUP
+#line 168 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 77:
+YY_RULE_SETUP
+#line 169 "tokenizer.l"
+{ FEED(); return 1; }
+	YY_BREAK
+case 78:
+/* rule 78 can match eol */
+YY_RULE_SETUP
+#line 171 "tokenizer.l"
+{ /* nothing */ }
+	YY_BREAK
+case 79:
+YY_RULE_SETUP
+#line 173 "tokenizer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1610 "lex.linguist_yy.c"
-			case YY_STATE_EOF(INITIAL):
-			case YY_STATE_EOF(c_comment):
-			case YY_STATE_EOF(xml_comment):
-			case YY_STATE_EOF(haskell_comment):
-			case YY_STATE_EOF(ocaml_comment):
-			case YY_STATE_EOF(python_dcomment):
-			case YY_STATE_EOF(python_scomment):
-			case YY_STATE_EOF(roff_comment):
-				yyterminate();
+#line 1668 "lex.linguist_yy.c"
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(c_comment):
+case YY_STATE_EOF(xml_comment):
+case YY_STATE_EOF(haskell_comment):
+case YY_STATE_EOF(ocaml_comment):
+case YY_STATE_EOF(python_dcomment):
+case YY_STATE_EOF(python_scomment):
+case YY_STATE_EOF(roff_comment):
+	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1680,7 +1738,8 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 
 			else
 				{
-				yy_cp = yyg->yy_c_buf_p;
+				yy_cp = yyg->yy_last_accepting_cpos;
+				yy_current_state = yyg->yy_last_accepting_state;
 				goto yy_find_action;
 				}
 			}
@@ -1807,8 +1866,38 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyrealloc( (void *) b->yy_ch_buf,
+							 (yy_size_t) (b->yy_buf_size + 2) , yyscanner );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = NULL;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
 
 			}
 
@@ -1872,20 +1961,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	yy_current_state = yyg->yy_start;
 	yy_current_state += YY_AT_BOL();
 
-	yyg->yy_state_ptr = yyg->yy_state_buf;
-	*yyg->yy_state_ptr++ = yy_current_state;
-
 	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
 		{
 		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			yyg->yy_last_accepting_state = yy_current_state;
+			yyg->yy_last_accepting_cpos = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 210 )
+			if ( yy_current_state >= 255 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-		*yyg->yy_state_ptr++ = yy_current_state;
 		}
 
 	return yy_current_state;
@@ -1900,18 +1990,22 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 {
 	int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
+	char *yy_cp = yyg->yy_c_buf_p;
 
 	YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		yyg->yy_last_accepting_state = yy_current_state;
+		yyg->yy_last_accepting_cpos = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 210 )
+		if ( yy_current_state >= 255 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 209);
-	if ( ! yy_is_jam )
-		*yyg->yy_state_ptr++ = yy_current_state;
+	yy_is_jam = (yy_current_state == 254);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -2609,11 +2703,6 @@ static int yy_init_globals (yyscan_t yyscanner)
     yyg->yy_start_stack_depth = 0;
     yyg->yy_start_stack =  NULL;
 
-    yyg->yy_state_buf = 0;
-    yyg->yy_state_ptr = 0;
-    yyg->yy_full_match = 0;
-    yyg->yy_lp = 0;
-
 /* Defined in main.c */
 #ifdef YY_STDINIT
     yyin = stdin;
@@ -2649,9 +2738,6 @@ int yylex_destroy  (yyscan_t yyscanner)
         yyfree( yyg->yy_start_stack , yyscanner );
         yyg->yy_start_stack = NULL;
 
-    yyfree ( yyg->yy_state_buf , yyscanner);
-    yyg->yy_state_buf  = NULL;
-
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
     yy_init_globals( yyscanner);
@@ -2720,7 +2806,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 136 "tokenizer.l"
+#line 173 "tokenizer.l"