Merge lp:~monkey-libre/valide/update-afrodite into lp:valide

[Monkey]

Update Afrodite from vtg-0.11.1
Changes in the api:
Removed the try_acquire_ast / release_ast

Works very fast and without any problem. More info attached in the bug.
Thanks in advance.

[Monkey (monkey-libre)]

Check this a lot because Afrodite could crash but I cannot reproduce it.

Thanks in advance.

=== modified file 'plugins/completion/afrodite-provider/afrodite-provider.vala'
--- plugins/completion/afrodite-provider/afrodite-provider.vala	2011-02-20 14:12:17 +0000
+++ plugins/completion/afrodite-provider/afrodite-provider.vala	2011-03-10 19:26:24 +0000
@@ -737,40 +737,35 @@
       first_part = word; // "this"; //HACK: this won't work for static methods
     }
 
-    Afrodite.Ast ast;
+    Afrodite.Ast ast = completion.ast;
     Afrodite.Symbol? symbol = null;
-
-    if (this.completion.try_acquire_ast (out ast, retry_count))
-    {
-      Afrodite.QueryResult? result = null;
-      Afrodite.QueryOptions options = this.get_options_for_line (text, is_assignment, is_creation);
-
+    Afrodite.QueryResult? result = null;
+    Afrodite.QueryOptions options = this.get_options_for_line (text, is_assignment, is_creation);
+
+    if (word == symbol_name)
+    {
+      result = this.get_symbol_for_name (options, ast, first_part, null,  line, col);
+    }
+    else
+    {
+      result = this.get_symbol_type_for_name (options, ast, first_part, null,  line, col);
+    }
+
+    if (result != null && !result.is_empty)
+    {
+      var first = result.children.get (0);
       if (word == symbol_name)
       {
-        result = this.get_symbol_for_name (options, ast, first_part, null,  line, col);
+        symbol = first.symbol;
       }
       else
       {
-        result = this.get_symbol_type_for_name (options, ast, first_part, null,  line, col);
-      }
-
-      if (result != null && !result.is_empty)
-      {
-        var first = result.children.get (0);
-        if (word == symbol_name)
-        {
-          symbol = first.symbol;
-        }
-        else
-        {
-          symbol = this.get_symbol_for_name_in_children (symbol_name, first.symbol);
-          if (symbol == null)
-          {
-            symbol =this.get_symbol_for_name_in_base_types (symbol_name, first.symbol);
-          }
-        }
-      }
-      this.completion.release_ast (ast);
+        symbol = this.get_symbol_for_name_in_children (symbol_name, first.symbol);
+        if (symbol == null)
+        {
+          symbol =this.get_symbol_for_name_in_base_types (symbol_name, first.symbol);
+        }
+      }
     }
     return symbol;
   }
@@ -857,10 +852,9 @@
 
     Vtg.ParserUtils.parse_line (text, out word, out is_assignment, out is_creation, out is_declaration);
 
-    Afrodite.Ast ast = null;
+    Afrodite.Ast ast = completion.ast;
     Vtg.Utils.trace ("completing word: '%s'", word);
-    if (!Vtg.StringUtils.is_null_or_empty (word)
-        && this.completion.try_acquire_ast (out ast))
+    if (!Vtg.StringUtils.is_null_or_empty (word))
     {
       Afrodite.QueryOptions options = this.get_options_for_line (text, is_assignment, is_creation);
       Afrodite.QueryResult result = null;
@@ -878,7 +872,6 @@
       }
       result = this.get_symbol_type_for_name (options, ast, word, text, line, col);
       this.transform_result (options, result);
-      this.completion.release_ast (ast);
     }
     else
     {
@@ -895,12 +888,11 @@
 
   private void lookup_visible_symbols_in_scope (string word, Afrodite.CompareMode mode)
   {
-    Afrodite.Ast ast = null;
+    Afrodite.Ast ast = completion.ast;
     Vtg.Utils.trace ("lookup_all_symbols_in_scope: mode: %s word:'%s' ",
       mode == Afrodite.CompareMode.EXACT ? "exact" : "start-with",
       word);
-    if (!Vtg.StringUtils.is_null_or_empty (word)
-        && this.completion.try_acquire_ast (out ast, 0))
+    if (!Vtg.StringUtils.is_null_or_empty (word))
     {
       Vala.List<Afrodite.Symbol> results = new Vala.ArrayList<Afrodite.Symbol> ();
 
@@ -929,7 +921,6 @@
         this.proposals = new List<Gtk.SourceCompletionItem> ();
         append_symbols (null, results);
       }
-      this.completion.release_ast (ast);
     }
     else
     {

=== modified file 'plugins/completion/afrodite-provider/afrodite/Makefile.am'
--- plugins/completion/afrodite-provider/afrodite/Makefile.am	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/Makefile.am	2011-03-10 19:26:24 +0000
@@ -61,7 +61,7 @@
 	touch $@
 
 libafrodite_la_LDFLAGS = \
-	-version-info 0:1:0 \
+	-version-info 1:0:0 \
 	$(NULL)
 
 libafrodite_la_LIBADD = \

=== modified file 'plugins/completion/afrodite-provider/afrodite/afroditetest.vala'
--- plugins/completion/afrodite-provider/afrodite/afroditetest.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/afroditetest.vala	2011-03-10 19:26:24 +0000
@@ -47,10 +47,11 @@
 };
 
 public class AfroditeTest.Application : Object {
+
+	private MainLoop _loop;
+	private Afrodite.CompletionEngine _engine;
+	
 	public int run (string[] args) {
-		int i = 0;
-		int result = 0;
-
 		// parse options
 		var opt_context = new OptionContext ("- Afrodite Test");
 		opt_context.set_help_enabled (true);
@@ -60,12 +61,119 @@
 		} catch (Error err) {
 			error (_("parsing options"));
 		}
-		
-		var engine = new Afrodite.CompletionEngine ("afrodite-test-engine");
-		
+
 		if (option_repeat == 0)
 			option_repeat = 1;
-			
+
+		parse ();
+		_loop = new MainLoop();
+		_loop.run();
+		return 0;
+	}
+
+	private void on_begin_parsing (CompletionEngine engine)
+	{
+		print ("\nAfrodite engine is parsing sources\n");
+	}
+	private void on_end_parsing (CompletionEngine engine)
+	{
+		print ("\nAfrodite engine end parsing sources\n");
+		_loop.quit ();
+		dump (engine);
+	}
+
+	private void dump (CompletionEngine engine)
+	{
+		print (": done\n\n");
+		print ("Looking for '%s' %d,%d\n\nDump follows:\n", option_symbol_name, option_line, option_column);
+		while (true)
+		{
+			// dumping tree (just a debug facility)
+			var dumper = new Afrodite.AstDumper ();
+			dumper.dump (engine.ast, option_namespace);
+			print ("\n");
+
+			// Query the AST
+			if (option_visible_symbols != null) {
+				var source = engine.ast.lookup_source_file (option_visible_symbols);
+				if (source != null) {
+					// get the source node at this position
+					var s = engine.ast.get_symbol_for_source_and_position (source, option_line, option_column);
+					if (s != null) {
+						Vala.List<Symbol> syms = null;
+						syms = engine.ast.lookup_visible_symbols_from_symbol (s, option_filter);
+						print ("Symbols found: %d\n", syms.size);
+						foreach (Symbol sym in syms) {
+							print ("          from %s: %s\n", sym.parent == null ? "<root>" : sym.parent.fully_qualified_name, Utils.unescape_xml_string (sym.description));
+						}
+					} else {
+						print ("no symbol found for position: %d-%d\n", option_line, option_column);
+					}
+				} else {
+					print ("source file not found: %s\n", option_visible_symbols);
+				}
+			} else if (option_symbol_name != null) {
+				// Setup query options
+				QueryOptions options = QueryOptions.standard ();
+				options.auto_member_binding_mode = true;
+				options.compare_mode = CompareMode.EXACT;
+				options.access = Afrodite.SymbolAccessibility.ANY;
+				options.binding = Afrodite.MemberBinding.ANY;
+
+				QueryResult sym = null;
+				sym = engine.ast.get_symbol_type_for_name_and_path (options, option_symbol_name, option_files[0], option_line, option_column);
+				print ("The type for '%s' is: ", option_symbol_name);
+				if (!sym.is_empty) {
+					foreach (ResultItem item in sym.children) {
+						print ("%s\n     Childs:\n", Utils.unescape_xml_string (item.symbol.description));
+						if (item.symbol.has_children) {
+							int count = 0;
+							// print an excerpt of the child symbols
+							foreach (var child in item.symbol.children) {
+								print ("          %s\n", Utils.unescape_xml_string (child.description));
+								count++;
+								if (count == 6) {
+									print ("          ......\n");
+									break;
+								}
+							}
+							if (count < 6 && item.symbol.has_base_types) {
+								foreach (var base_item in item.symbol.base_types) {
+									if (base_item.unresolved || !base_item.symbol.has_children)
+										continue;
+
+									foreach (var child in base_item.symbol.children) {
+										print ("          %s\n", Utils.unescape_xml_string (child.description));
+										count++;
+										if (count == 6)
+											break;
+									}
+
+									if (count == 6) {
+										print ("          ......\n");
+										break;
+									}
+								}
+							}
+						}
+					}
+				} else {
+					print ("unresolved :(\n");
+				}
+			}
+			break;
+		}
+		
+		print ("done\n");
+	}
+	
+	private void parse () {
+		int i = 0;
+
+		_engine = new Afrodite.CompletionEngine ("afrodite-test-engine");
+		_engine.begin_parsing.connect (this.on_begin_parsing);
+		_engine.end_parsing.connect (this.on_end_parsing);
+		
 		for(int repeat = 0; repeat < option_repeat; repeat++) {
 			print ("Adding sources (%d):\n", repeat);
 			i = 0;
@@ -82,118 +190,17 @@
 					}
 					source.content = buffer;
 					source.path = "live-buffer.vala";
-					engine.queue_source (source);
+					_engine.queue_source (source);
 				} else {
-					engine.queue_sourcefile (filename);
-				}
-				i++;
-			}
-
-			print ("\nAfrodite engine is parsing sources (%d)", repeat);
-			// Wait for the engine to complete the parsing
-			i = 0;
-			while (engine.is_parsing)
-			{
-				if (i % 10 == 0)
-					print (".");
-				Thread.usleep (1 * 250000);
-				i++;
-			}
-		}
-		
-		Afrodite.Ast ast;
-		print (": done\n\n");
-		print ("Looking for '%s' %d,%d\n\nDump follows:\n", option_symbol_name, option_line, option_column);
-		while (true)
-		{
-			// try to acquire ast
-			if (engine.try_acquire_ast (out ast)) {
-				// dumping tree (just a debug facility)
-				var dumper = new Afrodite.AstDumper ();
-				dumper.dump (ast, option_namespace);
-				print ("\n");
-
-				// Query the AST
-				if (option_visible_symbols != null) {
-					var source = ast.lookup_source_file (option_visible_symbols);
-					if (source != null) {
-						// get the source node at this position
-						var s = ast.get_symbol_for_source_and_position (source, option_line, option_column);
-						if (s != null) {
-							Vala.List<Symbol> syms = null;
-							syms = ast.lookup_visible_symbols_from_symbol (s, option_filter);
-							print ("Symbols found: %d\n", syms.size);
-							foreach (Symbol sym in syms) {
-								print ("          from %s: %s\n", sym.parent == null ? "<root>" : sym.parent.fully_qualified_name, Utils.unescape_xml_string (sym.description));
-							}
-						} else {
-							print ("no symbol found for position: %d-%d\n", option_line, option_column);
-						}
-					} else {
-						print ("source file not found: %s\n", option_visible_symbols);
-					}
-				} else if (option_symbol_name != null) {
-					// Setup query options
-					QueryOptions options = QueryOptions.standard ();
-					options.auto_member_binding_mode = true;
-					options.compare_mode = CompareMode.EXACT;
-					options.access = Afrodite.SymbolAccessibility.ANY;
-					options.binding = Afrodite.MemberBinding.ANY;
-
-					QueryResult sym = null;
-					sym = ast.get_symbol_type_for_name_and_path (options, option_symbol_name, option_files[0], option_line, option_column);
-					print ("The type for '%s' is: ", option_symbol_name);
-					if (!sym.is_empty) {
-						foreach (ResultItem item in sym.children) {
-							print ("%s\n     Childs:\n", Utils.unescape_xml_string (item.symbol.description));
-							if (item.symbol.has_children) {
-								int count = 0;
-								// print an excerpt of the child symbols
-								foreach (var child in item.symbol.children) {
-									print ("          %s\n", Utils.unescape_xml_string (child.description));
-									count++;
-									if (count == 6) {
-										print ("          ......\n");
-										break;
-									}
-								}
-								if (count < 6 && item.symbol.has_base_types) {
-									foreach (var base_item in item.symbol.base_types) {
-										if (base_item.unresolved || !base_item.symbol.has_children)
-											continue;
-
-										foreach (var child in base_item.symbol.children) {
-											print ("          %s\n", Utils.unescape_xml_string (child.description));
-											count++;
-											if (count == 6)
-												break;
-										}
-
-										if (count == 6) {
-											print ("          ......\n");
-											break;
-										}
-									}
-								}
-							}
-						}
-					} else {
-						print ("unresolved :(\n");
-						result = 1;
-					}
-				}
-				engine.release_ast (ast);
-				break;
-			}
-		}
-		
-		print ("done\n");
-		return result;
+					_engine.queue_sourcefile (filename);
+				}
+				i++;
+			}
+		}
 	}
 
 	static int main (string[] args) {
 		var application = new Application ();
-		application.run (args);
-		return 0;
+		return application.run (args);
 	}
 }

