From 1a4a7fa6dbd7c43c5d6c99297d1b6c5c497c0589 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Mon, 9 Nov 2009 18:05:13 +0000
Subject: A bit of cleaning around name generation + creation of dedicated file
 namegen.ml

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12485 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 plugins/extraction/common.ml     | 3 ++-
 plugins/extraction/extraction.ml | 2 +-
 plugins/extraction/table.ml      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins/extraction')

diff --git a/plugins/extraction/common.ml b/plugins/extraction/common.ml
index 47381f6d80..73b51cfe7d 100644
--- a/plugins/extraction/common.ml
+++ b/plugins/extraction/common.ml
@@ -13,6 +13,7 @@ open Util
 open Names
 open Term
 open Declarations
+open Namegen
 open Nameops
 open Libnames
 open Table
@@ -92,7 +93,7 @@ type env = identifier list * Idset.t
 (*s Generic renaming issues for local variable names. *)
 
 let rec rename_id id avoid =
-  if Idset.mem id avoid then rename_id (lift_ident id) avoid else id
+  if Idset.mem id avoid then rename_id (lift_subscript id) avoid else id
 
 let rec rename_vars avoid = function
   | [] ->
diff --git a/plugins/extraction/extraction.ml b/plugins/extraction/extraction.ml
index d119dbe8ec..71bb634dad 100644
--- a/plugins/extraction/extraction.ml
+++ b/plugins/extraction/extraction.ml
@@ -20,7 +20,7 @@ open Inductive
 open Termops
 open Inductiveops
 open Recordops
-open Nameops
+open Namegen
 open Summary
 open Libnames
 open Nametab
diff --git a/plugins/extraction/table.ml b/plugins/extraction/table.ml
index 043bf0fe75..df9f02dfd6 100644
--- a/plugins/extraction/table.ml
+++ b/plugins/extraction/table.ml
@@ -12,6 +12,7 @@ open Names
 open Term
 open Declarations
 open Nameops
+open Namegen
 open Summary
 open Libobject
 open Goptions
-- 
cgit v1.2.3