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

annotate Python/ast.c @ 78839:f96df022f124

merge 3.2

author	Benjamin Peterson <benjamin@python.org>
date	Sun, 02 Sep 2012 14:38:15 -0400
parents	d61424122af5 a5e28f9924c3
children	58de275e9224

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:
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	227 return !exp->v.YieldFrom.value \|\|
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	228 validate_expr(exp->v.YieldFrom.value, Load);
71795 4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	229 case Compare_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	230 if (!asdl_seq_LEN(exp->v.Compare.comparators)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	231 PyErr_SetString(PyExc_ValueError, "Compare with no comparators");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	232 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	233 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	234 if (asdl_seq_LEN(exp->v.Compare.comparators) !=
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	235 asdl_seq_LEN(exp->v.Compare.ops)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	236 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	237 "of comparators and operands");
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	238 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	239 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	240 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	241 validate_expr(exp->v.Compare.left, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	242 case Call_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	243 return validate_expr(exp->v.Call.func, Load) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	244 validate_exprs(exp->v.Call.args, Load, 0) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	245 validate_keywords(exp->v.Call.keywords) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	246 (!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	247 (!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	248 case Num_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	249 PyObject *n = exp->v.Num.n;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	250 if (!PyLong_CheckExact(n) && !PyFloat_CheckExact(n) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	251 !PyComplex_CheckExact(n)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	252 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	253 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	254 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	255 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	256 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	257 case Str_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	258 PyObject *s = exp->v.Str.s;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	259 if (!PyUnicode_CheckExact(s)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	260 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	261 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	262 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	263 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	264 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	265 case Bytes_kind: {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	266 PyObject *b = exp->v.Bytes.s;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	267 if (!PyBytes_CheckExact(b)) {
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	268 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	269 return 0;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	270 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	271 return 1;
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	272 }
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	273 case Attribute_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	274 return validate_expr(exp->v.Attribute.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	275 case Subscript_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	276 return validate_slice(exp->v.Subscript.slice) &&
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	277 validate_expr(exp->v.Subscript.value, Load);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	278 case Starred_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	279 return validate_expr(exp->v.Starred.value, ctx);
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	280 case List_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	281 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	282 case Tuple_kind:
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	283 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	284 /* These last cases don't have any checking. */
4090dfdf91a4 add a AST validator (closes #12575) Benjamin Peterson <benjamin@python.org> parents: 70918 diff changeset	285 case Name_kind:
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
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 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 {
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 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 /* This routine provides an invalid object for the syntax error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	578 The outermost routine must unpack this error and create the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	579 proper object. We do this so that we don't have to pass
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	580 the filename to everything function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	581
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	582 XXX Maybe we should just pass the filename...
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	583 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	584
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	585 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	586 ast_error(const node n, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	587 {
78838 a5e28f9924c3 move variable decl to the top of the function Benjamin Peterson <benjamin@python.org> parents: 78835 diff changeset	588 PyObject u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset), save;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	589 if (!u)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	590 return 0;
78835 0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	591 /*
0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	592 * Prevent the error from being chained. PyErr_SetObject will normalize the
0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	593 * exception in order to chain it. ast_error_finish, however, requires the
0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	594 * error not to be normalized.
0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	595 */
78838 a5e28f9924c3 move variable decl to the top of the function Benjamin Peterson <benjamin@python.org> parents: 78835 diff changeset	596 save = PyThreadState_GET()->exc_value;
78835 0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	597 PyThreadState_GET()->exc_value = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	598 PyErr_SetObject(PyExc_SyntaxError, u);
78835 0db75a55145a prevert ast errors from being normalized before ast_error_finish is called (closes #15846) Benjamin Peterson <benjamin@python.org> parents: 75545 diff changeset	599 PyThreadState_GET()->exc_value = save;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	600 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	601 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	602 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	603
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	604 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	605 ast_error_finish(const char *filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	606 {
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	607 PyObject type, value, tback, errstr, offset, loc, *tmp;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	608 PyObject *filename_obj;
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	609 long lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	610
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	611 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	612 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	613 return;
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 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	617 if (!errstr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	618 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	619 Py_INCREF(errstr);
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	620 lineno = PyLong_AsLong(PyTuple_GetItem(value, 1));
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	621 if (lineno == -1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	622 Py_DECREF(errstr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	623 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	624 }
64861 861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	625 offset = PyTuple_GetItem(value, 2);
861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	626 if (!offset) {
861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	627 Py_DECREF(errstr);
861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	628 return;
861c35cef7aa add column offset to all syntax errors Benjamin Peterson <benjamin@python.org> parents: 64184 diff changeset	629 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	630 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	631
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	632 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	633 if (!loc) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	634 Py_INCREF(Py_None);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	635 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	636 }
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	637 if (filename != NULL)
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	638 filename_obj = PyUnicode_DecodeFSDefault(filename);
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	639 else {
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	640 Py_INCREF(Py_None);
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	641 filename_obj = Py_None;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	642 }
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	643 if (filename_obj != NULL)
65399 55ed5c524428 Issue #9713, #10114: Parser functions (eg. PyParser_ASTFromFile) expects Victor Stinner <victor.stinner@haypocalc.com> parents: 64861 diff changeset	644 tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc);
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	645 else
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 64185 diff changeset	646 tmp = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	647 Py_DECREF(loc);
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	648 if (!tmp) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	649 Py_DECREF(errstr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	650 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	651 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	652 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	653 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	654 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	655 if (!value)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	656 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	657 PyErr_Restore(type, value, tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	658 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	659
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	660 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	661
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	662 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	663 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	664 grammar:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	665
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	666 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	667 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	668
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	669 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	670 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	671 small_stmt elements is returned.
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	674 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	675 num_stmts(const node *n)
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 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	678 node *ch;
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 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	681 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	682 if (TYPE(CHILD(n, 0)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	683 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	684 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	685 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	686 case file_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	687 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	688 for (i = 0; i < NCH(n); i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	689 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	690 if (TYPE(ch) == stmt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	691 l += num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	692 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	693 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	694 case stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	695 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	696 case compound_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	697 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	698 case simple_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	699 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	700 case suite:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	701 if (NCH(n) == 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	702 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	703 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	704 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	705 for (i = 2; i < (NCH(n) - 1); i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	706 l += num_stmts(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	707 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	708 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	709 default: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	710 char buf[128];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	711
50886 581d8602f3f7 Merged revisions 68746 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50035 diff changeset	712 sprintf(buf, "Non-statement found: %d %d",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	713 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	714 Py_FatalError(buf);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	715 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	716 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	717 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	718 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	719 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	720
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	721 /* 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	722 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	723
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	724 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	725 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	726 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	727 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	728 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	729 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	730 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	731 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	732 struct compiling c;
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	733 mod_ty res = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	734
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	735 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	736 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	737 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	738 #if 0
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	739 ast_error(n, "encoding declaration in Unicode string");
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	740 goto out;
42054 063530fcc32e Minimal changes to make the "freeze" tool work again. Guido van Rossum <guido@python.org> parents: 42013 diff changeset	741 #endif
063530fcc32e Minimal changes to make the "freeze" tool work again. Guido van Rossum <guido@python.org> parents: 42013 diff changeset	742 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	743 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	744 } else if (TYPE(n) == encoding_decl) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	745 c.c_encoding = STR(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	746 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	747 } else {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	748 /* PEP 3120 */
42403 7e8469617b1c Implement PEP 3120. Martin v. Löwis <martin@v.loewis.de> parents: 42309 diff changeset	749 c.c_encoding = "utf-8";
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	750 }
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	751 c.c_arena = arena;
44025 ebc7389297d6 Merged revisions 59107-59186 via svnmerge from Guido van Rossum <guido@python.org> parents: 43961 diff changeset	752 c.c_filename = filename;
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	753 c.c_normalize = c.c_normalize_args = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	754
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	755 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	756 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	757 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	758 stmts = asdl_seq_new(num_stmts(n), arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	759 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	760 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	761 for (i = 0; i < NCH(n) - 1; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	762 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	763 if (TYPE(ch) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	764 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	765 REQ(ch, stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	766 num = num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	767 if (num == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	768 s = ast_for_stmt(&c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	769 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	770 goto out;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	771 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	772 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	773 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	775 REQ(ch, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	776 for (j = 0; j < num; j++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	777 s = ast_for_stmt(&c, CHILD(ch, j * 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	778 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	779 goto out;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	780 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	781 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	782 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	783 }
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	784 res = Module(stmts, arena);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	785 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	786 case eval_input: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	787 expr_ty testlist_ast;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	788
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	789 /* 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	790 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	791 if (!testlist_ast)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	792 goto out;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	793 res = Expression(testlist_ast, arena);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	794 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	795 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	796 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	797 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	798 stmts = asdl_seq_new(1, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	799 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	800 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	801 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	802 arena));
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	803 if (!asdl_seq_GET(stmts, 0))
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	804 goto out;
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	805 res = Interactive(stmts, arena);
35742 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 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	808 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	809 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	810 stmts = asdl_seq_new(num, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	811 if (!stmts)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	812 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	813 if (num == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	814 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	815 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	816 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	817 asdl_seq_SET(stmts, 0, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	818 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	819 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	820 /* Only a simple_stmt can contain multiple statements. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	821 REQ(n, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	822 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	823 if (TYPE(CHILD(n, i)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	824 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	825 s = ast_for_stmt(&c, CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	826 if (!s)
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	827 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	828 asdl_seq_SET(stmts, i / 2, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	829 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	830 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	831
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	832 res = Interactive(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833 }
74460 953d6ee29464 break out switch at correct place Benjamin Peterson <benjamin@python.org> parents: 74459 diff changeset	834 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	835 default:
41716 00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	836 PyErr_Format(PyExc_SystemError,
00c02c4488ce Merged revisions 55325-55327 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	837 "invalid node %d for PyAST_FromNode", TYPE(n));
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	838 goto out;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	839 }
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	840 out:
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	841 if (c.c_normalize) {
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	842 Py_DECREF(c.c_normalize);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	843 PyTuple_SET_ITEM(c.c_normalize_args, 1, NULL);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	844 Py_DECREF(c.c_normalize_args);
0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	845 }
74459 8241fc821e2b only finish error if one occurred Benjamin Peterson <benjamin@python.org> parents: 74458 diff changeset	846 if (!res)
8241fc821e2b only finish error if one occurred Benjamin Peterson <benjamin@python.org> parents: 74458 diff changeset	847 ast_error_finish(filename);
74457 0677f05d6ece streamline normalizer identification a bit Benjamin Peterson <benjamin@python.org> parents: 74448 diff changeset	848 return res;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	849 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	850
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	851 /* 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	852 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	853
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	854 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	855 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	856 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	857 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	858 case VBAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	859 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	860 case CIRCUMFLEX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	861 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	862 case AMPER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	863 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	864 case LEFTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	865 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	866 case RIGHTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	867 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	868 case PLUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	869 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	870 case MINUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	871 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	872 case STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	873 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	874 case SLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	875 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	876 case DOUBLESLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	877 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	878 case PERCENT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	879 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	880 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	881 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	882 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	883 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	884
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	885 static const char* FORBIDDEN[] = {
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	886 "None",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	887 "True",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	888 "False",
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	889 NULL,
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	890 };
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	891
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	892 static int
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	893 forbidden_name(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	894 {
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	895 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	896 if (PyUnicode_CompareWithASCIIString(name, "__debug__") == 0) {
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	897 ast_error(n, "assignment to keyword");
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	898 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	899 }
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	900 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	901 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	902 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	903 if (PyUnicode_CompareWithASCIIString(name, *p) == 0) {
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	904 ast_error(n, "assignment to keyword");
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	905 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	906 }
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	907 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	908 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	909 return 0;
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	910 }
9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	911
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	912 /* 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	913
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	914 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	915 (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	916 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	917 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	918
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	919 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	920 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	921 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	922 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	923 /* 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	924 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	925 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	926 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	927
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	928 /* 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	929 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	930 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	931 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	932 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	933 set_context(), too.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	934 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	935 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	936
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	937 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	938 case Attribute_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	939 e->v.Attribute.ctx = ctx;
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	940 if (ctx == Store && forbidden_name(e->v.Attribute.attr, n, 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	941 return 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	942 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	943 case Subscript_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	944 e->v.Subscript.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 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 Starred_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	947 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	948 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	949 return 0;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	950 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	951 case Name_kind:
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	952 if (ctx == Store) {
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	953 if (forbidden_name(e->v.Name.id, n, 1))
41969 9d02a4adf574 Merged revisions 55631-55794 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	954 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	955 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	956 e->v.Name.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	957 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958 case List_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	959 e->v.List.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	960 s = e->v.List.elts;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	961 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	962 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	963 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	964 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	965 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	966 }
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	967 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	968 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	969 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	970 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	971 case Lambda_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	972 expr_name = "lambda";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	973 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	974 case Call_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	975 expr_name = "function call";
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	976 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	977 case BoolOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	978 case BinOp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	979 case UnaryOp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	980 expr_name = "operator";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	981 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	982 case GeneratorExp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	983 expr_name = "generator expression";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	984 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	985 case Yield_kind:
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	986 case YieldFrom_kind:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	987 expr_name = "yield expression";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	988 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	989 case ListComp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	990 expr_name = "list comprehension";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	991 break;
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	992 case SetComp_kind:
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	993 expr_name = "set comprehension";
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	994 break;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	995 case DictComp_kind:
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	996 expr_name = "dict comprehension";
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	997 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	998 case Dict_kind:
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	999 case Set_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001 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	1002 case Bytes_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1003 expr_name = "literal";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1004 break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1005 case Ellipsis_kind:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1006 expr_name = "Ellipsis";
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1007 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1008 case Compare_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1009 expr_name = "comparison";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1010 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	1011 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	1012 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	1013 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1014 default:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1015 PyErr_Format(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1016 "unexpected expression in assignment %d (line %d)",
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1017 e->kind, e->lineno);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1018 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1020 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1021 if (expr_name) {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1022 char buf[300];
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1023 PyOS_snprintf(buf, sizeof(buf),
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1024 "can't %s %s",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1025 ctx == Store ? "assign to" : "delete",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1026 expr_name);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1027 return ast_error(n, buf);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1028 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1029
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1030 /* 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	1031 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1032 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 if (s) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1034 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1035
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1036 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	1037 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	1038 return 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1039 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1040 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1043
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044 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	1045 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	1046 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1047 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1048 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1049 switch (STR(n)[0]) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1050 case '+':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1051 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1052 case '-':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1053 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1054 case '/':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1055 if (STR(n)[1] == '/')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1056 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1057 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1058 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1059 case '%':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1060 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1061 case '<':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1062 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1063 case '>':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1064 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065 case '&':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1066 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1067 case '^':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1068 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1069 case '\|':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1070 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1071 case '*':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1072 if (STR(n)[1] == '*')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1073 return Pow;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1075 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1076 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1077 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	1078 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1079 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1081
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1082 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	1083 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	1084 {
39648 efe3f2c0da5e Killed the <> operator. You must now use !=. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	1085 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'!='\|'in'\|'not' 'in'\|'is'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1086 \|'is' 'not'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1087 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1088 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1089 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1090 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1091 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1092 case LESS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1093 return Lt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1094 case GREATER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1095 return Gt;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1096 case EQEQUAL: /* == */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1097 return Eq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1098 case LESSEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1099 return LtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100 case GREATEREQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1101 return GtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1102 case NOTEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103 return NotEq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1105 if (strcmp(STR(n), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 return In;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1107 if (strcmp(STR(n), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108 return Is;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1109 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1110 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1111 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	1112 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1113 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1115 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	1116 /* 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	1117 switch (TYPE(CHILD(n, 0))) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1120 return NotIn;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1121 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1122 return IsNot;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1123 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1124 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	1125 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	1126 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1127 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1129 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	1130 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	1131 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1134 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1136 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	1137 /* 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	1138 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	1139 */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1140 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1141 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	1142 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	1143 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	1144
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	1145 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	1146 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 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	1150 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	1151 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	1152
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 55912 diff changeset	1153 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	1154 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1156
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157 assert(i / 2 < seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158 asdl_seq_SET(seq, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1159 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1160 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1161 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1162
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1163 static arg_ty
75543 fe0b2681a42f use correct naming convention Benjamin Peterson <benjamin@python.org> parents: 70916 diff changeset	1164 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	1165 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1166 identifier name;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1167 expr_ty annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1168 node *ch;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1169
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1170 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	1171 ch = CHILD(n, 0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1172 name = NEW_IDENTIFIER(ch);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1173 if (!name)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1174 return NULL;
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	1175 if (forbidden_name(name, ch, 0))
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	1176 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1177
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1178 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	1179 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	1180 if (!annotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1181 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1182 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1183
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1184 return arg(name, annotation, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1185 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1186
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1187 /* 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	1188 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	1189 (',' tfpdef ['=' test])*
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1190 ^^^
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1191 start pointing here
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1192 */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1193 static int
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1194 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	1195 asdl_seq kwonlyargs, asdl_seq kwdefaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1196 {
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1197 PyObject *argname;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1198 node *ch;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1199 expr_ty expression, annotation;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1200 arg_ty arg;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1201 int i = start;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1202 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	1203
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1204 if (kwonlyargs == NULL) {
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1205 ast_error(CHILD(n, start), "named arguments must follow bare *");
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1206 return -1;
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1207 }
aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1208 assert(kwdefaults != NULL);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1209 while (i < NCH(n)) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1210 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1211 switch (TYPE(ch)) {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1212 case vfpdef:
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1213 case tfpdef:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1214 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	1215 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	1216 if (!expression)
64185 38ceeae0d1f0 Merged revisions 84214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64183 diff changeset	1217 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1218 asdl_seq_SET(kwdefaults, j, expression);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1219 i += 2; /* '=' and test */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1220 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1221 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	1222 asdl_seq_SET(kwdefaults, j, NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1223 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1224 if (NCH(ch) == 3) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1225 /* ch is NAME ':' test */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1226 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	1227 if (!annotation)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1228 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1229 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1230 else {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1231 annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1232 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1233 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	1234 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	1235 if (!argname)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1236 goto error;
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	1237 if (forbidden_name(argname, ch, 0))
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	1238 goto error;
49852 30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1239 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	1240 if (!arg)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	1241 goto error;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1242 asdl_seq_SET(kwonlyargs, j++, arg);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1243 i += 2; /* the name and the comma */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1244 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1245 case DOUBLESTAR:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1246 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1247 default:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1248 ast_error(ch, "unexpected node");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1249 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1250 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1251 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1252 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1253 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1254 return -1;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1255 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1257 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1258
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1259 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1260 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1261 {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1262 /* 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	1263 and varargslist (lambda definition).
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1264
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1265 parameters: '(' [typedargslist] ')'
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1266 typedargslist: ((tfpdef ['=' test] ',')*
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1267 ('' [tfpdef] (',' tfpdef ['=' test]) [',' '**' tfpdef]
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1268 \| '**' tfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1269 \| tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1270 tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1271 varargslist: ((vfpdef ['=' test] ',')*
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1272 ('' [vfpdef] (',' vfpdef ['=' test]) [',' '**' vfpdef]
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1273 \| '**' vfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1274 \| vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1275 vfpdef: NAME
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 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	1278 int nposdefaults = 0, found_default = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1279 asdl_seq posargs, posdefaults, kwonlyargs, kwdefaults;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1280 identifier vararg = NULL, kwarg = NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1281 arg_ty arg;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1282 expr_ty varargannotation = NULL, kwargannotation = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1283 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1284
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1285 if (TYPE(n) == parameters) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1286 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	1287 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	1288 NULL, c->c_arena);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1289 n = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1290 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1291 assert(TYPE(n) == typedargslist \|\| TYPE(n) == varargslist);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1292
48515 dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1293 /* 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	1294 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	1295 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	1296 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297 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	1298 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1299 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	1300 /* skip star */
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1301 i++;
48515 dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1302 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	1303 (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	1304 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	1305 i++;
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1306 }
dbc2b7ad0c22 Fix uninitialized memory read for cases like def(f, ): pass Jeremy Hylton <jeremy@alum.mit.edu>* parents: 48397 diff changeset	1307 break;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1308 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1309 if (TYPE(ch) == DOUBLESTAR) break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1310 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	1311 if (TYPE(ch) == EQUAL) nposdefaults++;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1312 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1313 /* 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	1314 defaults for keyword only args */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1315 for ( ; i < NCH(n); ++i) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1316 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1317 if (TYPE(ch) == DOUBLESTAR) break;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1318 if (TYPE(ch) == tfpdef \|\| TYPE(ch) == vfpdef) nkwonlyargs++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1319 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1320 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	1321 if (!posargs && nposargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1322 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1323 kwonlyargs = (nkwonlyargs ?
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1324 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	1325 if (!kwonlyargs && nkwonlyargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1326 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1327 posdefaults = (nposdefaults ?
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1328 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	1329 if (!posdefaults && nposdefaults)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1330 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1331 /* 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	1332 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	1333 - 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	1334 kwdefaults = (nkwonlyargs ?
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1335 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	1336 if (!kwdefaults && nkwonlyargs)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1337 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1338
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1339 if (nposargs + nkwonlyargs > 255) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1340 ast_error(n, "more than 255 arguments");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1341 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1342 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1343
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1344 /* tfpdef: NAME [':' test]
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1345 vfpdef: NAME
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1346 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1348 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	1349 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 while (i < NCH(n)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1351 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1352 switch (TYPE(ch)) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1353 case tfpdef:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1354 case vfpdef:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355 /* 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	1356 anything other than EQUAL or a comma? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1357 /* 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	1358 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	1359 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	1360 if (!expression)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1361 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1362 assert(posdefaults != NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1363 asdl_seq_SET(posdefaults, j++, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 i += 2;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1365 found_default = 1;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1366 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1367 else if (found_default) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1368 ast_error(n,
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1369 "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	1370 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1371 }
75543 fe0b2681a42f use correct naming convention Benjamin Peterson <benjamin@python.org> parents: 70916 diff changeset	1372 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	1373 if (!arg)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1374 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1375 asdl_seq_SET(posargs, k++, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1376 i += 2; /* the name and the comma */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1377 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1378 case STAR:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1379 if (i+1 >= NCH(n)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1380 ast_error(CHILD(n, i),
44246 aac33ee1a8fc Issue #1573, second attempt: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 44237 diff changeset	1381 "named arguments must follow bare *");
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1382 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1383 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1384 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	1385 if (TYPE(ch) == COMMA) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1386 int res = 0;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1387 i += 2; /* now follows keyword only arguments */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1388 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1389 kwonlyargs, kwdefaults);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1390 if (res == -1) return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1391 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	1392 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1393 else {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1394 vararg = NEW_IDENTIFIER(CHILD(ch, 0));
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1395 if (!vararg)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1396 return NULL;
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	1397 if (forbidden_name(vararg, CHILD(ch, 0), 0))
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	1398 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1399 if (NCH(ch) > 1) {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1400 /* 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	1401 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	1402 if (!varargannotation)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1403 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1404 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1405 i += 3;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1406 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	1407 \|\| TYPE(CHILD(n, i)) == vfpdef)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1408 int res = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1409 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1410 kwonlyargs, kwdefaults);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1411 if (res == -1) return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1412 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	1413 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1414 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 case DOUBLESTAR:
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1417 ch = CHILD(n, i+1); /* tfpdef */
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41716 diff changeset	1418 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	1419 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	1420 if (!kwarg)
38ceeae0d1f0 Merged revisions 84214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 64183 diff changeset	1421 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1422 if (NCH(ch) > 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1423 /* 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	1424 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	1425 if (!kwargannotation)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1426 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1427 }
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	1428 if (forbidden_name(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	1429 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1430 i += 3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1432 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1433 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 "unexpected node in varargslist: %d @ %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435 TYPE(ch), i);
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1436 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1437 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1439 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	1440 kwargannotation, posdefaults, kwdefaults, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1441 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1442
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1443 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 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	1445 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1446 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1447 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	1448 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1449 int i;
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 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	1452
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1453 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	1454 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	1455
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1456 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457 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	1458 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	1459 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	1460 if (!e)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1461 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1463 for (i = 2; i < NCH(n); i+=2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1464 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	1465 if (!id)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1466 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1467 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	1468 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1469 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1470 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1471
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1473 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1474
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1479 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1480 expr_ty name_expr;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1481
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1482 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1483 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1484 REQ(RCHILD(n, -1), NEWLINE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1485
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1486 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	1487 if (!name_expr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1488 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1489
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1490 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	1491 d = name_expr;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1492 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1493 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1494 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	1495 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	1496 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	1497 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1498 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1499 name_expr = NULL;
35742 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 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1502 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	1503 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1504 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1505 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1506 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1507
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1508 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1512 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1513 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1514 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	1515 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 int i;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1517
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518 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	1519 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	1520 if (!decorator_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1522
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 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	1524 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	1525 if (!d)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1526 return NULL;
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1527 asdl_seq_SET(decorator_seq, i, d);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1528 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1529 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1531
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1532 static stmt_ty
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1533 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	1534 {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1535 /* 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	1536 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1537 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1538 asdl_seq *body;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1539 expr_ty returns = NULL;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1540 int name_i = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1541
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1542 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1543
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1544 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1545 if (!name)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1546 return NULL;
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	1547 if (forbidden_name(name, CHILD(n, name_i), 0))
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	1548 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1549 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	1550 if (!args)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1551 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1552 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	1553 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	1554 if (!returns)
64183 54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	1555 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1556 name_i += 2;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1557 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1558 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	1559 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1560 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1561
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1562 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	1563 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1564 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1565
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1566 static stmt_ty
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1567 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	1568 {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1569 /* decorated: decorators (classdef \| funcdef) */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1570 stmt_ty thing = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1571 asdl_seq *decorator_seq = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1572
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1573 REQ(n, decorated);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1574
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1575 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	1576 if (!decorator_seq)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1577 return NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1578
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1579 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	1580 TYPE(CHILD(n, 1)) == classdef);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1581
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1582 if (TYPE(CHILD(n, 1)) == funcdef) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1583 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	1584 } 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	1585 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	1586 }
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	1587 /* 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	1588 * 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	1589 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	1590 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	1591 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	1592 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1593 return thing;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1594 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1595
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1596 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1597 ast_for_lambdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1598 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1599 /* lambdef: 'lambda' [varargslist] ':' test
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1600 lambdef_nocond: 'lambda' [varargslist] ':' test_nocond */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1601 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1602 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1603
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1604 if (NCH(n) == 3) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1605 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	1606 NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1607 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1608 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1609 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	1610 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1611 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1612 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1613 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1614 args = ast_for_arguments(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1615 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1616 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1617 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	1618 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1619 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1620 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1621
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1622 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	1623 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1624
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1625 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1626 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	1627 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1628 /* 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	1629 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	1630
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	1631 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	1632 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	1633 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1634 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1635 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	1636 if (!expression)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1637 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1638 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	1639 if (!orelse)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1640 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	1641 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	1642 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1643 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1644
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1645 /*
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1646 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	1647
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1648 Helper for ast_for_comprehension().
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1649 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1650
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 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	1652 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	1653 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1654 int n_fors = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1655
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1656 count_comp_for:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1657 n_fors++;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1658 REQ(n, comp_for);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1659 if (NCH(n) == 5)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1660 n = CHILD(n, 4);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1661 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1662 return n_fors;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1663 count_comp_iter:
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1664 REQ(n, comp_iter);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1665 n = CHILD(n, 0);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1666 if (TYPE(n) == comp_for)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1667 goto count_comp_for;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1668 else if (TYPE(n) == comp_if) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1669 if (NCH(n) == 3) {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1670 n = CHILD(n, 2);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1671 goto count_comp_iter;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1672 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1673 else
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1674 return n_fors;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1675 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1676
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1677 /* Should never be reached */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1678 PyErr_SetString(PyExc_SystemError,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1679 "logic error in count_comp_fors");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1680 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1681 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1682
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1683 /* 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	1684
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1685 Helper for ast_for_comprehension().
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1686 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1687
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1688 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	1689 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	1690 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1691 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1692
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1693 while (1) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1694 REQ(n, comp_iter);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1695 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	1696 return n_ifs;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1697 n = CHILD(n, 0);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1698 REQ(n, comp_if);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1699 n_ifs++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1700 if (NCH(n) == 2)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1701 return n_ifs;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1702 n = CHILD(n, 2);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	1703 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1704 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1705
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1706 static asdl_seq *
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1707 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	1708 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1709 int i, n_fors;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1710 asdl_seq *comps;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1711
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	1712 n_fors = count_comp_fors(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1713 if (n_fors == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1714 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	1715
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1716 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	1717 if (!comps)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1718 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	1719
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1720 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	1721 comprehension_ty comp;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1722 asdl_seq *t;
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1723 expr_ty expression, first;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1724 node *for_ch;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1725
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1726 REQ(n, comp_for);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1727
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1728 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	1729 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	1730 if (!t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1731 return NULL;
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1732 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	1733 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1734 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	1735
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1736 /* 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	1737 (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	1738 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	1739 if (NCH(for_ch) == 1)
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1740 comp = comprehension(first, expression, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1741 else
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1742 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	1743 c->c_arena),
d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	1744 expression, NULL, c->c_arena);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1745 if (!comp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1746 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	1747
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1748 if (NCH(n) == 5) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1749 int j, n_ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1750 asdl_seq *ifs;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1751
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1752 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	1753 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	1754 if (n_ifs == -1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1755 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	1756
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	1757 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	1758 if (!ifs)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1759 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	1760
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1761 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	1762 REQ(n, comp_iter);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1763 n = CHILD(n, 0);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1764 REQ(n, comp_if);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1765
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1766 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	1767 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	1768 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1769 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	1770 if (NCH(n) == 3)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1771 n = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1772 }
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1773 /* 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	1774 if (TYPE(n) == comp_iter)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1775 n = CHILD(n, 0);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1776 comp->ifs = ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1777 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1778 asdl_seq_SET(comps, i, comp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1779 }
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1780 return comps;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1781 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1782
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1783 static expr_ty
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1784 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	1785 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1786 /* testlist_comp: test ( comp_for \| (',' test)* [','] )
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1787 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	1788 expr_ty elt;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1789 asdl_seq *comps;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1790
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1791 assert(NCH(n) > 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1792
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1793 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	1794 if (!elt)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1795 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1796
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1797 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	1798 if (!comps)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1799 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1800
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1801 if (type == COMP_GENEXP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1802 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	1803 else if (type == COMP_LISTCOMP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1804 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	1805 else if (type == COMP_SETCOMP)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1806 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	1807 else
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1808 /* Should never happen */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1809 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1810 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 static expr_ty
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1813 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	1814 {
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1815 expr_ty key, value;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1816 asdl_seq *comps;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1817
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1818 assert(NCH(n) > 3);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1819 REQ(CHILD(n, 1), COLON);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1820
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1821 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	1822 if (!key)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1823 return NULL;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1824 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	1825 if (!value)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1826 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1827
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1828 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	1829 if (!comps)
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1830 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1831
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1832 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	1833 }
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1834
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1835 static expr_ty
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1836 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	1837 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1838 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	1839 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	1840 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1841
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1842 static expr_ty
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1843 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	1844 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1845 assert(TYPE(n) == (testlist_comp));
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1846 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	1847 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1848
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1849 static expr_ty
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1850 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	1851 {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1852 assert(TYPE(n) == (dictorsetmaker));
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 42084 diff changeset	1853 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	1854 }
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1855
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1856
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1857 static expr_ty
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1860 /* 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	1861 \| '{' [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	1862 \| '...' \| 'None' \| 'True' \| 'False'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1863 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 node *ch = CHILD(n, 0);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1865 int bytesmode = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1866
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 switch (TYPE(ch)) {
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1868 case NAME: {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1869 /* All names start in Load context, but may later be
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1870 changed. */
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1871 PyObject *name = NEW_IDENTIFIER(ch);
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1872 if (!name)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1873 return NULL;
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	1874 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	1875 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1876 case STRING: {
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1877 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	1878 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	1879 if (PyErr_ExceptionMatches(PyExc_UnicodeError)) {
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1880 PyObject type, value, tback, errstr;
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1881 PyErr_Fetch(&type, &value, &tback);
49797 f403d94157b2 Merged revisions 67320 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49697 diff changeset	1882 errstr = PyObject_Str(value);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1883 if (errstr) {
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1884 char *s = "";
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1885 char buf[128];
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48515 diff changeset	1886 s = _PyUnicode_AsString(errstr);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1887 PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1888 ast_error(n, buf);
49797 f403d94157b2 Merged revisions 67320 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49697 diff changeset	1889 Py_DECREF(errstr);
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1890 } else {
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1891 ast_error(n, "(unicode error) unknown error");
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1892 }
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1893 Py_DECREF(type);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1894 Py_DECREF(value);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1895 Py_XDECREF(tback);
bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1896 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1897 return NULL;
42309 bd6acfdb47d2 Merged revisions 56301-56442 via svnmerge from Guido van Rossum <guido@python.org> parents: 42193 diff changeset	1898 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1899 PyArena_AddPyObject(c->c_arena, str);
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1900 if (bytesmode)
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1901 return Bytes(str, LINENO(n), n->n_col_offset, c->c_arena);
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1902 else
0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	1903 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	1904 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1905 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	1906 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	1907 if (!pynum)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1908 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	1909
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1910 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	1911 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	1912 }
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	1913 case ELLIPSIS: /* Ellipsis */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1914 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	1915 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	1916 ch = CHILD(n, 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1917
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1918 if (TYPE(ch) == RPAR)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1919 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	1920
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1921 if (TYPE(ch) == yield_expr)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1922 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	1923
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1924 /* 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	1925 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	1926 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	1927
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1928 return ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 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	1930 ch = CHILD(n, 1);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1931
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1932 if (TYPE(ch) == RSQB)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1933 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	1934
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1935 REQ(ch, testlist_comp);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1936 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	1937 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	1938 if (!elts)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1939 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	1940
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1941 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	1942 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1943 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1944 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1945 case LBRACE: {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1946 /* dictorsetmaker: test ':' test (',' test ':' test)* [','] \|
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1947 * test (gen_for \| (',' test)* [',']) */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1948 int i, size;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1949 asdl_seq keys, values;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1950
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1951 ch = CHILD(n, 1);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1952 if (TYPE(ch) == RBRACE) {
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1953 /* it's an empty dict */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1954 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	1955 } 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	1956 /* it's a simple set */
41482 a5e410639e24 Make it compile with C89. Guido van Rossum <guido@python.org> parents: 41464 diff changeset	1957 asdl_seq *elts;
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1958 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	1959 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	1960 if (!elts)
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1961 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1962 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	1963 expr_ty expression;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1964 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	1965 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1966 return NULL;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1967 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	1968 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1969 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	1970 } 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	1971 /* it's a set comprehension */
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	1972 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	1973 } 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	1974 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	1975 } else {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1976 /* it's a dict */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1977 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	1978 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	1979 if (!keys)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1980 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1981
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1982 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	1983 if (!values)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1984 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1985
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1986 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	1987 expr_ty expression;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	1988
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1989 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	1990 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1991 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	1992
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1993 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	1994
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1995 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	1996 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1997 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1998
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1999 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	2000 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	2001 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	2002 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 default:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2005 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	2006 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2009
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2010 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2011 ast_for_slice(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2013 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2014 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 /*
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	2019 subscript: test \| [test] ':' [test] [sliceop]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 if (NCH(n) == 1 && TYPE(ch) == test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 /* '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	2025 other vars */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2026 step = ast_for_expr(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 if (!step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2029
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2030 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2032
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2033 if (TYPE(ch) == test) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2034 lower = ast_for_expr(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2035 if (!lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036 return NULL;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2039 /* 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	2040 if (TYPE(ch) == COLON) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2041 if (NCH(n) > 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2042 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2043
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2044 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2045 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2046 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2047 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2048 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2049 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2050 } 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	2051 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2052
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2053 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2054 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2055 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2056 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2057 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2058 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2059
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2060 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2061 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	2062 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	2063 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	2064 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	2065 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	2066 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	2067 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	2068 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2069 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2070 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2071
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	2072 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2073 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2074
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2075 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2076 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2077 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2078 /* 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	2079 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	2080 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	2081 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2082
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2083 int i, nops;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2084 expr_ty expr1, expr2, result;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2085 operator_ty newoperator;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2086
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2087 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	2088 if (!expr1)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2089 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2090
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2091 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	2092 if (!expr2)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2093 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2094
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2095 newoperator = get_operator(CHILD(n, 1));
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2096 if (!newoperator)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2097 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2098
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2099 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	2100 c->c_arena);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2101 if (!result)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2102 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2104 nops = (NCH(n) - 1) / 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2105 for (i = 1; i < nops; i++) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2106 expr_ty tmp_result, tmp;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2107 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	2108
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2109 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	2110 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2111 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2113 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	2114 if (!tmp)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2115 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2116
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2117 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	2118 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	2119 c->c_arena);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2120 if (!tmp_result)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2121 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2122 result = tmp_result;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2123 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	2124 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2125 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2127 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2128 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	2129 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2130 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2131 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2132 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2133 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2134 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2135 if (TYPE(CHILD(n, 0)) == LPAR) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2136 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	2137 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	2138 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	2139 else
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2140 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	2141 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2142 else if (TYPE(CHILD(n, 0)) == DOT ) {
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2143 PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2144 if (!attr_id)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2145 return NULL;
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2146 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	2147 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	2148 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2149 else {
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	2150 REQ(CHILD(n, 0), LSQB);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2151 REQ(CHILD(n, 2), RSQB);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2152 n = CHILD(n, 1);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2153 if (NCH(n) == 1) {
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2154 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	2155 if (!slc)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2156 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	2157 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	2158 c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2159 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2160 else {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2161 /* 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	2162 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	2163 no slice features.
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2164 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2165 int j;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2166 slice_ty slc;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2167 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	2168 int simple = 1;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2169 asdl_seq slices, elts;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2170 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	2171 if (!slices)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2172 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2173 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	2174 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	2175 if (!slc)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2176 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2177 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	2178 simple = 0;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2179 asdl_seq_SET(slices, j / 2, slc);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2180 }
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2181 if (!simple) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2182 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	2183 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	2184 }
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2185 /* extract Index values and put them in a Tuple */
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2186 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	2187 if (!elts)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36786 diff changeset	2188 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2189 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2190 slc = (slice_ty)asdl_seq_GET(slices, j);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2191 assert(slc->kind == Index_kind && slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2192 asdl_seq_SET(elts, j, slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2193 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2194 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	2195 if (!e)
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2196 return NULL;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	2197 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	2198 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	2199 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2200 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2201 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2202
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2203 static expr_ty
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2204 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	2205 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2206 expr_ty expression;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2207
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2208 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	2209 if (!expression)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2210 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2211
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2212 switch (TYPE(CHILD(n, 0))) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2213 case PLUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2214 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	2215 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2216 case MINUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2217 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	2218 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2219 case TILDE:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2220 return UnaryOp(Invert, expression, LINENO(n),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2221 n->n_col_offset, c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2222 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2223 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2224 TYPE(CHILD(n, 0)));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2225 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2226 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2227
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2228 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2229 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	2230 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2231 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2232 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2233 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2234 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2235 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2236 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	2237 if (!e)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2238 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2239 if (NCH(n) == 1)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2240 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2241 for (i = 1; i < NCH(n); i++) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2242 node *ch = CHILD(n, i);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2243 if (TYPE(ch) != trailer)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2244 break;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2245 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	2246 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2247 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2248 tmp->lineno = e->lineno;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2249 tmp->col_offset = e->col_offset;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2250 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2251 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2252 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	2253 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	2254 if (!f)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2255 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	2256 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	2257 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2258 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2259 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2260 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2261 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2262 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2263
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2264 static expr_ty
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2265 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	2266 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2267 expr_ty tmp;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2268 REQ(n, star_expr);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2269
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2270 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	2271 if (!tmp)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2272 return NULL;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2273
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2274 /* 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	2275 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	2276 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2277
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2278
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2279 /* 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	2280 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2282 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2283 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2284 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2285 /* 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	2286 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	2287 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	2288 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2291 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2292 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2293 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2294 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2295 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2296 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2297 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2298 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2299 power: atom trailer* ('*' factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2300 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2301
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2302 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2303 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2304
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2305 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2306 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2307 case test:
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2308 case test_nocond:
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	2309 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	2310 TYPE(CHILD(n, 0)) == lambdef_nocond)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2311 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	2312 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	2313 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	2314 /* Fallthrough */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2315 case or_test:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2316 case and_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2317 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2318 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2319 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2320 }
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	2321 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	2322 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2323 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2324 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2325 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	2326 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2327 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2328 asdl_seq_SET(seq, i / 2, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2329 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2330 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	2331 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	2332 c->c_arena);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2333 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	2334 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	2335 case not_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2336 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2337 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2338 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2339 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2340 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2341 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	2342 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2343 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2344
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	2345 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	2346 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2347 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2348 case comparison:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2349 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2350 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2351 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2352 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2353 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2354 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	2355 asdl_int_seq *ops;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2356 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	2357 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	2358 if (!ops)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2359 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	2360 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	2361 if (!cmps) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2362 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2363 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2364 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	2365 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2366
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	2367 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	2368 if (!newoperator) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2369 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2370 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2371
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2372 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	2373 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2374 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2375 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2376
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	2377 asdl_seq_SET(ops, i / 2, newoperator);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2378 asdl_seq_SET(cmps, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2379 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2380 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	2381 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2382 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2383 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2384
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	2385 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	2386 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2387 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2388 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2389
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41698 diff changeset	2390 case star_expr:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	2391 return ast_for_starred(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2392 /* 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	2393 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	2394 reuse the code for each type of operator.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2395 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2396 case expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2397 case xor_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2398 case and_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2399 case shift_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2400 case arith_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2401 case term:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2402 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2403 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2404 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2405 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2406 return ast_for_binop(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2407 case yield_expr: {
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2408 node *an = NULL;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2409 node *en = NULL;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2410 int is_from = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2411 expr_ty exp = NULL;
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2412 if (NCH(n) > 1)
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2413 an = CHILD(n, 1); /* yield_arg */
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2414 if (an) {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2415 en = CHILD(an, NCH(an) - 1);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2416 if (NCH(an) == 2) {
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2417 is_from = 1;
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2418 exp = ast_for_expr(c, en);
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2419 }
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2420 else
d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2421 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	2422 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2423 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2424 }
74391 e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	2425 if (is_from)
e1177b9167ce make YieldFrom its own distinct from Yield (closes #13780) Benjamin Peterson <benjamin@python.org> parents: 74356 diff changeset	2426 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	2427 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	2428 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2429 case factor:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2430 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2431 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2432 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2433 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2434 return ast_for_factor(c, n);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2435 case power:
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	2436 return ast_for_power(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2437 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2438 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	2439 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2440 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2441 /* 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	2442 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2443 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2444
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2445 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2446 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	2447 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2448 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2449 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2450 \| '**' test)
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2451 argument: [test '='] (test) [comp_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2452 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2453
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2454 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2455 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2456 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2457 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2458
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2459 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2460
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2461 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2462 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2463 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2464 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	2465 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2466 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2467 if (NCH(ch) == 1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2468 nargs++;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2469 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	2470 ngens++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2471 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2472 nkeywords++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2473 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2474 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2475 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2476 ast_error(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	2477 "if not sole argument");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2478 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2479 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2480
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2481 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2482 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2483 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2484 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2485
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	2486 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	2487 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	2488 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	2489 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2490 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	2491 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2492 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2493 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2494 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	2495 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2496 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2497 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2498 if (NCH(ch) == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2499 if (nkeywords) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2500 ast_error(CHILD(ch, 0),
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2501 "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	2502 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2503 }
48777 6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2504 if (vararg) {
6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2505 ast_error(CHILD(ch, 0),
6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2506 "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	2507 return NULL;
6abada05c313 allow keyword args after args in a function call Benjamin Peterson <benjamin@python.org>* parents: 48660 diff changeset	2508 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2509 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2510 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	2511 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2512 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	2513 }
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2514 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	2515 e = ast_for_genexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2516 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	2517 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2518 asdl_seq_SET(args, nargs++, e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2519 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2520 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2521 keyword_ty kw;
48397 42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2522 identifier key, tmp;
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2523 int k;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2524
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2525 /* 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	2526 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2527 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	2528 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2529 /* 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	2530 * 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	2531 * 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	2532 * then is very confusing.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2533 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2534 if (e->kind == Lambda_kind) {
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2535 ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2536 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2537 } else if (e->kind != Name_kind) {
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2538 ast_error(CHILD(ch, 0), "keyword can't be an expression");
ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2539 return NULL;
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	2540 } else if (forbidden_name(e->v.Name.id, ch, 1)) {
74462 ffb58df8f9ea fix indentation Benjamin Peterson <benjamin@python.org> parents: 74460 diff changeset	2541 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2542 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2543 key = e->v.Name.id;
48397 42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2544 for (k = 0; k < nkeywords; k++) {
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2545 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	2546 if (!PyUnicode_Compare(tmp, key)) {
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2547 ast_error(CHILD(ch, 0), "keyword argument repeated");
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2548 return NULL;
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2549 }
42309437f1ca Merged revisions 64622 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48330 diff changeset	2550 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2551 e = ast_for_expr(c, CHILD(ch, 2));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2552 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	2553 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2554 kw = keyword(key, e, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2555 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	2556 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2557 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	2558 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2559 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2560 else if (TYPE(ch) == STAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2561 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	2562 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	2563 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2564 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2565 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2566 else if (TYPE(ch) == DOUBLESTAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2567 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	2568 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	2569 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2570 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2571 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2572 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2573
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2574 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	2575 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2576
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2577 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	2578 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	2579 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2580 /* 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	2581 /* testlist: test (',' test)* [','] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2582 assert(NCH(n) > 0);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2583 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	2584 if (NCH(n) > 1)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 41235 diff changeset	2585 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	2586 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2587 else {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2588 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	2589 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	2590 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2591 if (NCH(n) == 1)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2592 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2593 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2594 asdl_seq *tmp = seq_for_testlist(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2595 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2596 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2597 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	2598 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2599 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2600
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2601 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2602 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	2603 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2604 REQ(n, expr_stmt);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56951 diff changeset	2605 /* 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	2606 \| ('=' (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	2607 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	2608 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2609 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2610 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2611 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2612
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2613 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2614 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	2615 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2616 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2617
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2618 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	2619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2620 else if (TYPE(CHILD(n, 1)) == augassign) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 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	2622 operator_ty newoperator;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2623 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2625 expr1 = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2626 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2627 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	2628 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	2629 return NULL;
56363 4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2630 /* 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	2631 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	2632 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	2633 those. */
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2634 switch (expr1->kind) {
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2635 case Name_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2636 case Attribute_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2637 case Subscript_kind:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2638 break;
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2639 default:
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2640 ast_error(ch, "illegal expression for augmented assignment");
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2641 return NULL;
4f49bd2e7c58 Merged revisions 75224 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54703 diff changeset	2642 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2643
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2644 ch = CHILD(n, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2645 if (TYPE(ch) == testlist)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2646 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	2647 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2648 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	2649 if (!expr2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2650 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2651
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	2652 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	2653 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2654 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2655
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2656 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	2657 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2658 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2659 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2660 asdl_seq *targets;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2661 node *value;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2662 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2663
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2664 /* a normal assignment */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2665 REQ(CHILD(n, 1), EQUAL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2666 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	2667 if (!targets)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2668 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2669 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	2670 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2671 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2672 if (TYPE(ch) == yield_expr) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2673 ast_error(ch, "assignment to yield expression not possible");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2674 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2675 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2676 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	2677 if (!e)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	2678 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2679
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2680 /* 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	2681 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	2682 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2683
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2684 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	2685 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2686 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	2687 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	2688 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	2689 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2690 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	2691 if (!expression)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2692 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2693 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	2694 }
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
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	2697
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2698 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	2699 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	2700 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2701 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2702 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2703 expr_ty e;
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 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2706
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	2707 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	2708 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2709 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2710 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	2711 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	2712 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2713 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2714 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	2715 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	2716 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2717 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2718 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2719 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2720
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2721 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2722 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	2723 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2724 asdl_seq *expr_list;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2725
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2726 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2727 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2728
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2729 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	2730 if (!expr_list)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2731 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	2732 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	2733 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2734
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2735 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2736 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	2737 {
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 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	2740 \| yield_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2741 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2742 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2743 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2744 yield_stmt: yield_expr
74356 d64ac9ab4cd0 Implement PEP 380 - 'yield from' (closes #11682) Nick Coghlan <ncoghlan@gmail.com> parents: 74354 diff changeset	2745 yield_expr: 'yield' testlist \| 'yield' 'from' test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2746 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2747 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2748 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2749
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2750 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2751 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2752 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2753 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	2754 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	2755 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	2756 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	2757 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	2758 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	2759 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2760 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	2761 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	2762 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2763 case return_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2764 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	2765 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	2766 else {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2767 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	2768 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2769 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	2770 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	2771 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2772 case raise_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2773 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	2774 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	2775 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	2776 expr_ty cause = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2777 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	2778 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2779 return NULL;
43102 981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2780 if (NCH(ch) == 4) {
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2781 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	2782 if (!cause)
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2783 return NULL;
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2784 }
981ecc526703 Issue #1066: implement PEP 3109, 2/3 of PEP 3134. Collin Winter <collinw@gmail.com> parents: 42597 diff changeset	2785 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	2786 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2787 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2788 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2789 "unexpected flow_stmt: %d", TYPE(ch));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2790 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2791 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2792
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2793 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	2794 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2795 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2796
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2797 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	2798 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	2799 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2800 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2801 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	2802 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2803 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2804 */
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	2805 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	2806
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2807 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2808 switch (TYPE(n)) {
70916 8ece0dacd8e8 fix indentation Benjamin Peterson <benjamin@python.org> parents: 69290 diff changeset	2809 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	2810 node *name_node = CHILD(n, 0);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2811 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	2812 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	2813 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	2814 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2815 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	2816 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	2817 str = NEW_IDENTIFIER(str_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2818 if (!str)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2819 return NULL;
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	2820 if (store && forbidden_name(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	2821 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2822 }
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	2823 else {
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	2824 if (forbidden_name(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	2825 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	2826 }
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2827 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	2828 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2829 case dotted_as_name:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2830 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2831 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2832 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2833 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2834 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	2835 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	2836 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	2837 if (!a)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2838 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2839 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	2840 a->asname = NEW_IDENTIFIER(asname_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2841 if (!a->asname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2842 return NULL;
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	2843 if (forbidden_name(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	2844 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2845 return a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2846 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2847 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2848 case dotted_name:
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2849 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	2850 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	2851 name = NEW_IDENTIFIER(name_node);
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2852 if (!name)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2853 return NULL;
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	2854 if (store && forbidden_name(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	2855 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2856 return alias(name, NULL, c->c_arena);
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	2857 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2858 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2859 /* 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	2860 int i;
36241 557e9b6ee7e1 alias_for_import_name(): Dueling compiler warnings ;-) Tim Peters <tim.peters@gmail.com> parents: 36231 diff changeset	2861 size_t len;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2862 char *s;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2863 PyObject *uni;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2864
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2865 len = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2866 for (i = 0; i < NCH(n); i += 2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2867 /* length of string plus one for the dot */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2868 len += strlen(STR(CHILD(n, i))) + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2869 len--; /* the last name doesn't have a dot */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	2870 str = PyBytes_FromStringAndSize(NULL, len);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2871 if (!str)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2872 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	2873 s = PyBytes_AS_STRING(str);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2874 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2875 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2876 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2877 char *sch = STR(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2878 strcpy(s, STR(CHILD(n, i)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2879 s += strlen(sch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2880 *s++ = '.';
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2881 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2882 --s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2883 *s = '\0';
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2884 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	2885 PyBytes_GET_SIZE(str),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2886 NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2887 Py_DECREF(str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2888 if (!uni)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2889 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2890 str = uni;
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2891 PyUnicode_InternInPlace(&str);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2892 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	2893 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2894 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2895 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2896 case STAR:
42013 cd125fe83051 Make identifiers str (not str8) objects throughout. Martin v. Löwis <martin@v.loewis.de> parents: 41969 diff changeset	2897 str = PyUnicode_InternFromString("*");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2898 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	2899 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2900 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2901 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2902 "unexpected import name: %d", TYPE(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2903 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2904 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2905
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2906 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2907 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2908 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2909
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2910 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2911 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	2912 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2913 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2914 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2915 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	2916 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	2917 'import' ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2918 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2919 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2920 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2921 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2922 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2923
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2924 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	2925 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	2926 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2927 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2928 if (TYPE(n) == import_name) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2929 n = CHILD(n, 1);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2930 REQ(n, dotted_as_names);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2931 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	2932 if (!aliases)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2933 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2934 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	2935 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	2936 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2937 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2938 asdl_seq_SET(aliases, i / 2, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2939 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2940 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	2941 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2942 else if (TYPE(n) == import_from) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2943 int n_children;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2944 int idx, ndots = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2945 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	2946 identifier modname = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	2947
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2948 /* 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	2949 optional module name */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2950 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	2951 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	2952 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	2953 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	2954 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2955 idx++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2956 break;
41235 6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2957 } 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	2958 /* 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	2959 ndots += 3;
6c8c33a43a15 "from ... import x" should not be a syntax error... make Georg Brandl <georg@python.org> parents: 41230 diff changeset	2960 continue;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2961 } 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	2962 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2963 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2964 ndots++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2965 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2966 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	2967 switch (TYPE(CHILD(n, idx))) {
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2968 case STAR:
e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2969 /* from ... import * */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2970 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2971 n_children = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2972 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2973 case LPAR:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2974 /* from ... import (x, y, z) */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2975 n = CHILD(n, idx + 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2976 n_children = NCH(n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2977 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2978 case import_as_names:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2979 /* from ... import x, y, z */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2980 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2981 n_children = NCH(n);
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2982 if (n_children % 2 == 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2983 ast_error(n, "trailing comma not allowed without"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2984 " surrounding parentheses");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2985 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2986 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2987 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2988 default:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2989 ast_error(n, "Unexpected node-type in from-import");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2990 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2991 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2992
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2993 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	2994 if (!aliases)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2995 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2996
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2997 /* 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	2998 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	2999 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	3000 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3001 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3002 asdl_seq_SET(aliases, 0, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3003 }
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	3004 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3005 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	3006 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	3007 if (!import_alias)
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	3008 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3009 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	3010 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3011 }
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	3012 if (mod != NULL)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	3013 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	3014 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	3015 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3016 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3017 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3018 "unknown import statement: starts with command '%s'",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3019 STR(CHILD(n, 0)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3020 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3021 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3022
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3023 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3024 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	3025 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3026 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3027 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3028 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3029 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3030
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3031 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	3032 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	3033 if (!s)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3034 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3035 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	3036 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	3037 if (!name)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3038 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3039 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3040 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	3041 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	3042 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3043
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3044 static stmt_ty
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3045 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	3046 {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3047 /* nonlocal_stmt: 'nonlocal' NAME (',' NAME)* */
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3048 identifier name;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3049 asdl_seq *s;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3050 int i;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3051
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3052 REQ(n, nonlocal_stmt);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3053 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	3054 if (!s)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3055 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3056 for (i = 1; i < NCH(n); i += 2) {
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3057 name = NEW_IDENTIFIER(CHILD(n, i));
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3058 if (!name)
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3059 return NULL;
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3060 asdl_seq_SET(s, i / 2, name);
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3061 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3062 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	3063 }
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3064
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3065 static stmt_ty
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3066 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	3067 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3068 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3069 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3070 if (NCH(n) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3071 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	3072 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3073 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3074 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	3075 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3076 else if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3077 expr_ty expr1, expr2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3078
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3079 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3080 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3081 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3082 expr2 = ast_for_expr(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3083 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3084 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3085
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3086 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	3087 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3088 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3089 "improper number of parts to 'assert' statement: %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3090 NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3091 return NULL;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3094 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3095 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3096 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3097 /* 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	3098 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3099 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3100 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3101 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3102
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3103 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3104
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3105 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	3106 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3107 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3108 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3109 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	3110 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3111 /* 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	3112 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	3113 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3114 end = NCH(n) - 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3115 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	3116 end--;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3117 /* 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	3118 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	3119 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3120 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	3121 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3122 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3123 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	3124 }
35742 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 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3127 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	3128 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3129 REQ(ch, stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3130 num = num_stmts(ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3131 if (num == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3132 /* 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	3133 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	3134 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3135 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3136 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	3137 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3138 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3139 int j;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3140 ch = CHILD(ch, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3141 REQ(ch, simple_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3142 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	3143 /* 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	3144 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	3145 assert((j + 1) == NCH(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3146 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3147 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3148 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	3149 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3150 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3151 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	3152 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3153 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3154 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3155 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3156 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3157 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3158 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3159
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3161 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	3162 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3163 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3164 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3165 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3166 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3167
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3168 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3169
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3170 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3171 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3172 asdl_seq *suite_seq;
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 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3175 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3176 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3177 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	3178 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3179 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3180
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3181 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	3182 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3183 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3184
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3185 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3186 /* 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	3187 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3188 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3189 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3190 if (s[2] == 's') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3191 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3192 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3193
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3194 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3195 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3196 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3197 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	3198 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3199 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3200 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	3201 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3202 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3203
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3204 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	3205 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3206 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3207 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	3208 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	3209 expr_ty expression;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3210 asdl_seq *suite_seq;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3211 asdl_seq *orelse = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3212 n_elif = NCH(n) - 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3213 /* 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	3214 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	3215 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	3216 && 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	3217 has_else = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3218 n_elif -= 3;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3219 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3220 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3221
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3222 if (has_else) {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3223 asdl_seq *suite_seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3224
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3225 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	3226 if (!orelse)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3227 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3228 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	3229 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3230 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3231 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	3232 if (!suite_seq)
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3233 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3234 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	3235 if (!suite_seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3236 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3237
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3238 asdl_seq_SET(orelse, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3239 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	3240 LINENO(CHILD(n, NCH(n) - 6)),
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3241 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	3242 c->c_arena));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3243 /* 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	3244 n_elif--;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3245 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3246
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3247 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	3248 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	3249 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	3250 if (!newobj)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3251 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3252 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	3253 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3254 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3255 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	3256 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3257 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3258
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3259 asdl_seq_SET(newobj, 0,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3260 If(expression, suite_seq, orelse,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3261 LINENO(CHILD(n, off)),
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3262 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	3263 orelse = newobj;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3264 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3265 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	3266 if (!expression)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3267 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3268 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	3269 if (!suite_seq)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3270 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3271 return If(expression, suite_seq, orelse,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3272 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	3273 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3274
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3275 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3276 "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	3277 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3278 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3279
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3280 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3281 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	3282 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3283 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3284 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3285
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3286 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3287 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3288 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3289
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3290 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3291 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3292 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3293 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	3294 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3295 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3296 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	3297 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3298 else if (NCH(n) == 7) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3299 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3300 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3301
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3302 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3303 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3304 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3305 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	3306 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3307 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3308 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	3309 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3310 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3311
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3312 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	3313 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3314
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3315 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3316 "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	3317 NCH(n));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3318 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3319 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3320
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3321 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3322 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	3323 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3324 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3325 expr_ty expression;
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3326 expr_ty target, first;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3327 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3328 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3329 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3330
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3331 if (NCH(n) == 9) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3332 seq = ast_for_suite(c, CHILD(n, 8));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3333 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3334 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3335 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3336
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3337 node_target = CHILD(n, 1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3338 _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	3339 if (!_target)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3340 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	3341 /* 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	3342 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	3343 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	3344 if (NCH(node_target) == 1)
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3345 target = first;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3346 else
55912 d4e3af343e32 Merged revisions 74464 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 54954 diff changeset	3347 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	3348
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	3349 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	3350 if (!expression)
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 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	3353 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3354 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3355
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	3356 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	3357 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3358 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3359
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3360 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3361 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	3362 {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3363 /* except_clause: 'except' [test ['as' test]] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3364 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3365 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3366
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3367 if (NCH(exc) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3368 asdl_seq *suite_seq = ast_for_suite(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3369 if (!suite_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3370 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3371
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3372 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	3373 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3374 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3375 else if (NCH(exc) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3376 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3377 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3378
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3379 expression = ast_for_expr(c, CHILD(exc, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3380 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3381 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3382 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	3383 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3384 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3385
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3386 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	3387 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3388 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3389 else if (NCH(exc) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3390 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3391 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	3392 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	3393 if (!e)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3394 return NULL;
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	3395 if (forbidden_name(e, CHILD(exc, 3), 0))
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	3396 return NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3397 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	3398 if (!expression)
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3399 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3400 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	3401 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3402 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3403
46231 81ee270a6eb5 Merged revisions 62047 via svnmerge from Neal Norwitz <nnorwitz@gmail.com> parents: 46120 diff changeset	3404 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	3405 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3406 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3407
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3408 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3409 "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	3410 NCH(exc));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3411 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3412 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3413
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3414 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3415 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	3416 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3417 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	3418 int n_except = (nch - 3)/3;
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3419 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	3420
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3421 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3422
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3423 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	3424 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	3425 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3426
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3427 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	3428 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	3429 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	3430 /* 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	3431 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	3432 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	3433 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	3434 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	3435 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3436 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3437 }
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 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	3440 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	3441 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3442 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3443 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3444 else {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3445 /* 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	3446 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	3447 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	3448 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	3449 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3450 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3451 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3452 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3453 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
35867 f4842f42700b remove useless debug print helper. fix a couple of exceptions Neal Norwitz <nnorwitz@gmail.com> parents: 35799 diff changeset	3454 ast_error(n, "malformed 'try' statement");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3455 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3456 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3457
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3458 if (n_except > 0) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3459 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	3460 /* 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	3461 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	3462 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	3463 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3464
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3465 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	3466 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	3467 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	3468 if (!e)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3469 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3470 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	3471 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3472 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	3473
70499 e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3474 assert(finally != NULL \|\| asdl_seq_LEN(handlers));
e0e663132363 unify TryExcept and TryFinally (closes #12199) Benjamin Peterson <benjamin@python.org> parents: 70438 diff changeset	3475 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	3476 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3477
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3478 /* 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	3479 static withitem_ty
9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3480 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	3481 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3482 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3483
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3484 REQ(n, with_item);
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3485 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	3486 if (!context_expr)
54c9c86ad104 Merged revisions 84209 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 62647 diff changeset	3487 return NULL;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3488 if (NCH(n) == 3) {
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3489 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	3490
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3491 if (!optional_vars) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3492 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3493 }
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	3494 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	3495 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3496 }
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3497 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3498
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3499 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	3500 }
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3501
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3502 /* with_stmt: 'with' with_item (',' with_item)* ':' suite */
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3503 static stmt_ty
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3504 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	3505 {
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3506 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	3507 asdl_seq items, body;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3508
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3509 REQ(n, with_stmt);
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3510
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3511 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	3512 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	3513 if (!items)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3514 return NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3515 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	3516 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	3517 if (!item)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3518 return NULL;
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3519 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	3520 }
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3521
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3522 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	3523 if (!body)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3524 return NULL;
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 53707 diff changeset	3525
70438 9b11cc4e2918 reflect with statements with multiple items in the AST (closes #12106) Benjamin Peterson <benjamin@python.org> parents: 69291 diff changeset	3526 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	3527 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3528
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3529 static stmt_ty
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3530 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	3531 {
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3532 /* classdef: 'class' NAME ['(' arglist ')'] ':' suite */
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3533 PyObject *classname;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3534 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	3535 expr_ty call;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3536
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3537 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3538
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3539 if (NCH(n) == 4) { /* class NAME ':' suite */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3540 s = ast_for_suite(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3541 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3542 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3543 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3544 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3545 return NULL;
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	3546 if (forbidden_name(classname, CHILD(n, 3), 0))
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	3547 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3548 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	3549 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	3550 }
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3551
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3552 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	3553 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	3554 if (!s)
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3555 return NULL;
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3556 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3557 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3558 return NULL;
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	3559 if (forbidden_name(classname, CHILD(n, 3), 0))
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	3560 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3561 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	3562 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	3563 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3564
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3565 /* class NAME '(' arglist ')' ':' suite */
19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3566 /* 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	3567 {
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3568 PyObject *dummy_name;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3569 expr_ty dummy;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3570 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	3571 if (!dummy_name)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3572 return NULL;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3573 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	3574 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	3575 if (!call)
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3576 return NULL;
30d01a5f517e check the return value of NEW_IDENTIFIER in some more places Benjamin Peterson <benjamin@python.org> parents: 49847 diff changeset	3577 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3578 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	3579 if (!s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3580 return NULL;
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3581 classname = NEW_IDENTIFIER(CHILD(n, 1));
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3582 if (!classname)
40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3583 return NULL;
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	3584 if (forbidden_name(classname, CHILD(n, 1), 0))
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	3585 return NULL;
41226 19f7ff443718 Implement PEP 3115 -- new metaclass syntax and semantics. Guido van Rossum <guido@python.org> parents: 40965 diff changeset	3586
49844 40b7277e665f Merged revisions 67373 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49797 diff changeset	3587 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	3588 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	3589 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	3590 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3591
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3592 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3593 ast_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3594 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3595 if (TYPE(n) == stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3596 assert(NCH(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3597 n = CHILD(n, 0);
35742 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 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	3600 assert(num_stmts(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3601 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3602 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3603 if (TYPE(n) == small_stmt) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3604 n = CHILD(n, 0);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3605 /* 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	3606 \| 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	3607 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3608 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3609 case expr_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3610 return ast_for_expr_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3611 case del_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3612 return ast_for_del_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3613 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	3614 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	3615 case flow_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3616 return ast_for_flow_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3617 case import_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3618 return ast_for_import_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3619 case global_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3620 return ast_for_global_stmt(c, n);
40965 30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3621 case nonlocal_stmt:
30e5cb3a55ac Provisional implementation of PEP 3104. Jeremy Hylton <jeremy@alum.mit.edu> parents: 40941 diff changeset	3622 return ast_for_nonlocal_stmt(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3623 case assert_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3624 return ast_for_assert_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3625 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3626 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3627 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3628 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3629 return NULL;
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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3632 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3633 /* 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	3634 \| funcdef \| classdef \| decorated
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3635 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3636 node *ch = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3637 REQ(n, compound_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3638 switch (TYPE(ch)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3639 case if_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3640 return ast_for_if_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3641 case while_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3642 return ast_for_while_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3643 case for_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3644 return ast_for_for_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3645 case try_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3646 return ast_for_try_stmt(c, ch);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3647 case with_stmt:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3648 return ast_for_with_stmt(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3649 case funcdef:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3650 return ast_for_funcdef(c, ch, NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3651 case classdef:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	3652 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	3653 case decorated:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3654 return ast_for_decorated(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3655 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3656 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3657 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3658 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3659 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3660 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3661 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3662 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3663
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3664 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	3665 parsenumber(struct compiling c, const char s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3666 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3667 const char *end;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3668 long x;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3669 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	3670 Py_complex compl;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3671 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3672
50035 4c9844cf2a3f Merged revisions 67595 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 49852 diff changeset	3673 assert(s != NULL);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3674 errno = 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3675 end = s + strlen(s) - 1;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3676 imflag = end == 'j' \|\| end == 'J';
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3677 if (s[0] == '0') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3678 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	3679 if (x < 0 && errno == 0) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3680 return PyLong_FromString((char *)s,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3681 (char **)0,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3682 0);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3683 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3684 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3685 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3686 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	3687 if (*end == '\0') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3688 if (errno != 0)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3689 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	3690 return PyLong_FromLong(x);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3691 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3692 /* XXX Huge floats may silently fail */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3693 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	3694 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	3695 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	3696 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	3697 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	3698 return PyComplex_FromCComplex(compl);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3699 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3700 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3701 {
53707 13a82a710f19 Issue #5914: Add new C-API function PyOS_string_to_double, to complement Mark Dickinson <dickinsm@gmail.com> parents: 50886 diff changeset	3702 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	3703 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	3704 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	3705 return PyFloat_FromDouble(dx);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3706 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3707 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3708
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3709 static PyObject *
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3710 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	3711 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3712 char s, t;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3713 t = s = (char )sPtr;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3714 /* 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	3715 while (s < end && (*s & 0x80)) s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3716 *sPtr = s;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3717 return PyUnicode_DecodeUTF8(t, s - t, NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3718 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3719
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3720 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	3721 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	3722 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3723 PyObject v, u;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3724 char *buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3725 char *p;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3726 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	3727
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3728 if (encoding == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3729 u = NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3730 } else {
48330 ac854cde3135 Merged revisions 64114 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47301 diff changeset	3731 /* check for integer overflow */
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3732 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	3733 return NULL;
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3734 /* "ä" (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	3735 "\ä" (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	3736 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	3737 if (u == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3738 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3739 p = buf = PyBytes_AsString(u);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3740 end = s + len;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3741 while (s < end) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3742 if (*s == '\\') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3743 p++ = s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3744 if (*s & 0x80) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3745 strcpy(p, "u005c");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3746 p += 5;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3747 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3748 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3749 if (s & 0x80) { / XXX inefficient */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3750 PyObject *w;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3751 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3752 void *data;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3753 Py_ssize_t len, i;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3754 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	3755 if (w == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3756 Py_DECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3757 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3758 }
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3759 kind = PyUnicode_KIND(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3760 data = PyUnicode_DATA(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3761 len = PyUnicode_GET_LENGTH(w);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3762 for (i = 0; i < len; i++) {
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3763 Py_UCS4 chr = PyUnicode_READ(kind, data, i);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71795 diff changeset	3764 sprintf(p, "\\U%08x", chr);
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3765 p += 10;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3766 }
56955 f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3767 /* Should be impossible to overflow */
f32dc84a876c Merged revisions 75928 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 56363 diff changeset	3768 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	3769 Py_DECREF(w);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3770 } else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3771 p++ = s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3772 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3773 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3774 len = p - buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3775 s = buf;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3776 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3777 if (rawmode)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3778 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3779 else
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3780 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3781 Py_XDECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3782 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3783 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3784
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3785 /* 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	3786 * 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	3787 * 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	3788 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3789 static PyObject *
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3790 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	3791 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3792 size_t len;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3793 const char *s = STR(n);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3794 int quote = Py_CHARMASK(*s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3795 int rawmode = 0;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3796 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	3797 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	3798 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	3799 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	3800 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	3801 *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	3802 }
75381 ed9497d6a216 Basic support for PEP 414 without docs or tests. Armin Ronacher <armin.ronacher@active-4.com> parents: 74462 diff changeset	3803 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	3804 quote = *++s;
ed9497d6a216 Basic support for PEP 414 without docs or tests. Armin Ronacher <armin.ronacher@active-4.com> parents: 74462 diff changeset	3805 }
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	3806 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	3807 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	3808 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	3809 }
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	3810 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	3811 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	3812 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3813 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3814 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3815 if (quote != '\'' && quote != '\"') {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3816 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3817 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3818 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3819 s++;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3820 len = strlen(s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3821 if (len > INT_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3822 PyErr_SetString(PyExc_OverflowError,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3823 "string to parse is too long");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3824 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3825 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3826 if (s[--len] != quote) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3827 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3828 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3829 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3830 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	3831 s += 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3832 len -= 2;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3833 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	3834 PyErr_BadInternalCall();
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3835 return NULL;
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	3836 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3837 }
46306 b10292eafb07 Reverted r62128 on Guido's orders Benjamin Peterson <benjamin@python.org> parents: 46272 diff changeset	3838 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	3839 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	3840 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3841 if (*bytesmode) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3842 /* Disallow non-ascii characters (but not escapes) */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3843 const char *c;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3844 for (c = s; *c; c++) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3845 if (Py_CHARMASK(*c) >= 0x80) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3846 ast_error(n, "bytes can only contain ASCII "
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3847 "literal characters.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3848 return NULL;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3849 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3850 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3851 }
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3852 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	3853 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	3854 if (rawmode \|\| strchr(s, '\\') == NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3855 if (need_encoding) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3856 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	3857 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	3858 return u;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3859 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	3860 Py_DECREF(u);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3861 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	3862 } else if (*bytesmode) {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3863 return PyBytes_FromStringAndSize(s, len);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3864 } 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	3865 return PyUnicode_FromStringAndSize(s, len);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56955 diff changeset	3866 } 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	3867 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	3868 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3869 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3870 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	3871 need_encoding ? c->c_encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3872 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3873
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3874 /* 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	3875 * 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	3876 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3877 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3878 static PyObject *
40894 0ea24f4f2467 Bytes literal. Thomas Wouters <thomas@python.org> parents: 40774 diff changeset	3879 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	3880 {
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3881 PyObject *v;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3882 int i;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3883 REQ(CHILD(n, 0), STRING);
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3884 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	3885 if (v != NULL) {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3886 /* String literal concatenation */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3887 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	3888 PyObject *s;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3889 int subbm = 0;
46120 78504d604b44 Merged revisions 61952-61953 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45931 diff changeset	3890 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	3891 if (s == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3892 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3893 if (*bytesmode != subbm) {
43819 068655054b0d Minimal change that disables (AFAICT) the interpolation of \u and \U inside Guido van Rossum <guido@python.org> parents: 43777 diff changeset	3894 ast_error(n, "cannot mix bytes and nonbytes literals");
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3895 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3896 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3897 if (PyBytes_Check(v) && PyBytes_Check(s)) {
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	3898 PyBytes_ConcatAndDel(&v, s);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3899 if (v == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3900 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3901 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3902 else {
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3903 PyObject *temp = PyUnicode_Concat(v, s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3904 Py_DECREF(s);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3905 Py_DECREF(v);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3906 v = temp;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3907 if (v == NULL)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3908 goto onError;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3909 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3910 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3911 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3912 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3913
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3914 onError:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3915 Py_XDECREF(v);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: 41509 diff changeset	3916 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3917 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 78839:f96df022f124