Fix bug that allowed future statements virtually anywhere in a module.

jeremyhylton · jeremyhylton · commit c9add9a48316 · 2005-02-04T18:38:43.000Z
If we exit via the break here, we need to set ff_last_lineno or
FUTURE_POSSIBLE() will remain true.  The bug affected statements
containing a variety of expressions, but not all expressions.  It has
been present since Python 2.2.
diff --git a/Python/future.c b/Python/future.c
@@ -93,7 +93,6 @@ future_parse(PyFutureFeatures *ff, node *n, const char *filename)
 {
 	int i, r;
  loop:
-
 	switch (TYPE(n)) {
 
 	case single_input:
@@ -222,6 +221,7 @@ future_parse(PyFutureFeatures *ff, node *n, const char *filename)
 			n = CHILD(n, 0);
 			goto loop;
 		}
+                ff->ff_last_lineno = n->n_lineno;
 		break;
 
 	case atom:
@@ -258,4 +258,3 @@ PyNode_Future(node *n, const char *filename)
 	}
 	return ff;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ future_parse(PyFutureFeatures ff, node n, const char *filename)`
`93`	`93`	`{`
`94`	`94`	`int i, r;`
`95`	`95`	`loop:`
`96`		`-`
`97`	`96`	`switch (TYPE(n)) {`
`98`	`97`
`99`	`98`	`case single_input:`
`@@ -222,6 +221,7 @@ future_parse(PyFutureFeatures ff, node n, const char *filename)`
`222`	`221`	`n = CHILD(n, 0);`
`223`	`222`	`goto loop;`
`224`	`223`	`}`
	`224`	`+ ff->ff_last_lineno = n->n_lineno;`
`225`	`225`	`break;`
`226`	`226`
`227`	`227`	`case atom:`
`@@ -258,4 +258,3 @@ PyNode_Future(node n, const char filename)`
`258`	`258`	`}`
`259`	`259`	`return ff;`
`260`	`260`	`}`
`261`		`-`