summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJohn Whitington <john@coherentgraphics.co.uk>2020-07-29 14:58:01 +0100
committerJohn Whitington <john@coherentgraphics.co.uk>2020-07-29 14:58:01 +0100
commit85491c88670b32174d27698dd6e3cfc864ba8e67 (patch)
treed1684c0bb8c590660befa06f6dfadfc9f2654ad8 /tools
parentdd1f3789f22f2339583d87877b11a33770056708 (diff)
downloadocaml-85491c88670b32174d27698dd6e3cfc864ba8e67.tar.gz
Tildes back in labeled modules
Diffstat (limited to 'tools')
-rwxr-xr-xtools/unlabel6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/unlabel b/tools/unlabel
index 5f1386c323..60630fa4f1 100755
--- a/tools/unlabel
+++ b/tools/unlabel
@@ -30,9 +30,9 @@ LABREGEX="s/ [a-z_]+:([a-z\('])/ \1/g"
#A second, sligthly different round sometimes required to deal with f:(key:key
LABLABREGEX="s/\([a-z_]+:([a-z\('])/\(\1/g"
-#Remove a tilde if it is followed by some alphanumerics and a space or closing
+#Remove a tilde if it is followed by a label name and a space or closing
#OCamldoc code section with ]
-TILDEREGEX="s/~([a-z]*[ \]])/\1/g"
+TILDEREGEX="s/~([a-z_]*[ \]])/\1/g"
#Stdlib
perl -p -e "$LABREGEX" stdlib/listLabels.mli > stdlib/list.temp.mli
@@ -74,7 +74,7 @@ perl -p -e 's/MAP/`tail -n +19 stdlib\/templates\/map.template.mli`/e' \
perl -p -e 's/SET/`tail -n +19 stdlib\/templates\/set.template.mli`/e' \
stdlib/moreLabels.2temp.mli > stdlib/moreLabels.mli
-#Fix up
+#Fix up with templates in tools/unlabel-patches
perl -p -e "s/type statistics =/type statistics = Hashtbl\.statistics =/" \
stdlib/moreLabels.mli > stdlib/moreLabels.temp.mli
perl -p -e "s/type \(!'a, !'b\) t/type \(!'a, !'b\) t = \('a, 'b) Hashtbl.t/" \