add internal copy of libgee and use Gee.ArrayList, Gee.HashMap, and

2007-07-27  Juerg Billeter  <j@bitron.ch>

	* Makefile.am, README, configure.ac, gee/Makefile.am,
	  gee/arraylist.vala, gee/collection.vala, gee/hashmap.vala,
	  gee/hashset.vala, gee/iterable.vala, gee/iterator.vala, gee/list.vala,
	  gee/map.vala, gee/readonlycollection.vala, gee/readonlylist.vala,
	  gee/readonlymap.vala, gee/readonlyset.vala, gee/set.vala,
	  vala/Makefile.am, vala/parser.y, vala/valaarray.vala,
	  vala/valaarraycreationexpression.vala, vala/valaattribute.vala,
	  vala/valablock.vala, vala/valacallback.vala, vala/valaclass.vala,
	  vala/valacodecontext.vala, vala/valacodenode.vala,
	  vala/valadatatype.vala, vala/valaelementaccess.vala,
	  vala/valaenum.vala, vala/valaexpression.vala, vala/valafield.vala,
	  vala/valaformalparameter.vala, vala/valaforstatement.vala,
	  vala/valainitializerlist.vala, vala/valainstancecast.vala,
	  vala/valainterface.vala, vala/valainterfacewriter.vala,
	  vala/valainvocationexpression.vala, vala/valainvokable.vala,
	  vala/valalambdaexpression.vala,
	  vala/valalocalvariabledeclaration.vala, vala/valamember.vala,
	  vala/valamemberaccess.vala, vala/valamemorymanager.vala,
	  vala/valamethod.vala, vala/valanamespace.vala,
	  vala/valaobjectcreationexpression.vala, vala/valapointer.vala,
	  vala/valascope.vala, vala/valasemanticanalyzer.vala,
	  vala/valasignal.vala, vala/valasourcefile.vala,
	  vala/valasourcefilecycle.vala, vala/valastruct.vala,
	  vala/valaswitchsection.vala, vala/valaswitchstatement.vala,
	  vala/valasymbol.vala, vala/valasymbolresolver.vala,
	  vala/valatrystatement.vala, vala/valatypeparameter.vala,
	  vala/valatypereference.vala, vala/valavariabledeclarator.vala,
	  ccode/Makefile.am, ccode/valaccodeblock.vala,
	  ccode/valaccodecasestatement.vala,
	  ccode/valaccodecommaexpression.vala, ccode/valaccodedeclaration.vala,
	  ccode/valaccodeenum.vala, ccode/valaccodeforstatement.vala,
	  ccode/valaccodefragment.vala, ccode/valaccodefunction.vala,
	  ccode/valaccodefunctioncall.vala,
	  ccode/valaccodefunctiondeclarator.vala,
	  ccode/valaccodeinitializerlist.vala, ccode/valaccodestruct.vala,
	  ccode/valaccodeswitchstatement.vala, gobject/Makefile.am,
	  gobject/valaclassregisterfunction.vala,
	  gobject/valacodegenerator.vala,
	  gobject/valacodegeneratorassignment.vala,
	  gobject/valacodegeneratorclass.vala,
	  gobject/valacodegeneratorinterface.vala,
	  gobject/valacodegeneratorinvocationexpression.vala,
	  gobject/valacodegeneratormemberaccess.vala,
	  gobject/valacodegeneratormethod.vala,
	  gobject/valacodegeneratorsignal.vala,
	  gobject/valacodegeneratorsourcefile.vala,
	  gobject/valainterfaceregisterfunction.vala, compiler/Makefile.am,
	  vapi/gio-standalone.vala, vapi/gstreamer-0.10.vala,
	  vapi/gtk+-2.0.vala, vapigen/Makefile.am, vapigen/valagidlparser.vala:
	  add internal copy of libgee and use Gee.ArrayList, Gee.HashMap, and
	  Gee.HashSet instead of GLib.List and GLib.HashTable

svn path=/trunk/; revision=406

1 files changed, 5 insertions, 4 deletions

diff --git a/vala/valascope.vala b/vala/valascope.vala
index 745c8e58a..6a5610481 100644
--- a/vala/valascope.vala
+++ b/vala/valascope.vala
@@ -21,6 +21,7 @@
  */
 
 using GLib;
+using Gee;
 
 /**
  * Represents a part of the symbol tree.
@@ -36,7 +37,7 @@ public class Vala.Scope {
 	 */
 	public weak Scope parent_scope { get; set; }
 
-	private HashTable<string,Symbol> symbol_table;
+	private Map<string,Symbol> symbol_table;
 
 	/**
 	 * Creates a new scope.
@@ -56,14 +57,14 @@ public class Vala.Scope {
 	public void add (string name, Symbol! sym) {
 		if (name != null) {
 			if (symbol_table == null) {
-				symbol_table = new HashTable.full (str_hash, str_equal, g_free, g_object_unref);
+				symbol_table = new HashMap<string,Symbol> (str_hash, str_equal);
 			} else if (lookup (name) != null) {
 				owner.error = true;
 				Report.error (owner.source_reference, "`%s' already contains a definition for `%s'".printf (owner.get_full_name (), name));
 				return;
 			}
 
-			symbol_table.insert (name, sym);
+			symbol_table[name] = sym;
 		}
 		sym.owner = this;
 	}
@@ -79,7 +80,7 @@ public class Vala.Scope {
 		if (symbol_table == null) {
 			return null;
 		}
-		Symbol sym = symbol_table.lookup (name);
+		Symbol sym = symbol_table[name];
 		if (sym != null && !sym.active) {
 			sym = null;
 		}