Added Comparable interface to Ref

(and fixed some warnings)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Var.vala b/src/Var.vala
index eb44637..177e2fa 100644
--- a/src/Var.vala
+++ b/src/Var.vala
@@ -13,7 +13,7 @@ namespace Eva {
     }
     
     internal static string alias(string key, Gee.Map<string, string> aliases) {
-      if(!(key in aliases))
+      if(!(key in aliases.keys))
         return key;
       else
         return alias(aliases[key], aliases);
@@ -37,19 +37,19 @@ namespace Eva {
         if(key == vkey)
           return true;
         
-        if(key in vars && vkey in vars)
+        if(key in vars.keys && vkey in vars.keys)
           return vars[key].do_match(vars[vkey], vars, aliases);
-        else if(!(vkey in vars)) {
+        else if(!(vkey in vars.keys)) {
           aliases[vkey] = key;
           return true;
         }
-        else /* !(key in vars) */ {
+        else /* !(key in vars.keys) */ {
           aliases[key] = vkey;
           return true;
         }
       }
       else {
-        if(key in vars) {
+        if(key in vars.keys) {
           return vars[key].do_match(o, vars, aliases);
         }
         else {