1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 20:50:53 -08:00
emacs/lisp/cedet/semantic/bovine/gcc.el
David Engster e8cc7880c3 Merge with CEDET upstream (rev. 8499).
lisp/

* eieio/eieio-datadebug.el (data-debug/eieio-insert-slots):
  Inhibit read only while inserting objects.

lisp/cedet/

* semantic.el (navigate-menu): Yank Tag :enable. Make sure
`senator-tag-ring' is bound.
(semantic-parse-region-default): Stop reversing the output of
parse-whole-stream.
(semantic-repeat-parse-whole-stream): Append returned tags
differently, so they come out in the right order.

* semantic/sb.el (semantic-sb-filter-tags-of-class): New option.
(semantic-sb-fetch-tag-table): Filter tags being bucketed to exclude
tags belonging to above filtered classes.

* semantic/find.el (semantic-filter-tags-by-class): New function.

* semantic/tag-ls.el (semantic-tag-similar-p-default): Add
short-circuit in case tag1 and 2 are identical.

* semantic/analyze/fcn.el
(semantic-analyze-dereference-metatype-stack): Use
`semantic-tag-similar-p' instead of 'eq' when comparing two tags
during metatype evaluation in case they are the same, but not the same
node. (Tweaked patch from Tomasz Gajewski) (Tiny change)

* semantic/db-find.el (semanticdb-partial-synchronize): Fix require to
semantic/db-typecache to be correct.
(semanticdb-find-tags-external-children-of-type): Make this a brutish
search by default.

* semantic/sort.el (semantic-tag-external-member-children-default):
When calling `semanticdb-find-tags-external-children-of-type', pass in
the input tag as the place to start searching for externally defined
methods.

* semantic/db-file.el (semanticdb-default-save-directory): Doc
fix: Add ref to default value.

* semantic/complete.el (semantic-complete-post-command-hook): When
detecting if cursor is outside completion area, do so if cursor moves
before start of overlay, or the original starting location of the
overlay (i.e., if user deletes past beginning of the overlay region).
(semantic-complete-inline-tag-engine): Initialize original start of
`semantic-complete-inline-overlay'.

* semantic/bovine/c.el (semantic-c-describe-environment): Update some
section titles.  Test semanticdb table before printing it.
(semantic-c-reset-preprocessor-symbol-map): Update
`semantic-lex-spp-macro-symbol-obarray' outside the loop over all the
files contributing to its value.
(semantic-c-describe-environment): If there is an EDE project but no
spp symbols from it, say so.

* srecode/args.el (srecode-semantic-handle-:project): New argument
handler. Provide variable values if not in an EDE project.

* srecode/srt-mode.el (srecode-template-mode): Fix typo on srecode
name.

* srecode/cpp.el (srecode-semantic-handle-:c): Replace all characters
in FILENAME_SYMBOL that aren't valid CPP symbol chars.

* srecode/map.el (srecode-map-validate-file-for-mode): Force semantic
to load if it is not active in the template being added to the map.

* srecode/srt.el: Add local variables for setting the autoload file
name.
(srecode-semantic-handle-:srt): New autoload cookie

* ede.el (ede-apply-preprocessor-map): Apply map to
`semantic-lex-spp-project-macro-symbol-obarray' instead of the system
one. Add require for semantic.

* ede/proj-elisp.el (ede-update-version-in-source): In case a file has
both a version variable and a Version: comment, always use
`call-next-method'.

* ede/cpp-root.el (ede-set-project-variables): Deleted.
`ede-preprocessor-map' does the job this function was attempting to do
with :spp-table.
(ede-preprocessor-map): Update file tests to provide better messages.
Do not try to get symbols from a file that is the file in the current
buffer.

* ede/base.el (ede-project-placeholder): Add more documentation to
:file slot.
(ede-load-cache): Use `insert-file-contents' instead of
`find-file-noselect' in order to avoid activating other tools.

* semantic/bovine/c.el (semantic-get-local-variables): Also add a new
variable 'this' if we are in an inline member function.  For detecting
this, we check overlays at point if there is a class spanning the
current function.  Also, the variable 'this' has to be a pointer.

