Hygiene - Possibly working

1 files changed, 12 insertions, 3 deletions

diff --git a/src/ident.cpp b/src/ident.cpp
index 8543d6fa..45c96f2e 100644
--- a/src/ident.cpp
+++ b/src/ident.cpp
@@ -15,8 +15,17 @@ unsigned int Ident::Hygiene::g_next_scope = 0;
 bool Ident::Hygiene::is_visible(const Hygiene& src) const
 {
     // HACK: Disable hygiene for now
-    return true;
-    //return this->scope_index == src.scope_index;
+    //return true;
+
+    if( this->contexts.size() == 0 ) {
+        return src.contexts.size() == 0;
+    }
+    
+    auto des = this->contexts.back();
+    for(const auto& c : src.contexts)
+        if( des == c )
+            return true;
+    return false;
 }
 
 ::std::ostream& operator<<(::std::ostream& os, const Ident& x) {
@@ -25,7 +34,7 @@ bool Ident::Hygiene::is_visible(const Hygiene& src) const
 }
 
 ::std::ostream& operator<<(::std::ostream& os, const Ident::Hygiene& x) {
-    os << "{" << x.scope_index << "}";
+    os << "{" << x.contexts << "}";
     return os;
 }