Remove cobol_typeck/cobol_typeck.ml

.github/workflows/workflow.yml

@@ -61,7 +61,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y superbol-studio-oss superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_data_old cobol_typeck cobol_unit ez_toml ezr_toml
+      - run: opam depext -y superbol-studio-oss superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_data_old cobol_typeck cobol_typeck_old cobol_unit ez_toml ezr_toml
 #        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y opam/*.opam --deps-only --with-test

drom.toml

@@ -208,6 +208,10 @@ dir = "src/lsp/cobol_data_old"
 dir = "src/lsp/cobol_typeck"
 # edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
 
+[[package]]
+dir = "src/lsp/cobol_typeck_old"
+# edit 'src/lsp/cobol_lsp/package.toml' for package-specific options
+
 [[package]]
 dir = "src/lsp/cobol_unit"
 # edit 'src/lsp/cobol_unit/package.toml' for package-specific options

opam/cobol_typeck_old.opam

@@ -0,0 +1,57 @@
+# This file was generated by `drom` from `drom.toml`.
+# Do not modify, or add to the `skip` field of `drom.toml`.
+opam-version: "2.0"
+name: "cobol_typeck_old"
+version: "0.1.0"
+license: "MIT"
+synopsis: "SuperBOL Studio OSS Project"
+description: "SuperBOL Studio OSS is a new platform for COBOL"
+authors: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+maintainer: [
+  "Nicolas Berthier <[email protected]>"
+  "David Declerck <[email protected]>"
+  "Fabrice Le Fessant <[email protected]>"
+  "Emilien Lemaire <[email protected]>"
+]
+homepage: "https://ocamlpro.github.io/superbol-studio-oss"
+doc: "https://ocamlpro.github.io/superbol-studio-oss/sphinx"
+bug-reports: "https://github.com/ocamlpro/superbol-studio-oss/issues"
+dev-repo: "git+https://github.com/ocamlpro/superbol-studio-oss.git"
+tags: "org:ocamlpro"
+build: [
+  ["dune" "subst"] {dev}
+  ["sh" "-c" "./scripts/before.sh build '%{name}%'"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["sh" "-c" "./scripts/after.sh build '%{name}%'"]
+]
+install: [
+  ["sh" "-c" "./scripts/before.sh install '%{name}%'"]
+]
+depends: [
+  "ocaml" {>= "4.14.0"}
+  "dune" {>= "2.8.0"}
+  "cobol_unit" {= version}
+  "cobol_typeck" {= version}
+  "cobol_ptree" {= version}
+  "cobol_parser" {= version}
+  "cobol_data" {= version}
+  "cobol_common" {= version}
+  "ppx_deriving" {>= "5.2.1"}
+  "odoc" {with-doc}
+]
+# Content of `opam-trailer` field:

src/lsp/cobol_lsp/lsp_document.ml

@@ -92,8 +92,8 @@ let check doc ptree =
   let DIAGS.{ result = artifacts, rewinder, checked; diags} =
     DIAGS.more_result ~f:begin fun (ptree, rewinder) ->
       let config = doc.project.config.cobol_config in
-      Cobol_typeck.compilation_group ~config ptree |>
-      Cobol_typeck.translate_diagnostics ~config |>
+      Cobol_typeck.Engine.compilation_group ~config ptree |>
+      Cobol_typeck.Engine.translate_diagnostics ~config |>
       DIAGS.map_result ~f:begin fun checked ->
         Cobol_parser.artifacts ptree, Some rewinder, Some checked
       end

src/lsp/cobol_typeck/old_typeck_engine.ml → src/lsp/cobol_typeck/engine.ml

@@ -13,21 +13,16 @@
 
 (** Type-checking and validation of COBOL compilation groups *)
 
-module Prog_builder = Old_prog_builder
-
 module DIAGS = Cobol_common.Diagnostics
-module CU = Cobol_data_old.Compilation_unit
-module CUs = CU.SET
 
-let analyze_compilation_group
+let compilation_group
     (type m) : ?config: _ -> m Cobol_parser.Outputs.parsed_compilation_group -> _ =
   fun ?(config = Cobol_config.Config.default) ->
   function
   | Only None | WithArtifacts (None, _) ->
-      DIAGS.result (Cobol_data_old.Compilation_unit.SET.empty, None)
+      Outputs.none, Diagnostics.none
   | Only Some cg | WithArtifacts (Some cg, _) ->
-      match Prog_builder.compilation_group config cg with
-      | { diags; _ } when DIAGS.Set.has_errors diags ->
-          DIAGS.result ~diags (CUs.empty, Some cg)
-      | { diags; result } ->
-          DIAGS.result ~diags (result, Some cg)
+      Typeck_units.of_compilation_group config cg
+
+let translate_diagnostics ?(config = Cobol_config.Config.default) (output, diags) =
+  DIAGS.result output ~diags:(Diagnostics.translate ~config diags)

src/lsp/cobol_typeck/typeck_engine.mli → src/lsp/cobol_typeck/engine.mli

@@ -14,9 +14,9 @@
 val compilation_group
   : ?config: Cobol_config.Types.t
   -> _ Cobol_parser.Outputs.parsed_compilation_group
-  -> Typeck_outputs.t * Typeck_diagnostics.t
+  -> Outputs.t * Diagnostics.t
 
 val translate_diagnostics
   : ?config: Cobol_config.Types.t
-  -> Typeck_outputs.t * Typeck_diagnostics.t
-  -> Typeck_outputs.t Cobol_common.Diagnostics.with_diags
+  -> Outputs.t * Diagnostics.t
+  -> Outputs.t Cobol_common.Diagnostics.with_diags

src/lsp/cobol_typeck/typeck_clauses.ml

@@ -14,7 +14,7 @@
 open Cobol_data.Types
 open Cobol_common.Srcloc.TYPES
 open Cobol_common.Srcloc.INFIX
-open Typeck_diagnostics
+open Diagnostics
 
 module PIC = Cobol_data.Picture
 

src/lsp/cobol_typeck/typeck_config.ml

@@ -23,7 +23,7 @@ type output = Cobol_unit.Types.unit_config
 type acc =
   {
     config: output;
-    diags: Typeck_diagnostics.t;
+    diags: Diagnostics.t;
   }
 
 let default_config =
@@ -35,7 +35,7 @@ let default_config =
 let init config =
   {
     config;
-    diags = Typeck_diagnostics.none;
+    diags = Diagnostics.none;
   }
 
 let error acc e = { acc with diags = Config_error e :: acc.diags }

src/lsp/cobol_typeck/typeck_config.mli

@@ -18,4 +18,4 @@ type output = Cobol_unit.Types.unit_config
 val of_compilation_unit
   : ?parent_config:Cobol_unit.Types.unit_config
   -> Cobol_ptree.Types.compilation_unit with_loc
-  -> output * Typeck_diagnostics.t
+  -> output * Diagnostics.t

src/lsp/cobol_typeck/typeck_data_items.ml

@@ -28,7 +28,7 @@ module PIC = Cobol_data.Picture
 type output =
   {
     definitions: Cobol_unit.Types.data_definitions;
-    references: Typeck_outputs.qualrefmap;
+    references: Outputs.qualrefmap;
   }
 
 (* --- *)
@@ -44,7 +44,7 @@ type acc =
     definitions: Cobol_unit.Types.data_definitions;
     references: srcloc list Cobol_unit.Qual.MAP.t;
     picture_config: Cobol_data.Types.picture_config;
-    diags: Typeck_diagnostics.t;
+    diags: Diagnostics.t;
   }
 and item_stack = item_under_construction list
 and item_under_construction =               (* item currently being assembled *)
