Skip to content

Commit 1c2221d

Browse files
pmderodatraph-amiard
authored andcommitted
Adalog: remove the state machine solver and the solver generic interface
The old solver is pretty much useless at this stage, so remove it. That removal in turn makes the generic interface useless, so get rid of it as well, renaming the symbolic solver to be a substitute and sligthly adapting it to make it API compatible. TN: SB20-024
1 parent d337a3d commit 1c2221d

File tree

79 files changed

+2184
-5079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2184
-5079
lines changed

langkit/templates/pkg_analysis_body_ada.mako

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,7 @@ pragma Warnings (On, "is an internal GNAT unit");
2020
with GNATCOLL.Traces;
2121

2222
pragma Warnings (Off, "referenced");
23-
with Langkit_Support.Adalog.Abstract_Relation;
24-
use Langkit_Support.Adalog.Abstract_Relation;
25-
with Langkit_Support.Adalog.Debug;
26-
use Langkit_Support.Adalog.Debug;
27-
with Langkit_Support.Adalog.Operations;
28-
use Langkit_Support.Adalog.Operations;
29-
with Langkit_Support.Adalog.Predicates;
30-
use Langkit_Support.Adalog.Predicates;
31-
with Langkit_Support.Adalog.Pure_Relations;
32-
use Langkit_Support.Adalog.Pure_Relations;
33-
with Langkit_Support.Symbols; use Langkit_Support.Symbols;
23+
with Langkit_Support.Symbols; use Langkit_Support.Symbols;
3424
pragma Warnings (On, "referenced");
3525

3626
with Langkit_Support.Types; use Langkit_Support.Types;
@@ -339,15 +329,6 @@ package body ${ada_lib_name}.Analysis is
339329
Set_Logic_Resolution_Timeout (Unwrap_Context (Context), Timeout);
340330
end Set_Logic_Resolution_Timeout;
341331

342-
---------------------
343-
-- Set_Solver_Kind --
344-
---------------------
345-
346-
procedure Set_Solver_Kind (Kind : Langkit_Support.Adalog.Solver_Kind) is
347-
begin
348-
Implementation.Solver.Set_Kind (Kind);
349-
end Set_Solver_Kind;
350-
351332
---------------------------
352333
-- Set_Lookup_Cache_Mode --
353334
---------------------------

langkit/templates/pkg_analysis_spec_ada.mako

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ with GNATCOLL.Refcount;
2020
% if any(s.exposed and not s.is_entity_type for s in ctx.struct_types):
2121
private with Langkit_Support.Boxes;
2222
% endif
23-
with Langkit_Support.Adalog;
2423

2524
with Langkit_Support.File_Readers; use Langkit_Support.File_Readers;
2625
with Langkit_Support.Lexical_Envs; use Langkit_Support.Lexical_Envs;
@@ -298,9 +297,6 @@ package ${ada_lib_name}.Analysis is
298297
-- Set the lexical environments lookup cache mode according to ``Mode``.
299298
-- Note: Mainly meant for debugging the default mode.
300299

301-
procedure Set_Solver_Kind (Kind : Langkit_Support.Adalog.Solver_Kind);
302-
-- Set the library's solver kind
303-
304300
function Has_Rewriting_Handle
305301
(Context : Analysis_Context'Class) return Boolean;
306302
-- Return whether ``Context`` has a rewriting handler (see

langkit/templates/pkg_debug_body_ada.mako

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,4 @@ package body ${ada_lib_name}.Debug is
8383
return Symbol.Success and then Image (S.all) = Image (Symbol.Symbol);
8484
end Sym_Matches;
8585

86-
----------
87-
-- PRel --
88-
----------
89-
90-
procedure PRel (Rel : Relation; Context_Node : ${T.root_node.name}) is
91-
begin
92-
Assign_Names_To_Logic_Vars (Context_Node);
93-
Print_Relation (Rel, null, False);
94-
end PRel;
95-
9686
end ${ada_lib_name}.Debug;

langkit/templates/pkg_debug_spec_ada.mako

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
-- This package defines subprograms whose only purpose it to be used from a
44
-- debugger. This is supposed to make developpers' life easier.
55

6-
with Langkit_Support.Adalog.Abstract_Relation;
7-
use Langkit_Support.Adalog.Abstract_Relation;
8-
96
with Langkit_Support.Lexical_Envs; use Langkit_Support.Lexical_Envs;
107
with Langkit_Support.Symbols; use Langkit_Support.Symbols;
118
with Langkit_Support.Token_Data_Handlers;
@@ -38,7 +35,4 @@ private package ${ada_lib_name}.Debug is
3835
-- Return whether the text associated to S matches Text. There is a bug in
3936
-- GDB that makes comparison with "=" always return false.
4037

41-
procedure PRel (Rel : Relation; Context_Node : ${T.root_node.name});
42-
-- "Print Relation". Print Rel as a tree of logic relations
43-
4438
end ${ada_lib_name}.Debug;

support/langkit_support-adalog-abstract_relation.adb

Lines changed: 0 additions & 212 deletions
This file was deleted.

0 commit comments

Comments
 (0)