Removed Nametags and identifier aliasing for Variables

1 files changed, 1 insertions, 43 deletions

diff --git a/src/kompsos-advanced_reify.adb b/src/kompsos-advanced_reify.adb
index 42df1e7..c2d1670 100644
--- a/src/kompsos-advanced_reify.adb
+++ b/src/kompsos-advanced_reify.adb
@@ -96,49 +96,7 @@ package body Kompsos.Advanced_Reify is
            (Subst : in State)
         return Element_Trees.Tree is
     begin
-        if Subst.LVars.Is_Empty then
-            return Element_Trees.Empty_Tree;
-        end if;
-        for Iter in Subst.Ident.Iterate loop
-            if ID_Number_Maps.Element (Iter) = Subst.LVars.First_Index then
-                return Treeify (Term (T (Variable'(
-                    Ident => ID_Number_Maps.Key (Iter),
-                    Name  => Subst.LVars.Element (ID_Number_Maps.Element (Iter))))),
-                    Subst);
-            end if;
-        end loop;
-        return Element_Trees.Empty_Tree;
-    end Treeify_First;
-
-
-    function Treeify_First
-           (Subst : in State;
-            Name  : in String)
-        return Element_Trees.Tree is
-    begin
-        return Treeify_First (Subst, +Name);
-    end Treeify_First;
-
-
-    function Treeify_First
-           (Subst : in State;
-            Name  : in Nametag)
-        return Element_Trees.Tree
-    is
-        Name_Index : constant Name_Vectors.Extended_Index := Subst.LVars.Find_Index (Name);
-    begin
-        if Name_Index = Name_Vectors.No_Index then
-            return Element_Trees.Empty_Tree;
-        end if;
-        for Iter in Subst.Ident.Iterate loop
-            if ID_Number_Maps.Element (Iter) = Name_Index then
-                return Treeify (Term (T (Variable'(
-                    Ident => ID_Number_Maps.Key (Iter),
-                    Name  => Subst.LVars.Element (ID_Number_Maps.Element (Iter))))),
-                    Subst);
-            end if;
-        end loop;
-        return Element_Trees.Empty_Tree;
+        return To_Tree (Resolve_First (Subst));
     end Treeify_First;