@@ -104,7 +104,7 @@ let error acc error = { acc with diags = Data_error error :: acc.diags }
 let warn acc d = { acc with diags = Data_warning d :: acc.diags }
 
 let result { definitions = { data_items; data_records };
-             references; diags; _ } : output * Typeck_diagnostics.t =
+             references; diags; _ } : output * Diagnostics.t =
   { definitions =
       { data_items = { data_items with list = List.rev data_items.list };
         data_records = List.rev data_records };
@@ -330,7 +330,7 @@ let field_usage_n_value acc { item_name; item_loc; item_clauses; _ } =
     Typeck_clauses.to_usage_n_value item_clauses ~item_name ~item_loc
       ~picture_config:acc.picture_config
   in
-  let acc = { acc with diags = Typeck_diagnostics.union acc.diags diags } in
+  let acc = { acc with diags = Diagnostics.union acc.diags diags } in
   acc, usage, value
 
 
@@ -488,7 +488,7 @@ let register_ref ~from:{ loc; _ } ~to_:qualname_opt acc =
       acc
   | Some qn ->
       { acc with
-        references = Typeck_outputs.register_qualref ~&qn ~loc acc.references }
+        references = Outputs.register_qualref ~&qn ~loc acc.references }
 
 
 let find_in_current_record qualname acc =
@@ -597,7 +597,7 @@ let on_item acc ~at_level
   let item_clauses = Typeck_clauses.of_data_item data_clauses in
   let acc =
     { acc with
-      diags = Typeck_diagnostics.union acc.diags item_clauses.clause_diags } in
+      diags = Diagnostics.union acc.diags item_clauses.clause_diags } in
   match item_clauses.redefines with
   | Some redefined_name ->
       on_redefinition_item acc item_clauses

src/lsp/cobol_typeck/typeck_data_items.mli

@@ -16,10 +16,10 @@ open Cobol_common.Srcloc.TYPES
 type output =
   {
     definitions: Cobol_unit.Types.data_definitions;
-    references: Typeck_outputs.qualrefmap;
+    references: Outputs.qualrefmap;
   }
 
 val of_compilation_unit
   : Cobol_unit.Types.unit_config
   -> Cobol_ptree.Types.compilation_unit with_loc
-  -> output * Typeck_diagnostics.t
+  -> output * Diagnostics.t