cpython-lru_cache-weakref: Python/ast.c annotate

annotate Python/ast.c @ 81922:4ab386b00aaf

Fix tests for issue #11159.

author	Serhiy Storchaka <storchaka@gmail.com>
date	Sat, 02 Feb 2013 12:17:50 +0200
parents	03f92a9f0875
children	10e59553a8de

rev	line source
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2 * This file includes functions to transform a concrete syntax tree (CST) to
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	3 * an abstract syntax tree (AST). The main function is PyAST_FromNode().
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	4 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	8 #include "node.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	9 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	10 #include "token.h"
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	11
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	12 #include <assert.h>
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	13
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	14 static int validate_stmts(asdl_seq *);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	15 static int validate_exprs(asdl_seq *, expr_context_ty, int);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	16 static int validate_nonempty_seq(asdl_seq , const char , const char *);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	17 static int validate_stmt(stmt_ty);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	18 static int validate_expr(expr_ty, expr_context_ty);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	19
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	20 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	21 validate_comprehension(asdl_seq *gens)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	22 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	23 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	24 if (!asdl_seq_LEN(gens)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	25 PyErr_SetString(PyExc_ValueError, "comprehension with no generators");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	26 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	27 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	28 for (i = 0; i < asdl_seq_LEN(gens); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	29 comprehension_ty comp = asdl_seq_GET(gens, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	30 if (!validate_expr(comp->target, Store) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	31 !validate_expr(comp->iter, Load) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	32 !validate_exprs(comp->ifs, Load, 0))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	33 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	34 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	35 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	36 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	37
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	38 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	39 validate_slice(slice_ty slice)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	40 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	41 switch (slice->kind) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	42 case Slice_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	43 return (!slice->v.Slice.lower \|\| validate_expr(slice->v.Slice.lower, Load)) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	44 (!slice->v.Slice.upper \|\| validate_expr(slice->v.Slice.upper, Load)) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	45 (!slice->v.Slice.step \|\| validate_expr(slice->v.Slice.step, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	46 case ExtSlice_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	47 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	48 if (!validate_nonempty_seq(slice->v.ExtSlice.dims, "dims", "ExtSlice"))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	49 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	50 for (i = 0; i < asdl_seq_LEN(slice->v.ExtSlice.dims); i++)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	51 if (!validate_slice(asdl_seq_GET(slice->v.ExtSlice.dims, i)))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	52 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	53 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	54 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	55 case Index_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	56 return validate_expr(slice->v.Index.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	57 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	58 PyErr_SetString(PyExc_SystemError, "unknown slice node");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	59 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	60 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	61 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	62
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	63 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	64 validate_keywords(asdl_seq *keywords)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	65 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	66 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	67 for (i = 0; i < asdl_seq_LEN(keywords); i++)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	68 if (!validate_expr(((keyword_ty)asdl_seq_GET(keywords, i))->value, Load))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	69 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	70 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	71 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	72
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	73 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	74 validate_args(asdl_seq *args)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	75 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	76 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	77 for (i = 0; i < asdl_seq_LEN(args); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	78 arg_ty arg = asdl_seq_GET(args, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	79 if (arg->annotation && !validate_expr(arg->annotation, Load))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	80 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	81 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	82 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	83 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	84
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	85 static const char *
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	86 expr_context_name(expr_context_ty ctx)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	87 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	88 switch (ctx) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	89 case Load:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	90 return "Load";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	91 case Store:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	92 return "Store";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	93 case Del:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	94 return "Del";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	95 case AugLoad:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	96 return "AugLoad";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	97 case AugStore:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	98 return "AugStore";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	99 case Param:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	100 return "Param";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	101 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	102 assert(0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	103 return "(unknown)";
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	104 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	105 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	106
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	107 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	108 validate_arguments(arguments_ty args)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	109 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	110 if (!validate_args(args->args))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	111 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	112 if (args->varargannotation) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	113 if (!args->vararg) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	114 PyErr_SetString(PyExc_ValueError, "varargannotation but no vararg on arguments");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	115 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	116 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	117 if (!validate_expr(args->varargannotation, Load))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	118 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	119 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	120 if (!validate_args(args->kwonlyargs))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	121 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	122 if (args->kwargannotation) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	123 if (!args->kwarg) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	124 PyErr_SetString(PyExc_ValueError, "kwargannotation but no kwarg on arguments");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	125 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	126 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	127 if (!validate_expr(args->kwargannotation, Load))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	128 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	129 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	130 if (asdl_seq_LEN(args->defaults) > asdl_seq_LEN(args->args)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	131 PyErr_SetString(PyExc_ValueError, "more positional defaults than args on arguments");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	132 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	133 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	134 if (asdl_seq_LEN(args->kw_defaults) != asdl_seq_LEN(args->kwonlyargs)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	135 PyErr_SetString(PyExc_ValueError, "length of kwonlyargs is not the same as "
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	136 "kw_defaults on arguments");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	137 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	138 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	139 return validate_exprs(args->defaults, Load, 0) && validate_exprs(args->kw_defaults, Load, 1);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	140 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	141
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	142 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	143 validate_expr(expr_ty exp, expr_context_ty ctx)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	144 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	145 int check_ctx = 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	146 expr_context_ty actual_ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	147
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	148 /* First check expression context. */
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	149 switch (exp->kind) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	150 case Attribute_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	151 actual_ctx = exp->v.Attribute.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	152 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	153 case Subscript_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	154 actual_ctx = exp->v.Subscript.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	155 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	156 case Starred_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	157 actual_ctx = exp->v.Starred.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	158 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	159 case Name_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	160 actual_ctx = exp->v.Name.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	161 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	162 case List_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	163 actual_ctx = exp->v.List.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	164 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	165 case Tuple_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	166 actual_ctx = exp->v.Tuple.ctx;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	167 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	168 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	169 if (ctx != Load) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	170 PyErr_Format(PyExc_ValueError, "expression which can't be "
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	171 "assigned to in %s context", expr_context_name(ctx));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	172 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	173 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	174 check_ctx = 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	175 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	176 if (check_ctx && actual_ctx != ctx) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	177 PyErr_Format(PyExc_ValueError, "expression must have %s context but has %s instead",
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	178 expr_context_name(ctx), expr_context_name(actual_ctx));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	179 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	180 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	181
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	182 /* Now validate expression. */
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	183 switch (exp->kind) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	184 case BoolOp_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	185 if (asdl_seq_LEN(exp->v.BoolOp.values) < 2) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	186 PyErr_SetString(PyExc_ValueError, "BoolOp with less than 2 values");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	187 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	188 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	189 return validate_exprs(exp->v.BoolOp.values, Load, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	190 case BinOp_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	191 return validate_expr(exp->v.BinOp.left, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	192 validate_expr(exp->v.BinOp.right, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	193 case UnaryOp_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	194 return validate_expr(exp->v.UnaryOp.operand, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	195 case Lambda_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	196 return validate_arguments(exp->v.Lambda.args) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	197 validate_expr(exp->v.Lambda.body, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	198 case IfExp_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	199 return validate_expr(exp->v.IfExp.test, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	200 validate_expr(exp->v.IfExp.body, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	201 validate_expr(exp->v.IfExp.orelse, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	202 case Dict_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	203 if (asdl_seq_LEN(exp->v.Dict.keys) != asdl_seq_LEN(exp->v.Dict.values)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	204 PyErr_SetString(PyExc_ValueError,
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	205 "Dict doesn't have the same number of keys as values");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	206 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	207 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	208 return validate_exprs(exp->v.Dict.keys, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	209 validate_exprs(exp->v.Dict.values, Load, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	210 case Set_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	211 return validate_exprs(exp->v.Set.elts, Load, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	212 #define COMP(NAME) \
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	213 case NAME ## _kind: \
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	214 return validate_comprehension(exp->v.NAME.generators) && \
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	215 validate_expr(exp->v.NAME.elt, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	216 COMP(ListComp)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	217 COMP(SetComp)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	218 COMP(GeneratorExp)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	219 #undef COMP
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	220 case DictComp_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	221 return validate_comprehension(exp->v.DictComp.generators) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	222 validate_expr(exp->v.DictComp.key, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	223 validate_expr(exp->v.DictComp.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	224 case Yield_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	225 return !exp->v.Yield.value \|\| validate_expr(exp->v.Yield.value, Load);
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	226 case YieldFrom_kind:
80589 ffb2fa900cb7 Issue #16546: make ast.YieldFrom argument mandatory. Mark Dickinson <mdickinson@enthought.com> parents: 78963 diff changeset	227 return validate_expr(exp->v.YieldFrom.value, Load);
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	228 case Compare_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	229 if (!asdl_seq_LEN(exp->v.Compare.comparators)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	230 PyErr_SetString(PyExc_ValueError, "Compare with no comparators");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	231 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	232 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	233 if (asdl_seq_LEN(exp->v.Compare.comparators) !=
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	234 asdl_seq_LEN(exp->v.Compare.ops)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	235 PyErr_SetString(PyExc_ValueError, "Compare has a different number "
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	236 "of comparators and operands");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	237 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	238 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	239 return validate_exprs(exp->v.Compare.comparators, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	240 validate_expr(exp->v.Compare.left, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	241 case Call_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	242 return validate_expr(exp->v.Call.func, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	243 validate_exprs(exp->v.Call.args, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	244 validate_keywords(exp->v.Call.keywords) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	245 (!exp->v.Call.starargs \|\| validate_expr(exp->v.Call.starargs, Load)) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	246 (!exp->v.Call.kwargs \|\| validate_expr(exp->v.Call.kwargs, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	247 case Num_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	248 PyObject *n = exp->v.Num.n;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	249 if (!PyLong_CheckExact(n) && !PyFloat_CheckExact(n) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	250 !PyComplex_CheckExact(n)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	251 PyErr_SetString(PyExc_TypeError, "non-numeric type in Num");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	252 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	253 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	254 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	255 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	256 case Str_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	257 PyObject *s = exp->v.Str.s;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	258 if (!PyUnicode_CheckExact(s)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	259 PyErr_SetString(PyExc_TypeError, "non-string type in Str");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	260 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	261 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	262 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	263 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	264 case Bytes_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	265 PyObject *b = exp->v.Bytes.s;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	266 if (!PyBytes_CheckExact(b)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	267 PyErr_SetString(PyExc_TypeError, "non-bytes type in Bytes");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	268 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	269 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	270 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	271 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	272 case Attribute_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	273 return validate_expr(exp->v.Attribute.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	274 case Subscript_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	275 return validate_slice(exp->v.Subscript.slice) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	276 validate_expr(exp->v.Subscript.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	277 case Starred_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	278 return validate_expr(exp->v.Starred.value, ctx);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	279 case List_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	280 return validate_exprs(exp->v.List.elts, ctx, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	281 case Tuple_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	282 return validate_exprs(exp->v.Tuple.elts, ctx, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	283 /* These last cases don't have any checking. */
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	284 case Name_kind:
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	285 case NameConstant_kind:
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	286 case Ellipsis_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	287 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	288 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	289 PyErr_SetString(PyExc_SystemError, "unexpected expression");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	290 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	291 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	292 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	293
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	294 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	295 validate_nonempty_seq(asdl_seq seq, const char what, const char *owner)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	296 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	297 if (asdl_seq_LEN(seq))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	298 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	299 PyErr_Format(PyExc_ValueError, "empty %s on %s", what, owner);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	300 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	301 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	302
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	303 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	304 validate_assignlist(asdl_seq *targets, expr_context_ty ctx)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	305 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	306 return validate_nonempty_seq(targets, "targets", ctx == Del ? "Delete" : "Assign") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	307 validate_exprs(targets, ctx, 0);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	308 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	309
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	310 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	311 validate_body(asdl_seq body, const char owner)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	312 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	313 return validate_nonempty_seq(body, "body", owner) && validate_stmts(body);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	314 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	315
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	316 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	317 validate_stmt(stmt_ty stmt)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	318 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	319 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	320 switch (stmt->kind) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	321 case FunctionDef_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	322 return validate_body(stmt->v.FunctionDef.body, "FunctionDef") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	323 validate_arguments(stmt->v.FunctionDef.args) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	324 validate_exprs(stmt->v.FunctionDef.decorator_list, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	325 (!stmt->v.FunctionDef.returns \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	326 validate_expr(stmt->v.FunctionDef.returns, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	327 case ClassDef_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	328 return validate_body(stmt->v.ClassDef.body, "ClassDef") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	329 validate_exprs(stmt->v.ClassDef.bases, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	330 validate_keywords(stmt->v.ClassDef.keywords) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	331 validate_exprs(stmt->v.ClassDef.decorator_list, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	332 (!stmt->v.ClassDef.starargs \|\| validate_expr(stmt->v.ClassDef.starargs, Load)) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	333 (!stmt->v.ClassDef.kwargs \|\| validate_expr(stmt->v.ClassDef.kwargs, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	334 case Return_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	335 return !stmt->v.Return.value \|\| validate_expr(stmt->v.Return.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	336 case Delete_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	337 return validate_assignlist(stmt->v.Delete.targets, Del);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	338 case Assign_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	339 return validate_assignlist(stmt->v.Assign.targets, Store) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	340 validate_expr(stmt->v.Assign.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	341 case AugAssign_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	342 return validate_expr(stmt->v.AugAssign.target, Store) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	343 validate_expr(stmt->v.AugAssign.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	344 case For_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	345 return validate_expr(stmt->v.For.target, Store) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	346 validate_expr(stmt->v.For.iter, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	347 validate_body(stmt->v.For.body, "For") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	348 validate_stmts(stmt->v.For.orelse);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	349 case While_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	350 return validate_expr(stmt->v.While.test, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	351 validate_body(stmt->v.While.body, "While") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	352 validate_stmts(stmt->v.While.orelse);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	353 case If_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	354 return validate_expr(stmt->v.If.test, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	355 validate_body(stmt->v.If.body, "If") &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	356 validate_stmts(stmt->v.If.orelse);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	357 case With_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	358 if (!validate_nonempty_seq(stmt->v.With.items, "items", "With"))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	359 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	360 for (i = 0; i < asdl_seq_LEN(stmt->v.With.items); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	361 withitem_ty item = asdl_seq_GET(stmt->v.With.items, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	362 if (!validate_expr(item->context_expr, Load) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	363 (item->optional_vars && !validate_expr(item->optional_vars, Store)))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	364 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	365 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	366 return validate_body(stmt->v.With.body, "With");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	367 case Raise_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	368 if (stmt->v.Raise.exc) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	369 return validate_expr(stmt->v.Raise.exc, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	370 (!stmt->v.Raise.cause \|\| validate_expr(stmt->v.Raise.cause, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	371 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	372 if (stmt->v.Raise.cause) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	373 PyErr_SetString(PyExc_ValueError, "Raise with cause but no exception");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	374 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	375 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	376 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	377 case Try_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	378 if (!validate_body(stmt->v.Try.body, "Try"))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	379 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	380 if (!asdl_seq_LEN(stmt->v.Try.handlers) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	381 !asdl_seq_LEN(stmt->v.Try.finalbody)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	382 PyErr_SetString(PyExc_ValueError, "Try has neither except handlers nor finalbody");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	383 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	384 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	385 if (!asdl_seq_LEN(stmt->v.Try.handlers) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	386 asdl_seq_LEN(stmt->v.Try.orelse)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	387 PyErr_SetString(PyExc_ValueError, "Try has orelse but no except handlers");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	388 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	389 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	390 for (i = 0; i < asdl_seq_LEN(stmt->v.Try.handlers); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	391 excepthandler_ty handler = asdl_seq_GET(stmt->v.Try.handlers, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	392 if ((handler->v.ExceptHandler.type &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	393 !validate_expr(handler->v.ExceptHandler.type, Load)) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	394 !validate_body(handler->v.ExceptHandler.body, "ExceptHandler"))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	395 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	396 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	397 return (!asdl_seq_LEN(stmt->v.Try.finalbody) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	398 validate_stmts(stmt->v.Try.finalbody)) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	399 (!asdl_seq_LEN(stmt->v.Try.orelse) \|\|
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	400 validate_stmts(stmt->v.Try.orelse));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	401 case Assert_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	402 return validate_expr(stmt->v.Assert.test, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	403 (!stmt->v.Assert.msg \|\| validate_expr(stmt->v.Assert.msg, Load));
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	404 case Import_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	405 return validate_nonempty_seq(stmt->v.Import.names, "names", "Import");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	406 case ImportFrom_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	407 if (stmt->v.ImportFrom.level < -1) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	408 PyErr_SetString(PyExc_ValueError, "ImportFrom level less than -1");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	409 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	410 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	411 return validate_nonempty_seq(stmt->v.ImportFrom.names, "names", "ImportFrom");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	412 case Global_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	413 return validate_nonempty_seq(stmt->v.Global.names, "names", "Global");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	414 case Nonlocal_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	415 return validate_nonempty_seq(stmt->v.Nonlocal.names, "names", "Nonlocal");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	416 case Expr_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	417 return validate_expr(stmt->v.Expr.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	418 case Pass_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	419 case Break_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	420 case Continue_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	421 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	422 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	423 PyErr_SetString(PyExc_SystemError, "unexpected statement");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	424 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	425 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	426 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	427
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	428 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	429 validate_stmts(asdl_seq *seq)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	430 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	431 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	432 for (i = 0; i < asdl_seq_LEN(seq); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	433 stmt_ty stmt = asdl_seq_GET(seq, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	434 if (stmt) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	435 if (!validate_stmt(stmt))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	436 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	437 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	438 else {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	439 PyErr_SetString(PyExc_ValueError,
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	440 "None disallowed in statement list");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	441 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	442 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	443 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	444 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	445 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	446
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	447 static int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	448 validate_exprs(asdl_seq *exprs, expr_context_ty ctx, int null_ok)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	449 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	450 int i;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	451 for (i = 0; i < asdl_seq_LEN(exprs); i++) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	452 expr_ty expr = asdl_seq_GET(exprs, i);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	453 if (expr) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	454 if (!validate_expr(expr, ctx))
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	455 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	456 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	457 else if (!null_ok) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	458 PyErr_SetString(PyExc_ValueError,
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	459 "None disallowed in expression list");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	460 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	461 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	462
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	463 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	464 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	465 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	466
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	467 int
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	468 PyAST_Validate(mod_ty mod)
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	469 {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	470 int res = 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	471
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	472 switch (mod->kind) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	473 case Module_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	474 res = validate_stmts(mod->v.Module.body);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	475 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	476 case Interactive_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	477 res = validate_stmts(mod->v.Interactive.body);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	478 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	479 case Expression_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	480 res = validate_expr(mod->v.Expression.body, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	481 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	482 case Suite_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	483 PyErr_SetString(PyExc_ValueError, "Suite is not valid in the CPython compiler");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	484 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	485 default:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	486 PyErr_SetString(PyExc_SystemError, "impossible module node");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	487 res = 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	488 break;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	489 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	490 return res;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	491 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	492
74448 525188cb79fc fix spelling Benjamin Peterson <benjamin@python.org> parents: 74447 diff changeset	493 /* This is done here, so defines like "test" don't interfere with AST use above. */
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	494 #include "grammar.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	495 #include "parsetok.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	496 #include "graminit.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	497
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	498 /* Data structure used internally */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	499 struct compiling {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	500 char c_encoding; / source encoding */
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	501 PyArena c_arena; / arena for allocating memeory */
44025 ebc7389297d6 Merged revisions 59107-59186 via svnmerge from Guido van Rossum <guido@python.org> parents: 43961 diff changeset	502 const char c_filename; / filename */
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	503 PyObject c_normalize; / Normalization function from unicodedata. */
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	504 PyObject c_normalize_args; / Normalization argument tuple. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	505 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	506
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	507 static asdl_seq seq_for_testlist(struct compiling , const node *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	508 static expr_ty ast_for_expr(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	509 static stmt_ty ast_for_stmt(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	510 static asdl_seq ast_for_suite(struct compiling , const node *);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	511 static asdl_seq ast_for_exprlist(struct compiling , const node *,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	512 expr_context_ty);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	513 static expr_ty ast_for_testlist(struct compiling , const node );
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	514 static stmt_ty ast_for_classdef(struct compiling , const node , asdl_seq *);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	515
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	516 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	517 static expr_ty ast_for_call(struct compiling , const node , expr_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	518
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	519 static PyObject parsenumber(struct compiling , const char *);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	520 static PyObject parsestr(struct compiling , const node n, int bytesmode);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	521 static PyObject parsestrplus(struct compiling , const node *n,
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	522 int *bytesmode);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	523
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	524 #define COMP_GENEXP 0
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	525 #define COMP_LISTCOMP 1
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	526 #define COMP_SETCOMP 2
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	527
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	528 static int
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	529 init_normalization(struct compiling *c)
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	530 {
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	531 PyObject *m = PyImport_ImportModuleNoBlock("unicodedata");
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	532 if (!m)
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	533 return 0;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	534 c->c_normalize = PyObject_GetAttrString(m, "normalize");
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	535 Py_DECREF(m);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	536 if (!c->c_normalize)
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	537 return 0;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	538 c->c_normalize_args = Py_BuildValue("(sN)", "NFKC", Py_None);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	539 PyTuple_SET_ITEM(c->c_normalize_args, 1, NULL);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	540 if (!c->c_normalize_args) {
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	541 Py_CLEAR(c->c_normalize);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	542 return 0;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	543 }
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	544 return 1;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	545 }
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	546
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	547 static identifier
78842 8ff2f4634ed8 merge 3.2 Benjamin Peterson <benjamin@python.org> parents: 78840 78841 diff changeset	548 new_identifier(const char n, struct compiling c)
42597 20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42549 diff changeset	549 {
78841 0c6a09b982d8 put * in the normal place Benjamin Peterson <benjamin@python.org> parents: 78838 diff changeset	550 PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	551 if (!id)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	552 return NULL;
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	553 /* PyUnicode_DecodeUTF8 should always return a ready string. */
74443 f5214817ed57 PyUnicode_DecodeUTF8 will always return a ready string Benjamin Peterson <benjamin@python.org> parents: 74442 diff changeset	554 assert(PyUnicode_IS_READY(id));
42597 20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42549 diff changeset	555 /* Check whether there are non-ASCII characters in the
20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42549 diff changeset	556 identifier; if so, normalize to NFKC. */
74447 ca5c5142da58 invert condition (head bang) Benjamin Peterson <benjamin@python.org> parents: 74445 diff changeset	557 if (!PyUnicode_IS_ASCII(id)) {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	558 PyObject *id2;
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	559 if (!c->c_normalize && !init_normalization(c)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	560 Py_DECREF(id);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	561 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	562 }
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	563 PyTuple_SET_ITEM(c->c_normalize_args, 1, id);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	564 id2 = PyObject_Call(c->c_normalize, c->c_normalize_args, NULL);
74445 5ef589e38985 fix possible refleaks Benjamin Peterson <benjamin@python.org> parents: 74444 diff changeset	565 Py_DECREF(id);
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	566 if (!id2)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	567 return NULL;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	568 id = id2;
42597 20477cbfd996 Implement PEP 3131. Add isidentifier to str. Martin v. Löwis <martin@v.loewis.de> parents: 42549 diff changeset	569 }
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	570 PyUnicode_InternInPlace(&id);
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	571 PyArena_AddPyObject(c->c_arena, id);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	572 return id;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	573 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	574
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	575 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	576
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	577 static int
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	578 ast_error(struct compiling c, const node n, const char *errmsg)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	579 {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	580 PyObject value, errstr, loc, tmp;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	581 PyObject *filename_obj;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	582
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	583 loc = PyErr_ProgramText(c->c_filename, LINENO(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	584 if (!loc) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	585 Py_INCREF(Py_None);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	586 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	587 }
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	588 if (c->c_filename) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	589 filename_obj = PyUnicode_DecodeFSDefault(c->c_filename);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	590 if (!filename_obj) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	591 Py_DECREF(loc);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	592 return 0;
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	593 }
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	594 } else {
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	595 Py_INCREF(Py_None);
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	596 filename_obj = Py_None;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	597 }
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	598 tmp = Py_BuildValue("(NiiN)", filename_obj, LINENO(n), n->n_col_offset, loc);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	599 if (!tmp)
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	600 return 0;
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	601 errstr = PyUnicode_FromString(errmsg);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	602 if (!errstr) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	603 Py_DECREF(tmp);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	604 return 0;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	605 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	606 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	607 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	608 Py_DECREF(tmp);
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	609 if (value) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	610 PyErr_SetObject(PyExc_SyntaxError, value);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	611 Py_DECREF(value);
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	612 }
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	613 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	614 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	615
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	617
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	618 Use this routine to determine how big a sequence is needed for
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	619 the statements in a parse tree. Its raison d'etre is this bit of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	620 grammar:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	621
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	622 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	623 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	624
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	625 A simple_stmt can contain multiple small_stmt elements joined
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	626 by semicolons. If the arg is a simple_stmt, the number of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	627 small_stmt elements is returned.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	628 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	629
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	630 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	631 num_stmts(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	632 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	633 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	634 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	635
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	636 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	637 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	638 if (TYPE(CHILD(n, 0)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	639 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	640 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	641 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	642 case file_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	643 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	644 for (i = 0; i < NCH(n); i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	645 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	646 if (TYPE(ch) == stmt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	647 l += num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	648 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	649 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	650 case stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	651 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	652 case compound_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	653 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	654 case simple_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	655 return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	656 case suite:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	657 if (NCH(n) == 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	658 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	659 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	660 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	661 for (i = 2; i < (NCH(n) - 1); i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	662 l += num_stmts(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	663 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	664 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	665 default: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	666 char buf[128];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	667
50886 581d8602f3f7 Merged revisions 68746 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50035 diff changeset	668 sprintf(buf, "Non-statement found: %d %d",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	669 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	670 Py_FatalError(buf);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	671 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	672 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	673 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	674 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	675 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	676
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	677 /* Transform the CST rooted at node * to the appropriate AST
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	678 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	679
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	680 mod_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	681 PyAST_FromNode(const node n, PyCompilerFlags flags, const char *filename,
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	682 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	683 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	684 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	685 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	686 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	687 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	688 struct compiling c;
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	689 mod_ty res = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	690
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	691 c.c_arena = arena;
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	692 c.c_filename = filename;
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	693 c.c_normalize = c.c_normalize_args = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	694 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	695 c.c_encoding = "utf-8";
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	696 if (TYPE(n) == encoding_decl) {
42054 063530fcc32e Minimal changes to make the "freeze" tool work again. Guido van Rossum <guido@python.org> parents: 42013 diff changeset	697 #if 0
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	698 ast_error(c, n, "encoding declaration in Unicode string");
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	699 goto out;
42054 063530fcc32e Minimal changes to make the "freeze" tool work again. Guido van Rossum <guido@python.org> parents: 42013 diff changeset	700 #endif
063530fcc32e Minimal changes to make the "freeze" tool work again. Guido van Rossum <guido@python.org> parents: 42013 diff changeset	701 n = CHILD(n, 0);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	702 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	703 } else if (TYPE(n) == encoding_decl) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	704 c.c_encoding = STR(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	705 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	706 } else {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	707 /* PEP 3120 */
42403 7e8469617b1c Implement PEP 3120. Martin v. Löwis <martin@v.loewis.de> parents: 42309 diff changeset	708 c.c_encoding = "utf-8";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	709 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	710
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	711 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	712 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	713 case file_input:
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	714 stmts = asdl_seq_new(num_stmts(n), arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	715 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	716 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	717 for (i = 0; i < NCH(n) - 1; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	718 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	719 if (TYPE(ch) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	720 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	721 REQ(ch, stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	722 num = num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	723 if (num == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	724 s = ast_for_stmt(&c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	725 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	726 goto out;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	727 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	728 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	729 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	730 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	731 REQ(ch, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	732 for (j = 0; j < num; j++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	733 s = ast_for_stmt(&c, CHILD(ch, j * 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	734 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	735 goto out;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	736 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	737 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	738 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	739 }
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	740 res = Module(stmts, arena);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	741 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	742 case eval_input: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	743 expr_ty testlist_ast;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	744
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	745 /* XXX Why not comp_for here? */
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	746 testlist_ast = ast_for_testlist(&c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	747 if (!testlist_ast)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	748 goto out;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	749 res = Expression(testlist_ast, arena);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	750 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	751 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	752 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	753 if (TYPE(CHILD(n, 0)) == NEWLINE) {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	754 stmts = asdl_seq_new(1, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	755 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	756 goto out;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	757 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	758 arena));
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	759 if (!asdl_seq_GET(stmts, 0))
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	760 goto out;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	761 res = Interactive(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	762 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	763 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	764 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	765 num = num_stmts(n);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	766 stmts = asdl_seq_new(num, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	767 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	768 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	769 if (num == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	770 s = ast_for_stmt(&c, n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	771 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	772 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	773 asdl_seq_SET(stmts, 0, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	775 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	776 /* Only a simple_stmt can contain multiple statements. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	777 REQ(n, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	778 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	779 if (TYPE(CHILD(n, i)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	780 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	781 s = ast_for_stmt(&c, CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	782 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	783 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	784 asdl_seq_SET(stmts, i / 2, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	785 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	786 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	787
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	788 res = Interactive(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	789 }
74460 953d6ee29464 break out switch at correct place Benjamin Peterson <benjamin@python.org> parents: 74459 diff changeset	790 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	791 default:
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	792 PyErr_Format(PyExc_SystemError,
00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	793 "invalid node %d for PyAST_FromNode", TYPE(n));
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	794 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	795 }
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	796 out:
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	797 if (c.c_normalize) {
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	798 Py_DECREF(c.c_normalize);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	799 PyTuple_SET_ITEM(c.c_normalize_args, 1, NULL);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	800 Py_DECREF(c.c_normalize_args);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	801 }
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	802 return res;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	803 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	804
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	805 /* Return the AST repr. of the operator represented as syntax (\|, ^, etc.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	806 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	807
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	808 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	809 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	810 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	811 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	812 case VBAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	813 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	814 case CIRCUMFLEX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	815 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	816 case AMPER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	817 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	818 case LEFTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	819 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	820 case RIGHTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	821 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	822 case PLUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	823 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	824 case MINUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	825 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	826 case STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	827 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	828 case SLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	829 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	830 case DOUBLESLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	831 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	832 case PERCENT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	834 default:
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	835 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	836 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	837 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	838
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	839 static const char* FORBIDDEN[] = {
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	840 "None",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	841 "True",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	842 "False",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	843 NULL,
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	844 };
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	845
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	846 static int
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	847 forbidden_name(struct compiling c, identifier name, const node n, int full_checks)
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	848 {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	849 assert(PyUnicode_Check(name));
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	850 if (PyUnicode_CompareWithASCIIString(name, "__debug__") == 0) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	851 ast_error(c, n, "assignment to keyword");
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	852 return 1;
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	853 }
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	854 if (full_checks) {
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	855 const char **p;
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	856 for (p = FORBIDDEN; *p; p++) {
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	857 if (PyUnicode_CompareWithASCIIString(name, *p) == 0) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	858 ast_error(c, n, "assignment to keyword");
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	859 return 1;
c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	860 }
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	861 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	862 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	863 return 0;
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	864 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	865
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	866 /* Set the context ctx for expr_ty e, recursively traversing e.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	867
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	868 Only sets context for expr kinds that "can appear in assignment context"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	869 (according to ../Parser/Python.asdl). For other expr kinds, it sets
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	870 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	871 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	872
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	873 static int
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	874 set_context(struct compiling c, expr_ty e, expr_context_ty ctx, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	875 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	876 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	877 /* If a particular expression type can't be used for assign / delete,
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	878 set expr_name to its name and an error message will be generated.
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	879 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	880 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	881
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	882 /* The ast defines augmented store and load contexts, but the
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	883 implementation here doesn't actually use them. The code may be
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	884 a little more complex than necessary as a result. It also means
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	885 that expressions in an augmented assignment have a Store context.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	886 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	887 set_context(), too.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	888 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	889 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	890
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	891 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	892 case Attribute_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	893 e->v.Attribute.ctx = ctx;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	894 if (ctx == Store && forbidden_name(c, e->v.Attribute.attr, n, 1))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	895 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	896 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	897 case Subscript_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	898 e->v.Subscript.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	899 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	900 case Starred_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	901 e->v.Starred.ctx = ctx;
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	902 if (!set_context(c, e->v.Starred.value, ctx, n))
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	903 return 0;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	904 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	905 case Name_kind:
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	906 if (ctx == Store) {
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	907 if (forbidden_name(c, e->v.Name.id, n, 0))
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	908 return 0; /* forbidden_name() calls ast_error() */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	909 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	910 e->v.Name.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	911 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	912 case List_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	913 e->v.List.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	914 s = e->v.List.elts;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	915 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	916 case Tuple_kind:
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	917 if (asdl_seq_LEN(e->v.Tuple.elts)) {
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	918 e->v.Tuple.ctx = ctx;
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	919 s = e->v.Tuple.elts;
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	920 }
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	921 else {
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	922 expr_name = "()";
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	923 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	924 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	925 case Lambda_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	926 expr_name = "lambda";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	927 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	928 case Call_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	929 expr_name = "function call";
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	930 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	931 case BoolOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	932 case BinOp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	933 case UnaryOp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	934 expr_name = "operator";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	935 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	936 case GeneratorExp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	937 expr_name = "generator expression";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	938 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	939 case Yield_kind:
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	940 case YieldFrom_kind:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	941 expr_name = "yield expression";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	942 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	943 case ListComp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	944 expr_name = "list comprehension";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	945 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	946 case SetComp_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	947 expr_name = "set comprehension";
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	948 break;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	949 case DictComp_kind:
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	950 expr_name = "dict comprehension";
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	951 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	952 case Dict_kind:
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	953 case Set_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	954 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	955 case Str_kind:
69288 4d9a8e84279a make assigning to a bytes literal a syntax error (closes #11506) Benjamin Peterson <benjamin@python.org> parents: 65536 diff changeset	956 case Bytes_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	957 expr_name = "literal";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	958 break;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	959 case NameConstant_kind:
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	960 expr_name = "keyword";
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	961 break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	962 case Ellipsis_kind:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	963 expr_name = "Ellipsis";
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	964 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	965 case Compare_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	966 expr_name = "comparison";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	967 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	968 case IfExp_kind:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	969 expr_name = "conditional expression";
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	970 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	971 default:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	972 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	973 "unexpected expression in assignment %d (line %d)",
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	974 e->kind, e->lineno);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	975 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	976 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	977 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	978 if (expr_name) {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	979 char buf[300];
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	980 PyOS_snprintf(buf, sizeof(buf),
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	981 "can't %s %s",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	982 ctx == Store ? "assign to" : "delete",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	983 expr_name);
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	984 return ast_error(c, n, buf);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	985 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	986
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	987 /* If the LHS is a list or tuple, we need to set the assignment
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	988 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	989 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	990 if (s) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	991 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	992
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	993 for (i = 0; i < asdl_seq_LEN(s); i++) {
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	994 if (!set_context(c, (expr_ty)asdl_seq_GET(s, i), ctx, n))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	995 return 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	996 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	999 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001 static operator_ty
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1002 ast_for_augassign(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1003 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1004 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1005 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006 switch (STR(n)[0]) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1007 case '+':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1008 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1009 case '-':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1010 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1011 case '/':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1012 if (STR(n)[1] == '/')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1013 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1014 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1015 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016 case '%':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1017 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1018 case '<':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1020 case '>':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1021 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022 case '&':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1023 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024 case '^':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1025 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026 case '\|':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1027 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1028 case '*':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1029 if (STR(n)[1] == '*')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1030 return Pow;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1031 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1032 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1034 PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1035 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1036 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1037 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1038
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1039 static cmpop_ty
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1040 ast_for_comp_op(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041 {
39648 efe3f2c0da5e Killed the <> operator. You must now use !=. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	1042 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'!='\|'in'\|'not' 'in'\|'is'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1043 \|'is' 'not'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1045 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1046 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1047 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1048 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1049 case LESS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1050 return Lt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1051 case GREATER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1052 return Gt;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1053 case EQEQUAL: /* == */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1054 return Eq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1055 case LESSEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1056 return LtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1057 case GREATEREQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1058 return GtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1059 case NOTEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1060 return NotEq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1061 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1062 if (strcmp(STR(n), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1063 return In;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1064 if (strcmp(STR(n), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065 return Is;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1066 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1067 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1068 STR(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1069 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1070 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1071 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1072 else if (NCH(n) == 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1073 /* handle "not in" and "is not" */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1074 switch (TYPE(CHILD(n, 0))) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1075 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1076 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1077 return NotIn;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1078 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1079 return IsNot;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1081 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1082 STR(CHILD(n, 0)), STR(CHILD(n, 1)));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1083 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1084 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1085 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1086 PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1087 NCH(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1088 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1089 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1090
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1091 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1092 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1093 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	1094 /* testlist: test (',' test)* [',']
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1095 testlist_star_expr: test\|star_expr (',' test\|star_expr)* [',']
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1096 */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1097 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1098 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1099 int i;
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1100 assert(TYPE(n) == testlist \|\| TYPE(n) == testlist_star_expr \|\| TYPE(n) == testlist_comp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1101
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1102 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1105
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 for (i = 0; i < NCH(n); i += 2) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	1107 const node *ch = CHILD(n, i);
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1108 assert(TYPE(ch) == test \|\| TYPE(ch) == test_nocond \|\| TYPE(ch) == star_expr);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1109
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1110 expression = ast_for_expr(c, ch);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1111 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1112 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1113
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 assert(i / 2 < seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1115 asdl_seq_SET(seq, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1116 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1120 static arg_ty
75543 fe0b2681a42f use correct naming convention Benjamin Peterson <benjamin@python.org> parents: 70916 diff changeset	1121 ast_for_arg(struct compiling c, const node n)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1122 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1123 identifier name;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1124 expr_ty annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1125 node *ch;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1126
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1127 assert(TYPE(n) == tfpdef \|\| TYPE(n) == vfpdef);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1128 ch = CHILD(n, 0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1129 name = NEW_IDENTIFIER(ch);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1130 if (!name)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1131 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1132 if (forbidden_name(c, name, ch, 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1133 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1134
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1135 if (NCH(n) == 3 && TYPE(CHILD(n, 1)) == COLON) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1136 annotation = ast_for_expr(c, CHILD(n, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1137 if (!annotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1138 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1139 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1140
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1141 return arg(name, annotation, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1144 /* returns -1 if failed to handle keyword only arguments
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1145 returns new position to keep processing if successful
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1146 (',' tfpdef ['=' test])*
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1147 ^^^
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1148 start pointing here
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1149 */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1150 static int
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1151 handle_keywordonly_args(struct compiling c, const node n, int start,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1152 asdl_seq kwonlyargs, asdl_seq kwdefaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1153 {
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1154 PyObject *argname;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1155 node *ch;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1156 expr_ty expression, annotation;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1157 arg_ty arg;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1158 int i = start;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1159 int j = 0; /* index for kwdefaults and kwonlyargs */
44246 aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1160
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1161 if (kwonlyargs == NULL) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1162 ast_error(c, CHILD(n, start), "named arguments must follow bare *");
44246 aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1163 return -1;
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1164 }
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1165 assert(kwdefaults != NULL);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1166 while (i < NCH(n)) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1167 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1168 switch (TYPE(ch)) {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1169 case vfpdef:
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1170 case tfpdef:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1171 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1172 expression = ast_for_expr(c, CHILD(n, i + 2));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1173 if (!expression)
64185 38ceeae0d1f0 Merged revisions 84214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64183 diff changeset	1174 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1175 asdl_seq_SET(kwdefaults, j, expression);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1176 i += 2; /* '=' and test */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1177 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1178 else { /* setting NULL if no default value exists */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1179 asdl_seq_SET(kwdefaults, j, NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1180 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1181 if (NCH(ch) == 3) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1182 /* ch is NAME ':' test */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1183 annotation = ast_for_expr(c, CHILD(ch, 2));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1184 if (!annotation)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1185 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1186 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1187 else {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1188 annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1189 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1190 ch = CHILD(ch, 0);
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1191 argname = NEW_IDENTIFIER(ch);
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1192 if (!argname)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1193 goto error;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1194 if (forbidden_name(c, argname, ch, 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1195 goto error;
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1196 arg = arg(argname, annotation, c->c_arena);
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1197 if (!arg)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1198 goto error;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1199 asdl_seq_SET(kwonlyargs, j++, arg);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1200 i += 2; /* the name and the comma */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1201 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1202 case DOUBLESTAR:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1203 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1204 default:
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1205 ast_error(c, ch, "unexpected node");
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1206 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1207 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1208 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1209 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1210 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1211 return -1;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1212 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1213
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1214 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1215
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1216 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1217 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1218 {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1219 /* This function handles both typedargslist (function definition)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1220 and varargslist (lambda definition).
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1221
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1222 parameters: '(' [typedargslist] ')'
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1223 typedargslist: ((tfpdef ['=' test] ',')*
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1224 ('' [tfpdef] (',' tfpdef ['=' test]) [',' '**' tfpdef]
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1225 \| '**' tfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1226 \| tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1227 tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1228 varargslist: ((vfpdef ['=' test] ',')*
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1229 ('' [vfpdef] (',' vfpdef ['=' test]) [',' '**' vfpdef]
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1230 \| '**' vfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1231 \| vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1232 vfpdef: NAME
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1233 */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1234 int i, j, k, nposargs = 0, nkwonlyargs = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1235 int nposdefaults = 0, found_default = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1236 asdl_seq posargs, posdefaults, kwonlyargs, kwdefaults;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 identifier vararg = NULL, kwarg = NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1238 arg_ty arg;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1239 expr_ty varargannotation = NULL, kwargannotation = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1240 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1241
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1242 if (TYPE(n) == parameters) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1243 if (NCH(n) == 2) /* () as argument list */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1244 return arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1245 NULL, c->c_arena);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1246 n = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1247 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1248 assert(TYPE(n) == typedargslist \|\| TYPE(n) == varargslist);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1249
48515 dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1250 /* First count the number of positional args & defaults. The
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1251 variable i is the loop index for this for loop and the next.
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1252 The next loop picks up where the first leaves off.
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1253 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 for (i = 0; i < NCH(n); i++) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1255 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1256 if (TYPE(ch) == STAR) {
48515 dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1257 /* skip star */
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1258 i++;
48515 dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1259 if (i < NCH(n) && /* skip argument following star */
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1260 (TYPE(CHILD(n, i)) == tfpdef \|\|
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1261 TYPE(CHILD(n, i)) == vfpdef)) {
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1262 i++;
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1263 }
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1264 break;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1265 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1266 if (TYPE(ch) == DOUBLESTAR) break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1267 if (TYPE(ch) == vfpdef \|\| TYPE(ch) == tfpdef) nposargs++;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1268 if (TYPE(ch) == EQUAL) nposdefaults++;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1269 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1270 /* count the number of keyword only args &
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1271 defaults for keyword only args */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1272 for ( ; i < NCH(n); ++i) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1273 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1274 if (TYPE(ch) == DOUBLESTAR) break;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1275 if (TYPE(ch) == tfpdef \|\| TYPE(ch) == vfpdef) nkwonlyargs++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1276 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1277 posargs = (nposargs ? asdl_seq_new(nposargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1278 if (!posargs && nposargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1279 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1280 kwonlyargs = (nkwonlyargs ?
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1281 asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1282 if (!kwonlyargs && nkwonlyargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1283 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1284 posdefaults = (nposdefaults ?
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1285 asdl_seq_new(nposdefaults, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1286 if (!posdefaults && nposdefaults)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1287 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1288 /* The length of kwonlyargs and kwdefaults are same
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1289 since we set NULL as default for keyword only argument w/o default
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1290 - we have sequence data structure, but no dictionary */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1291 kwdefaults = (nkwonlyargs ?
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1292 asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1293 if (!kwdefaults && nkwonlyargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1294 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1295
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1296 if (nposargs + nkwonlyargs > 255) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1297 ast_error(c, n, "more than 255 arguments");
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1298 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1299 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1301 /* tfpdef: NAME [':' test]
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1302 vfpdef: NAME
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1304 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1305 j = 0; /* index for defaults */
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1306 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 while (i < NCH(n)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1308 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1309 switch (TYPE(ch)) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1310 case tfpdef:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1311 case vfpdef:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1312 /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1313 anything other than EQUAL or a comma? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 /* XXX Should NCH(n) check be made a separate check? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1315 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1316 expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1317 if (!expression)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1318 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1319 assert(posdefaults != NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1320 asdl_seq_SET(posdefaults, j++, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1321 i += 2;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1322 found_default = 1;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1323 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1324 else if (found_default) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1325 ast_error(c, n,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1326 "non-default argument follows default argument");
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1327 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 }
75543 fe0b2681a42f use correct naming convention Benjamin Peterson <benjamin@python.org> parents: 70916 diff changeset	1329 arg = ast_for_arg(c, ch);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1330 if (!arg)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1331 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1332 asdl_seq_SET(posargs, k++, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333 i += 2; /* the name and the comma */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1334 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1335 case STAR:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1336 if (i+1 >= NCH(n)) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1337 ast_error(c, CHILD(n, i),
44246 aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1338 "named arguments must follow bare *");
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1339 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1340 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1341 ch = CHILD(n, i+1); /* tfpdef or COMMA */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1342 if (TYPE(ch) == COMMA) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1343 int res = 0;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1344 i += 2; /* now follows keyword only arguments */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1345 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1346 kwonlyargs, kwdefaults);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1347 if (res == -1) return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1348 i = res; /* res has new position to process */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1349 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1350 else {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1351 vararg = NEW_IDENTIFIER(CHILD(ch, 0));
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1352 if (!vararg)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1353 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1354 if (forbidden_name(c, vararg, CHILD(ch, 0), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1355 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1356 if (NCH(ch) > 1) {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1357 /* there is an annotation on the vararg */
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1358 varargannotation = ast_for_expr(c, CHILD(ch, 2));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1359 if (!varargannotation)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1360 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1361 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1362 i += 3;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1363 if (i < NCH(n) && (TYPE(CHILD(n, i)) == tfpdef
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1364 \|\| TYPE(CHILD(n, i)) == vfpdef)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1365 int res = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1366 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1367 kwonlyargs, kwdefaults);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1368 if (res == -1) return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1369 i = res; /* res has new position to process */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1370 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1371 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1372 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1373 case DOUBLESTAR:
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1374 ch = CHILD(n, i+1); /* tfpdef */
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1375 assert(TYPE(ch) == tfpdef \|\| TYPE(ch) == vfpdef);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1376 kwarg = NEW_IDENTIFIER(CHILD(ch, 0));
64185 38ceeae0d1f0 Merged revisions 84214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64183 diff changeset	1377 if (!kwarg)
38ceeae0d1f0 Merged revisions 84214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64183 diff changeset	1378 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1379 if (NCH(ch) > 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1380 /* there is an annotation on the kwarg */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1381 kwargannotation = ast_for_expr(c, CHILD(ch, 2));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1382 if (!kwargannotation)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1383 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1384 }
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1385 if (forbidden_name(c, kwarg, CHILD(ch, 0), 0))
64178 5fd26f452600 Check the return values for all functions returning an ast node. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62373 diff changeset	1386 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1387 i += 3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1390 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1391 "unexpected node in varargslist: %d @ %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1392 TYPE(ch), i);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1393 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1394 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1395 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1396 return arguments(posargs, vararg, varargannotation, kwonlyargs, kwarg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1397 kwargannotation, posdefaults, kwdefaults, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1398 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1399
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1401 ast_for_dotted_name(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1402 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1403 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1404 identifier id;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1405 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1406 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1407
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1408 REQ(n, dotted_name);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1409
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1410 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1411 col_offset = n->n_col_offset;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1412
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1413 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1414 if (!id)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1415 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1416 e = Name(id, Load, lineno, col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417 if (!e)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1418 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1419
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1420 for (i = 2; i < NCH(n); i+=2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1421 id = NEW_IDENTIFIER(CHILD(n, i));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1422 if (!id)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1423 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1424 e = Attribute(e, id, Load, lineno, col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1425 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1426 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1427 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1428
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1429 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1430 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1432 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1433 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1436 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1437 expr_ty name_expr;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1438
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1440 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1441 REQ(RCHILD(n, -1), NEWLINE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1442
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1443 name_expr = ast_for_dotted_name(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 if (!name_expr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1445 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1446
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1447 if (NCH(n) == 3) { /* No arguments */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1448 d = name_expr;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1449 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1451 else if (NCH(n) == 5) { /* Call with no arguments */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1452 d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1453 n->n_col_offset, c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1454 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1455 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1456 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1459 d = ast_for_call(c, CHILD(n, 3), name_expr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1460 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1461 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1462 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1463 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1464
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1465 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1466 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1467
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1468 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1469 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1470 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1471 asdl_seq* decorator_seq;
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1472 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1473 int i;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1474
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 REQ(n, decorators);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1476 decorator_seq = asdl_seq_new(NCH(n), c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477 if (!decorator_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1479
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480 for (i = 0; i < NCH(n); i++) {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1481 d = ast_for_decorator(c, CHILD(n, i));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1482 if (!d)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1483 return NULL;
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1484 asdl_seq_SET(decorator_seq, i, d);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1485 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1486 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1487 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1488
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1489 static stmt_ty
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1490 ast_for_funcdef(struct compiling c, const node n, asdl_seq *decorator_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1491 {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1492 /* funcdef: 'def' NAME parameters ['->' test] ':' suite */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1493 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1494 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1495 asdl_seq *body;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1496 expr_ty returns = NULL;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1497 int name_i = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1498
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1499 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1500
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1501 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502 if (!name)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1503 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1504 if (forbidden_name(c, name, CHILD(n, name_i), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	1505 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1506 args = ast_for_arguments(c, CHILD(n, name_i + 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1507 if (!args)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1508 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1509 if (TYPE(CHILD(n, name_i+2)) == RARROW) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1510 returns = ast_for_expr(c, CHILD(n, name_i + 3));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1511 if (!returns)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1512 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1513 name_i += 2;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1514 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515 body = ast_for_suite(c, CHILD(n, name_i + 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1517 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1519 return FunctionDef(name, args, body, decorator_seq, returns, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1520 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1523 static stmt_ty
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1524 ast_for_decorated(struct compiling c, const node n)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1525 {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1526 /* decorated: decorators (classdef \| funcdef) */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1527 stmt_ty thing = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1528 asdl_seq *decorator_seq = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1529
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1530 REQ(n, decorated);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1531
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1532 decorator_seq = ast_for_decorators(c, CHILD(n, 0));
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1533 if (!decorator_seq)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1534 return NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1535
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1536 assert(TYPE(CHILD(n, 1)) == funcdef \|\|
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1537 TYPE(CHILD(n, 1)) == classdef);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1538
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1539 if (TYPE(CHILD(n, 1)) == funcdef) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1540 thing = ast_for_funcdef(c, CHILD(n, 1), decorator_seq);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1541 } else if (TYPE(CHILD(n, 1)) == classdef) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1542 thing = ast_for_classdef(c, CHILD(n, 1), decorator_seq);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1543 }
45448 f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1544 /* we count the decorators in when talking about the class' or
f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1545 * function's line number */
f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1546 if (thing) {
f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1547 thing->lineno = LINENO(n);
f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1548 thing->col_offset = n->n_col_offset;
f1b50aa5d5af Patch from Georg Brandl: Fix co_lineno of decorated function and class objects. If you see an error in test_inspect please delete all pyc files. Christian Heimes <christian@cheimes.de> parents: 44442 diff changeset	1549 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1550 return thing;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1551 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1552
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1553 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1554 ast_for_lambdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1555 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1556 /* lambdef: 'lambda' [varargslist] ':' test
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1557 lambdef_nocond: 'lambda' [varargslist] ':' test_nocond */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1558 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1559 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1560
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1561 if (NCH(n) == 3) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1562 args = arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1563 NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1564 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1565 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1566 expression = ast_for_expr(c, CHILD(n, 2));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1567 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1568 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1570 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1571 args = ast_for_arguments(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1572 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1573 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1574 expression = ast_for_expr(c, CHILD(n, 3));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1575 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1576 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1577 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1578
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1579 return Lambda(args, expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1580 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1581
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1582 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1583 ast_for_ifexpr(struct compiling c, const node n)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1584 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1585 /* test: or_test 'if' or_test 'else' test */
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1586 expr_ty expression, body, orelse;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1587
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	1588 assert(NCH(n) == 5);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1589 body = ast_for_expr(c, CHILD(n, 0));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1590 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1591 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1592 expression = ast_for_expr(c, CHILD(n, 2));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1593 if (!expression)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1594 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1595 orelse = ast_for_expr(c, CHILD(n, 4));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1596 if (!orelse)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1597 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1598 return IfExp(expression, body, orelse, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1599 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1600 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1601
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1602 /*
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1603 Count the number of 'for' loops in a comprehension.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1604
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1605 Helper for ast_for_comprehension().
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1606 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1607
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1608 static int
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1609 count_comp_fors(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1610 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1611 int n_fors = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1612
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1613 count_comp_for:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1614 n_fors++;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1615 REQ(n, comp_for);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1616 if (NCH(n) == 5)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1617 n = CHILD(n, 4);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1618 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1619 return n_fors;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1620 count_comp_iter:
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1621 REQ(n, comp_iter);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1622 n = CHILD(n, 0);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1623 if (TYPE(n) == comp_for)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1624 goto count_comp_for;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1625 else if (TYPE(n) == comp_if) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1626 if (NCH(n) == 3) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1627 n = CHILD(n, 2);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1628 goto count_comp_iter;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1629 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1630 else
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1631 return n_fors;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1632 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1633
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1634 /* Should never be reached */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1635 PyErr_SetString(PyExc_SystemError,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1636 "logic error in count_comp_fors");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1637 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1638 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1639
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1640 /* Count the number of 'if' statements in a comprehension.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1641
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1642 Helper for ast_for_comprehension().
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1643 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1644
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1645 static int
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1646 count_comp_ifs(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1647 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1648 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1649
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1650 while (1) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1651 REQ(n, comp_iter);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1652 if (TYPE(CHILD(n, 0)) == comp_for)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1653 return n_ifs;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1654 n = CHILD(n, 0);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1655 REQ(n, comp_if);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1656 n_ifs++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1657 if (NCH(n) == 2)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1658 return n_ifs;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1659 n = CHILD(n, 2);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1660 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1661 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1662
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1663 static asdl_seq *
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1664 ast_for_comprehension(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1665 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1666 int i, n_fors;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1667 asdl_seq *comps;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1668
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1669 n_fors = count_comp_fors(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1670 if (n_fors == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1671 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1672
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1673 comps = asdl_seq_new(n_fors, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1674 if (!comps)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1675 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1676
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1677 for (i = 0; i < n_fors; i++) {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1678 comprehension_ty comp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1679 asdl_seq *t;
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1680 expr_ty expression, first;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1681 node *for_ch;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1682
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1683 REQ(n, comp_for);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1684
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1685 for_ch = CHILD(n, 1);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1686 t = ast_for_exprlist(c, for_ch, Store);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1687 if (!t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1688 return NULL;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1689 expression = ast_for_expr(c, CHILD(n, 3));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1690 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1691 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1692
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1693 /* Check the # of children rather than the length of t, since
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1694 (x for x, in ...) has 1 element in t, but still requires a Tuple. */
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1695 first = (expr_ty)asdl_seq_GET(t, 0);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1696 if (NCH(for_ch) == 1)
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1697 comp = comprehension(first, expression, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1698 else
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1699 comp = comprehension(Tuple(t, Store, first->lineno, first->col_offset,
d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1700 c->c_arena),
d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1701 expression, NULL, c->c_arena);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1702 if (!comp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1703 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1704
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1705 if (NCH(n) == 5) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1706 int j, n_ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1707 asdl_seq *ifs;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1708
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1709 n = CHILD(n, 4);
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1710 n_ifs = count_comp_ifs(c, n);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1711 if (n_ifs == -1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1712 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1713
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1714 ifs = asdl_seq_new(n_ifs, c->c_arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1715 if (!ifs)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1716 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1717
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1718 for (j = 0; j < n_ifs; j++) {
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1719 REQ(n, comp_iter);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1720 n = CHILD(n, 0);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1721 REQ(n, comp_if);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1722
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1723 expression = ast_for_expr(c, CHILD(n, 1));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1724 if (!expression)
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1725 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1726 asdl_seq_SET(ifs, j, expression);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1727 if (NCH(n) == 3)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1728 n = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1729 }
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1730 /* on exit, must guarantee that n is a comp_for */
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1731 if (TYPE(n) == comp_iter)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1732 n = CHILD(n, 0);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1733 comp->ifs = ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1734 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1735 asdl_seq_SET(comps, i, comp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1736 }
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1737 return comps;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1738 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1739
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1740 static expr_ty
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1741 ast_for_itercomp(struct compiling c, const node n, int type)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1742 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1743 /* testlist_comp: test ( comp_for \| (',' test)* [','] )
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1744 argument: [test '='] test [comp_for] # Really [keyword '='] test */
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1745 expr_ty elt;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1746 asdl_seq *comps;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1747
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1748 assert(NCH(n) > 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1749
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1750 elt = ast_for_expr(c, CHILD(n, 0));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1751 if (!elt)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1752 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1753
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1754 comps = ast_for_comprehension(c, CHILD(n, 1));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1755 if (!comps)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1756 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1757
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1758 if (type == COMP_GENEXP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1759 return GeneratorExp(elt, comps, LINENO(n), n->n_col_offset, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1760 else if (type == COMP_LISTCOMP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1761 return ListComp(elt, comps, LINENO(n), n->n_col_offset, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1762 else if (type == COMP_SETCOMP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1763 return SetComp(elt, comps, LINENO(n), n->n_col_offset, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1764 else
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1765 /* Should never happen */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1766 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1767 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1768
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1769 static expr_ty
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1770 ast_for_dictcomp(struct compiling c, const node n)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1771 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1772 expr_ty key, value;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1773 asdl_seq *comps;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1774
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1775 assert(NCH(n) > 3);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1776 REQ(CHILD(n, 1), COLON);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1777
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1778 key = ast_for_expr(c, CHILD(n, 0));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1779 if (!key)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1780 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1781 value = ast_for_expr(c, CHILD(n, 2));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1782 if (!value)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1783 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1784
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1785 comps = ast_for_comprehension(c, CHILD(n, 3));
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1786 if (!comps)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1787 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1788
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1789 return DictComp(key, value, comps, LINENO(n), n->n_col_offset, c->c_arena);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1790 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1791
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1792 static expr_ty
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1793 ast_for_genexp(struct compiling c, const node n)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1794 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1795 assert(TYPE(n) == (testlist_comp) \|\| TYPE(n) == (argument));
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1796 return ast_for_itercomp(c, n, COMP_GENEXP);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1797 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1798
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1799 static expr_ty
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1800 ast_for_listcomp(struct compiling c, const node n)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1801 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1802 assert(TYPE(n) == (testlist_comp));
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1803 return ast_for_itercomp(c, n, COMP_LISTCOMP);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1804 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1805
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1806 static expr_ty
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1807 ast_for_setcomp(struct compiling c, const node n)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1808 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1809 assert(TYPE(n) == (dictorsetmaker));
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1810 return ast_for_itercomp(c, n, COMP_SETCOMP);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1811 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1812
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1813
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1814 static expr_ty
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1815 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1816 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1817 /* atom: '(' [yield_expr\|testlist_comp] ')' \| '[' [testlist_comp] ']'
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1818 \| '{' [dictmaker\|testlist_comp] '}' \| NAME \| NUMBER \| STRING+
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1819 \| '...' \| 'None' \| 'True' \| 'False'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1821 node *ch = CHILD(n, 0);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1822 int bytesmode = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1823
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1824 switch (TYPE(ch)) {
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1825 case NAME: {
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1826 PyObject *name;
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1827 const char *s = STR(ch);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1828 size_t len = strlen(s);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1829 if (len >= 4 && len <= 5) {
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1830 if (!strcmp(s, "None"))
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1831 return NameConstant(Py_None, LINENO(n), n->n_col_offset, c->c_arena);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1832 if (!strcmp(s, "True"))
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1833 return NameConstant(Py_True, LINENO(n), n->n_col_offset, c->c_arena);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1834 if (!strcmp(s, "False"))
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1835 return NameConstant(Py_False, LINENO(n), n->n_col_offset, c->c_arena);
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1836 }
03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1837 name = new_identifier(s, c);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1838 if (!name)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1839 return NULL;
80738 03f92a9f0875 create NameConstant AST class for None, True, and False literals (closes #16619) Benjamin Peterson <benjamin@python.org> parents: 80589 diff changeset	1840 /* All names start in Load context, but may later be changed. */
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1841 return Name(name, Load, LINENO(n), n->n_col_offset, c->c_arena);
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1842 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1843 case STRING: {
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1844 PyObject *str = parsestrplus(c, n, &bytesmode);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1845 if (!str) {
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	1846 if (PyErr_ExceptionMatches(PyExc_UnicodeError)) {
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1847 PyObject type, value, tback, errstr;
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1848 PyErr_Fetch(&type, &value, &tback);
49797 f403d94157b2 Merged revisions 67320 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49697 diff changeset	1849 errstr = PyObject_Str(value);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1850 if (errstr) {
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1851 char *s = "";
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1852 char buf[128];
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48515 diff changeset	1853 s = _PyUnicode_AsString(errstr);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1854 PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1855 ast_error(c, n, buf);
49797 f403d94157b2 Merged revisions 67320 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49697 diff changeset	1856 Py_DECREF(errstr);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1857 } else {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	1858 ast_error(c, n, "(unicode error) unknown error");
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1859 }
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1860 Py_DECREF(type);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1861 Py_DECREF(value);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1862 Py_XDECREF(tback);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1863 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1864 return NULL;
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1865 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1866 PyArena_AddPyObject(c->c_arena, str);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1867 if (bytesmode)
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1868 return Bytes(str, LINENO(n), n->n_col_offset, c->c_arena);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1869 else
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1870 return Str(str, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872 case NUMBER: {
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	1873 PyObject *pynum = parsenumber(c, STR(ch));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1874 if (!pynum)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1875 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1876
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1877 PyArena_AddPyObject(c->c_arena, pynum);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1878 return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 }
41230 b1a18c7ed5ca Make ELLIPSIS a separate token. This makes it a syntax error to write ". . ." for Ellipsis. Georg Brandl <georg@python.org> parents: 41226 diff changeset	1880 case ELLIPSIS: /* Ellipsis */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1881 return Ellipsis(LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1882 case LPAR: /* some parenthesized expressions */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1883 ch = CHILD(n, 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1884
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1885 if (TYPE(ch) == RPAR)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1886 return Tuple(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1887
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1888 if (TYPE(ch) == yield_expr)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1889 return ast_for_expr(c, ch);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1890
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1891 /* testlist_comp: test ( comp_for \| (',' test)* [','] ) */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1892 if ((NCH(ch) > 1) && (TYPE(CHILD(ch, 1)) == comp_for))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1893 return ast_for_genexp(c, ch);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1894
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1895 return ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 case LSQB: /* list (or list comprehension) */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1897 ch = CHILD(n, 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1898
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1899 if (TYPE(ch) == RSQB)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1900 return List(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1901
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1902 REQ(ch, testlist_comp);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1903 if (NCH(ch) == 1 \|\| TYPE(CHILD(ch, 1)) == COMMA) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1904 asdl_seq *elts = seq_for_testlist(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1905 if (!elts)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1906 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1907
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1908 return List(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1909 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1910 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1911 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1912 case LBRACE: {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1913 /* dictorsetmaker: test ':' test (',' test ':' test)* [','] \|
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1914 * test (gen_for \| (',' test)* [',']) */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1915 int i, size;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1916 asdl_seq keys, values;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1917
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1918 ch = CHILD(n, 1);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1919 if (TYPE(ch) == RBRACE) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1920 /* it's an empty dict */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1921 return Dict(NULL, NULL, LINENO(n), n->n_col_offset, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1922 } else if (NCH(ch) == 1 \|\| TYPE(CHILD(ch, 1)) == COMMA) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1923 /* it's a simple set */
41482 a5e410639e24 Make it compile with C89. Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1924 asdl_seq *elts;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1925 size = (NCH(ch) + 1) / 2; /* +1 in case no trailing comma */
41482 a5e410639e24 Make it compile with C89. Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1926 elts = asdl_seq_new(size, c->c_arena);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1927 if (!elts)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1928 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1929 for (i = 0; i < NCH(ch); i += 2) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1930 expr_ty expression;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1931 expression = ast_for_expr(c, CHILD(ch, i));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1932 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1933 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1934 asdl_seq_SET(elts, i / 2, expression);
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1935 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1936 return Set(elts, LINENO(n), n->n_col_offset, c->c_arena);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1937 } else if (TYPE(CHILD(ch, 1)) == comp_for) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1938 /* it's a set comprehension */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1939 return ast_for_setcomp(c, ch);
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1940 } else if (NCH(ch) > 3 && TYPE(CHILD(ch, 3)) == comp_for) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1941 return ast_for_dictcomp(c, ch);
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1942 } else {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1943 /* it's a dict */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1944 size = (NCH(ch) + 1) / 4; /* +1 in case no trailing comma */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1945 keys = asdl_seq_new(size, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1946 if (!keys)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1947 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1948
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1949 values = asdl_seq_new(size, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1950 if (!values)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1951 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1952
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1953 for (i = 0; i < NCH(ch); i += 4) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1954 expr_ty expression;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1955
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1956 expression = ast_for_expr(c, CHILD(ch, i));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1957 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1958 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1959
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1960 asdl_seq_SET(keys, i / 4, expression);
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1961
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1962 expression = ast_for_expr(c, CHILD(ch, i + 2));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1963 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1964 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1965
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1966 asdl_seq_SET(values, i / 4, expression);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1967 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1968 return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1969 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1970 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1971 default:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1972 PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1973 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1974 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1975 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1976
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1977 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1978 ast_for_slice(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1979 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1980 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1981 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1982
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1983 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1984
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1985 /*
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1986 subscript: test \| [test] ':' [test] [sliceop]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1987 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1988 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1989 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1990 if (NCH(n) == 1 && TYPE(ch) == test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1991 /* 'step' variable hold no significance in terms of being used over
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1992 other vars */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1993 step = ast_for_expr(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1994 if (!step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1995 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1996
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1997 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1998 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2000 if (TYPE(ch) == test) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2001 lower = ast_for_expr(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2002 if (!lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2006 /* If there's an upper bound it's in the second or third position. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 if (TYPE(ch) == COLON) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2008 if (NCH(n) > 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2009 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2010
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2011 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2012 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2013 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2014 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2016 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 } else if (NCH(n) > 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2018 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2020 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2021 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 if (TYPE(ch) == sliceop) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2029 if (NCH(ch) != 1) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2030 ch = CHILD(ch, 1);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2031 if (TYPE(ch) == test) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2032 step = ast_for_expr(c, ch);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2033 if (!step)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2034 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2035 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2037 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2038
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2039 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2040 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2041
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2042 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2043 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2044 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2045 /* Must account for a sequence of expressions.
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2046 How should A op B op C by represented?
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2047 BinOp(BinOp(A, op, B), op, C).
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2048 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2049
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2050 int i, nops;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2051 expr_ty expr1, expr2, result;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2052 operator_ty newoperator;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2053
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2054 expr1 = ast_for_expr(c, CHILD(n, 0));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2055 if (!expr1)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2056 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2057
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2058 expr2 = ast_for_expr(c, CHILD(n, 2));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2059 if (!expr2)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2060 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2061
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2062 newoperator = get_operator(CHILD(n, 1));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2063 if (!newoperator)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2064 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2065
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2066 result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2067 c->c_arena);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2068 if (!result)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2069 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2070
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2071 nops = (NCH(n) - 1) / 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2072 for (i = 1; i < nops; i++) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2073 expr_ty tmp_result, tmp;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2074 const node* next_oper = CHILD(n, i * 2 + 1);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2075
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2076 newoperator = get_operator(next_oper);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2077 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2078 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2079
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2080 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2081 if (!tmp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2082 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2083
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2084 tmp_result = BinOp(result, newoperator, tmp,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2085 LINENO(next_oper), next_oper->n_col_offset,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2086 c->c_arena);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2087 if (!tmp_result)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2088 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2089 result = tmp_result;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2090 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2091 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2092 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2093
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2094 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2095 ast_for_trailer(struct compiling c, const node n, expr_ty left_expr)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2096 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2097 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2098 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2099 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2100 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2101 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2102 if (TYPE(CHILD(n, 0)) == LPAR) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2103 if (NCH(n) == 2)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2104 return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2105 n->n_col_offset, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2106 else
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2107 return ast_for_call(c, CHILD(n, 1), left_expr);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2108 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2109 else if (TYPE(CHILD(n, 0)) == DOT ) {
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2110 PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2111 if (!attr_id)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2112 return NULL;
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2113 return Attribute(left_expr, attr_id, Load,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2114 LINENO(n), n->n_col_offset, c->c_arena);
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2115 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2116 else {
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2117 REQ(CHILD(n, 0), LSQB);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2118 REQ(CHILD(n, 2), RSQB);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2119 n = CHILD(n, 1);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2120 if (NCH(n) == 1) {
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2121 slice_ty slc = ast_for_slice(c, CHILD(n, 0));
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2122 if (!slc)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2123 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2124 return Subscript(left_expr, slc, Load, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2125 c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2126 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2127 else {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2128 /* The grammar is ambiguous here. The ambiguity is resolved
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2129 by treating the sequence as a tuple literal if there are
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2130 no slice features.
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2131 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2132 int j;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2133 slice_ty slc;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2134 expr_ty e;
40941 2ca14d6a369b Whoops, fix build breakage. There were still a few uses of the bool type. Neal Norwitz <nnorwitz@gmail.com> parents: 40894 diff changeset	2135 int simple = 1;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2136 asdl_seq slices, elts;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2137 slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2138 if (!slices)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2139 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2140 for (j = 0; j < NCH(n); j += 2) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2141 slc = ast_for_slice(c, CHILD(n, j));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2142 if (!slc)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2143 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2144 if (slc->kind != Index_kind)
40941 2ca14d6a369b Whoops, fix build breakage. There were still a few uses of the bool type. Neal Norwitz <nnorwitz@gmail.com> parents: 40894 diff changeset	2145 simple = 0;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2146 asdl_seq_SET(slices, j / 2, slc);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2147 }
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2148 if (!simple) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2149 return Subscript(left_expr, ExtSlice(slices, c->c_arena),
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2150 Load, LINENO(n), n->n_col_offset, c->c_arena);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2151 }
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2152 /* extract Index values and put them in a Tuple */
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2153 elts = asdl_seq_new(asdl_seq_LEN(slices), c->c_arena);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36786 diff changeset	2154 if (!elts)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36786 diff changeset	2155 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2156 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2157 slc = (slice_ty)asdl_seq_GET(slices, j);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2158 assert(slc->kind == Index_kind && slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2159 asdl_seq_SET(elts, j, slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2160 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2161 e = Tuple(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2162 if (!e)
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2163 return NULL;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2164 return Subscript(left_expr, Index(e, c->c_arena),
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2165 Load, LINENO(n), n->n_col_offset, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2166 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2167 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2168 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2169
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2170 static expr_ty
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2171 ast_for_factor(struct compiling c, const node n)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2172 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2173 expr_ty expression;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2174
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2175 expression = ast_for_expr(c, CHILD(n, 1));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2176 if (!expression)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2177 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2178
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2179 switch (TYPE(CHILD(n, 0))) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2180 case PLUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2181 return UnaryOp(UAdd, expression, LINENO(n), n->n_col_offset,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2182 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2183 case MINUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2184 return UnaryOp(USub, expression, LINENO(n), n->n_col_offset,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2185 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2186 case TILDE:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2187 return UnaryOp(Invert, expression, LINENO(n),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2188 n->n_col_offset, c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2189 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2190 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2191 TYPE(CHILD(n, 0)));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2192 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2193 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2194
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2195 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2196 ast_for_power(struct compiling c, const node n)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2197 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2198 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2199 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2200 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2201 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2202 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2203 e = ast_for_atom(c, CHILD(n, 0));
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2204 if (!e)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2205 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2206 if (NCH(n) == 1)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2207 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2208 for (i = 1; i < NCH(n); i++) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2209 node *ch = CHILD(n, i);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2210 if (TYPE(ch) != trailer)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2211 break;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2212 tmp = ast_for_trailer(c, ch, e);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2213 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2214 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2215 tmp->lineno = e->lineno;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2216 tmp->col_offset = e->col_offset;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2217 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2218 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2219 if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2220 expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2221 if (!f)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2222 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2223 tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2224 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2225 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2226 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2227 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2228 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2229 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2230
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2231 static expr_ty
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2232 ast_for_starred(struct compiling c, const node n)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2233 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2234 expr_ty tmp;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2235 REQ(n, star_expr);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2236
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2237 tmp = ast_for_expr(c, CHILD(n, 1));
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2238 if (!tmp)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2239 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2240
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2241 /* The Load context is changed later. */
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2242 return Starred(tmp, Load, LINENO(n), n->n_col_offset, c->c_arena);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2243 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2244
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2245
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2246 /* Do not name a variable 'expr'! Will cause a compile error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2247 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2248
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2249 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2250 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2251 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2252 /* handle the full range of simple expressions
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	2253 test: or_test ['if' or_test 'else' test] \| lambdef
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2254 test_nocond: or_test \| lambdef_nocond
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2255 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2256 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2257 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2258 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2259 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2260 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2261 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2262 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2263 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2264 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2265 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2266 power: atom trailer* ('*' factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2267 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2268
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2269 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2270 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2271
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2272 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2273 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2274 case test:
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2275 case test_nocond:
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	2276 if (TYPE(CHILD(n, 0)) == lambdef \|\|
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2277 TYPE(CHILD(n, 0)) == lambdef_nocond)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2278 return ast_for_lambdef(c, CHILD(n, 0));
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	2279 else if (NCH(n) > 1)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	2280 return ast_for_ifexpr(c, n);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2281 /* Fallthrough */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2282 case or_test:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2283 case and_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2284 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2285 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2286 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2287 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2288 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2291 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2292 expr_ty e = ast_for_expr(c, CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2293 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2294 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2295 asdl_seq_SET(seq, i / 2, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2296 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2297 if (!strcmp(STR(CHILD(n, 1)), "and"))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2298 return BoolOp(And, seq, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2299 c->c_arena);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2300 assert(!strcmp(STR(CHILD(n, 1)), "or"));
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2301 return BoolOp(Or, seq, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2302 case not_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2303 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2304 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2305 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2306 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2307 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2308 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2309 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2310 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2311
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2312 return UnaryOp(Not, expression, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2313 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2314 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2315 case comparison:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2316 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2317 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2318 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2319 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2320 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2321 expr_ty expression;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2322 asdl_int_seq *ops;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2323 asdl_seq *cmps;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2324 ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2325 if (!ops)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2326 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2327 cmps = asdl_seq_new(NCH(n) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2328 if (!cmps) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2329 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2330 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2331 for (i = 1; i < NCH(n); i += 2) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2332 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2333
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2334 newoperator = ast_for_comp_op(c, CHILD(n, i));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2335 if (!newoperator) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2336 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2337 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2338
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2339 expression = ast_for_expr(c, CHILD(n, i + 1));
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	2340 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2341 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2342 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2343
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2344 asdl_seq_SET(ops, i / 2, newoperator);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2345 asdl_seq_SET(cmps, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2346 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2347 expression = ast_for_expr(c, CHILD(n, 0));
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	2348 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2349 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2350 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2351
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2352 return Compare(expression, ops, cmps, LINENO(n),
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2353 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2354 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2355 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2356
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2357 case star_expr:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	2358 return ast_for_starred(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2359 /* The next five cases all handle BinOps. The main body of code
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2360 is the same in each case, but the switch turned inside out to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2361 reuse the code for each type of operator.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2362 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2363 case expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2364 case xor_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2365 case and_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2366 case shift_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2367 case arith_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2368 case term:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2369 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2370 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2371 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2372 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2373 return ast_for_binop(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2374 case yield_expr: {
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2375 node *an = NULL;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2376 node *en = NULL;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2377 int is_from = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2378 expr_ty exp = NULL;
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2379 if (NCH(n) > 1)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2380 an = CHILD(n, 1); /* yield_arg */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2381 if (an) {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2382 en = CHILD(an, NCH(an) - 1);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2383 if (NCH(an) == 2) {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2384 is_from = 1;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2385 exp = ast_for_expr(c, en);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2386 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2387 else
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2388 exp = ast_for_testlist(c, en);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2389 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2390 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2391 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	2392 if (is_from)
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	2393 return YieldFrom(exp, LINENO(n), n->n_col_offset, c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2394 return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2395 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2396 case factor:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2397 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2398 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2399 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2400 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2401 return ast_for_factor(c, n);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2402 case power:
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2403 return ast_for_power(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2404 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2405 PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2406 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2407 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2408 /* should never get here unless if error is set */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2409 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2410 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2411
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2412 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2413 ast_for_call(struct compiling c, const node n, expr_ty func)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2414 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2415 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2416 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2417 \| '**' test)
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2418 argument: [test '='] (test) [comp_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2419 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2420
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2421 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2422 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2423 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2424 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2425
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2426 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2427
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2428 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2429 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2430 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2431 for (i = 0; i < NCH(n); i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2432 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2433 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2434 if (NCH(ch) == 1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2435 nargs++;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2436 else if (TYPE(CHILD(ch, 1)) == comp_for)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2437 ngens++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2438 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2439 nkeywords++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2440 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2441 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2442 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2443 ast_error(c, n, "Generator expression must be parenthesized "
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2444 "if not sole argument");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2445 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2446 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2447
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2448 if (nargs + nkeywords + ngens > 255) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2449 ast_error(c, n, "more than 255 arguments");
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2450 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2451 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2452
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2453 args = asdl_seq_new(nargs + ngens, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2454 if (!args)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2455 return NULL;
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2456 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2457 if (!keywords)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2458 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2459 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2460 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2461 for (i = 0; i < NCH(n); i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2462 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2463 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2464 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2465 if (NCH(ch) == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2466 if (nkeywords) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2467 ast_error(c, CHILD(ch, 0),
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2468 "non-keyword arg after keyword arg");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2469 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2470 }
48777 6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2471 if (vararg) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2472 ast_error(c, CHILD(ch, 0),
48777 6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2473 "only named arguments may follow *expression");
6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2474 return NULL;
6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2475 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2476 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2477 if (!e)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2478 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2479 asdl_seq_SET(args, nargs++, e);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2480 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2481 else if (TYPE(CHILD(ch, 1)) == comp_for) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2482 e = ast_for_genexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2483 if (!e)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2484 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2485 asdl_seq_SET(args, nargs++, e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2486 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2487 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2488 keyword_ty kw;
48397 42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2489 identifier key, tmp;
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2490 int k;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2491
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2492 /* CHILD(ch, 0) is test, but must be an identifier? */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2493 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2494 if (!e)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2495 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2496 /* f(lambda x: x[0] = 3) ends up getting parsed with
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2497 * LHS test = lambda x: x[0], and RHS test = 3.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2498 * SF bug 132313 points out that complaining about a keyword
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2499 * then is very confusing.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2500 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2501 if (e->kind == Lambda_kind) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2502 ast_error(c, CHILD(ch, 0), "lambda cannot contain assignment");
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2503 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2504 } else if (e->kind != Name_kind) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2505 ast_error(c, CHILD(ch, 0), "keyword can't be an expression");
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2506 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2507 } else if (forbidden_name(c, e->v.Name.id, ch, 1)) {
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2508 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2509 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2510 key = e->v.Name.id;
48397 42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2511 for (k = 0; k < nkeywords; k++) {
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2512 tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg;
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2513 if (!PyUnicode_Compare(tmp, key)) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2514 ast_error(c, CHILD(ch, 0), "keyword argument repeated");
48397 42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2515 return NULL;
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2516 }
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2517 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2518 e = ast_for_expr(c, CHILD(ch, 2));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2519 if (!e)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2520 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2521 kw = keyword(key, e, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2522 if (!kw)
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2523 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2524 asdl_seq_SET(keywords, nkeywords++, kw);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2525 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2526 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2527 else if (TYPE(ch) == STAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2528 vararg = ast_for_expr(c, CHILD(n, i+1));
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45448 diff changeset	2529 if (!vararg)
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45448 diff changeset	2530 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2531 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2532 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2533 else if (TYPE(ch) == DOUBLESTAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2534 kwarg = ast_for_expr(c, CHILD(n, i+1));
45773 832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45448 diff changeset	2535 if (!kwarg)
832c820e9d14 Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45448 diff changeset	2536 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2537 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2538 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2539 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2540
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2541 return Call(func, args, keywords, vararg, kwarg, func->lineno, func->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2542 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2543
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2544 static expr_ty
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2545 ast_for_testlist(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2546 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2547 /* testlist_comp: test (comp_for \| (',' test)* [',']) */
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2548 /* testlist: test (',' test)* [','] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2549 assert(NCH(n) > 0);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2550 if (TYPE(n) == testlist_comp) {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2551 if (NCH(n) > 1)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2552 assert(TYPE(CHILD(n, 1)) != comp_for);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2553 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2554 else {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2555 assert(TYPE(n) == testlist \|\|
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	2556 TYPE(n) == testlist_star_expr);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2557 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2558 if (NCH(n) == 1)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2559 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2560 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2561 asdl_seq *tmp = seq_for_testlist(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2562 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2563 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2564 return Tuple(tmp, Load, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2565 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2566 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2567
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2568 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2569 ast_for_expr_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2570 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2571 REQ(n, expr_stmt);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	2572 /* expr_stmt: testlist_star_expr (augassign (yield_expr\|testlist)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2573 \| ('=' (yield_expr\|testlist))*)
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	2574 testlist_star_expr: (test\|star_expr) (',' test\|star_expr)* [',']
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2575 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2576 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2577 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2578 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2579
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2580 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2581 expr_ty e = ast_for_testlist(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2582 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2583 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2584
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2585 return Expr(e, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2586 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2587 else if (TYPE(CHILD(n, 1)) == augassign) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2588 expr_ty expr1, expr2;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2589 operator_ty newoperator;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2590 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2591
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2592 expr1 = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2593 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2594 return NULL;
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2595 if(!set_context(c, expr1, Store, ch))
031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2596 return NULL;
56363 4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2597 /* set_context checks that most expressions are not the left side.
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2598 Augmented assignments can only have a name, a subscript, or an
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2599 attribute on the left, though, so we have to explicitly check for
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2600 those. */
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2601 switch (expr1->kind) {
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2602 case Name_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2603 case Attribute_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2604 case Subscript_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2605 break;
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2606 default:
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2607 ast_error(c, ch, "illegal expression for augmented assignment");
56363 4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2608 return NULL;
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2609 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2610
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2611 ch = CHILD(n, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2612 if (TYPE(ch) == testlist)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2613 expr2 = ast_for_testlist(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2614 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2615 expr2 = ast_for_expr(c, ch);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2616 if (!expr2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2617 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2618
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2619 newoperator = ast_for_augassign(c, CHILD(n, 1));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2620 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2622
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2623 return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2625 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2626 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2627 asdl_seq *targets;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2628 node *value;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2629 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2630
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2631 /* a normal assignment */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2632 REQ(CHILD(n, 1), EQUAL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2633 targets = asdl_seq_new(NCH(n) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2634 if (!targets)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2635 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2636 for (i = 0; i < NCH(n) - 2; i += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2637 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2638 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2639 if (TYPE(ch) == yield_expr) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2640 ast_error(c, ch, "assignment to yield expression not possible");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2641 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2642 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2643 e = ast_for_testlist(c, ch);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	2644 if (!e)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	2645 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2646
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2647 /* set context to assign */
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2648 if (!set_context(c, e, Store, CHILD(n, i)))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2649 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2650
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2651 asdl_seq_SET(targets, i / 2, e);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2652 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2653 value = CHILD(n, NCH(n) - 1);
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	2654 if (TYPE(value) == testlist_star_expr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2655 expression = ast_for_testlist(c, value);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2656 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2657 expression = ast_for_expr(c, value);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2658 if (!expression)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2659 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2660 return Assign(targets, expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2661 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2662 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2663
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2664
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2665 static asdl_seq *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2666 ast_for_exprlist(struct compiling c, const node n, expr_context_ty context)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2667 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2668 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2669 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2670 expr_ty e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2671
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2672 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2673
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2674 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2675 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2676 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2677 for (i = 0; i < NCH(n); i += 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2678 e = ast_for_expr(c, CHILD(n, i));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2679 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2680 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2681 asdl_seq_SET(seq, i / 2, e);
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	2682 if (context && !set_context(c, e, context, CHILD(n, i)))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2683 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2684 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2685 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2686 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2687
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2688 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2689 ast_for_del_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2690 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2691 asdl_seq *expr_list;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2692
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2693 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2694 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2695
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2696 expr_list = ast_for_exprlist(c, CHILD(n, 1), Del);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2697 if (!expr_list)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2698 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2699 return Delete(expr_list, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2700 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2701
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2702 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2703 ast_for_flow_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2704 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2705 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2706 flow_stmt: break_stmt \| continue_stmt \| return_stmt \| raise_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2707 \| yield_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2708 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2709 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2710 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2711 yield_stmt: yield_expr
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2712 yield_expr: 'yield' testlist \| 'yield' 'from' test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2713 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2714 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2715 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2716
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2717 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2718 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2719 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2720 case break_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2721 return Break(LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2722 case continue_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2723 return Continue(LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2724 case yield_stmt: { /* will reduce to yield_expr */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2725 expr_ty exp = ast_for_expr(c, CHILD(ch, 0));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2726 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2727 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2728 return Expr(exp, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2729 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2730 case return_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2731 if (NCH(ch) == 1)
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2732 return Return(NULL, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2733 else {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2734 expr_ty expression = ast_for_testlist(c, CHILD(ch, 1));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2735 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2736 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2737 return Return(expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2738 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2739 case raise_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2740 if (NCH(ch) == 1)
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2741 return Raise(NULL, NULL, LINENO(n), n->n_col_offset, c->c_arena);
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2742 else if (NCH(ch) >= 2) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2743 expr_ty cause = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2744 expr_ty expression = ast_for_expr(c, CHILD(ch, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2745 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2746 return NULL;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2747 if (NCH(ch) == 4) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2748 cause = ast_for_expr(c, CHILD(ch, 3));
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2749 if (!cause)
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2750 return NULL;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2751 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2752 return Raise(expression, cause, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2753 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2754 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2755 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2756 "unexpected flow_stmt: %d", TYPE(ch));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2757 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2758 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2759
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2760 PyErr_SetString(PyExc_SystemError, "unhandled flow statement");
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2761 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2762 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2763
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2764 static alias_ty
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2765 alias_for_import_name(struct compiling c, const node n, int store)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2766 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2767 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2768 import_as_name: NAME ['as' NAME]
658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2769 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2770 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2771 */
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2772 identifier str, name;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2773
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2774 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2775 switch (TYPE(n)) {
70916 8ece0dacd8e8 fix indentation Benjamin Peterson <benjamin@python.org> parents: 69290 diff changeset	2776 case import_as_name: {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2777 node *name_node = CHILD(n, 0);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2778 str = NULL;
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2779 name = NEW_IDENTIFIER(name_node);
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2780 if (!name)
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2781 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2782 if (NCH(n) == 3) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2783 node *str_node = CHILD(n, 2);
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2784 str = NEW_IDENTIFIER(str_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2785 if (!str)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2786 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2787 if (store && forbidden_name(c, str, str_node, 0))
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2788 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2789 }
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2790 else {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2791 if (forbidden_name(c, name, name_node, 0))
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2792 return NULL;
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2793 }
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2794 return alias(name, str, c->c_arena);
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2795 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2796 case dotted_as_name:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2797 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2798 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2799 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2800 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2801 else {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2802 node *asname_node = CHILD(n, 2);
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2803 alias_ty a = alias_for_import_name(c, CHILD(n, 0), 0);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2804 if (!a)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2805 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2806 assert(!a->asname);
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2807 a->asname = NEW_IDENTIFIER(asname_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2808 if (!a->asname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2809 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2810 if (forbidden_name(c, a->asname, asname_node, 0))
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2811 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2812 return a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2813 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2814 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2815 case dotted_name:
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2816 if (NCH(n) == 1) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2817 node *name_node = CHILD(n, 0);
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2818 name = NEW_IDENTIFIER(name_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2819 if (!name)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2820 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2821 if (store && forbidden_name(c, name, name_node, 0))
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2822 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2823 return alias(name, NULL, c->c_arena);
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2824 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2825 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2826 /* Create a string of the form "a.b.c" */
36242 0f5189607264 Repair bizarre indentation created by VC 7.1. Tim Peters <tim.peters@gmail.com> parents: 36241 diff changeset	2827 int i;
36241 557e9b6ee7e1 alias_for_import_name(): Dueling compiler warnings ;-) Tim Peters <tim.peters@gmail.com> parents: 36231 diff changeset	2828 size_t len;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2829 char *s;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2830 PyObject *uni;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2831
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2832 len = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2833 for (i = 0; i < NCH(n); i += 2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2834 /* length of string plus one for the dot */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2835 len += strlen(STR(CHILD(n, i))) + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2836 len--; /* the last name doesn't have a dot */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	2837 str = PyBytes_FromStringAndSize(NULL, len);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2838 if (!str)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2839 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	2840 s = PyBytes_AS_STRING(str);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2841 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2842 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2843 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2844 char *sch = STR(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2845 strcpy(s, STR(CHILD(n, i)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2846 s += strlen(sch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2847 *s++ = '.';
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2848 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2849 --s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2850 *s = '\0';
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2851 uni = PyUnicode_DecodeUTF8(PyBytes_AS_STRING(str),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2852 PyBytes_GET_SIZE(str),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2853 NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2854 Py_DECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2855 if (!uni)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2856 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2857 str = uni;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2858 PyUnicode_InternInPlace(&str);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2859 PyArena_AddPyObject(c->c_arena, str);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2860 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2861 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2862 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2863 case STAR:
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2864 str = PyUnicode_InternFromString("*");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2865 PyArena_AddPyObject(c->c_arena, str);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2866 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2867 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2868 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2869 "unexpected import name: %d", TYPE(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2870 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2871 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2872
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2873 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2874 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2875 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2876
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2877 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2878 ast_for_import_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2879 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2880 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2881 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2882 import_name: 'import' dotted_as_names
41235 6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2883 import_from: 'from' (('.' \| '...')* dotted_name \| ('.' \| '...')+)
6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2884 'import' ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2885 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2886 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2887 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2888 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2889 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2890
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2891 REQ(n, import_stmt);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2892 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2893 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2894 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2895 if (TYPE(n) == import_name) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2896 n = CHILD(n, 1);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2897 REQ(n, dotted_as_names);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2898 aliases = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2899 if (!aliases)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2900 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2901 for (i = 0; i < NCH(n); i += 2) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2902 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2903 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2904 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2905 asdl_seq_SET(aliases, i / 2, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2906 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2907 return Import(aliases, lineno, col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2908 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2909 else if (TYPE(n) == import_from) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2910 int n_children;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2911 int idx, ndots = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2912 alias_ty mod = NULL;
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2913 identifier modname = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2914
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2915 /* Count the number of dots (for relative imports) and check for the
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2916 optional module name */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2917 for (idx = 1; idx < NCH(n); idx++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2918 if (TYPE(CHILD(n, idx)) == dotted_name) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2919 mod = alias_for_import_name(c, CHILD(n, idx), 0);
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2920 if (!mod)
0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2921 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2922 idx++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2923 break;
41235 6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2924 } else if (TYPE(CHILD(n, idx)) == ELLIPSIS) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2925 /* three consecutive dots are tokenized as one ELLIPSIS */
41235 6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2926 ndots += 3;
6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2927 continue;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2928 } else if (TYPE(CHILD(n, idx)) != DOT) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2929 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2930 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2931 ndots++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2932 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2933 idx++; /* skip over the 'import' keyword */
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2934 switch (TYPE(CHILD(n, idx))) {
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2935 case STAR:
e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2936 /* from ... import * */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2937 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2938 n_children = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2939 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2940 case LPAR:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2941 /* from ... import (x, y, z) */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2942 n = CHILD(n, idx + 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2943 n_children = NCH(n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2944 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2945 case import_as_names:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2946 /* from ... import x, y, z */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2947 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2948 n_children = NCH(n);
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2949 if (n_children % 2 == 0) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2950 ast_error(c, n, "trailing comma not allowed without"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2951 " surrounding parentheses");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2952 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2953 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2954 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2955 default:
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	2956 ast_error(c, n, "Unexpected node-type in from-import");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2957 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2958 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2959
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2960 aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2961 if (!aliases)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2962 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2963
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2964 /* handle "from ... import " special b/c there's no children /
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2965 if (TYPE(n) == STAR) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2966 alias_ty import_alias = alias_for_import_name(c, n, 1);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2967 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2968 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2969 asdl_seq_SET(aliases, 0, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2970 }
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2971 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2972 for (i = 0; i < NCH(n); i += 2) {
54918 0704f15b4682 Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2973 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2974 if (!import_alias)
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2975 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2976 asdl_seq_SET(aliases, i / 2, import_alias);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2977 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2978 }
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2979 if (mod != NULL)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2980 modname = mod->name;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2981 return ImportFrom(modname, aliases, ndots, lineno, col_offset,
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2982 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2983 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2984 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2985 "unknown import statement: starts with command '%s'",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2986 STR(CHILD(n, 0)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2987 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2988 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2989
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2990 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2991 ast_for_global_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2992 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2993 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2994 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2995 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2996 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2997
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2998 REQ(n, global_stmt);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2999 s = asdl_seq_new(NCH(n) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3000 if (!s)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3001 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3002 for (i = 1; i < NCH(n); i += 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3003 name = NEW_IDENTIFIER(CHILD(n, i));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3004 if (!name)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3005 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3006 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3007 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	3008 return Global(s, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3009 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3010
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3011 static stmt_ty
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3012 ast_for_nonlocal_stmt(struct compiling c, const node n)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3013 {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3014 /* nonlocal_stmt: 'nonlocal' NAME (',' NAME)* */
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3015 identifier name;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3016 asdl_seq *s;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3017 int i;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3018
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3019 REQ(n, nonlocal_stmt);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3020 s = asdl_seq_new(NCH(n) / 2, c->c_arena);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3021 if (!s)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3022 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3023 for (i = 1; i < NCH(n); i += 2) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3024 name = NEW_IDENTIFIER(CHILD(n, i));
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3025 if (!name)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3026 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3027 asdl_seq_SET(s, i / 2, name);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3028 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3029 return Nonlocal(s, LINENO(n), n->n_col_offset, c->c_arena);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3030 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3031
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3032 static stmt_ty
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3033 ast_for_assert_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3034 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3035 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3036 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3037 if (NCH(n) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3038 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3039 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3040 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3041 return Assert(expression, NULL, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3043 else if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3044 expr_ty expr1, expr2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3045
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3046 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3047 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3048 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3049 expr2 = ast_for_expr(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3050 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3051 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3052
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3053 return Assert(expr1, expr2, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3054 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3055 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3056 "improper number of parts to 'assert' statement: %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3057 NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3058 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3059 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3060
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3061 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3062 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3063 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3064 /* suite: simple_stmt \| NEWLINE INDENT stmt+ DEDENT */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3065 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3066 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3067 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3068 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3069
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3070 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3071
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3072 total = num_stmts(n);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	3073 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3074 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3075 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3076 if (TYPE(CHILD(n, 0)) == simple_stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3077 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3078 /* simple_stmt always ends with a NEWLINE,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3079 and may have a trailing SEMI
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3080 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3081 end = NCH(n) - 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3082 if (TYPE(CHILD(n, end - 1)) == SEMI)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3083 end--;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3084 /* loop by 2 to skip semi-colons */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3085 for (i = 0; i < end; i += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3086 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3087 s = ast_for_stmt(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3088 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3089 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3090 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3091 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3092 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3093 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3094 for (i = 2; i < (NCH(n) - 1); i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3095 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3096 REQ(ch, stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3097 num = num_stmts(ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3098 if (num == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3099 /* small_stmt or compound_stmt with only one child */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3100 s = ast_for_stmt(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3101 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3102 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3103 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3104 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3105 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3106 int j;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3107 ch = CHILD(ch, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3108 REQ(ch, simple_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3109 for (j = 0; j < NCH(ch); j += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3110 /* statement terminates with a semi-colon ';' */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3111 if (NCH(CHILD(ch, j)) == 0) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3112 assert((j + 1) == NCH(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3113 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3114 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3115 s = ast_for_stmt(c, CHILD(ch, j));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3116 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3117 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3118 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3119 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3120 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3121 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3122 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3123 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3124 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3125 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3126
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3127 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3128 ast_for_if_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3129 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3130 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3131 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3132 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3133 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3134
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3135 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3136
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3137 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3138 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3139 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3140
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3141 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3142 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3143 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3144 suite_seq = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3145 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3146 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3147
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3148 return If(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3149 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3150 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3151
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3152 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3153 /* s[2], the third character in the string, will be
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3154 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3155 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3156 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3157 if (s[2] == 's') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3158 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3159 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3161 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3162 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3163 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3164 seq1 = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3165 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3166 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3167 seq2 = ast_for_suite(c, CHILD(n, 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3168 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3169 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3170
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3171 return If(expression, seq1, seq2, LINENO(n), n->n_col_offset,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3172 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3173 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3174 else if (s[2] == 'i') {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3175 int i, n_elif, has_else = 0;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3176 expr_ty expression;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3177 asdl_seq *suite_seq;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3178 asdl_seq *orelse = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3179 n_elif = NCH(n) - 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3180 /* must reference the child n_elif+1 since 'else' token is third,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3181 not fourth, child from the end. */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3182 if (TYPE(CHILD(n, (n_elif + 1))) == NAME
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3183 && STR(CHILD(n, (n_elif + 1)))[2] == 's') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3184 has_else = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3185 n_elif -= 3;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3186 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3187 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3188
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3189 if (has_else) {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3190 asdl_seq *suite_seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3191
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3192 orelse = asdl_seq_new(1, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3193 if (!orelse)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3194 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3195 expression = ast_for_expr(c, CHILD(n, NCH(n) - 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3196 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3197 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3198 suite_seq = ast_for_suite(c, CHILD(n, NCH(n) - 4));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3199 if (!suite_seq)
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3200 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3201 suite_seq2 = ast_for_suite(c, CHILD(n, NCH(n) - 1));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3202 if (!suite_seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3203 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3204
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3205 asdl_seq_SET(orelse, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3206 If(expression, suite_seq, suite_seq2,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3207 LINENO(CHILD(n, NCH(n) - 6)),
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3208 CHILD(n, NCH(n) - 6)->n_col_offset,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3209 c->c_arena));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3210 /* the just-created orelse handled the last elif */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3211 n_elif--;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3212 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3213
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3214 for (i = 0; i < n_elif; i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3215 int off = 5 + (n_elif - i - 1) * 4;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3216 asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3217 if (!newobj)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3218 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3219 expression = ast_for_expr(c, CHILD(n, off));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3220 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3221 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3222 suite_seq = ast_for_suite(c, CHILD(n, off + 2));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3223 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3224 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3225
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3226 asdl_seq_SET(newobj, 0,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3227 If(expression, suite_seq, orelse,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3228 LINENO(CHILD(n, off)),
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3229 CHILD(n, off)->n_col_offset, c->c_arena));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3230 orelse = newobj;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3231 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3232 expression = ast_for_expr(c, CHILD(n, 1));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3233 if (!expression)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3234 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3235 suite_seq = ast_for_suite(c, CHILD(n, 3));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3236 if (!suite_seq)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3237 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3238 return If(expression, suite_seq, orelse,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3239 LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3240 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3241
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3242 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3243 "unexpected token in 'if' statement: %s", s);
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3244 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3245 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3246
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3247 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3248 ast_for_while_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3249 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3250 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3251 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3252
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3253 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3254 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3255 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3256
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3257 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3258 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3259 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3260 suite_seq = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3261 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3262 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3263 return While(expression, suite_seq, NULL, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3264 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3265 else if (NCH(n) == 7) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3266 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3267 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3268
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3269 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3270 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3271 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3272 seq1 = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3273 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3274 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3275 seq2 = ast_for_suite(c, CHILD(n, 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3276 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3277 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3278
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3279 return While(expression, seq1, seq2, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3280 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3281
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3282 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3283 "wrong number of tokens for 'while' statement: %d",
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3284 NCH(n));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3285 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3286 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3287
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3288 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3289 ast_for_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3290 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3291 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3292 expr_ty expression;
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3293 expr_ty target, first;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3294 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3295 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3296 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3297
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3298 if (NCH(n) == 9) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3299 seq = ast_for_suite(c, CHILD(n, 8));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3300 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3301 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3302 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3303
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3304 node_target = CHILD(n, 1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3305 _target = ast_for_exprlist(c, node_target, Store);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3306 if (!_target)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3307 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3308 /* Check the # of children rather than the length of _target, since
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3309 for x, in ... has 1 element in _target, but still requires a Tuple. */
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3310 first = (expr_ty)asdl_seq_GET(_target, 0);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3311 if (NCH(node_target) == 1)
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3312 target = first;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3313 else
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3314 target = Tuple(_target, Store, first->lineno, first->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3315
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	3316 expression = ast_for_testlist(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3317 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3318 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3319 suite_seq = ast_for_suite(c, CHILD(n, 5));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3320 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3321 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3322
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3323 return For(target, expression, suite_seq, seq, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3324 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3325 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3326
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3327 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3328 ast_for_except_clause(struct compiling c, const node exc, node *body)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3329 {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3330 /* except_clause: 'except' [test ['as' test]] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3331 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3332 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3333
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3334 if (NCH(exc) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3335 asdl_seq *suite_seq = ast_for_suite(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3336 if (!suite_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3337 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3338
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3339 return ExceptHandler(NULL, NULL, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3340 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3341 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3342 else if (NCH(exc) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3343 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3344 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3345
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3346 expression = ast_for_expr(c, CHILD(exc, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3347 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3348 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3349 suite_seq = ast_for_suite(c, body);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3350 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3351 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3352
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3353 return ExceptHandler(expression, NULL, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3354 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3355 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3356 else if (NCH(exc) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3357 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3358 expr_ty expression;
40588 4bab65fcca8e Some more changes related to the new except syntax and semantics, Guido van Rossum <guido@python.org> parents: 40529 diff changeset	3359 identifier e = NEW_IDENTIFIER(CHILD(exc, 3));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3360 if (!e)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3361 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3362 if (forbidden_name(c, e, CHILD(exc, 3), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	3363 return NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3364 expression = ast_for_expr(c, CHILD(exc, 1));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3365 if (!expression)
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3366 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3367 suite_seq = ast_for_suite(c, body);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3368 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3369 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3370
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3371 return ExceptHandler(expression, e, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3372 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3373 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3374
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3375 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3376 "wrong number of children for 'except' clause: %d",
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3377 NCH(exc));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3378 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3379 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3380
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3381 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3382 ast_for_try_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3383 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3384 const int nch = NCH(n);
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3385 int n_except = (nch - 3)/3;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3386 asdl_seq body, handlers = NULL, orelse = NULL, finally = NULL;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3387
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3388 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3389
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3390 body = ast_for_suite(c, CHILD(n, 2));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3391 if (body == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3392 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3393
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3394 if (TYPE(CHILD(n, nch - 3)) == NAME) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3395 if (strcmp(STR(CHILD(n, nch - 3)), "finally") == 0) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3396 if (nch >= 9 && TYPE(CHILD(n, nch - 6)) == NAME) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3397 /* we can assume it's an "else",
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3398 because nch >= 9 for try-else-finally and
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3399 it would otherwise have a type of except_clause */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3400 orelse = ast_for_suite(c, CHILD(n, nch - 4));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3401 if (orelse == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3402 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3403 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3404 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3405
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3406 finally = ast_for_suite(c, CHILD(n, nch - 1));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3407 if (finally == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3408 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3409 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3410 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3411 else {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3412 /* we can assume it's an "else",
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3413 otherwise it would have a type of except_clause */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3414 orelse = ast_for_suite(c, CHILD(n, nch - 1));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3415 if (orelse == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3416 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3417 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3418 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3419 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3420 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3421 ast_error(c, n, "malformed 'try' statement");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3422 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3423 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3424
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3425 if (n_except > 0) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3426 int i;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3427 /* process except statements to create a try ... except */
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3428 handlers = asdl_seq_new(n_except, c->c_arena);
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3429 if (handlers == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3430 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3431
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3432 for (i = 0; i < n_except; i++) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3433 excepthandler_ty e = ast_for_except_clause(c, CHILD(n, 3 + i * 3),
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3434 CHILD(n, 5 + i * 3));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3435 if (!e)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3436 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3437 asdl_seq_SET(handlers, i, e);
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3438 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3439 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3440
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3441 assert(finally != NULL \|\| asdl_seq_LEN(handlers));
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3442 return Try(body, handlers, orelse, finally, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3443 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3444
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3445 /* with_item: test ['as' expr] */
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3446 static withitem_ty
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3447 ast_for_with_item(struct compiling c, const node n)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3448 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3449 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3450
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3451 REQ(n, with_item);
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3452 context_expr = ast_for_expr(c, CHILD(n, 0));
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	3453 if (!context_expr)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	3454 return NULL;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3455 if (NCH(n) == 3) {
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3456 optional_vars = ast_for_expr(c, CHILD(n, 2));
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3457
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3458 if (!optional_vars) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3459 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3460 }
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3461 if (!set_context(c, optional_vars, Store, n)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3462 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3463 }
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3464 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3465
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3466 return withitem(context_expr, optional_vars, c->c_arena);
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3467 }
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3468
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3469 /* with_stmt: 'with' with_item (',' with_item)* ':' suite */
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3470 static stmt_ty
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3471 ast_for_with_stmt(struct compiling c, const node n)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3472 {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3473 int i, n_items;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3474 asdl_seq items, body;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3475
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3476 REQ(n, with_stmt);
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3477
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3478 n_items = (NCH(n) - 2) / 2;
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3479 items = asdl_seq_new(n_items, c->c_arena);
78673 663de4dbb88a Check return value of asdl_seq_new(). Found by Coverity. Stefan Krah <skrah@bytereef.org> parents: 75546 diff changeset	3480 if (!items)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3481 return NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3482 for (i = 1; i < NCH(n) - 2; i += 2) {
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3483 withitem_ty item = ast_for_with_item(c, CHILD(n, i));
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3484 if (!item)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3485 return NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3486 asdl_seq_SET(items, (i - 1) / 2, item);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3487 }
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3488
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3489 body = ast_for_suite(c, CHILD(n, NCH(n) - 1));
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3490 if (!body)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3491 return NULL;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3492
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3493 return With(items, body, LINENO(n), n->n_col_offset, c->c_arena);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3494 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3495
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3496 static stmt_ty
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3497 ast_for_classdef(struct compiling c, const node n, asdl_seq *decorator_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3498 {
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3499 /* classdef: 'class' NAME ['(' arglist ')'] ':' suite */
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3500 PyObject *classname;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3501 asdl_seq *s;
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3502 expr_ty call;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3503
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3504 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3505
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3506 if (NCH(n) == 4) { /* class NAME ':' suite */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3507 s = ast_for_suite(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3508 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3509 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3510 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3511 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3512 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3513 if (forbidden_name(c, classname, CHILD(n, 3), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	3514 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3515 return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3516 LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3517 }
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3518
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3519 if (TYPE(CHILD(n, 3)) == RPAR) { /* class NAME '(' ')' ':' suite */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3520 s = ast_for_suite(c, CHILD(n,5));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3521 if (!s)
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3522 return NULL;
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3523 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3524 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3525 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3526 if (forbidden_name(c, classname, CHILD(n, 3), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	3527 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3528 return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3529 LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3531
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3532 /* class NAME '(' arglist ')' ':' suite */
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3533 /* build up a fake Call node so we can extract its pieces */
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3534 {
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3535 PyObject *dummy_name;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3536 expr_ty dummy;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3537 dummy_name = NEW_IDENTIFIER(CHILD(n, 1));
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3538 if (!dummy_name)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3539 return NULL;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3540 dummy = Name(dummy_name, Load, LINENO(n), n->n_col_offset, c->c_arena);
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3541 call = ast_for_call(c, CHILD(n, 3), dummy);
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3542 if (!call)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3543 return NULL;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3544 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3545 s = ast_for_suite(c, CHILD(n, 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3546 if (!s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3547 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3548 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3549 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3550 return NULL;
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3551 if (forbidden_name(c, classname, CHILD(n, 1), 0))
54954 c45e331238ae In most cases, the parser will protect True, False, and None from being assign to. Benjamin Peterson <benjamin@python.org> parents: 54918 diff changeset	3552 return NULL;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3553
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3554 return ClassDef(classname, call->v.Call.args, call->v.Call.keywords,
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3555 call->v.Call.starargs, call->v.Call.kwargs, s,
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3556 decorator_seq, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3557 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3558
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3559 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3560 ast_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3561 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3562 if (TYPE(n) == stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3563 assert(NCH(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3564 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3565 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3566 if (TYPE(n) == simple_stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3567 assert(num_stmts(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3568 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3569 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3570 if (TYPE(n) == small_stmt) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3571 n = CHILD(n, 0);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3572 /* small_stmt: expr_stmt \| del_stmt \| pass_stmt \| flow_stmt
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3573 \| import_stmt \| global_stmt \| nonlocal_stmt \| assert_stmt
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3574 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3575 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3576 case expr_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3577 return ast_for_expr_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3578 case del_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3579 return ast_for_del_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3580 case pass_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	3581 return Pass(LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3582 case flow_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3583 return ast_for_flow_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3584 case import_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3585 return ast_for_import_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3586 case global_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3587 return ast_for_global_stmt(c, n);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3588 case nonlocal_stmt:
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3589 return ast_for_nonlocal_stmt(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3590 case assert_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3591 return ast_for_assert_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3592 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3593 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3594 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3595 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3596 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3597 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3598 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3599 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3600 /* compound_stmt: if_stmt \| while_stmt \| for_stmt \| try_stmt
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3601 \| funcdef \| classdef \| decorated
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3602 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3603 node *ch = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3604 REQ(n, compound_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3605 switch (TYPE(ch)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3606 case if_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3607 return ast_for_if_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3608 case while_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3609 return ast_for_while_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3610 case for_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3611 return ast_for_for_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3612 case try_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3613 return ast_for_try_stmt(c, ch);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3614 case with_stmt:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3615 return ast_for_with_stmt(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3616 case funcdef:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3617 return ast_for_funcdef(c, ch, NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3618 case classdef:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3619 return ast_for_classdef(c, ch, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3620 case decorated:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3621 return ast_for_decorated(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3622 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3623 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3624 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3625 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3626 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3627 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3628 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3629 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3630
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3631 static PyObject *
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3632 parsenumber(struct compiling c, const char s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3633 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3634 const char *end;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3635 long x;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3636 double dx;
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3637 Py_complex compl;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3638 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3639
50035 4c9844cf2a3f Merged revisions 67595 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 49852 diff changeset	3640 assert(s != NULL);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3641 errno = 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3642 end = s + strlen(s) - 1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3643 imflag = end == 'j' \|\| end == 'J';
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3644 if (s[0] == '0') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3645 x = (long) PyOS_strtoul((char )s, (char *)&end, 0);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3646 if (x < 0 && errno == 0) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3647 return PyLong_FromString((char *)s,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3648 (char **)0,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3649 0);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3650 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3651 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3652 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3653 x = PyOS_strtol((char )s, (char *)&end, 0);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3654 if (*end == '\0') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3655 if (errno != 0)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3656 return PyLong_FromString((char )s, (char *)0, 0);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44025 diff changeset	3657 return PyLong_FromLong(x);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3658 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3659 /* XXX Huge floats may silently fail */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3660 if (imflag) {
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3661 compl.real = 0.;
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3662 compl.imag = PyOS_string_to_double(s, (char **)&end, NULL);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3663 if (compl.imag == -1.0 && PyErr_Occurred())
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3664 return NULL;
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3665 return PyComplex_FromCComplex(compl);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3666 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3667 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3668 {
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3669 dx = PyOS_string_to_double(s, NULL, NULL);
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3670 if (dx == -1.0 && PyErr_Occurred())
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3671 return NULL;
13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3672 return PyFloat_FromDouble(dx);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3673 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3674 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3675
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3676 static PyObject *
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3677 decode_utf8(struct compiling c, const char sPtr, const char end)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3678 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3679 char s, t;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3680 t = s = (char )sPtr;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3681 /* while (s < end && s != '\\') s++; / /* inefficient for u".." */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3682 while (s < end && (*s & 0x80)) s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3683 *sPtr = s;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3684 return PyUnicode_DecodeUTF8(t, s - t, NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3685 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3686
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3687 static PyObject *
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3688 decode_unicode(struct compiling c, const char s, size_t len, int rawmode, const char *encoding)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3689 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3690 PyObject v, u;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3691 char *buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3692 char *p;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3693 const char *end;
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3694
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3695 if (encoding == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3696 u = NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3697 } else {
48330 ac854cde3135 Merged revisions 64114 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47301 diff changeset	3698 /* check for integer overflow */
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3699 if (len > PY_SIZE_MAX / 6)
48330 ac854cde3135 Merged revisions 64114 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47301 diff changeset	3700 return NULL;
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3701 /* "ä" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5
f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3702 "\ä" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */
f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3703 u = PyBytes_FromStringAndSize((char )NULL, len 6);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3704 if (u == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3705 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3706 p = buf = PyBytes_AsString(u);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3707 end = s + len;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3708 while (s < end) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3709 if (*s == '\\') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3710 p++ = s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3711 if (*s & 0x80) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3712 strcpy(p, "u005c");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3713 p += 5;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3714 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3715 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3716 if (s & 0x80) { / XXX inefficient */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3717 PyObject *w;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3718 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3719 void *data;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3720 Py_ssize_t len, i;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3721 w = decode_utf8(c, &s, end);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3722 if (w == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3723 Py_DECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3724 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3725 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3726 kind = PyUnicode_KIND(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3727 data = PyUnicode_DATA(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3728 len = PyUnicode_GET_LENGTH(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3729 for (i = 0; i < len; i++) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3730 Py_UCS4 chr = PyUnicode_READ(kind, data, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3731 sprintf(p, "\\U%08x", chr);
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3732 p += 10;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3733 }
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3734 /* Should be impossible to overflow */
f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3735 assert(p - buf <= Py_SIZE(u));
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3736 Py_DECREF(w);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3737 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3738 p++ = s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3739 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3740 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3741 len = p - buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3742 s = buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3743 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3744 if (rawmode)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3745 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3746 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3747 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3748 Py_XDECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3749 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3750 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3751
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3752 /* s is a Python string literal, including the bracketing quote characters,
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3753 * and r &/or b prefixes (if any), and embedded escape sequences (if any).
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3754 * parsestr parses it, and returns the decoded Python string object.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3755 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3756 static PyObject *
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3757 parsestr(struct compiling c, const node n, int *bytesmode)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3758 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3759 size_t len;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3760 const char *s = STR(n);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3761 int quote = Py_CHARMASK(*s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3762 int rawmode = 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3763 int need_encoding;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	3764 if (isalpha(quote)) {
74354 bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3765 while (!*bytesmode \|\| !rawmode) {
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3766 if (quote == 'b' \|\| quote == 'B') {
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3767 quote = *++s;
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3768 *bytesmode = 1;
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3769 }
75381 ed9497d6a216 Basic support for PEP 414 without docs or tests. Armin Ronacher <armin.ronacher@active-4.com> parents: 74462 diff changeset	3770 else if (quote == 'u' \|\| quote == 'U') {
ed9497d6a216 Basic support for PEP 414 without docs or tests. Armin Ronacher <armin.ronacher@active-4.com> parents: 74462 diff changeset	3771 quote = *++s;
ed9497d6a216 Basic support for PEP 414 without docs or tests. Armin Ronacher <armin.ronacher@active-4.com> parents: 74462 diff changeset	3772 }
74354 bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3773 else if (quote == 'r' \|\| quote == 'R') {
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3774 quote = *++s;
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3775 rawmode = 1;
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3776 }
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3777 else {
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3778 break;
bbed36370b08 Issue #13748: Raw bytes literals can now be written with the `rb` prefix as well as `br`. Antoine Pitrou <solipsis@pitrou.net> parents: 72925 diff changeset	3779 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3780 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3781 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3782 if (quote != '\'' && quote != '\"') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3783 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3784 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3785 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3786 s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3787 len = strlen(s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3788 if (len > INT_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3789 PyErr_SetString(PyExc_OverflowError,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3790 "string to parse is too long");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3791 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3792 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3793 if (s[--len] != quote) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3794 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3795 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3796 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3797 if (len >= 4 && s[0] == quote && s[1] == quote) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3798 s += 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3799 len -= 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3800 if (s[--len] != quote \|\| s[--len] != quote) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3801 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3802 return NULL;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	3803 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3804 }
46306 b10292eafb07 Reverted r62128 on Guido's orders Benjamin Peterson <benjamin@python.org> parents: 46272 diff changeset	3805 if (!*bytesmode && !rawmode) {
46664 031dfe455585 Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 46306 diff changeset	3806 return decode_unicode(c, s, len, rawmode, c->c_encoding);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3807 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3808 if (*bytesmode) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3809 /* Disallow non-ascii characters (but not escapes) */
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3810 const char *ch;
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3811 for (ch = s; *ch; ch++) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3812 if (Py_CHARMASK(*ch) >= 0x80) {
58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3813 ast_error(c, n, "bytes can only contain ASCII "
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3814 "literal characters.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3815 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3816 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3817 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3818 }
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3819 need_encoding = (!*bytesmode && c->c_encoding != NULL &&
49539 481ad3d9ffd1 Latin-1 source code was not being properly decoded when passed through Brett Cannon <bcannon@gmail.com> parents: 48777 diff changeset	3820 strcmp(c->c_encoding, "utf-8") != 0);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3821 if (rawmode \|\| strchr(s, '\\') == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3822 if (need_encoding) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3823 PyObject v, u = PyUnicode_DecodeUTF8(s, len, NULL);
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3824 if (u == NULL \|\| !*bytesmode)
068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3825 return u;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3826 v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3827 Py_DECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3828 return v;
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3829 } else if (*bytesmode) {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3830 return PyBytes_FromStringAndSize(s, len);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3831 } else if (strcmp(c->c_encoding, "utf-8") == 0) {
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3832 return PyUnicode_FromStringAndSize(s, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3833 } else {
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3834 return PyUnicode_DecodeLatin1(s, len, NULL);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3835 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3836 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3837 return PyBytes_DecodeEscape(s, len, NULL, 1,
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3838 need_encoding ? c->c_encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3839 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3840
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3841 /* Build a Python string object out of a STRING+ atom. This takes care of
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3842 * compile-time literal catenation, calling parsestr() on each piece, and
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3843 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3844 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3845 static PyObject *
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	3846 parsestrplus(struct compiling c, const node n, int *bytesmode)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3847 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3848 PyObject *v;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3849 int i;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3850 REQ(CHILD(n, 0), STRING);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3851 v = parsestr(c, CHILD(n, 0), bytesmode);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3852 if (v != NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3853 /* String literal concatenation */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3854 for (i = 1; i < NCH(n); i++) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3855 PyObject *s;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3856 int subbm = 0;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3857 s = parsestr(c, CHILD(n, i), &subbm);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3858 if (s == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3859 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3860 if (*bytesmode != subbm) {
78840 58de275e9224 get rid of ast_error_finish by passing the compiling struct to ast_error Benjamin Peterson <benjamin@python.org> parents: 78839 diff changeset	3861 ast_error(c, n, "cannot mix bytes and nonbytes literals");
78962 4a343636c8ca Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s going out of scope leaks the storage it points to. Christian Heimes <christian@cheimes.de> parents: 78841 diff changeset	3862 Py_DECREF(s);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3863 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3864 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3865 if (PyBytes_Check(v) && PyBytes_Check(s)) {
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3866 PyBytes_ConcatAndDel(&v, s);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3867 if (v == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3868 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3869 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3870 else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3871 PyObject *temp = PyUnicode_Concat(v, s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3872 Py_DECREF(s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3873 Py_DECREF(v);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3874 v = temp;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3875 if (v == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3876 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3877 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3878 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3879 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3880 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3881
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3882 onError:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3883 Py_XDECREF(v);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3884 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3885 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 81922:4ab386b00aaf