[Python-3000-checkins] r53685 - in python/branches/p3yk: Grammar/Grammar Include/graminit.h Makefile.pre.in Modules/parsermodule.c Python/ast.c Python/bltinmodule.c Python/graminit.c Python/import.c setup.py
guido.van.rossum
python-3000-checkins at python.org
Fri Feb 9 06:32:51 CET 2007
Author: guido.van.rossum
Date: Fri Feb 9 06:32:43 2007
New Revision: 53685
Modified:
python/branches/p3yk/Grammar/Grammar
python/branches/p3yk/Include/graminit.h
python/branches/p3yk/Makefile.pre.in
python/branches/p3yk/Modules/parsermodule.c
python/branches/p3yk/Python/ast.c
python/branches/p3yk/Python/bltinmodule.c
python/branches/p3yk/Python/graminit.c
python/branches/p3yk/Python/import.c
python/branches/p3yk/setup.py
Log:
Essential changes for print function changes.
Lib will be changed in a separate run.
Modified: python/branches/p3yk/Grammar/Grammar
==============================================================================
--- python/branches/p3yk/Grammar/Grammar (original)
+++ python/branches/p3yk/Grammar/Grammar Fri Feb 9 06:32:43 2007
@@ -38,15 +38,13 @@
stmt: simple_stmt | compound_stmt
simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
-small_stmt: (expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt |
+small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
import_stmt | global_stmt | assert_stmt)
expr_stmt: testlist (augassign (yield_expr|testlist) |
('=' (yield_expr|testlist))*)
augassign: ('+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' |
'<<=' | '>>=' | '**=' | '//=')
# For normal assignments, additional restrictions enforced by the interpreter
-print_stmt: 'print' ( [ test (',' test)* [','] ] |
- '>>' test [ (',' test)+ [','] ] )
del_stmt: 'del' exprlist
pass_stmt: 'pass'
flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
Modified: python/branches/p3yk/Include/graminit.h
==============================================================================
--- python/branches/p3yk/Include/graminit.h (original)
+++ python/branches/p3yk/Include/graminit.h Fri Feb 9 06:32:43 2007
@@ -18,71 +18,70 @@
#define small_stmt 273
#define expr_stmt 274
#define augassign 275
-#define print_stmt 276
-#define del_stmt 277
-#define pass_stmt 278
-#define flow_stmt 279
-#define break_stmt 280
-#define continue_stmt 281
-#define return_stmt 282
-#define yield_stmt 283
-#define raise_stmt 284
-#define import_stmt 285
-#define import_name 286
-#define import_from 287
-#define import_as_name 288
-#define dotted_as_name 289
-#define import_as_names 290
-#define dotted_as_names 291
-#define dotted_name 292
-#define global_stmt 293
-#define assert_stmt 294
-#define compound_stmt 295
-#define if_stmt 296
-#define while_stmt 297
-#define for_stmt 298
-#define try_stmt 299
-#define with_stmt 300
-#define with_var 301
-#define except_clause 302
-#define suite 303
-#define testlist_safe 304
-#define old_test 305
-#define old_lambdef 306
-#define test 307
-#define or_test 308
-#define and_test 309
-#define not_test 310
-#define comparison 311
-#define comp_op 312
-#define expr 313
-#define xor_expr 314
-#define and_expr 315
-#define shift_expr 316
-#define arith_expr 317
-#define term 318
-#define factor 319
-#define power 320
-#define atom 321
-#define listmaker 322
-#define testlist_gexp 323
-#define lambdef 324
-#define trailer 325
-#define subscriptlist 326
-#define subscript 327
-#define sliceop 328
-#define exprlist 329
-#define testlist 330
-#define dictsetmaker 331
-#define classdef 332
-#define arglist 333
-#define argument 334
-#define list_iter 335
-#define list_for 336
-#define list_if 337
-#define gen_iter 338
-#define gen_for 339
-#define gen_if 340
-#define testlist1 341
-#define encoding_decl 342
-#define yield_expr 343
+#define del_stmt 276
+#define pass_stmt 277
+#define flow_stmt 278
+#define break_stmt 279
+#define continue_stmt 280
+#define return_stmt 281
+#define yield_stmt 282
+#define raise_stmt 283
+#define import_stmt 284
+#define import_name 285
+#define import_from 286
+#define import_as_name 287
+#define dotted_as_name 288
+#define import_as_names 289
+#define dotted_as_names 290
+#define dotted_name 291
+#define global_stmt 292
+#define assert_stmt 293
+#define compound_stmt 294
+#define if_stmt 295
+#define while_stmt 296
+#define for_stmt 297
+#define try_stmt 298
+#define with_stmt 299
+#define with_var 300
+#define except_clause 301
+#define suite 302
+#define testlist_safe 303
+#define old_test 304
+#define old_lambdef 305
+#define test 306
+#define or_test 307
+#define and_test 308
+#define not_test 309
+#define comparison 310
+#define comp_op 311
+#define expr 312
+#define xor_expr 313
+#define and_expr 314
+#define shift_expr 315
+#define arith_expr 316
+#define term 317
+#define factor 318
+#define power 319
+#define atom 320
+#define listmaker 321
+#define testlist_gexp 322
+#define lambdef 323
+#define trailer 324
+#define subscriptlist 325
+#define subscript 326
+#define sliceop 327
+#define exprlist 328
+#define testlist 329
+#define dictsetmaker 330
+#define classdef 331
+#define arglist 332
+#define argument 333
+#define list_iter 334
+#define list_for 335
+#define list_if 336
+#define gen_iter 337
+#define gen_for 338
+#define gen_if 339
+#define testlist1 340
+#define encoding_decl 341
+#define yield_expr 342
Modified: python/branches/p3yk/Makefile.pre.in
==============================================================================
--- python/branches/p3yk/Makefile.pre.in (original)
+++ python/branches/p3yk/Makefile.pre.in Fri Feb 9 06:32:43 2007
@@ -341,7 +341,7 @@
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
platform: $(BUILDPYTHON)
- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
# Build the shared modules
Modified: python/branches/p3yk/Modules/parsermodule.c
==============================================================================
--- python/branches/p3yk/Modules/parsermodule.c (original)
+++ python/branches/p3yk/Modules/parsermodule.c Fri Feb 9 06:32:43 2007
@@ -857,7 +857,7 @@
VALIDATER(vfpdef); VALIDATER(vfplist);
VALIDATER(stmt); VALIDATER(simple_stmt);
VALIDATER(expr_stmt); VALIDATER(power);
-VALIDATER(print_stmt); VALIDATER(del_stmt);
+VALIDATER(del_stmt);
VALIDATER(return_stmt); VALIDATER(list_iter);
VALIDATER(raise_stmt); VALIDATER(import_stmt);
VALIDATER(import_name); VALIDATER(import_from);
@@ -1545,7 +1545,6 @@
int ntype = TYPE(CHILD(tree, 0));
if ( (ntype == expr_stmt)
- || (ntype == print_stmt)
|| (ntype == del_stmt)
|| (ntype == pass_stmt)
|| (ntype == flow_stmt)
@@ -1650,54 +1649,6 @@
}
-/* print_stmt:
- *
- * 'print' ( [ test (',' test)* [','] ]
- * | '>>' test [ (',' test)+ [','] ] )
- */
-static int
-validate_print_stmt(node *tree)
-{
- int nch = NCH(tree);
- int res = (validate_ntype(tree, print_stmt)
- && (nch > 0)
- && validate_name(CHILD(tree, 0), "print"));
-
- if (res && nch > 1) {
- int sym = TYPE(CHILD(tree, 1));
- int i = 1;
- int allow_trailing_comma = 1;
-
- if (sym == test)
- res = validate_test(CHILD(tree, i++));
- else {
- if (nch < 3)
- res = validate_numnodes(tree, 3, "print_stmt");
- else {
- res = (validate_ntype(CHILD(tree, i), RIGHTSHIFT)
- && validate_test(CHILD(tree, i+1)));
- i += 2;
- allow_trailing_comma = 0;
- }
- }
- if (res) {
- /* ... (',' test)* [','] */
- while (res && i+2 <= nch) {
- res = (validate_comma(CHILD(tree, i))
- && validate_test(CHILD(tree, i+1)));
- allow_trailing_comma = 1;
- i += 2;
- }
- if (res && !allow_trailing_comma)
- res = validate_numnodes(tree, i, "print_stmt");
- else if (res && i < nch)
- res = validate_comma(CHILD(tree, i));
- }
- }
- return (res);
-}
-
-
static int
validate_del_stmt(node *tree)
{
@@ -2977,7 +2928,7 @@
break;
case small_stmt:
/*
- * expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt
+ * expr_stmt | del_stmt | pass_stmt | flow_stmt
* | import_stmt | global_stmt | assert_stmt
*/
res = validate_small_stmt(tree);
@@ -3012,9 +2963,6 @@
case expr_stmt:
res = validate_expr_stmt(tree);
break;
- case print_stmt:
- res = validate_print_stmt(tree);
- break;
case del_stmt:
res = validate_del_stmt(tree);
break;
Modified: python/branches/p3yk/Python/ast.c
==============================================================================
--- python/branches/p3yk/Python/ast.c (original)
+++ python/branches/p3yk/Python/ast.c Fri Feb 9 06:32:43 2007
@@ -2218,37 +2218,6 @@
}
}
-static stmt_ty
-ast_for_print_stmt(struct compiling *c, const node *n)
-{
- /* print_stmt: 'print' ( [ test (',' test)* [','] ]
- | '>>' test [ (',' test)+ [','] ] )
- */
- expr_ty dest = NULL, expression;
- asdl_seq *seq;
- bool nl;
- int i, j, start = 1;
-
- REQ(n, print_stmt);
- if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
- dest = ast_for_expr(c, CHILD(n, 2));
- if (!dest)
- return NULL;
- start = 4;
- }
- seq = asdl_seq_new((NCH(n) + 1 - start) / 2, c->c_arena);
- if (!seq)
- return NULL;
- for (i = start, j = 0; i < NCH(n); i += 2, ++j) {
- expression = ast_for_expr(c, CHILD(n, i));
- if (!expression)
- return NULL;
- asdl_seq_SET(seq, j, expression);
- }
- nl = (TYPE(CHILD(n, NCH(n) - 1)) == COMMA) ? false : true;
- return Print(dest, seq, nl, LINENO(n), n->n_col_offset, c->c_arena);
-}
-
static asdl_seq *
ast_for_exprlist(struct compiling *c, const node *n, expr_context_ty context)
{
@@ -3089,14 +3058,12 @@
if (TYPE(n) == small_stmt) {
REQ(n, small_stmt);
n = CHILD(n, 0);
- /* small_stmt: expr_stmt | print_stmt | del_stmt | pass_stmt
+ /* small_stmt: expr_stmt | del_stmt | pass_stmt
| flow_stmt | import_stmt | global_stmt | assert_stmt
*/
switch (TYPE(n)) {
case expr_stmt:
return ast_for_expr_stmt(c, n);
- case print_stmt:
- return ast_for_print_stmt(c, n);
case del_stmt:
return ast_for_del_stmt(c, n);
case pass_stmt:
Modified: python/branches/p3yk/Python/bltinmodule.c
==============================================================================
--- python/branches/p3yk/Python/bltinmodule.c (original)
+++ python/branches/p3yk/Python/bltinmodule.c Fri Feb 9 06:32:43 2007
@@ -1446,7 +1446,7 @@
}
PyDoc_STRVAR(print_doc,
-"Print(value, ..., file=None, sep=' ', end='\\n')\n\
+"print(value, ..., file=None, sep=' ', end='\\n')\n\
\n\
Prints the values to a stream, or to sys.stdout by default.\n\
Optional keyword arguments:\n\
@@ -2056,7 +2056,7 @@
{"open", (PyCFunction)builtin_open, METH_VARARGS | METH_KEYWORDS, open_doc},
{"ord", builtin_ord, METH_O, ord_doc},
{"pow", builtin_pow, METH_VARARGS, pow_doc},
- {"Print", (PyCFunction)builtin_print, METH_VARARGS | METH_KEYWORDS, print_doc},
+ {"print", (PyCFunction)builtin_print, METH_VARARGS | METH_KEYWORDS, print_doc},
{"range", builtin_range, METH_VARARGS, range_doc},
{"reload", builtin_reload, METH_O, reload_doc},
{"repr", builtin_repr, METH_O, repr_doc},
Modified: python/branches/p3yk/Python/graminit.c
==============================================================================
--- python/branches/p3yk/Python/graminit.c (original)
+++ python/branches/p3yk/Python/graminit.c Fri Feb 9 06:32:43 2007
@@ -403,7 +403,7 @@
{2, arcs_16_2},
{1, arcs_16_3},
};
-static arc arcs_17_0[8] = {
+static arc arcs_17_0[7] = {
{39, 1},
{40, 1},
{41, 1},
@@ -411,29 +411,28 @@
{43, 1},
{44, 1},
{45, 1},
- {46, 1},
};
static arc arcs_17_1[1] = {
{0, 1},
};
static state states_17[2] = {
- {8, arcs_17_0},
+ {7, arcs_17_0},
{1, arcs_17_1},
};
static arc arcs_18_0[1] = {
{9, 1},
};
static arc arcs_18_1[3] = {
- {47, 2},
+ {46, 2},
{27, 3},
{0, 1},
};
static arc arcs_18_2[2] = {
- {48, 4},
+ {47, 4},
{9, 4},
};
static arc arcs_18_3[2] = {
- {48, 5},
+ {47, 5},
{9, 5},
};
static arc arcs_18_4[1] = {
@@ -452,6 +451,7 @@
{2, arcs_18_5},
};
static arc arcs_19_0[12] = {
+ {48, 1},
{49, 1},
{50, 1},
{51, 1},
@@ -463,7 +463,6 @@
{57, 1},
{58, 1},
{59, 1},
- {60, 1},
};
static arc arcs_19_1[1] = {
{0, 1},
@@ -473,90 +472,55 @@
{1, arcs_19_1},
};
static arc arcs_20_0[1] = {
- {61, 1},
+ {60, 1},
};
-static arc arcs_20_1[3] = {
- {22, 2},
- {62, 3},
- {0, 1},
+static arc arcs_20_1[1] = {
+ {61, 2},
};
-static arc arcs_20_2[2] = {
- {28, 4},
+static arc arcs_20_2[1] = {
{0, 2},
};
-static arc arcs_20_3[1] = {
- {22, 5},
-};
-static arc arcs_20_4[2] = {
- {22, 2},
- {0, 4},
-};
-static arc arcs_20_5[2] = {
- {28, 6},
- {0, 5},
-};
-static arc arcs_20_6[1] = {
- {22, 7},
-};
-static arc arcs_20_7[2] = {
- {28, 8},
- {0, 7},
-};
-static arc arcs_20_8[2] = {
- {22, 7},
- {0, 8},
-};
-static state states_20[9] = {
+static state states_20[3] = {
{1, arcs_20_0},
- {3, arcs_20_1},
- {2, arcs_20_2},
- {1, arcs_20_3},
- {2, arcs_20_4},
- {2, arcs_20_5},
- {1, arcs_20_6},
- {2, arcs_20_7},
- {2, arcs_20_8},
+ {1, arcs_20_1},
+ {1, arcs_20_2},
};
static arc arcs_21_0[1] = {
- {63, 1},
+ {62, 1},
};
static arc arcs_21_1[1] = {
- {64, 2},
-};
-static arc arcs_21_2[1] = {
- {0, 2},
+ {0, 1},
};
-static state states_21[3] = {
+static state states_21[2] = {
{1, arcs_21_0},
{1, arcs_21_1},
- {1, arcs_21_2},
};
-static arc arcs_22_0[1] = {
+static arc arcs_22_0[5] = {
+ {63, 1},
+ {64, 1},
{65, 1},
+ {66, 1},
+ {67, 1},
};
static arc arcs_22_1[1] = {
{0, 1},
};
static state states_22[2] = {
- {1, arcs_22_0},
+ {5, arcs_22_0},
{1, arcs_22_1},
};
-static arc arcs_23_0[5] = {
- {66, 1},
- {67, 1},
+static arc arcs_23_0[1] = {
{68, 1},
- {69, 1},
- {70, 1},
};
static arc arcs_23_1[1] = {
{0, 1},
};
static state states_23[2] = {
- {5, arcs_23_0},
+ {1, arcs_23_0},
{1, arcs_23_1},
};
static arc arcs_24_0[1] = {
- {71, 1},
+ {69, 1},
};
static arc arcs_24_1[1] = {
{0, 1},
@@ -566,142 +530,151 @@
{1, arcs_24_1},
};
static arc arcs_25_0[1] = {
- {72, 1},
+ {70, 1},
};
-static arc arcs_25_1[1] = {
+static arc arcs_25_1[2] = {
+ {9, 2},
{0, 1},
};
-static state states_25[2] = {
+static arc arcs_25_2[1] = {
+ {0, 2},
+};
+static state states_25[3] = {
{1, arcs_25_0},
- {1, arcs_25_1},
+ {2, arcs_25_1},
+ {1, arcs_25_2},
};
static arc arcs_26_0[1] = {
- {73, 1},
+ {47, 1},
};
-static arc arcs_26_1[2] = {
- {9, 2},
+static arc arcs_26_1[1] = {
{0, 1},
};
-static arc arcs_26_2[1] = {
- {0, 2},
-};
-static state states_26[3] = {
+static state states_26[2] = {
{1, arcs_26_0},
- {2, arcs_26_1},
- {1, arcs_26_2},
+ {1, arcs_26_1},
};
static arc arcs_27_0[1] = {
- {48, 1},
-};
-static arc arcs_27_1[1] = {
- {0, 1},
-};
-static state states_27[2] = {
- {1, arcs_27_0},
- {1, arcs_27_1},
-};
-static arc arcs_28_0[1] = {
- {74, 1},
+ {71, 1},
};
-static arc arcs_28_1[2] = {
+static arc arcs_27_1[2] = {
{22, 2},
{0, 1},
};
-static arc arcs_28_2[2] = {
+static arc arcs_27_2[2] = {
{28, 3},
{0, 2},
};
-static arc arcs_28_3[1] = {
+static arc arcs_27_3[1] = {
{22, 4},
};
-static arc arcs_28_4[2] = {
+static arc arcs_27_4[2] = {
{28, 5},
{0, 4},
};
-static arc arcs_28_5[1] = {
+static arc arcs_27_5[1] = {
{22, 6},
};
-static arc arcs_28_6[1] = {
+static arc arcs_27_6[1] = {
{0, 6},
};
-static state states_28[7] = {
- {1, arcs_28_0},
- {2, arcs_28_1},
- {2, arcs_28_2},
- {1, arcs_28_3},
- {2, arcs_28_4},
- {1, arcs_28_5},
- {1, arcs_28_6},
+static state states_27[7] = {
+ {1, arcs_27_0},
+ {2, arcs_27_1},
+ {2, arcs_27_2},
+ {1, arcs_27_3},
+ {2, arcs_27_4},
+ {1, arcs_27_5},
+ {1, arcs_27_6},
};
-static arc arcs_29_0[2] = {
- {75, 1},
- {76, 1},
+static arc arcs_28_0[2] = {
+ {72, 1},
+ {73, 1},
};
-static arc arcs_29_1[1] = {
+static arc arcs_28_1[1] = {
{0, 1},
};
-static state states_29[2] = {
- {2, arcs_29_0},
- {1, arcs_29_1},
+static state states_28[2] = {
+ {2, arcs_28_0},
+ {1, arcs_28_1},
};
-static arc arcs_30_0[1] = {
- {77, 1},
+static arc arcs_29_0[1] = {
+ {74, 1},
};
-static arc arcs_30_1[1] = {
- {78, 2},
+static arc arcs_29_1[1] = {
+ {75, 2},
};
-static arc arcs_30_2[1] = {
+static arc arcs_29_2[1] = {
{0, 2},
};
-static state states_30[3] = {
- {1, arcs_30_0},
- {1, arcs_30_1},
- {1, arcs_30_2},
+static state states_29[3] = {
+ {1, arcs_29_0},
+ {1, arcs_29_1},
+ {1, arcs_29_2},
};
-static arc arcs_31_0[1] = {
- {79, 1},
+static arc arcs_30_0[1] = {
+ {76, 1},
};
-static arc arcs_31_1[2] = {
- {80, 2},
+static arc arcs_30_1[2] = {
+ {77, 2},
{12, 3},
};
-static arc arcs_31_2[3] = {
- {80, 2},
+static arc arcs_30_2[3] = {
+ {77, 2},
{12, 3},
- {77, 4},
+ {74, 4},
};
-static arc arcs_31_3[1] = {
- {77, 4},
+static arc arcs_30_3[1] = {
+ {74, 4},
};
-static arc arcs_31_4[3] = {
+static arc arcs_30_4[3] = {
{29, 5},
{13, 6},
- {81, 5},
+ {78, 5},
};
-static arc arcs_31_5[1] = {
+static arc arcs_30_5[1] = {
{0, 5},
};
-static arc arcs_31_6[1] = {
- {81, 7},
+static arc arcs_30_6[1] = {
+ {78, 7},
};
-static arc arcs_31_7[1] = {
+static arc arcs_30_7[1] = {
{15, 5},
};
-static state states_31[8] = {
+static state states_30[8] = {
+ {1, arcs_30_0},
+ {2, arcs_30_1},
+ {3, arcs_30_2},
+ {1, arcs_30_3},
+ {3, arcs_30_4},
+ {1, arcs_30_5},
+ {1, arcs_30_6},
+ {1, arcs_30_7},
+};
+static arc arcs_31_0[1] = {
+ {19, 1},
+};
+static arc arcs_31_1[2] = {
+ {80, 2},
+ {0, 1},
+};
+static arc arcs_31_2[1] = {
+ {19, 3},
+};
+static arc arcs_31_3[1] = {
+ {0, 3},
+};
+static state states_31[4] = {
{1, arcs_31_0},
{2, arcs_31_1},
- {3, arcs_31_2},
+ {1, arcs_31_2},
{1, arcs_31_3},
- {3, arcs_31_4},
- {1, arcs_31_5},
- {1, arcs_31_6},
- {1, arcs_31_7},
};
static arc arcs_32_0[1] = {
- {19, 1},
+ {12, 1},
};
static arc arcs_32_1[2] = {
- {83, 2},
+ {80, 2},
{0, 1},
};
static arc arcs_32_2[1] = {
@@ -717,45 +690,37 @@
{1, arcs_32_3},
};
static arc arcs_33_0[1] = {
- {12, 1},
+ {79, 1},
};
static arc arcs_33_1[2] = {
- {83, 2},
+ {28, 2},
{0, 1},
};
-static arc arcs_33_2[1] = {
- {19, 3},
-};
-static arc arcs_33_3[1] = {
- {0, 3},
+static arc arcs_33_2[2] = {
+ {79, 1},
+ {0, 2},
};
-static state states_33[4] = {
+static state states_33[3] = {
{1, arcs_33_0},
{2, arcs_33_1},
- {1, arcs_33_2},
- {1, arcs_33_3},
+ {2, arcs_33_2},
};
static arc arcs_34_0[1] = {
- {82, 1},
+ {81, 1},
};
static arc arcs_34_1[2] = {
- {28, 2},
+ {28, 0},
{0, 1},
};
-static arc arcs_34_2[2] = {
- {82, 1},
- {0, 2},
-};
-static state states_34[3] = {
+static state states_34[2] = {
{1, arcs_34_0},
{2, arcs_34_1},
- {2, arcs_34_2},
};
static arc arcs_35_0[1] = {
- {84, 1},
+ {19, 1},
};
static arc arcs_35_1[2] = {
- {28, 0},
+ {77, 0},
{0, 1},
};
static state states_35[2] = {
@@ -763,69 +728,94 @@
{2, arcs_35_1},
};
static arc arcs_36_0[1] = {
- {19, 1},
+ {82, 1},
};
-static arc arcs_36_1[2] = {
- {80, 0},
- {0, 1},
+static arc arcs_36_1[1] = {
+ {19, 2},
};
-static state states_36[2] = {
+static arc arcs_36_2[2] = {
+ {28, 1},
+ {0, 2},
+};
+static state states_36[3] = {
{1, arcs_36_0},
- {2, arcs_36_1},
+ {1, arcs_36_1},
+ {2, arcs_36_2},
};
static arc arcs_37_0[1] = {
- {85, 1},
+ {83, 1},
};
static arc arcs_37_1[1] = {
- {19, 2},
+ {22, 2},
};
static arc arcs_37_2[2] = {
- {28, 1},
+ {28, 3},
{0, 2},
};
-static state states_37[3] = {
+static arc arcs_37_3[1] = {
+ {22, 4},
+};
+static arc arcs_37_4[1] = {
+ {0, 4},
+};
+static state states_37[5] = {
{1, arcs_37_0},
{1, arcs_37_1},
{2, arcs_37_2},
+ {1, arcs_37_3},
+ {1, arcs_37_4},
};
-static arc arcs_38_0[1] = {
+static arc arcs_38_0[7] = {
+ {84, 1},
+ {85, 1},
{86, 1},
+ {87, 1},
+ {88, 1},
+ {17, 1},
+ {89, 1},
};
static arc arcs_38_1[1] = {
+ {0, 1},
+};
+static state states_38[2] = {
+ {7, arcs_38_0},
+ {1, arcs_38_1},
+};
+static arc arcs_39_0[1] = {
+ {90, 1},
+};
+static arc arcs_39_1[1] = {
{22, 2},
};
-static arc arcs_38_2[2] = {
- {28, 3},
- {0, 2},
+static arc arcs_39_2[1] = {
+ {23, 3},
};
-static arc arcs_38_3[1] = {
- {22, 4},
+static arc arcs_39_3[1] = {
+ {24, 4},
};
-static arc arcs_38_4[1] = {
+static arc arcs_39_4[3] = {
+ {91, 1},
+ {92, 5},
{0, 4},
};
-static state states_38[5] = {
- {1, arcs_38_0},
- {1, arcs_38_1},
- {2, arcs_38_2},
- {1, arcs_38_3},
- {1, arcs_38_4},
+static arc arcs_39_5[1] = {
+ {23, 6},
};
-static arc arcs_39_0[7] = {
- {87, 1},
- {88, 1},
- {89, 1},
- {90, 1},
- {91, 1},
- {17, 1},
- {92, 1},
+static arc arcs_39_6[1] = {
+ {24, 7},
};
-static arc arcs_39_1[1] = {
- {0, 1},
+static arc arcs_39_7[1] = {
+ {0, 7},
};
-static state states_39[2] = {
- {7, arcs_39_0},
+static state states_39[8] = {
+ {1, arcs_39_0},
{1, arcs_39_1},
+ {1, arcs_39_2},
+ {1, arcs_39_3},
+ {3, arcs_39_4},
+ {1, arcs_39_5},
+ {1, arcs_39_6},
+ {1, arcs_39_7},
};
static arc arcs_40_0[1] = {
{93, 1},
@@ -839,9 +829,8 @@
static arc arcs_40_3[1] = {
{24, 4},
};
-static arc arcs_40_4[3] = {
- {94, 1},
- {95, 5},
+static arc arcs_40_4[2] = {
+ {92, 5},
{0, 4},
};
static arc arcs_40_5[1] = {
@@ -858,404 +847,380 @@
{1, arcs_40_1},
{1, arcs_40_2},
{1, arcs_40_3},
- {3, arcs_40_4},
+ {2, arcs_40_4},
{1, arcs_40_5},
{1, arcs_40_6},
{1, arcs_40_7},
};
static arc arcs_41_0[1] = {
- {96, 1},
+ {94, 1},
};
static arc arcs_41_1[1] = {
- {22, 2},
+ {61, 2},
};
static arc arcs_41_2[1] = {
- {23, 3},
+ {95, 3},
};
static arc arcs_41_3[1] = {
- {24, 4},
+ {9, 4},
};
-static arc arcs_41_4[2] = {
- {95, 5},
- {0, 4},
+static arc arcs_41_4[1] = {
+ {23, 5},
};
static arc arcs_41_5[1] = {
- {23, 6},
+ {24, 6},
};
-static arc arcs_41_6[1] = {
- {24, 7},
+static arc arcs_41_6[2] = {
+ {92, 7},
+ {0, 6},
};
static arc arcs_41_7[1] = {
- {0, 7},
+ {23, 8},
+};
+static arc arcs_41_8[1] = {
+ {24, 9},
+};
+static arc arcs_41_9[1] = {
+ {0, 9},
};
-static state states_41[8] = {
+static state states_41[10] = {
{1, arcs_41_0},
{1, arcs_41_1},
{1, arcs_41_2},
{1, arcs_41_3},
- {2, arcs_41_4},
+ {1, arcs_41_4},
{1, arcs_41_5},
- {1, arcs_41_6},
+ {2, arcs_41_6},
{1, arcs_41_7},
+ {1, arcs_41_8},
+ {1, arcs_41_9},
};
static arc arcs_42_0[1] = {
- {97, 1},
+ {96, 1},
};
static arc arcs_42_1[1] = {
- {64, 2},
+ {23, 2},
};
static arc arcs_42_2[1] = {
- {98, 3},
+ {24, 3},
};
-static arc arcs_42_3[1] = {
- {9, 4},
+static arc arcs_42_3[2] = {
+ {97, 4},
+ {98, 5},
};
static arc arcs_42_4[1] = {
- {23, 5},
+ {23, 6},
};
static arc arcs_42_5[1] = {
- {24, 6},
+ {23, 7},
};
-static arc arcs_42_6[2] = {
- {95, 7},
- {0, 6},
+static arc arcs_42_6[1] = {
+ {24, 8},
};
static arc arcs_42_7[1] = {
- {23, 8},
-};
-static arc arcs_42_8[1] = {
{24, 9},
};
+static arc arcs_42_8[4] = {
+ {97, 4},
+ {92, 10},
+ {98, 5},
+ {0, 8},
+};
static arc arcs_42_9[1] = {
{0, 9},
};
-static state states_42[10] = {
+static arc arcs_42_10[1] = {
+ {23, 11},
+};
+static arc arcs_42_11[1] = {
+ {24, 12},
+};
+static arc arcs_42_12[2] = {
+ {98, 5},
+ {0, 12},
+};
+static state states_42[13] = {
{1, arcs_42_0},
{1, arcs_42_1},
{1, arcs_42_2},
- {1, arcs_42_3},
+ {2, arcs_42_3},
{1, arcs_42_4},
{1, arcs_42_5},
- {2, arcs_42_6},
+ {1, arcs_42_6},
{1, arcs_42_7},
- {1, arcs_42_8},
+ {4, arcs_42_8},
{1, arcs_42_9},
+ {1, arcs_42_10},
+ {1, arcs_42_11},
+ {2, arcs_42_12},
};
static arc arcs_43_0[1] = {
{99, 1},
};
static arc arcs_43_1[1] = {
- {23, 2},
+ {22, 2},
};
-static arc arcs_43_2[1] = {
- {24, 3},
+static arc arcs_43_2[2] = {
+ {100, 3},
+ {23, 4},
};
-static arc arcs_43_3[2] = {
- {100, 4},
- {101, 5},
+static arc arcs_43_3[1] = {
+ {23, 4},
};
static arc arcs_43_4[1] = {
- {23, 6},
+ {24, 5},
};
static arc arcs_43_5[1] = {
- {23, 7},
-};
-static arc arcs_43_6[1] = {
- {24, 8},
-};
-static arc arcs_43_7[1] = {
- {24, 9},
-};
-static arc arcs_43_8[4] = {
- {100, 4},
- {95, 10},
- {101, 5},
- {0, 8},
-};
-static arc arcs_43_9[1] = {
- {0, 9},
-};
-static arc arcs_43_10[1] = {
- {23, 11},
-};
-static arc arcs_43_11[1] = {
- {24, 12},
-};
-static arc arcs_43_12[2] = {
- {101, 5},
- {0, 12},
+ {0, 5},
};
-static state states_43[13] = {
+static state states_43[6] = {
{1, arcs_43_0},
{1, arcs_43_1},
- {1, arcs_43_2},
- {2, arcs_43_3},
+ {2, arcs_43_2},
+ {1, arcs_43_3},
{1, arcs_43_4},
{1, arcs_43_5},
- {1, arcs_43_6},
- {1, arcs_43_7},
- {4, arcs_43_8},
- {1, arcs_43_9},
- {1, arcs_43_10},
- {1, arcs_43_11},
- {2, arcs_43_12},
};
static arc arcs_44_0[1] = {
- {102, 1},
+ {80, 1},
};
static arc arcs_44_1[1] = {
- {22, 2},
-};
-static arc arcs_44_2[2] = {
- {103, 3},
- {23, 4},
+ {101, 2},
};
-static arc arcs_44_3[1] = {
- {23, 4},
-};
-static arc arcs_44_4[1] = {
- {24, 5},
-};
-static arc arcs_44_5[1] = {
- {0, 5},
+static arc arcs_44_2[1] = {
+ {0, 2},
};
-static state states_44[6] = {
+static state states_44[3] = {
{1, arcs_44_0},
{1, arcs_44_1},
- {2, arcs_44_2},
- {1, arcs_44_3},
- {1, arcs_44_4},
- {1, arcs_44_5},
+ {1, arcs_44_2},
};
static arc arcs_45_0[1] = {
- {83, 1},
+ {102, 1},
};
-static arc arcs_45_1[1] = {
- {104, 2},
+static arc arcs_45_1[2] = {
+ {22, 2},
+ {0, 1},
};
-static arc arcs_45_2[1] = {
+static arc arcs_45_2[2] = {
+ {80, 3},
{0, 2},
};
-static state states_45[3] = {
+static arc arcs_45_3[1] = {
+ {19, 4},
+};
+static arc arcs_45_4[1] = {
+ {0, 4},
+};
+static state states_45[5] = {
{1, arcs_45_0},
- {1, arcs_45_1},
- {1, arcs_45_2},
+ {2, arcs_45_1},
+ {2, arcs_45_2},
+ {1, arcs_45_3},
+ {1, arcs_45_4},
};
-static arc arcs_46_0[1] = {
- {105, 1},
+static arc arcs_46_0[2] = {
+ {3, 1},
+ {2, 2},
};
-static arc arcs_46_1[2] = {
- {22, 2},
+static arc arcs_46_1[1] = {
{0, 1},
};
-static arc arcs_46_2[2] = {
- {83, 3},
- {0, 2},
+static arc arcs_46_2[1] = {
+ {103, 3},
};
static arc arcs_46_3[1] = {
- {19, 4},
+ {6, 4},
};
-static arc arcs_46_4[1] = {
- {0, 4},
+static arc arcs_46_4[2] = {
+ {6, 4},
+ {104, 1},
};
static state states_46[5] = {
- {1, arcs_46_0},
- {2, arcs_46_1},
- {2, arcs_46_2},
+ {2, arcs_46_0},
+ {1, arcs_46_1},
+ {1, arcs_46_2},
{1, arcs_46_3},
- {1, arcs_46_4},
+ {2, arcs_46_4},
};
-static arc arcs_47_0[2] = {
- {3, 1},
- {2, 2},
+static arc arcs_47_0[1] = {
+ {106, 1},
};
-static arc arcs_47_1[1] = {
+static arc arcs_47_1[2] = {
+ {28, 2},
{0, 1},
};
static arc arcs_47_2[1] = {
{106, 3},
};
-static arc arcs_47_3[1] = {
- {6, 4},
+static arc arcs_47_3[2] = {
+ {28, 4},
+ {0, 3},
};
static arc arcs_47_4[2] = {
- {6, 4},
- {107, 1},
+ {106, 3},
+ {0, 4},
};
static state states_47[5] = {
- {2, arcs_47_0},
- {1, arcs_47_1},
+ {1, arcs_47_0},
+ {2, arcs_47_1},
{1, arcs_47_2},
- {1, arcs_47_3},
+ {2, arcs_47_3},
{2, arcs_47_4},
};
-static arc arcs_48_0[1] = {
- {109, 1},
+static arc arcs_48_0[2] = {
+ {107, 1},
+ {108, 1},
};
-static arc arcs_48_1[2] = {
- {28, 2},
+static arc arcs_48_1[1] = {
{0, 1},
};
-static arc arcs_48_2[1] = {
- {109, 3},
+static state states_48[2] = {
+ {2, arcs_48_0},
+ {1, arcs_48_1},
};
-static arc arcs_48_3[2] = {
- {28, 4},
- {0, 3},
+static arc arcs_49_0[1] = {
+ {109, 1},
};
-static arc arcs_48_4[2] = {
- {109, 3},
- {0, 4},
+static arc arcs_49_1[2] = {
+ {33, 2},
+ {23, 3},
};
-static state states_48[5] = {
- {1, arcs_48_0},
- {2, arcs_48_1},
- {1, arcs_48_2},
- {2, arcs_48_3},
- {2, arcs_48_4},
+static arc arcs_49_2[1] = {
+ {23, 3},
};
-static arc arcs_49_0[2] = {
- {110, 1},
- {111, 1},
+static arc arcs_49_3[1] = {
+ {106, 4},
};
-static arc arcs_49_1[1] = {
- {0, 1},
+static arc arcs_49_4[1] = {
+ {0, 4},
};
-static state states_49[2] = {
- {2, arcs_49_0},
- {1, arcs_49_1},
+static state states_49[5] = {
+ {1, arcs_49_0},
+ {2, arcs_49_1},
+ {1, arcs_49_2},
+ {1, arcs_49_3},
+ {1, arcs_49_4},
};
-static arc arcs_50_0[1] = {
- {112, 1},
+static arc arcs_50_0[2] = {
+ {107, 1},
+ {110, 2},
};
static arc arcs_50_1[2] = {
- {33, 2},
- {23, 3},
+ {90, 3},
+ {0, 1},
};
static arc arcs_50_2[1] = {
- {23, 3},
+ {0, 2},
};
static arc arcs_50_3[1] = {
- {109, 4},
+ {107, 4},
};
static arc arcs_50_4[1] = {
- {0, 4},
+ {92, 5},
+};
+static arc arcs_50_5[1] = {
+ {22, 2},
};
-static state states_50[5] = {
- {1, arcs_50_0},
+static state states_50[6] = {
+ {2, arcs_50_0},
{2, arcs_50_1},
{1, arcs_50_2},
{1, arcs_50_3},
{1, arcs_50_4},
+ {1, arcs_50_5},
};
-static arc arcs_51_0[2] = {
- {110, 1},
- {113, 2},
+static arc arcs_51_0[1] = {
+ {111, 1},
};
static arc arcs_51_1[2] = {
- {93, 3},
+ {112, 0},
{0, 1},
};
-static arc arcs_51_2[1] = {
- {0, 2},
-};
-static arc arcs_51_3[1] = {
- {110, 4},
-};
-static arc arcs_51_4[1] = {
- {95, 5},
-};
-static arc arcs_51_5[1] = {
- {22, 2},
-};
-static state states_51[6] = {
- {2, arcs_51_0},
+static state states_51[2] = {
+ {1, arcs_51_0},
{2, arcs_51_1},
- {1, arcs_51_2},
- {1, arcs_51_3},
- {1, arcs_51_4},
- {1, arcs_51_5},
};
static arc arcs_52_0[1] = {
- {114, 1},
+ {113, 1},
};
static arc arcs_52_1[2] = {
- {115, 0},
+ {114, 0},
{0, 1},
};
static state states_52[2] = {
{1, arcs_52_0},
{2, arcs_52_1},
};
-static arc arcs_53_0[1] = {
- {116, 1},
-};
-static arc arcs_53_1[2] = {
- {117, 0},
- {0, 1},
-};
-static state states_53[2] = {
- {1, arcs_53_0},
- {2, arcs_53_1},
-};
-static arc arcs_54_0[2] = {
- {118, 1},
- {119, 2},
-};
-static arc arcs_54_1[1] = {
+static arc arcs_53_0[2] = {
+ {115, 1},
{116, 2},
};
-static arc arcs_54_2[1] = {
+static arc arcs_53_1[1] = {
+ {113, 2},
+};
+static arc arcs_53_2[1] = {
{0, 2},
};
-static state states_54[3] = {
- {2, arcs_54_0},
- {1, arcs_54_1},
- {1, arcs_54_2},
+static state states_53[3] = {
+ {2, arcs_53_0},
+ {1, arcs_53_1},
+ {1, arcs_53_2},
};
-static arc arcs_55_0[1] = {
- {104, 1},
+static arc arcs_54_0[1] = {
+ {101, 1},
};
-static arc arcs_55_1[2] = {
- {120, 0},
+static arc arcs_54_1[2] = {
+ {117, 0},
{0, 1},
};
-static state states_55[2] = {
- {1, arcs_55_0},
- {2, arcs_55_1},
+static state states_54[2] = {
+ {1, arcs_54_0},
+ {2, arcs_54_1},
};
-static arc arcs_56_0[9] = {
+static arc arcs_55_0[9] = {
+ {118, 1},
+ {119, 1},
+ {120, 1},
{121, 1},
{122, 1},
{123, 1},
- {124, 1},
- {125, 1},
- {126, 1},
- {98, 1},
- {118, 2},
- {127, 3},
+ {95, 1},
+ {115, 2},
+ {124, 3},
};
-static arc arcs_56_1[1] = {
+static arc arcs_55_1[1] = {
{0, 1},
};
-static arc arcs_56_2[1] = {
- {98, 1},
+static arc arcs_55_2[1] = {
+ {95, 1},
};
-static arc arcs_56_3[2] = {
- {118, 1},
+static arc arcs_55_3[2] = {
+ {115, 1},
{0, 3},
};
-static state states_56[4] = {
- {9, arcs_56_0},
- {1, arcs_56_1},
- {1, arcs_56_2},
- {2, arcs_56_3},
+static state states_55[4] = {
+ {9, arcs_55_0},
+ {1, arcs_55_1},
+ {1, arcs_55_2},
+ {2, arcs_55_3},
+};
+static arc arcs_56_0[1] = {
+ {125, 1},
+};
+static arc arcs_56_1[2] = {
+ {126, 0},
+ {0, 1},
+};
+static state states_56[2] = {
+ {1, arcs_56_0},
+ {2, arcs_56_1},
};
static arc arcs_57_0[1] = {
- {128, 1},
+ {127, 1},
};
static arc arcs_57_1[2] = {
- {129, 0},
+ {128, 0},
{0, 1},
};
static state states_57[2] = {
@@ -1263,10 +1228,10 @@
{2, arcs_57_1},
};
static arc arcs_58_0[1] = {
- {130, 1},
+ {129, 1},
};
static arc arcs_58_1[2] = {
- {131, 0},
+ {130, 0},
{0, 1},
};
static state states_58[2] = {
@@ -1274,22 +1239,23 @@
{2, arcs_58_1},
};
static arc arcs_59_0[1] = {
- {132, 1},
+ {131, 1},
};
-static arc arcs_59_1[2] = {
+static arc arcs_59_1[3] = {
+ {132, 0},
{133, 0},
{0, 1},
};
static state states_59[2] = {
{1, arcs_59_0},
- {2, arcs_59_1},
+ {3, arcs_59_1},
};
static arc arcs_60_0[1] = {
{134, 1},
};
static arc arcs_60_1[3] = {
{135, 0},
- {62, 0},
+ {136, 0},
{0, 1},
};
static state states_60[2] = {
@@ -1297,300 +1263,304 @@
{3, arcs_60_1},
};
static arc arcs_61_0[1] = {
- {136, 1},
+ {137, 1},
};
-static arc arcs_61_1[3] = {
- {137, 0},
+static arc arcs_61_1[5] = {
+ {29, 0},
{138, 0},
+ {139, 0},
+ {140, 0},
{0, 1},
};
static state states_61[2] = {
{1, arcs_61_0},
- {3, arcs_61_1},
+ {5, arcs_61_1},
};
-static arc arcs_62_0[1] = {
- {139, 1},
-};
-static arc arcs_62_1[5] = {
- {29, 0},
- {140, 0},
- {141, 0},
- {142, 0},
- {0, 1},
-};
-static state states_62[2] = {
- {1, arcs_62_0},
- {5, arcs_62_1},
-};
-static arc arcs_63_0[4] = {
- {137, 1},
- {138, 1},
- {143, 1},
- {144, 2},
+static arc arcs_62_0[4] = {
+ {135, 1},
+ {136, 1},
+ {141, 1},
+ {142, 2},
};
-static arc arcs_63_1[1] = {
- {139, 2},
+static arc arcs_62_1[1] = {
+ {137, 2},
};
-static arc arcs_63_2[1] = {
+static arc arcs_62_2[1] = {
{0, 2},
};
-static state states_63[3] = {
- {4, arcs_63_0},
- {1, arcs_63_1},
- {1, arcs_63_2},
+static state states_62[3] = {
+ {4, arcs_62_0},
+ {1, arcs_62_1},
+ {1, arcs_62_2},
};
-static arc arcs_64_0[1] = {
- {145, 1},
+static arc arcs_63_0[1] = {
+ {143, 1},
};
-static arc arcs_64_1[3] = {
- {146, 1},
+static arc arcs_63_1[3] = {
+ {144, 1},
{31, 2},
{0, 1},
};
-static arc arcs_64_2[1] = {
- {139, 3},
+static arc arcs_63_2[1] = {
+ {137, 3},
};
-static arc arcs_64_3[1] = {
+static arc arcs_63_3[1] = {
{0, 3},
};
-static state states_64[4] = {
- {1, arcs_64_0},
- {3, arcs_64_1},
- {1, arcs_64_2},
- {1, arcs_64_3},
+static state states_63[4] = {
+ {1, arcs_63_0},
+ {3, arcs_63_1},
+ {1, arcs_63_2},
+ {1, arcs_63_3},
};
-static arc arcs_65_0[7] = {
+static arc arcs_64_0[7] = {
{13, 1},
- {148, 2},
- {151, 3},
+ {146, 2},
+ {149, 3},
{19, 4},
- {154, 4},
- {155, 5},
- {80, 6},
+ {152, 4},
+ {153, 5},
+ {77, 6},
};
-static arc arcs_65_1[3] = {
- {48, 7},
- {147, 7},
+static arc arcs_64_1[3] = {
+ {47, 7},
+ {145, 7},
{15, 4},
};
-static arc arcs_65_2[2] = {
- {149, 8},
- {150, 4},
-};
-static arc arcs_65_3[2] = {
- {152, 9},
- {153, 4},
+static arc arcs_64_2[2] = {
+ {147, 8},
+ {148, 4},
+};
+static arc arcs_64_3[2] = {
+ {150, 9},
+ {151, 4},
};
-static arc arcs_65_4[1] = {
+static arc arcs_64_4[1] = {
{0, 4},
};
-static arc arcs_65_5[2] = {
- {155, 5},
+static arc arcs_64_5[2] = {
+ {153, 5},
{0, 5},
};
-static arc arcs_65_6[1] = {
- {80, 10},
+static arc arcs_64_6[1] = {
+ {77, 10},
};
-static arc arcs_65_7[1] = {
+static arc arcs_64_7[1] = {
{15, 4},
};
-static arc arcs_65_8[1] = {
- {150, 4},
+static arc arcs_64_8[1] = {
+ {148, 4},
};
-static arc arcs_65_9[1] = {
- {153, 4},
+static arc arcs_64_9[1] = {
+ {151, 4},
};
-static arc arcs_65_10[1] = {
- {80, 4},
+static arc arcs_64_10[1] = {
+ {77, 4},
};
-static state states_65[11] = {
- {7, arcs_65_0},
- {3, arcs_65_1},
- {2, arcs_65_2},
- {2, arcs_65_3},
- {1, arcs_65_4},
- {2, arcs_65_5},
- {1, arcs_65_6},
- {1, arcs_65_7},
- {1, arcs_65_8},
- {1, arcs_65_9},
- {1, arcs_65_10},
+static state states_64[11] = {
+ {7, arcs_64_0},
+ {3, arcs_64_1},
+ {2, arcs_64_2},
+ {2, arcs_64_3},
+ {1, arcs_64_4},
+ {2, arcs_64_5},
+ {1, arcs_64_6},
+ {1, arcs_64_7},
+ {1, arcs_64_8},
+ {1, arcs_64_9},
+ {1, arcs_64_10},
};
-static arc arcs_66_0[1] = {
+static arc arcs_65_0[1] = {
{22, 1},
};
-static arc arcs_66_1[3] = {
- {156, 2},
+static arc arcs_65_1[3] = {
+ {154, 2},
{28, 3},
{0, 1},
};
-static arc arcs_66_2[1] = {
+static arc arcs_65_2[1] = {
{0, 2},
};
-static arc arcs_66_3[2] = {
+static arc arcs_65_3[2] = {
{22, 4},
{0, 3},
};
-static arc arcs_66_4[2] = {
+static arc arcs_65_4[2] = {
{28, 3},
{0, 4},
};
-static state states_66[5] = {
- {1, arcs_66_0},
- {3, arcs_66_1},
- {1, arcs_66_2},
- {2, arcs_66_3},
- {2, arcs_66_4},
+static state states_65[5] = {
+ {1, arcs_65_0},
+ {3, arcs_65_1},
+ {1, arcs_65_2},
+ {2, arcs_65_3},
+ {2, arcs_65_4},
};
-static arc arcs_67_0[1] = {
+static arc arcs_66_0[1] = {
{22, 1},
};
-static arc arcs_67_1[3] = {
- {157, 2},
+static arc arcs_66_1[3] = {
+ {155, 2},
{28, 3},
{0, 1},
};
-static arc arcs_67_2[1] = {
+static arc arcs_66_2[1] = {
{0, 2},
};
-static arc arcs_67_3[2] = {
+static arc arcs_66_3[2] = {
{22, 4},
{0, 3},
};
-static arc arcs_67_4[2] = {
+static arc arcs_66_4[2] = {
{28, 3},
{0, 4},
};
-static state states_67[5] = {
- {1, arcs_67_0},
- {3, arcs_67_1},
- {1, arcs_67_2},
- {2, arcs_67_3},
- {2, arcs_67_4},
+static state states_66[5] = {
+ {1, arcs_66_0},
+ {3, arcs_66_1},
+ {1, arcs_66_2},
+ {2, arcs_66_3},
+ {2, arcs_66_4},
};
-static arc arcs_68_0[1] = {
- {112, 1},
+static arc arcs_67_0[1] = {
+ {109, 1},
};
-static arc arcs_68_1[2] = {
+static arc arcs_67_1[2] = {
{33, 2},
{23, 3},
};
-static arc arcs_68_2[1] = {
+static arc arcs_67_2[1] = {
{23, 3},
};
-static arc arcs_68_3[1] = {
+static arc arcs_67_3[1] = {
{22, 4},
};
-static arc arcs_68_4[1] = {
+static arc arcs_67_4[1] = {
{0, 4},
};
-static state states_68[5] = {
- {1, arcs_68_0},
- {2, arcs_68_1},
- {1, arcs_68_2},
- {1, arcs_68_3},
- {1, arcs_68_4},
+static state states_67[5] = {
+ {1, arcs_67_0},
+ {2, arcs_67_1},
+ {1, arcs_67_2},
+ {1, arcs_67_3},
+ {1, arcs_67_4},
};
-static arc arcs_69_0[3] = {
+static arc arcs_68_0[3] = {
{13, 1},
- {148, 2},
- {80, 3},
+ {146, 2},
+ {77, 3},
};
-static arc arcs_69_1[2] = {
+static arc arcs_68_1[2] = {
{14, 4},
{15, 5},
};
-static arc arcs_69_2[1] = {
- {158, 6},
+static arc arcs_68_2[1] = {
+ {156, 6},
};
-static arc arcs_69_3[1] = {
+static arc arcs_68_3[1] = {
{19, 5},
};
-static arc arcs_69_4[1] = {
+static arc arcs_68_4[1] = {
{15, 5},
};
-static arc arcs_69_5[1] = {
+static arc arcs_68_5[1] = {
{0, 5},
};
-static arc arcs_69_6[1] = {
- {150, 5},
+static arc arcs_68_6[1] = {
+ {148, 5},
};
-static state states_69[7] = {
- {3, arcs_69_0},
- {2, arcs_69_1},
- {1, arcs_69_2},
- {1, arcs_69_3},
- {1, arcs_69_4},
- {1, arcs_69_5},
- {1, arcs_69_6},
+static state states_68[7] = {
+ {3, arcs_68_0},
+ {2, arcs_68_1},
+ {1, arcs_68_2},
+ {1, arcs_68_3},
+ {1, arcs_68_4},
+ {1, arcs_68_5},
+ {1, arcs_68_6},
};
-static arc arcs_70_0[1] = {
- {159, 1},
+static arc arcs_69_0[1] = {
+ {157, 1},
};
-static arc arcs_70_1[2] = {
+static arc arcs_69_1[2] = {
{28, 2},
{0, 1},
};
-static arc arcs_70_2[2] = {
- {159, 1},
+static arc arcs_69_2[2] = {
+ {157, 1},
{0, 2},
};
-static state states_70[3] = {
- {1, arcs_70_0},
- {2, arcs_70_1},
- {2, arcs_70_2},
+static state states_69[3] = {
+ {1, arcs_69_0},
+ {2, arcs_69_1},
+ {2, arcs_69_2},
};
-static arc arcs_71_0[2] = {
+static arc arcs_70_0[2] = {
{22, 1},
{23, 2},
};
-static arc arcs_71_1[2] = {
+static arc arcs_70_1[2] = {
{23, 2},
{0, 1},
};
-static arc arcs_71_2[3] = {
+static arc arcs_70_2[3] = {
{22, 3},
- {160, 4},
+ {158, 4},
{0, 2},
};
-static arc arcs_71_3[2] = {
- {160, 4},
+static arc arcs_70_3[2] = {
+ {158, 4},
{0, 3},
};
-static arc arcs_71_4[1] = {
+static arc arcs_70_4[1] = {
{0, 4},
};
-static state states_71[5] = {
- {2, arcs_71_0},
+static state states_70[5] = {
+ {2, arcs_70_0},
+ {2, arcs_70_1},
+ {3, arcs_70_2},
+ {2, arcs_70_3},
+ {1, arcs_70_4},
+};
+static arc arcs_71_0[1] = {
+ {23, 1},
+};
+static arc arcs_71_1[2] = {
+ {22, 2},
+ {0, 1},
+};
+static arc arcs_71_2[1] = {
+ {0, 2},
+};
+static state states_71[3] = {
+ {1, arcs_71_0},
{2, arcs_71_1},
- {3, arcs_71_2},
- {2, arcs_71_3},
- {1, arcs_71_4},
+ {1, arcs_71_2},
};
static arc arcs_72_0[1] = {
- {23, 1},
+ {101, 1},
};
static arc arcs_72_1[2] = {
- {22, 2},
+ {28, 2},
{0, 1},
};
-static arc arcs_72_2[1] = {
+static arc arcs_72_2[2] = {
+ {101, 1},
{0, 2},
};
static state states_72[3] = {
{1, arcs_72_0},
{2, arcs_72_1},
- {1, arcs_72_2},
+ {2, arcs_72_2},
};
static arc arcs_73_0[1] = {
- {104, 1},
+ {22, 1},
};
static arc arcs_73_1[2] = {
{28, 2},
{0, 1},
};
static arc arcs_73_2[2] = {
- {104, 1},
+ {22, 1},
{0, 2},
};
static state states_73[3] = {
@@ -1601,500 +1571,482 @@
static arc arcs_74_0[1] = {
{22, 1},
};
-static arc arcs_74_1[2] = {
- {28, 2},
- {0, 1},
-};
-static arc arcs_74_2[2] = {
- {22, 1},
- {0, 2},
-};
-static state states_74[3] = {
- {1, arcs_74_0},
- {2, arcs_74_1},
- {2, arcs_74_2},
-};
-static arc arcs_75_0[1] = {
- {22, 1},
-};
-static arc arcs_75_1[3] = {
+static arc arcs_74_1[3] = {
{23, 2},
{28, 3},
{0, 1},
};
-static arc arcs_75_2[1] = {
+static arc arcs_74_2[1] = {
{22, 4},
};
-static arc arcs_75_3[2] = {
+static arc arcs_74_3[2] = {
{22, 5},
{0, 3},
};
-static arc arcs_75_4[2] = {
+static arc arcs_74_4[2] = {
{28, 6},
{0, 4},
};
-static arc arcs_75_5[2] = {
+static arc arcs_74_5[2] = {
{28, 3},
{0, 5},
};
-static arc arcs_75_6[2] = {
+static arc arcs_74_6[2] = {
{22, 7},
{0, 6},
};
-static arc arcs_75_7[1] = {
+static arc arcs_74_7[1] = {
{23, 2},
};
-static state states_75[8] = {
- {1, arcs_75_0},
- {3, arcs_75_1},
- {1, arcs_75_2},
- {2, arcs_75_3},
- {2, arcs_75_4},
- {2, arcs_75_5},
- {2, arcs_75_6},
- {1, arcs_75_7},
+static state states_74[8] = {
+ {1, arcs_74_0},
+ {3, arcs_74_1},
+ {1, arcs_74_2},
+ {2, arcs_74_3},
+ {2, arcs_74_4},
+ {2, arcs_74_5},
+ {2, arcs_74_6},
+ {1, arcs_74_7},
};
-static arc arcs_76_0[1] = {
- {161, 1},
+static arc arcs_75_0[1] = {
+ {159, 1},
};
-static arc arcs_76_1[1] = {
+static arc arcs_75_1[1] = {
{19, 2},
};
-static arc arcs_76_2[2] = {
+static arc arcs_75_2[2] = {
{13, 3},
{23, 4},
};
-static arc arcs_76_3[2] = {
+static arc arcs_75_3[2] = {
{9, 5},
{15, 6},
};
-static arc arcs_76_4[1] = {
+static arc arcs_75_4[1] = {
{24, 7},
};
-static arc arcs_76_5[1] = {
+static arc arcs_75_5[1] = {
{15, 6},
};
-static arc arcs_76_6[1] = {
+static arc arcs_75_6[1] = {
{23, 4},
};
-static arc arcs_76_7[1] = {
+static arc arcs_75_7[1] = {
{0, 7},
};
-static state states_76[8] = {
- {1, arcs_76_0},
- {1, arcs_76_1},
- {2, arcs_76_2},
- {2, arcs_76_3},
- {1, arcs_76_4},
- {1, arcs_76_5},
- {1, arcs_76_6},
- {1, arcs_76_7},
+static state states_75[8] = {
+ {1, arcs_75_0},
+ {1, arcs_75_1},
+ {2, arcs_75_2},
+ {2, arcs_75_3},
+ {1, arcs_75_4},
+ {1, arcs_75_5},
+ {1, arcs_75_6},
+ {1, arcs_75_7},
};
-static arc arcs_77_0[3] = {
- {162, 1},
+static arc arcs_76_0[3] = {
+ {160, 1},
{29, 2},
{31, 3},
};
-static arc arcs_77_1[2] = {
+static arc arcs_76_1[2] = {
{28, 4},
{0, 1},
};
-static arc arcs_77_2[1] = {
+static arc arcs_76_2[1] = {
{22, 5},
};
-static arc arcs_77_3[1] = {
+static arc arcs_76_3[1] = {
{22, 6},
};
-static arc arcs_77_4[4] = {
- {162, 1},
+static arc arcs_76_4[4] = {
+ {160, 1},
{29, 2},
{31, 3},
{0, 4},
};
-static arc arcs_77_5[2] = {
+static arc arcs_76_5[2] = {
{28, 7},
{0, 5},
};
-static arc arcs_77_6[1] = {
+static arc arcs_76_6[1] = {
{0, 6},
};
-static arc arcs_77_7[1] = {
+static arc arcs_76_7[1] = {
{31, 3},
};
-static state states_77[8] = {
- {3, arcs_77_0},
- {2, arcs_77_1},
- {1, arcs_77_2},
- {1, arcs_77_3},
- {4, arcs_77_4},
- {2, arcs_77_5},
- {1, arcs_77_6},
- {1, arcs_77_7},
+static state states_76[8] = {
+ {3, arcs_76_0},
+ {2, arcs_76_1},
+ {1, arcs_76_2},
+ {1, arcs_76_3},
+ {4, arcs_76_4},
+ {2, arcs_76_5},
+ {1, arcs_76_6},
+ {1, arcs_76_7},
};
-static arc arcs_78_0[1] = {
+static arc arcs_77_0[1] = {
{22, 1},
};
-static arc arcs_78_1[3] = {
- {157, 2},
+static arc arcs_77_1[3] = {
+ {155, 2},
{27, 3},
{0, 1},
};
-static arc arcs_78_2[1] = {
+static arc arcs_77_2[1] = {
{0, 2},
};
-static arc arcs_78_3[1] = {
+static arc arcs_77_3[1] = {
{22, 2},
};
-static state states_78[4] = {
- {1, arcs_78_0},
- {3, arcs_78_1},
- {1, arcs_78_2},
- {1, arcs_78_3},
+static state states_77[4] = {
+ {1, arcs_77_0},
+ {3, arcs_77_1},
+ {1, arcs_77_2},
+ {1, arcs_77_3},
};
-static arc arcs_79_0[2] = {
- {156, 1},
- {164, 1},
+static arc arcs_78_0[2] = {
+ {154, 1},
+ {162, 1},
};
-static arc arcs_79_1[1] = {
+static arc arcs_78_1[1] = {
{0, 1},
};
-static state states_79[2] = {
- {2, arcs_79_0},
- {1, arcs_79_1},
+static state states_78[2] = {
+ {2, arcs_78_0},
+ {1, arcs_78_1},
};
-static arc arcs_80_0[1] = {
- {97, 1},
+static arc arcs_79_0[1] = {
+ {94, 1},
};
-static arc arcs_80_1[1] = {
- {64, 2},
+static arc arcs_79_1[1] = {
+ {61, 2},
};
-static arc arcs_80_2[1] = {
- {98, 3},
+static arc arcs_79_2[1] = {
+ {95, 3},
};
-static arc arcs_80_3[1] = {
- {108, 4},
+static arc arcs_79_3[1] = {
+ {105, 4},
};
-static arc arcs_80_4[2] = {
- {163, 5},
+static arc arcs_79_4[2] = {
+ {161, 5},
{0, 4},
};
-static arc arcs_80_5[1] = {
+static arc arcs_79_5[1] = {
{0, 5},
};
-static state states_80[6] = {
- {1, arcs_80_0},
- {1, arcs_80_1},
- {1, arcs_80_2},
- {1, arcs_80_3},
- {2, arcs_80_4},
- {1, arcs_80_5},
+static state states_79[6] = {
+ {1, arcs_79_0},
+ {1, arcs_79_1},
+ {1, arcs_79_2},
+ {1, arcs_79_3},
+ {2, arcs_79_4},
+ {1, arcs_79_5},
};
-static arc arcs_81_0[1] = {
- {93, 1},
+static arc arcs_80_0[1] = {
+ {90, 1},
};
-static arc arcs_81_1[1] = {
- {109, 2},
+static arc arcs_80_1[1] = {
+ {106, 2},
};
-static arc arcs_81_2[2] = {
- {163, 3},
+static arc arcs_80_2[2] = {
+ {161, 3},
{0, 2},
};
-static arc arcs_81_3[1] = {
+static arc arcs_80_3[1] = {
{0, 3},
};
-static state states_81[4] = {
- {1, arcs_81_0},
- {1, arcs_81_1},
- {2, arcs_81_2},
- {1, arcs_81_3},
+static state states_80[4] = {
+ {1, arcs_80_0},
+ {1, arcs_80_1},
+ {2, arcs_80_2},
+ {1, arcs_80_3},
};
-static arc arcs_82_0[2] = {
- {157, 1},
- {166, 1},
+static arc arcs_81_0[2] = {
+ {155, 1},
+ {164, 1},
};
-static arc arcs_82_1[1] = {
+static arc arcs_81_1[1] = {
{0, 1},
};
-static state states_82[2] = {
- {2, arcs_82_0},
- {1, arcs_82_1},
+static state states_81[2] = {
+ {2, arcs_81_0},
+ {1, arcs_81_1},
};
-static arc arcs_83_0[1] = {
- {97, 1},
+static arc arcs_82_0[1] = {
+ {94, 1},
};
-static arc arcs_83_1[1] = {
- {64, 2},
+static arc arcs_82_1[1] = {
+ {61, 2},
};
-static arc arcs_83_2[1] = {
- {98, 3},
+static arc arcs_82_2[1] = {
+ {95, 3},
};
-static arc arcs_83_3[1] = {
- {110, 4},
+static arc arcs_82_3[1] = {
+ {107, 4},
};
-static arc arcs_83_4[2] = {
- {165, 5},
+static arc arcs_82_4[2] = {
+ {163, 5},
{0, 4},
};
-static arc arcs_83_5[1] = {
+static arc arcs_82_5[1] = {
{0, 5},
};
-static state states_83[6] = {
- {1, arcs_83_0},
- {1, arcs_83_1},
- {1, arcs_83_2},
- {1, arcs_83_3},
- {2, arcs_83_4},
- {1, arcs_83_5},
+static state states_82[6] = {
+ {1, arcs_82_0},
+ {1, arcs_82_1},
+ {1, arcs_82_2},
+ {1, arcs_82_3},
+ {2, arcs_82_4},
+ {1, arcs_82_5},
};
-static arc arcs_84_0[1] = {
- {93, 1},
+static arc arcs_83_0[1] = {
+ {90, 1},
};
-static arc arcs_84_1[1] = {
- {109, 2},
+static arc arcs_83_1[1] = {
+ {106, 2},
};
-static arc arcs_84_2[2] = {
- {165, 3},
+static arc arcs_83_2[2] = {
+ {163, 3},
{0, 2},
};
-static arc arcs_84_3[1] = {
+static arc arcs_83_3[1] = {
{0, 3},
};
-static state states_84[4] = {
- {1, arcs_84_0},
- {1, arcs_84_1},
- {2, arcs_84_2},
- {1, arcs_84_3},
+static state states_83[4] = {
+ {1, arcs_83_0},
+ {1, arcs_83_1},
+ {2, arcs_83_2},
+ {1, arcs_83_3},
};
-static arc arcs_85_0[1] = {
+static arc arcs_84_0[1] = {
{22, 1},
};
-static arc arcs_85_1[2] = {
+static arc arcs_84_1[2] = {
{28, 0},
{0, 1},
};
-static state states_85[2] = {
- {1, arcs_85_0},
- {2, arcs_85_1},
+static state states_84[2] = {
+ {1, arcs_84_0},
+ {2, arcs_84_1},
};
-static arc arcs_86_0[1] = {
+static arc arcs_85_0[1] = {
{19, 1},
};
-static arc arcs_86_1[1] = {
+static arc arcs_85_1[1] = {
{0, 1},
};
-static state states_86[2] = {
- {1, arcs_86_0},
- {1, arcs_86_1},
+static state states_85[2] = {
+ {1, arcs_85_0},
+ {1, arcs_85_1},
};
-static arc arcs_87_0[1] = {
- {169, 1},
+static arc arcs_86_0[1] = {
+ {167, 1},
};
-static arc arcs_87_1[2] = {
+static arc arcs_86_1[2] = {
{9, 2},
{0, 1},
};
-static arc arcs_87_2[1] = {
+static arc arcs_86_2[1] = {
{0, 2},
};
-static state states_87[3] = {
- {1, arcs_87_0},
- {2, arcs_87_1},
- {1, arcs_87_2},
+static state states_86[3] = {
+ {1, arcs_86_0},
+ {2, arcs_86_1},
+ {1, arcs_86_2},
};
-static dfa dfas[88] = {
+static dfa dfas[87] = {
{256, "single_input", 0, 3, states_0,
- "\004\050\014\000\000\000\000\240\202\247\141\040\113\000\101\000\000\206\220\014\002\002"},
+ "\004\050\014\000\000\000\000\120\360\064\014\144\011\040\010\000\200\041\044\203\200"},
{257, "file_input", 0, 2, states_1,
- "\204\050\014\000\000\000\000\240\202\247\141\040\113\000\101\000\000\206\220\014\002\002"},
+ "\204\050\014\000\000\000\000\120\360\064\014\144\011\040\010\000\200\041\044\203\200"},
{258, "eval_input", 0, 3, states_2,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
{259, "decorator", 0, 7, states_3,
- "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{260, "decorators", 0, 2, states_4,
- "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{261, "funcdef", 0, 9, states_5,
- "\000\010\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\010\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{262, "parameters", 0, 4, states_6,
- "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{263, "typedargslist", 0, 12, states_7,
- "\000\040\010\240\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\240\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{264, "tname", 0, 4, states_8,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{265, "tfpdef", 0, 4, states_9,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{266, "tfplist", 0, 3, states_10,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{267, "varargslist", 0, 12, states_11,
- "\000\040\010\240\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\240\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{268, "vname", 0, 2, states_12,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{269, "vfpdef", 0, 4, states_13,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{270, "vfplist", 0, 3, states_14,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{271, "stmt", 0, 2, states_15,
- "\000\050\014\000\000\000\000\240\202\247\141\040\113\000\101\000\000\206\220\014\002\002"},
+ "\000\050\014\000\000\000\000\120\360\064\014\144\011\040\010\000\200\041\044\203\200"},
{272, "simple_stmt", 0, 4, states_16,
- "\000\040\010\000\000\000\000\240\202\247\141\000\000\000\101\000\000\206\220\014\000\002"},
+ "\000\040\010\000\000\000\000\120\360\064\014\000\000\040\010\000\200\041\044\003\200"},
{273, "small_stmt", 0, 2, states_17,
- "\000\040\010\000\000\000\000\240\202\247\141\000\000\000\101\000\000\206\220\014\000\002"},
+ "\000\040\010\000\000\000\000\120\360\064\014\000\000\040\010\000\200\041\044\003\200"},
{274, "expr_stmt", 0, 6, states_18,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
{275, "augassign", 0, 2, states_19,
- "\000\000\000\000\000\000\376\037\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {276, "print_stmt", 0, 9, states_20,
- "\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {277, "del_stmt", 0, 3, states_21,
- "\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {278, "pass_stmt", 0, 2, states_22,
- "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {279, "flow_stmt", 0, 2, states_23,
- "\000\000\000\000\000\000\000\000\200\007\000\000\000\000\000\000\000\000\000\000\000\002"},
- {280, "break_stmt", 0, 2, states_24,
- "\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {281, "continue_stmt", 0, 2, states_25,
- "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"},
- {282, "return_stmt", 0, 3, states_26,
- "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"},
- {283, "yield_stmt", 0, 2, states_27,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
- {284, "raise_stmt", 0, 7, states_28,
- "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"},
- {285, "import_stmt", 0, 2, states_29,
- "\000\000\000\000\000\000\000\000\000\240\000\000\000\000\000\000\000\000\000\000\000\000"},
- {286, "import_name", 0, 3, states_30,
- "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
- {287, "import_from", 0, 8, states_31,
- "\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000"},
- {288, "import_as_name", 0, 4, states_32,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {289, "dotted_as_name", 0, 4, states_33,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {290, "import_as_names", 0, 3, states_34,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {291, "dotted_as_names", 0, 2, states_35,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {292, "dotted_name", 0, 2, states_36,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {293, "global_stmt", 0, 3, states_37,
- "\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000"},
- {294, "assert_stmt", 0, 5, states_38,
- "\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000"},
- {295, "compound_stmt", 0, 2, states_39,
- "\000\010\004\000\000\000\000\000\000\000\000\040\113\000\000\000\000\000\000\000\002\000"},
- {296, "if_stmt", 0, 8, states_40,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
- {297, "while_stmt", 0, 8, states_41,
- "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
- {298, "for_stmt", 0, 10, states_42,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
- {299, "try_stmt", 0, 13, states_43,
- "\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"},
- {300, "with_stmt", 0, 6, states_44,
- "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
- {301, "with_var", 0, 3, states_45,
- "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000"},
- {302, "except_clause", 0, 5, states_46,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"},
- {303, "suite", 0, 5, states_47,
- "\004\040\010\000\000\000\000\240\202\247\141\000\000\000\101\000\000\206\220\014\000\002"},
- {304, "testlist_safe", 0, 5, states_48,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {305, "old_test", 0, 2, states_49,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {306, "old_lambdef", 0, 5, states_50,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
- {307, "test", 0, 6, states_51,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {308, "or_test", 0, 2, states_52,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\100\000\000\206\220\014\000\000"},
- {309, "and_test", 0, 2, states_53,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\100\000\000\206\220\014\000\000"},
- {310, "not_test", 0, 3, states_54,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\100\000\000\206\220\014\000\000"},
- {311, "comparison", 0, 2, states_55,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {312, "comp_op", 0, 4, states_56,
- "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\100\376\000\000\000\000\000\000"},
- {313, "expr", 0, 2, states_57,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {314, "xor_expr", 0, 2, states_58,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {315, "and_expr", 0, 2, states_59,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {316, "shift_expr", 0, 2, states_60,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {317, "arith_expr", 0, 2, states_61,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {318, "term", 0, 2, states_62,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {319, "factor", 0, 3, states_63,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {320, "power", 0, 4, states_64,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\220\014\000\000"},
- {321, "atom", 0, 11, states_65,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\220\014\000\000"},
- {322, "listmaker", 0, 5, states_66,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {323, "testlist_gexp", 0, 5, states_67,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {324, "lambdef", 0, 5, states_68,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
- {325, "trailer", 0, 7, states_69,
- "\000\040\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\020\000\000\000"},
- {326, "subscriptlist", 0, 3, states_70,
- "\000\040\210\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {327, "subscript", 0, 5, states_71,
- "\000\040\210\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {328, "sliceop", 0, 3, states_72,
- "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {329, "exprlist", 0, 3, states_73,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\000\000\000\206\220\014\000\000"},
- {330, "testlist", 0, 3, states_74,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {331, "dictsetmaker", 0, 8, states_75,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {332, "classdef", 0, 8, states_76,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000"},
- {333, "arglist", 0, 8, states_77,
- "\000\040\010\240\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {334, "argument", 0, 4, states_78,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {335, "list_iter", 0, 2, states_79,
- "\000\000\000\000\000\000\000\000\000\000\000\040\002\000\000\000\000\000\000\000\000\000"},
- {336, "list_for", 0, 6, states_80,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
- {337, "list_if", 0, 4, states_81,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
- {338, "gen_iter", 0, 2, states_82,
- "\000\000\000\000\000\000\000\000\000\000\000\040\002\000\000\000\000\000\000\000\000\000"},
- {339, "gen_for", 0, 6, states_83,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
- {340, "gen_if", 0, 4, states_84,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
- {341, "testlist1", 0, 2, states_85,
- "\000\040\010\000\000\000\000\000\000\000\001\000\000\000\101\000\000\206\220\014\000\000"},
- {342, "encoding_decl", 0, 2, states_86,
- "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {343, "yield_expr", 0, 3, states_87,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
+ "\000\000\000\000\000\000\377\017\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {276, "del_stmt", 0, 3, states_20,
+ "\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {277, "pass_stmt", 0, 2, states_21,
+ "\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {278, "flow_stmt", 0, 2, states_22,
+ "\000\000\000\000\000\000\000\000\360\000\000\000\000\000\000\000\000\000\000\000\200"},
+ {279, "break_stmt", 0, 2, states_23,
+ "\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {280, "continue_stmt", 0, 2, states_24,
+ "\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {281, "return_stmt", 0, 3, states_25,
+ "\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {282, "yield_stmt", 0, 2, states_26,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200"},
+ {283, "raise_stmt", 0, 7, states_27,
+ "\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {284, "import_stmt", 0, 2, states_28,
+ "\000\000\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\000\000\000\000"},
+ {285, "import_name", 0, 3, states_29,
+ "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"},
+ {286, "import_from", 0, 8, states_30,
+ "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000"},
+ {287, "import_as_name", 0, 4, states_31,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {288, "dotted_as_name", 0, 4, states_32,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {289, "import_as_names", 0, 3, states_33,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {290, "dotted_as_names", 0, 2, states_34,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {291, "dotted_name", 0, 2, states_35,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {292, "global_stmt", 0, 3, states_36,
+ "\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"},
+ {293, "assert_stmt", 0, 5, states_37,
+ "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000"},
+ {294, "compound_stmt", 0, 2, states_38,
+ "\000\010\004\000\000\000\000\000\000\000\000\144\011\000\000\000\000\000\000\200\000"},
+ {295, "if_stmt", 0, 8, states_39,
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {296, "while_stmt", 0, 8, states_40,
+ "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
+ {297, "for_stmt", 0, 10, states_41,
+ "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ {298, "try_stmt", 0, 13, states_42,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000"},
+ {299, "with_stmt", 0, 6, states_43,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000"},
+ {300, "with_var", 0, 3, states_44,
+ "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000"},
+ {301, "except_clause", 0, 5, states_45,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
+ {302, "suite", 0, 5, states_46,
+ "\004\040\010\000\000\000\000\120\360\064\014\000\000\040\010\000\200\041\044\003\200"},
+ {303, "testlist_safe", 0, 5, states_47,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {304, "old_test", 0, 2, states_48,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {305, "old_lambdef", 0, 5, states_49,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000"},
+ {306, "test", 0, 6, states_50,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {307, "or_test", 0, 2, states_51,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\010\000\200\041\044\003\000"},
+ {308, "and_test", 0, 2, states_52,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\010\000\200\041\044\003\000"},
+ {309, "not_test", 0, 3, states_53,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\010\000\200\041\044\003\000"},
+ {310, "comparison", 0, 2, states_54,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {311, "comp_op", 0, 4, states_55,
+ "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\310\037\000\000\000\000\000"},
+ {312, "expr", 0, 2, states_56,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {313, "xor_expr", 0, 2, states_57,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {314, "and_expr", 0, 2, states_58,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {315, "shift_expr", 0, 2, states_59,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {316, "arith_expr", 0, 2, states_60,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {317, "term", 0, 2, states_61,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {318, "factor", 0, 3, states_62,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {319, "power", 0, 4, states_63,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\044\003\000"},
+ {320, "atom", 0, 11, states_64,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\044\003\000"},
+ {321, "listmaker", 0, 5, states_65,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {322, "testlist_gexp", 0, 5, states_66,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {323, "lambdef", 0, 5, states_67,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000"},
+ {324, "trailer", 0, 7, states_68,
+ "\000\040\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\004\000\000"},
+ {325, "subscriptlist", 0, 3, states_69,
+ "\000\040\210\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {326, "subscript", 0, 5, states_70,
+ "\000\040\210\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {327, "sliceop", 0, 3, states_71,
+ "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {328, "exprlist", 0, 3, states_72,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\000\000\000\200\041\044\003\000"},
+ {329, "testlist", 0, 3, states_73,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {330, "dictsetmaker", 0, 8, states_74,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {331, "classdef", 0, 8, states_75,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"},
+ {332, "arglist", 0, 8, states_76,
+ "\000\040\010\240\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {333, "argument", 0, 4, states_77,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {334, "list_iter", 0, 2, states_78,
+ "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"},
+ {335, "list_for", 0, 6, states_79,
+ "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ {336, "list_if", 0, 4, states_80,
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {337, "gen_iter", 0, 2, states_81,
+ "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"},
+ {338, "gen_for", 0, 6, states_82,
+ "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ {339, "gen_if", 0, 4, states_83,
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {340, "testlist1", 0, 2, states_84,
+ "\000\040\010\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\003\000"},
+ {341, "encoding_decl", 0, 2, states_85,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {342, "yield_expr", 0, 3, states_86,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200"},
};
-static label labels[170] = {
+static label labels[168] = {
{0, "EMPTY"},
{256, 0},
{4, 0},
{272, 0},
- {295, 0},
+ {294, 0},
{257, 0},
{271, 0},
{0, 0},
{258, 0},
- {330, 0},
+ {329, 0},
{259, 0},
{50, 0},
- {292, 0},
+ {291, 0},
{7, 0},
- {333, 0},
+ {332, 0},
{8, 0},
{260, 0},
{261, 0},
@@ -2102,9 +2054,9 @@
{1, 0},
{262, 0},
{51, 0},
- {307, 0},
+ {306, 0},
{11, 0},
- {303, 0},
+ {302, 0},
{263, 0},
{265, 0},
{22, 0},
@@ -2123,12 +2075,11 @@
{276, 0},
{277, 0},
{278, 0},
- {279, 0},
- {285, 0},
+ {284, 0},
+ {292, 0},
{293, 0},
- {294, 0},
{275, 0},
- {343, 0},
+ {342, 0},
{37, 0},
{38, 0},
{39, 0},
@@ -2141,38 +2092,36 @@
{46, 0},
{47, 0},
{49, 0},
- {1, "print"},
- {35, 0},
{1, "del"},
- {329, 0},
+ {328, 0},
{1, "pass"},
+ {279, 0},
{280, 0},
{281, 0},
- {282, 0},
- {284, 0},
{283, 0},
+ {282, 0},
{1, "break"},
{1, "continue"},
{1, "return"},
{1, "raise"},
+ {285, 0},
{286, 0},
- {287, 0},
{1, "import"},
- {291, 0},
+ {290, 0},
{1, "from"},
{23, 0},
- {290, 0},
- {288, 0},
- {1, "as"},
{289, 0},
+ {287, 0},
+ {1, "as"},
+ {288, 0},
{1, "global"},
{1, "assert"},
+ {295, 0},
{296, 0},
{297, 0},
{298, 0},
{299, 0},
- {300, 0},
- {332, 0},
+ {331, 0},
{1, "if"},
{1, "elif"},
{1, "else"},
@@ -2180,27 +2129,27 @@
{1, "for"},
{1, "in"},
{1, "try"},
- {302, 0},
+ {301, 0},
{1, "finally"},
{1, "with"},
- {301, 0},
- {313, 0},
+ {300, 0},
+ {312, 0},
{1, "except"},
{5, 0},
{6, 0},
+ {303, 0},
{304, 0},
+ {307, 0},
{305, 0},
- {308, 0},
- {306, 0},
{1, "lambda"},
- {324, 0},
- {309, 0},
+ {323, 0},
+ {308, 0},
{1, "or"},
- {310, 0},
+ {309, 0},
{1, "and"},
{1, "not"},
+ {310, 0},
{311, 0},
- {312, 0},
{20, 0},
{21, 0},
{28, 0},
@@ -2208,52 +2157,53 @@
{30, 0},
{29, 0},
{1, "is"},
- {314, 0},
+ {313, 0},
{18, 0},
- {315, 0},
+ {314, 0},
{33, 0},
- {316, 0},
+ {315, 0},
{19, 0},
- {317, 0},
+ {316, 0},
{34, 0},
- {318, 0},
+ {35, 0},
+ {317, 0},
{14, 0},
{15, 0},
- {319, 0},
+ {318, 0},
{17, 0},
{24, 0},
{48, 0},
{32, 0},
+ {319, 0},
{320, 0},
- {321, 0},
- {325, 0},
- {323, 0},
- {9, 0},
+ {324, 0},
{322, 0},
+ {9, 0},
+ {321, 0},
{10, 0},
{26, 0},
- {331, 0},
+ {330, 0},
{27, 0},
{2, 0},
{3, 0},
- {336, 0},
- {339, 0},
+ {335, 0},
+ {338, 0},
+ {325, 0},
{326, 0},
{327, 0},
- {328, 0},
{1, "class"},
+ {333, 0},
{334, 0},
- {335, 0},
+ {336, 0},
{337, 0},
- {338, 0},
+ {339, 0},
{340, 0},
{341, 0},
- {342, 0},
{1, "yield"},
};
grammar _PyParser_Grammar = {
- 88,
+ 87,
dfas,
- {170, labels},
+ {168, labels},
256
};
Modified: python/branches/p3yk/Python/import.c
==============================================================================
--- python/branches/p3yk/Python/import.c (original)
+++ python/branches/p3yk/Python/import.c Fri Feb 9 06:32:43 2007
@@ -71,9 +71,10 @@
3020 (added BUILD_SET)
3030 (added keyword-only parameters)
3040 (added signature annotations)
+ 3050 (print becomes a function)
.
*/
-#define MAGIC (3040 | ((long)'\r'<<16) | ((long)'\n'<<24))
+#define MAGIC (3050 | ((long)'\r'<<16) | ((long)'\n'<<24))
/* Magic word as global; note that _PyImport_Init() can change the
value of this global to accommodate for alterations of how the
Modified: python/branches/p3yk/setup.py
==============================================================================
--- python/branches/p3yk/setup.py (original)
+++ python/branches/p3yk/setup.py Fri Feb 9 06:32:43 2007
@@ -664,7 +664,7 @@
# search path.
for d in inc_dirs + db_inc_paths:
f = os.path.join(d, "db.h")
- if db_setup_debug: print "db: looking for db.h in", f
+ if db_setup_debug: print("db: looking for db.h in", f)
if os.path.exists(f):
f = open(f).read()
m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
@@ -680,13 +680,13 @@
# (first occurrance only)
db_ver_inc_map[db_ver] = d
if db_setup_debug:
- print "db.h: found", db_ver, "in", d
+ print("db.h: found", db_ver, "in", d)
else:
# we already found a header for this library version
- if db_setup_debug: print "db.h: ignoring", d
+ if db_setup_debug: print("db.h: ignoring", d)
else:
# ignore this header, it didn't contain a version number
- if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
+ if db_setup_debug: print("db.h: unsupported version", db_ver, "in", d)
db_found_vers = db_ver_inc_map.keys()
db_found_vers.sort()
@@ -717,12 +717,12 @@
dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
raise db_found
else:
- if db_setup_debug: print "db lib: ", dblib, "not found"
+ if db_setup_debug: print("db lib: ", dblib, "not found")
except db_found:
if db_setup_debug:
- print "db lib: using", db_ver, dblib
- print "db: lib dir", dblib_dir, "inc dir", db_incdir
+ print("db lib: using", db_ver, dblib)
+ print("db: lib dir", dblib_dir, "inc dir", db_incdir)
db_incs = [db_incdir]
dblibs = [dblib]
# We add the runtime_library_dirs argument because the
@@ -737,7 +737,7 @@
include_dirs=db_incs,
libraries=dblibs))
else:
- if db_setup_debug: print "db: no appropriate library found"
+ if db_setup_debug: print("db: no appropriate library found")
db_incs = None
dblibs = []
dblib_dir = None
@@ -765,7 +765,7 @@
for d in inc_dirs + sqlite_inc_paths:
f = os.path.join(d, "sqlite3.h")
if os.path.exists(f):
- if sqlite_setup_debug: print "sqlite: found %s"%f
+ if sqlite_setup_debug: print("sqlite: found %s"%f)
incf = open(f).read()
m = re.search(
r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
@@ -776,15 +776,15 @@
if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
# we win!
if sqlite_setup_debug:
- print "%s/sqlite3.h: version %s"%(d, sqlite_version)
+ print("%s/sqlite3.h: version %s"%(d, sqlite_version))
sqlite_incdir = d
break
else:
if sqlite_setup_debug:
- print "%s: version %d is too old, need >= %s"%(d,
- sqlite_version, MIN_SQLITE_VERSION)
+ print("%s: version %d is too old, need >= %s"%(d,
+ sqlite_version, MIN_SQLITE_VERSION))
elif sqlite_setup_debug:
- print "sqlite: %s had no SQLITE_VERSION"%(f,)
+ print("sqlite: %s had no SQLITE_VERSION"%(f,))
if sqlite_incdir:
sqlite_dirs_to_check = [
@@ -1333,7 +1333,7 @@
res = os.system(cmd)
if res or not os.path.exists(ffi_configfile):
- print "Failed to configure _ctypes module"
+ print("Failed to configure _ctypes module")
return False
fficonfig = {}
More information about the Python-3000-checkins
mailing list