[Python-checkins] python/dist/src/Include graminit.h, 2.21, 2.22 node.h, 2.22, 2.23 token.h, 2.20, 2.21

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6086/Include

Modified Files:
	graminit.h node.h token.h 
Log Message:
PEP-0318, @decorator-style. In Guido's words:
"@ seems the syntax that everybody can hate equally"
Implementation by Mark Russell, from SF #979728.


Index: graminit.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/graminit.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -d -r2.21 -r2.22
*** graminit.h	19 May 2004 08:20:05 -0000	2.21
--- graminit.h	2 Aug 2004 06:09:53 -0000	2.22
***************
*** 2,72 ****
  #define file_input 257
  #define eval_input 258
! #define funcdef 259
! #define parameters 260
! #define varargslist 261
! #define fpdef 262
! #define fplist 263
! #define stmt 264
! #define simple_stmt 265
! #define small_stmt 266
! #define expr_stmt 267
! #define augassign 268
! #define print_stmt 269
! #define del_stmt 270
! #define pass_stmt 271
! #define flow_stmt 272
! #define break_stmt 273
! #define continue_stmt 274
! #define return_stmt 275
! #define yield_stmt 276
! #define raise_stmt 277
! #define import_stmt 278
! #define import_as_name 279
! #define dotted_as_name 280
! #define dotted_name 281
! #define global_stmt 282
! #define exec_stmt 283
! #define assert_stmt 284
! #define compound_stmt 285
! #define if_stmt 286
! #define while_stmt 287
! #define for_stmt 288
! #define try_stmt 289
! #define except_clause 290
! #define suite 291
! #define test 292
! #define and_test 293
! #define not_test 294
! #define comparison 295
! #define comp_op 296
! #define expr 297
! #define xor_expr 298
! #define and_expr 299
! #define shift_expr 300
! #define arith_expr 301
! #define term 302
! #define factor 303
! #define power 304
! #define atom 305
! #define listmaker 306
! #define testlist_gexp 307
! #define lambdef 308
! #define trailer 309
! #define subscriptlist 310
! #define subscript 311
! #define sliceop 312
! #define exprlist 313
! #define testlist 314
! #define testlist_safe 315
! #define dictmaker 316
! #define classdef 317
! #define arglist 318
! #define argument 319
! #define list_iter 320
! #define list_for 321
! #define list_if 322
! #define gen_iter 323
! #define gen_for 324
! #define gen_if 325
! #define testlist1 326
! #define encoding_decl 327
--- 2,74 ----
  #define file_input 257
  #define eval_input 258
! #define decorator 259
! #define decorators 260
! #define funcdef 261
! #define parameters 262
! #define varargslist 263
! #define fpdef 264
! #define fplist 265
! #define stmt 266
! #define simple_stmt 267
! #define small_stmt 268
! #define expr_stmt 269
! #define augassign 270
! #define print_stmt 271
! #define del_stmt 272
! #define pass_stmt 273
! #define flow_stmt 274
! #define break_stmt 275
! #define continue_stmt 276
! #define return_stmt 277
! #define yield_stmt 278
! #define raise_stmt 279
! #define import_stmt 280
! #define import_as_name 281
! #define dotted_as_name 282
! #define dotted_name 283
! #define global_stmt 284
! #define exec_stmt 285
! #define assert_stmt 286
! #define compound_stmt 287
! #define if_stmt 288
! #define while_stmt 289
! #define for_stmt 290
! #define try_stmt 291
! #define except_clause 292
! #define suite 293
! #define test 294
! #define and_test 295
! #define not_test 296
! #define comparison 297
! #define comp_op 298
! #define expr 299
! #define xor_expr 300
! #define and_expr 301
! #define shift_expr 302
! #define arith_expr 303
! #define term 304
! #define factor 305
! #define power 306
! #define atom 307
! #define listmaker 308
! #define testlist_gexp 309
! #define lambdef 310
! #define trailer 311
! #define subscriptlist 312
! #define subscript 313
! #define sliceop 314
! #define exprlist 315
! #define testlist 316
! #define testlist_safe 317
! #define dictmaker 318
! #define classdef 319
! #define arglist 320
! #define argument 321
! #define list_iter 322
! #define list_for 323
! #define list_if 324
! #define gen_iter 325
! #define gen_for 326
! #define gen_if 327
! #define testlist1 328
! #define encoding_decl 329

Index: node.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/node.h,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** node.h	17 Sep 2002 03:27:02 -0000	2.22
--- node.h	2 Aug 2004 06:09:53 -0000	2.23
***************
*** 23,27 ****
--- 23,29 ----
  /* Node access functions */
  #define NCH(n)		((n)->n_nchildren)
+ 	
  #define CHILD(n, i)	(&(n)->n_child[i])
+ #define RCHILD(n, i)	(CHILD(n, NCH(n) + i))
  #define TYPE(n)		((n)->n_type)
  #define STR(n)		((n)->n_str)

Index: token.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/token.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -d -r2.20 -r2.21
*** token.h	12 Aug 2002 07:21:57 -0000	2.20
--- token.h	2 Aug 2004 06:09:53 -0000	2.21
***************
*** 58,65 ****
  #define DOUBLESLASH	48
  #define DOUBLESLASHEQUAL 49
  /* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
! #define OP		50
! #define ERRORTOKEN	51
! #define N_TOKENS	52
  
  /* Special definitions for cooperation with parser */
--- 58,66 ----
  #define DOUBLESLASH	48
  #define DOUBLESLASHEQUAL 49
+ #define AT              50	
  /* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */
! #define OP		51
! #define ERRORTOKEN	52
! #define N_TOKENS	53
  
  /* Special definitions for cooperation with parser */