Skip to content

Commit

Permalink
Dynamic options single branch fix and refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
@olasoder-work
olasoder-work committed Sep 9, 2019
1 parent 44f3e25 commit c4f7f32
Show file tree
Hide file tree
Showing 8 changed files with 318 additions and 353 deletions.
114 changes: 60 additions & 54 deletions build/parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,9 @@ union yyalloc
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 153
/* YYNRULES -- Number of rules. */
#define YYNRULES 364
#define YYNRULES 365
/* YYNSTATES -- Number of states. */
#define YYNSTATES 707
#define YYNSTATES 708

#define YYUNDEFTOK 2
#define YYMAXUTOK 392
Expand Down Expand Up @@ -613,7 +613,7 @@ static const yytype_uint16 yyrline[] =
464, 465, 466, 467, 468, 469, 470, 471, 472, 473,
474, 475, 476, 477, 478, 479, 480, 481, 482, 483,
484, 485, 486, 487, 488, 489, 490, 491, 492, 493,
494, 495, 496, 497, 498
494, 495, 496, 497, 498, 499
};
#endif

Expand Down Expand Up @@ -749,35 +749,35 @@ static const yytype_int16 yypact[] =
-549, -549, -549, -549, -549, -549, 1606, -549, -549, 1924,
-549, -549, -549, 1422, 141, 143, 37, 303, 37, 309,
-117, 37, 37, 314, 1428, 37, 37, 37, 316, 319,
327, 37, 37, 37, 37, 1434, 336, 37, 37, 339,
340, 347, 348, 37, 37, 349, 37, 350, 37, 37,
37, 37, 37, 351, 37, 354, 37, 147, -549, 156,
327, 37, 37, 37, 37, 1434, 336, 37, 37, 347,
348, 349, 350, 37, 37, 351, 37, 354, 37, 37,
37, 37, 37, 355, 37, 356, 37, 147, -549, 156,
1442, -60, -549, 158, 1571, -549, 182, 1579, -549, -549,
355, -549, 1588, -549, 184, 37, -549, -549, -549, 193,
195, -96, -549, 356, 357, -549, 198, 1462, -549, 358,
372, -549, 362, -549, 208, 212, -549, 236, -549, 240,
357, -549, 1588, -549, 184, 37, -549, -549, -549, 193,
195, -96, -549, 358, 361, -549, 198, 1462, -549, 362,
374, -549, 364, -549, 208, 212, -549, 236, -549, 240,
247, -549, 261, -549, -549, -549, -549, 263, -549, -549,
-549, 268, 1716, -549, -549, -549, -549, 363, -549, 364,
-549, 268, 1716, -549, -549, -549, -549, 365, -549, 372,
37, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, 368, -549, 389, -549, -549, -549, 393, 15,
-549, -549, 392, -549, 393, -549, -549, -549, 394, 15,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, 394, -549, -549, 37, -549, -549,
-549, -549, -549, -549, 403, -549, -549, 37, -549, -549,
37, -549, -549, 270, 279, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, 1725, -549, -549, -549, -549,
-549, 1731, -549, 1845, -549, 281, 1853, 1868, -549, -549,
403, 404, 1874, 405, -549, -549, -549, 408, 409, 411,
412, -549, 1894, -549, 427, 428, -549, -549, -549, -549,
435, 1900, -549, 443, -549, 449, 451, 456, 1906, 457,
458, -549, 1912, -549, 459, -549, -549, -549, 284, -549,
-549, 286, -549, -549, 288, -549, -549, -549, 373, -549,
404, 405, 1874, 408, -549, -549, -549, 409, 411, 412,
427, -549, 1894, -549, 428, 435, -549, -549, -549, -549,
443, 1900, -549, 449, -549, 451, 456, 457, 1906, 458,
459, -549, 1912, -549, 461, -549, -549, -549, 284, -549,
-549, 286, -549, -549, 288, -549, -549, -549, 471, -549,
-549, 302, -549, -549, -549, -549, -549, -549, -549, 307,
-549, -549, -549, -549, 313, -549, -549, -549, 324, -549,
-549, 1918, -549, -549, -549, -549, 461, -549, -549, -549,
-549, -549, 333, -549, 470, 1174, 373, -549, -549, -549,
-549, 1918, -549, -549, -549, -549, 472, -549, -549, -549,
-549, -549, 333, -549, 478, 1174, 335, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, 1967, -549, -549, -549,
-549, -549, -549, -549, -549, 471, -549
-549, -549, -549, -549, -549, -549, 479, -549
};

