Use Extraction Blacklist

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1114 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e

3 files changed, 3 insertions, 17 deletions

diff --git a/extraction/convert b/extraction/convert
deleted file mode 100755
index 94ec38e..0000000
--- a/extraction/convert
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl -pi
-
-s/\bList\b/CoqList/g;
-s/\bString\b/CoqString/g;
-s/^open Int$/open CoqInt/;
-
diff --git a/extraction/extraction.v b/extraction/extraction.v
index d74e192..137ddb0 100644
--- a/extraction/extraction.v
+++ b/extraction/extraction.v
@@ -82,6 +82,9 @@ Extract Constant Asm.ireg_eq => "fun (x: ireg) (y: ireg) -> x = y".
 Extract Constant Asm.freg_eq => "fun (x: freg) (y: freg) -> x = y".
 Extract Constant Asm.preg_eq => "fun (x: preg) (y: preg) -> x = y".
 
+(* Avoid name clashes *)
+Extraction Blacklist List String Int.
+
 (* Go! *)
 Cd "extraction".
 Recursive Extraction Library Compiler.
diff --git a/extraction/fixextract b/extraction/fixextract
index 1ee3c48..86ebdbd 100755
--- a/extraction/fixextract
+++ b/extraction/fixextract
@@ -1,15 +1,4 @@
 #!/bin/sh
 
-echo "Fixing file names..."
-mv list.ml CoqList.ml
-mv list.mli CoqList.mli
-mv string.ml CoqString.ml
-mv string.mli CoqString.mli
-mv int.ml CoqInt.ml
-mv int.mli CoqInt.mli
-
-echo "Conversion List -> CoqList, String -> CoqString, Int -> CoqInt..."
-./convert *.mli *.ml
-
 echo "Patching files..."
 for i in *.patch; do patch < $i; done