Skip to content

Update ede-compdb.el #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marciosmiderle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ede-compdb.el #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions ede-compdb.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
(require 'tramp)

(eval-when-compile
(require 'cl)
(require 'cl-lib))

(declare-function semantic-gcc-fields "semantic/bovine/gcc")
Expand Down Expand Up @@ -246,15 +247,16 @@ line until needed. Call this before accessing any slots derived
from the command line (which is most of them!)"
;; compiler slot is used to determine whether we need to parse the command line
(unless (slot-boundp this :compiler)
(parse-command-line this)))
(parse-command-line this (oref this command-line))))

(defconst ede-compdb-entry-combined-args-rx
(rx
string-start
(submatch
(or (: "-" (any "DUIF"))
"-isystem"
"--sysroot"))
"--sysroot"
"@"))
(optional
(submatch (+? (not (any "=")))))
(optional
Expand All @@ -273,11 +275,11 @@ from the command line (which is most of them!)"
string-end)
"Regex to identify directories which are relative to sysroot")

(defmethod parse-command-line ((this compdb-entry))
(defmethod parse-command-line ((this compdb-entry) command-line)
"Parse the :command-line slot of THIS to derive :compiler, :include-path, etc."
(let ((args (split-string (oref this command-line)))
(seenopt nil)
(case-fold-search nil))
(let* ((args (split-string command-line))
(seenopt nil)
(case-fold-search nil))
;; parsing code inspired by `command-line'
(while args
(let ((argi (pop args)) argval eqval)
Expand All @@ -286,8 +288,11 @@ from the command line (which is most of them!)"
(setq argval (match-string 2 argi))
(setq eqval (match-string 3 argi))
(setq argi (match-string 1 argi)))
(when (char-equal ?- (string-to-char argi))
(setq seenopt t))
(let ((first-char (string-to-char argi)))
(when (or (char-equal ?- first-char)
(and (char-equal ?/ first-char)
(not (file-exists-p argi))))
(setq seenopt t)))
(pcase argi
(`"-D"
(object-add-to-list this :defines (cons (or argval (pop args)) eqval) t))
Expand All @@ -296,6 +301,12 @@ from the command line (which is most of them!)"
;; TODO: support gcc notation "=dir" where '=' is the sysroot prefix
((or `"-I" `"-F" `"-isystem")
(object-add-to-list this :include-path (file-name-as-directory (or argval (pop args))) t))
(`"@"
(parse-command-line
this
(with-temp-buffer
(insert-file-contents (concat (oref this directory) (or argval (pop args))))
(buffer-string))))
(`"-include"
(object-add-to-list this :includes (pop args) t)) ;; append
(`"-imacros"
Expand Down Expand Up @@ -486,7 +497,7 @@ current configuration directory is used if CONFIG not set."
;; Use projectile-get-other-files if defined, or ff-other-file-list (see below) if not
(or (and (fboundp 'projectile-get-other-files)
(projectile-project-p)
(projectile-get-other-files fname (projectile-current-project-files) t))
(projectile-get-other-files fname (projectile-current-project-files) ))
(ff-other-file-list)))

(defmethod compdb-entry-for-buffer ((this ede-compdb-project))
Expand Down Expand Up @@ -544,7 +555,14 @@ an d pick one that is present in the compdb hashtable."
(let* ((directory (file-name-as-directory (ede-compdb-make-path compdb-path (cdr (assoc 'directory E)))))
(filename (expand-file-name (ede-compdb-make-path compdb-path (cdr (assoc 'file E))) directory))
(filetruename (file-truename filename))
(command-line (cdr (assoc 'command E)))
;; From http://clang.llvm.org/docs/JSONCompilationDatabase.html
;; arguments: The compile command executed as list of strings.
;; Either arguments or command is required.
;; More recent versions of bear prefer "arguments", so we generate
;; "command" field from "arguments" field.
(command-line (or (cdr (assoc 'command E)) (reduce (lambda (acum arg)
(concat acum " " arg))
(cdr (assoc 'arguments E)))))
(compilation
(compdb-entry filename
:command-line command-line
Expand Down