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

$.Introspection: add prefixes to member names ("f_", "p_")

Browse Source 
TN: U203-015
This commit is contained in:
Pierre-Marie de Rodat
2021-02-03 17:08:43 +01:00
committed by Pierre-Marie de Rodat
parent 5f4b9e7096
commit 8564bff96d
5 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
langkit/templates/pkg_introspection_impl_spec_ada.mako
View File

@@ -134,7 +134,7 @@ private package ${ada_lib_name}.Introspection_Implementation is
-- Descriptors for syntax fields
% for f in ctx.sorted_parse_fields:
<% name = f.original_name.lower %>
<% name = f.api_name.lower %>
Desc_For_${f.introspection_enum_literal} : aliased constant
Syntax_Field_Descriptor := (
Name_Length => ${len(name)},
@@ -201,7 +201,7 @@ private package ${ada_lib_name}.Introspection_Implementation is
% endfor
% for p in ctx.sorted_properties:
<% name = p.original_name.lower %>
<% name = p.api_name.lower %>
Desc_For_${p.introspection_enum_literal} : aliased constant
Property_Descriptor := (
Name_Length => ${len(name)},

26
testsuite/tests/ada_api/field_introspection/test.out
View File

@@ -3,27 +3,27 @@ FooNode (FOO_NODE_TYPE_ID)
Decl (DECL_TYPE_ID)
Fields (with abstract ones):
field name (Name)
field value (Expr)
field f_name (Name)
field f_value (Expr)
FunDecl (FUN_DECL_TYPE_ID)
Fields (with abstract ones):
field name (Name)
field value (Expr)
field f_name (Name)
field f_value (Expr)
Fields (only concrete ones):
name: 1
f_name: 1
VarDecl (VAR_DECL_TYPE_ID)
Fields (with abstract ones):
field var_kw (VarKeyword)
field name (Name)
field value (Expr)
field f_var_kw (VarKeyword)
field f_name (Name)
field f_value (Expr)
Fields (only concrete ones):
var_kw: 1
name: 2
value: 3
f_var_kw: 1
f_name: 2
f_value: 3
Expr (EXPR_TYPE_ID)
Fields (with abstract ones):
@@ -35,10 +35,10 @@ Number (NUMBER_TYPE_ID)
Ref (REF_TYPE_ID)
Fields (with abstract ones):
field name (Name)
field f_name (Name)
Fields (only concrete ones):
name: 1
f_name: 1
FooNodeBaseList (FOO_NODE_BASE_LIST_TYPE_ID)
Fields (with abstract ones):

6
testsuite/tests/ada_api/properties_introspection/main.adb
View File

@@ -303,12 +303,12 @@ begin
& Lookup_Member (Id, Name)'Image);
end Test;
begin
Test (Foo_Node_Type_Id, "name");
Test (Foo_Node_Type_Id, "p_name");
Test (Foo_Node_Type_Id, "parent");
Test (Var_Decl_Type_Id, "parent");
Test (Var_Decl_Type_Id, "name");
Test (Var_Decl_Type_Id, "eval");
Test (Var_Decl_Type_Id, "p_name");
Test (Var_Decl_Type_Id, "p_eval");
New_Line;
end;

174
testsuite/tests/ada_api/properties_introspection/test.out
View File

File diff suppressed because it is too large Load Diff

172
testsuite/tests/misc/rewriting/test.out
View File

@@ -23,59 +23,59 @@ main.adb: Done.
== revert.adb ==
DefList[1:1-5:10]
| Def[1:1-1:10]
| |name:
| |f_name:
| | Name[1:5-1:6]: a
| |args:
| |f_args:
| | NameList[1:4-1:4]: <empty list>
| |expr:
| |f_expr:
| | Literal[1:9-1:10]: 1
| Def[2:1-2:20]
| |name:
| |f_name:
| | Name[2:5-2:6]: b
| |args:
| |f_args:
| | NameList[2:4-2:4]: <empty list>
| |expr:
| |f_expr:
| | Plus[2:9-2:20]
| | |lhs:
| | |f_lhs:
| | | ParenExpr[2:9-2:16]
| | | |expr:
| | | |f_expr:
| | | | Plus[2:10-2:15]
| | | | |lhs:
| | | | |f_lhs:
| | | | | Literal[2:10-2:11]: 2
| | | | |rhs:
| | | | |f_rhs:
| | | | | Ref[2:14-2:15]
| | | | | |name:
| | | | | |f_name:
| | | | | | Name[2:14-2:15]: a
| | |rhs:
| | |f_rhs:
| | | Literal[2:19-2:20]: 3
| Def[3:1-3:14]
| |name:
| |f_name:
| | Name[3:5-3:6]: c
| |args:
| |f_args:
| | NameList[3:4-3:4]: <empty list>
| |expr:
| |f_expr:
| | Plus[3:9-3:14]
| | |lhs:
| | |f_lhs:
| | | Ref[3:9-3:10]
| | | |name:
| | | |f_name:
| | | | Name[3:9-3:10]: a
| | |rhs:
| | |f_rhs:
| | | Ref[3:13-3:14]
| | | |name:
| | | |f_name:
| | | | Name[3:13-3:14]: b
| Def[4:1-4:10]
| |name:
| |f_name:
| | Name[4:5-4:6]: d
| |args:
| |f_args:
| | NameList[4:4-4:4]: <empty list>
| |expr:
| |f_expr:
| | Literal[4:9-4:10]: 4
| Def[5:1-5:10]
| |name:
| |f_name:
| | Name[5:5-5:6]: e
| |args:
| |f_args:
| | NameList[5:4-5:4]: <empty list>
| |expr:
| |f_expr:
| | Literal[5:9-5:10]: 5
revert.adb: Done.
@@ -100,88 +100,88 @@ Applying the diff...
u1.txt:
DefList
| Def
| |name:
| |f_name:
| | Name: d
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 4
| Def
| |name:
| |f_name:
| | Name: c
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Plus
| | |lhs:
| | |f_lhs:
| | | Ref
| | | |name:
| | | |f_name:
| | | | Name: a
| | |rhs:
| | |f_rhs:
| | | Ref
| | | |name:
| | | |f_name:
| | | | Name: b
| Def
| |name:
| |f_name:
| | Name: c
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Plus
| | |lhs:
| | |f_lhs:
| | | Ref
| | | |name:
| | | |f_name:
| | | | Name: a
| | |rhs:
| | |f_rhs:
| | | Ref
| | | |name:
| | | |f_name:
| | | | Name: b
| Def
| |name:
| |f_name:
| | Name: a
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 1
| Def
| |name:
| |f_name:
| | Name: e
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | ParenExpr
| | |expr:
| | |f_expr:
| | | Plus
| | | |lhs:
| | | |f_lhs:
| | | | Ref
| | | | |name:
| | | | |f_name:
| | | | | Name: d
| | | |rhs:
| | | |f_rhs:
| | | | ParenExpr
| | | | |expr:
| | | | |f_expr:
| | | | | Plus
| | | | | |lhs:
| | | | | |f_lhs:
| | | | | | Literal: 5
| | | | | |rhs:
| | | | | |f_rhs:
| | | | | | Ref
| | | | | | |name:
| | | | | | |f_name:
| | | | | | | Name: c
u2.txt:
DefList
| Def
| |name:
| |f_name:
| | Name: zz
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 111
| Def
| |name:
| |f_name:
| | Name: yy
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 333
rewrite.adb: Done.
@@ -189,18 +189,18 @@ rewrite.adb: Done.
Applying the diff...
DefList
| Def
| |name:
| |f_name:
| | Name: a
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 1
| Def
| |name:
| |f_name:
| | Name: c
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 3
rewrite_lists.adb: Done.
@@ -248,34 +248,34 @@ Use templates to create trees of node rewriting handles...
Applying the diff...
DefList
| Def
| |name:
| |f_name:
| | Name: a
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Literal: 1
| Def
| |name:
| |f_name:
| | Name: b
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | ParenExpr
| | |expr:
| | |f_expr:
| | | Plus
| | | |lhs:
| | | |f_lhs:
| | | | Ref
| | | | |name:
| | | | |f_name:
| | | | | Name: b
| | | |rhs:
| | | |f_rhs:
| | | | ParenExpr
| | | | |expr:
| | | | |f_expr:
| | | | | Plus
| | | | | |lhs:
| | | | | |f_lhs:
| | | | | | Ref
| | | | | | |name:
| | | | | | |f_name:
| | | | | | | Name: a
| | | | | |rhs:
| | | | | |f_rhs:
| | | | | | Literal: 3
templates.adb: Done.
@@ -339,13 +339,13 @@ Applying the diff...
u.txt:
DefList
| Def
| |name:
| |f_name:
| | Name: B
| |args:
| |f_args:
| | NameList: <empty list>
| |expr:
| |f_expr:
| | Ref
| | |name:
| | |f_name:
| | | Name: A
clone_synthetic.adb: Done.
Done