Cleanup.

generator/print_coq.ml

@@ -21,25 +21,16 @@ let width =
 (* Various fixed elements. *)
 
 let arrow =
-  string " ->"
+  string "->"
 
 let doublearrow =
   string "=>"
 
-let colon =
-  string " :"
-
 let colonequals =
-  string " :="
-
-let within =
-  string "in"
+  string ":="
 
-let quote =
-  string "'"
-
-let dot =
-  string "."
+let spacecolon =
+  string " :"
 
 (* -------------------------------------------------------------------------- *)
 
@@ -116,7 +107,7 @@ let label = function
       string "_"
   | Some l ->
       parens (
-        string "Label_create" ^/^ quote ^^ string l
+        string "Label_create" ^/^ squote ^^ string l
       )
 
 (* -------------------------------------------------------------------------- *)
@@ -141,7 +132,7 @@ let rec expr0 = function
   | Coq_record _les ->
       assert false (* TODO *)
   | Coq_annot (e1, e2) ->
-      parens (expr e1 ^^ colon ^/^ expr e2)
+      parens (expr e1 ^^ spacecolon ^/^ expr e2)
   | Coq_app _
   | Coq_tag _
   | Coq_impl _
@@ -167,28 +158,28 @@ and expr1 = function
 
 and expr2 = function
   | Coq_impl (e1, e2) ->
-      group (expr1 e1 ^^ arrow ^/^ expr2 e2)
+      group (expr1 e1 ^^ space ^^ arrow ^/^ expr2 e2)
   | e ->
       expr1 e
 
 and expr3 = function
   | Coq_lettuple (es, e1, e2) ->
       block
-        (string "let '" ^^ tuple expr es ^^ colonequals)
+        (string "let '" ^^ tuple expr es ^^ space ^^ colonequals)
         (break 1 ^^ expr e1)
-        (break 1 ^^ within)
+        (break 1 ^^ string "in")
       ^/^
       expr3 e2
   | Coq_forall ((x, e1), e2) ->
       block
-        (string "forall " ^^ string x ^^ colon)
+        (string "forall " ^^ string x ^^ spacecolon)
         (break 1 ^^ expr e1 ^^ comma)
         empty
       ^/^
       expr3 e2
   | Coq_fun ((x, e1), e2) ->
       block
-        (string "fun " ^^ string x ^^ colon)
+        (string "fun " ^^ string x ^^ spacecolon)
         (break 1 ^^ expr e1)
         (break 1 ^^ doublearrow)
       ^/^
@@ -206,7 +197,7 @@ and expr e =
 (* Raw. *)
 
 let var (x, t) =
-  block (string x ^^ colon) (space ^^ expr t) empty
+  block (string x ^^ spacecolon) (space ^^ expr t) empty
 
 (* With parentheses and with a leading space. *)
 
@@ -230,16 +221,16 @@ let fields xts =
 
 let definition x d1 =
   block
-    (space ^^ x ^^ colon)
+    (space ^^ x ^^ spacecolon)
     (break 1 ^^ d1)
-    (break 1 ^^ string ":=")
+    (break 1 ^^ colonequals)
 
 (* A parameter, without a leading keyword, but with a leading space.
    [ x : d1.]. *)
 
 let parameter x d1 =
   block
-    (space ^^ x ^^ colon)
+    (space ^^ x ^^ spacecolon)
     (break 1 ^^ d1)
     dot
 
@@ -318,13 +309,13 @@ let top = function
   | Coqtop_hint_constructors (xs, base) ->
       string "Hint Constructors " ^^
       separate_map space string xs ^^
-      colon ^/^
+      spacecolon ^/^
       string base
       ^^ dot
   | Coqtop_hint_unfold (xs, base) ->
       string "Hint Unfold " ^^
       separate_map space string xs ^^
-      colon ^/^
+      spacecolon ^/^
       string base
       ^^ dot
   | Coqtop_require x ->