[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/delphi.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/delphi.el,v |
Date: |
Mon, 01 Sep 2008 17:24:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/09/01 17:24:52
Index: delphi.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/delphi.el,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- delphi.el 6 May 2008 07:18:18 -0000 3.31
+++ delphi.el 1 Sep 2008 17:24:52 -0000 3.32
@@ -3,8 +3,9 @@
;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
;; 2008 Free Software Foundation, Inc.
-;; Author: Ray Blaak <address@hidden>
-;; Maintainer: FSF (Blaak's email addr bounces, Aug 2005)
+;; Authors: Ray Blaak <address@hidden>,
+;; Simon South <address@hidden>
+;; Maintainer: Simon South <address@hidden>
;; Keywords: languages
;; This file is part of GNU Emacs.
@@ -238,10 +239,14 @@
(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 record)
+(defconst delphi-composite-types
+ `(,@delphi-class-types ,@delphi-interface-types record)
"Types that contain declarations within them.")
(defconst delphi-unit-sections
@@ -835,8 +840,9 @@
(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.
+ ;; Returns true (actually the last-token) if the pair equals (= class), (=
+ ;; dispinterface), (= interface), (= object), 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))
@@ -1327,7 +1333,29 @@
delphi-indent-level)))
;; In unit sections we indent right to the left.
- ((delphi-is token-kind delphi-unit-sections) (throw 'done 0))
+ ((delphi-is token-kind delphi-unit-sections)
+ (throw 'done
+ ;; Handle specially the case of "interface", which can be used
+ ;; to start either a unit section or an interface definition.
+ (if (delphi-is token-kind delphi-interface-types)
+ (progn
+ ;; Find the previous non-whitespace token.
+ (while (progn
+ (setq last-token token
+ token (delphi-previous-token token)
+ token-kind (delphi-token-kind token))
+ (and token
+ (delphi-is token-kind
+ delphi-whitespace))))
+ ;; If this token is an equals sign, "interface" is being
+ ;; used to start an interface definition and we should
+ ;; treat it as a composite type; otherwise, we should
+ ;; consider it the start of a unit section.
+ (if (and token (eq token-kind 'equals))
+ (delphi-line-indent-of last-token
+ delphi-indent-level)
+ 0))
+ 0)))
;; A previous terminator means we can stop.
((delphi-is token-kind delphi-previous-terminators)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/delphi.el,v,
Chong Yidong <=