ada/langkit
0
0
Fork 0
mirror of https://github.com/AdaCore/langkit.git synced 2026-02-12 12:28:12 -08:00
Code Issues Packages Projects Releases Wiki Activity

Generic API: rename Language_For to Language

Browse Source 
The latter feels more natural when using dot notation.

TN: U401-024
This commit is contained in:
Pierre-Marie de Rodat
2022-01-31 17:10:25 +00:00
committed by Raphaël AMIARD
parent fdacac7eab
commit 08eed4580b
9 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
langkit/templates/pkg_generic_api_body_ada.mako
View File

@@ -53,7 +53,7 @@ package body ${ada_lib_name}.Generic_API is
Ctx : constant Generic_Internal_Context :=
Lk_Convs.Unwrap_Context (Context);
begin
if Language_For (Context) /= Self_Id then
if Language (Context) /= Self_Id then
raise Precondition_Failure with "context belongs to another language";
end if;
return Wrap_Context.all (+Ctx);

40
support/langkit_support-generic_api-analysis.adb
View File

@@ -399,15 +399,15 @@ package body Langkit_Support.Generic_API.Analysis is
Internal => Result);
end Create_Context;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Self : Lk_Context'Class) return Language_Id is
function Language (Self : Lk_Context'Class) return Language_Id is
begin
Reject_Null_Context (Self);
return Self.Desc;
end Language_For;
end Language;
----------
-- Hash --
@@ -461,15 +461,15 @@ package body Langkit_Support.Generic_API.Analysis is
end;
end Get_From_File;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Self : Lk_Unit'Class) return Language_Id is
function Language (Self : Lk_Unit'Class) return Language_Id is
begin
Reject_Null_Unit (Self);
return Self.Context.Desc;
end Language_For;
end Language;
----------
-- Hash --
@@ -575,17 +575,17 @@ package body Langkit_Support.Generic_API.Analysis is
return Text (Self.First_Token, Self.Last_Token);
end Text;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Self : Lk_Node'Class) return Language_Id is
function Language (Self : Lk_Node'Class) return Language_Id is
begin
Check_Safety_Net (Self);
Reject_Null_Node (Self);
return Self.Desc;
end Language_For;
end Language;
----------
-- Hash --
@@ -961,16 +961,16 @@ package body Langkit_Support.Generic_API.Analysis is
end if;
end Is_Incomplete;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Self : Lk_Token'Class) return Language_Id is
function Language (Self : Lk_Token'Class) return Language_Id is
begin
Check_Safety_Net (Self);
Reject_Null_Token (Self);
return Self.Desc;
end Language_For;
end Language;
----------
-- Hash --

8
support/langkit_support-generic_api-analysis.ads
View File

@@ -96,7 +96,7 @@ package Langkit_Support.Generic_API.Analysis is
-- ``Tab_Stop`` is a positive number to describe the effect of tabulation
-- characters on the column number in source files.
function Language_For (Self : Lk_Context'Class) return Language_Id;
function Language (Self : Lk_Context'Class) return Language_Id;
-- Return the unique identifier for the Langkit-generated library that
-- implements ``Context``.
@@ -137,7 +137,7 @@ package Langkit_Support.Generic_API.Analysis is
-- Analysis unit operations --
------------------------------
function Language_For (Self : Lk_Unit'Class) return Language_Id;
function Language (Self : Lk_Unit'Class) return Language_Id;
-- Return the unique identifier corresponding to ``Self``
function Hash (Self : Lk_Unit) return Hash_Type;
@@ -172,7 +172,7 @@ package Langkit_Support.Generic_API.Analysis is
-- Analysis nodes operations --
-------------------------------
function Language_For (Self : Lk_Node'Class) return Language_Id;
function Language (Self : Lk_Node'Class) return Language_Id;
-- Return the unique identifier corresponding to ``Self``
function Hash (Self : Lk_Node) return Hash_Type;
@@ -298,7 +298,7 @@ package Langkit_Support.Generic_API.Analysis is
-- Token operations --
----------------------
function Language_For (Self : Lk_Token'Class) return Language_Id;
function Language (Self : Lk_Token'Class) return Language_Id;
-- Return the unique identifier corresponding to ``Self``
function Hash (Self : Lk_Token) return Hash_Type;

32
support/langkit_support-generic_api-introspection.adb
View File

@@ -176,15 +176,15 @@ package body Langkit_Support.Generic_API.Introspection is
end if;
end Debug_Name;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (T : Type_Ref) return Language_Id is
function Language (T : Type_Ref) return Language_Id is
begin
Check_Type (T);
return T.Id;
end Language_For;
end Language;
--------------
-- To_Index --
@@ -288,15 +288,15 @@ package body Langkit_Support.Generic_API.Introspection is
end if;
end "=";
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Value : Value_Ref) return Language_Id is
function Language (Value : Value_Ref) return Language_Id is
begin
Check_Value (Value);
return Value.Value.Id;
end Language_For;
end Language;
-------------
-- Type_Of --
@@ -356,7 +356,7 @@ package body Langkit_Support.Generic_API.Introspection is
Result : Internal_Acc_Analysis_Unit;
begin
if Value /= No_Lk_Unit then
Check_Same_Language (Id, Value.Language_For);
Check_Same_Language (Id, Value.Language);
end if;
Result := new Internal_Rec_Analysis_Unit;
Result.Value := Value;
@@ -556,7 +556,7 @@ package body Langkit_Support.Generic_API.Introspection is
Result : Internal_Acc_Token;
begin
if Value /= No_Lk_Token then
Check_Same_Language (Id, Value.Language_For);
Check_Same_Language (Id, Value.Language);
end if;
Result := new Internal_Rec_Token;
Result.Value := Value;
@@ -614,7 +614,7 @@ package body Langkit_Support.Generic_API.Introspection is
Result : Internal_Acc_Node;
begin
if Value /= No_Lk_Node then
Check_Same_Language (Id, Value.Language_For);
Check_Same_Language (Id, Value.Language);
end if;
Result := new Internal_Rec_Node;
Result.Value := Value;
@@ -647,7 +647,7 @@ package body Langkit_Support.Generic_API.Introspection is
end if;
declare
Id : constant Language_Id := Language_For (Node);
Id : constant Language_Id := Language (Node);
E : constant Internal.Analysis.Internal_Entity :=
Unwrap_Node (Node);
Result : constant Type_Index := Id.Node_Kind (E.Node);
@@ -906,7 +906,7 @@ package body Langkit_Support.Generic_API.Introspection is
V : constant Value_Ref := Values (I);
begin
Check_Value (V);
Check_Same_Language (T.Id, V.Language_For);
Check_Same_Language (T.Id, V.Language);
Check_Value_Type (V, ET);
Internal_Values (I) := +V.Value;
end;
@@ -1635,7 +1635,7 @@ package body Langkit_Support.Generic_API.Introspection is
raise Precondition_Failure with "the null node has no member";
end if;
Node := Create_Node (Value.Language_For, Value);
Node := Create_Node (Value.Language, Value);
return Eval_Member (Node, Member, Arguments);
end Eval_Node_Member;

4
support/langkit_support-generic_api-introspection.ads
View File

@@ -55,7 +55,7 @@ package Langkit_Support.Generic_API.Introspection is
type Type_Ref_Array is array (Positive range <>) of Type_Ref;
function Language_For (T : Type_Ref) return Language_Id;
function Language (T : Type_Ref) return Language_Id;
-- Return the language ID corresponding to the given type. Raise a
-- ``Precondition_Failure`` exception if ``T`` is ``No_Type_Ref``.
@@ -118,7 +118,7 @@ package Langkit_Support.Generic_API.Introspection is
function "=" (Left, Right : Value_Ref) return Boolean;
-- Return whether ``Left`` and ``Right`` are structurally equivalent
function Language_For (Value : Value_Ref) return Language_Id;
function Language (Value : Value_Ref) return Language_Id;
-- Return the language ID corresponding to the given value. Raise a
-- ``Precondition_Failure`` exception if ``Value`` is ``No_Value_Ref``.

20
support/langkit_support-generic_api.adb
View File

@@ -43,15 +43,15 @@ package body Langkit_Support.Generic_API is
return Create_Name (Id.Language_Name.all);
end Language_Name;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Rule : Grammar_Rule_Ref) return Language_Id is
function Language (Rule : Grammar_Rule_Ref) return Language_Id is
begin
Check_Grammar_Rule (Rule);
return Rule.Id;
end Language_For;
end Language;
--------------------------
-- Default_Grammar_Rule --
@@ -126,15 +126,15 @@ package body Langkit_Support.Generic_API is
end if;
end Check_Grammar_Rule;
------------------
-- Language_For --
------------------
--------------
-- Language --
--------------
function Language_For (Kind : Token_Kind_Ref) return Language_Id is
function Language (Kind : Token_Kind_Ref) return Language_Id is
begin
Check_Token_Kind (Kind);
return Kind.Id;
end Language_For;
end Language;
---------------------
-- Token_Kind_Name --

4
support/langkit_support-generic_api.ads
View File

@@ -72,7 +72,7 @@ package Langkit_Support.Generic_API is
No_Grammar_Rule_Ref : constant Grammar_Rule_Ref;
-- Special value to express no grammar rule reference
function Language_For (Rule : Grammar_Rule_Ref) return Language_Id;
function Language (Rule : Grammar_Rule_Ref) return Language_Id;
-- Return the language ID corresponding to the given grammar rule. Raise a
-- ``Precondition_Failure`` exception if ``Rule`` is
-- ``No_Grammar_Rule_Ref``.
@@ -119,7 +119,7 @@ package Langkit_Support.Generic_API is
No_Token_Kind_Ref : constant Token_Kind_Ref;
-- Special value to express no token kind reference
function Language_For (Kind : Token_Kind_Ref) return Language_Id;
function Language (Kind : Token_Kind_Ref) return Language_Id;
-- Return the language ID corresponding to the given token kind. Raise a
-- ``Precondition_Failure`` exception if ``Kind`` is ``No_Token_Kind_Ref``.

4
testsuite/tests/ada_api/generic_api/introspection_types.adb
View File

@@ -158,10 +158,10 @@ begin
Invalid_Iter := From_Index (Id, First_Node);
Invalid_Struct := From_Index (Id, First_Enum);
Put ("Language_For: null T argument: ");
Put ("Language: null T argument: ");
begin
declare
Dummy : constant Language_Id := Language_For (No_Type_Ref);
Dummy : constant Language_Id := Language (No_Type_Ref);
begin
raise Program_Error;
end;

2
testsuite/tests/ada_api/generic_api/test.out
View File

@@ -259,7 +259,7 @@ All types
STRUCT_CATEGORY
is a node
Language_For: null T argument: LANGKIT_SUPPORT.ERRORS.PRECONDITION_FAILURE: null type reference
Language: null T argument: LANGKIT_SUPPORT.ERRORS.PRECONDITION_FAILURE: null type reference
To_Index: Null T argument: LANGKIT_SUPPORT.ERRORS.PRECONDITION_FAILURE: null type reference
From_Index: out of range type index: LANGKIT_SUPPORT.ERRORS.PRECONDITION_FAILURE: invalid type index
Debug_Name: Null T argument: <No_Type_Ref>