Skip to content

Commit

Permalink
Merge branch 'topic/1107-fix' into 'master'
Browse files Browse the repository at this point in the history 
Add missing `;` in Standard's env hook

See merge request eng/libadalang/libadalang!1466
  • Loading branch information
@thvnx
thvnx committed Nov 17, 2023
2 parents 4125a06 + b6cfe2c commit 7649a9f
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion extensions/src/libadalang-env_hooks.adb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ package body Libadalang.Env_Hooks is
" for Duration'Small use 0.000000001;" & ASCII.LF &
" type Universal_Int_Type_ is range -1 .. 1;" & ASCII.LF &
" type Universal_Real_Type_ is digits 16;" & ASCII.LF &
" type Universal_Fixed_Type_ is delta 0.01 range -1.0 .. 1.0"
" type Universal_Fixed_Type_ is delta 0.01 range -1.0 .. 1.0;"
& ASCII.LF &
" package root_types_ is" & ASCII.LF &
" type root_integer is range -1 .. 1;" & ASCII.LF &
Expand Down
8 changes: 4 additions & 4 deletions testsuite/tests/ada_api/foreign_nodes/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down Expand Up @@ -132,7 +132,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down Expand Up @@ -207,7 +207,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down Expand Up @@ -282,7 +282,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/envs_1/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/envs_3/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/envs_4/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/envs_5/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/gen_pkg_inst/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ $root = LexEnv(Static_Primary, Parent=null):
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
test: [<SubpBody ["Test"] test.adb:1:1-10:10>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/incomplete_with/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/lexical_envs/records/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ $root = LexEnv(Static_Primary, Parent=null):
string: [<ConcreteTypeDecl ["String"] __standard:105:3-105:57>]
tasking_error: [<ExceptionDecl ["Tasking_Error"] __standard:128:3-128:32>]
true: [<EnumLiteralDecl ["True"] __standard:3:27-3:31>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>]
universal_fixed_type_: [<ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>]
universal_int_type_: [<ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>]
universal_real_type_: [<ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>]
wide_character: [<ConcreteTypeDecl ["Wide_Character"] __standard:22:3-22:32>]
Expand Down
12 changes: 6 additions & 6 deletions testsuite/tests/name_resolution/universal_fixed/test.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ Expr: <Id "X3" test.adb:14:6-14:8>
type: <ConcreteTypeDecl ["T1"] test.adb:4:6-4:55>
expected type: None
Expr: <BinOp test.adb:14:12-14:19>
type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>
expected type: <ConcreteTypeDecl ["T1"] test.adb:4:6-4:55>
Expr: <Id "X1" test.adb:14:12-14:14>
references: <DefiningName "X1" test.adb:7:6-7:8>
type: <ConcreteTypeDecl ["T1"] test.adb:4:6-4:55>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>
Expr: <OpDiv "/" test.adb:14:15-14:16>
references: None
type: None
expected type: None
Expr: <Id "X2" test.adb:14:17-14:19>
references: <DefiningName "X2" test.adb:8:6-8:8>
type: <ConcreteTypeDecl ["T2"] test.adb:5:6-5:55>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>

Resolving xrefs for node <AssignStmt test.adb:17:6-17:25>
*********************************************************
Expand Down Expand Up @@ -94,20 +94,20 @@ Expr: <Id "T1" test.adb:20:12-20:14>
type: <ConcreteTypeDecl ["T1"] test.adb:4:6-4:55>
expected type: None
Expr: <BinOp test.adb:20:16-20:23>
type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>
expected type: None
Expr: <Id "X1" test.adb:20:16-20:18>
references: <DefiningName "X1" test.adb:7:6-7:8>
type: <ConcreteTypeDecl ["T1"] test.adb:4:6-4:55>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>
Expr: <OpDiv "/" test.adb:20:19-20:20>
references: None
type: None
expected type: None
Expr: <Id "X2" test.adb:20:21-20:23>
references: <DefiningName "X2" test.adb:8:6-8:8>
type: <ConcreteTypeDecl ["T2"] test.adb:5:6-5:55>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:61>
expected type: <ConcreteTypeDecl ["Universal_Fixed_Type_"] __standard:118:3-118:62>


Done.
Loading

0 comments on commit 7649a9f

Please sign in to comment.