From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Simon South Newsgroups: gmane.emacs.bugs Subject: bug#260: delphi-mode does not properly format interface definitions Date: Fri, 16 May 2008 12:33:23 -0400 Message-ID: <482DB753.7080905@slowcomputing.org> References: <482DB340.3050405@slowcomputing.org> Reply-To: Simon South , 260@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1210971164 16768 80.91.229.12 (16 May 2008 20:52:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 May 2008 20:52:44 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 16 22:53:21 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 1Jx6uP-0004VW-2f for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 May 2008 22:52:09 +0200 Original-Received: from localhost ([127.0.0.1]:44239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx6tf-0003Ue-Ho for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 May 2008 16:51:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jx39l-0007dL-2e for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:51:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jx39j-0007d9-Fo for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:51:43 -0400 Original-Received: from [199.232.76.173] (port=38693 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx39j-0007d6-9n for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:51:43 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:44684) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jx39i-0007on-Es for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:51:42 -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 m4GGpeMx021229; Fri, 16 May 2008 09:51:40 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m4GGe4gJ010669; Fri, 16 May 2008 09:40:04 -0700 X-Loop: don@donarmstrong.com Resent-From: Simon South Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 16 May 2008 16:40:04 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 260 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12109556126157 (code B ref -1); Fri, 16 May 2008 16:40:04 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 16 May 2008 16:33:32 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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) User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) In-Reply-To: <482DB340.3050405@slowcomputing.org> X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Fri, 16 May 2008 12:51:43 -0400 X-Mailman-Approved-At: Fri, 16 May 2008 16:51:08 -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:18026 Archived-At: 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.