From f10a4ac8e58917f0d9b11458465a963a562aa582 Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sat, 28 Mar 2015 08:19:05 -0400
Subject: Define Any in Haskell extraction when Tunknown is used.

Commit 84c2433a introduced the Any type alias as the Haskell extracted
version of MiniML's Tunknown.  However, the code to define the Any
type alias was generated conditional on usf.magic.  As it turns out,
sometimes Tunknown appears even if usf.magic is false (i.e., even if
MLmagic does not appear anywhere in the AST).  This produced Haskell
code that would not compile; e.g.:

  % coqtop
  Coq < Extraction Language Haskell.
  Coq < Extraction Library Datatypes.
  The file Datatypes.hs has been created by extraction.

  % ghc Datatypes.hs
  [1 of 1] Compiling Datatypes        ( Datatypes.hs, Datatypes.o )
  Datatypes.hs:261:17: Not in scope: type constructor or class `Any'
  Datatypes.hs:261:24: Not in scope: type constructor or class `Any'

The fix is straightforward: produce the code that defines the Any type
alias if usf.tunknown is true.
---
 plugins/extraction/haskell.ml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/haskell.ml b/plugins/extraction/haskell.ml
index 52459f78eb..4bf576f640 100644
--- a/plugins/extraction/haskell.ml
+++ b/plugins/extraction/haskell.ml
@@ -38,7 +38,7 @@ let pp_bracket_comment s = str"{- " ++ hov 0 s ++ str" -}"
 let preamble mod_name comment used_modules usf =
   let pp_import mp = str ("import qualified "^ string_of_modfile mp ^"\n")
   in
