Reorganization.

src/interface.ml

@@ -100,19 +100,16 @@ let monolithic_api grammar =
 
 (* The incremental API. *)
 
-let incremental_api grammar () =
+let incremental_engine () : module_type =
+  with_types WKDestructive
+    "MenhirLib.IncrementalEngine.INCREMENTAL_ENGINE"
+    [
+      [],
+      "token", (* NOT [tctoken], which is qualified if [--external-tokens] is used *)
+      TokenType.ttoken
+    ]
 
-  IIComment "The incremental API." ::
-  IIModule (
-    interpreter,
-    with_types WKDestructive
-      "MenhirLib.IncrementalEngine.INCREMENTAL_ENGINE"
-      [
-        [],
-        "token", (* NOT [tctoken], which is qualified if [--external-tokens] is used *)
-        TokenType.ttoken
-      ]
-  ) ::
+let incremental_entry_points grammar : interface =
 
   IIComment "The entry point(s) to the incremental API." ::
   IIModule (incremental, MTSigEnd [
@@ -125,6 +122,19 @@ let incremental_api grammar () =
 
   []
 
+let incremental_api grammar () : interface =
+
+  IIModule (
+    interpreter,
+    MTSigEnd (
+      IIComment "The incremental API." ::
+      IIInclude (incremental_engine()) ::
+      []
+    )
+  ) ::
+
+  incremental_entry_points grammar
+
 (* -------------------------------------------------------------------------- *)
 
 (* The inspection API. *)

src/tableBackend.ml

@@ -963,12 +963,6 @@ let program =
       MApp (MVar make, MVar tables)
     ) ::
 
-    SIValDefs (false, monolithic_api) ::
-
-    SIModuleDef (incremental, MStruct [
-      SIValDefs (false, incremental_api)
-    ]) ::
-
     listiflazy Settings.inspection (fun () -> [
       SIModuleDef (inspection, MStruct (
 
@@ -1015,8 +1009,15 @@ let program =
         []
 
       ))
+
     ]) @
 
+    SIValDefs (false, monolithic_api) ::
+
+    SIModuleDef (incremental, MStruct [
+      SIValDefs (false, incremental_api)
+    ]) ::
+
     SIStretch grammar.postludes ::
 
   [])]