comparison Python/Python-ast.c @ 46233:61c92923cf7f

Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
author Neal Norwitz <nnorwitz@gmail.com>
date Mon, 31 Mar 2008 05:29:39 +0000
parents 81ee270a6eb5
children 23ab586c427a
comparison
equal deleted inserted replaced
46231:81ee270a6eb5 46233:61c92923cf7f
1 /* File automatically generated by Parser/asdl_c.py. */ 1 /* File automatically generated by Parser/asdl_c.py. */
2 2
3 3
4 /* 4 /*
5 __version__ 57783. 5 __version__ 62078.
6 6
7 This module must be committed separately after each AST grammar change; 7 This module must be committed separately after each AST grammar change;
8 The __version__ number is set to the revision number of the commit 8 The __version__ number is set to the revision number of the commit
9 containing the grammar change. 9 containing the grammar change.
10 */ 10 */
443 cleanup: 443 cleanup:
444 Py_XDECREF(fields); 444 Py_XDECREF(fields);
445 return res; 445 return res;
446 } 446 }
447 447
448 /* Pickling support */
449 static PyObject *
450 ast_type_reduce(PyObject *self, PyObject *unused)
451 {
452 PyObject *res;
453 PyObject *dict = PyObject_GetAttrString(self, "__dict__");
454 if (dict == NULL) {
455 if (PyErr_ExceptionMatches(PyExc_AttributeError))
456 PyErr_Clear();
457 else
458 return NULL;
459 }
460 if (dict) {
461 res = Py_BuildValue("O()O", Py_TYPE(self), dict);
462 Py_DECREF(dict);
463 return res;
464 }
465 return Py_BuildValue("O()", Py_TYPE(self));
466 }
467
468 static PyMethodDef ast_type_methods[] = {
469 {"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
470 {NULL}
471 };
472
448 static PyTypeObject AST_type = { 473 static PyTypeObject AST_type = {
449 PyVarObject_HEAD_INIT(&PyType_Type, 0) 474 PyVarObject_HEAD_INIT(&PyType_Type, 0)
450 "AST", 475 "_ast.AST",
451 sizeof(PyObject), 476 sizeof(PyObject),
452 0, 477 0,
453 0, /* tp_dealloc */ 478 0, /* tp_dealloc */
454 0, /* tp_print */ 479 0, /* tp_print */
455 0, /* tp_getattr */ 480 0, /* tp_getattr */
471 0, /* tp_clear */ 496 0, /* tp_clear */
472 0, /* tp_richcompare */ 497 0, /* tp_richcompare */
473 0, /* tp_weaklistoffset */ 498 0, /* tp_weaklistoffset */
474 0, /* tp_iter */ 499 0, /* tp_iter */
475 0, /* tp_iternext */ 500 0, /* tp_iternext */
476 0, /* tp_methods */ 501 ast_type_methods, /* tp_methods */
477 0, /* tp_members */ 502 0, /* tp_members */
478 0, /* tp_getset */ 503 0, /* tp_getset */
479 0, /* tp_base */ 504 0, /* tp_base */
480 0, /* tp_dict */ 505 0, /* tp_dict */
481 0, /* tp_descr_get */ 506 0, /* tp_descr_get */
490 515
491 static PyTypeObject* make_type(char *type, PyTypeObject* base, char**fields, int num_fields) 516 static PyTypeObject* make_type(char *type, PyTypeObject* base, char**fields, int num_fields)
492 { 517 {
493 PyObject *fnames, *result; 518 PyObject *fnames, *result;
494 int i; 519 int i;
495 if (num_fields) { 520 fnames = PyTuple_New(num_fields);
496 fnames = PyTuple_New(num_fields); 521 if (!fnames) return NULL;
497 if (!fnames) return NULL; 522 for (i = 0; i < num_fields; i++) {
498 } else {
499 fnames = Py_None;
500 Py_INCREF(Py_None);
501 }
502 for(i=0; i < num_fields; i++) {
503 PyObject *field = PyUnicode_FromString(fields[i]); 523 PyObject *field = PyUnicode_FromString(fields[i]);
504 if (!field) { 524 if (!field) {
505 Py_DECREF(fnames); 525 Py_DECREF(fnames);
506 return NULL; 526 return NULL;
507 } 527 }
6373 if (!m) return; 6393 if (!m) return;
6374 d = PyModule_GetDict(m); 6394 d = PyModule_GetDict(m);
6375 if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return; 6395 if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return;
6376 if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0) 6396 if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)
6377 return; 6397 return;
6378 if (PyModule_AddStringConstant(m, "__version__", "57783") < 0) 6398 if (PyModule_AddStringConstant(m, "__version__", "62078") < 0)
6379 return; 6399 return;
6380 if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return; 6400 if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return;
6381 if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0) 6401 if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)
6382 return; 6402 return;
6383 if (PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type) 6403 if (PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type)