summaryrefslogtreecommitdiff
path: root/src/ident.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ident.cpp')
-rw-r--r--src/ident.cpp45
1 files changed, 8 insertions, 37 deletions
diff --git a/src/ident.cpp b/src/ident.cpp
index 5d0fe00c..a5a6bdbb 100644
--- a/src/ident.cpp
+++ b/src/ident.cpp
@@ -3,49 +3,20 @@
* - By John Hodge (Mutabah/thePowersGang)
*
* include/ident.cpp
- * - Identifiers with hygine
+ * - Identifiers with hygiene
*/
#include <iostream>
#include <ident.hpp>
#include <debug.hpp>
#include <common.hpp> // vector print
-bool Ident::Hygine::is_visible(const Hygine& src) const
+unsigned int Ident::Hygiene::g_next_scope = 0;
+
+bool Ident::Hygiene::is_visible(const Hygiene& src) const
{
- // HACK: Disable hygine for now
+ // HACK: Disable hygiene for now
return true;
-
- DEBUG("*this = " << *this << ", src=" << src);
- if( this->file_num != src.file_num ) {
- DEBUG("- Different file");
- return false;
- }
-
- // `this` is the item, `src` is the ident used to access it
-
- // If this is from a deeper point than the source, it won't work.
- if( this->indexes.size() > src.indexes.size() ) {
- DEBUG("- Not subset: len");
- return false;
- }
-
- // If this hygine list (barring the last) is a subset of the source
- for(unsigned int i = 0; i < this->indexes.size()-1 - 1; i ++)
- {
- if( this->indexes[i] != src.indexes[i] ) {
- DEBUG("- Not subset: " << i);
- return false;
- }
- }
-
- unsigned int end = this->indexes.size()-1-1;
- // Allow match if this ident is from before the addressing ident
- if( this->indexes[end] < src.indexes[end] ) {
- return true;
- }
-
- DEBUG("- Not before");
- return false;
+ //return x.scope_index == src.scope_index;
}
::std::ostream& operator<<(::std::ostream& os, const Ident& x) {
@@ -53,8 +24,8 @@ bool Ident::Hygine::is_visible(const Hygine& src) const
return os;
}
-::std::ostream& operator<<(::std::ostream& os, const Ident::Hygine& x) {
- os << "{" << x.file_num << ": [" << x.indexes << "]}";
+::std::ostream& operator<<(::std::ostream& os, const Ident::Hygiene& x) {
+ os << "{" << x.scope_index << "}";
return os;
}