From 9414dd8d50cc49464c97a5cb81f38796ff1fbec1 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 6 Oct 2012 22:18:35 +0800 Subject: [PATCH] Move bovine-grammar and wisent-grammar into lisp/ directory. * lisp/files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). * cedet/semantic/bovine/grammar.el: * cedet/semantic/wisent/grammar.el: Move from admin/grammars. Add autoloads for bovine-grammar-mode and wisent-grammar-mode. --- admin/ChangeLog | 5 +++++ lisp/ChangeLog | 4 ++++ lisp/cedet/ChangeLog | 6 ++++++ .../cedet/semantic/bovine/grammar.el | 17 ++++++++--------- .../cedet/semantic/wisent/grammar.el | 14 +++++++------- lisp/files.el | 2 ++ 6 files changed, 32 insertions(+), 16 deletions(-) rename admin/grammars/bovine-grammar.el => lisp/cedet/semantic/bovine/grammar.el (98%) rename admin/grammars/wisent-grammar.el => lisp/cedet/semantic/wisent/grammar.el (99%) diff --git a/admin/ChangeLog b/admin/ChangeLog index 2da65523116..8fe82ca36cb 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2012-10-01 David Engster + + * grammars/bovine-grammar.el: + * grammars/wisent-grammar.el: Move to lisp directory. + 2012-10-01 David Engster * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87b54707e0a..5d93a386a21 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-10-06 Chong Yidong + + * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). + 2012-10-06 Ikumi Keita (tiny change) * international/characters.el: Fix simple mistake ((car chars) -> diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index e066368d011..9e20b4fbb4e 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,9 @@ +2012-10-06 Chong Yidong + + * semantic/bovine/grammar.el: + * semantic/wisent/grammar.el: Move from admin/grammars. Add + autoloads for bovine-grammar-mode and wisent-grammar-mode. + 2012-10-02 Chong Yidong * srecode.el, ede.el: Restore Version header. diff --git a/admin/grammars/bovine-grammar.el b/lisp/cedet/semantic/bovine/grammar.el similarity index 98% rename from admin/grammars/bovine-grammar.el rename to lisp/cedet/semantic/bovine/grammar.el index a7289f6bafe..cc27c5b0646 100644 --- a/admin/grammars/bovine-grammar.el +++ b/lisp/cedet/semantic/bovine/grammar.el @@ -1,4 +1,4 @@ -;;; bovine-grammar.el --- Bovine's input grammar mode +;;; semantic/bovine/grammar.el --- Bovine's input grammar mode ;; ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; @@ -143,7 +143,7 @@ expanded from elsewhere." (setq first (car form) form (cdr form)) ;; Hack for dealing with new reading of unquotes outside of - ;; backquote (introduced in rev. 102591 in emacs-bzr). + ;; backquote (introduced in 2010-12-06T16:37:26Z!monnier@iro.umontreal.ca). (when (and (>= emacs-major-version 24) (listp first) (or (equal (car first) '\,) @@ -413,18 +413,17 @@ manual." "")))) (defvar bovine-grammar-menu - '("BY Grammar" - ) + '("BY Grammar") "BY mode specific grammar menu. Menu items are appended to the common grammar menu.") +;;;###autoload (define-derived-mode bovine-grammar-mode semantic-grammar-mode "BY" "Major mode for editing Bovine grammars." (semantic-grammar-setup-menu bovine-grammar-menu) (semantic-install-function-overrides '((grammar-parsetable-builder . bovine-grammar-parsetable-builder) - (grammar-setupcode-builder . bovine-grammar-setupcode-builder) - ))) + (grammar-setupcode-builder . bovine-grammar-setupcode-builder)))) (add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode)) @@ -444,8 +443,6 @@ Menu items are appended to the common grammar menu.") ) "Semantic grammar macros used in bovine grammars.") -(provide 'semantic/bovine/grammar) - (defun bovine-make-parsers () "Generate Emacs' built-in Bovine-based parser files." (interactive) @@ -504,4 +501,6 @@ Menu items are appended to the common grammar menu.") (replace-match packagename nil nil nil 1) (save-buffer)))))) -;;; bovine-grammar.el ends here +(provide 'semantic/bovine/grammar) + +;;; semantic/bovine/grammar.el ends here diff --git a/admin/grammars/wisent-grammar.el b/lisp/cedet/semantic/wisent/grammar.el similarity index 99% rename from admin/grammars/wisent-grammar.el rename to lisp/cedet/semantic/wisent/grammar.el index 25dba5be2d8..6fa52dc2adc 100644 --- a/admin/grammars/wisent-grammar.el +++ b/lisp/cedet/semantic/wisent/grammar.el @@ -1,4 +1,4 @@ -;;; wisent-grammar.el --- Wisent's input grammar mode +;;; semantic/wisent/grammar.el --- Wisent's input grammar mode ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; @@ -323,15 +323,13 @@ Return the expanded expression." "WY mode specific grammar menu. Menu items are appended to the common grammar menu.") +;;;###autoload (define-derived-mode wisent-grammar-mode semantic-grammar-mode "WY" "Major mode for editing Wisent grammars." (semantic-grammar-setup-menu wisent-grammar-menu) (semantic-install-function-overrides '((grammar-parsetable-builder . wisent-grammar-parsetable-builder) - (grammar-setupcode-builder . wisent-grammar-setupcode-builder) - ))) - -(add-to-list 'auto-mode-alist '("\\.wy\\'" . wisent-grammar-mode)) + (grammar-setupcode-builder . wisent-grammar-setupcode-builder)))) (defvar-mode-local wisent-grammar-mode semantic-grammar-macros '( @@ -498,7 +496,7 @@ Menu items are appended to the common grammar menu.") (insert-file-contents filename) ;; Fix copyright header: (goto-char (point-min)) - (when additional-copyright + (when additional-copyright (re-search-forward "Copyright (C).*$") (insert "\n;; " additional-copyright)) (re-search-forward "^;; Author:") @@ -523,4 +521,6 @@ Menu items are appended to the common grammar menu.") (delete-trailing-whitespace) (write-region nil nil (expand-file-name filename)))))))) -;;; wisent-grammar.el ends here +(provide 'semantic/wisent/grammar) + +;;; semantic/wisent/grammar.el ends here diff --git a/lisp/files.el b/lisp/files.el index c3f9e1ef1a0..e030aff0ae2 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2326,6 +2326,8 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ("\\.js\\'" . javascript-mode) ("\\.json\\'" . javascript-mode) ("\\.[ds]?vh?\\'" . verilog-mode) + ("\\.by\\'" . bovine-grammar-mode) + ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix, MSDOG or VMS syntax. ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) -- 2.39.5