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).

1 files changed, 44 insertions, 42 deletions

diff --git a/Include/graminit.h b/Include/graminit.h
index e80473475a..9af182a560 100644
--- a/Include/graminit.h
+++ b/Include/graminit.h
@@ -38,45 +38,47 @@
 #define while_stmt 293
 #define for_stmt 294
 #define try_stmt 295
-#define except_clause 296
-#define suite 297
-#define testlist_safe 298
-#define old_test 299
-#define old_lambdef 300
-#define test 301
-#define or_test 302
-#define and_test 303
-#define not_test 304
-#define comparison 305
-#define comp_op 306
-#define expr 307
-#define xor_expr 308
-#define and_expr 309
-#define shift_expr 310
-#define arith_expr 311
-#define term 312
-#define factor 313
-#define power 314
-#define atom 315
-#define listmaker 316
-#define testlist_gexp 317
-#define lambdef 318
-#define trailer 319
-#define subscriptlist 320
-#define subscript 321
-#define sliceop 322
-#define exprlist 323
-#define testlist 324
-#define dictmaker 325
-#define classdef 326
-#define arglist 327
-#define argument 328
-#define list_iter 329
-#define list_for 330
-#define list_if 331
-#define gen_iter 332
-#define gen_for 333
-#define gen_if 334
-#define testlist1 335
-#define encoding_decl 336
-#define yield_expr 337
+#define with_stmt 296
+#define with_var 297
+#define except_clause 298
+#define suite 299
+#define testlist_safe 300
+#define old_test 301
+#define old_lambdef 302
+#define test 303
+#define or_test 304
+#define and_test 305
+#define not_test 306
+#define comparison 307
+#define comp_op 308
+#define expr 309
+#define xor_expr 310
+#define and_expr 311
+#define shift_expr 312
+#define arith_expr 313
+#define term 314
+#define factor 315
+#define power 316
+#define atom 317
+#define listmaker 318
+#define testlist_gexp 319
+#define lambdef 320
+#define trailer 321
+#define subscriptlist 322
+#define subscript 323
+#define sliceop 324
+#define exprlist 325
+#define testlist 326
+#define dictmaker 327
+#define classdef 328
+#define arglist 329
+#define argument 330
+#define list_iter 331
+#define list_for 332
+#define list_if 333
+#define gen_iter 334
+#define gen_for 335
+#define gen_if 336
+#define testlist1 337
+#define encoding_decl 338
+#define yield_expr 339