From nobody Thu Apr 07 09:27:49 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 629C01A89023; Thu, 7 Apr 2022 09:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KYwys2JVpz3w9w; Thu, 7 Apr 2022 09:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649323669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DRKYe/nSbNEPuhxkZN7gj9UEPCaD9pP1EDVxnp/tpdE=; b=oNyRXuDWLgxZkkd7/UOXF4hW3vrc5E/+KeVLUrGDNqxqsqL59ef/ROQIFrPhLlMUutFfng JoRD/KZok33MbxuEz2qsQsZVU/ovDLO6jiSXFNkSFSrNOr5L6upbRKLntrmGSTk9tt3NRY QwMXloHCmPqyatsIUgTtG0LPhjnSEblSzPVXVGoDwJa5/muWUY6Pgy1vYkl3aPIXB53Rvv 8281Xc0A2tD+4us0rIjQZJxtqmxlhtmSeREa8P1yEfXmbU5B6tmE9JCM53k+m9S6OD8IMN WXWxeASkEBfJcNATvOaCRGZy64KLFunc4JHcAD3lqCaAJSH5n+DpY0Wjg2dw5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F6D05417; Thu, 7 Apr 2022 09:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2379RnlE095045; Thu, 7 Apr 2022 09:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2379Rn2d095044; Thu, 7 Apr 2022 09:27:49 GMT (envelope-from git) Date: Thu, 7 Apr 2022 09:27:49 GMT Message-Id: <202204070927.2379Rn2d095044@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: dd7c628b2137 - main - devel/cil: prepare for OCaml 4.06+ (strings are immutable by default) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd7c628b2137da8f908fc858752c7e4622b6bbbf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649323669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DRKYe/nSbNEPuhxkZN7gj9UEPCaD9pP1EDVxnp/tpdE=; b=UBQweUPWCgAR4Ej26A6HTh9QrFTrU3YskZ+nkNOmQGv5dsrjTfnsWdYiwZClBpWWv2ybwc gFquQ3xKgOiGzlQ4qnltIzgXalgohu3nttmGHh7k0Nmr1ym7zGx447PPldCaxNsnXy64IM qA6us+mfqGl/Q05plr8PBCnzhcpqWSO3TwQMj9uTxJJ++ehAox0VUNv+Z4syBBkGnE/wWL xllty6rLQN8Xwq9ywNMsON/r39RjMzOaFcqkWjVOAlcRdHuNAA6bNqZgqwwk+DwL8ZswcU ygaaURbETRqwG73/gAPhctrlSLrPU5UUUrvrYj1+25KPJCXA5m4clNx7KqAiBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649323669; a=rsa-sha256; cv=none; b=sL5DC5BgXdT64d3x2lPTyxQd+dYzkG092O+mx1ttEWWBCYbYV51cp8H2GdAJ+hI1gRevfB +0CPO1ivaUmLh6wRdKo/TE0Ryi0T5JHlWNwlvPTkZecPCvyJGYmAxajvvYpTEXvzdfFi1D kBrTrrJkpv7aQ7sOHg4MJ4JsY0llPHShxVfpHdaDRuf9DCp8JAgwnBUfuE671oxlkyJEUN hWCcAI9qM0450eF47X1rr05ME5vMxE0FPkMzADMFDeUWTguqujd1al69MZ8IVf4xsBcB7J VQ8HLDDXwBpNMNGGfy7jyS49O+4MdUuxFnjJDGVw3SzjXC/eiTKqt0ZvMFNkTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd7c628b2137da8f908fc858752c7e4622b6bbbf commit dd7c628b2137da8f908fc858752c7e4622b6bbbf Author: Alexey Dokuchaev AuthorDate: 2022-04-07 09:26:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-07 09:26:36 +0000 devel/cil: prepare for OCaml 4.06+ (strings are immutable by default) --- devel/cil/files/patch-ocamlutil_errormsg.ml | 25 +++++++++++++++++ devel/cil/files/patch-ocamlutil_pretty.ml | 43 +++++++++++++++++++++++++++++ devel/cil/files/patch-src_cil.ml | 23 +++++++++++++++ devel/cil/files/patch-src_formatlex.mll | 17 ++++++++++++ 4 files changed, 108 insertions(+) diff --git a/devel/cil/files/patch-ocamlutil_errormsg.ml b/devel/cil/files/patch-ocamlutil_errormsg.ml new file mode 100644 index 000000000000..8faa3e27dd39 --- /dev/null +++ b/devel/cil/files/patch-ocamlutil_errormsg.ml @@ -0,0 +1,25 @@ +--- ocamlutil/errormsg.ml.orig 2013-07-24 15:07:11 UTC ++++ ocamlutil/errormsg.ml +@@ -211,16 +211,17 @@ let cleanFileName str = + if str <> "" && String.get str 0 = '"' (* '"' ( *) + then rem_quotes str else str in + let l = String.length str1 in ++ let str1 = Bytes.of_string str1 in + let rec loop (copyto: int) (i: int) = + if i >= l then +- String.sub str1 0 copyto ++ Bytes.to_string (Bytes.sub str1 0 copyto) + else +- let c = String.get str1 i in ++ let c = Bytes.get str1 i in + if c <> '\\' then begin +- String.set str1 copyto c; loop (copyto + 1) (i + 1) ++ Bytes.set str1 copyto c; loop (copyto + 1) (i + 1) + end else begin +- String.set str1 copyto '/'; +- if i < l - 2 && String.get str1 (i + 1) = '\\' then ++ Bytes.set str1 copyto '/'; ++ if i < l - 2 && Bytes.get str1 (i + 1) = '\\' then + loop (copyto + 1) (i + 2) + else + loop (copyto + 1) (i + 1) diff --git a/devel/cil/files/patch-ocamlutil_pretty.ml b/devel/cil/files/patch-ocamlutil_pretty.ml new file mode 100644 index 000000000000..96aa594f2abd --- /dev/null +++ b/devel/cil/files/patch-ocamlutil_pretty.ml @@ -0,0 +1,43 @@ +--- ocamlutil/pretty.ml.orig 2013-07-24 15:07:11 UTC ++++ ocamlutil/pretty.ml +@@ -725,31 +725,31 @@ let gprintf (finish : doc -> 'b) + invalid_arg ("dprintf: unimplemented format " + ^ (String.sub format i (j-i+1))); + let j' = succ j in (* eat the d,i,x etc. *) +- let format_spec = "% " in +- String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) ++ let format_spec = Bytes.of_string "% " in ++ Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) + Obj.magic(fun n -> + collect (dctext1 acc +- (Int64.format format_spec n)) ++ (Int64.format (Bytes.to_string format_spec) n)) + (succ j')) + | 'l' -> + if j != i + 1 then invalid_arg ("dprintf: unimplemented format " + ^ (String.sub format i (j-i+1))); + let j' = succ j in (* eat the d,i,x etc. *) +- let format_spec = "% " in +- String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) ++ let format_spec = Bytes.of_string "% " in ++ Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) + Obj.magic(fun n -> + collect (dctext1 acc +- (Int32.format format_spec n)) ++ (Int32.format (Bytes.to_string format_spec) n)) + (succ j')) + | 'n' -> + if j != i + 1 then invalid_arg ("dprintf: unimplemented format " + ^ (String.sub format i (j-i+1))); + let j' = succ j in (* eat the d,i,x etc. *) +- let format_spec = "% " in +- String.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) ++ let format_spec = Bytes.of_string "% " in ++ Bytes.set format_spec 1 (fget j'); (* format_spec = "%x", etc. *) + Obj.magic(fun n -> + collect (dctext1 acc +- (Nativeint.format format_spec n)) ++ (Nativeint.format (Bytes.to_string format_spec) n)) + (succ j')) + | 'f' | 'e' | 'E' | 'g' | 'G' -> + Obj.magic(fun f -> diff --git a/devel/cil/files/patch-src_cil.ml b/devel/cil/files/patch-src_cil.ml new file mode 100644 index 000000000000..f2be5cf6eda5 --- /dev/null +++ b/devel/cil/files/patch-src_cil.ml @@ -0,0 +1,23 @@ +--- src/cil.ml.orig 2013-07-24 15:07:11 UTC ++++ src/cil.ml +@@ -5033,7 +5033,7 @@ let loadBinaryFile (filename : string) : file = + (* Take the name of a file and make a valid symbol name out of it. There are + * a few characters that are not valid in symbols *) + let makeValidSymbolName (s: string) = +- let s = String.copy s in (* So that we can update in place *) ++ let b = Bytes.copy (Bytes.of_string s) in (* So that we can update in place *) + let l = String.length s in + for i = 0 to l - 1 do + let c = String.get s i in +@@ -5043,9 +5043,9 @@ let makeValidSymbolName (s: string) = + | _ -> false + in + if isinvalid then +- String.set s i '_'; ++ Bytes.set b i '_'; + done; +- s ++ Bytes.to_string b + + let rec addOffset (toadd: offset) (off: offset) : offset = + match off with diff --git a/devel/cil/files/patch-src_formatlex.mll b/devel/cil/files/patch-src_formatlex.mll new file mode 100644 index 000000000000..c1045cac852d --- /dev/null +++ b/devel/cil/files/patch-src_formatlex.mll @@ -0,0 +1,17 @@ +--- src/formatlex.mll.orig 2013-07-24 15:07:11 UTC ++++ src/formatlex.mll +@@ -145,11 +145,11 @@ let scan_oct_escape str = + * We convert L"Hi" to "H\000i\000" *) + let wbtowc wstr = + let len = String.length wstr in +- let dest = String.make (len * 2) '\000' in ++ let dest = Bytes.make (len * 2) '\000' in + for i = 0 to len-1 do +- dest.[i*2] <- wstr.[i] ; ++ Bytes.set dest (i*2) (String.get wstr i) + done ; +- dest ++ Bytes.to_string dest + + (* This function converst the "Hi" in L"Hi" to { L'H', L'i', L'\0' } *) + let wstr_to_warray wstr =