* semantic/bovine/gcc.el (semantic-gcc-setup): Fail gracefully when
querying g++ for defines returns an error.

* srecode/srt-mode.el:
* srecode/compile.el:
* semantic/elp.el:
* semantic/db-el.el:
* semantic/complete.el:
* ede.el:
* cogre.el:
* srecode/table.el:
* srecode/mode.el:
* srecode/insert.el:
* srecode/compile.el:
* semantic/decorate/include.el:
* semantic/db.el:
* semantic/adebug.el:
* ede/auto.el:
* srecode/dictionary.el:
* semantic/ede-grammar.el:
* semantic/db.el:
* semantic/db-find.el:
* semantic/db-file.el:
* semantic/complete.el:
* semantic/bovine/c.el:
* semantic/analyze.el:
* ede/util.el:
* ede/proj.el:
* ede/proj-elisp.el:
* ede/pconf.el:
* ede/locate.el:
* ede.el: Adapt to EIEIO namespace cleanup: Rename `object-name' to
`eieio-object-name', `object-set-name-string' to
`eieio-object-set-name-string', `object-class' to
`eieio-object-class', `class-parent' to `eieio-class-parent',
`class-parents' to `eieio-class-parents', `class-children' to
`eieio-class-children', `object-name-string' to
`eieio-object-name-string', `object-class-fast' to
`eieio--object-class'. Also replace direct access with new accessor
functions.

* ede/cpp-root.el (ede-project-autoload, initialize-instance): Fix EDE
file symbol to match rename.  Fix ede-cpp-root symbol to include
-project in name.

* cedet-files.el (cedet-files-list-recursively): New function.
Recursively find files whose names are matching to given regex

* ede.el (ede-current-project): Rewrite to avoid imperative style.

* ede/files.el (ede-find-file): Simplify code.

* ede/base.el (ede-normalize-file/directory): Add function to
normalize :file or :directory slots if they are missing.

* ede/cpp-root.el (ede-cpp-root-project): Add compile-command slot.
(project-compile-project): Compiles project using value specified in
:compule-command slot or in compile-command local variable.  Value of
slot or local variable could be string or function that receives
project and should return string that will be invoked as command.
(project-compile-target): Invokes compilation of whole project

* ede/files.el (ede-find-project-root): New function to find root of
project that contains specific file.
(ede-files-find-existing): New function which checks presence of given
directory in the list of registered projects.

etc/

* srecode/ede-autoconf.srt: Change Copyright to FSF.
(ede-empty): Change AC_INIT to use PROJECT_NAME, and PROJECT_VERSION.

* srecode/ede-make.srt (ede-empty): Add a dependency on :project.  Add
header comment specifying the project's relative path.

* srecode/c.srt (header_guard): Upcase the filename symbol.

* srecode/java.srt (empty-main): New.
(class-tag): Decapitalize class.
2013-03-21 23:11:03 +01:00

242 lines
10 KiB
EmacsLisp

;;; semantic/bovine/gcc.el --- gcc querying special code for the C parser
;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <eric@siege-engine.com>
;; 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 <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
;; GCC stores things in special places. These functions will query
;; GCC, and set up the preprocessor and include paths.
(require 'semantic/dep)
(defvar semantic-lex-c-preprocessor-symbol-file)
(defvar semantic-lex-c-preprocessor-symbol-map)
(declare-function semantic-c-reset-preprocessor-symbol-map "semantic/bovine/c")
;;; Code:
(defun semantic-gcc-query (gcc-cmd &rest gcc-options)
"Return program output or error code in case error happens.
GCC-CMD is the program to execute and GCC-OPTIONS are the options
to give to the program."
;; $ gcc -v
;;
(let* ((buff (get-buffer-create " *gcc-query*"))
(old-lc-messages (getenv "LC_ALL"))
(options `(,nil ,(cons buff t) ,nil ,@gcc-options))
(err 0))
(with-current-buffer buff
(erase-buffer)
(setenv "LC_ALL" "C")
(condition-case nil
(setq err (apply 'call-process gcc-cmd options))
(error ;; Some bogus directory for the first time perhaps?
(let ((default-directory (expand-file-name "~/")))
(condition-case nil
(setq err (apply 'call-process gcc-cmd options))
(error ;; gcc doesn't exist???
nil)))))
(setenv "LC_ALL" old-lc-messages)
(prog1
(if (zerop err)
(buffer-string)
err)
(kill-buffer buff)))))
;;(semantic-gcc-get-include-paths "c")
;;(semantic-gcc-get-include-paths "c++")
(defun semantic-gcc-get-include-paths (lang)
"Return include paths as gcc uses them for language LANG."
(let* ((gcc-cmd (cond
((string= lang "c") "gcc")
((string= lang "c++") "c++")
(t (if (stringp lang)
(error "Unknown lang: %s" lang)
(error "LANG=%S, should be a string" lang)))))
(gcc-output (semantic-gcc-query gcc-cmd "-v" "-E" "-x" lang null-device))
(lines (split-string gcc-output "\n"))
(include-marks 0)
(inc-mark "#include ")
(inc-mark-len (length "#include "))
inc-path)
;;(message "gcc-output=%s" gcc-output)
(dolist (line lines)
(when (> (length line) 1)
(if (= 0 include-marks)
(when (and (> (length line) inc-mark-len)
(string= inc-mark (substring line 0 inc-mark-len)))
(setq include-marks (1+ include-marks)))
(let ((chars (append line nil)))
(when (= 32 (nth 0 chars))
(let ((path (substring line 1)))
(when (file-accessible-directory-p path)
(when (if (memq system-type '(windows-nt))
(/= ?/ (nth 1 chars))
(= ?/ (nth 1 chars)))
(add-to-list 'inc-path
(expand-file-name (substring line 1))
t)))))))))
inc-path))
(defun semantic-cpp-defs (str)
"Convert CPP output STR into a list of cons cells with defines for C++."
(let ((lines (split-string str "\n"))
(lst nil))
(dolist (L lines)
(let ((dat (split-string L)))
(when (= (length dat) 3)
(add-to-list 'lst (cons (nth 1 dat) (nth 2 dat))))))
lst))
(defun semantic-gcc-fields (str)
"Convert GCC output STR into an alist of fields."
(let ((fields nil)
(lines (split-string str "\n"))
)
(dolist (L lines)
;; For any line, what do we do with it?
(cond ((or (string-match "Configured with\\(:\\)" L)
(string-match "\\(:\\)\\s-*[^ ]*configure " L))
(let* ((parts (substring L (match-end 1)))
(opts (split-string parts " " t))
)
(dolist (O (cdr opts))
(let* ((data (split-string O "="))
(sym (intern (car data)))
(val (car (cdr data))))
(push (cons sym val) fields)
))
))
((string-match "gcc[ -][vV]ersion" L)
(let* ((vline (substring L (match-end 0)))
(parts (split-string vline " ")))
(push (cons 'version (nth 1 parts)) fields)))
((string-match "Target: " L)
(let ((parts (split-string L " ")))
(push (cons 'target (nth 1 parts)) fields)))
))
fields))
(defvar semantic-gcc-setup-data nil
"The GCC setup data.
This is setup by `semantic-gcc-setup'.
This is an alist, and should include keys of:
'version - the version of gcc
'--host - the host symbol (used in include directories)
'--prefix - where GCC was installed.
It should also include other symbols GCC was compiled with.")
;;;###autoload
(defun semantic-gcc-setup ()
"Setup Semantic C/C++ parsing based on GCC output."
(interactive)
(let* ((fields (or semantic-gcc-setup-data
(semantic-gcc-fields (semantic-gcc-query "gcc" "-v"))))
(cpp-options `("-E" "-dM" "-x" "c++" ,null-device))
(query (let ((q (apply 'semantic-gcc-query "cpp" cpp-options)))
(if (stringp q)
q
;; `cpp' command in `semantic-gcc-setup' doesn't work on
;; Mac, try `gcc'.
(apply 'semantic-gcc-query "gcc" cpp-options))))
(defines (if (stringp query)
(semantic-cpp-defs query)
(message (concat "Could not query gcc for defines. "
"Maybe g++ is not installed."))
nil))
(ver (cdr (assoc 'version fields)))
(host (or (cdr (assoc 'target fields))
(cdr (assoc '--target fields))
(cdr (assoc '--host fields))))
(prefix (cdr (assoc '--prefix fields)))
;; gcc output supplied paths
(c-include-path (semantic-gcc-get-include-paths "c"))
(c++-include-path (semantic-gcc-get-include-paths "c++"))
(gcc-exe (locate-file "gcc" exec-path exec-suffixes 'executable))
)
;; Remember so we don't have to call GCC twice.
(setq semantic-gcc-setup-data fields)
(when (and (not c-include-path) gcc-exe)
;; Fallback to guesses
(let* ( ;; gcc include dirs
(gcc-root (expand-file-name ".." (file-name-directory gcc-exe)))
(gcc-include (expand-file-name "include" gcc-root))
(gcc-include-c++ (expand-file-name "c++" gcc-include))
(gcc-include-c++-ver (expand-file-name ver gcc-include-c++))
(gcc-include-c++-ver-host (expand-file-name host gcc-include-c++-ver)))
(setq c-include-path
;; Replace cl-function remove-if-not.
(delq nil (mapcar (lambda (d)
(if (file-accessible-directory-p d) d))
(list "/usr/include" gcc-include))))
(setq c++-include-path
(delq nil (mapcar (lambda (d)
(if (file-accessible-directory-p d) d))
(list "/usr/include"
gcc-include
gcc-include-c++
gcc-include-c++-ver
gcc-include-c++-ver-host))))))
;;; Fix-me: I think this part might have been a misunderstanding, but I am not sure.
;; If this option is specified, try it both with and without prefix, and with and without host
;; (if (assoc '--with-gxx-include-dir fields)
;; (let ((gxx-include-dir (cdr (assoc '--with-gxx-include-dir fields))))
;; (nconc try-paths (list gxx-include-dir
;; (concat prefix gxx-include-dir)
;; (concat gxx-include-dir "/" host)
;; (concat prefix gxx-include-dir "/" host)))))
;; Now setup include paths etc
(dolist (D (semantic-gcc-get-include-paths "c"))
(semantic-add-system-include D 'c-mode))
(dolist (D (semantic-gcc-get-include-paths "c++"))
(semantic-add-system-include D 'c++-mode)
(let ((cppconfig (list (concat D "/bits/c++config.h") (concat D "/sys/cdefs.h"))))
(dolist (cur cppconfig)
;; Presumably there will be only one of these files in the try-paths list...
(when (file-readable-p cur)
;; Add it to the symbol file
(if (boundp 'semantic-lex-c-preprocessor-symbol-file)
;; Add to the core macro header list
(add-to-list 'semantic-lex-c-preprocessor-symbol-file cur)
;; Setup the core macro header
(setq semantic-lex-c-preprocessor-symbol-file (list cur)))
))))
(if (not (boundp 'semantic-lex-c-preprocessor-symbol-map))
(setq semantic-lex-c-preprocessor-symbol-map nil))
(dolist (D defines)
(add-to-list 'semantic-lex-c-preprocessor-symbol-map D))
;; Needed for parsing OS X libc
(when (eq system-type 'darwin)
(add-to-list 'semantic-lex-c-preprocessor-symbol-map '("__i386__" . "")))
(when (featurep 'semantic/bovine/c)
(semantic-c-reset-preprocessor-symbol-map))
nil))
(provide 'semantic/bovine/gcc)
;; Local variables:
;; generated-autoload-file: "../loaddefs.el"
;; generated-autoload-load-name: "semantic/bovine/gcc"
;; End:
;;; semantic/bovine/gcc.el ends here