Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-25 10:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
cpython/Python/Python-ast.c

3178 lines
110 KiB
C
Raw Normal View History

SF #1373150, diffs in working copy after a build Strip off leading dots and slash so the generated files are the same regardless of whether you configure in the checkout directory or build. If anyone configures in a different directory, we might want a cleaner approach using os.path.*(). Hopefully this is good enough.
2005-12-11 21:18:22 +00:00
/* File automatically generated by Parser/asdl_c.py */
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
#include "Python.h"
#include "Python-ast.h"
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject* AST_type;
static PyTypeObject *mod_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_mod(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Module_type;
static char *Module_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Interactive_type;
static char *Interactive_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Expression_type;
static char *Expression_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Suite_type;
static char *Suite_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *stmt_type;
static char *stmt_attributes[] = {
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
"lineno",
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
"col_offset",
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
};
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_stmt(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *FunctionDef_type;
static char *FunctionDef_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"name",
"args",
"body",
"decorators",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *ClassDef_type;
static char *ClassDef_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"name",
"bases",
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Return_type;
static char *Return_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Delete_type;
static char *Delete_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"targets",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Assign_type;
static char *Assign_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"targets",
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *AugAssign_type;
static char *AugAssign_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"target",
"op",
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Print_type;
static char *Print_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"dest",
"values",
"nl",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *For_type;
static char *For_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"target",
"iter",
"body",
"orelse",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *While_type;
static char *While_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"test",
"body",
"orelse",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *If_type;
static char *If_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"test",
"body",
"orelse",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *With_type;
static char *With_fields[]={
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
"context_expr",
"optional_vars",
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Raise_type;
static char *Raise_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"type",
"inst",
"tback",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *TryExcept_type;
static char *TryExcept_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
"handlers",
"orelse",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *TryFinally_type;
static char *TryFinally_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
"finalbody",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Assert_type;
static char *Assert_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"test",
"msg",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Import_type;
static char *Import_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"names",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *ImportFrom_type;
static char *ImportFrom_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"module",
"names",
SF patch #1438387, PEP 328: relative and absolute imports. - IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
2006-02-28 16:09:29 +00:00
"level",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Exec_type;
static char *Exec_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"body",
"globals",
"locals",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Global_type;
static char *Global_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"names",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Expr_type;
static char *Expr_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Pass_type;
static PyTypeObject *Break_type;
static PyTypeObject *Continue_type;
static PyTypeObject *expr_type;
static char *expr_attributes[] = {
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
"lineno",
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
"col_offset",
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
};
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_expr(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *BoolOp_type;
static char *BoolOp_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"op",
"values",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *BinOp_type;
static char *BinOp_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"left",
"op",
"right",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *UnaryOp_type;
static char *UnaryOp_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"op",
"operand",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Lambda_type;
static char *Lambda_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"args",
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *IfExp_type;
static char *IfExp_fields[]={
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
"test",
"body",
"orelse",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Dict_type;
static char *Dict_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"keys",
"values",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *ListComp_type;
static char *ListComp_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"elt",
"generators",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *GeneratorExp_type;
static char *GeneratorExp_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"elt",
"generators",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Yield_type;
static char *Yield_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Compare_type;
static char *Compare_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"left",
"ops",
"comparators",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Call_type;
static char *Call_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"func",
"args",
"keywords",
"starargs",
"kwargs",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Repr_type;
static char *Repr_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Num_type;
static char *Num_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"n",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Str_type;
static char *Str_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"s",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Attribute_type;
static char *Attribute_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
"attr",
"ctx",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Subscript_type;
static char *Subscript_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
"slice",
"ctx",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Name_type;
static char *Name_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"id",
"ctx",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *List_type;
static char *List_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"elts",
"ctx",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Tuple_type;
static char *Tuple_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"elts",
"ctx",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *expr_context_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject *Load_singleton, *Store_singleton, *Del_singleton,
*AugLoad_singleton, *AugStore_singleton, *Param_singleton;
static PyObject* ast2obj_expr_context(expr_context_ty);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Load_type;
static PyTypeObject *Store_type;
static PyTypeObject *Del_type;
static PyTypeObject *AugLoad_type;
static PyTypeObject *AugStore_type;
static PyTypeObject *Param_type;
static PyTypeObject *slice_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_slice(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Ellipsis_type;
static PyTypeObject *Slice_type;
static char *Slice_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"lower",
"upper",
"step",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *ExtSlice_type;
static char *ExtSlice_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"dims",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Index_type;
static char *Index_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *boolop_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject *And_singleton, *Or_singleton;
static PyObject* ast2obj_boolop(boolop_ty);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *And_type;
static PyTypeObject *Or_type;
static PyTypeObject *operator_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject *Add_singleton, *Sub_singleton, *Mult_singleton,
*Div_singleton, *Mod_singleton, *Pow_singleton, *LShift_singleton,
*RShift_singleton, *BitOr_singleton, *BitXor_singleton, *BitAnd_singleton,
*FloorDiv_singleton;
static PyObject* ast2obj_operator(operator_ty);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Add_type;
static PyTypeObject *Sub_type;
static PyTypeObject *Mult_type;
static PyTypeObject *Div_type;
static PyTypeObject *Mod_type;
static PyTypeObject *Pow_type;
static PyTypeObject *LShift_type;
static PyTypeObject *RShift_type;
static PyTypeObject *BitOr_type;
static PyTypeObject *BitXor_type;
static PyTypeObject *BitAnd_type;
static PyTypeObject *FloorDiv_type;
static PyTypeObject *unaryop_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject *Invert_singleton, *Not_singleton, *UAdd_singleton,
*USub_singleton;
static PyObject* ast2obj_unaryop(unaryop_ty);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Invert_type;
static PyTypeObject *Not_type;
static PyTypeObject *UAdd_type;
static PyTypeObject *USub_type;
static PyTypeObject *cmpop_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject *Eq_singleton, *NotEq_singleton, *Lt_singleton, *LtE_singleton,
*Gt_singleton, *GtE_singleton, *Is_singleton, *IsNot_singleton, *In_singleton,
*NotIn_singleton;
static PyObject* ast2obj_cmpop(cmpop_ty);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *Eq_type;
static PyTypeObject *NotEq_type;
static PyTypeObject *Lt_type;
static PyTypeObject *LtE_type;
static PyTypeObject *Gt_type;
static PyTypeObject *GtE_type;
static PyTypeObject *Is_type;
static PyTypeObject *IsNot_type;
static PyTypeObject *In_type;
static PyTypeObject *NotIn_type;
static PyTypeObject *comprehension_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_comprehension(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static char *comprehension_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"target",
"iter",
"ifs",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *excepthandler_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_excepthandler(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static char *excepthandler_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"type",
"name",
"body",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *arguments_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_arguments(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static char *arguments_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"args",
"vararg",
"kwarg",
"defaults",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *keyword_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_keyword(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static char *keyword_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"arg",
"value",
};
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static PyTypeObject *alias_type;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_alias(void*);
Don't pollute namespace as bad as before. All the types are static now.
2006-02-28 22:47:29 +00:00
static char *alias_fields[]={
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
"name",
"asname",
};
static PyTypeObject* make_type(char *type, PyTypeObject* base, char**fields, int num_fields)
{
PyObject *fnames, *result;
int i;
if (num_fields) {
fnames = PyTuple_New(num_fields);
if (!fnames) return NULL;
} else {
fnames = Py_None;
Py_INCREF(Py_None);
}
for(i=0; i < num_fields; i++) {
PyObject *field = PyString_FromString(fields[i]);
if (!field) {
Py_DECREF(fnames);
return NULL;
}
PyTuple_SET_ITEM(fnames, i, field);
}
from __future__ import with_statement addon for 'with', mostly written by Neal.
2006-02-28 19:02:24 +00:00
result = PyObject_CallFunction((PyObject*)&PyType_Type, "s(O){sOss}",
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
type, base, "_fields", fnames, "__module__", "_ast");
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Py_DECREF(fnames);
return (PyTypeObject*)result;
}
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
static int add_attributes(PyTypeObject* type, char**attrs, int num_fields)
{
int i;
PyObject *s, *l = PyList_New(num_fields);
if (!l) return 0;
for(i=0; i < num_fields; i++) {
s = PyString_FromString(attrs[i]);
if (!s) {
Py_DECREF(l);
return 0;
}
PyList_SET_ITEM(l, i, s);
}
return PyObject_SetAttrString((PyObject*)type, "_attributes", l) >=0;
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static PyObject* ast2obj_list(asdl_seq *seq, PyObject* (*func)(void*))
{
int i, n = asdl_seq_LEN(seq);
PyObject *result = PyList_New(n);
PyObject *value;
if (!result)
return NULL;
for (i = 0; i < n; i++) {
value = func(asdl_seq_GET(seq, i));
if (!value) {
Py_DECREF(result);
return NULL;
}
PyList_SET_ITEM(result, i, value);
}
return result;
}
static PyObject* ast2obj_object(void *o)
{
if (!o)
o = Py_None;
Py_INCREF((PyObject*)o);
return (PyObject*)o;
}
#define ast2obj_identifier ast2obj_object
#define ast2obj_string ast2obj_object
static PyObject* ast2obj_bool(bool b)
{
return PyBool_FromLong(b);
}
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
static PyObject* ast2obj_int(bool b)
{
return PyInt_FromLong(b);
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
static int initialized;
static int init_types(void)
{
if (initialized) return 1;
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
AST_type = make_type("AST", &PyBaseObject_Type, NULL, 0);
mod_type = make_type("mod", AST_type, NULL, 0);
if (!mod_type) return 0;
if (!add_attributes(mod_type, NULL, 0)) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Module_type = make_type("Module", mod_type, Module_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Module_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Interactive_type = make_type("Interactive", mod_type,
Interactive_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Interactive_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Expression_type = make_type("Expression", mod_type, Expression_fields,
1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Expression_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Suite_type = make_type("Suite", mod_type, Suite_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Suite_type) return 0;
stmt_type = make_type("stmt", AST_type, NULL, 0);
if (!stmt_type) return 0;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
if (!add_attributes(stmt_type, stmt_attributes, 2)) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
FunctionDef_type = make_type("FunctionDef", stmt_type,
FunctionDef_fields, 4);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!FunctionDef_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
ClassDef_type = make_type("ClassDef", stmt_type, ClassDef_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!ClassDef_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Return_type = make_type("Return", stmt_type, Return_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Return_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Delete_type = make_type("Delete", stmt_type, Delete_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Delete_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Assign_type = make_type("Assign", stmt_type, Assign_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Assign_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
AugAssign_type = make_type("AugAssign", stmt_type, AugAssign_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!AugAssign_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Print_type = make_type("Print", stmt_type, Print_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Print_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
For_type = make_type("For", stmt_type, For_fields, 4);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!For_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
While_type = make_type("While", stmt_type, While_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!While_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
If_type = make_type("If", stmt_type, If_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!If_type) return 0;
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
With_type = make_type("With", stmt_type, With_fields, 3);
if (!With_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Raise_type = make_type("Raise", stmt_type, Raise_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Raise_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
TryExcept_type = make_type("TryExcept", stmt_type, TryExcept_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!TryExcept_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
TryFinally_type = make_type("TryFinally", stmt_type, TryFinally_fields,
2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!TryFinally_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Assert_type = make_type("Assert", stmt_type, Assert_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Assert_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Import_type = make_type("Import", stmt_type, Import_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Import_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
ImportFrom_type = make_type("ImportFrom", stmt_type, ImportFrom_fields,
SF patch #1438387, PEP 328: relative and absolute imports. - IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
2006-02-28 16:09:29 +00:00
3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!ImportFrom_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Exec_type = make_type("Exec", stmt_type, Exec_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Exec_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Global_type = make_type("Global", stmt_type, Global_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Global_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Expr_type = make_type("Expr", stmt_type, Expr_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Expr_type) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Pass_type = make_type("Pass", stmt_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Pass_type) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Break_type = make_type("Break", stmt_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Break_type) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Continue_type = make_type("Continue", stmt_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Continue_type) return 0;
expr_type = make_type("expr", AST_type, NULL, 0);
if (!expr_type) return 0;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
if (!add_attributes(expr_type, expr_attributes, 2)) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
BoolOp_type = make_type("BoolOp", expr_type, BoolOp_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BoolOp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
BinOp_type = make_type("BinOp", expr_type, BinOp_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BinOp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
UnaryOp_type = make_type("UnaryOp", expr_type, UnaryOp_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!UnaryOp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Lambda_type = make_type("Lambda", expr_type, Lambda_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Lambda_type) return 0;
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
IfExp_type = make_type("IfExp", expr_type, IfExp_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!IfExp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Dict_type = make_type("Dict", expr_type, Dict_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Dict_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
ListComp_type = make_type("ListComp", expr_type, ListComp_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!ListComp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
GeneratorExp_type = make_type("GeneratorExp", expr_type,
GeneratorExp_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!GeneratorExp_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Yield_type = make_type("Yield", expr_type, Yield_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Yield_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Compare_type = make_type("Compare", expr_type, Compare_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Compare_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Call_type = make_type("Call", expr_type, Call_fields, 5);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Call_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Repr_type = make_type("Repr", expr_type, Repr_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Repr_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Num_type = make_type("Num", expr_type, Num_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Num_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Str_type = make_type("Str", expr_type, Str_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Str_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Attribute_type = make_type("Attribute", expr_type, Attribute_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Attribute_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Subscript_type = make_type("Subscript", expr_type, Subscript_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Subscript_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Name_type = make_type("Name", expr_type, Name_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Name_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
List_type = make_type("List", expr_type, List_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!List_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Tuple_type = make_type("Tuple", expr_type, Tuple_fields, 2);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Tuple_type) return 0;
expr_context_type = make_type("expr_context", AST_type, NULL, 0);
if (!expr_context_type) return 0;
if (!add_attributes(expr_context_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Load_type = make_type("Load", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Load_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Load_singleton = PyType_GenericNew(Load_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Load_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Store_type = make_type("Store", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Store_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Store_singleton = PyType_GenericNew(Store_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Store_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Del_type = make_type("Del", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Del_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Del_singleton = PyType_GenericNew(Del_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Del_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
AugLoad_type = make_type("AugLoad", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!AugLoad_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
AugLoad_singleton = PyType_GenericNew(AugLoad_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!AugLoad_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
AugStore_type = make_type("AugStore", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!AugStore_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
AugStore_singleton = PyType_GenericNew(AugStore_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!AugStore_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Param_type = make_type("Param", expr_context_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Param_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Param_singleton = PyType_GenericNew(Param_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Param_singleton) return 0;
slice_type = make_type("slice", AST_type, NULL, 0);
if (!slice_type) return 0;
if (!add_attributes(slice_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Ellipsis_type = make_type("Ellipsis", slice_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Ellipsis_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Slice_type = make_type("Slice", slice_type, Slice_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Slice_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
ExtSlice_type = make_type("ExtSlice", slice_type, ExtSlice_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!ExtSlice_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Index_type = make_type("Index", slice_type, Index_fields, 1);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Index_type) return 0;
boolop_type = make_type("boolop", AST_type, NULL, 0);
if (!boolop_type) return 0;
if (!add_attributes(boolop_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
And_type = make_type("And", boolop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!And_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
And_singleton = PyType_GenericNew(And_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!And_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Or_type = make_type("Or", boolop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Or_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Or_singleton = PyType_GenericNew(Or_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Or_singleton) return 0;
operator_type = make_type("operator", AST_type, NULL, 0);
if (!operator_type) return 0;
if (!add_attributes(operator_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Add_type = make_type("Add", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Add_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Add_singleton = PyType_GenericNew(Add_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Add_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Sub_type = make_type("Sub", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Sub_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Sub_singleton = PyType_GenericNew(Sub_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Sub_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Mult_type = make_type("Mult", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Mult_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Mult_singleton = PyType_GenericNew(Mult_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Mult_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Div_type = make_type("Div", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Div_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Div_singleton = PyType_GenericNew(Div_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Div_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Mod_type = make_type("Mod", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Mod_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Mod_singleton = PyType_GenericNew(Mod_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Mod_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Pow_type = make_type("Pow", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Pow_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Pow_singleton = PyType_GenericNew(Pow_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Pow_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
LShift_type = make_type("LShift", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!LShift_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
LShift_singleton = PyType_GenericNew(LShift_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!LShift_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
RShift_type = make_type("RShift", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!RShift_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
RShift_singleton = PyType_GenericNew(RShift_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!RShift_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
BitOr_type = make_type("BitOr", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitOr_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
BitOr_singleton = PyType_GenericNew(BitOr_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitOr_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
BitXor_type = make_type("BitXor", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitXor_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
BitXor_singleton = PyType_GenericNew(BitXor_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitXor_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
BitAnd_type = make_type("BitAnd", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitAnd_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
BitAnd_singleton = PyType_GenericNew(BitAnd_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!BitAnd_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
FloorDiv_type = make_type("FloorDiv", operator_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!FloorDiv_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
FloorDiv_singleton = PyType_GenericNew(FloorDiv_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!FloorDiv_singleton) return 0;
unaryop_type = make_type("unaryop", AST_type, NULL, 0);
if (!unaryop_type) return 0;
if (!add_attributes(unaryop_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Invert_type = make_type("Invert", unaryop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Invert_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Invert_singleton = PyType_GenericNew(Invert_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Invert_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Not_type = make_type("Not", unaryop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Not_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Not_singleton = PyType_GenericNew(Not_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Not_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
UAdd_type = make_type("UAdd", unaryop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!UAdd_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
UAdd_singleton = PyType_GenericNew(UAdd_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!UAdd_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
USub_type = make_type("USub", unaryop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!USub_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
USub_singleton = PyType_GenericNew(USub_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!USub_singleton) return 0;
cmpop_type = make_type("cmpop", AST_type, NULL, 0);
if (!cmpop_type) return 0;
if (!add_attributes(cmpop_type, NULL, 0)) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Eq_type = make_type("Eq", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Eq_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Eq_singleton = PyType_GenericNew(Eq_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Eq_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
NotEq_type = make_type("NotEq", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!NotEq_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
NotEq_singleton = PyType_GenericNew(NotEq_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!NotEq_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Lt_type = make_type("Lt", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Lt_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Lt_singleton = PyType_GenericNew(Lt_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Lt_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
LtE_type = make_type("LtE", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!LtE_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
LtE_singleton = PyType_GenericNew(LtE_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!LtE_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Gt_type = make_type("Gt", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Gt_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Gt_singleton = PyType_GenericNew(Gt_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Gt_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
GtE_type = make_type("GtE", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!GtE_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
GtE_singleton = PyType_GenericNew(GtE_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!GtE_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
Is_type = make_type("Is", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Is_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
Is_singleton = PyType_GenericNew(Is_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!Is_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
IsNot_type = make_type("IsNot", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!IsNot_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
IsNot_singleton = PyType_GenericNew(IsNot_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!IsNot_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
In_type = make_type("In", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!In_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
In_singleton = PyType_GenericNew(In_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!In_singleton) return 0;
Stop generating empty arrays.
2006-02-26 23:40:20 +00:00
NotIn_type = make_type("NotIn", cmpop_type, NULL, 0);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!NotIn_type) return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
NotIn_singleton = PyType_GenericNew(NotIn_type, NULL, NULL);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!NotIn_singleton) return 0;
comprehension_type = make_type("comprehension", AST_type,
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
comprehension_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!comprehension_type) return 0;
excepthandler_type = make_type("excepthandler", AST_type,
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
excepthandler_fields, 3);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if (!excepthandler_type) return 0;
arguments_type = make_type("arguments", AST_type, arguments_fields, 4);
if (!arguments_type) return 0;
keyword_type = make_type("keyword", AST_type, keyword_fields, 2);
if (!keyword_type) return 0;
alias_type = make_type("alias", AST_type, alias_fields, 2);
if (!alias_type) return 0;
initialized = 1;
return 1;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 19:14:20 +00:00
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
mod_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Module(asdl_seq * body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
mod_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Module_kind;
p->v.Module.body = body;
return p;
}
mod_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Interactive(asdl_seq * body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
mod_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Interactive_kind;
p->v.Interactive.body = body;
return p;
}
mod_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Expression(expr_ty body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
mod_ty p;
if (!body) {
PyErr_SetString(PyExc_ValueError,
"field body is required for Expression");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Expression_kind;
p->v.Expression.body = body;
return p;
}
mod_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Suite(asdl_seq * body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
mod_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Suite_kind;
p->v.Suite.body = body;
return p;
}
stmt_ty
FunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq *
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
decorators, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field name is required for FunctionDef");
return NULL;
}
if (!args) {
PyErr_SetString(PyExc_ValueError,
"field args is required for FunctionDef");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = FunctionDef_kind;
p->v.FunctionDef.name = name;
p->v.FunctionDef.args = args;
p->v.FunctionDef.body = body;
p->v.FunctionDef.decorators = decorators;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field name is required for ClassDef");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = ClassDef_kind;
p->v.ClassDef.name = name;
p->v.ClassDef.bases = bases;
p->v.ClassDef.body = body;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Return(expr_ty value, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Return_kind;
p->v.Return.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Delete(asdl_seq * targets, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Delete_kind;
p->v.Delete.targets = targets;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Assign(asdl_seq * targets, expr_ty value, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Assign");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Assign_kind;
p->v.Assign.targets = targets;
p->v.Assign.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
"field target is required for AugAssign");
return NULL;
}
if (!op) {
PyErr_SetString(PyExc_ValueError,
"field op is required for AugAssign");
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for AugAssign");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = AugAssign_kind;
p->v.AugAssign.target = target;
p->v.AugAssign.op = op;
p->v.AugAssign.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Print_kind;
p->v.Print.dest = dest;
p->v.Print.values = values;
p->v.Print.nl = nl;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
"field target is required for For");
return NULL;
}
if (!iter) {
PyErr_SetString(PyExc_ValueError,
"field iter is required for For");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = For_kind;
p->v.For.target = target;
p->v.For.iter = iter;
p->v.For.body = body;
p->v.For.orelse = orelse;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
"field test is required for While");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = While_kind;
p->v.While.test = test;
p->v.While.body = body;
p->v.While.orelse = orelse;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
"field test is required for If");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = If_kind;
p->v.If.test = test;
p->v.If.body = body;
p->v.If.orelse = orelse;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
stmt_ty
With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, int lineno,
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
int col_offset, PyArena *arena)
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
{
stmt_ty p;
if (!context_expr) {
PyErr_SetString(PyExc_ValueError,
"field context_expr is required for With");
return NULL;
}
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
if (!p) {
PyErr_NoMemory();
return NULL;
}
p->kind = With_kind;
p->v.With.context_expr = context_expr;
p->v.With.optional_vars = optional_vars;
p->v.With.body = body;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Raise_kind;
p->v.Raise.type = type;
p->v.Raise.inst = inst;
p->v.Raise.tback = tback;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, int lineno,
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = TryExcept_kind;
p->v.TryExcept.body = body;
p->v.TryExcept.handlers = handlers;
p->v.TryExcept.orelse = orelse;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = TryFinally_kind;
p->v.TryFinally.body = body;
p->v.TryFinally.finalbody = finalbody;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
"field test is required for Assert");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Assert_kind;
p->v.Assert.test = test;
p->v.Assert.msg = msg;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Import(asdl_seq * names, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Import_kind;
p->v.Import.names = names;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
ImportFrom(identifier module, asdl_seq * names, int level, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!module) {
PyErr_SetString(PyExc_ValueError,
"field module is required for ImportFrom");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = ImportFrom_kind;
p->v.ImportFrom.module = module;
p->v.ImportFrom.names = names;
SF patch #1438387, PEP 328: relative and absolute imports. - IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
2006-02-28 16:09:29 +00:00
p->v.ImportFrom.level = level;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!body) {
PyErr_SetString(PyExc_ValueError,
"field body is required for Exec");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Exec_kind;
p->v.Exec.body = body;
p->v.Exec.globals = globals;
p->v.Exec.locals = locals;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Global(asdl_seq * names, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Global_kind;
p->v.Global.names = names;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Expr(expr_ty value, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Expr");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Expr_kind;
p->v.Expr.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Pass(int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Pass_kind;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Break(int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Break_kind;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
stmt_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Continue(int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
stmt_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Continue_kind;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!op) {
PyErr_SetString(PyExc_ValueError,
"field op is required for BoolOp");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = BoolOp_kind;
p->v.BoolOp.op = op;
p->v.BoolOp.values = values;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!left) {
PyErr_SetString(PyExc_ValueError,
"field left is required for BinOp");
return NULL;
}
if (!op) {
PyErr_SetString(PyExc_ValueError,
"field op is required for BinOp");
return NULL;
}
if (!right) {
PyErr_SetString(PyExc_ValueError,
"field right is required for BinOp");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = BinOp_kind;
p->v.BinOp.left = left;
p->v.BinOp.op = op;
p->v.BinOp.right = right;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!op) {
PyErr_SetString(PyExc_ValueError,
"field op is required for UnaryOp");
return NULL;
}
if (!operand) {
PyErr_SetString(PyExc_ValueError,
"field operand is required for UnaryOp");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = UnaryOp_kind;
p->v.UnaryOp.op = op;
p->v.UnaryOp.operand = operand;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!args) {
PyErr_SetString(PyExc_ValueError,
"field args is required for Lambda");
return NULL;
}
if (!body) {
PyErr_SetString(PyExc_ValueError,
"field body is required for Lambda");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Lambda_kind;
p->v.Lambda.args = args;
p->v.Lambda.body = body;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int col_offset,
PyArena *arena)
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
{
expr_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
"field test is required for IfExp");
return NULL;
}
if (!body) {
PyErr_SetString(PyExc_ValueError,
"field body is required for IfExp");
return NULL;
}
if (!orelse) {
PyErr_SetString(PyExc_ValueError,
"field orelse is required for IfExp");
return NULL;
}
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
if (!p) {
PyErr_NoMemory();
return NULL;
}
p->kind = IfExp_kind;
p->v.IfExp.test = test;
p->v.IfExp.body = body;
p->v.IfExp.orelse = orelse;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Dict(asdl_seq * keys, asdl_seq * values, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Dict_kind;
p->v.Dict.keys = keys;
p->v.Dict.values = values;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
ListComp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!elt) {
PyErr_SetString(PyExc_ValueError,
"field elt is required for ListComp");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = ListComp_kind;
p->v.ListComp.elt = elt;
p->v.ListComp.generators = generators;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!elt) {
PyErr_SetString(PyExc_ValueError,
"field elt is required for GeneratorExp");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = GeneratorExp_kind;
p->v.GeneratorExp.elt = elt;
p->v.GeneratorExp.generators = generators;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Yield(expr_ty value, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Yield_kind;
p->v.Yield.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Compare(expr_ty left, asdl_seq * ops, asdl_seq * comparators, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!left) {
PyErr_SetString(PyExc_ValueError,
"field left is required for Compare");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Compare_kind;
p->v.Compare.left = left;
p->v.Compare.ops = ops;
p->v.Compare.comparators = comparators;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty starargs,
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
expr_ty kwargs, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!func) {
PyErr_SetString(PyExc_ValueError,
"field func is required for Call");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Call_kind;
p->v.Call.func = func;
p->v.Call.args = args;
p->v.Call.keywords = keywords;
p->v.Call.starargs = starargs;
p->v.Call.kwargs = kwargs;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Repr(expr_ty value, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Repr");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Repr_kind;
p->v.Repr.value = value;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Num(object n, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!n) {
PyErr_SetString(PyExc_ValueError,
"field n is required for Num");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Num_kind;
p->v.Num.n = n;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Str(string s, int lineno, int col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!s) {
PyErr_SetString(PyExc_ValueError,
"field s is required for Str");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Str_kind;
p->v.Str.s = s;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Attribute");
return NULL;
}
if (!attr) {
PyErr_SetString(PyExc_ValueError,
"field attr is required for Attribute");
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
"field ctx is required for Attribute");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Attribute_kind;
p->v.Attribute.value = value;
p->v.Attribute.attr = attr;
p->v.Attribute.ctx = ctx;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int lineno, int
col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Subscript");
return NULL;
}
if (!slice) {
PyErr_SetString(PyExc_ValueError,
"field slice is required for Subscript");
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
"field ctx is required for Subscript");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Subscript_kind;
p->v.Subscript.value = value;
p->v.Subscript.slice = slice;
p->v.Subscript.ctx = ctx;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Name(identifier id, expr_context_ty ctx, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!id) {
PyErr_SetString(PyExc_ValueError,
"field id is required for Name");
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
"field ctx is required for Name");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Name_kind;
p->v.Name.id = id;
p->v.Name.ctx = ctx;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
List(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
"field ctx is required for List");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = List_kind;
p->v.List.elts = elts;
p->v.List.ctx = ctx;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
expr_ty
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
expr_ty p;
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
"field ctx is required for Tuple");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Tuple_kind;
p->v.Tuple.elts = elts;
p->v.Tuple.ctx = ctx;
p->lineno = lineno;
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
p->col_offset = col_offset;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return p;
}
slice_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Ellipsis(PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
slice_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Ellipsis_kind;
return p;
}
slice_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
slice_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Slice_kind;
p->v.Slice.lower = lower;
p->v.Slice.upper = upper;
p->v.Slice.step = step;
return p;
}
slice_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
ExtSlice(asdl_seq * dims, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
slice_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = ExtSlice_kind;
p->v.ExtSlice.dims = dims;
return p;
}
slice_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
Index(expr_ty value, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
slice_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for Index");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->kind = Index_kind;
p->v.Index.value = value;
return p;
}
comprehension_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
comprehension_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
"field target is required for comprehension");
return NULL;
}
if (!iter) {
PyErr_SetString(PyExc_ValueError,
"field iter is required for comprehension");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (comprehension_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->target = target;
p->iter = iter;
p->ifs = ifs;
return p;
}
excepthandler_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
excepthandler(expr_ty type, expr_ty name, asdl_seq * body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
excepthandler_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->type = type;
p->name = name;
p->body = body;
return p;
}
arguments_ty
arguments(asdl_seq * args, identifier vararg, identifier kwarg, asdl_seq *
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
defaults, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
arguments_ty p;
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (arguments_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->args = args;
p->vararg = vararg;
p->kwarg = kwarg;
p->defaults = defaults;
return p;
}
keyword_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
keyword(identifier arg, expr_ty value, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
keyword_ty p;
if (!arg) {
PyErr_SetString(PyExc_ValueError,
"field arg is required for keyword");
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field value is required for keyword");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (keyword_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->arg = arg;
p->value = value;
return p;
}
alias_ty
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
alias(identifier name, identifier asname, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
alias_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field name is required for alias");
return NULL;
}
Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, simplifies a lot of error handling code, and fixes many memory leaks.
2005-12-17 20:54:49 +00:00
p = (alias_ty)PyArena_Malloc(arena, sizeof(*p));
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
if (!p) {
Use PyErr_NoMemory() instead of rolling our own. Get rid of "int i" unused warnings from Python-ast.c which we are generating.
2005-10-23 19:22:48 +00:00
PyErr_NoMemory();
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
return NULL;
}
p->name = name;
p->asname = asname;
return p;
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 19:14:20 +00:00
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
PyObject*
ast2obj_mod(void* _o)
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 19:14:20 +00:00
{
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
mod_ty o = (mod_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 19:14:20 +00:00
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
switch (o->kind) {
case Module_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Module_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Module.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Interactive_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Interactive_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Interactive.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Expression_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Expression_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Expression.body);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Suite_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Suite_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Suite.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
PyObject*
ast2obj_stmt(void* _o)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
stmt_ty o = (stmt_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
switch (o->kind) {
case FunctionDef_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(FunctionDef_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_identifier(o->v.FunctionDef.name);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "name", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_arguments(o->v.FunctionDef.args);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "args", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.FunctionDef.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.FunctionDef.decorators, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "decorators", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case ClassDef_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(ClassDef_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_identifier(o->v.ClassDef.name);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "name", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.ClassDef.bases, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "bases", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.ClassDef.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Return_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Return_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Return.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Delete_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Delete_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Delete.targets, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "targets", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Assign_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Assign_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Assign.targets, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "targets", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Assign.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case AugAssign_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(AugAssign_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.AugAssign.target);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "target", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_operator(o->v.AugAssign.op);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "op", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.AugAssign.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Print_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Print_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Print.dest);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "dest", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.Print.values, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "values", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_bool(o->v.Print.nl);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "nl", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case For_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(For_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.For.target);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "target", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.For.iter);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "iter", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.For.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.For.orelse, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "orelse", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case While_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(While_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.While.test);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "test", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.While.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.While.orelse, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "orelse", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case If_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(If_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.If.test);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "test", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.If.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.If.orelse, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "orelse", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
case With_kind:
result = PyType_GenericNew(With_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.With.context_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "context_expr", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.With.optional_vars);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "optional_vars", value) ==
-1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.With.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
break;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
case Raise_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Raise_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Raise.type);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "type", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Raise.inst);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "inst", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Raise.tback);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "tback", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case TryExcept_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(TryExcept_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.TryExcept.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.TryExcept.handlers,
ast2obj_excepthandler);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "handlers", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.TryExcept.orelse, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "orelse", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case TryFinally_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(TryFinally_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.TryFinally.body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.TryFinally.finalbody, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "finalbody", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Assert_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Assert_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Assert.test);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "test", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Assert.msg);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "msg", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Import_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Import_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Import.names, ast2obj_alias);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "names", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case ImportFrom_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(ImportFrom_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_identifier(o->v.ImportFrom.module);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "module", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.ImportFrom.names, ast2obj_alias);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "names", value) == -1)
SF patch #1438387, PEP 328: relative and absolute imports. - IMPORT_NAME takes an extra argument from the stack: the relativeness of the import. Only passed to __import__ when it's not -1. - __import__() takes an optional 5th argument for the same thing; it __defaults to -1 (old semantics: try relative, then absolute) - 'from . import name' imports name (be it module or regular attribute) from the current module's *package*. Likewise, 'from .module import name' will import name from a sibling to the current module. - Importing from outside a package is not allowed; 'from . import sys' in a toplevel module will not work, nor will 'from .. import sys' in a (single-level) package. - 'from __future__ import absolute_import' will turn on the new semantics for import and from-import: imports will be absolute, except for from-import with dots. Includes tests for regular imports and importhooks, parser changes and a NEWS item, but no compiler-package changes or documentation changes.
2006-02-28 16:09:29 +00:00
goto failed;
Py_DECREF(value);
value = ast2obj_int(o->v.ImportFrom.level);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "level", value) == -1)
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Exec_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Exec_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Exec.body);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Exec.globals);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "globals", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Exec.locals);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "locals", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Global_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Global_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Global.names, ast2obj_identifier);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "names", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Expr_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Expr_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Expr.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Pass_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Pass_type, NULL, NULL);
if (!result) goto failed;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Break_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Break_type, NULL, NULL);
if (!result) goto failed;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Continue_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Continue_type, NULL, NULL);
if (!result) goto failed;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
}
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
value = ast2obj_int(o->lineno);
if (!value) goto failed;
PyObject_SetAttrString(result, "lineno", value);
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
value = ast2obj_int(o->col_offset);
if (!value) goto failed;
PyObject_SetAttrString(result, "col_offset", value);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
PyObject*
ast2obj_expr(void* _o)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
{
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
expr_ty o = (expr_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
switch (o->kind) {
case BoolOp_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(BoolOp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_boolop(o->v.BoolOp.op);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "op", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.BoolOp.values, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "values", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case BinOp_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(BinOp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.BinOp.left);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "left", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_operator(o->v.BinOp.op);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "op", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.BinOp.right);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "right", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case UnaryOp_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(UnaryOp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_unaryop(o->v.UnaryOp.op);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "op", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.UnaryOp.operand);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "operand", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Lambda_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Lambda_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_arguments(o->v.Lambda.args);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "args", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Lambda.body);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-27 00:24:13 +00:00
case IfExp_kind:
result = PyType_GenericNew(IfExp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.IfExp.test);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "test", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.IfExp.body);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.IfExp.orelse);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "orelse", value) == -1)
goto failed;
Py_DECREF(value);
break;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
case Dict_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Dict_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Dict.keys, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "keys", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.Dict.values, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "values", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case ListComp_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(ListComp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.ListComp.elt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "elt", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.ListComp.generators,
ast2obj_comprehension);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "generators", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case GeneratorExp_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(GeneratorExp_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.GeneratorExp.elt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "elt", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.GeneratorExp.generators,
ast2obj_comprehension);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "generators", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Yield_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Yield_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Yield.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Compare_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Compare_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Compare.left);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "left", value) == -1)
goto failed;
Py_DECREF(value);
Fix iterating over cmpop_ty lists.
2006-02-26 20:51:25 +00:00
{
int i, n = asdl_seq_LEN(o->v.Compare.ops);
value = PyList_New(n);
if (!value) goto failed;
for(i = 0; i < n; i++)
PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i)));
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ops", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.Compare.comparators, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "comparators", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Call_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Call_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Call.func);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "func", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.Call.args, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "args", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->v.Call.keywords, ast2obj_keyword);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "keywords", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Call.starargs);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "starargs", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Call.kwargs);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "kwargs", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Repr_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Repr_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Repr.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Num_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Num_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_object(o->v.Num.n);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "n", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Str_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Str_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_string(o->v.Str.s);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "s", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Attribute_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Attribute_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Attribute.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_identifier(o->v.Attribute.attr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "attr", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr_context(o->v.Attribute.ctx);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ctx", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Subscript_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Subscript_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Subscript.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_slice(o->v.Subscript.slice);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "slice", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr_context(o->v.Subscript.ctx);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ctx", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Name_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Name_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_identifier(o->v.Name.id);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "id", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr_context(o->v.Name.ctx);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ctx", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case List_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(List_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.List.elts, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "elts", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr_context(o->v.List.ctx);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ctx", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Tuple_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Tuple_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.Tuple.elts, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "elts", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr_context(o->v.Tuple.ctx);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ctx", value) == -1)
goto failed;
Py_DECREF(value);
break;
}
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
value = ast2obj_int(o->lineno);
if (!value) goto failed;
PyObject_SetAttrString(result, "lineno", value);
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 22:49:05 +00:00
value = ast2obj_int(o->col_offset);
if (!value) goto failed;
PyObject_SetAttrString(result, "col_offset", value);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject* ast2obj_expr_context(expr_context_ty o)
{
switch(o) {
case Load:
Py_INCREF(Load_singleton);
return Load_singleton;
case Store:
Py_INCREF(Store_singleton);
return Store_singleton;
case Del:
Py_INCREF(Del_singleton);
return Del_singleton;
case AugLoad:
Py_INCREF(AugLoad_singleton);
return AugLoad_singleton;
case AugStore:
Py_INCREF(AugStore_singleton);
return AugStore_singleton;
case Param:
Py_INCREF(Param_singleton);
return Param_singleton;
}
return NULL; /* cannot happen */
}
PyObject*
ast2obj_slice(void* _o)
{
slice_ty o = (slice_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
}
switch (o->kind) {
case Ellipsis_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Ellipsis_type, NULL, NULL);
if (!result) goto failed;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Slice_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Slice_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Slice.lower);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "lower", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Slice.upper);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "upper", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->v.Slice.step);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "step", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case ExtSlice_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(ExtSlice_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_list(o->v.ExtSlice.dims, ast2obj_slice);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "dims", value) == -1)
goto failed;
Py_DECREF(value);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
break;
case Index_kind:
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
result = PyType_GenericNew(Index_type, NULL, NULL);
if (!result) goto failed;
value = ast2obj_expr(o->v.Index.value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
break;
}
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject* ast2obj_boolop(boolop_ty o)
{
switch(o) {
case And:
Py_INCREF(And_singleton);
return And_singleton;
case Or:
Py_INCREF(Or_singleton);
return Or_singleton;
}
return NULL; /* cannot happen */
}
PyObject* ast2obj_operator(operator_ty o)
{
switch(o) {
case Add:
Py_INCREF(Add_singleton);
return Add_singleton;
case Sub:
Py_INCREF(Sub_singleton);
return Sub_singleton;
case Mult:
Py_INCREF(Mult_singleton);
return Mult_singleton;
case Div:
Py_INCREF(Div_singleton);
return Div_singleton;
case Mod:
Py_INCREF(Mod_singleton);
return Mod_singleton;
case Pow:
Py_INCREF(Pow_singleton);
return Pow_singleton;
case LShift:
Py_INCREF(LShift_singleton);
return LShift_singleton;
case RShift:
Py_INCREF(RShift_singleton);
return RShift_singleton;
case BitOr:
Py_INCREF(BitOr_singleton);
return BitOr_singleton;
case BitXor:
Py_INCREF(BitXor_singleton);
return BitXor_singleton;
case BitAnd:
Py_INCREF(BitAnd_singleton);
return BitAnd_singleton;
case FloorDiv:
Py_INCREF(FloorDiv_singleton);
return FloorDiv_singleton;
}
return NULL; /* cannot happen */
}
PyObject* ast2obj_unaryop(unaryop_ty o)
{
switch(o) {
case Invert:
Py_INCREF(Invert_singleton);
return Invert_singleton;
case Not:
Py_INCREF(Not_singleton);
return Not_singleton;
case UAdd:
Py_INCREF(UAdd_singleton);
return UAdd_singleton;
case USub:
Py_INCREF(USub_singleton);
return USub_singleton;
}
return NULL; /* cannot happen */
}
PyObject* ast2obj_cmpop(cmpop_ty o)
{
switch(o) {
case Eq:
Py_INCREF(Eq_singleton);
return Eq_singleton;
case NotEq:
Py_INCREF(NotEq_singleton);
return NotEq_singleton;
case Lt:
Py_INCREF(Lt_singleton);
return Lt_singleton;
case LtE:
Py_INCREF(LtE_singleton);
return LtE_singleton;
case Gt:
Py_INCREF(Gt_singleton);
return Gt_singleton;
case GtE:
Py_INCREF(GtE_singleton);
return GtE_singleton;
case Is:
Py_INCREF(Is_singleton);
return Is_singleton;
case IsNot:
Py_INCREF(IsNot_singleton);
return IsNot_singleton;
case In:
Py_INCREF(In_singleton);
return In_singleton;
case NotIn:
Py_INCREF(NotIn_singleton);
return NotIn_singleton;
}
return NULL; /* cannot happen */
}
PyObject*
ast2obj_comprehension(void* _o)
{
comprehension_ty o = (comprehension_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
result = PyType_GenericNew(comprehension_type, NULL, NULL);
if (!result) return NULL;
value = ast2obj_expr(o->target);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "target", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->iter);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "iter", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->ifs, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "ifs", value) == -1)
goto failed;
Py_DECREF(value);
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
ast2obj_excepthandler(void* _o)
{
excepthandler_ty o = (excepthandler_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
result = PyType_GenericNew(excepthandler_type, NULL, NULL);
if (!result) return NULL;
value = ast2obj_expr(o->type);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "type", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->name);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "name", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->body, ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
ast2obj_arguments(void* _o)
{
arguments_ty o = (arguments_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
result = PyType_GenericNew(arguments_type, NULL, NULL);
if (!result) return NULL;
value = ast2obj_list(o->args, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "args", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_identifier(o->vararg);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "vararg", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_identifier(o->kwarg);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "kwarg", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_list(o->defaults, ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "defaults", value) == -1)
goto failed;
Py_DECREF(value);
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
ast2obj_keyword(void* _o)
{
keyword_ty o = (keyword_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
result = PyType_GenericNew(keyword_type, NULL, NULL);
if (!result) return NULL;
value = ast2obj_identifier(o->arg);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "arg", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->value);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "value", value) == -1)
goto failed;
Py_DECREF(value);
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
ast2obj_alias(void* _o)
{
alias_ty o = (alias_ty)_o;
PyObject *result = NULL, *value = NULL;
if (!o) {
Py_INCREF(Py_None);
return Py_None;
}
result = PyType_GenericNew(alias_type, NULL, NULL);
if (!result) return NULL;
value = ast2obj_identifier(o->name);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "name", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_identifier(o->asname);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "asname", value) == -1)
goto failed;
Py_DECREF(value);
return result;
failed:
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
PyMODINIT_FUNC
init_ast(void)
{
PyObject *m, *d;
if (!init_types()) return;
m = Py_InitModule3("_ast", NULL, NULL);
if (!m) return;
d = PyModule_GetDict(m);
if (PyDict_SetItemString(d, "AST", (PyObject*)AST_type) < 0) return;
if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)
return;
from __future__ import with_statement addon for 'with', mostly written by Neal.
2006-02-28 19:02:24 +00:00
if (PyModule_AddStringConstant(m, "__version__", "42649") < 0)
Regenerate.
2006-02-28 00:32:31 +00:00
return;
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if(PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return;
if(PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)
return;
if(PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type)
< 0) return;
if(PyDict_SetItemString(d, "Expression", (PyObject*)Expression_type) <
0) return;
if(PyDict_SetItemString(d, "Suite", (PyObject*)Suite_type) < 0) return;
if(PyDict_SetItemString(d, "stmt", (PyObject*)stmt_type) < 0) return;
if(PyDict_SetItemString(d, "FunctionDef", (PyObject*)FunctionDef_type)
< 0) return;
if(PyDict_SetItemString(d, "ClassDef", (PyObject*)ClassDef_type) < 0)
return;
if(PyDict_SetItemString(d, "Return", (PyObject*)Return_type) < 0)
return;
if(PyDict_SetItemString(d, "Delete", (PyObject*)Delete_type) < 0)
return;
if(PyDict_SetItemString(d, "Assign", (PyObject*)Assign_type) < 0)
return;
if(PyDict_SetItemString(d, "AugAssign", (PyObject*)AugAssign_type) < 0)
return;
if(PyDict_SetItemString(d, "Print", (PyObject*)Print_type) < 0) return;
if(PyDict_SetItemString(d, "For", (PyObject*)For_type) < 0) return;
if(PyDict_SetItemString(d, "While", (PyObject*)While_type) < 0) return;
if(PyDict_SetItemString(d, "If", (PyObject*)If_type) < 0) return;
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 22:32:47 +00:00
if(PyDict_SetItemString(d, "With", (PyObject*)With_type) < 0) return;
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 15:23:19 +00:00
if(PyDict_SetItemString(d, "Raise", (PyObject*)Raise_type) < 0) return;
if(PyDict_SetItemString(d, "TryExcept", (PyObject*)TryExcept_type) < 0)
return;
if(PyDict_SetItemString(d, "TryFinally", (PyObject*)TryFinally_type) <
0) return;
if(PyDict_SetItemString(d, "Assert", (PyObject*)Assert_type) < 0)
return;
if(PyDict_SetItemString(d, "Import", (PyObject*)Import_type) < 0)
return;
if(PyDict_SetItemString(d, "ImportFrom", (PyObject*)ImportFrom_type) <
0) return;
if(PyDict_SetItemString(d, "Exec", (PyObject*)Exec_type) < 0) return;
if(PyDict_SetItemString(d, "Global", (PyObject*)Global_type) < 0)
return;
if(PyDict_SetItemString(d, "Expr", (PyObject*)Expr_type) < 0) return;
if(PyDict_SetItemString(d, "Pass", (PyObject*)Pass_type) < 0) return;
if(PyDict_SetItemString(d, "Break", (PyObject*)Break_type) < 0) return;
if(PyDict_SetItemString(d, "Continue", (PyObject*)Continue_type) < 0)
return;
if(PyDict_SetItemString(d, "expr", (PyObject*)expr_type) < 0) return;
if(PyDict_SetItemString(d, "BoolOp", (PyObject*)BoolOp_type) < 0)
return;
if(PyDict_SetItemString(d, "BinOp", (PyObject*)BinOp_type) < 0) return;
if(PyDict_SetItemString(d, "UnaryOp", (PyObject*)UnaryOp_type) < 0)
return;
if(PyDict_SetItemString(d, "Lambda", (PyObject*)Lambda_type) < 0)
return;
if(PyDict_SetItemString(d, "IfExp", (PyObject*)IfExp_type) < 0) return;
if(PyDict_SetItemString(d, "Dict", (PyObject*)Dict_type) < 0) return;
if(PyDict_SetItemString(d, "ListComp", (PyObject*)ListComp_type) < 0)
return;
if(PyDict_SetItemString(d, "GeneratorExp",
(PyObject*)GeneratorExp_type) < 0) return;
if(PyDict_SetItemString(d, "Yield", (PyObject*)Yield_type) < 0) return;
if(PyDict_SetItemString(d, "Compare", (PyObject*)Compare_type) < 0)
return;
if(PyDict_SetItemString(d, "Call", (PyObject*)Call_type) < 0) return;
if(PyDict_SetItemString(d, "Repr", (PyObject*)Repr_type) < 0) return;
if(PyDict_SetItemString(d, "Num", (PyObject*)Num_type) < 0) return;
if(PyDict_SetItemString(d, "Str", (PyObject*)Str_type) < 0) return;
if(PyDict_SetItemString(d, "Attribute", (PyObject*)Attribute_type) < 0)
return;
if(PyDict_SetItemString(d, "Subscript", (PyObject*)Subscript_type) < 0)
return;
if(PyDict_SetItemString(d, "Name", (PyObject*)Name_type) < 0) return;
if(PyDict_SetItemString(d, "List", (PyObject*)List_type) < 0) return;
if(PyDict_SetItemString(d, "Tuple", (PyObject*)Tuple_type) < 0) return;
if(PyDict_SetItemString(d, "expr_context",
(PyObject*)expr_context_type) < 0) return;
if(PyDict_SetItemString(d, "Load", (PyObject*)Load_type) < 0) return;
if(PyDict_SetItemString(d, "Store", (PyObject*)Store_type) < 0) return;
if(PyDict_SetItemString(d, "Del", (PyObject*)Del_type) < 0) return;
if(PyDict_SetItemString(d, "AugLoad", (PyObject*)AugLoad_type) < 0)
return;
if(PyDict_SetItemString(d, "AugStore", (PyObject*)AugStore_type) < 0)
return;
if(PyDict_SetItemString(d, "Param", (PyObject*)Param_type) < 0) return;
if(PyDict_SetItemString(d, "slice", (PyObject*)slice_type) < 0) return;
if(PyDict_SetItemString(d, "Ellipsis", (PyObject*)Ellipsis_type) < 0)
return;
if(PyDict_SetItemString(d, "Slice", (PyObject*)Slice_type) < 0) return;
if(PyDict_SetItemString(d, "ExtSlice", (PyObject*)ExtSlice_type) < 0)
return;
if(PyDict_SetItemString(d, "Index", (PyObject*)Index_type) < 0) return;
if(PyDict_SetItemString(d, "boolop", (PyObject*)boolop_type) < 0)
return;
if(PyDict_SetItemString(d, "And", (PyObject*)And_type) < 0) return;
if(PyDict_SetItemString(d, "Or", (PyObject*)Or_type) < 0) return;
if(PyDict_SetItemString(d, "operator", (PyObject*)operator_type) < 0)
return;
if(PyDict_SetItemString(d, "Add", (PyObject*)Add_type) < 0) return;
if(PyDict_SetItemString(d, "Sub", (PyObject*)Sub_type) < 0) return;
if(PyDict_SetItemString(d, "Mult", (PyObject*)Mult_type) < 0) return;
if(PyDict_SetItemString(d, "Div", (PyObject*)Div_type) < 0) return;
if(PyDict_SetItemString(d, "Mod", (PyObject*)Mod_type) < 0) return;
if(PyDict_SetItemString(d, "Pow", (PyObject*)Pow_type) < 0) return;
if(PyDict_SetItemString(d, "LShift", (PyObject*)LShift_type) < 0)
return;
if(PyDict_SetItemString(d, "RShift", (PyObject*)RShift_type) < 0)
return;
if(PyDict_SetItemString(d, "BitOr", (PyObject*)BitOr_type) < 0) return;
if(PyDict_SetItemString(d, "BitXor", (PyObject*)BitXor_type) < 0)
return;
if(PyDict_SetItemString(d, "BitAnd", (PyObject*)BitAnd_type) < 0)
return;
if(PyDict_SetItemString(d, "FloorDiv", (PyObject*)FloorDiv_type) < 0)
return;
if(PyDict_SetItemString(d, "unaryop", (PyObject*)unaryop_type) < 0)
return;
if(PyDict_SetItemString(d, "Invert", (PyObject*)Invert_type) < 0)
return;
if(PyDict_SetItemString(d, "Not", (PyObject*)Not_type) < 0) return;
if(PyDict_SetItemString(d, "UAdd", (PyObject*)UAdd_type) < 0) return;
if(PyDict_SetItemString(d, "USub", (PyObject*)USub_type) < 0) return;
if(PyDict_SetItemString(d, "cmpop", (PyObject*)cmpop_type) < 0) return;
if(PyDict_SetItemString(d, "Eq", (PyObject*)Eq_type) < 0) return;
if(PyDict_SetItemString(d, "NotEq", (PyObject*)NotEq_type) < 0) return;
if(PyDict_SetItemString(d, "Lt", (PyObject*)Lt_type) < 0) return;
if(PyDict_SetItemString(d, "LtE", (PyObject*)LtE_type) < 0) return;
if(PyDict_SetItemString(d, "Gt", (PyObject*)Gt_type) < 0) return;
if(PyDict_SetItemString(d, "GtE", (PyObject*)GtE_type) < 0) return;
if(PyDict_SetItemString(d, "Is", (PyObject*)Is_type) < 0) return;
if(PyDict_SetItemString(d, "IsNot", (PyObject*)IsNot_type) < 0) return;
if(PyDict_SetItemString(d, "In", (PyObject*)In_type) < 0) return;
if(PyDict_SetItemString(d, "NotIn", (PyObject*)NotIn_type) < 0) return;
if(PyDict_SetItemString(d, "comprehension",
(PyObject*)comprehension_type) < 0) return;
if(PyDict_SetItemString(d, "excepthandler",
(PyObject*)excepthandler_type) < 0) return;
if(PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) < 0)
return;
if(PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)
return;
if(PyDict_SetItemString(d, "alias", (PyObject*)alias_type) < 0) return;
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 19:42:26 +00:00
PyObject* PyAST_mod2obj(mod_ty t)
{
init_types();
return ast2obj_mod(t);
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 19:59:25 +00:00
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 19:14:20 +00:00
Reference in a new issue Copy permalink