/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
Expand Down Expand Up @@ -855,14 +855,14 @@ static const yytype_uint16 yydefact[] =
326, 328, 330, 331, 332, 336, 337, 338, 339, 340,
343, 344, 349, 350, 352, 354, 355, 356, 358, 357,
359, 361, 363, 201, 205, 209, 0, 224, 237, 245,
257, 267, 283, 318, 20, 0, 364
257, 267, 283, 318, 20, 365, 0, 364
};

/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
-549, -549, -332, 402, 278, -63, -549, 0, 2, -115,
-225, -549, 52, -549, -549, -549, -549, -548, -549, -549,
-225, -549, 55, -549, -549, -549, -549, -548, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
Expand All @@ -874,9 +874,9 @@ static const yytype_int16 yypgoto[] =
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, -549, -549, -549,
-549, -549, -549, -549, -549, -549, -549, 315, -549, -549,
-116, -549, 174, -549, -549, -549, -549, -549, -549, -549,
282, -549, -549
-549, -549, -549, -549, -549, -549, -549, 323, -549, -549,
-116, -549, 179, -549, -549, -549, -549, -549, -549, -549,
274, -549, -549
};

/* YYDEFGOTO[NTERM-NUM]. */
Expand Down Expand Up @@ -916,7 +916,7 @@ static const yytype_uint16 yytable[] =
666, 338, 313, 314, 359, 318, 319, 197, 198, 199,
200, 201, 202, 197, 198, 199, 200, 201, 202, 375,
197, 198, 199, 200, 201, 202, 1, 463, 291, 466,
352, 197, 198, 199, 200, 201, 202, 383, 705, 447,
352, 197, 198, 199, 200, 201, 202, 383, 706, 447,
449, 291, 467, 368, 384, 370, 385, 4, 386, 288,
197, 198, 199, 200, 201, 202, 197, 198, 199, 200,
201, 202, 197, 198, 199, 200, 201, 202, 1, 527,
Expand Down Expand Up @@ -952,22 +952,22 @@ static const yytype_uint16 yytable[] =
291, 697, 572, 203, 458, 291, 698, 651, 574, 284,
459, 291, 699, 578, 355, 584, 357, 358, 585, 361,
203, 461, 291, 700, 4, 369, 586, 371, 372, 373,
374, 291, 703, 479, 482, 593, 4, 377, 596, 597,
197, 198, 199, 200, 201, 202, 598, 599, 602, 604,
611, 477, 478, 613, 625, 632, 633, 635, 234, 486,
437, 636, 649, 650, 445, 212, 214, 212, 212, 217,
218, 696, 212, 212, 212, 212, 212, 212, 226, 229,
230, 231, 197, 198, 199, 200, 201, 202, 652, 4,
289, 5, 653, 657, 294, 296, 297, 212, 299, 301,
303, 305, 671, 672, 674, 212, 311, 675, 676, 316,
677, 678, 320, 212, 212, 212, 324, 212, 327, 329,
330, 332, 333, 334, 336, 4, 680, 681, 197, 198,
199, 200, 201, 202, 682, 4, 353, 354, 212, 356,
212, 212, 684, 212, 363, 364, 366, 367, 685, 212,
686, 212, 212, 212, 212, 687, 689, 690, 692, 507,
702, 510, 197, 198, 199, 200, 201, 202, 379, 704,
706, 473, 379, 379, 382, 234, 491, 664, 524, 0,
0, 379, 197, 198, 199, 200, 201, 202, 398, 0,
374, 291, 703, 696, 705, 593, 4, 377, 479, 482,
197, 198, 199, 200, 201, 202, 596, 597, 598, 599,
602, 477, 478, 604, 611, 613, 625, 632, 234, 486,
633, 635, 437, 636, 649, 212, 214, 212, 212, 217,
218, 650, 212, 212, 212, 212, 212, 212, 226, 229,
230, 231, 197, 198, 199, 200, 201, 202, 445, 4,
289, 5, 652, 653, 294, 296, 297, 212, 299, 301,
303, 305, 657, 671, 672, 212, 311, 674, 675, 316,
676, 677, 320, 212, 212, 212, 324, 212, 327, 329,
330, 332, 333, 334, 336, 4, 678, 680, 197, 198,
199, 200, 201, 202, 681, 4, 353, 354, 212, 356,
212, 212, 682, 212, 363, 364, 366, 367, 684, 212,
685, 212, 212, 212, 212, 686, 687, 689, 690, 507,
692, 510, 197, 198, 199, 200, 201, 202, 379, 696,
524, 702, 379, 379, 382, 234, 491, 704, 707, 473,
664, 379, 197, 198, 199, 200, 201, 202, 398, 0,
0, 398, 0, 0, 0, 0, 0, 379, 197, 198,
199, 200, 201, 202, 197, 198, 199, 200, 201, 202,
197, 198, 199, 200, 201, 202, 0, 203, 495, 197,
Expand Down Expand Up @@ -1167,22 +1167,22 @@ static const yytype_int16 yycheck[] =
138, 139, 139, 138, 139, 138, 139, 510, 139, 138,
139, 138, 139, 139, 176, 139, 178, 179, 139, 181,
138, 139, 138, 139, 464, 187, 139, 189, 190, 191,
192, 138, 139, 299, 300, 139, 476, 477, 139, 139,
192, 138, 139, 138, 139, 139, 476, 477, 299, 300,
3, 4, 5, 6, 7, 8, 139, 139, 139, 139,
139, 138, 139, 139, 139, 139, 139, 139, 138, 139,
128, 139, 139, 139, 136, 103, 104, 105, 106, 107,
108, 138, 110, 111, 112, 113, 114, 115, 116, 117,
118, 119, 3, 4, 5, 6, 7, 8, 139, 529,
139, 139, 128, 139, 139, 103, 104, 105, 106, 107,
108, 139, 110, 111, 112, 113, 114, 115, 116, 117,
118, 119, 3, 4, 5, 6, 7, 8, 136, 529,
128, 529, 139, 139, 132, 133, 134, 135, 136, 137,
138, 139, 139, 139, 139, 143, 144, 139, 139, 147,
139, 139, 150, 151, 152, 153, 154, 155, 156, 157,
158, 159, 160, 161, 162, 565, 139, 139, 3, 4,
5, 6, 7, 8, 139, 575, 174, 175, 176, 177,
178, 179, 139, 181, 182, 183, 184, 185, 139, 187,
139, 189, 190, 191, 192, 139, 139, 139, 139, 321,
139, 323, 3, 4, 5, 6, 7, 8, 206, 139,
139, 296, 210, 211, 212, 138, 139, 565, 336, -1,
-1, 219, 3, 4, 5, 6, 7, 8, 226, -1,
139, 323, 3, 4, 5, 6, 7, 8, 206, 138,
336, 139, 210, 211, 212, 138, 139, 139, 139, 296,
565, 219, 3, 4, 5, 6, 7, 8, 226, -1,
-1, 229, -1, -1, -1, -1, -1, 235, 3, 4,
5, 6, 7, 8, 3, 4, 5, 6, 7, 8,
3, 4, 5, 6, 7, 8, -1, 138, 139, 3,
Expand Down Expand Up @@ -1407,7 +1407,7 @@ static const yytype_uint16 yystos[] =
139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
139, 139, 139, 139, 139, 139, 138, 139, 139, 139,
139, 139, 139, 139, 139, 164, 139
139, 139, 139, 139, 139, 139, 164, 139
};

