Extract shared definitions for typed and untyped representations

docs/development.md

@@ -7,6 +7,7 @@
 - Debug: Helpers for debug logging
 - Hipcore: core language and spec AST and pure functions for manipulating it
 - Hipcore_typed: core language and spec AST with type annotations
+- Hipcore_common: libraries and definitions common to both the untyped and typed ASTs
 - Provers: prover back ends which translate Hipcore types into SMT
 - Hipprover: code which depends on calls to an external prover, e.g. normalization
 - Ocamlfrontend: OCaml parser

lib/heifer-parsing/core_lang.ml

@@ -15,6 +15,7 @@ open Types
 exception Foo of string
 
 let rec get_tactic e =
+  let open Hipcore_common.Tactics in
   match e with
   | { pexp_desc = Pexp_ident { txt = Lident "unfold_right"; _ }; _ } ->
     [Unfold_right]

lib/heifer-parsing/core_lang_typed.ml

@@ -19,6 +19,7 @@ open Typedhip
 exception Foo of string
 
 let rec get_tactic e =
+  let open Hipcore_common.Tactics in
   let open Parsetree in
   match e with
   | { pexp_desc = Pexp_ident { txt = Lident "unfold_right"; _ }; _ } ->

lib/hipcore/dune

@@ -1,7 +1,7 @@
 (library
  (name hipcore)
  (public_name heifer.hipcore)
- (modules subst pretty common hiptypes syntax variables types)
- (libraries debug unionFind str ocaml_compiler utils)
+ (modules subst pretty hiptypes syntax variables types untyped_core_ast)
+ (libraries debug unionFind str ocaml_compiler utils hipcore_common)
  (inline_tests)
  (preprocess (pps ppx_expect ppx_deriving.std visitors.ppx)))