Skip to content

Commit e058486

Browse files
committed
Merge branch 'topic/gnatcheck/format_ada_code' into 'master'
Introduce GNATformat as Ada source formatter Closes #424 See merge request eng/libadalang/langkit-query-language!414
2 parents 4f00d2b + 0fe81ba commit e058486

29 files changed

+3285
-2887
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ impacts:
4141
PYTHONPATH=$(IMPACTDB_DIR) ./utils/impact-db_impacts_gen.py $(IMPACTDB_DIR)
4242

4343
format:
44+
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects
4445
$(MAVEN) -f lkql_jit spotless:apply
4546

4647
gnatcheck: lkql
48+
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects --check
4749
gprbuild -P lkql_checker/gnatcheck.gpr -p $(GPR_ARGS) -XBUILD_MODE=$(BUILD_MODE)
4850

4951
build/bin/liblkqllang_parse: lkql/lkql.lkt
@@ -74,6 +76,7 @@ automated:
7476
rm -rf "$(PREFIX)"
7577
mkdir -p "$(PREFIX)/share" "$(PREFIX)/share/examples" "$(PREFIX)/lib"
7678
$(LKM) make -c lkql/langkit.yaml $(MANAGE_ARGS) $(ADDITIONAL_MANAGE_ARGS)
79+
gnatformat -P lkql_checker/gnatcheck.gpr --check --no-subprojects
7780
$(GPRBUILD) -Plkql_checker/gnatcheck.gpr -largs -s
7881
$(GPRINSTALL) --mode=usage -Plkql_checker/gnatcheck.gpr
7982
$(GPRINSTALL) --mode=usage -P$(LKQL_DIR)/mains.gpr
@@ -102,4 +105,3 @@ automated-cov:
102105
mkdir -p "$(PREFIX)/lib/lkql_checker"
103106
cp -p "$(BUILD_DIR)/lkql_checker/obj/$(BUILD_MODE)/"*.sid \
104107
"$(PREFIX)/lib/lkql_checker"
105-

lkql_checker/gnatcheck.gpr

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ with "liblkqllang";
33
with "gpr2";
44

55
project GNATcheck is
6-
76
type Build_Mode_Type is ("dev", "prod");
87
Build_Mode : Build_Mode_Type := external
98
("BUILD_MODE", external ("LKQL_CHECKER_BUILD_MODE", "dev"));
@@ -39,4 +38,9 @@ project GNATcheck is
3938
for Default_Switches ("Ada") use Switches;
4039
end Compiler;
4140

41+
package Format is
42+
for End_Of_Line ("Ada") use "lf";
43+
for Charset ("Ada") use "utf-8";
44+
for Width ("Ada") use "79";
45+
end Format;
4246
end GNATcheck;

lkql_checker/src/checker_app.ads

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@ with Libadalang.Analysis; use Libadalang.Analysis;
1111
with Rules_Factory; use Rules_Factory;
1212

1313
-- TODO: Factor into another package, check what is dead. See #190
14+
1415
package Checker_App is
1516

1617
package LK renames Langkit_Support.Generic_API.Analysis;
1718
package LKI renames Langkit_Support.Generic_API.Introspection;
1819

19-
type Rules_By_Kind_Array
20-
is array (LKI.Any_Type_Index range <>) of Rule_Vector;
20+
type Rules_By_Kind_Array is
21+
array (LKI.Any_Type_Index range <>) of Rule_Vector;
2122

2223
type Rules_By_Kind is access all Rules_By_Kind_Array;
2324

2425
type Lkql_Context is record
25-
Analysis_Ctx : Analysis_Context;
26+
Analysis_Ctx : Analysis_Context;
2627
LKQL_Analysis_Context : L.Analysis_Context;
2728

2829
Cached_Rules : Rules_By_Kind := null;

0 commit comments

Comments
 (0)