From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Newsgroups: gmane.emacs.devel Subject: [PATCH] Make `old-style-backquotes' variable internal Date: Sun, 7 May 2017 13:49:46 +0200 Message-ID: <20170507114946.38440-1-phst@google.com> References: <83r301e6td.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1494157811 31017 195.159.176.226 (7 May 2017 11:50:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 7 May 2017 11:50:11 +0000 (UTC) Cc: Philipp To: eliz@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 07 13:50:07 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7KhT-0007yd-EU for ged-emacs-devel@m.gmane.org; Sun, 07 May 2017 13:50:07 +0200 Original-Received: from localhost ([::1]:54591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7KhZ-0004ry-4A for ged-emacs-devel@m.gmane.org; Sun, 07 May 2017 07:50:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7KhS-0004pv-Vv for emacs-devel@gnu.org; Sun, 07 May 2017 07:50:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7KhR-0000mh-Ps for emacs-devel@gnu.org; Sun, 07 May 2017 07:50:07 -0400 Original-Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7KhN-0000mG-3P; Sun, 07 May 2017 07:50:01 -0400 Original-Received: by mail-wm0-x244.google.com with SMTP id u65so9497783wmu.3; Sun, 07 May 2017 04:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=SxT22DA6qEXoEu5R+6jBMiHlhNPqtIOxnZVjX0sNrVE=; b=VpfOILqsPUpfSuRXWqnYJAywRSqxjvzo+7Nzx5Z0mTjcs43shYY+jtyeOnMXk/kgDw F8xxcQyyivWLu6bs7RcGIqbKhQJKtCKgKLjZhDlGHSvFzGJhabVf2Qyo35/I9DQyjmDk ZdelE3kvFMxKO7QRAbztEYbgbKpCsIMWJZnSpqO0hNPCufMuoG+nJJHcXByX0MtwClis d7Ay81ADyL5on2YRsqPwzrLGBTK/aVPSDgdz8RL8zvfjratDtJtsgvne1Xzp8N0eHJHU vY2234L3ox8W1/6FNum2I16bm6jRalcUWBsNEJUPPLMykLXBSHVuXUb9eQGvzozJzok+ NYjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=SxT22DA6qEXoEu5R+6jBMiHlhNPqtIOxnZVjX0sNrVE=; b=Mk1IQpcK4cjmfO4UTg+Wi2VgGKwURhet2FF7Vz9+P/a8XmBys2OZT5NKD1J4h76L0k gtyt0R/fazFDH0KBnopD5r5D/8xCFuvglo1YZcjf7/ye19rGWm1GJOlho1sKMjfmkPm+ AiGwq1pJNb2QU+fylrxGJc4jeAOivrm74Izki6lDveHmYTEHlzi+Fn2ZAUfasAkSBL56 wv1s0cppB6/3ysd/4v1yNb2ob2Gic5jNw2YjkmUNWxDialZhx9l5fpTgWrku2rKtVDDB vLIVot6wIgbhtMHkUyEbs25eVHOQE+rr9zOV9fTD5uWP8AIFQZLI8AesgWdz7B3+bfO1 xCiw== X-Gm-Message-State: AN3rC/5YajP4/R8tO+wP2OHUrCBs3DXm+ho/GpcIHj4sgu7SLbXeyA02 2Kzr0A729B7Vx3bTXJ4= X-Received: by 10.28.69.73 with SMTP id s70mr9725855wma.36.1494157799504; Sun, 07 May 2017 04:49:59 -0700 (PDT) Original-Received: from p.cm.cablesurf.de (46.128.198.151.dynamic.cablesurf.de. [46.128.198.151]) by smtp.gmail.com with ESMTPSA id s72sm12094546wmb.18.2017.05.07.04.49.58 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 07 May 2017 04:49:58 -0700 (PDT) X-Google-Original-From: Philipp X-Mailer: git-send-email 2.12.2 In-Reply-To: <83r301e6td.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:214663 Archived-At: * src/lread.c (load_warn_old_style_backquotes, Fload, read1) (syms_of_lread): Rename `old-style-backquotes' to `lread--old-style-backquotes', and clarify that it's for internal use only. * lisp/emacs-lisp/bytecomp.el (byte-compile-from-buffer): Rename variable. * test/src/lread-tests.el (lread-tests--old-style-backquotes): Add unit test. * emacs-lisp/bytecomp-tests.el (bytecomp-tests--old-style-backquotes): Add unit test. --- etc/NEWS | 5 +++++ lisp/emacs-lisp/bytecomp.el | 4 ++-- src/lread.c | 17 +++++++++-------- test/lisp/emacs-lisp/bytecomp-tests.el | 15 +++++++++++++++ test/src/lread-tests.el | 9 +++++++++ 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 1f1f4b4b4b..166744b848 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -896,6 +896,11 @@ which was sometimes numerically incorrect. For example, on a 64-bit host (max 1e16 10000000000000001) now returns its second argument instead of its first. ++++ +** The variable 'old-style-backquotes' has been made internal and +renamed to 'lread--old-style-backquotes'. No user code should use +this variable. + * Lisp Changes in Emacs 26.1 diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 201733ff03..04335ffbfe 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2021,11 +2021,11 @@ byte-compile-from-buffer (not (eobp))) (setq byte-compile-read-position (point) byte-compile-last-position byte-compile-read-position) - (let* ((old-style-backquotes nil) + (let* ((lread--old-style-backquotes nil) (lread--unescaped-character-literals nil) (form (read inbuffer))) ;; Warn about the use of old-style backquotes. - (when old-style-backquotes + (when lread--old-style-backquotes (byte-compile-warn "!! The file uses old-style backquotes !! This functionality has been obsolete for more than 10 years already and will be removed soon. See (elisp)Backquote in the manual.")) diff --git a/src/lread.c b/src/lread.c index 6467043b1d..3cf8ef5a4e 100644 --- a/src/lread.c +++ b/src/lread.c @@ -948,7 +948,7 @@ load_error_handler (Lisp_Object data) static void load_warn_old_style_backquotes (Lisp_Object file) { - if (!NILP (Vold_style_backquotes)) + if (!NILP (Vlread_old_style_backquotes)) { AUTO_STRING (format, "Loading `%s': old-style backquotes detected!"); CALLN (Fmessage, format, file); @@ -1214,7 +1214,7 @@ Return t if the file exists and loads successfully. */) version = -1; /* Check for the presence of old-style quotes and warn about them. */ - specbind (Qold_style_backquotes, Qnil); + specbind (Qlread_old_style_backquotes, Qnil); record_unwind_protect (load_warn_old_style_backquotes, file); /* Check for the presence of unescaped character literals and warn @@ -3037,7 +3037,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) "(\`" anyway). */ if (!new_backquote_flag && first_in_list && next_char == ' ') { - Vold_style_backquotes = Qt; + Vlread_old_style_backquotes = Qt; goto default_label; } else @@ -3091,7 +3091,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list) } else { - Vold_style_backquotes = Qt; + Vlread_old_style_backquotes = Qt; goto default_label; } } @@ -4840,10 +4840,11 @@ variables, this must be set in the first line of a file. */); doc: /* List of buffers being read from by calls to `eval-buffer' and `eval-region'. */); Veval_buffer_list = Qnil; - DEFVAR_LISP ("old-style-backquotes", Vold_style_backquotes, - doc: /* Set to non-nil when `read' encounters an old-style backquote. */); - Vold_style_backquotes = Qnil; - DEFSYM (Qold_style_backquotes, "old-style-backquotes"); + DEFVAR_LISP ("lread--old-style-backquotes", Vlread_old_style_backquotes, + doc: /* Set to non-nil when `read' encounters an old-style backquote. +For internal use only. */); + Vlread_old_style_backquotes = Qnil; + DEFSYM (Qlread_old_style_backquotes, "lread--old-style-backquotes"); DEFVAR_LISP ("lread--unescaped-character-literals", Vlread_unescaped_character_literals, diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 3624904753..a83c998a59 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -529,6 +529,21 @@ bytecomp-tests--with-temp-file (list (concat "unescaped character literals " "\", (, ), ;, [, ] detected!")))))))) +(ert-deftest bytecomp-tests--old-style-backquotes () + "Check that byte compiling warns about old-style backquotes." + (should (boundp 'lread--old-style-backquotes)) + (bytecomp-tests--with-temp-file source + (write-region "(` (a b))" nil source) + (bytecomp-tests--with-temp-file destination + (let* ((byte-compile-dest-file-function (lambda (_) destination)) + (byte-compile-error-on-warn t) + (byte-compile-debug t) + (err (should-error (byte-compile-file source)))) + (should (equal (cdr err) + (list "!! The file uses old-style backquotes !! +This functionality has been obsolete for more than 10 years already +and will be removed soon. See (elisp)Backquote in the manual."))))))) + ;; Local Variables: ;; no-byte-compile: t ;; End: diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el index 84342348d4..e45d184cad 100644 --- a/test/src/lread-tests.el +++ b/test/src/lread-tests.el @@ -142,4 +142,13 @@ lread-tests--last-message "unescaped character literals " "\", (, ), ;, [, ] detected!"))))) +(ert-deftest lread-tests--old-style-backquotes () + "Check that loading warns about old-style backquotes." + (lread-tests--with-temp-file file-name + (write-region "(` (a b))" nil file-name) + (should (equal (load file-name nil :nomessage :nosuffix) t)) + (should (equal (lread-tests--last-message) + (concat (format-message "Loading `%s': " file-name) + "old-style backquotes detected!"))))) + ;;; lread-tests.el ends here -- 2.12.2