X-Git-Url: https://gitweb.ps.run/toc/blobdiff_plain/b9322dfb8efe37f6f88a899269bdf21015f4db9a..c4231c6faf4e1b4650b075c641b0bb8c053739e4:/src/find.h?ds=inline

diff --git a/src/find.h b/src/find.h
index fec540f..3342536 100644
--- a/src/find.h
+++ b/src/find.h
@@ -27,202 +27,165 @@ opt<T *> findPtr(const std::vector<T> & ts, std::function<bool(T)> f)
   return nullopt;
 }
 
-opt<Function> findFunction(
-  const Program & p,
-  const std::string & name,
-  const std::vector<std::string> & namespacePrefixes)
+std::optional<
+  std::tuple<
+    std::shared_ptr<Context>,
+    std::vector<std::string>>>
+getContext(std::shared_ptr<Context> ctx, const std::vector<std::string> & namespacePrefix)
 {
-  if (namespacePrefixes.empty())
-  {
-    return find<Function>(p.functions, [&](Function f) { return f.name == name; });
-  }
-  
-  auto n = find<Namespace>(p.namespaces, [&](Namespace n) { return n.name == namespacePrefixes[0]; });
-
-  if (!n.has_value())
-    return nullopt;
+  auto result = ctx;
 
-  std::vector<Namespace> namespaces = { n.value() };
-
-  for (int i = 1; i < namespacePrefixes.size(); i++)
+  for (auto name : namespacePrefix)
   {
-    n = find<Namespace>(n.value().namespaces, [&](Namespace n) { return n.name == namespacePrefixes[i]; });
-    
-    if (!n.has_value())
+    auto newResult = find<Namespace>(result->namespaces, [&](Namespace n) { return n.name == name; });
+    if (newResult.has_value())
+    {
+      result = newResult->ctx;
+    }
+    else
+    {
       return nullopt;
-
-    namespaces.push_back(n.value());
+    }
   }
 
-  for (int i = namespaces.size()-1; i >= 0; i--)
+  std::vector<std::string> namespaces;
+  for (auto it = result; it != nullptr; it = it->parent)
   {
-    auto f = find<Function>(namespaces[i].functions, [&](Function f) { return f.name == name; });
-    if (f.has_value())
-      return f.value();
+    if (it->name.has_value())
+    {
+      namespaces.insert(namespaces.begin(), it->name.value());
+    }
+    else if (it->parent != nullptr)
+    {
+      namespaces.clear();
+      break;
+    }
   }
 
-  return find<Function>(p.functions, [&](Function f) { return f.name == name; });
+  return std::make_tuple(result, namespaces);
 }
 