=== modified file 'plugins/completion/afrodite-provider/afrodite/ast.vala'
--- plugins/completion/afrodite-provider/afrodite/ast.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/ast.vala	2011-03-10 19:26:24 +0000
@@ -26,32 +26,17 @@
 {
 	public class Ast
 	{
-
-#if DEBUG
-		// debug utility to dump leaked symbols when destroying a source file
-		public static Vala.List<unowned Symbol> leaked_symbols = new Vala.ArrayList<unowned Symbol>();
-#endif
 		public Vala.HashMap<string, unowned Symbol> symbols = new Vala.HashMap <string, unowned Symbol>(GLib.str_hash, GLib.str_equal);
-
+		public Vala.List<unowned Symbol> unresolved_symbols = new Vala.ArrayList<unowned Symbol>();
+		
 		private Symbol _root = new Symbol (null, null);
 
 		~Ast ()
 		{
 			Utils.trace ("Ast destroy");
-#if DEBUG
-			Utils.trace ("     symbol count before destroy %d", leaked_symbols.size);
-#endif
 			// destroy the root symbol
 			_root = null;
 			source_files = null;// source have to be destroyes after root symbol
-
-#if DEBUG
-			Utils.trace ("     symbol count after destroy  %d", leaked_symbols.size);
-			if (leaked_symbols.size > 0) {
-				this.dump_leaks ();
-			}
-#endif
-
 			Utils.trace ("Ast destroyed");
 		}
 
@@ -69,11 +54,11 @@
 
 		public Vala.List<SourceFile> source_files { get; set; }
 	
-		public Symbol? lookup (string fully_qualified_name, out Symbol? parent)
+		public Symbol? lookup (string fully_qualified_name)
 		{
 			Symbol result = null;
 			
-			parent = _root;
+			Symbol parent = _root;
 			if (_root.has_children) {
 				result = lookup_symbol (fully_qualified_name, _root, ref parent, CompareMode.EXACT);
 			}
@@ -148,7 +133,6 @@
 				*/
 
 				foreach (SourceFile file in source_files) {
-					
 					if (file.filename == filename) {
 						return file;
 					}
@@ -582,10 +566,11 @@
 				// search in using directives
 				if (source.has_using_directives) {
 					foreach (DataType u in source.using_directives) {
-						Symbol parent;
-						
-						sym = lookup (u.type_name, out parent);
+						
+						
+						sym = lookup (u.type_name);
 						if (sym != null) {
+							Symbol parent = sym.parent;
 							if (compare_symbol_names (sym.name, name, mode)) {
 								// is a reference to a namespace
 								return sym;
@@ -606,7 +591,7 @@
 		public Symbol? get_symbol_for_source_and_position (SourceFile source, int line, int column)
 		{
 			Symbol result = null;
-			SourceReference result_sr = null;
+			unowned SourceReference result_sr = null;
 			
 			if (source.has_symbols) {
 				// base 0
@@ -638,19 +623,5 @@
 			
 			return result;
 		}
-
-#if DEBUG
-		private void dump_leaks ()
-		{
-			foreach (Symbol s in leaked_symbols) {
-				Utils.trace ("    -- leaked symbol %s (%p), parent %s (%p), generic_parent %s (%p) childs %d, refcount %u",
-					s.fully_qualified_name, s,
-					s.parent == null ? "null" : s.parent.fully_qualified_name, s.parent,
-					s.generic_parent == null ? "null" : s.generic_parent.fully_qualified_name, s.generic_parent,
-					s.has_children ? s.children.size : 0,
-					s.ref_count);
-			}
-		}
-#endif
 	}
 }

=== modified file 'plugins/completion/afrodite-provider/afrodite/astdumper.vala'
--- plugins/completion/afrodite-provider/afrodite/astdumper.vala	2010-09-03 21:40:48 +0000
+++ plugins/completion/afrodite-provider/afrodite/astdumper.vala	2011-03-10 19:26:24 +0000
@@ -140,7 +140,7 @@
 						inc_pad ();
 						print ("%slocal variables\n", pad);
 						foreach (DataType local in symbol.local_variables) {
-							var sr = local.source_reference;
+							unowned SourceReference sr = local.source_reference;
 							print ("%s   %s     - [(%d - %d) %s]\n",
 								pad,
 								Utils.unescape_xml_string (local.description),

=== modified file 'plugins/completion/afrodite-provider/afrodite/astmerger.vala'
--- plugins/completion/afrodite-provider/afrodite/astmerger.vala	2010-12-30 07:38:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/astmerger.vala	2011-03-10 19:26:24 +0000
@@ -28,40 +28,135 @@
 	{
 		Afrodite.Symbol _current = null;
 		Afrodite.DataType _current_type = null;
-		Afrodite.SourceReference _current_sr = null;
+		unowned Afrodite.SourceReference _current_sr = null;
 		Afrodite.SourceFile _source_file = null;
 		Afrodite.DataType _inferred_type = null;
 		Vala.Literal _last_literal = null;
 		
 		string _vala_symbol_fqn = null;
 		bool _merge_glib = true;
-		int _child_count = 0;
-		
+
 		private Afrodite.Ast _ast = null;
-		
+
 		public AstMerger (Afrodite.Ast ast)
 		{
 			this._ast = ast;
 		}
 
-		public void merge_vala_context (Vala.SourceFile source, CodeContext context, bool merge_glib = false)
+		public async void merge_vala_context (Vala.SourceFile source, CodeContext context, bool merge_glib = false)
 		{
 			_merge_glib = merge_glib;
 			_vala_symbol_fqn = null;
 			_current_type = null;
-			_child_count = 0;
 			_current = _ast.root;
 			assert (_ast.lookup_source_file (source.filename) == null);
 
 			//debug ("COMPLETING FILE %s", source.filename);
 			_source_file = _ast.add_source_file (source.filename);
 			foreach (UsingDirective u in source.current_using_directives) {
-				_source_file.add_using_directive (u.namespace_symbol.get_full_name ());
-			}
-			context.root.accept_children (this);
-		}
-
-		public void remove_source_filename (string filename)
+				_source_file.add_using_directive (u.namespace_symbol.to_string ());
+			}
+			yield visit_namespace_sliced (context.root);
+		}
+
+		public async void visit_namespace_sliced (Namespace ns)
+		{
+			var prev_vala_fqn = _vala_symbol_fqn;
+			var prev = _current;
+			unowned SourceReference prev_sr = _current_sr;
+			
+			if (ns.name != null)
+				_current = visit_symbol (ns, out _current_sr);
+
+			foreach (Enum en in ns.get_enums ()) {
+				en.accept (this);
+			}
+
+			foreach (ErrorDomain edomain in ns.get_error_domains ()) {
+				edomain.accept (this);
+			}
+
+			foreach (Vala.Namespace n in ns.get_namespaces ()) {
+				yield visit_namespace_sliced (n);
+			}
+
+			foreach (Vala.Class cl in ns.get_classes ()) {
+				yield visit_class_sliced (cl);
+			}
+
+			foreach (Interface iface in ns.get_interfaces ()) {
+				yield visit_interface_sliced (iface);
+			}
+
+			foreach (Struct st in ns.get_structs ()) {
+				yield visit_struct_sliced (st);
+			}
+
+			foreach (Delegate d in ns.get_delegates ()) {
+				d.accept (this);
+			}
+
+			foreach (Constant c in ns.get_constants ()) {
+				c.accept (this);
+			}
+
+			foreach (Field f in ns.get_fields ()) {
+				f.accept (this);
+			}
+
+			foreach (Method m in ns.get_methods ()) {
+				m.accept (this);
+			}
+
+			_current = prev;
+			_current_sr = prev_sr;
+			_vala_symbol_fqn = prev_vala_fqn;
+		}
+
+		public async void visit_class_sliced (Class c)
+		{
+			visit_class (c);
+		}
+
+		public async void visit_struct_sliced (Struct st)
+		{
+			visit_struct (st);
+		}
+
+		public async void visit_interface_sliced (Interface iface)
+		{
+			visit_interface (iface);
+		}
+
+		public override void visit_class (Class c)
+		{
+			var prev_vala_fqn = _vala_symbol_fqn;
+			var prev = _current;
+			unowned SourceReference prev_sr = _current_sr;
+
+			_current = visit_symbol (c, out _current_sr);
+			_current.is_abstract = c.is_abstract;
+			c.accept_children (this);
+
+			_current = prev;
+			_current_sr = prev_sr;
+			_vala_symbol_fqn = prev_vala_fqn;
+		}
+		
+		public override void visit_struct (Struct s)
+		{
+			var prev_vala_fqn = _vala_symbol_fqn;
+			var prev = _current;
+			unowned SourceReference prev_sr = _current_sr;
+			
+			_current = visit_symbol (s, out _current_sr);
+			s.accept_children (this);
+			_current = prev;
+			_current_sr = prev_sr;
+			_vala_symbol_fqn = prev_vala_fqn;
+		}
+
+		public async void remove_source_filename (string filename)
 		{
 			var source = _ast.lookup_source_file (filename);
 			assert (source != null);
@@ -69,65 +164,62 @@
 			_ast.remove_source (source);
 		}
 
-		private Afrodite.Symbol visit_symbol (Vala.Symbol s, out Afrodite.SourceReference source_reference)
+		private Afrodite.Symbol visit_symbol (Vala.Symbol s, out unowned Afrodite.SourceReference source_reference)
 		{
 			Afrodite.Symbol symbol;
 
 			set_fqn (s.name);
-			//symbol = _ast.lookup (_vala_symbol_fqn, out parent);
-			//assert (parent != null);
-			symbol = _ast.symbols.@get (_vala_symbol_fqn);
 
-			if (symbol == null) {
+			//NOTE: usually we should always add symbols but 
+			// we should merge namespaces content.
+			// This must be changed whenever vala will support 
+			// partial classes.
+			if (s.type_name != "ValaNamespace") {
 				symbol = add_symbol (s, out source_reference);
-				//Utils.trace ("adding %s to source %s", symbol.fully_qualified_name, _source_file.filename);
 				_current.add_child (symbol);
 			} else {
-				Afrodite.Symbol parent = symbol.parent;
-				//NOTE: see if we should replace the symbol
-				// we should replace it if is not a namespace
-				// this can change whenever vala will support
-				// partial classes
-				bool replace = s.type_name != "ValaNamespace";
-				if (replace) {
-					parent.remove_child (symbol);
+				symbol = _ast.lookup (_vala_symbol_fqn);
+				if (symbol == null) {
 					symbol = add_symbol (s, out source_reference);
-					parent.add_child (symbol);
+					//Utils.trace ("adding %s to source %s", symbol.fully_qualified_name, _source_file.filename);
+					_current.add_child (symbol);
 				} else {
+					source_reference = symbol.lookup_source_reference_filename (_source_file.filename);
 					// add one more source reference to the symbol
-					source_reference = symbol.lookup_source_reference_filename (_source_file.filename);
 					if (source_reference == null) {
-						source_reference = create_source_reference (s);
-						symbol.add_source_reference (source_reference);
+						var sr = create_source_reference (s);
+						symbol.add_source_reference (sr);
+						source_reference = sr;
 						//Utils.trace ("adding source reference %s to source %s", symbol.fully_qualified_name, _source_file.filename);
 						_source_file.add_symbol (symbol);
 					} else {
-						warning ("two sources with the same name were merged: %s", _source_file.filename);
+						warning ("two sources with the same name were merged %s: %s", symbol.fully_qualified_name, _source_file.filename);
 					}
 				}
 			}
-
 			return symbol;
 		}
 		
-		private Afrodite.Symbol add_symbol (Vala.Symbol s, out Afrodite.SourceReference source_ref, int last_line = 0, int last_column = 0)
+		private Afrodite.Symbol add_symbol (Vala.Symbol s, out unowned Afrodite.SourceReference source_ref, int last_line = 0, int last_column = 0)
 		{
 			var symbol = new Afrodite.Symbol (_vala_symbol_fqn, s.type_name);
 			if (symbol.lookup_source_reference_filename (_source_file.filename) == null) {
-				source_ref = create_source_reference (s, last_line, last_column);
-				symbol.add_source_reference (source_ref);
+				var sr = create_source_reference (s, last_line, last_column);
+				symbol.add_source_reference (sr);
+				source_ref = sr;
 			}
 			symbol.access = get_vala_symbol_access (s.access);
 			_source_file.add_symbol (symbol);
 			return symbol;
 		}
 
-		private Afrodite.Symbol add_codenode (string type_name, Vala.CodeNode c, out Afrodite.SourceReference source_ref, int last_line = 0, int last_column = 0)
+		private Afrodite.Symbol add_codenode (string type_name, Vala.CodeNode c, out unowned Afrodite.SourceReference source_ref, int last_line = 0, int last_column = 0)
 		{
 			var symbol = new Afrodite.Symbol (_vala_symbol_fqn, type_name);
 			if (symbol.lookup_source_reference_filename (_source_file.filename) == null) {
-				source_ref = create_source_reference (c, last_line, last_column);
-				symbol.add_source_reference (source_ref);
+				var sr = create_source_reference (c, last_line, last_column);
+				symbol.add_source_reference (sr);
+				source_ref = sr;
 			}
 			symbol.access = Afrodite.SymbolAccessibility.PRIVATE;
 			_source_file.add_symbol (symbol);
@@ -198,58 +290,11 @@
 			}
 		}
 
-		public override void visit_namespace (Namespace ns)
-		{
-			var prev_vala_fqn = _vala_symbol_fqn;
-			var prev = _current;
-			var prev_sr = _current_sr;
-			var prev_child_count = _child_count;
-			
-			_current = visit_symbol (ns, out _current_sr);
-			ns.accept_children (this);
-
-			_child_count = prev_child_count;
-			_current = prev;
-			_current_sr = prev_sr;
-			_vala_symbol_fqn = prev_vala_fqn;
-		}
-		
-		public override void visit_class (Class c)
-		{
-			_child_count++;
-			var prev_vala_fqn = _vala_symbol_fqn;
-			var prev = _current;
-			var prev_sr = _current_sr;
-			
-			_current = visit_symbol (c, out _current_sr);
-			_current.is_abstract = c.is_abstract;
-			c.accept_children (this);
-
-			_current = prev;
-			_current_sr = prev_sr;
-			_vala_symbol_fqn = prev_vala_fqn;
-		}
-		
-		public override void visit_struct (Struct s)
-		{
-			_child_count++;
-			var prev_vala_fqn = _vala_symbol_fqn;
-			var prev = _current;
-			var prev_sr = _current_sr;
-			
-			_current = visit_symbol (s, out _current_sr);
-			s.accept_children (this);
-			_current = prev;
-			_current_sr = prev_sr;
-			_vala_symbol_fqn = prev_vala_fqn;
-		}
-		
 		public override void visit_interface (Interface iface)
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 
 			_current = visit_symbol (iface, out _current_sr);
 			iface.accept_children (this);
@@ -258,6 +303,7 @@
 			_vala_symbol_fqn = prev_vala_fqn;
 		}
 		
+		/*
 		public override void visit_expression_statement (Vala.ExpressionStatement e)
 		{
 			e.accept_children (this);
@@ -268,13 +314,17 @@
 			//Utils.trace ("visit method call: %s", c.call.type_name);
 			c.accept_children (this);
 		}
+		*/
 		
 		public override void visit_method (Method m)
 		{
-			_child_count++;
+			//var timer = new Timer();
+			//timer.start ();
+			//Utils.trace ("visit method %s", m.name);
+
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (m.name);
 			int last_line = 0;
@@ -301,18 +351,30 @@
 			
 			_current = s;
 			visit_type_for_generics (m.return_type, s.return_type);
-			m.accept_children (this);
-			
+			//Utils.trace ("visit method (symbol) %s: %f", m.name, timer.elapsed());
+			foreach (TypeParameter p in m.get_type_parameters ()) {
+				p.accept (this);
+			}
+			//Utils.trace ("visit method (typeparam) %s: %f", m.name, timer.elapsed());
+			foreach (Vala.Parameter param in m.get_parameters ()) {
+				param.accept (this);
+			}
+			//Utils.trace ("visit method (param) %s: %f", m.name, timer.elapsed());
+			if (m.body != null) {
+				m.body.accept (this);
+			}
+			//Utils.trace ("visit method (body) %s: %f", m.name, timer.elapsed());
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
+			//Utils.trace ("visit method %s: %f", m.name, timer.elapsed());
 		}
 
 		public override void visit_creation_method (CreationMethod m)
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 
 			set_fqn (m.name);
 			int last_line = 0;
@@ -339,8 +401,18 @@
 			
 			_current = s;
 			visit_type_for_generics (m.return_type, s.return_type);
-			m.accept_children (this);
-			
+			foreach (TypeParameter p in m.get_type_parameters ()) {
+				p.accept (this);
+			}
+
+			foreach (Vala.Parameter param in m.get_parameters ()) {
+				param.accept (this);
+			}
+
+			if (m.body != null) {
+				m.body.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -350,7 +422,7 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn ("constructor:%s".printf(_current.fully_qualified_name));
 			int last_line = 0;
@@ -363,8 +435,9 @@
 			_current.add_child (s);
 			
 			_current = s;
-			m.accept_children (this);
-			
+			if (m.body != null) {
+				m.body.accept (this);
+			}
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -374,7 +447,7 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn ("destructor:%s".printf(_current.fully_qualified_name));
 			int last_line = 0;
@@ -387,7 +460,10 @@
 			_current.add_child (s);
 			 
 			_current = s;
-			m.accept_children (this);
+			if (m.body != null) {
+				m.body.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -397,7 +473,7 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (ev.name);
 			var sym = add_symbol (ev, out _current_sr);
@@ -412,16 +488,27 @@
 		
 		public override void visit_enum (Vala.Enum e) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (e.name);
 			var s = add_symbol (e, out _current_sr);
 			_current.add_child (s);
 			_current = s;
-			e.accept_children (this);
+
+			foreach (Vala.EnumValue value in e.get_values ()) {
+				value.accept (this);
+			}
+
+			foreach (Method m in e.get_methods ()) {
+				m.accept (this);
+			}
+
+			foreach (Constant c in e.get_constants ()) {
+				c.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -429,16 +516,23 @@
 		
 		public override void visit_delegate (Delegate d) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (d.name);
 			var sym = add_symbol (d, out _current_sr);
+			sym.return_type = new DataType (d.return_type.to_string ());
 			_current.add_child (sym);
 			_current = sym;
-			d.accept_children (this);
+
+			foreach (TypeParameter p in d.get_type_parameters ()) {
+				p.accept (this);
+			}
+			foreach (Vala.Parameter param in d.get_parameters ()) {
+				param.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -446,10 +540,9 @@
 
 	       	public override void visit_signal (Vala.Signal s) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (s.name);
 			var sym = add_symbol (s, out _current_sr);
@@ -457,7 +550,16 @@
 			sym.is_virtual = s.is_virtual;
 			_current.add_child (sym);
 			_current = sym;
-			s.accept_children (this);
+
+			foreach (Vala.Parameter param in s.get_parameters ()) {
+				param.accept (this);
+			}
+			if (s.default_handler == null && s.body != null) {
+				s.body.accept (this);
+			} else if (s.default_handler != null) {
+				s.default_handler.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -465,10 +567,9 @@
 		
 		public override void visit_field (Field f) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			
 			set_fqn (f.name);
@@ -494,10 +595,9 @@
 
 		public override void visit_constant (Vala.Constant c) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (c.name);
 			var s = add_symbol (c, out _current_sr);
@@ -512,10 +612,9 @@
 	
 		public override void visit_property (Property p) 
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (p.name);
 			var s = add_symbol (p, out _current_sr);
@@ -533,7 +632,17 @@
 			_current.add_child (s);
 			
 			_current = s;
-			p.accept_children (this);
+			if (p.get_accessor != null) {
+				p.get_accessor.accept (this);
+			}
+			if (p.set_accessor != null) {
+				p.set_accessor.accept (this);
+			}
+
+			if (p.initializer != null) {
+				p.initializer.accept (this);
+			}
+
 			_current = prev;
 			_current_sr = prev_sr;
 			_vala_symbol_fqn = prev_vala_fqn;
@@ -544,7 +653,7 @@
 			this.visit_scoped_codenode (a.readable ? "get" : "set", a, a.body);
 			/*
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			if (a.body != null 
 			    && a.body.source_reference != null
@@ -559,17 +668,23 @@
 		
 		public override void visit_error_domain (ErrorDomain ed)
 		{
-			_child_count++;
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 						
 			set_fqn (ed.name);
 			var s = add_symbol (ed, out _current_sr);
 			_current.add_child (s);
 			
 			_current = s;
-			ed.accept_children (this);
+
+			foreach (ErrorCode ecode in ed.get_codes()) {
+				ecode.accept (this);
+			}
+			foreach (Method m in ed.get_methods ()) {
+				m.accept (this);
+			}
+
 			
 			_current = prev;
 			_current_sr = prev_sr;
@@ -580,7 +695,7 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn (ecode.name);
 			var s = add_symbol (ecode, out _current_sr);
@@ -649,17 +764,14 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			
+
 			set_fqn (local.name);
 			DataType s = new DataType ("", local.name);
 			if (local.variable_type != null) {
 				s.type_name = get_datatype_typename (local.variable_type);
-			} else if (local.variable_type == null && local.initializer != null) {
-				// try to resolve local variable type from initializers
-				var prev_inferred_type = _inferred_type;
-				_inferred_type = s;
+			} else if (local.variable_type == null) {
 				//Utils.trace ("infer from init '%s': %s", s.name, local.initializer.type_name);
-				
+				/* 
 				if (local.initializer is ObjectCreationExpression) {
 					//debug ("START: initialization %s from %s: %s", local.name, s.name, _inferred_type.type_name);
 					var obj_initializer = (ObjectCreationExpression) local.initializer;
@@ -667,12 +779,22 @@
 					//debug ("END: initialization done %s", _inferred_type.type_name);
 				} else if (local.initializer is MethodCall) {
 					//Utils.trace ("method call: %s", s.name);
- 					((MethodCall) local.initializer).call.accept (this); // this avoid visit parameters of method calls
+					var call = ((MethodCall) local.initializer);
+					Utils.trace ("method call: %s -> %s %s", local.name, call.to_string (), call.call.type_name);
+					var ma = call.call as MemberAccess;
+					if (true || ma == null)
+	 					call.call.accept (this); // this avoid visit parameters of method calls
+	 				else {
+	 					
+						Utils.trace ("ma inner: %s", ma.member_name);
+	 				}
+	 				Utils.trace ("AFTER: %s", s.type_name);
+ 					//breakpoint();
  				} else if (local.initializer is BinaryExpression) {
  					((BinaryExpression) local.initializer).accept_children (this);
  				} else if (local.initializer is CastExpression) {
  					var cast_expr = (CastExpression)local.initializer;
-					cast_expr.accept (this);
+					//cast_expr.accept (this);
  					if (cast_expr.type_reference != null)
  					{
 	 					s.type_name = get_datatype_typename (cast_expr.type_reference);
@@ -680,13 +802,34 @@
  				} else if (local.initializer is ArrayCreationExpression) {
  					//Utils.trace ("ArrayCreationExpression infer from init '%s' %s", s.name, local.initializer.type_name);
  					var ac = (ArrayCreationExpression) local.initializer; 
- 					ac.accept_children (this);
  					s.is_array = true;
+ 					if (ac.element_type == null) {
+						if (ac.initializer_list != null) {
+							ac.initializer_list.accept (this);
+						}
+ 					}
  					s.type_name = get_datatype_typename (ac.element_type);
 					//Utils.trace ("init type %s: %s %s", local.name, s.type_name, ac.element_type.type_name);
 				} else {
-					local.accept_children (this);
-				}
+					if (local.initializer != null) {
+						local.initializer.accept (this);
+					}
+				}
+				*/
+				// try to resolve local variable type from initializers
+				var prev_inferred_type = _inferred_type;
+				_inferred_type = s;
+
+				if (local.initializer != null) {
+					local.initializer.accept (this);
+					// HACK:
+					if (s.type_name != null 
+					    && (s.type_name.has_prefix ("this.") || s.type_name.has_prefix ("base.")))
+					{
+						s.type_name = s.type_name.substring (5);
+					}
+				}
+
 				_last_literal = null;
 				//debug ("infer from init done %s", _inferred_type.type_name);
 				_inferred_type = prev_inferred_type;
@@ -734,23 +877,34 @@
 		{
 			if (_inferred_type == null)
 				return;
-			
-			//Utils.trace ("visit member access %s: %s", _inferred_type.type_name, expr.member_name);
-			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
-				_inferred_type.type_name = expr.member_name;
-			else {
-				string member_name = null;
-				// lookup in the scope variables
+
+			string member_name = expr.member_name;
+			//Utils.trace ("MemberAccess %s: %s", _current.name, expr.member_name);
+			if (expr.inner == null) {
+				// this is the last iteration
+				// lookup the name in all the visible symbols
 				if (_current != null) {
-					DataType d = _current.scope_lookup_datatype_for_variable (CompareMode.EXACT, expr.member_name);
+					// try the first optimized path
+					DataType d = _current.lookup_datatype_for_variable_name (CompareMode.EXACT, member_name);
 					if (d != null) {
 						member_name = d.type_name;
+					} else if (_current.parent != null) {
+						d = _current.parent.lookup_datatype_for_symbol_name (CompareMode.EXACT, member_name);
+						if (d != null) {
+							member_name = d.type_name;
+						} /* else {
+							// this is the slowest path
+							d = _current.scope_lookup_datatype_for_name (CompareMode.EXACT, member_name);
+							if (d != null) {
+								member_name = d.type_name;
+							}
+						}*/
 					}
 				}
-				
-				// if not found assume that is a static type
-				if (member_name == null)
-					member_name = expr.member_name;
+			}
+			if (_inferred_type.type_name == null || _inferred_type.type_name == "") {
+				_inferred_type.type_name = member_name;
+			} else {
 				_inferred_type.type_name = "%s.%s".printf (member_name, _inferred_type.type_name);
 			}
 		}
@@ -777,7 +931,6 @@
 	
 		public override void visit_binary_expression (BinaryExpression expr) 
 		{
-			//debug ("vidit binary expr %p", expr);
 			expr.accept_children (this);
 		}
 		
@@ -788,8 +941,6 @@
 			
 			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
 				_inferred_type.type_name = "bool";
-			else  if (_inferred_type.type_name != "bool")
-				_inferred_type.type_name = "%s.%s".printf ("bool", _inferred_type.type_name);
 		}
 
 
@@ -800,8 +951,6 @@
 				
 			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
 				_inferred_type.type_name = "char";
-			else if (_inferred_type.type_name != "char")
-				_inferred_type.type_name = "%s.%s".printf ("char", _inferred_type.type_name);
 		}
 
 		public override void visit_integer_literal (IntegerLiteral lit) 
@@ -811,8 +960,6 @@
 
 			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
 				_inferred_type.type_name = lit.type_name;
-			else if (_inferred_type.type_name != lit.type_name)
-				_inferred_type.type_name = "%s.%s".printf (lit.type_name, _inferred_type.type_name);
 		}
 
 		public override void visit_real_literal (RealLiteral lit) 
@@ -821,8 +968,6 @@
 				return;
 			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
 				_inferred_type.type_name = lit.get_type_name ();
-			else if (_inferred_type.type_name != lit.get_type_name ())
-				_inferred_type.type_name = "%s.%s".printf (lit.get_type_name (), _inferred_type.type_name);
 		}
 
 		public override void visit_string_literal (StringLiteral lit) 
@@ -832,8 +977,6 @@
 			
 			if (_inferred_type.type_name == null || _inferred_type.type_name == "")
 				_inferred_type.type_name = "string";
-			else if (_inferred_type.type_name != "string")
-				_inferred_type.type_name = "%s.%s".printf ("string", _inferred_type.type_name);
 		}
 		
 		public override void visit_declaration_statement (DeclarationStatement stmt)
@@ -885,7 +1028,7 @@
 		{
 			var s = visit_scoped_codenode ("catch", clause, clause.body);
 			var d = new DataType (get_datatype_typename (clause.error_type), clause.variable_name);
-			s.add_local_variable (d);			
+			s.add_local_variable (d);
 		}
 		
 		public override void visit_if_statement (IfStatement stmt) 
@@ -965,7 +1108,7 @@
 		{
 			var prev_vala_fqn = _vala_symbol_fqn;
 			var prev = _current;
-			var prev_sr = _current_sr;
+			unowned SourceReference prev_sr = _current_sr;
 			
 			set_fqn ("!%s".printf (name));
 			int last_line = 0;

=== modified file 'plugins/completion/afrodite-provider/afrodite/completionengine.vala'
--- plugins/completion/afrodite-provider/afrodite/completionengine.vala	2010-12-30 07:38:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/completionengine.vala	2011-03-10 19:26:24 +0000
@@ -37,16 +37,16 @@
 		
 		private Mutex _source_queue_mutex;
 		private Mutex _merge_queue_mutex;
-		private Mutex _ast_mutex = null;
 		
 		private unowned Thread<int> _parser_thread;
 		private int _parser_stamp = 0;
 		private int _parser_remaining_files = 0;
 		private int _current_parsing_total_file_count = 0;
 		private bool _glib_init = false;
-		
+		private bool _is_parsing = false;
+
 		private Ast _ast;
-		private Vala.HashMap<string, ParseResult> _parse_result_list = new Vala.HashMap<string, ParseResult> (GLib.str_hash, GLib.str_equal, GLib.direct_equal);
+		private Vala.List<ParseResult> _parse_result_list = new Vala.ArrayList<ParseResult> ();
 		private uint _idle_id = 0;
 
 		public CompletionEngine (string? id = null)
@@ -62,16 +62,13 @@
 			_merge_queue_mutex = new Mutex ();
 			
 			_ast = new Ast ();
-			_ast_mutex = new Mutex ();
 		}
 		
 		~Completion ()
 		{
 			Utils.trace ("Completion %s destroy", id);
 			// invalidate the ast so the parser thread will exit asap
-			_ast_mutex.lock ();
 			_ast = null;
-			_ast_mutex.unlock ();
 
 			if (AtomicInt.@get (ref _parser_stamp) != 0) {
 				Utils.trace ("join the parser thread before exit");
@@ -88,7 +85,7 @@
 		public bool is_parsing
 		{
 			get {
-				return AtomicInt.@get (ref _parser_stamp) != 0;
+				return _is_parsing;
 			}
 		}
 
@@ -121,8 +118,10 @@
 			return null;
 		}
 
-		public void queue_sources (Vala.List<SourceItem> sources)
+		public bool queue_sources (Vala.List<SourceItem> sources, bool no_update_check = false)
 		{
+			bool result = false;
+			
 			_source_queue_mutex.@lock ();
 			if (!_glib_init) {
 				// merge standard base vapi (glib and gobject)
@@ -144,22 +143,36 @@
 				}
 			}
 			foreach (SourceItem source in sources) {
-				var item = source_queue_contains (source);
-				if (item == null || item.content != source.content) {
-				/*
-					if (source.content == null || source.content == "")
-						Utils.trace ("%s: queued source %s. sources to parse %d", id, source.path, source_queue.size);
-					else
-						Utils.trace ("%s: queued live buffer %s. sources to parse %d", id, source.path, source_queue.size);
-				*/	
-					if (item != null)
-						_source_queue.remove (item);
-
-					_source_queue.add (source.copy ());
-				} 
-				else if (item.content == null && source.content != null) {
-					item.content = source.content;
-					//Utils.trace ("%s: updated live buffer %s. sources to parse %d", id, source.path, source_queue.size);
+				bool skip_unchanged_file = false;
+
+				// test if file is really changed but only if it's not a live buffer
+				if (no_update_check == false && source.content == null && _ast != null) {
+					var sf = _ast.lookup_source_file (source.path);
+					if (sf != null && sf.update_last_modification_time ()) {
+						Utils.trace ("engine %s: skip unchanged source %s", id, source.path);
+						skip_unchanged_file = true;
+					}
+				}
+
+				if (!skip_unchanged_file)
+				{
+					var item = source_queue_contains (source);
+					if (item == null || item.content != source.content) {
+					/*
+						if (source.content == null || source.content == "")
+							Utils.trace ("%s: queued source %s. sources to parse %d", id, source.path, source_queue.size);
+						else
+							Utils.trace ("%s: queued live buffer %s. sources to parse %d", id, source.path, source_queue.size);
+					*/	
+						if (item != null)
+							_source_queue.remove (item);
+
+						_source_queue.add (source.copy ());
+					} 
+					else if (item.content == null && source.content != null) {
+						item.content = source.content;
+						//Utils.trace ("%s: updated live buffer %s. sources to parse %d", id, source.path, source_queue.size);
+					}
 				}
 			}
 			_source_queue_mutex.@unlock ();
@@ -168,7 +181,9 @@
 				create_parser_thread ();
 			} else {
 				AtomicInt.inc (ref _parser_stamp);
-			}		
+			}
+			
+			return result;
 		}
 		
 		public void queue_sourcefile (string path, string? content = null, bool is_vapi = false, bool is_glib = false)
@@ -193,52 +208,12 @@
 			
 			queue_sources (sources);
 		}
-		
-		public bool try_acquire_ast (out Ast ast, int retry_count = -1)
-		{
-			bool res = false;
-			ast = null;
-			bool first_run = true;
-			int file_count = 0;
-			int retry = 0;
-			
-			while (ast == null 
-				&& _ast_mutex != null 
-				&& (first_run || (file_count = AtomicInt.get (ref _current_parsing_total_file_count)) <= 2))
-			{
-				first_run = false;
-				res = _ast_mutex.@trylock ();
-				if (res) {
-					ast = _ast;
-				} else {
-					if (retry_count < 0 || retry < retry_count) {
-						retry++;
-						GLib.Thread.usleep (100 * 1000);
-					} else {
-						break;
-					}
-				}
-			}
-
-#if DEBUG
-			if (ast == null) {
-				//Utils.trace ("can't acquire lock: %d", file_count);
-			} else {
-				Utils.trace ("lock acquired: %d", file_count);
-			}
-#endif
-
-			return res;
-		}
-		
-		public void release_ast (Ast ast)
-		{
-			if (_ast != ast) {
-				warning ("%s: release_ast requested for unknown ast instance", id);
-				return;
-			}
-			
-			_ast_mutex.unlock ();
+
+		public Ast ast
+		{
+			get {
+				return _ast;
+			}
 		}
 
 		private void create_parser_thread ()
@@ -257,26 +232,19 @@
 		{
 #if DEBUG
 			GLib.Timer timer = new GLib.Timer ();
-			double start_parsing_time = 0;
-			double parsing_time = 0;
 			double start_time = 0;
 			timer.start ();
 #endif
 			Utils.trace ("engine %s: parser thread *** starting ***...", id);
-			begin_parsing (this);
+
 			Vala.List<SourceItem> sources = new ArrayList<SourceItem> ();
 
 			while (true) {
-#if DEBUG
-				start_parsing_time = timer.elapsed ();
-#endif
 				int stamp = AtomicInt.get (ref _parser_stamp);
-				// set the number of sources to process + 1, because the last one
-				// will be decreased by the resolve part
-				AtomicInt.set (ref _parser_remaining_files, _source_queue.size + 1);
+				// set the number of sources to process
+				AtomicInt.set (ref _parser_remaining_files, _source_queue.size );
 				// get the source to parse
 				_source_queue_mutex.@lock ();
-				int source_count = _source_queue.size;
 				foreach (SourceItem item in _source_queue) {
 					sources.add (item.copy ());
 				}
@@ -287,109 +255,28 @@
 				_source_queue.clear ();
 				_source_queue_mutex.@unlock ();
 
-				AstMerger merger = null;
 				foreach (SourceItem source in sources) {
-					bool skip_unchanged_file = false;
-
-					// test if file is really changed but only if it's not a live buffer
-					if (source.content == null) {
-						_ast_mutex.@lock ();
-						if (_ast != null) {
-							var sf = _ast.lookup_source_file (source.path);
-							if (sf != null) {
-								if (sf.update_last_modification_time ()) {
-									// no need to reparse the source since it isn't changed
-									Utils.trace ("engine %s: source file parsing optimized out since it isn't changed: %s", id, source.path);
-									_ast_mutex.@unlock ();
-									skip_unchanged_file = true;
-								}
-							}
-						}
-						_ast_mutex.@unlock ();
-					}
-
-					if (!skip_unchanged_file) {
-#if DEBUG
-						Utils.trace ("engine %s: parsing source: %s", id, source.path);
-						start_time = timer.elapsed ();
-#endif
-
-						Parser p = new Parser.with_source (source);
-						var parse_results = p.parse ();
-						lock (_parse_result_list) {
-							_parse_result_list.set (source.path, parse_results);
-							if (_idle_id == 0)
-								_idle_id = Idle.add_full (Priority.LOW, on_parse_results);
-						}
-#if DEBUG
-						Utils.trace ("engine %s: parsing source: %s done %g", id, source.path, timer.elapsed () - start_time);
-#endif
-						source.context = p.context;
-						if (source.context == null)
-							critical ("source %s context == null, non thread safe access to source item", source.path);
-						else {
-							foreach (Vala.SourceFile s in source.context.get_source_files ()) {
-								if (s.filename == source.path) {
-									// do the real merge
-									_ast_mutex.@lock ();
-									if (_ast != null) {
-										bool source_exists = _ast.lookup_source_file (source.path) != null;
-
-										// if the ast is still valid: not null
-										// and not 
-										// if I'm parsing just one source and there are errors and the source already exists in the ast: I'll keep the previous copy
-										// do the merge
-										if (!(source_count == 1 && source_exists && p.context.report.get_errors () > 0)) {
-											if (merger == null) {
-												// lazy init the merger, here I'm sure that _ast != null
-												merger = new AstMerger (_ast);
-											}
-											if (source_exists) {
-												merger.remove_source_filename (source.path);
-											}
-#if DEBUG
-											Utils.trace ("engine %s: merging source %s", id, source.path);
-											start_time = timer.elapsed ();
-#endif
-											merger.merge_vala_context (s, source.context, source.is_glib);
-#if DEBUG
-											Utils.trace ("engine %s: merging source %s done %g", id, source.path, timer.elapsed () - start_time);
-#endif
-										}
-									}
-									_ast_mutex.unlock ();
-								
-									//timer.stop ();
-									//debug ("%s: merging context and file %s in %g", id, s.filename, timer.elapsed ());
-									break;
-								}
-							}
-						}
-					}
+#if DEBUG
+					Utils.trace ("engine %s: parsing source: %s", id, source.path);
+					start_time = timer.elapsed ();
+#endif
+
+					Parser p = new Parser.with_source (source);
+					var parse_results = p.parse ();
+					lock (_parse_result_list) {
+						_parse_result_list.add (parse_results);
+						if (_idle_id == 0)
+							//_idle_id = Idle.add (this.on_parse_results, Priority.LOW);
+							_idle_id = Timeout.add (250, this.on_parse_results, Priority.LOW);
+					}
+#if DEBUG
+					Utils.trace ("engine %s: parsing source: %s done %g", id, source.path, timer.elapsed () - start_time);
+#endif
 					AtomicInt.add (ref _parser_remaining_files, -1);
 				}
-#if DEBUG
-				parsing_time += (timer.elapsed () - start_parsing_time);
-#endif
 
-				_ast_mutex.@lock ();
-				if (_ast != null) {
-#if DEBUG
-					//_ast.dump_symbols ();
-					Utils.trace ("engine %s: resolving ast", id);
-					start_time = timer.elapsed ();
-#endif
-					var resolver = new SymbolResolver ();
-					resolver.resolve (_ast);
-#if DEBUG
-					Utils.trace ("engine %s: resolving ast done %g", id, timer.elapsed () - start_time);
-#endif
-				}
-				AtomicInt.add (ref _parser_remaining_files, -1);
-				_ast_mutex.unlock ();
-				
 				sources.clear ();
-				
+
 				//check for changes or exit request
 				if (_ast == null || AtomicInt.compare_and_exchange (ref _parser_stamp, stamp, 0)) {
 					break;
@@ -402,36 +289,152 @@
 
 #if DEBUG
 			timer.stop ();
-			Utils.trace ("engine %s: parser thread *** exiting *** (elapsed time parsing %g, resolving %g)...", id, parsing_time, timer.elapsed ());
+			Utils.trace ("engine %s: parser thread *** exiting *** (elapsed time parsing %g)...", id, timer.elapsed());
 #endif
-			end_parsing (this);
 			return 0;
 		}
-		
+
+		private void on_begin_parsing ()
+		{
+			if (!_is_parsing) {
+				_is_parsing = true;
+				begin_parsing (this);
+			}
+		}
+
+		private void on_end_parsing ()
+		{
+			if (AtomicInt.@get (ref _current_parsing_total_file_count) == 0) {
+				_is_parsing = false;
+				end_parsing (this);
+			}
+		}
+
+
 		private bool on_parse_results ()
 		{
-			bool more_results = true;
-			string filename = null;
-			ParseResult result = null;
+			bool merge_scheduled = false;
 
 			lock (_parse_result_list) {
 				if (_parse_result_list.size > 0) {
-					foreach (string key in _parse_result_list.get_keys ()) {
-						result = _parse_result_list.get (key);
-						_parse_result_list.remove (key);
-						filename = key;
-						break; // one iteration
+					foreach (ParseResult key in _parse_result_list) {
+						if (!merge_scheduled) {
+							merge_scheduled = true;
+							merge_and_resolve.begin (key, this.on_merge_and_resolve_ended);
+							_parse_result_list.remove (key);
+							break;
+						}
 					}
-				}
-				if (_parse_result_list.size == 0) {
+				} else {
+					// Tell to the parser thread the a new Idle should be created
+					// for the merge process
 					_idle_id = 0;
-					more_results = false;
-				}
-			}
-			if (result != null) {
-				this.file_parsed (this, filename, result);
-			}
-			return more_results;
+				}
+			}
+
+			if (merge_scheduled) {
+				on_begin_parsing();
+			} else {
+				// this is the last run after the merge
+				on_end_parsing ();
+			}
+
+			return false;
+		}
+
+		private void on_merge_and_resolve_ended (GLib.Object? source, GLib.AsyncResult r)
+		{
+			merge_and_resolve.end (r);
+			//_idle_id = Idle.add (this.on_parse_results, Priority.LOW);
+			_idle_id = Timeout.add (250, this.on_parse_results, Priority.LOW);
+		}
+
+		private async ParseResult merge_and_resolve (ParseResult result)
+		{
+			Utils.trace ("engine %s: async merge and resolve: %s", id, result.source_path);
+			foreach (Vala.SourceFile s in result.context.get_source_files ()) {
+				if (s.filename == result.source_path) {
+					var ast_source = _ast.lookup_source_file (result.source_path);
+					bool source_exists = ast_source != null;
+					bool need_update = true;
+
+					// if I already parsed this source and this copy is a live gedit buffer
+					// and the parsing contains some error, I maintain the previous copy in the ast
+					if (!(source_exists && result.is_edited && result.errors.size > 0))
+					{
+						// if the source was already parsed and it's not opend in a edit window
+						if (source_exists && !result.is_edited) {
+							need_update = ast_source.update_last_modification_time();
+						}
+						// this is important!
+						// TODO: we shouldn't hold this reference lookup_source_file should return an unowned ref
+						ast_source = null;
+						if (need_update) {
+							yield perform_merge_and_resolve (s, result, source_exists);
+							this.file_parsed (this, result.source_path, result);
+						}
+					} else {
+						Utils.trace ("engine %s: source (live buffer) with errors mantaining the previous parsing: %s", id, result.source_path);
+					}
+					break; // found the file
+				}
+			}
+			
+			return result;
+		}
+
+		private async void perform_merge_and_resolve (Vala.SourceFile s, ParseResult result, bool source_exists)
+		{
+			yield merge_vala_source (s, result, source_exists);
+			yield resolve_ast ();
+		}
+		
+		private async void merge_vala_source (Vala.SourceFile s, ParseResult result, bool source_exists)
+		{
+#if DEBUG
+			GLib.Timer timer = new GLib.Timer ();
+			double start_time = 0, elapsed;
+			timer.start ();
+#endif
+			var merger = new AstMerger (_ast);
+			if (source_exists) {
+#if DEBUG
+				Utils.trace ("engine %s: removing source (%p) %s", id, result, result.source_path);
+				start_time = timer.elapsed ();
+#endif
+				yield merger.remove_source_filename (result.source_path);
+#if DEBUG
+				Utils.trace ("engine %s: removing source (%p) %s done %g", id, result, result.source_path, timer.elapsed () - start_time);
+#endif
+			}
+#if DEBUG
+			Utils.trace ("engine %s: merging source %s", id, result.source_path);
+			start_time = timer.elapsed ();
+#endif
+			yield merger.merge_vala_context (s, result.context, result.is_glib);
+			result.context = null; // let's free some memory
+			merger = null;
+#if DEBUG
+			elapsed = timer.elapsed () - start_time;
+			Utils.trace ("engine %s: merging source %s done %g %s", id, result.source_path, elapsed, elapsed > 0.7 ? " <== Warning" : "");
+#endif
+		}
+		
+		private async void resolve_ast ()
+		{
+#if DEBUG
+			GLib.Timer timer = new GLib.Timer ();
+			double start_time = 0;
+			timer.start ();
+			//_ast.dump_symbols ();
+			Utils.trace ("engine %s: resolving ast", id);
+			start_time = timer.elapsed ();
+#endif
+			var resolver = new SymbolResolver ();
+			resolver.resolve (_ast);
+#if DEBUG
+			Utils.trace ("engine %s: resolving ast done %g", id, timer.elapsed () - start_time);
+#endif
 		}
 	}
 }

=== modified file 'plugins/completion/afrodite-provider/afrodite/parser.vala'
--- plugins/completion/afrodite-provider/afrodite/parser.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/parser.vala	2011-03-10 19:26:24 +0000
@@ -26,21 +26,15 @@
 {
 	public class Parser : GLib.Object
 	{
-		public CodeContext context = null;
-
-		public Parser (Vala.List<SourceItem> sources)
-		{
-			context = new Vala.CodeContext();
-			foreach (SourceItem source in sources) {
-				add_source_item (source);
-			}
-
-		}
-
+		private CodeContext context = null;
+
+		private unowned SourceItem _source;
+		
 		public Parser.with_source (SourceItem source_item)
 		{
 			context = new Vala.CodeContext();
 			add_source_item (source_item);
+			_source = source_item;
 		}
 
 		private void add_source_item (SourceItem source)
@@ -99,6 +93,11 @@
 			parser.parse (context);
 
 			CodeContext.pop ();
+			
+			parse_result.source_path = _source.path;
+			parse_result.is_glib = _source.is_glib;
+			parse_result.is_edited = _source.content != null;
+			parse_result.context = context;
 			return parse_result;
 		}
 	}

=== modified file 'plugins/completion/afrodite-provider/afrodite/parseresult.vala'
--- plugins/completion/afrodite-provider/afrodite/parseresult.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/parseresult.vala	2011-03-10 19:26:24 +0000
@@ -30,6 +30,11 @@
 		public Vala.List<string> errors = new Vala.ArrayList<string> ();
 		public Vala.List<string> notes = new Vala.ArrayList<string> ();
 
+		public string source_path = null;
+		public bool is_glib = false;
+		public Vala.CodeContext context = null;
+		public bool is_edited = false;
+		
 		public override void warn (Vala.SourceReference? source, string message)
 		{
 			base.warn (source, message);

=== modified file 'plugins/completion/afrodite-provider/afrodite/sourcefile.vala'
--- plugins/completion/afrodite-provider/afrodite/sourcefile.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/sourcefile.vala	2011-03-10 19:26:24 +0000
@@ -69,16 +69,10 @@
 		~SourceFile ()
 		{
 			Utils.trace ("SourceFile destroying: %s", filename);
-#if DEBUG
-			Utils.trace ("     symbol count before destroy %d", parent.leaked_symbols.size);
-#endif
 			while (symbols != null && symbols.size > 0) {
 				var symbol = symbols.get (0);
 				remove_symbol (symbol);
 			}
-#if DEBUG
-			Utils.trace ("     symbol count after destroy  %d", parent.leaked_symbols.size);
-#endif
 			Utils.trace ("SourceFile destroyed: %s", filename);
 		}
 
@@ -130,21 +124,11 @@
 			if (symbols == null) {
 				symbols = new ArrayList<unowned Symbol> ();
 			}
-			assert (symbols.contains (symbol) == false);
 
 			symbols.add (symbol);
 
-
 			parent.symbols.set (symbol.fully_qualified_name, symbol);
-#if DEBUG
-			// debug
-			if (!parent.leaked_symbols.contains (symbol)) {
-				//parent.leaked_symbols.add (symbol);
-				symbol.weak_ref (this.on_symbol_destroy);
-			} else {
-				Utils.trace ("Symbol already added to the leak check: %s", symbol.fully_qualified_name);
-			}
-#endif
+			parent.unresolved_symbols.add(symbol);
 		}
 
 		public void remove_symbol (Symbol symbol)
@@ -157,6 +141,7 @@
 
 			if (!symbol.has_source_references) {
 				parent.symbols.remove (symbol.fully_qualified_name);
+				parent.unresolved_symbols.remove (symbol);
 				if (symbol.parent != null) {
 					if (symbol.is_generic_type_argument) {
 						symbol.parent.remove_generic_type_argument (symbol);
@@ -177,13 +162,5 @@
 				return symbols != null;
 			}
 		}
-
-#if DEBUG
-		private void on_symbol_destroy (Object obj)
-		{
-			parent.leaked_symbols.remove ((Symbol)obj);
-			//Utils.trace ("symbol destroyed (%p)",  obj);
-		}
-#endif
 	}
 }

=== modified file 'plugins/completion/afrodite-provider/afrodite/sourcereference.vala'
--- plugins/completion/afrodite-provider/afrodite/sourcereference.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/sourcereference.vala	2011-03-10 19:26:24 +0000
@@ -23,13 +23,13 @@
 
 namespace Afrodite
 {
-	public class SourceReference : Object
+	public class SourceReference
 	{
-		public unowned SourceFile file { get; set; }
-		public int first_line { get; set; }
-		public int last_line { get; set; }
-		public int first_column { get; set; }
-		public int last_column { get; set; }
+		public unowned SourceFile file;
+		public int first_line;
+		public int last_line;
+		public int first_column;
+		public int last_column;
 		
 		public bool contains_position (int line, int column)
 		{

=== modified file 'plugins/completion/afrodite-provider/afrodite/symbol.vala'
--- plugins/completion/afrodite-provider/afrodite/symbol.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/symbol.vala	2011-03-10 19:26:24 +0000
@@ -24,7 +24,7 @@
 
 namespace Afrodite
 {	
-	public class Symbol : Object
+	public class Symbol
 	{
 		public static VoidType VOID = new VoidType ();
 		public static EllipsisType ELLIPSIS = new EllipsisType ();
@@ -346,7 +346,7 @@
 			return null;
 		}
 
-		public DataType? lookup_datatype_for_variable (CompareMode mode, string name, SymbolAccessibility access = SymbolAccessibility.ANY)
+		public DataType? lookup_datatype_for_variable_name (CompareMode mode, string name, SymbolAccessibility access = SymbolAccessibility.ANY)
 		{
 			if (has_local_variables) {
 				foreach (DataType d in local_variables) {
@@ -355,7 +355,7 @@
 					}
 				}
 			}
-			
+
 			// search in symbol parameters
 			if (has_parameters) {
 				foreach (DataType type in parameters) {
@@ -365,6 +365,11 @@
 				}
 			}
 			
+			return null;
+		}
+
+		public DataType? lookup_datatype_for_symbol_name (CompareMode mode, string name, SymbolAccessibility access = SymbolAccessibility.ANY)
+		{
 			if (has_children) {
 				foreach (Symbol s in this.children) {
 					if ((s.access & access) != 0
@@ -377,7 +382,7 @@
 			if (has_base_types) {
 				foreach (DataType d in this.base_types) {
 					if (d.symbol != null) {
-						var r = d.symbol.lookup_datatype_for_variable (mode, name, 
+						var r = d.symbol.lookup_datatype_for_symbol_name (mode, name, 
 							SymbolAccessibility.INTERNAL | SymbolAccessibility.PROTECTED | SymbolAccessibility.PROTECTED);
 						if (r != null) {
 							return d;
@@ -387,15 +392,24 @@
 			}
 			return null;
 		}
+
+		public DataType? lookup_datatype_for_name (CompareMode mode, string name, SymbolAccessibility access = SymbolAccessibility.ANY)
+		{
+			var result = lookup_datatype_for_variable_name (mode, name, access);
+			if (result != null)
+				return result;
+
+			return lookup_datatype_for_symbol_name (mode, name, access);
+		}
 		
-		public DataType? scope_lookup_datatype_for_variable (CompareMode mode, string name)
+		public DataType? scope_lookup_datatype_for_name (CompareMode mode, string name)
 		{
-			DataType result = lookup_datatype_for_variable (mode, name);
+			DataType result = lookup_datatype_for_name (mode, name);
 			
 			if (result == null) {
 
 				if (this.parent != null) {
-					result = this.parent.scope_lookup_datatype_for_variable (mode, name);
+					result = this.parent.scope_lookup_datatype_for_name (mode, name);
 				}
 				
 				if (result == null) {
@@ -405,7 +419,7 @@
 							if (s.file.has_using_directives) {
 								foreach (var u in s.file.using_directives) {
 									if (!u.unresolved) {
-										result = u.symbol.lookup_datatype_for_variable (mode, name, SymbolAccessibility.INTERNAL | SymbolAccessibility.PUBLIC);
+										result = u.symbol.lookup_datatype_for_symbol_name (mode, name, SymbolAccessibility.INTERNAL | SymbolAccessibility.PUBLIC);
 										if (result != null) {
 											break;
 										}
@@ -522,7 +536,6 @@
 				generic_type_arguments = new ArrayList<Symbol> ();
 			}
 
-			assert (generic_type_arguments.contains(sym) == false);
 			//debug ("added generic %s to %s", sym.name, this.fully_qualified_name);
 			//Utils.trace ("add generic type args symbol %s: %s", _fully_qualified_name, sym.fully_qualified_name);
 			generic_type_arguments.add (sym);
@@ -623,16 +636,18 @@
 			}
 		}
 		
-		public SourceReference? lookup_source_reference_filename (string filename)
+		public unowned SourceReference? lookup_source_reference_filename (string filename)
 		{
+			unowned SourceReference? result = null;
 			if (has_source_references) {
 				foreach (SourceReference reference in source_references) {
 					if (reference.file.filename == filename)
-						return reference;
+						result = reference;
+						break;
 				}
 			}
 			
-			return null;
+			return result;
 		}
 		
 		public SourceReference? lookup_source_reference_sourcefile (SourceFile source)
@@ -1053,7 +1068,6 @@
 			if (_specialized_symbols == null)
 				_specialized_symbols = new Vala.ArrayList<Symbol> ();
 
-			assert (_specialized_symbols.contains (item) == false);
 			_specialized_symbols.add (item);
 			item.generic_parent = this;
 		}
@@ -1061,7 +1075,6 @@
 		public void remove_specialized_symbol (Symbol? item)
 		{
 			assert (item != this);
-			assert (_specialized_symbols.contains (item));
 
 			_specialized_symbols.remove (item);
 			if (item.generic_parent == this)

=== modified file 'plugins/completion/afrodite-provider/afrodite/symbolresolver.vala'
--- plugins/completion/afrodite-provider/afrodite/symbolresolver.vala	2010-10-14 16:01:50 +0000
+++ plugins/completion/afrodite-provider/afrodite/symbolresolver.vala	2011-03-10 19:26:24 +0000
@@ -44,13 +44,12 @@
 
 			// first resolve the using directives
 			if (_ast.has_source_files) {
-				Symbol dummy;
 				foreach (SourceFile file in _ast.source_files) {
 					if (file.has_using_directives) {
 						foreach (DataType using_directive in file.using_directives) {
 							//
 							if (using_directive.unresolved) {
-								using_directive.symbol = _ast.lookup (using_directive.type_name, out dummy);
+								using_directive.symbol = _ast.lookup (using_directive.type_name);
 								if (using_directive.unresolved)
 									message ("file %s - can't resolve using directive: %s", file.filename, using_directive.type_name);
 							}
@@ -59,8 +58,12 @@
 				}
 			}
 
-			if (ast.root.has_children)
-				visit_symbols (ast.root.children);
+			if (ast.unresolved_symbols.size > 0) {
+				Afrodite.Utils.trace ("(symbol resolver): symbols to resolve %d", ast.unresolved_symbols.size);
+				visit_symbols (ast.unresolved_symbols);
+				Afrodite.Utils.trace ("(symbol resolver): unresolved symbol after resolve process %d", ast.unresolved_symbols.size);
+			}
+
 		}
 		
 		private Symbol? resolve_type (Symbol symbol, DataType type)
@@ -303,7 +306,52 @@
 
 			}
 		}
-		
+
+		private bool visit_symbol (Symbol symbol)
+		{
+			//print_symbol (symbol);
+			bool resolved = true;
+			
+			// resolving base types
+			if (symbol.has_base_types) {
+				foreach (DataType type in symbol.base_types) {
+					if (type.unresolved) {
+						type.symbol = resolve_type (symbol, type);
+						resolved &= !type.unresolved;
+					}
+				}
+			}
+			// resolving return type
+			if (symbol.return_type != null) {
+				if (symbol.return_type.unresolved) {
+					symbol.return_type.symbol = resolve_type (symbol, symbol.return_type);
+					resolved &= !symbol.return_type.unresolved;
+				}
+			}
+
+			// resolving symbol parameters
+			if (symbol.has_parameters) {
+				foreach (DataType type in symbol.parameters) {
+					if (type.unresolved) {
+						type.symbol = resolve_type (symbol, type);
+						resolved &= !type.unresolved;
+					}
+				}
+			}
+			// resolving local variables
+			if (symbol.has_local_variables) {
+				foreach (DataType type in symbol.local_variables) {
+					if (type.unresolved) {
+						resolve_symbol (symbol, type);
+						resolved &= !type.unresolved;
+					}
+				}
+			}
+			
+			return resolved;
+		}
+
+		/*
 		private void visit_symbol (Symbol symbol)
 		{
 			//print_symbol (symbol);
@@ -342,13 +390,20 @@
 			if (symbol.has_children) {
 				visit_symbols (symbol.children);
 			}
-		}
+		}*/
 
-		private void visit_symbols (Vala.List<Afrodite.Symbol> symbols)
+		private void visit_symbols (Vala.List<unowned Afrodite.Symbol> symbols)
 		{
+			Vala.List<unowned Afrodite.Symbol> resolved = new Vala.ArrayList<unowned Afrodite.Symbol>();
+			
 			foreach (Symbol symbol in symbols) {
-				visit_symbol (symbol);
+				if (visit_symbol (symbol)) {
+					resolved.add (symbol);
+				}
 			}
+			
+			foreach (Symbol symbol in resolved)
+				symbols.remove(symbol);
 		}
 	}
 }