From 9b03305f3b77bb7eaec6cbf661cd41202b8b96f5 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@users.sourceforge.net>
Date: Thu, 22 Oct 2009 14:48:05 +0200
Subject: [PATCH] Improved functions behavior Version:1.1.42

---
 src/parsed_text.py | 31 ++++++++-----------------------
 src/version.py     |  2 +-
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/parsed_text.py b/src/parsed_text.py
index 41d83d3..85ee2cb 100644
--- a/src/parsed_text.py
+++ b/src/parsed_text.py
@@ -363,27 +363,6 @@ def add_subroutine_needs():
   
 parsed_text = add_subroutine_needs()
 
-######################################################################
-def find_vars_from_functions():
-  main_result = []
-  for filename, text in parsed_text:
-    result = []
-    for vars,line in text:
-      if type(line) in [ \
-        Simple_line,  Assert,
-        Do         ,  If,
-        Elseif     ,  Select,
-        Call       ,  Provide_all
-      ]: 
-        funcs = find_funcs_in_line(line)
-        for f in funcs:
-          vars += subroutines[f].needs 
-      result.append( (vars,line) )
-    main_result.append( (filename, result) )
-  return main_result
-
-parsed_text = find_vars_from_functions()
-
 ######################################################################
 def build_needs():
   # Needs
@@ -404,8 +383,14 @@ def build_needs():
         if isinstance(line,Call):
           subname = find_subname(line)
           var.needs += subroutines[subname].needs
-        # Need to do the same for functions. Variables inside if blocks of the 
-        # function are not seen in tree.
+        elif type(line) in [ \
+          Simple_line,  Assert,
+          Do         ,  If,
+          Elseif     ,  Select,
+        ]: 
+          funcs = find_funcs_in_line(line)
+          for f in funcs:
+            var.needs += subroutines[f].needs 
   for v in variables.keys():
     main = variables[v].same_as 
     if main != v:
diff --git a/src/version.py b/src/version.py
index fef004d..5e8d1b5 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1 +1 @@
-version = "1.1.41"
+version = "1.1.42"