-opt<Function *> findFunctionPtr(
-  const Program & p,
-  const std::string & name,
-  const std::vector<std::string> & namespacePrefixes)
-{
-  if (namespacePrefixes.empty())
-  {
-    return findPtr<Function>(p.functions, [&](Function f) { return f.name == name; });
-  }
-  
-  auto n = find<Namespace>(p.namespaces, [&](Namespace n) { return n.name == namespacePrefixes[0]; });
 
-  if (!n.has_value())
-    return nullopt;
 
-  std::vector<Namespace> namespaces = { n.value() };
-
-  for (int i = 1; i < namespacePrefixes.size(); i++)
-  {
-    n = find<Namespace>(n.value().namespaces, [&](Namespace n) { return n.name == namespacePrefixes[i]; });
-    
-    if (!n.has_value())
-      return nullopt;
-
-    namespaces.push_back(n.value());
-  }
-
-  for (int i = namespaces.size()-1; i >= 0; i--)
+opt<std::tuple<Function, std::vector<std::string>>> findFunction(
+  const std::string & name,
+  const std::vector<std::string> & namespacePrefix,
+  std::shared_ptr<Context> ctx)
+{
+  for (auto it = ctx; it != nullptr; it = it->parent)
   {
-    auto f = findPtr<Function>(namespaces[i].functions, [&](Function f) { return f.name == name; });
-    if (f.has_value())
-      return f.value();
+    auto n = getContext(it, namespacePrefix);
+    if (n.has_value())
+    {
+      auto x = find<Function>(std::get<0>(*n)->functions, [&](Function _) { return _.name == name; });
+      if (x.has_value())
+        return std::make_tuple(x.value(), std::get<1>(*n));
+    }
   }
-
-  return findPtr<Function>(p.functions, [&](Function f) { return f.name == name; });
+  return nullopt;
 }
 
-opt<Struct> findStruct(
-  const Program & p,
+opt<std::tuple<Function *, std::vector<std::string>>> findFunctionPtr(
   const std::string & name,
-  const std::vector<std::string> & namespacePrefixes)
+  const std::vector<std::string> & namespacePrefix,
+  std::shared_ptr<Context> ctx)
 {
-  if (namespacePrefixes.empty())
+  for (auto it = ctx; it != nullptr; it = it->parent)
   {
-    return find<Struct>(p.structs, [&](Struct s) { return s.name == name; });
+    auto n = getContext(it, namespacePrefix);
+    if (n.has_value())
+    {
+      auto x = findPtr<Function>(std::get<0>(*n)->functions, [&](Function _) { return _.name == name; });
+      if (x.has_value())
+        return std::make_tuple(x.value(), std::get<1>(*n));
+    }
   }
-  
-  auto n = find<Namespace>(p.namespaces, [&](Namespace n) { return n.name == namespacePrefixes[0]; });
-  
-  if (!n.has_value())
-    return nullopt;
-
-  std::vector<Namespace> namespaces = { n.value() };
-    
-  for (int i = 1; i < namespacePrefixes.size(); i++)
-  {
-    n = find<Namespace>(n.value().namespaces, [&](Namespace n) { return n.name == namespacePrefixes[i]; });
+  return nullopt;
+}
 
-    if (!n.has_value())
-      return nullopt;
 
-    namespaces.push_back(n.value());
-  }
 
-  for (int i = namespaces.size()-1; i >= 0; i--)
+opt<std::tuple<Struct, std::vector<std::string>>> findStruct(
+  const std::string & name,
+  const std::vector<std::string> & namespacePrefix,
+  std::shared_ptr<Context> ctx)
+{
+  for (auto it = ctx; it != nullptr; it = it->parent)
   {
-    auto f = find<Struct>(namespaces[i].structs, [&](Struct f) { return f.name == name; });
-    if (f.has_value())
-      return f.value();
+    auto n = getContext(it, namespacePrefix);
+    if (n.has_value())
+    {
+      auto x = find<Struct>(std::get<0>(*n)->structs, [&](Struct _) { return _.name == name; });
+      if (x.has_value())
+        return std::make_tuple(x.value(), std::get<1>(*n));
+    }
   }
-
-  return find<Struct>(n.value().structs, [&](Struct s) { return s.name == name; });
+  return nullopt;
 }
 
-opt<Struct *> findStructPtr(
-  const Program & p,
+opt<std::tuple<Struct *, std::vector<std::string>>> findStructPtr(
   const std::string & name,
-  const std::vector<std::string> & namespacePrefixes)
+  const std::vector<std::string> & namespacePrefix,
+  std::shared_ptr<Context> ctx)
 {
-  if (namespacePrefixes.empty())
-  {
-    return findPtr<Struct>(p.structs, [&](Struct s) { return s.name == name; });
-  }
-  
-  auto n = find<Namespace>(p.namespaces, [&](Namespace n) { return n.name == namespacePrefixes[0]; });
-  
-  if (!n.has_value())
-    return nullopt;
-
-  std::vector<Namespace> namespaces = { n.value() };
-    
-  for (int i = 1; i < namespacePrefixes.size(); i++)
+  for (auto it = ctx; it != nullptr; it = it->parent)
   {
-    n = find<Namespace>(n.value().namespaces, [&](Namespace n) { return n.name == namespacePrefixes[i]; });
-
-    if (!n.has_value())
-      return nullopt;
-
-    namespaces.push_back(n.value());
+    auto n = getContext(it, namespacePrefix);
+    if (n.has_value())
+    {
+      auto x = findPtr<Struct>(std::get<0>(*n)->structs, [&](Struct _) { return _.name == name; });
+      if (x.has_value())
+        return std::make_tuple(x.value(), std::get<1>(*n));
+    }
   }
+  return nullopt;
+}
 
-  for (int i = namespaces.size()-1; i >= 0; i--)
-  {
-    auto f = findPtr<Struct>(namespaces[i].structs, [&](Struct f) { return f.name == name; });
-    if (f.has_value())
-      return f.value();
-  }
 
-  return findPtr<Struct>(n.value().structs, [&](Struct s) { return s.name == name; });
-}
 