-  (if not usf.magic then mt ()
+  (if not (usf.magic || usf.tunknown) then mt ()
    else
      str "{-# OPTIONS_GHC -cpp -XMagicHash #-}" ++ fnl () ++
      str "{- For Hugs, use the option -F\"cpp -P -traditional\" -}")
@@ -56,16 +56,23 @@ let preamble mod_name comment used_modules usf =
    else str "\
 \n#ifdef __GLASGOW_HASKELL__\
 \nimport qualified GHC.Base\
-\nimport qualified GHC.Prim\
-\ntype Any = GHC.Prim.Any\
 \nunsafeCoerce :: a -> b\
 \nunsafeCoerce = GHC.Base.unsafeCoerce#\
 \n#else\
 \n-- HUGS\
 \nimport qualified IOExts\
-\ntype Any = ()\
 \nunsafeCoerce :: a -> b\
 \nunsafeCoerce = IOExts.unsafeCoerce\
+\n#endif" ++ fnl2 ())
+  ++
+  (if not usf.tunknown then mt ()
+   else str "\
+\n#ifdef __GLASGOW_HASKELL__\
+\nimport qualified GHC.Prim\
+\ntype Any = GHC.Prim.Any\
+\n#else\
+\n-- HUGS\
+\ntype Any = ()\
 \n#endif" ++ fnl2 ())
   ++
   (if not usf.mldummy then mt ()
-- 
cgit v1.2.3


From aec237038d300ce7c81dddd154cbdc93fed5b226 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond
Date: Thu, 2 Apr 2015 19:26:59 +0200
Subject: Fix some typos.

---
 plugins/extraction/haskell.ml | 2 +-
 plugins/extraction/scheme.ml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/haskell.ml b/plugins/extraction/haskell.ml
index 4bf576f640..5f31edfb60 100644
--- a/plugins/extraction/haskell.ml
+++ b/plugins/extraction/haskell.ml
@@ -356,7 +356,7 @@ and pp_module_expr = function
   | MEfunctor _ -> mt ()
       (* for the moment we simply discard unapplied functors *)
   | MEident _ | MEapply _ -> assert false
-      (* should be expansed in extract_env *)
+      (* should be expanded in extract_env *)
 
 let pp_struct =
   let pp_sel (mp,sel) =
diff --git a/plugins/extraction/scheme.ml b/plugins/extraction/scheme.ml
index 99b4fd448d..cc8b6d8e79 100644
--- a/plugins/extraction/scheme.ml
+++ b/plugins/extraction/scheme.ml
@@ -212,7 +212,7 @@ and pp_module_expr = function
   | MEfunctor _ -> mt ()
       (* for the moment we simply discard unapplied functors *)
   | MEident _ | MEapply _ -> assert false
-      (* should be expansed in extract_env *)
+      (* should be expanded in extract_env *)
 
 let pp_struct =
   let pp_sel (mp,sel) =
-- 
cgit v1.2.3


From 6950837dd6e2a3a2bc3c3d748d06054a625bc661 Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Thu, 2 Apr 2015 21:46:19 +0200
Subject: Puts all the "import" statements first so as to accommodate the
 latest GHC.

---
 plugins/extraction/haskell.ml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/haskell.ml b/plugins/extraction/haskell.ml
index 5f31edfb60..37b4142073 100644
--- a/plugins/extraction/haskell.ml
+++ b/plugins/extraction/haskell.ml
@@ -52,15 +52,23 @@ let preamble mod_name comment used_modules usf =
   str "import qualified Prelude" ++ fnl () ++
   prlist pp_import used_modules ++ fnl () ++
   (if List.is_empty used_modules then mt () else fnl ()) ++
-  (if not usf.magic then mt ()
+  (if not (usf.magic || usf.tunknown) then mt ()
    else str "\
 \n#ifdef __GLASGOW_HASKELL__\
 \nimport qualified GHC.Base\
+\nimport qualified GHC.Prim\
+\n#else\
+\n-- HUGS\
+\nimport qualified IOExts\
+\n#endif" ++ fnl2 ())
+  ++
+  (if not usf.magic then mt ()
+   else str "\
+\n#ifdef __GLASGOW_HASKELL__\
 \nunsafeCoerce :: a -> b\
 \nunsafeCoerce = GHC.Base.unsafeCoerce#\
 \n#else\
 \n-- HUGS\
-\nimport qualified IOExts\
 \nunsafeCoerce :: a -> b\
 \nunsafeCoerce = IOExts.unsafeCoerce\
 \n#endif" ++ fnl2 ())
@@ -68,7 +76,6 @@ let preamble mod_name comment used_modules usf =
   (if not usf.tunknown then mt ()
    else str "\
 \n#ifdef __GLASGOW_HASKELL__\
-\nimport qualified GHC.Prim\
 \ntype Any = GHC.Prim.Any\
 \n#else\
 \n-- HUGS\
-- 
cgit v1.2.3


From c595d5cc3105b0bec4faa0a5ed7e1c37de0c5e2c Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sat, 4 Apr 2015 10:42:18 -0400
Subject: Fix specialized extraction of ascii characters into Haskell. (Fix bug
 #4181)

The extraction machinery has specialized support for extracting [ascii]
characters into native characters in the target language, as opposed
to using an explicit constructor from 8 boolean bits.  This works by
hard-coding the name of the character type in the target language.
Unfortunately, the hard-coded type for Haskell was "Char", not the
fully-qualified "Prelude.Char".  As a result, it was impossible to
extract characters into Haskell without getting type errors about "Char".
This patch changes this hard-coded name to "Prelude.Char".
---
 plugins/extraction/common.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/common.ml b/plugins/extraction/common.ml
index 21819aa8f1..0748af1ead 100644
--- a/plugins/extraction/common.ml
+++ b/plugins/extraction/common.ml
@@ -628,7 +628,7 @@ let check_extract_ascii () =
   try
     let char_type = match lang () with
       | Ocaml -> "char"
-      | Haskell -> "Char"
+      | Haskell -> "Prelude.Char"
       | _ -> raise Not_found
     in
     String.equal (find_custom (IndRef (ind_ascii, 0))) (char_type)
-- 
cgit v1.2.3


From 19ca8f80e7e35e8f6c41c99bd311b3c7df2033e2 Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sun, 5 Apr 2015 01:14:42 -0400
Subject: add ExtrHaskellBasic.v to mirror ExtrOcamlBasic.v

---
 plugins/extraction/ExtrHaskellBasic.v | 15 +++++++++++++++
 plugins/extraction/vo.itarget         |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 plugins/extraction/ExtrHaskellBasic.v

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/ExtrHaskellBasic.v b/plugins/extraction/ExtrHaskellBasic.v
new file mode 100644
index 0000000000..294d61023b
--- /dev/null
+++ b/plugins/extraction/ExtrHaskellBasic.v
@@ -0,0 +1,15 @@
+(** Extraction to Haskell : use of basic Haskell types *)
+
+Extract Inductive bool => "Prelude.Bool" [ "Prelude.True" "Prelude.False" ].
+Extract Inductive option => "Prelude.Maybe" [ "Prelude.Just" "Prelude.Nothing" ].
+Extract Inductive unit => "()" [ "()" ].
+Extract Inductive list => "([])" [ "([])" "(:)" ].
+Extract Inductive prod => "(,)" [ "(,)" ].
+
+Extract Inductive sumbool => "Prelude.Bool" [ "Prelude.True" "Prelude.False" ].
+Extract Inductive sumor => "Prelude.Maybe" [ "Prelude.Just" "Prelude.Nothing" ].
+Extract Inductive sum => "Prelude.Either" [ "Prelude.Left" "Prelude.Right" ].
+
+Extract Inlined Constant andb => "(Prelude.&&)".
+Extract Inlined Constant orb => "(Prelude.||)".
+Extract Inlined Constant negb => "Prelude.not".
diff --git a/plugins/extraction/vo.itarget b/plugins/extraction/vo.itarget
index 1fe09f6fa2..f04890480f 100644
--- a/plugins/extraction/vo.itarget
+++ b/plugins/extraction/vo.itarget
@@ -1,3 +1,4 @@
+ExtrHaskellBasic.vo
 ExtrOcamlBasic.vo
 ExtrOcamlIntConv.vo
 ExtrOcamlBigIntConv.vo
-- 
cgit v1.2.3


From b23edffbb4c0f57a5988c3ae218987f15e215097 Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sun, 15 Feb 2015 13:54:59 -0500
Subject: Add extraction to JSON.

This patch allows Coq terms to be extracted into the widely used JSON
format.  This is useful in at least two cases:

  - One might want to manipulate Coq values outside of Coq, but without
    being forced to use one of the three existing extraction languages
    (OCaml, Haskell, or Scheme), and without having to compile Coq's
    extracted result.  This is especially useful when a Coq evaluation
    produces some data structure that needs to be moved out of Coq.
    Having to invoke an OCaml/Haskell/Scheme compiler just to get a
    data structure out of Coq is somewhat awkward.

  - One might want to experiment with extracting Coq code into other
    languages (Go, Javascript, etc), without having to write the whole
    extraction logic in OCaml and recompile Coq's extraction plugin
    each time.  This makes it easy to quickly prototype extraction
    in any language, without having to build Coq from source.

Extraction to JSON is implemented by adding the JSON "pseudo-language"
to the extraction facility.  Thus, one can extract the JSON encoding
of a single term using:

  Extraction Language JSON.
  Extraction qualid.

and extract an entire Coq library "ident" into "ident.json" using:

  Extraction Language JSON.
  Extraction Library ident.

Nota (Pierre Letouzey) : this is an updated version of the original
PullRequest, updated to match recent changes in trunk
---
 plugins/extraction/common.ml               |   1 +
 plugins/extraction/extract_env.ml          |   1 +
 plugins/extraction/extraction_plugin.mllib |   1 +
 plugins/extraction/g_extraction.ml4        |   2 +
 plugins/extraction/json.ml                 | 275 +++++++++++++++++++++++++++++
 plugins/extraction/json.mli                |   1 +
 plugins/extraction/table.ml                |   2 +-
 plugins/extraction/table.mli               |   2 +-
 8 files changed, 283 insertions(+), 2 deletions(-)
 create mode 100644 plugins/extraction/json.ml
 create mode 100644 plugins/extraction/json.mli

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/common.ml b/plugins/extraction/common.ml
index 0748af1ead..094d91d20b 100644
--- a/plugins/extraction/common.ml
+++ b/plugins/extraction/common.ml
@@ -600,6 +600,7 @@ let pp_global k r =
     let rls = List.rev ls in (* for what come next it's easier this way *)
     match lang () with
       | Scheme -> unquote s (* no modular Scheme extraction... *)
+      | JSON -> unquote s (* no modular JSON extraction... *)
       | Haskell -> if modular () then pp_haskell_gen k mp rls else s
       | Ocaml -> pp_ocaml_gen k mp rls (Some l)
 
diff --git a/plugins/extraction/extract_env.ml b/plugins/extraction/extract_env.ml
index 5ea4fb763e..0f846013b2 100644
--- a/plugins/extraction/extract_env.ml
+++ b/plugins/extraction/extract_env.ml
@@ -410,6 +410,7 @@ let descr () = match lang () with
   | Ocaml -> Ocaml.ocaml_descr
   | Haskell -> Haskell.haskell_descr
   | Scheme -> Scheme.scheme_descr
+  | JSON -> Json.json_descr
 
 (* From a filename string "foo.ml" or "foo", builds "foo.ml" and "foo.mli"
    Works similarly for the other languages. *)
diff --git a/plugins/extraction/extraction_plugin.mllib b/plugins/extraction/extraction_plugin.mllib
index b7f458611a..ad32124347 100644
--- a/plugins/extraction/extraction_plugin.mllib
+++ b/plugins/extraction/extraction_plugin.mllib
@@ -6,6 +6,7 @@ Common
 Ocaml
 Haskell
 Scheme
+Json
 Extract_env
 G_extraction
 Extraction_plugin_mod
diff --git a/plugins/extraction/g_extraction.ml4 b/plugins/extraction/g_extraction.ml4
index 3caa558f9b..3fe5a8c04e 100644
--- a/plugins/extraction/g_extraction.ml4
+++ b/plugins/extraction/g_extraction.ml4
@@ -41,12 +41,14 @@ let pr_language = function
   | Ocaml -> str "Ocaml"
   | Haskell -> str "Haskell"
   | Scheme -> str "Scheme"
+  | JSON -> str "JSON"
 
 VERNAC ARGUMENT EXTEND language
 PRINTED BY pr_language
 | [ "Ocaml" ] -> [ Ocaml ]
 | [ "Haskell" ] -> [ Haskell ]
 | [ "Scheme" ] -> [ Scheme ]
+| [ "JSON" ] -> [ JSON ]
 END
 
 (* Extraction commands *)
diff --git a/plugins/extraction/json.ml b/plugins/extraction/json.ml
new file mode 100644
index 0000000000..f19fba6f1f
--- /dev/null
+++ b/plugins/extraction/json.ml
@@ -0,0 +1,275 @@
+open Pp
+open Errors
+open Util
+open Names
+open Nameops
+open Globnames
+open Table
+open Miniml
+open Mlutil
+open Common
+
+let json_str s =
+  qs s
+
+let json_int i =
+  int i
+
+let json_bool b =
+  if b then str "true" else str "false"
+
+let json_null =
+  str "null"
+
+let json_global typ ref =
+  json_str (Common.pp_global typ ref)
+
+let json_id id =
+  json_str (Id.to_string id)
+
+let json_dict_one (k, v) =
+  json_str k ++ str (": ") ++ v
+
+let json_dict_open l =
+  str ("{") ++ fnl () ++
+  str ("  ") ++ hov 0 (prlist_with_sep pr_comma json_dict_one l)
+
+let json_dict l =
+  json_dict_open l ++ fnl () ++
+  str ("}")
+
+let json_list l =
+  str ("[") ++ fnl () ++
+  str ("  ") ++ hov 0 (prlist_with_sep pr_comma (fun x -> x) l) ++ fnl () ++
+  str ("]")
+
+let json_listarr a =
+  str ("[") ++ fnl () ++
+  str ("  ") ++ hov 0 (prvect_with_sep pr_comma (fun x -> x) a) ++ fnl () ++
+  str ("]")
+
+
+let preamble mod_name comment used_modules usf =
+  (match comment with
+    | None -> mt ()
+    | Some s -> str "/* " ++ hov 0 s ++ str " */" ++ fnl ()) ++
+  json_dict_open [
+    ("what", json_str "module");
+    ("name", json_id mod_name);
+    ("need_magic", json_bool (usf.magic));
+    ("need_dummy", json_bool (usf.mldummy));
+    ("used_modules", json_list
+      (List.map (fun mf -> json_str (file_of_modfile mf)) used_modules))
+  ]
+
+
+(*s Pretty-printing of types. *)
+
+let rec json_type vl = function
+  | Tmeta _ | Tvar' _ -> assert false
+  | Tvar i -> (try
+      let varid = List.nth vl (pred i) in json_dict [
+        ("what", json_str "type:var");
+        ("name", json_id varid)
+      ]
+    with Failure _ -> json_dict [
+        ("what", json_str "type:varidx");
+        ("name", json_int i)
+      ])
+  | Tglob (r, l) -> json_dict [
+      ("what", json_str "type:glob");
+      ("name", json_global Type r);
+      ("args", json_list (List.map (json_type vl) l))
+    ]
+  | Tarr (t1,t2) -> json_dict [
+      ("what", json_str "type:arrow");
+      ("left", json_type vl t1);
+      ("right", json_type vl t2)
+    ]
+  | Tdummy _ -> json_dict [("what", json_str "type:dummy")]
+  | Tunknown -> json_dict [("what", json_str "type:unknown")]
+  | Taxiom -> json_dict [("what", json_str "type:axiom")]
+
+
+(*s Pretty-printing of expressions. *)
+
+let rec json_expr env = function
+  | MLrel n -> json_dict [
+      ("what", json_str "expr:rel");
+      ("name", json_id (get_db_name n env))
+    ]
+  | MLapp (f, args) -> json_dict [
+      ("what", json_str "expr:apply");
+      ("func", json_expr env f);
+      ("args", json_list (List.map (json_expr env) args))
+    ]
+  | MLlam _ as a ->
+    let fl, a' = collect_lams a in
+    let fl, env' = push_vars (List.map id_of_mlid fl) env in
+    json_dict [
+      ("what", json_str "expr:lambda");
+      ("argnames", json_list (List.map json_id (List.rev fl)));
+      ("body", json_expr env' a')
+    ]
+  | MLletin (id, a1, a2) ->
+    let i, env' = push_vars [id_of_mlid id] env in
+    json_dict [
+      ("what", json_str "expr:let");
+      ("name", json_id (List.hd i));
+      ("nameval", json_expr env a1);
+      ("body", json_expr env' a2)
+    ]
+  | MLglob r -> json_dict [
+      ("what", json_str "expr:global");
+      ("name", json_global Term r)
+    ]
+  | MLcons (_, r, a) -> json_dict [
+      ("what", json_str "expr:constructor");
+      ("name", json_global Cons r);
+      ("args", json_list (List.map (json_expr env) a))
+    ]
+  | MLtuple l -> json_dict [
+      ("what", json_str "expr:tuple");
+      ("items", json_list (List.map (json_expr env) l))
+    ]
+  | MLcase (typ, t, pv) -> json_dict [
+      ("what", json_str "expr:case");
+      ("expr", json_expr env t);
+      ("cases", json_listarr (Array.map (fun x -> json_one_pat env x) pv))
+    ]
+  | MLfix (i, ids, defs) ->
+    let ids', env' = push_vars (List.rev (Array.to_list ids)) env in
+    let ids' = Array.of_list (List.rev ids') in
+    json_dict [
+      ("what", json_str "expr:fix");
+      ("funcs", json_listarr (Array.map (fun (fi, ti) ->
+        json_dict [
+          ("what", json_str "fix:item");
+          ("name", json_id fi);
+          ("body", json_function env' ti)
+        ]) (Array.map2 (fun a b -> a,b) ids' defs)))
+    ]
+  | MLexn s -> json_dict [
+      ("what", json_str "expr:exception");
+      ("msg", json_str s)
+    ]
+  | MLdummy -> json_dict [("what", json_str "expr:dummy")]
+  | MLmagic a -> json_dict [
+      ("what", json_str "expr:coerce");
+      ("value", json_expr env a)
+    ]
+  | MLaxiom -> json_dict [("what", json_str "expr:axiom")]
+
+and json_one_pat env (ids,p,t) =
+  let ids', env' = push_vars (List.rev_map id_of_mlid ids) env in json_dict [
+    ("what", json_str "case");
+    ("pat", json_gen_pat (List.rev ids') env' p);
+    ("body", json_expr env' t)
+  ]
+
+and json_gen_pat ids env = function
+  | Pcons (r, l) -> json_cons_pat r (List.map (json_gen_pat ids env) l)
+  | Pusual r -> json_cons_pat r (List.map json_id ids)
+  | Ptuple l -> json_dict [
+      ("what", json_str "pat:tuple");
+      ("items", json_list (List.map (json_gen_pat ids env) l))
+    ]
+  | Pwild -> json_dict [("what", json_str "pat:wild")]
+  | Prel n -> json_dict [
+      ("what", json_str "pat:rel");
+      ("name", json_id (get_db_name n env))
+    ]
+
+and json_cons_pat r ppl = json_dict [
+    ("what", json_str "pat:constructor");
+    ("name", json_global Cons r);
+    ("argnames", json_list ppl)
+  ]
+
+and json_function env t =
+  let bl, t' = collect_lams t in
+  let bl, env' = push_vars (List.map id_of_mlid bl) env in
+  json_dict [
+    ("what", json_str "expr:lambda");
+    ("argnames", json_list (List.map json_id (List.rev bl)));
+    ("body", json_expr env' t')
+  ]
+
+
+(*s Pretty-printing of inductive types declaration. *)
+
+let json_ind ip pl cv = json_dict [
+    ("what", json_str "decl:ind");
+    ("name", json_global Type (IndRef ip));
+    ("argnames", json_list (List.map json_id pl));
+    ("constructors", json_listarr (Array.mapi (fun idx c -> json_dict [
+        ("name", json_global Cons (ConstructRef (ip, idx+1)));
+        ("argtypes", json_list (List.map (json_type pl) c))
+      ]) cv))
+  ]
+
+
+(*s Pretty-printing of a declaration. *)
+
+let pp_decl = function
+  | Dind (kn, defs) -> prvecti_with_sep pr_comma
+    (fun i p -> if p.ip_logical then str ""
+     else json_ind (kn, i) p.ip_vars p.ip_types) defs.ind_packets
+  | Dtype (r, l, t) -> json_dict [
+      ("what", json_str "decl:type");
+      ("name", json_global Type r);
+      ("argnames", json_list (List.map json_id l));
+      ("value", json_type l t)
+    ]
+  | Dfix (rv, defs, typs) -> prvecti_with_sep pr_comma (fun i r ->
+      json_dict [
+        ("what", json_str "decl:fix");
+        ("name", json_global Term rv.(i));
+        ("type", json_type [] typs.(i));
+        ("value", json_function (empty_env ()) defs.(i))
+      ]) rv
+  | Dterm (r, a, t) -> json_dict [
+      ("what", json_str "decl:term");
+      ("name", json_global Term r);
+      ("type", json_type [] t);
+      ("value", json_function (empty_env ()) a)
+    ]
+
+let rec pp_structure_elem = function
+  | (l,SEdecl d) -> [ pp_decl d ]
+  | (l,SEmodule m) -> pp_module_expr m.ml_mod_expr
+  | (l,SEmodtype m) -> []
+      (* for the moment we simply discard module type *)
+
+and pp_module_expr = function
+  | MEstruct (mp,sel) -> List.concat (List.map pp_structure_elem sel)
+  | MEfunctor _ -> []
+      (* for the moment we simply discard unapplied functors *)
+  | MEident _ | MEapply _ -> assert false
+      (* should be expansed in extract_env *)
+
+let pp_struct mls =
+  let pp_sel (mp,sel) =
+    push_visible mp [];
+    let p = prlist_with_sep pr_comma identity
+      (List.concat (List.map pp_structure_elem sel)) in
+    pop_visible (); p
+  in
+  str "," ++ fnl () ++
+  str "  " ++ qs "declarations" ++ str ": [" ++ fnl () ++
+  str "    " ++ hov 0 (prlist_with_sep pr_comma pp_sel mls) ++ fnl () ++
+  str "  ]" ++ fnl () ++
+  str "}" ++ fnl ()
+
+
+let json_descr = {
+  keywords = Id.Set.empty;
+  file_suffix = ".json";
+  file_naming = file_of_modfile;
+  preamble = preamble;
+  pp_struct = pp_struct;
+  sig_suffix = None;
+  sig_preamble = (fun _ _ _ _ -> mt ());
+  pp_sig = (fun _ -> mt ());
+  pp_decl = pp_decl;
+}
diff --git a/plugins/extraction/json.mli b/plugins/extraction/json.mli
new file mode 100644
index 0000000000..3ba240a1d0
--- /dev/null
+++ b/plugins/extraction/json.mli
@@ -0,0 +1 @@
+val json_descr : Miniml.language_descr
diff --git a/plugins/extraction/table.ml b/plugins/extraction/table.ml
index 44d760ccdf..a57c39eef1 100644
--- a/plugins/extraction/table.ml
+++ b/plugins/extraction/table.ml
@@ -554,7 +554,7 @@ let _ = declare_string_option
 
 (*s Extraction Lang *)
 
-type lang = Ocaml | Haskell | Scheme
+type lang = Ocaml | Haskell | Scheme | JSON
 
 let lang_ref = Summary.ref Ocaml ~name:"ExtrLang"
 
diff --git a/plugins/extraction/table.mli b/plugins/extraction/table.mli
index 1acbe3555f..648f232114 100644
--- a/plugins/extraction/table.mli
+++ b/plugins/extraction/table.mli
@@ -142,7 +142,7 @@ val file_comment : unit -> string
 
 (*s Target language. *)
 
-type lang = Ocaml | Haskell | Scheme
+type lang = Ocaml | Haskell | Scheme | JSON
 val lang : unit -> lang
 
 (*s Extraction modes: modular or monolithic, library or minimal ?
-- 
cgit v1.2.3


From fb8c4b8903e82b36ebcf28dfe18282fb05a93d4f Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sun, 5 Apr 2015 10:52:45 -0400
Subject: JSON extraction: construct full names (dot-separated) in pp_global

This is important to disambiguate identical names from different modules.
---
 plugins/extraction/common.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/common.ml b/plugins/extraction/common.ml
index 094d91d20b..97f856944c 100644
--- a/plugins/extraction/common.ml
+++ b/plugins/extraction/common.ml
@@ -600,7 +600,7 @@ let pp_global k r =
     let rls = List.rev ls in (* for what come next it's easier this way *)
     match lang () with
       | Scheme -> unquote s (* no modular Scheme extraction... *)
-      | JSON -> unquote s (* no modular JSON extraction... *)
+      | JSON -> dottify (List.map unquote rls)
       | Haskell -> if modular () then pp_haskell_gen k mp rls else s
       | Ocaml -> pp_ocaml_gen k mp rls (Some l)
 
-- 
cgit v1.2.3


From 1688d4af1896effb42fa5dd191948795c59288a4 Mon Sep 17 00:00:00 2001
From: Nickolai Zeldovich
Date: Sun, 5 Apr 2015 12:26:57 -0400
Subject: JSON extraction: make explicit each group of mutually-recursive
 fixpoints

---
 plugins/extraction/json.ml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/json.ml b/plugins/extraction/json.ml
index f19fba6f1f..125dc86b82 100644
--- a/plugins/extraction/json.ml
+++ b/plugins/extraction/json.ml
@@ -221,13 +221,16 @@ let pp_decl = function
       ("argnames", json_list (List.map json_id l));
       ("value", json_type l t)
     ]
-  | Dfix (rv, defs, typs) -> prvecti_with_sep pr_comma (fun i r ->
-      json_dict [
-        ("what", json_str "decl:fix");
-        ("name", json_global Term rv.(i));
-        ("type", json_type [] typs.(i));
-        ("value", json_function (empty_env ()) defs.(i))
-      ]) rv
+  | Dfix (rv, defs, typs) -> json_dict [
+      ("what", json_str "decl:fixgroup");
+      ("fixlist", json_listarr (Array.mapi (fun i r ->
+        json_dict [
+          ("what", json_str "fixgroup:item");
+          ("name", json_global Term rv.(i));
+          ("type", json_type [] typs.(i));
+          ("value", json_function (empty_env ()) defs.(i))
+        ]) rv))
+    ]
   | Dterm (r, a, t) -> json_dict [
       ("what", json_str "decl:term");
       ("name", json_global Term r);
-- 
cgit v1.2.3