Libadalang.Provider_Provider: add a constructor shortcut

TN: R914-022
AdaCore · Sep 18, 2018 · 0b56500 · 0b56500
1 parent e31b152
commit 0b56500
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/ada/extensions/src/libadalang-project_provider.ads b/ada/extensions/src/libadalang-project_provider.ads
@@ -40,6 +40,11 @@ package Libadalang.Project_Provider is
       Env              : Prj.Project_Environment_Access;
       Is_Project_Owner : Boolean := True)
       return Project_Unit_Provider;
+   function Create_Project_Unit_Provider_Reference
+     (Project          : Prj.Project_Tree_Access;
+      Env              : Prj.Project_Environment_Access;
+      Is_Project_Owner : Boolean := True)
+      return LAL.Unit_Provider_Reference;
    --  Create an unit provider using Project. If Is_Project_Owner is true,
    --  the result owns Project, thus the caller must not deallocate it itself.
    --  Otherwise, the project pointed by Project must outlive the returned unit
@@ -83,4 +88,12 @@ private
         Env              => Env,
         Is_Project_Owner => Is_Project_Owner));
 
+   function Create_Project_Unit_Provider_Reference
+     (Project          : Prj.Project_Tree_Access;
+      Env              : Prj.Project_Environment_Access;
+      Is_Project_Owner : Boolean := True)
+      return LAL.Unit_Provider_Reference
+   is (LAL.Create_Unit_Provider_Reference
+         (Create_Project_Unit_Provider (Project, Env, Is_Project_Owner)));
+
 end Libadalang.Project_Provider;
diff --git a/ada/testsuite/ada/gnat_compare/gnat_compare.adb b/ada/testsuite/ada/gnat_compare/gnat_compare.adb
@@ -136,8 +136,7 @@ procedure GNAT_Compare is
       end loop;
 
       Load (Project.all, Create (+Project_File), Env);
-      UFP := Create_Unit_Provider_Reference
-        (Create_Project_Unit_Provider (Project, Env, False));
+      UFP := Create_Project_Unit_Provider_Reference (Project, Env, False);
    end Load_Project;
 
    ------------------

diff --git a/ada/testsuite/ada/nameres.adb b/ada/testsuite/ada/nameres.adb
@@ -688,8 +688,7 @@ begin
             end loop;
 
             Load (Project.all, Create (+Filename), Env);
-            UFP := Create_Unit_Provider_Reference
-              (Create_Project_Unit_Provider (Project, Env));
+            UFP := Create_Project_Unit_Provider_Reference (Project, Env);
 
             if Args.Files_From_Project.Get then
                Add_Files_From_Project (Project, Project.Root_Project, Files);

diff --git a/ada/testsuite/ada/navigate.adb b/ada/testsuite/ada/navigate.adb
@@ -288,8 +288,7 @@ begin
    Project.Root_Project.Delete_Attribute (PRJ.Languages_Attribute);
    Project.Recompute_View;
 
-   UFP := LAL.Create_Unit_Provider_Reference
-     (LALPRJ.Create_Project_Unit_Provider (Project, Env));
+   UFP := LALPRJ.Create_Project_Unit_Provider_Reference (Project, Env);
 
    Ctx := LAL.Create_Context (Unit_Provider => UFP);
 

diff --git a/contrib/highlight/ada2web.adb b/contrib/highlight/ada2web.adb
@@ -338,9 +338,8 @@ begin
    end if;
 
    --  Create the analysis context for Libadalang
-   UFP := LAL.Create_Unit_Provider_Reference
-     (Libadalang.Project_Provider.Create_Project_Unit_Provider
-        (Prj_Tree, Env));
+   UFP := Libadalang.Project_Provider.Create_Project_Unit_Provider_Reference
+     (Prj_Tree, Env);
    Ctx := LAL.Create_Context (Unit_Provider => UFP);
 
    --  Create the output directories, if needed