-opt<Variable> findVariable(
-  const Program & p,
+opt<std::tuple<Variable, std::vector<std::string>>> findVariable(
   const std::string & name,
+  const std::vector<std::string> & namespacePrefix,
   std::shared_ptr<Context> ctx)
 {
-  auto it = ctx;
-  while (it != nullptr)
+  for (auto it = ctx; it != nullptr; it = it->parent)
   {
-    auto v = find<Variable>(it->variables, [&](Variable v) { return v.name == name; });
-    if (v.has_value())
-      return v;
-    it = it->parent;
+    auto n = getContext(it, namespacePrefix);
+    if (n.has_value())
+    {
+      auto x = find<Variable>(std::get<0>(*n)->variables, [&](Variable _) { return _.name == name; });
+      if (x.has_value())
+        return std::make_tuple(x.value(), std::get<1>(*n));
+    }
   }
   return nullopt;
 }
 
+
+
 opt<StructMember<Function>> findStructMethod(
-  const Program & p,
   const std::string & name,
-  TypeInfo ti)
+  const Struct & s)
 {
-  if (!ti.isStruct)
-    return nullopt;
-  auto s = findStruct(p, ti.type.name, ti.type.namespacePrefixes);
-  if (!s.has_value())
-    return nullopt;
-  return find<StructMember<Function>>(s.value().methods, [&](Function f) { return f.name == name; });
+  return find<StructMember<Function>>(s.methods, [&](Function f) { return f.name == name; });
 }
 opt<StructMember<Function> *> findStructMethodPtr(
-  const Program & p,
   const std::string & name,
-  TypeInfo ti)
+  const Struct & s)
 {
-  if (!ti.isStruct)
-    return nullopt;
-  auto s = findStruct(p, ti.type.name, ti.type.namespacePrefixes);
-  if (!s.has_value())
-    return nullopt;
-  return findPtr<StructMember<Function>>(s.value().methods, [&](Function f) { return f.name == name; });
+  return findPtr<StructMember<Function>>(s.methods, [&](Function f) { return f.name == name; });
 }
 
 opt<StructMember<Variable>> findStructMember(
-  const Program & p,
-  TypeInfo ti,
-  const std::string & name)
+  const std::string & name,
+  const Struct & s)
+{
+  return find<StructMember<Variable>>(s.members, [&](Variable v) { return v.name == name; });
+}
+
+opt<StructMember<Variable> *> findStructMemberPtr(
+  const std::string & name,
+  const Struct & s)
 {
-  auto s = findStruct(p, ti.type.name, ti.type.namespacePrefixes);
-  if (!s.has_value())
-    return nullopt;
-  return find<StructMember<Variable>>(s.value().members, [&](Variable v) { return v.name == name; });
+  return findPtr<StructMember<Variable>>(s.members, [&](Variable v) { return v.name == name; });
 }
\ No newline at end of file