/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
Expand Down Expand Up @@ -1449,7 +1449,7 @@ static const yytype_uint16 yyr1[] =
267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
277, 277, 278, 279, 280, 281, 282, 283, 284, 285,
286, 287, 288, 289, 290, 291, 292, 293, 293, 294,
295, 296, 297, 298, 299
295, 296, 297, 298, 299, 299
};

/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
Expand Down Expand Up @@ -1491,7 +1491,7 @@ static const yytype_uint8 yyr2[] =
4, 4, 4, 3, 3, 3, 4, 4, 4, 4,
4, 3, 3, 4, 4, 3, 3, 3, 3, 4,
4, 3, 4, 3, 4, 4, 4, 4, 4, 4,
3, 4, 3, 4, 6
3, 4, 3, 4, 6, 5
};


Expand Down Expand Up @@ -4454,8 +4454,14 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
#line 4455 "parser.c"
break;

case 365:
#line 499 "../src/parser.y"
{ (yyval.e) = new_option(strdup("dynopt"), OPT_DYNOPT, push(push(new_contxt(), (yyvsp[-2].e)), (yyvsp[-1].e))); }
#line 4461 "parser.c"
break;


#line 4459 "parser.c"
#line 4465 "parser.c"

default: break;
}
Expand Down Expand Up @@ -4687,5 +4693,5 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
#endif
return yyresult;
}
#line 500 "../src/parser.y"
#line 501 "../src/parser.y"

3 changes: 2 additions & 1 deletion dist/CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,5 @@

0.1.0-alpha.38:
===============
- ?
- Dynamic options single branch fix (rc-ftpd).
- @icon now contains absolute path also when started from CLI.
Loading

0 comments on commit c4f7f32

Please sign in to comment.