File tree 7 files changed +5
-50
lines changed
7 files changed +5
-50
lines changed Original file line number Diff line number Diff line change @@ -38,6 +38,10 @@ Working version
38
38
and patterns (plus fix printing of (::) in the toplevel)
39
39
(Florian Angeletti, review by Alain Frisch, Gabriel Scherer)
40
40
41
+ * GPR#1252: The default mode is now safe-string, can be overridden
42
+ at configure time or at compile time.
43
+ (Damien Doligez)
44
+
41
45
- GPR#1253: Private extensible variants
42
46
(Leo White, review by Alain Frisch)
43
47
Original file line number Diff line number Diff line change 1
- # **************************************************************************
2
- # * *
3
- # * OCaml *
4
- # * *
5
- # * Xavier Clerc, SED, INRIA Rocquencourt *
6
- # * *
7
- # * Copyright 2010 Institut National de Recherche en Informatique et *
8
- # * en Automatique. *
9
- # * *
10
- # * All rights reserved. This file is distributed under the terms of *
11
- # * the GNU Lesser General Public License version 2.1, with the *
12
- # * special exception on linking described in the file LICENSE. *
13
- # * *
14
- # **************************************************************************
15
-
16
- all : pr6322.ml check
17
-
18
1
BASEDIR =../..
19
2
include $(BASEDIR ) /makefiles/Makefile.several
20
3
include $(BASEDIR ) /makefiles/Makefile.common
@@ -25,16 +8,3 @@ include $(BASEDIR)/makefiles/Makefile.common
25
8
# As a temporary workaround, we skip this test.
26
9
SKIP =test $$file = trigraph.ml \
27
10
&& test ` uname -m ` = i386 && test ` uname -s ` = OpenBSD
28
-
29
- GENERATED_SOURCES =pr6322.ml *.safe-string
30
-
31
- pr6322.ml : $(SAFE_STRING ) .safe-string
32
- ifeq ($(SAFE_STRING ) ,false)
33
- @cat pr6322.ml.in > $@
34
- else
35
- @echo "Printf.printf \"PR# 6322=Ok\\n%!\"" > $@
36
- endif
37
-
38
- % .safe-string :
39
- @rm -f pr6322.ml
40
- @touch $@
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 13
13
14
14
BASEDIR =../..
15
15
include $(BASEDIR ) /makefiles/Makefile.common
16
-
17
- # The second test (`A.y`) is unnecessary, indeed cannot be compiled, under -safe-string
18
- ifeq ($(SAFE_STRING ) ,true)
19
- ADD_COMPFLAGS =-pp "sed -e '\$$d'"
20
- endif
Original file line number Diff line number Diff line change 1
1
type _ t =
2
2
X of string
3
3
| Y : bytes t
4
-
5
- (* It is important that the line below is the last line of the file (see Makefile) *)
6
- let y : string t = Y
Original file line number Diff line number Diff line change @@ -158,7 +158,7 @@ let runtime_variant = ref "";; (* -runtime-variant *)
158
158
159
159
let keep_docs = ref false (* -keep-docs *)
160
160
let keep_locs = ref true (* -keep-locs *)
161
- let unsafe_string = ref ( not Config. safe_string)
161
+ let unsafe_string = ref false
162
162
(* -safe-string / -unsafe-string *)
163
163
164
164
let classic_inlining = ref false (* -Oclassic *)
You can’t perform that action at this time.
0 commit comments