[Python-checkins] python/nondist/sandbox/ast python.asdl,1.9,1.10

[bckfnn@sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/ast
In directory usw-pr-cvs1:/tmp/cvs-serv14173

Modified Files:
	python.asdl 
Log Message:
Refactored 'Import' and 'ImportFrom' to support 'as' alias in both import
statements.



Index: python.asdl
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/ast/python.asdl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** python.asdl	11 Apr 2002 21:20:19 -0000	1.9
--- python.asdl	14 Apr 2002 09:23:01 -0000	1.10
***************
*** 28,39 ****
  	      | Assert(expr test, expr? msg)
  
! 	      -- may want to factor this differently perhaps excluding
!               -- 'as' from the type because can mix name and alias w/ from
! 	      -- also need import *
! 	      | Import(identifier* names)
! 	      | ImportAs(identifier name, identifier alias)
! 	      | ImportFrom(identifier module, identifier* names)
! 	      | ImportFromAs(identifier module, identifier name,
! 			     identifier alias)
  
  	      -- Doesn't capture requirement that locals must be
--- 28,33 ----
  	      | Assert(expr test, expr? msg)
  
! 	      | Import(alias* names)
! 	      | ImportFrom(identifier module, alias* names)
  
  	      -- Doesn't capture requirement that locals must be
***************
*** 97,99 ****
          -- keyword arguments supplied to call
          keyword = (identifier arg, expr value)
! }
\ No newline at end of file
--- 91,96 ----
          -- keyword arguments supplied to call
          keyword = (identifier arg, expr value)
! 
!         -- import name with optional 'as' alias.
!         alias = (identifier name, identifier? asname)
! }