mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-21 03:52:16 -08:00
Remove a few more redundant `:group` args. Make use of lexical scoping to replace `(lambda...) with proper closures. * lisp/cedet/ede/custom.el (ede-project-sort-targets-list): Use `dotimes` and replace `(lambda..) with closures. * lisp/cedet/ede/proj-comp.el (proj-comp-insert-variable-once): * lisp/cedet/ede/pmake.el (ede-pmake-insert-variable-once): Remove unused var `addcr`. * lisp/cedet/semantic/complete.el: Use lexical-binding. (semantic-displayer-show-request): Remove unused var `typing-count`. Use `equal` instead of `stringp+string=`. * lisp/cedet/semantic/db-ebrowse.el: Use lexical-binding. (semanticdb-create-ebrowse-database): Remove unused vars `mma` and `regexp`. (semanticdb-ebrowse-strip-trees): Remove unused var `class` and `filename`. (semanticdb-ebrowse-add-globals-to-table): Remove unused var `fname`. * lisp/cedet/semantic/db-find.el: Use lexical-binding. (semanticdb-find-adebug-insert-scanned-tag-cons): Remove always-nil var `tip`. * lisp/cedet/semantic/db-global.el: Use lexical-binding. (semanticdb-enable-gnu-global-databases): Access local var `semantic--ih` by sticking its value in the code passed to `eval` rather than by dynamic scoping. * lisp/cedet/semantic/db-typecache.el: Use lexical-binding. (semanticdb-db-typecache-dump): Remove unused var `junk`. * lisp/cedet/semantic/debug.el: Use lexical-binding. * lisp/cedet/semantic/dep.el: Use lexical-binding. (semantic-add-system-include): Avoid `add-to-list` on a local variable. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-remove-system-include): Don't use `delete` on a list received from elsewhere. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-reset-system-include): Simplify a bit. * lisp/cedet/semantic/ede-grammar.el: Use lexical-binding. (project-compile-target): Remove unused vars `csrc` and `cb`. Use `cl-incf`. Remove apparently unneeded `with-no-warnings`. * lisp/cedet/semantic/edit.el: Use lexical-binding. (semantic-edits-change-over-tags): Remove unused var `inner-start`. (semantic-edits-incremental-parser-1): Silence warnings about intentionally unused var `last-cond`. * lisp/cedet/semantic/fw.el: Use lexical-binding. (recentf-exclude, semantic-init-hook, ede-auto-add-method) (flymake-start-syntax-check-on-find-file, auto-insert): Declare vars. * lisp/cedet/semantic/ia-sb.el: Use lexical-binding. (semantic-ia-sb-key-map): Move initialization into declaration. (semantic-ia-sb-more-buttons): Remove unused var `idx`. (semantic-ia-sb-line-path): Simplify `if` -> `or`. * lisp/cedet/semantic/idle.el (semantic-idle-breadcrumbs--tag-function): Make it a function returning a closure. * lisp/cedet/semantic/senator.el: Use lexical-binding. (senator-search-set-tag-class-filter): Replace `(lambda..) with a closure. * lisp/cedet/semantic/sort.el: Use lexical-binding. (semanticdb-search-system-databases): Declare var. (semantic-tag-external-member-children-default): Replace `(lambda..) with a closure. * lisp/cedet/semantic/tag-ls.el: Use lexical-binding. (semantic-tag-protection-default, semantic-tag-abstract-p-default): Simplify with `member`. * lisp/cedet/semantic/util.el: Use lexical-binding. (semantic-something-to-tag-table): Declare function `semanticdb-abstract-table--eieio-childp` called via `cl-typep`. * lisp/cedet/semantic/bovine/scm.el (semantic-default-scheme-setup): Remove duplicate setting of `imenu-create-index-function`. * lisp/cedet/semantic/decorate/mode.el (semantic-decoration-build-style-menu): Replace `(lambda..) with a closure. * lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict): Remove always-t variable `member`. * lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu): Replace `(lambda..) with a closure. Use `push`. * lisp/cedet/semantic/chart.el: Use lexical-binding. * lisp/cedet/semantic/db-debug.el: Use lexical-binding. * lisp/cedet/semantic/db-el.el: Use lexical-binding. * lisp/cedet/semantic/db-file.el: Use lexical-binding. * lisp/cedet/semantic/db-javascript.el: Use lexical-binding. * lisp/cedet/semantic/db-mode.el: Use lexical-binding. * lisp/cedet/semantic/db-ref.el: Use lexical-binding. * lisp/cedet/semantic/decorate.el: Use lexical-binding. * lisp/cedet/semantic/doc.el: Use lexical-binding. * lisp/cedet/semantic/find.el: Use lexical-binding. * lisp/cedet/semantic/format.el: Use lexical-binding. * lisp/cedet/semantic/html.el: Use lexical-binding. * lisp/cedet/semantic/ia.el: Use lexical-binding. * lisp/cedet/semantic/imenu.el: Use lexical-binding. * lisp/cedet/semantic/java.el: Use lexical-binding. * lisp/cedet/semantic/mru-bookmark.el: Use lexical-binding. * lisp/cedet/semantic/symref.el: Use lexical-binding. * lisp/cedet/semantic/tag-file.el: Use lexical-binding. * lisp/cedet/semantic/tag-write.el: Use lexical-binding. * lisp/cedet/semantic/texi.el: Use lexical-binding. * lisp/cedet/semantic/util-modes.el: Use lexical-binding.
203 lines
7.6 KiB
EmacsLisp
203 lines
7.6 KiB
EmacsLisp
;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2003-2004, 2007-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Keywords: project, make
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Handle .by or .wy files.
|
|
|
|
(require 'semantic)
|
|
(require 'ede/proj)
|
|
(require 'ede/pmake)
|
|
(require 'ede/pconf)
|
|
(require 'ede/proj-elisp)
|
|
(require 'semantic/grammar)
|
|
(eval-when-compile (require 'cl-lib))
|
|
|
|
;;; Code:
|
|
(defclass semantic-ede-proj-target-grammar (ede-proj-target-elisp)
|
|
((menu :initform nil)
|
|
(keybindings :initform nil)
|
|
(phony :initform t)
|
|
(sourcetype :initform
|
|
(semantic-ede-source-grammar-wisent
|
|
semantic-ede-source-grammar-bovine
|
|
))
|
|
(availablecompilers :initform
|
|
(semantic-ede-grammar-compiler-wisent
|
|
semantic-ede-grammar-compiler-bovine
|
|
))
|
|
(aux-packages :initform '("semantic" "cedet-compat"))
|
|
(pre-load-packages :initform '("cedet-compat" "semantic/grammar" "semantic/bovine/grammar" "semantic/wisent/grammar"))
|
|
)
|
|
"This target consists of a group of grammar files.
|
|
A grammar target consists of grammar files that build Emacs Lisp programs for
|
|
parsing different languages.")
|
|
|
|
(cl-defmethod ede-proj-makefile-dependencies ((this semantic-ede-proj-target-grammar))
|
|
"Return a string representing the dependencies for THIS.
|
|
Some compilers only use the first element in the dependencies, others
|
|
have a list of intermediates (object files), and others don't care.
|
|
This allows customization of how these elements appear.
|
|
For Emacs Lisp, return addsuffix command on source files."
|
|
(let ((source (car (oref this source))))
|
|
(cond
|
|
((string-match "\\.wy$" source)
|
|
(format "$(addsuffix -wy.elc, $(basename $(%s)))"
|
|
(ede-proj-makefile-sourcevar this)))
|
|
((string-match "\\.by$" source)
|
|
(format "$(addsuffix -by.elc, $(basename $(%s)))"
|
|
(ede-proj-makefile-sourcevar this))))))
|
|
|
|
(defvar semantic-ede-source-grammar-wisent
|
|
(ede-sourcecode :name "Wisent Grammar"
|
|
:sourcepattern "\\.wy$"
|
|
:garbagepattern '("*-wy.el")
|
|
)
|
|
"Semantic Grammar source code definition for wisent.")
|
|
|
|
(defclass semantic-ede-grammar-compiler-class (ede-compiler)
|
|
nil
|
|
"Specialized compiler for semantic grammars.")
|
|
|
|
(defvar semantic-ede-grammar-compiler-wisent
|
|
(semantic-ede-grammar-compiler-class
|
|
:name "emacs"
|
|
:variables '(("EMACS" . "emacs")
|
|
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'")
|
|
("require" . "$(foreach r,$(1),(require (quote $(r))))"))
|
|
:rules (list (ede-makefile-rule
|
|
:target "%-wy.el"
|
|
:dependencies "%.wy"
|
|
:rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
|
|
--eval '(progn $(call require,$(PRELOADS)))' -f semantic-grammar-batch-build-packages $^")))
|
|
:sourcetype '(semantic-ede-source-grammar-wisent)
|
|
:objectextention "-wy.el"
|
|
)
|
|
"Compile Emacs Lisp programs.")
|
|
|
|
|
|
(defvar semantic-ede-source-grammar-bovine
|
|
(ede-sourcecode :name "Bovine Grammar"
|
|
:sourcepattern "\\.by$"
|
|
:garbagepattern '("*-by.el")
|
|
)
|
|
"Semantic Grammar source code definition for the bovinator.")
|
|
|
|
(defvar semantic-ede-grammar-compiler-bovine
|
|
(semantic-ede-grammar-compiler-class
|
|
:name "emacs"
|
|
:variables '(("EMACS" . "emacs")
|
|
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq debug-on-error t)'")
|
|
("require" . "$(foreach r,$(1),(require (quote $(r))))"))
|
|
:rules (list (ede-makefile-rule
|
|
:target "%-by.el"
|
|
:dependencies "%.by"
|
|
:rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
|
|
--eval '(progn $(call require,$(PRELOADS)))' -f semantic-grammar-batch-build-packages $^")))
|
|
:sourcetype '(semantic-ede-source-grammar-bovine)
|
|
:objectextention "-by.el"
|
|
)
|
|
"Compile Emacs Lisp programs.")
|
|
|
|
;;; Target options.
|
|
(cl-defmethod ede-buffer-mine ((_this semantic-ede-proj-target-grammar) buffer)
|
|
"Return t if object THIS lays claim to the file in BUFFER.
|
|
Lays claim to all -by.el, and -wy.el files."
|
|
;; We need to be a little more careful than this, but at the moment it
|
|
;; is common to have only one target of this class per directory.
|
|
(if (string-match "-[bw]y\\.elc?$" (buffer-file-name buffer))
|
|
t
|
|
(cl-call-next-method) ; The usual thing.
|
|
))
|
|
|
|
(cl-defmethod project-compile-target ((obj semantic-ede-proj-target-grammar))
|
|
"Compile all sources in a Lisp target OBJ."
|
|
(let* (;; (cb (current-buffer))
|
|
(proj (ede-target-parent obj))
|
|
(default-directory (oref proj directory))
|
|
(comp 0)
|
|
(utd 0))
|
|
(mapc (lambda (src)
|
|
(with-current-buffer (find-file-noselect src)
|
|
(let* ((package (semantic-grammar-create-package))
|
|
(fname (progn (string-match ".*/\\(.+\\.el\\)" package)
|
|
(match-string 1 package)))
|
|
(src (ede-expand-filename obj fname))
|
|
;; (csrc (concat (file-name-sans-extension src) ".elc"))
|
|
)
|
|
(cl-incf (if (eq (byte-recompile-file src nil 0) t)
|
|
comp utd)))))
|
|
(oref obj source))
|
|
(message "All Semantic Grammar sources are up to date in %s" (eieio-object-name obj))
|
|
(cons comp utd)))
|
|
|
|
;;; Makefile generation functions
|
|
;;
|
|
(cl-defmethod ede-proj-makefile-sourcevar ((this semantic-ede-proj-target-grammar))
|
|
"Return the variable name for THIS's sources."
|
|
(cond ((ede-proj-automake-p)
|
|
(error "No Automake support for Semantic Grammars"))
|
|
(t (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR"))))
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-variables :after ((this semantic-ede-proj-target-grammar))
|
|
"Insert variables needed by target THIS."
|
|
(ede-proj-makefile-insert-loadpath-items
|
|
(ede-proj-elisp-packages-to-loadpath
|
|
(list "eieio" "semantic" "ede")))
|
|
;; eieio for object system needed in ede
|
|
;; semantic because it is
|
|
;; ede for project regeneration
|
|
(ede-pmake-insert-variable-shared
|
|
(concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL")
|
|
(insert
|
|
(mapconcat (lambda (src)
|
|
(with-current-buffer (find-file-noselect src)
|
|
(concat (semantic-grammar-package) ".el")))
|
|
(oref this source)
|
|
" "))))
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-rules :after ((this semantic-ede-proj-target-grammar))
|
|
"Insert rules needed by THIS target.
|
|
This raises `max-specpdl-size' and `max-lisp-eval-depth', which can be
|
|
needed for the compilation of the resulting parsers."
|
|
(insert (format "%s: EMACSFLAGS+= --eval '(setq max-specpdl-size 1500 \
|
|
max-lisp-eval-depth 700)'\n"
|
|
(oref this name))))
|
|
|
|
(cl-defmethod ede-proj-makefile-insert-dist-dependencies ((this semantic-ede-proj-target-grammar))
|
|
"Insert dist dependencies, or intermediate targets.
|
|
This makes sure that all grammar lisp files are created before the dist
|
|
runs, so they are always up to date.
|
|
Argument THIS is the target that should insert stuff."
|
|
(cl-call-next-method)
|
|
(insert " $(" (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL)")
|
|
)
|
|
|
|
;; (autoload 'ede-proj-target-elisp "ede/proj-elisp"
|
|
;; "Target class for Emacs/Semantic grammar files." nil nil)
|
|
|
|
(ede-proj-register-target "semantic grammar"
|
|
'semantic-ede-proj-target-grammar)
|
|
|
|
(provide 'semantic/ede-grammar)
|
|
|
|
;;; semantic/ede-grammar.el ends here
|