From d68f695b5a953c50bcf5e80182ef317682de1a05 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Fri, 19 Jul 2019 14:01:38 +0200
Subject: [vernacexpr] Refactor fixpoint AST.

We turn the tuples used for (co)-fixpoints into records, cleaning up
their users.

More cleanup is be possible, in particular a few functions can now
shared among co and fixpoints, also `structured_fixpoint_expr` could
like be folded into the new record.

Feedback on the naming of the records fields is welcome.

This is a step towards cleaning up code in `funind`, as it is the main
consumer of this data structure, as it does quite a bit of fixpoint
manipulation.

cc: #6019
---
 stm/vernac_classifier.ml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'stm')

diff --git a/stm/vernac_classifier.ml b/stm/vernac_classifier.ml
index aaba36287a..11ff6e9df9 100644
--- a/stm/vernac_classifier.ml
+++ b/stm/vernac_classifier.ml
@@ -106,8 +106,8 @@ let classify_vernac e =
          else GuaranteesOpacity
        in
         let ids, open_proof =
-          List.fold_left (fun (l,b) ((({v=id},_),_,_,_,p),_) ->
-            id::l, b || p = None) ([],false) l in
+          List.fold_left (fun (l,b) {Vernacexpr.id_decl=({CAst.v=id},_); body_def} ->
+            id::l, b || body_def = None) ([],false) l in
         if open_proof
         then VtStartProof (guarantee,ids)
         else VtSideff (ids, VtLater)
@@ -118,8 +118,8 @@ let classify_vernac e =
          else GuaranteesOpacity
        in
         let ids, open_proof =
-          List.fold_left (fun (l,b) ((({v=id},_),_,_,p),_) ->
-            id::l, b || p = None) ([],false) l in
+          List.fold_left (fun (l,b) { Vernacexpr.id_decl=({CAst.v=id},_); body_def } ->
+            id::l, b || body_def = None) ([],false) l in
         if open_proof
         then VtStartProof (guarantee,ids)
         else VtSideff (ids, VtLater)
-- 
cgit v1.2.3


From d407d1f3f2f877fca8673eaf0470b3390e55dbaa Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Fri, 19 Jul 2019 18:55:05 +0200
Subject: [vernacexpr] Remove duplicate fixpoint record.

We continue over the previous commit and remove redundant
`structured_fixpoint_expr` record in favor of the one used in the AST.

This removes some term-shuffling, tho we still have discrepancies
related to adjustments on the recursive annotation.
---
 stm/vernac_classifier.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'stm')

diff --git a/stm/vernac_classifier.ml b/stm/vernac_classifier.ml
index 11ff6e9df9..8750a64ccc 100644
--- a/stm/vernac_classifier.ml
+++ b/stm/vernac_classifier.ml
@@ -106,7 +106,7 @@ let classify_vernac e =
          else GuaranteesOpacity
        in
         let ids, open_proof =
-          List.fold_left (fun (l,b) {Vernacexpr.id_decl=({CAst.v=id},_); body_def} ->
+          List.fold_left (fun (l,b) {Vernacexpr.fname={CAst.v=id}; body_def} ->
             id::l, b || body_def = None) ([],false) l in
         if open_proof
         then VtStartProof (guarantee,ids)
@@ -118,7 +118,7 @@ let classify_vernac e =
          else GuaranteesOpacity
        in
         let ids, open_proof =
-          List.fold_left (fun (l,b) { Vernacexpr.id_decl=({CAst.v=id},_); body_def } ->
+          List.fold_left (fun (l,b) { Vernacexpr.fname={CAst.v=id}; body_def } ->
             id::l, b || body_def = None) ([],false) l in
         if open_proof
         then VtStartProof (guarantee,ids)
-- 
cgit v1.2.3