From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: don@donarmstrong.com (Emacs bug Tracking System) Newsgroups: gmane.emacs.bugs Subject: bug#260: marked as done (delphi-mode does not properly format interface definitions) Date: Sat, 17 May 2008 21:20:04 -0700 Message-ID: References: <482DB753.7080905@slowcomputing.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----------=_1211084404-13590-0" X-Trace: ger.gmane.org 1211147401 18567 80.91.229.12 (18 May 2008 21:50:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 18 May 2008 21:50:01 +0000 (UTC) To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 18 23:50:38 2008 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 1Jxqm1-0007PF-Lr for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 May 2008 23:50:34 +0200 Original-Received: from localhost ([127.0.0.1]:43716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JxqlH-0004hS-SD for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 May 2008 17:49:47 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JxaYj-0004tV-VP for bug-gnu-emacs@gnu.org; Sun, 18 May 2008 00:31:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JxaYi-0004sl-Dw for bug-gnu-emacs@gnu.org; Sun, 18 May 2008 00:31:44 -0400 Original-Received: from [199.232.76.173] (port=59427 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JxaYi-0004sg-8P for bug-gnu-emacs@gnu.org; Sun, 18 May 2008 00:31:44 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:34411) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JxaYh-0006I6-Rz for bug-gnu-emacs@gnu.org; Sun, 18 May 2008 00:31:44 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m4I4VfIJ017085; Sat, 17 May 2008 21:31:41 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m4I4K4EH013700; Sat, 17 May 2008 21:20:04 -0700 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com X-Emacs-PR-Message: closed 260 X-Emacs-PR-Package: emacs X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-Mailman-Approved-At: Sun, 18 May 2008 17:49:27 -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:18041 Archived-At: This is a multi-part message in MIME format... ------------=_1211084404-13590-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Your message dated Sun, 18 May 2008 00:11:07 -0400 with message-id and subject line Close has caused the Emacs bug report #260, regarding delphi-mode does not properly format interface definitions to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact don@donarmstrong.com immediately.) --=20 260: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=3D260 Emacs Bug Tracking System Contact don@donarmstrong.com with problems ------------=_1211084404-13590-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-5.0 required=4.0 tests=BAYES_00,MURPHY_DRUGS_REL8, RCVD_IN_DNSWL_LOW autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 16 May 2008 16:33:32 +0000 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m4GGXSEo006151 for ; Fri, 16 May 2008 09:33:29 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jx2s3-0006tQ-VN for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:33:28 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jx2s2-0006rA-Fm for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:33:27 -0400 Received: from [199.232.76.173] (port=58151 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx2s2-0006r0-91 for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:33:26 -0400 Received: from sd-green-bigip-202.dreamhost.com ([208.97.132.202]:40545 helo=postalmail-a6.g.dreamhost.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jx2s1-0004IN-KQ for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:33:25 -0400 Received: from [192.168.30.235] (unknown [24.244.216.58]) by postalmail-a6.g.dreamhost.com (Postfix) with ESMTP id 41F4F88F55 for ; Fri, 16 May 2008 09:33:24 -0700 (PDT) Message-ID: <482DB753.7080905@slowcomputing.org> Date: Fri, 16 May 2008 12:33:23 -0400 From: Simon South User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: Re: delphi-mode does not properly format interface definitions References: <482DB340.3050405@slowcomputing.org> In-Reply-To: <482DB340.3050405@slowcomputing.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 A bug snuck through in my original patch. I've pasted a fixed version below. What the patch does is make delphi-mode indent by default after the "interface" keyword. This works fine for interface definitions and actually works fairly well overall, since the keywords that typically follow "interface" used in the other sense (like "uses" and "type") cancel the indentation and give the intended formatting. However, it fails when "interface" is used as a unit separator and followed by "function" or "procedure", for instance. *** delphi.el.orig Thu May 15 17:57:29 2008 --- delphi.el Fri May 16 12:19:25 2008 *************** *** 262,271 **** (defconst delphi-decl-sections '(type const var label resourcestring) "Denotes the start of a declaration section.") (defconst delphi-class-types '(class object) "Class types.") ! (defconst delphi-composite-types `(,@delphi-class-types record) "Types that contain declarations within them.") (defconst delphi-unit-sections --- 262,275 ---- (defconst delphi-decl-sections '(type const var label resourcestring) "Denotes the start of a declaration section.") + (defconst delphi-interface-types '(dispinterface interface) + "Interface types.") + (defconst delphi-class-types '(class object) "Class types.") ! (defconst delphi-composite-types ! `(,@delphi-class-types ,@delphi-interface-types record) "Types that contain declarations within them.") (defconst delphi-unit-sections *************** *** 859,866 **** (delphi-stmt-line-indent-of token delphi-indent-level)))) (defun delphi-composite-type-start (token last-token) ! ;; Returns true (actually the last-token) if the pair equals (= class) or (= ! ;; record), and nil otherwise. (if (and (eq 'equals (delphi-token-kind token)) (delphi-is (delphi-token-kind last-token) delphi-composite-types)) last-token)) --- 863,870 ---- (delphi-stmt-line-indent-of token delphi-indent-level)))) (defun delphi-composite-type-start (token last-token) ! ;; Returns true (actually the last-token) if the pair equals (= class), (= ! ;; interface), or (= record), and nil otherwise. (if (and (eq 'equals (delphi-token-kind token)) (delphi-is (delphi-token-kind last-token) delphi-composite-types)) last-token)) *************** *** 1252,1258 **** (throw 'done (delphi-line-indent-of token 0))) ;; Unit statements mean we indent right to the left. ! ((delphi-is token-kind delphi-unit-statements) (throw 'done 0)) ) (unless (delphi-is token-kind delphi-whitespace) (setq last-token token)) --- 1256,1264 ---- (throw 'done (delphi-line-indent-of token 0))) ;; Unit statements mean we indent right to the left. ! ((and (delphi-is token-kind delphi-unit-statements) ! (not (delphi-composite-type-start token last-token))) ! (throw 'done 0)) ) (unless (delphi-is token-kind delphi-whitespace) (setq last-token token)) *************** *** 1351,1357 **** delphi-indent-level))) ;; In unit sections we indent right to the left. ! ((delphi-is token-kind delphi-unit-sections) (throw 'done 0)) ;; A previous terminator means we can stop. ((delphi-is token-kind delphi-previous-terminators) --- 1357,1365 ---- delphi-indent-level))) ;; In unit sections we indent right to the left. ! ((and (delphi-is token-kind delphi-unit-sections) ! (not (delphi-is token-kind delphi-interface-types))) ! (throw 'done 0)) ;; A previous terminator means we can stop. ((delphi-is token-kind delphi-previous-terminators) *************** *** 1457,1463 **** ;; Indent to the matching start ( or [. (delphi-indent-of (delphi-group-start token))) ! ((delphi-is token-kind delphi-unit-statements) 0) ((delphi-is token-kind delphi-comments) ;; In a comment. --- 1465,1474 ---- ;; Indent to the matching start ( or [. (delphi-indent-of (delphi-group-start token))) ! ((and (delphi-is token-kind delphi-unit-statements) ! (not ! (delphi-is token-kind delphi-interface-types))) ! 0) ((delphi-is token-kind delphi-comments) ;; In a comment. ------------=_1211084404-13590-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: * X-Spam-Status: No, score=1.7 required=4.0 tests=AWL,BAYES_00,HELO_LH_HOME, ONEWORD,RDNS_DYNAMIC autolearn=no version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 260-done) by emacsbugs.donarmstrong.com; 18 May 2008 04:11:10 +0000 Received: from ceviche.home (206-248-170-48.dsl.teksavvy.com [206.248.170.48]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m4I4B7NK012354 for <260-done@emacsbugs.donarmstrong.com>; Sat, 17 May 2008 21:11:08 -0700 Received: by ceviche.home (Postfix, from userid 20848) id 416B7B41C9; Sun, 18 May 2008 00:11:07 -0400 (EDT) From: Stefan Monnier To: 260-done@emacsbugs.donarmstrong.com Subject: Close Message-ID: Date: Sun, 18 May 2008 00:11:07 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Duplicate of 259 ------------=_1211084404-13590-0--