annotate lisp/progmodes/cfengine.el @ 110523:a5ad4f188e19

Synch Semantic to CEDET 1.0. Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog. * semantic.el (semantic-version): Update to 2.0. (semantic-mode-map): Add "," and "m" bindings. (navigate-menu): Update. * semantic/symref.el (semantic-symref-calculate-rootdir): New function. (semantic-symref-detect-symref-tool): Use it. * semantic/symref/grep.el (semantic-symref-grep-shell): New var. (semantic-symref-perform-search): Use it. Calculate root dir with semantic-symref-calculate-rootdir. (semantic-symref-derive-find-filepatterns): Improve error message. * semantic/symref/list.el (semantic-symref-results-mode-map): New bindings. (semantic-symref-auto-expand-results): New option. (semantic-symref-results-dump): Obey auto-expand. (semantic-symref-list-expand-all, semantic-symref-regexp) (semantic-symref-list-contract-all) (semantic-symref-list-map-open-hits) (semantic-symref-list-update-open-hits) (semantic-symref-list-create-macro-on-open-hit) (semantic-symref-list-call-macro-on-open-hits): New functions. (semantic-symref-list-menu-entries) (semantic-symref-list-menu): New vars. (semantic-symref-list-map-open-hits): Move cursor to beginning of match before calling the mapped function. * semantic/doc.el (semantic-documentation-comment-preceeding-tag): Do nothing if the mode doesn't provide comment-start-skip. * semantic/scope.el (semantic-analyze-scope-nested-tags-default): Strip duplicates. (semantic-analyze-scoped-inherited-tag-map): Take the tag we are looking for as part of the scoped tags list. * semantic/html.el (semantic-default-html-setup): Add senator-step-at-tag-classes. * semantic/decorate/include.el (semantic-decoration-on-unknown-includes): Change light bgcolor. (semantic-decoration-on-includes-highlight-default): Check that the include tag has a postion. * semantic/complete.el (semantic-collector-local-members): (semantic-complete-read-tag-local-members) (semantic-complete-jump-local-members): New class and functions. (semantic-complete-self-insert): Save excursion before completing. * semantic/analyze/complete.el (semantic-analyze-possible-completions-default): If no completions are found, return the raw by-name-only completion list. Add FLAGS arguments. Add support for 'no-tc (type constraint) and 'no-unique, or no stripping duplicates. (semantic-analyze-possible-completions-default): Add FLAGS arg. * semantic/util-modes.el (semantic-stickyfunc-show-only-functions-p): New option. (semantic-stickyfunc-fetch-stickyline): Don't show stickytext for the very first line in a buffer. * semantic/util.el (semantic-hack-search) (semantic-recursive-find-nonterminal-by-name) (semantic-current-tag-interactive): Deleted. (semantic-describe-buffer): Fix expand-nonterminal. Add lex-syntax-mods, type relation separator char, and command separation char. (semantic-sanity-check): Only message if called interactively. * semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the :filename property and the tag position. * semantic/lex-spp.el (semantic-lex-spp-lex-text-string): Add recursion limit. * semantic/imenu.el (semantic-imenu-bucketize-type-members): Make this buffer local, not the obsoleted variable. * semantic/idle.el: Add breadcrumbs support. (semantic-idle-summary-current-symbol-info-default) (semantic-idle-tag-highlight) (semantic-idle-completion-list-default): Use semanticdb-without-unloaded-file-searches for speed, and to conform to the controls that specify if the idle timer is supposed to be parsing unparsed includes. (semantic-idle-symbol-highlight-face) (semantic-idle-symbol-maybe-highlight): Rename from *-summary-*. Callers changed. (semantic-idle-work-parse-neighboring-files-flag): Default to nil. (semantic-idle-work-update-headers-flag): New var. (semantic-idle-work-for-one-buffer): Use it. (semantic-idle-local-symbol-highlight): Rename from semantic-idle-tag-highlight. (semantic-idle-truncate-long-summaries): New option. * semantic/ia.el (semantic-ia-cache) (semantic-ia-get-completions): Deleted. Callers changed. (semantic-ia-show-variants): New command. (semantic-ia-show-doc): If doc is empty, don't make a temp buffer. (semantic-ia-show-summary): If there isn't anything to show, say so. * semantic/grammar.el (semantic-grammar-create-package): Save the buffer even in batch mode. * semantic/fw.el (semanticdb-without-unloaded-file-searches): New macro. * semantic/dep.el (semantic-dependency-find-file-on-path): Fix case dereferencing ede-object when it is a list. * semantic/db-typecache.el (semanticdb-expand-nested-tag) (semanticdb-typecache-faux-namespace): New functions. (semanticdb-typecache-file-tags) (semanticdb-typecache-merge-streams): Use them. (semanticdb-typecache-file-tags): When deriving tags from a file, give the mode a chance to monkey with the tag copy. (semanticdb-typecache-find-default): Wrap find in save-excursion. (semanticdb-typecache-find-by-name-helper): Merge found names down. * semantic/db-global.el (semanticdb-enable-gnu-global-in-buffer): Don't show messages if GNU Global is not available and we don't want to throw an error. * semantic/db-find.el (semanticdb-find-result-nth-in-buffer): When trying to normalize the tag to a buffer, don't error if set-buffer method doesn't exist. * semantic/db-file.el (semanticdb-save-db): Simplify msg. * semantic/db.el (semanticdb-refresh-table): If forcing a refresh on a file not in a buffer, use semantic-find-file-noselect and delete the buffer after use. (semanticdb-current-database-list): When calculating root via hooks, force it through true-filename and skip the list of possible roots. * semantic/ctxt.el (semantic-ctxt-imported-packages): New. * semantic/analyze/debug.el (semantic-analyzer-debug-insert-tag): Reset standard output to current buffer. (semantic-analyzer-debug-global-symbol) (semantic-analyzer-debug-missing-innertype): Change "prefix" to "symbol" in messages. * semantic/analyze/refs.el: (semantic-analyze-refs-impl) (semantic-analyze-refs-proto): When calculating value, make sure the found tag is 'similar' to the originating tag. (semantic--analyze-refs-find-tags-with-parent): Attempt to identify matches via imported symbols of parents. (semantic--analyze-refs-full-lookup-with-parents): Do a deep search during the brute search. * semantic/analyze.el (semantic-analyze-find-tag-sequence-default): Be robust to calculated scopes being nil. * semantic/bovine/c.el (semantic-c-describe-environment): Add project macro symbol array. (semantic-c-parse-lexical-token): Add recursion limit. (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag): New overrides. (semantic-expand-c-tag-namelist): Split a full type from a typedef out to its own tag. (semantic-expand-c-tag-namelist): Do not split out a typedef'd inline type if it is an anonymous type. (semantic-c-reconstitute-token): Use the optional initializers as a clue that some function is probably a constructor. When defining the type of these constructors, split the parent name, and use only the class part, if applicable. * semantic/bovine/c-by.el: * semantic/wisent/python-wy.el: Regenerate.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 18 Sep 2010 22:49:54 -0400
parents 1d1d5d9bd884
children b10051866f51 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
1 ;;; cfengine.el --- mode for editing Cfengine files
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
3 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
68773
dc49655f57ae Update copyright for 2006.
Nick Roberts <nickrob@snap.net.nz>
parents: 64699
diff changeset
4 ;; Free Software Foundation, Inc.
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
5
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
6 ;; Author: Dave Love <fx@gnu.org>
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
7 ;; Keywords: languages
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
8
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
10
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79717
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79717
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79717
diff changeset
14 ;; (at your option) any later version.
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
15
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
20
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 79717
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
23
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
24 ;;; Commentary:
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
25
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
26 ;; Provides support for editing GNU Cfengine files, including
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
27 ;; font-locking, Imenu and indention, but with no special keybindings.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
28
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
29 ;; Possible customization for auto-mode selection:
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
30 ;; (push '(("^cfagent.conf\\'" . cfengine-mode)) auto-mode-alist)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
31 ;; (push '(("^cf\\." . cfengine-mode)) auto-mode-alist)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
32
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
33 ;; This is not the same as the mode written by Rolf Ebert
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
34 ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5. It does
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
35 ;; better fontification and indentation, inter alia.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
36
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
37 ;;; Code:
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
38
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
39 (defgroup cfengine ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
40 "Editing Cfengine files."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
41 :group 'languages)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
42
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
43 (defcustom cfengine-indent 2
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
44 "*Size of a Cfengine indentation step in columns."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
45 :group 'cfengine
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
46 :type 'integer)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
47
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
48 (defcustom cfengine-mode-abbrevs nil
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
49 "Abbrevs for Cfengine mode."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
50 :group 'cfengine
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
51 :type '(repeat (list (string :tag "Name")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
52 (string :tag "Expansion")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
53 (choice :tag "Hook" (const nil) function))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
54
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
55 ;; Taken from the doc for pre-release 2.1.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
56 (eval-and-compile
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
57 (defconst cfengine-actions
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
58 '("acl" "alerts" "binservers" "broadcast" "control" "classes" "copy"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
59 "defaultroute" "disks" "directories" "disable" "editfiles" "files"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
60 "filters" "groups" "homeservers" "ignore" "import" "interfaces"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
61 "links" "mailserver" "methods" "miscmounts" "mountables"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
62 "processes" "packages" "rename" "required" "resolve"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
63 "shellcommands" "tidy" "unmount"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
64 ;; cfservd
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
65 "admit" "grant" "deny")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
66 "List of the action keywords supported by Cfengine.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
67 This includes those for cfservd as well as cfagent."))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
68
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
69 (defvar cfengine-font-lock-keywords
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
70 `(;; Actions.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
71 ;; List the allowed actions explicitly, so that errors are more obvious.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
72 (,(concat "^[ \t]*" (eval-when-compile
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
73 (regexp-opt cfengine-actions t))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
74 ":")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
75 1 font-lock-keyword-face)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
76 ;; Classes.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
77 ("^[ \t]*\\([[:alnum:]_().|!]+\\)::" 1 font-lock-function-name-face)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
78 ;; Variables.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
79 ("$(\\([[:alnum:]_]+\\))" 1 font-lock-variable-name-face)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
80 ("${\\([[:alnum:]_]+\\)}" 1 font-lock-variable-name-face)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
81 ;; Variable definitions.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
82 ("\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1 font-lock-variable-name-face)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
83 ;; File, acl &c in group: { token ... }
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
84 ("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
85
72799
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
86 (defconst cfengine-font-lock-syntactic-keywords
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
87 ;; In the main syntax-table, backslash is marked as a punctuation, because
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
88 ;; of its use in DOS-style directory separators. Here we try to recognize
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
89 ;; the cases where backslash is used as an escape inside strings.
75047
0e3ea59d0acd (cfengine-font-lock-syntactic-keywords): Fix format of value.
Richard M. Stallman <rms@gnu.org>
parents: 72799
diff changeset
90 '(("\\(\\(?:\\\\\\)+\\)\"" 1 "\\")))
72799
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
91
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
92 (defvar cfengine-imenu-expression
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
93 `((nil ,(concat "^[ \t]*" (eval-when-compile
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
94 (regexp-opt cfengine-actions t))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
95 ":[^:]")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
96 1)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
97 ("Variables/classes" "\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
98 ("Variables/classes" "\\<define=\\([[:alnum:]_]+\\)" 1)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
99 ("Variables/classes" "\\<DefineClass\\>[ \t]+\\([[:alnum:]_]+\\)" 1))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
100 "`imenu-generic-expression' for Cfengine mode.")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
101
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
102 (defun cfengine-outline-level ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
103 "`outline-level' function for Cfengine mode."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
104 (if (looking-at "[^:]+\\(?:[:]+\\)$")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
105 (length (match-string 1))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
106
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
107 (defun cfengine-beginning-of-defun ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
108 "`beginning-of-defun' function for Cfengine mode.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
109 Treats actions as defuns."
55239
1af59a842b93 (cfengine-beginning-of-defun, cfengine-end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54460
diff changeset
110 (unless (<= (current-column) (current-indentation))
1af59a842b93 (cfengine-beginning-of-defun, cfengine-end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54460
diff changeset
111 (end-of-line))
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
112 (if (re-search-backward "^[[:alpha:]]+: *$" nil t)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
113 (beginning-of-line)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
114 (goto-char (point-min)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
115 t)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
116
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
117 (defun cfengine-end-of-defun ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
118 "`end-of-defun' function for Cfengine mode.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
119 Treats actions as defuns."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
120 (end-of-line)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
121 (if (re-search-forward "^[[:alpha:]]+: *$" nil t)
55239
1af59a842b93 (cfengine-beginning-of-defun, cfengine-end-of-defun):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54460
diff changeset
122 (beginning-of-line)
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
123 (goto-char (point-max)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
124 t)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
125
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
126 ;; Fixme: Should get an extra indent step in editfiles BeginGroup...s.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
127
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
128 (defun cfengine-indent-line ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
129 "Indent a line in Cfengine mode.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
130 Intended as the value of `indent-line-function'."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
131 (let ((pos (- (point-max) (point))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
132 (save-restriction
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
133 (narrow-to-defun)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
134 (back-to-indentation)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
135 (cond
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
136 ;; Action selectors aren't indented; class selectors are
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
137 ;; indented one step.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
138 ((looking-at "[[:alnum:]_().|!]+:\\(:\\)?")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
139 (if (match-string 1)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
140 (indent-line-to cfengine-indent)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
141 (indent-line-to 0)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
142 ;; Outdent leading close brackets one step.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
143 ((or (eq ?\} (char-after))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
144 (eq ?\) (char-after)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
145 (condition-case ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
146 (indent-line-to (save-excursion
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
147 (forward-char)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
148 (backward-sexp)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
149 (current-column)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
150 (error nil)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
151 ;; Inside brackets/parens: indent to start column of non-comment
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
152 ;; token on line following open bracket or by one step from open
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
153 ;; bracket's column.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
154 ((condition-case ()
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
155 (progn (indent-line-to (save-excursion
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
156 (backward-up-list)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
157 (forward-char)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
158 (skip-chars-forward " \t")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
159 (if (looking-at "[^\n#]")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
160 (current-column)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
161 (skip-chars-backward " \t")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
162 (+ (current-column) -1
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
163 cfengine-indent))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
164 t)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
165 (error nil)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
166 ;; Indent by two steps after a class selector.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
167 ((save-excursion
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
168 (re-search-backward "^[ \t]*[[:alnum:]_().|!]+::" nil t))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
169 (indent-line-to (* 2 cfengine-indent)))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
170 ;; Indent by one step if we're after an action header.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
171 ((save-excursion
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
172 (goto-char (point-min))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
173 (looking-at "[[:alpha:]]+:[ \t]*$"))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
174 (indent-line-to cfengine-indent))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
175 ;; Else don't indent.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
176 (t
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
177 (indent-line-to 0))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
178 ;; If initial point was within line's indentation,
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
179 ;; position after the indentation. Else stay at same point in text.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
180 (if (> (- (point-max) pos) (point))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
181 (goto-char (- (point-max) pos)))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
182
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59241
diff changeset
183 ;; This doesn't work too well in Emacs 21.2. See 22.1 development
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
184 ;; code.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
185 (defun cfengine-fill-paragraph (&optional justify)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
186 "Fill `paragraphs' in Cfengine code."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
187 (interactive "P")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
188 (or (if (fboundp 'fill-comment-paragraph)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
189 (fill-comment-paragraph justify) ; post Emacs 21.3
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
190 ;; else do nothing in a comment
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
191 (nth 4 (parse-partial-sexp (save-excursion
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
192 (beginning-of-defun)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
193 (point))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
194 (point))))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
195 (let ((paragraph-start
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
196 ;; Include start of parenthesized block.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
197 "\f\\|[ \t]*$\\|.*\(")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
198 (paragraph-separate
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
199 ;; Include action and class lines, start and end of
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
200 ;; bracketed blocks and end of parenthesized blocks to
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
201 ;; avoid including these in fill. This isn't ideal.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
202 "[ \t\f]*$\\|.*#\\|.*[\){}]\\|\\s-*[[:alpha:]_().|!]+:")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
203 fill-paragraph-function)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
204 (fill-paragraph justify))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
205 t))
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
206
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
207 ;;;###autoload
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
208 (define-derived-mode cfengine-mode fundamental-mode "Cfengine"
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
209 "Major mode for editing cfengine input.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
210 There are no special keybindings by default.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
211
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
212 Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
213 to the action header."
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
214 (modify-syntax-entry ?# "<" cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
215 (modify-syntax-entry ?\n ">#" cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
216 ;; Shell commands can be quoted by single, double or back quotes.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
217 ;; It's debatable whether we should define string syntax, but it
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
218 ;; should avoid potential confusion in some cases.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
219 (modify-syntax-entry ?\" "\"" cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
220 (modify-syntax-entry ?\' "\"" cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
221 (modify-syntax-entry ?\` "\"" cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
222 ;; variable substitution:
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
223 (modify-syntax-entry ?$ "." cfengine-mode-syntax-table)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
224 ;; Doze path separators:
72799
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
225 (modify-syntax-entry ?\\ "." cfengine-mode-syntax-table)
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
226 ;; Otherwise, syntax defaults seem OK to give reasonable word
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
227 ;; movement.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
228
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
229 (set (make-local-variable 'parens-require-spaces) nil)
59241
685fd8697e78 (cfengine-mode): Use mode-require-final-newline.
Richard M. Stallman <rms@gnu.org>
parents: 55239
diff changeset
230 (set (make-local-variable 'require-final-newline) mode-require-final-newline)
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
231 (set (make-local-variable 'comment-start) "# ")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
232 (set (make-local-variable 'comment-start-skip)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
233 "\\(\\(?:^\\|[^\\\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
234 (set (make-local-variable 'indent-line-function) #'cfengine-indent-line)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
235 (set (make-local-variable 'outline-regexp) "[ \t]*\\(\\sw\\|\\s_\\)+:+")
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
236 (set (make-local-variable 'outline-level) #'cfengine-outline-level)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
237 (set (make-local-variable 'fill-paragraph-function)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
238 #'cfengine-fill-paragraph)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
239 (define-abbrev-table 'cfengine-mode-abbrev-table cfengine-mode-abbrevs)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
240 ;; Fixme: Use `font-lock-syntactic-keywords' to set the args of
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
241 ;; functions in evaluated classes to string syntax, and then obey
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
242 ;; syntax properties.
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
243 (setq font-lock-defaults
72799
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
244 '(cfengine-font-lock-keywords nil nil nil beginning-of-line
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
245 (font-lock-syntactic-keywords
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
246 . cfengine-font-lock-syntactic-keywords)))
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
247 (setq imenu-generic-expression cfengine-imenu-expression)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
248 (set (make-local-variable 'beginning-of-defun-function)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
249 #'cfengine-beginning-of-defun)
54460
82f7cd1ab4eb (cfengine-mode): Set parse-sexp-ignore-comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 52910
diff changeset
250 (set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun)
82f7cd1ab4eb (cfengine-mode): Set parse-sexp-ignore-comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 52910
diff changeset
251 ;; Like Lisp mode. Without this, we lose with, say,
82f7cd1ab4eb (cfengine-mode): Set parse-sexp-ignore-comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 52910
diff changeset
252 ;; `backward-up-list' when there's an unbalanced quote in a
82f7cd1ab4eb (cfengine-mode): Set parse-sexp-ignore-comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 52910
diff changeset
253 ;; preceding comment.
82f7cd1ab4eb (cfengine-mode): Set parse-sexp-ignore-comments.
Juanma Barranquero <lekktu@gmail.com>
parents: 52910
diff changeset
254 (set (make-local-variable 'parse-sexp-ignore-comments) t))
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
255
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
256 (provide 'cfengine)
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
257
72799
ff69721bef4a (cfengine-font-lock-syntactic-keywords): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68773
diff changeset
258 ;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
52888
bc07c51257ae *** empty log message ***
Dave Love <fx@gnu.org>
parents:
diff changeset
259 ;;; cfengine.el ends here