[Python-checkins] CVS: python/dist/src/Parser parser.c,2.18.8.1,2.18.8.2

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Parser
In directory usw-pr-cvs1:/tmp/cvs-serv27169/descr/dist/src/Parser

Modified Files:
      Tag: descr-branch
	parser.c 
Log Message:
Merge of trunk delta date2001-07-17b to date2001-07-21.  See PLAN.txt.


Index: parser.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parser.c,v
retrieving revision 2.18.8.1
retrieving revision 2.18.8.2
diff -C2 -r2.18.8.1 -r2.18.8.2
*** parser.c	2001/07/16 21:41:07	2.18.8.1
--- parser.c	2001/07/21 06:07:14	2.18.8.2
***************
*** 176,179 ****
--- 176,180 ----
  	node *n = ps->p_stack.s_top->s_parent;
  	node *ch;
+ 	int i;
  
  	if (strcmp(STR(CHILD(n, 0)), "from") != 0)
***************
*** 182,188 ****
  	if (strcmp(STR(CHILD(ch, 0)), "__future__") != 0)
  		return;
! 	ch = CHILD(n, 3);
! 	if (NCH(ch) == 1 && strcmp(STR(CHILD(ch, 0)), "generators") == 0)
! 		ps->p_generators = 1;
  }
  
--- 183,194 ----
  	if (strcmp(STR(CHILD(ch, 0)), "__future__") != 0)
  		return;
! 	for (i = 3; i < NCH(n); i += 2) {
! 		ch = CHILD(n, i);
! 		if (NCH(ch) >= 1 && TYPE(CHILD(ch, 0)) == NAME &&
! 		    strcmp(STR(CHILD(ch, 0)), "generators") == 0) {
! 			ps->p_generators = 1;
! 			break;
! 		}
! 	}
  }