Get parsermodule working again after adding set literals

This commit is contained in:
Neal Norwitz 2006-08-29 05:53:33 +00:00
parent c082cb72a5
commit 6309f2d282
1 changed files with 4 additions and 4 deletions

View File

@ -860,7 +860,7 @@ VALIDATER(term); VALIDATER(factor);
VALIDATER(atom); VALIDATER(lambdef); VALIDATER(atom); VALIDATER(lambdef);
VALIDATER(trailer); VALIDATER(subscript); VALIDATER(trailer); VALIDATER(subscript);
VALIDATER(subscriptlist); VALIDATER(sliceop); VALIDATER(subscriptlist); VALIDATER(sliceop);
VALIDATER(exprlist); VALIDATER(dictmaker); VALIDATER(exprlist); VALIDATER(dictsetmaker);
VALIDATER(arglist); VALIDATER(argument); VALIDATER(arglist); VALIDATER(argument);
VALIDATER(listmaker); VALIDATER(yield_stmt); VALIDATER(listmaker); VALIDATER(yield_stmt);
VALIDATER(testlist1); VALIDATER(gen_for); VALIDATER(testlist1); VALIDATER(gen_for);
@ -2402,7 +2402,7 @@ validate_atom(node *tree)
&& validate_ntype(CHILD(tree, nch - 1), RBRACE)); && validate_ntype(CHILD(tree, nch - 1), RBRACE));
if (res && (nch == 3)) if (res && (nch == 3))
res = validate_dictmaker(CHILD(tree, 1)); res = validate_dictsetmaker(CHILD(tree, 1));
break; break;
case NAME: case NAME:
case NUMBER: case NUMBER:
@ -2838,10 +2838,10 @@ validate_exprlist(node *tree)
static int static int
validate_dictmaker(node *tree) validate_dictsetmaker(node *tree)
{ {
int nch = NCH(tree); int nch = NCH(tree);
int res = (validate_ntype(tree, dictmaker) int res = (validate_ntype(tree, dictsetmaker)
&& (nch >= 3) && (nch >= 3)
&& validate_test(CHILD(tree, 0)) && validate_test(CHILD(tree, 0))
&& validate_colon(CHILD(tree, 1)) && validate_colon(CHILD(tree, 1))