From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Aaron S. Hawley" Newsgroups: gmane.emacs.bugs Subject: bug#4369: expunge references to lisp-re in re-builder Date: Tue, 8 Sep 2009 00:35:52 -0400 Message-ID: Reply-To: "Aaron S. Hawley" , 4369@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=00c09f899a4d5add620473098067 X-Trace: ger.gmane.org 1252454292 11888 80.91.229.12 (8 Sep 2009 23:58:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Sep 2009 23:58:12 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 09 01:58:05 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MlAZY-0001zO-HL for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Sep 2009 01:58:05 +0200 Original-Received: from localhost ([127.0.0.1]:43253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlAZY-0000Yk-2P for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Sep 2009 19:58:04 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mksbi-0000nC-Ra for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:47:06 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mksbe-0000n0-96 for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:47:06 -0400 Original-Received: from [199.232.76.173] (port=33928 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mksbd-0000mx-O2 for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:47:01 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:36904) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mksbd-00066C-4r for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:47:01 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n884kwh7019408; Mon, 7 Sep 2009 21:46:58 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n884j4Pk019011; Mon, 7 Sep 2009 21:45:04 -0700 Resent-Date: Mon, 7 Sep 2009 21:45:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: "Aaron S. Hawley" Original-Sender: aaron.s.hawley@gmail.com Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Tue, 08 Sep 2009 04:45:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 4369 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.125238456617629 (code B ref -1); Tue, 08 Sep 2009 04:45:04 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 8 Sep 2009 04:36:06 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n884a4Wo017621 for ; Mon, 7 Sep 2009 21:36:05 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MksR1-0003Wk-30 for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:36:03 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MksQv-0003Sm-Jg for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:36:01 -0400 Original-Received: from [199.232.76.173] (port=55061 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MksQv-0003Sd-Ap for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:35:57 -0400 Original-Received: from mail-qy0-f185.google.com ([209.85.221.185]:62178) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MksQu-0003ZS-UU for bug-gnu-emacs@gnu.org; Tue, 08 Sep 2009 00:35:57 -0400 Original-Received: by qyk15 with SMTP id 15so2287307qyk.13 for ; Mon, 07 Sep 2009 21:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=GgPI+szOOdTAJM6Zgwb99S3EqnRgHtJBHZ4vGfoMOWI=; b=C7EApVPoci3e6Gozy/scE1smSWQjPKn2sVOsTTgNnY/82GgHan0wvFYinfPAW7NiRw loghDN0HRqEW81cz0t2Yu4FmxohuHaGBUapHgLwOQxw8Kbxcmd7YIW00kOho57c9YRsp DtsPr6IJHFBMr4fZiCgtyE2qRvdi+fbQsJutQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; b=cDci65iq0vMg6bsy9bjkW4n5CGuW12gIckhXzt5emACbbybTyl+HLm1FTigNDdWQxk 4lzeFSDisHR0M9aQ6H4kFY9srYVoLWdFM6P/0jgV0pzT2rFIcElllIHVQVMj2R2v+26V J+aqf+nm1G5DdqWrII2ou2GgKoFPsjnQglaPk= Original-Received: by 10.224.79.37 with SMTP id n37mr9574387qak.194.1252384552180; Mon, 07 Sep 2009 21:35:52 -0700 (PDT) X-Google-Sender-Auth: 18a8ca21df6fa632 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Tue, 08 Sep 2009 00:47:06 -0400 X-Mailman-Approved-At: Tue, 08 Sep 2009 19:57:40 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:30860 Archived-At: --00c09f899a4d5add620473098067 Content-Type: text/plain; charset=ISO-8859-1 The lisp-re library never made it out of Detlev Zundel's private collection. I suggest that all references to it be removed. That way people can avoid getting error messages like: "Cannot open load file: lisp-re". --- re-builder.el 08 Sep 2009 00:16:11 -0400 1.47 +++ re-builder.el 08 Sep 2009 00:18:41 -0400 @@ -61,14 +61,12 @@ ;; this limit allowing an easy way to see all matches. ;; Currently `re-builder' understands five different forms of input, -;; namely `read', `string', `rx', `sregex' and `lisp-re' syntax. Read +;; namely `read', `string', `rx', and `sregex' syntax. Read ;; syntax and string syntax are both delimited by `"'s and behave ;; according to their name. With the `string' syntax there's no need ;; to escape the backslashes and double quotes simplifying the editing ;; somewhat. The other three allow editing of symbolic regular -;; expressions supported by the packages of the same name. (`lisp-re' -;; is a package by me and its support may go away as it is nearly the -;; same as the `sregex' package in Emacs) +;; expressions supported by the packages of the same name. ;; Editing symbolic expressions is done through a major mode derived ;; from `emacs-lisp-mode' so you'll get all the good stuff like @@ -128,12 +126,11 @@ (defcustom reb-re-syntax 'read "Syntax for the REs in the RE Builder. -Can either be `read', `string', `sregex', `lisp-re', `rx'." +Can either be `read', `string', `sregex', `rx'." :group 're-builder :type '(choice (const :tag "Read syntax" read) (const :tag "String syntax" string) (const :tag "`sregex' syntax" sregex) - (const :tag "`lisp-re' syntax" lisp-re) (const :tag "`rx' syntax" rx))) (defcustom reb-auto-match-limit 200 @@ -281,8 +278,7 @@ (define-derived-mode reb-lisp-mode emacs-lisp-mode "RE Builder Lisp" "Major mode for interactively building symbolic Regular Expressions." - (cond ((eq reb-re-syntax 'lisp-re) ; Pull in packages - (require 'lisp-re)) ; as needed + (cond ; Pull in packages as needed ((eq reb-re-syntax 'sregex) ; sregex is not autoloaded (require 'sregex)) ; right now.. ((eq reb-re-syntax 'rx) ; rx-to-string is autoloaded @@ -329,7 +325,7 @@ (defsubst reb-lisp-syntax-p () "Return non-nil if RE Builder uses a Lisp syntax." - (memq reb-re-syntax '(lisp-re sregex rx))) + (memq reb-re-syntax '(sregex rx))) (defmacro reb-target-binding (symbol) "Return binding for SYMBOL in the RE Builder target buffer." @@ -489,10 +485,10 @@ (list (intern (completing-read "Select syntax: " (mapcar (lambda (el) (cons (symbol-name el) 1)) - '(read string lisp-re sregex rx)) + '(read string sregex rx)) nil t (symbol-name reb-re-syntax))))) - (if (memq syntax '(read string lisp-re sregex rx)) + (if (memq syntax '(read string sregex rx)) (let ((buffer (get-buffer reb-buffer))) (setq reb-re-syntax syntax) (when buffer @@ -616,10 +612,7 @@ (defun reb-cook-regexp (re) "Return RE after processing it according to `reb-re-syntax'." - (cond ((eq reb-re-syntax 'lisp-re) - (when (fboundp 'lre-compile-string) - (lre-compile-string (eval (car (read-from-string re)))))) - ((eq reb-re-syntax 'sregex) + (cond ((eq reb-re-syntax 'sregex) (apply 'sregex (eval (car (read-from-string re))))) ((eq reb-re-syntax 'rx) (rx-to-string (eval (car (read-from-string re))))) -- In general, we reserve the right to have a poor memory--the computer, however, is supposed to remember! Poor computer. -- Guy Lewis Steele Jr. --00c09f899a4d5add620473098067 Content-Type: application/octet-stream; name="re-builder.el.diff" Content-Disposition: attachment; filename="re-builder.el.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fzc53y4h0 LS0tIHJlLWJ1aWxkZXIuZWwJMDggU2VwIDIwMDkgMDA6MTY6MTEgLTA0MDAJMS40NworKysgcmUt YnVpbGRlci5lbAkwOCBTZXAgMjAwOSAwMDoxODo0MSAtMDQwMAkKQEAgLTYxLDE0ICs2MSwxMiBA QAogOzsgdGhpcyBsaW1pdCBhbGxvd2luZyBhbiBlYXN5IHdheSB0byBzZWUgYWxsIG1hdGNoZXMu CiAKIDs7IEN1cnJlbnRseSBgcmUtYnVpbGRlcicgdW5kZXJzdGFuZHMgZml2ZSBkaWZmZXJlbnQg Zm9ybXMgb2YgaW5wdXQsCi07OyBuYW1lbHkgYHJlYWQnLCBgc3RyaW5nJywgYHJ4JywgYHNyZWdl eCcgYW5kIGBsaXNwLXJlJyBzeW50YXguICBSZWFkCis7OyBuYW1lbHkgYHJlYWQnLCBgc3RyaW5n JywgYHJ4JywgYW5kIGBzcmVnZXgnIHN5bnRheC4gIFJlYWQKIDs7IHN5bnRheCBhbmQgc3RyaW5n IHN5bnRheCBhcmUgYm90aCBkZWxpbWl0ZWQgYnkgYCIncyBhbmQgYmVoYXZlCiA7OyBhY2NvcmRp bmcgdG8gdGhlaXIgbmFtZS4gIFdpdGggdGhlIGBzdHJpbmcnIHN5bnRheCB0aGVyZSdzIG5vIG5l ZWQKIDs7IHRvIGVzY2FwZSB0aGUgYmFja3NsYXNoZXMgYW5kIGRvdWJsZSBxdW90ZXMgc2ltcGxp ZnlpbmcgdGhlIGVkaXRpbmcKIDs7IHNvbWV3aGF0LiAgVGhlIG90aGVyIHRocmVlIGFsbG93IGVk aXRpbmcgb2Ygc3ltYm9saWMgcmVndWxhcgotOzsgZXhwcmVzc2lvbnMgc3VwcG9ydGVkIGJ5IHRo ZSBwYWNrYWdlcyBvZiB0aGUgc2FtZSBuYW1lLiAgKGBsaXNwLXJlJwotOzsgaXMgYSBwYWNrYWdl IGJ5IG1lIGFuZCBpdHMgc3VwcG9ydCBtYXkgZ28gYXdheSBhcyBpdCBpcyBuZWFybHkgdGhlCi07 OyBzYW1lIGFzIHRoZSBgc3JlZ2V4JyBwYWNrYWdlIGluIEVtYWNzKQorOzsgZXhwcmVzc2lvbnMg c3VwcG9ydGVkIGJ5IHRoZSBwYWNrYWdlcyBvZiB0aGUgc2FtZSBuYW1lLgogCiA7OyBFZGl0aW5n IHN5bWJvbGljIGV4cHJlc3Npb25zIGlzIGRvbmUgdGhyb3VnaCBhIG1ham9yIG1vZGUgZGVyaXZl ZAogOzsgZnJvbSBgZW1hY3MtbGlzcC1tb2RlJyBzbyB5b3UnbGwgZ2V0IGFsbCB0aGUgZ29vZCBz dHVmZiBsaWtlCkBAIC0xMjgsMTIgKzEyNiwxMSBAQAogCiAoZGVmY3VzdG9tIHJlYi1yZS1zeW50 YXggJ3JlYWQKICAgIlN5bnRheCBmb3IgdGhlIFJFcyBpbiB0aGUgUkUgQnVpbGRlci4KLUNhbiBl aXRoZXIgYmUgYHJlYWQnLCBgc3RyaW5nJywgYHNyZWdleCcsIGBsaXNwLXJlJywgYHJ4Jy4iCitD YW4gZWl0aGVyIGJlIGByZWFkJywgYHN0cmluZycsIGBzcmVnZXgnLCBgcngnLiIKICAgOmdyb3Vw ICdyZS1idWlsZGVyCiAgIDp0eXBlICcoY2hvaWNlIChjb25zdCA6dGFnICJSZWFkIHN5bnRheCIg cmVhZCkKIAkJIChjb25zdCA6dGFnICJTdHJpbmcgc3ludGF4IiBzdHJpbmcpCiAJCSAoY29uc3Qg OnRhZyAiYHNyZWdleCcgc3ludGF4IiBzcmVnZXgpCi0JCSAoY29uc3QgOnRhZyAiYGxpc3AtcmUn IHN5bnRheCIgbGlzcC1yZSkKIAkJIChjb25zdCA6dGFnICJgcngnIHN5bnRheCIgcngpKSkKIAog KGRlZmN1c3RvbSByZWItYXV0by1tYXRjaC1saW1pdCAyMDAKQEAgLTI4MSw4ICsyNzgsNyBAQAog KGRlZmluZS1kZXJpdmVkLW1vZGUgcmViLWxpc3AtbW9kZQogICBlbWFjcy1saXNwLW1vZGUgIlJF IEJ1aWxkZXIgTGlzcCIKICAgIk1ham9yIG1vZGUgZm9yIGludGVyYWN0aXZlbHkgYnVpbGRpbmcg c3ltYm9saWMgUmVndWxhciBFeHByZXNzaW9ucy4iCi0gIChjb25kICgoZXEgcmViLXJlLXN5bnRh eCAnbGlzcC1yZSkJOyBQdWxsIGluIHBhY2thZ2VzCi0JIChyZXF1aXJlICdsaXNwLXJlKSkJCTsg YXMgbmVlZGVkCisgIChjb25kCQkJCQk7IFB1bGwgaW4gcGFja2FnZXMgYXMgbmVlZGVkCiAJKChl cSByZWItcmUtc3ludGF4ICdzcmVnZXgpCTsgc3JlZ2V4IGlzIG5vdCBhdXRvbG9hZGVkCiAJIChy ZXF1aXJlICdzcmVnZXgpKQkJOyByaWdodCBub3cuLgogCSgoZXEgcmViLXJlLXN5bnRheCAncngp CQk7IHJ4LXRvLXN0cmluZyBpcyBhdXRvbG9hZGVkCkBAIC0zMjksNyArMzI1LDcgQEAKIAogKGRl ZnN1YnN0IHJlYi1saXNwLXN5bnRheC1wICgpCiAgICJSZXR1cm4gbm9uLW5pbCBpZiBSRSBCdWls ZGVyIHVzZXMgYSBMaXNwIHN5bnRheC4iCi0gIChtZW1xIHJlYi1yZS1zeW50YXggJyhsaXNwLXJl IHNyZWdleCByeCkpKQorICAobWVtcSByZWItcmUtc3ludGF4ICcoc3JlZ2V4IHJ4KSkpCiAKIChk ZWZtYWNybyByZWItdGFyZ2V0LWJpbmRpbmcgKHN5bWJvbCkKICAgIlJldHVybiBiaW5kaW5nIGZv ciBTWU1CT0wgaW4gdGhlIFJFIEJ1aWxkZXIgdGFyZ2V0IGJ1ZmZlci4iCkBAIC00ODksMTAgKzQ4 NSwxMCBAQAogICAgKGxpc3QgKGludGVybgogCSAgKGNvbXBsZXRpbmctcmVhZCAiU2VsZWN0IHN5 bnRheDogIgogCQkJICAgKG1hcGNhciAobGFtYmRhIChlbCkgKGNvbnMgKHN5bWJvbC1uYW1lIGVs KSAxKSkKLQkJCQkgICAnKHJlYWQgc3RyaW5nIGxpc3AtcmUgc3JlZ2V4IHJ4KSkKKwkJCQkgICAn KHJlYWQgc3RyaW5nIHNyZWdleCByeCkpCiAJCQkgICBuaWwgdCAoc3ltYm9sLW5hbWUgcmViLXJl LXN5bnRheCkpKSkpCiAKLSAgKGlmIChtZW1xIHN5bnRheCAnKHJlYWQgc3RyaW5nIGxpc3AtcmUg c3JlZ2V4IHJ4KSkKKyAgKGlmIChtZW1xIHN5bnRheCAnKHJlYWQgc3RyaW5nIHNyZWdleCByeCkp CiAgICAgICAobGV0ICgoYnVmZmVyIChnZXQtYnVmZmVyIHJlYi1idWZmZXIpKSkKIAkoc2V0cSBy ZWItcmUtc3ludGF4IHN5bnRheCkKIAkod2hlbiBidWZmZXIKQEAgLTYxNiwxMCArNjEyLDcgQEAK IAogKGRlZnVuIHJlYi1jb29rLXJlZ2V4cCAocmUpCiAgICJSZXR1cm4gUkUgYWZ0ZXIgcHJvY2Vz c2luZyBpdCBhY2NvcmRpbmcgdG8gYHJlYi1yZS1zeW50YXgnLiIKLSAgKGNvbmQgKChlcSByZWIt cmUtc3ludGF4ICdsaXNwLXJlKQotCSAod2hlbiAoZmJvdW5kcCAnbHJlLWNvbXBpbGUtc3RyaW5n KQotCSAgIChscmUtY29tcGlsZS1zdHJpbmcgKGV2YWwgKGNhciAocmVhZC1mcm9tLXN0cmluZyBy ZSkpKSkpKQotCSgoZXEgcmViLXJlLXN5bnRheCAnc3JlZ2V4KQorICAoY29uZCAoKGVxIHJlYi1y ZS1zeW50YXggJ3NyZWdleCkKIAkgKGFwcGx5ICdzcmVnZXggKGV2YWwgKGNhciAocmVhZC1mcm9t LXN0cmluZyByZSkpKSkpCiAJKChlcSByZWItcmUtc3ludGF4ICdyeCkKIAkgKHJ4LXRvLXN0cmlu ZyAoZXZhbCAoY2FyIChyZWFkLWZyb20tc3RyaW5nIHJlKSkpKSkK --00c09f899a4d5add620473098067--