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#259: delphi-mode does not properly format interface definitions Date: Fri, 16 May 2008 12:16:00 -0400 Message-ID: <482DB340.3050405@slowcomputing.org> Reply-To: Simon South , 259@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 1210971136 16674 80.91.229.12 (16 May 2008 20:52:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 May 2008 20:52:16 +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:52:53 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 1Jx6uE-0004PC-Ae for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 May 2008 22:51:58 +0200 Original-Received: from localhost ([127.0.0.1]:44131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx6tV-0003Q3-0J for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 May 2008 16:51:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jx2qO-00068K-9O for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:31:44 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jx2qN-00067r-OO for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:31:43 -0400 Original-Received: from [199.232.76.173] (port=58121 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx2qN-00067g-FB for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:31:43 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:39893) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jx2qM-0003zT-OT for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:31:43 -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 m4GGVeoL004482; Fri, 16 May 2008 09:31:41 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m4GGP4cX031116; Fri, 16 May 2008 09:25: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:25:03 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 259 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.121095457925412 (code B ref -1); Fri, 16 May 2008 16:25:03 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 16 May 2008 16:16:19 +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 m4GGGBn3025406 for ; Fri, 16 May 2008 09:16:13 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jx2bL-0008B3-AE for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:16:11 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jx2bJ-00088f-Gs for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:16:10 -0400 Original-Received: from [199.232.76.173] (port=50484 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jx2bJ-00088X-6J for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:16:09 -0400 Original-Received: from sd-green-bigip-81.dreamhost.com ([208.97.132.81]:59400 helo=postalmail-a5.g.dreamhost.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jx2bH-0000jW-Td for bug-gnu-emacs@gnu.org; Fri, 16 May 2008 12:16:08 -0400 Original-Received: from [192.168.30.235] (unknown [24.244.216.58]) by postalmail-a5.g.dreamhost.com (Postfix) with ESMTP id 56036BF2A9 for ; Fri, 16 May 2008 09:16:02 -0700 (PDT) User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) 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:31:43 -0400 X-Mailman-Approved-At: Fri, 16 May 2008 16:51:01 -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:18025 Archived-At: delphi-mode doesn't properly indent interface definition, things like this: type IHelloWorld = interface(IInvokable) ['{D613A992-AB12-0978-80D1-02B40DF72551}'] function HelloWorld: String; stdcall; end; This is because it doesn't distinguish between the "interface" keyword used as a unit separator (i.e., as opposed to "implementation") and used like a class declaration, as above. As a result, delphi-mode will incorrectly indent the above code this way: type IHelloWorld = interface(IInvokable) ['{D613A992-AB12-0978-80D1-02B40DF72551}'] function HelloWorld: String; stdcall; end; I've taken a stab at updating delphi.el to distinguish between these cases and support "dispinterface" properly as well (patch below) but I don't understand the existing code well enough yet to finish it. (I suspect more changes need to be made to the delphi-enclosing-indent-of function.) Perhaps someone more familiar with this sort of thing could help me complete it? In GNU Emacs 22.1.1 (i386-mingw-nt5.1.2600) of 2007-06-02 on RELEASE Windowing system distributor `Microsoft Corp.', version 5.1.2600 configured using `configure --with-gcc (3.4) --cflags -Ic:/gnuwin32/include' *** delphi.el.orig Thu May 15 17:57:29 2008 --- delphi.el Fri May 16 12:07:37 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,1475 ---- ;; 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))) ! 1) ! 0) ((delphi-is token-kind delphi-comments) ;; In a comment.