Skip to content

C
cpython
Commit 9717991b authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

Merge back to main trunk

parent 224b289e
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 78 deletions
Python/graminit.c
View file @ 9717991b
......@@ -90,29 +90,39 @@ static state states_4[4] = {
};
static arc arcs_5_0[2] = {
{19, 1},
{21, 2},
{23, 2},
};
static arc arcs_5_1[2] = {
static arc arcs_5_1[3] = {
{20, 3},
{22, 4},
{0, 1},
};
static arc arcs_5_2[1] = {
{12, 4},
{12, 5},
};
static arc arcs_5_3[3] = {
{19, 1},
{21, 2},
{0, 3},
static arc arcs_5_3[1] = {
{21, 6},
};
static arc arcs_5_4[1] = {
static arc arcs_5_4[3] = {
{19, 1},
{23, 2},
{0, 4},
};
static state states_5[5] = {
static arc arcs_5_5[1] = {
{0, 5},
};
static arc arcs_5_6[2] = {
{22, 4},
{0, 6},
};
static state states_5[7] = {
{2, arcs_5_0},
{2, arcs_5_1},
{3, arcs_5_1},
{1, arcs_5_2},
{3, arcs_5_3},
{1, arcs_5_4},
{1, arcs_5_3},
{3, arcs_5_4},
{1, arcs_5_5},
{2, arcs_5_6},
};
static arc arcs_6_0[2] = {
{12, 1},
......@@ -122,7 +132,7 @@ static arc arcs_6_1[1] = {
{0, 1},
};
static arc arcs_6_2[1] = {
{22, 3},
{24, 3},
};
static arc arcs_6_3[1] = {
{18, 1},
......@@ -137,7 +147,7 @@ static arc arcs_7_0[1] = {
{19, 1},
};
static arc arcs_7_1[2] = {
{20, 2},
{22, 2},
{0, 1},
};
static arc arcs_7_2[2] = {
......@@ -161,14 +171,14 @@ static state states_8[2] = {
{1, arcs_8_1},
};
static arc arcs_9_0[1] = {
{23, 1},
{25, 1},
};
static arc arcs_9_1[2] = {
{24, 2},
{26, 2},
{2, 3},
};
static arc arcs_9_2[2] = {
{23, 1},
{25, 1},
{2, 3},
};
static arc arcs_9_3[1] = {
......@@ -181,8 +191,6 @@ static state states_9[4] = {
{1, arcs_9_3},
};
static arc arcs_10_0[9] = {
{25, 1},
{26, 1},
{27, 1},
{28, 1},
{29, 1},
......@@ -190,6 +198,8 @@ static arc arcs_10_0[9] = {
{31, 1},
{32, 1},
{33, 1},
{34, 1},
{35, 1},
};
static arc arcs_10_1[1] = {
{0, 1},
......@@ -202,7 +212,7 @@ static arc arcs_11_0[1] = {
{9, 1},
};
static arc arcs_11_1[2] = {
{34, 0},
{20, 0},
{0, 1},
};
static state states_11[2] = {
......@@ -210,14 +220,14 @@ static state states_11[2] = {
{2, arcs_11_1},
};
static arc arcs_12_0[1] = {
{35, 1},
{36, 1},
};
static arc arcs_12_1[2] = {
{36, 2},
{21, 2},
{0, 1},
};
static arc arcs_12_2[2] = {
{20, 1},
{22, 1},
{0, 2},
};
static state states_12[3] = {
......@@ -301,14 +311,14 @@ static arc arcs_19_0[1] = {
{47, 1},
};
static arc arcs_19_1[1] = {
{36, 2},
{21, 2},
};
static arc arcs_19_2[2] = {
{20, 3},
{22, 3},
{0, 2},
};
static arc arcs_19_3[1] = {
{36, 4},
{21, 4},
};
static arc arcs_19_4[1] = {
{0, 4},
......@@ -331,21 +341,21 @@ static arc arcs_20_2[1] = {
{12, 4},
};
static arc arcs_20_3[2] = {
{20, 1},
{22, 1},
{0, 3},
};
static arc arcs_20_4[1] = {
{48, 5},
};
static arc arcs_20_5[2] = {
{21, 6},
{23, 6},
{12, 7},
};
static arc arcs_20_6[1] = {
{0, 6},
};
static arc arcs_20_7[2] = {
{20, 8},
{22, 8},
{0, 7},
};
static arc arcs_20_8[1] = {
......@@ -369,7 +379,7 @@ static arc arcs_21_1[1] = {
{12, 2},
};
static arc arcs_21_2[2] = {
{20, 1},
{22, 1},
{0, 2},
};
static state states_21[3] = {
......@@ -381,14 +391,14 @@ static arc arcs_22_0[1] = {
{51, 1},
};
static arc arcs_22_1[2] = {
{21, 2},
{23, 2},
{12, 3},
};
static arc arcs_22_2[1] = {
{14, 4},
};
static arc arcs_22_3[2] = {
{20, 5},
{22, 5},
{14, 4},
};
static arc arcs_22_4[1] = {
......@@ -398,7 +408,7 @@ static arc arcs_22_5[1] = {
{12, 3},
};
static arc arcs_22_6[2] = {
{20, 4},
{22, 4},
{0, 6},
};
static state states_22[7] = {
......@@ -432,14 +442,14 @@ static arc arcs_24_2[2] = {
{0, 2},
};
static arc arcs_24_3[1] = {
{36, 4},
{21, 4},
};
static arc arcs_24_4[2] = {
{20, 5},
{22, 5},
{0, 4},
};
static arc arcs_24_5[1] = {
{36, 6},
{21, 6},
};
static arc arcs_24_6[1] = {
{0, 6},
......@@ -472,7 +482,7 @@ static arc arcs_26_0[1] = {
{61, 1},
};
static arc arcs_26_1[1] = {
{36, 2},
{21, 2},
};
static arc arcs_26_2[1] = {
{14, 3},
......@@ -508,7 +518,7 @@ static arc arcs_27_0[1] = {
{64, 1},
};
static arc arcs_27_1[1] = {
{36, 2},
{21, 2},
};
static arc arcs_27_2[1] = {
{14, 3},
......@@ -607,8 +617,9 @@ static arc arcs_29_6[1] = {
static arc arcs_29_7[1] = {
{15, 9},
};
static arc arcs_29_8[2] = {
static arc arcs_29_8[3] = {
{67, 4},
{63, 5},
{0, 8},
};
static arc arcs_29_9[1] = {
......@@ -623,22 +634,22 @@ static state states_29[10] = {
{1, arcs_29_5},
{1, arcs_29_6},
{1, arcs_29_7},
{2, arcs_29_8},
{3, arcs_29_8},
{1, arcs_29_9},
};
static arc arcs_30_0[1] = {
{69, 1},
};
static arc arcs_30_1[2] = {
{36, 2},
{21, 2},
{0, 1},
};
static arc arcs_30_2[2] = {
{20, 3},
{22, 3},
{0, 2},
};
static arc arcs_30_3[1] = {
{36, 4},
{21, 4},
};
static arc arcs_30_4[1] = {
{0, 4},
......@@ -820,7 +831,7 @@ static arc arcs_42_0[1] = {
{100, 1},
};
static arc arcs_42_1[4] = {
{21, 0},
{23, 0},
{101, 0},
{102, 0},
{0, 1},
......@@ -858,49 +869,54 @@ static arc arcs_44_0[7] = {
{111, 4},
{12, 5},
{112, 5},
{113, 5},
{113, 6},
};
static arc arcs_44_1[2] = {
{9, 6},
{9, 7},
{18, 5},
};
static arc arcs_44_2[2] = {
{9, 7},
{9, 8},
{107, 5},
};
static arc arcs_44_3[2] = {
{109, 8},
{109, 9},
{110, 5},
};
static arc arcs_44_4[1] = {
{9, 9},
{9, 10},
};
static arc arcs_44_5[1] = {
{0, 5},
};
static arc arcs_44_6[1] = {
{18, 5},
static arc arcs_44_6[2] = {
{113, 6},
{0, 6},
};
static arc arcs_44_7[1] = {
{107, 5},
{18, 5},
};
static arc arcs_44_8[1] = {
{110, 5},
{107, 5},
};
static arc arcs_44_9[1] = {
{110, 5},
};
static arc arcs_44_10[1] = {
{111, 5},
};
static state states_44[10] = {
static state states_44[11] = {
{7, arcs_44_0},
{2, arcs_44_1},
{2, arcs_44_2},
{2, arcs_44_3},
{1, arcs_44_4},
{1, arcs_44_5},
{1, arcs_44_6},
{2, arcs_44_6},
{1, arcs_44_7},
{1, arcs_44_8},
{1, arcs_44_9},
{1, arcs_44_10},
};
static arc arcs_45_0[1] = {
{114, 1},
......@@ -913,7 +929,7 @@ static arc arcs_45_2[1] = {
{14, 3},
};
static arc arcs_45_3[1] = {
{36, 4},
{21, 4},
};
static arc arcs_45_4[1] = {
{0, 4},
......@@ -959,7 +975,7 @@ static state states_46[7] = {
{1, arcs_46_6},
};
static arc arcs_47_0[2] = {
{36, 1},
{21, 1},
{14, 2},
};
static arc arcs_47_1[2] = {
......@@ -967,7 +983,7 @@ static arc arcs_47_1[2] = {
{0, 1},
};
static arc arcs_47_2[2] = {
{36, 3},
{21, 3},
{0, 2},
};
static arc arcs_47_3[1] = {
......@@ -983,7 +999,7 @@ static arc arcs_48_0[1] = {
{54, 1},
};
static arc arcs_48_1[2] = {
{20, 2},
{22, 2},
{0, 1},
};
static arc arcs_48_2[2] = {
......@@ -996,14 +1012,14 @@ static state states_48[3] = {
{2, arcs_48_2},
};
static arc arcs_49_0[1] = {
{36, 1},
{21, 1},
};
static arc arcs_49_1[2] = {
{20, 2},
{22, 2},
{0, 1},
};
static arc arcs_49_2[2] = {
{36, 1},
{21, 1},
{0, 2},
};
static state states_49[3] = {
......@@ -1012,20 +1028,20 @@ static state states_49[3] = {
{2, arcs_49_2},
};
static arc arcs_50_0[1] = {
{36, 1},
{21, 1},
};
static arc arcs_50_1[1] = {
{14, 2},
};
static arc arcs_50_2[1] = {
{36, 3},
{21, 3},
};
static arc arcs_50_3[2] = {
{20, 4},
{22, 4},
{0, 3},
};
static arc arcs_50_4[2] = {
{36, 1},
{21, 1},
{0, 4},
};
static state states_50[5] = {
......@@ -1072,31 +1088,31 @@ static state states_51[8] = {
};
static dfa dfas[52] = {
{256, "single_input", 0, 3, states_0,
"\004\030\001\000\250\360\057\040\007\040\000\000\214\224\047"},
"\004\030\001\000\260\360\057\040\007\040\000\000\214\224\047"},
{257, "file_input", 0, 2, states_1,
"\204\030\001\000\250\360\057\040\007\040\000\000\214\224\047"},
"\204\030\001\000\260\360\057\040\007\040\000\000\214\224\047"},
{258, "eval_input", 0, 3, states_2,
"\000\020\001\000\000\000\000\000\000\040\000\000\214\224\007"},
{259, "funcdef", 0, 6, states_3,
"\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{260, "parameters", 0, 4, states_4,
"\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"},
{261, "varargslist", 0, 5, states_5,
"\000\020\041\000\000\000\000\000\000\000\000\000\000\000\000"},
{261, "varargslist", 0, 7, states_5,
"\000\020\201\000\000\000\000\000\000\000\000\000\000\000\000"},
{262, "fpdef", 0, 4, states_6,
"\000\020\001\000\000\000\000\000\000\000\000\000\000\000\000"},
{263, "fplist", 0, 3, states_7,
"\000\020\001\000\000\000\000\000\000\000\000\000\000\000\000"},
{264, "stmt", 0, 2, states_8,
"\000\030\001\000\250\360\057\040\007\040\000\000\214\224\047"},
"\000\030\001\000\260\360\057\040\007\040\000\000\214\224\047"},
{265, "simple_stmt", 0, 4, states_9,
"\000\020\001\000\250\360\057\000\000\040\000\000\214\224\007"},
"\000\020\001\000\260\360\057\000\000\040\000\000\214\224\007"},
{266, "small_stmt", 0, 2, states_10,
"\000\020\001\000\250\360\057\000\000\040\000\000\214\224\007"},
"\000\020\001\000\260\360\057\000\000\040\000\000\214\224\007"},
{267, "expr_stmt", 0, 2, states_11,
"\000\020\001\000\000\000\000\000\000\040\000\000\214\224\007"},
{268, "print_stmt", 0, 3, states_12,
"\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000"},
"\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
{269, "del_stmt", 0, 3, states_13,
"\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
{270, "pass_stmt", 0, 2, states_14,
......@@ -1134,7 +1150,7 @@ static dfa dfas[52] = {
{286, "except_clause", 0, 5, states_30,
"\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000"},
{287, "suite", 0, 5, states_31,
"\004\020\001\000\250\360\057\000\000\040\000\000\214\224\007"},
"\004\020\001\000\260\360\057\000\000\040\000\000\214\224\007"},
{288, "test", 0, 4, states_32,
"\000\020\001\000\000\000\000\000\000\040\000\000\214\224\007"},
{289, "and_test", 0, 2, states_33,
......@@ -1159,7 +1175,7 @@ static dfa dfas[52] = {
"\000\020\001\000\000\000\000\000\000\000\000\000\214\224\003"},
{299, "factor", 0, 4, states_43,
"\000\020\001\000\000\000\000\000\000\000\000\000\214\224\003"},
{300, "atom", 0, 10, states_44,
{300, "atom", 0, 11, states_44,
"\000\020\001\000\000\000\000\000\000\000\000\000\000\224\003"},
{301, "lambdef", 0, 5, states_45,
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004"},
......@@ -1197,6 +1213,8 @@ static label labels[118] = {
{261, 0},
{8, 0},
{262, 0},
{22, 0},
{288, 0},
{12, 0},
{16, 0},
{263, 0},
......@@ -1211,9 +1229,7 @@ static label labels[118] = {
{277, 0},
{278, 0},
{280, 0},
{22, 0},
{1, "print"},
{288, 0},
{1, "del"},
{304, 0},
{1, "pass"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7