[Python-checkins] CVS: python/dist/src/Grammar Grammar,1.42,1.42.6.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Grammar
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src/Grammar

Modified Files:
      Tag: descr-branch
	Grammar 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.


Index: Grammar
===================================================================
RCS file: /cvsroot/python/python/dist/src/Grammar/Grammar,v
retrieving revision 1.42
retrieving revision 1.42.6.1
diff -C2 -r1.42 -r1.42.6.1
*** Grammar	2001/02/27 18:36:14	1.42
--- Grammar	2001/07/07 22:55:27	1.42.6.1
***************
*** 44,51 ****
  del_stmt: 'del' exprlist
  pass_stmt: 'pass'
! flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt
  break_stmt: 'break'
  continue_stmt: 'continue'
  return_stmt: 'return' [testlist]
  raise_stmt: 'raise' [test [',' test [',' test]]]
  import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*)
--- 44,52 ----
  del_stmt: 'del' exprlist
  pass_stmt: 'pass'
! flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
  break_stmt: 'break'
  continue_stmt: 'continue'
  return_stmt: 'return' [testlist]
+ yield_stmt: 'yield' testlist
  raise_stmt: 'raise' [test [',' test [',' test]]]
  import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*)