From: Kevin Ryde <user42@zip.com.au>
To: "Francesco Potortì" <pot@gnu.org>
Cc: 5600@debbugs.gnu.org
Subject: bug#5600: 23.1; etags don't tag (defvar foo) declaration
Date: Sat, 20 Feb 2010 11:06:17 +1100 [thread overview]
Message-ID: <87d400rcsm.fsf@blah.blah> (raw)
In-Reply-To: <87mxz6ayc7.fsf@blah.blah>
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
Francesco Potortì <pot@gnu.org> writes:
>
> Lisp_functions should distinguish between defvar and other (def*
> constructs, and tag the former only if --declarations.
Sounds likely. I didn't know about that option, new diff below.
I suppose it could tag `declare-function' and the like too, but start
with untagging the defvar ones.
(The bloat of bizaar has made the tree inaccessible for me, so excuse
three separate diff files.)
2010-02-19 Kevin Ryde <user42@zip.com.au>
* etags.c (skip_name): New helper.
(Lisp_functions): Tag "(defvar foo)" only under --declarations.
(Lisp_help): Describe this --declarations.
2010-02-19 Kevin Ryde <user42@zip.com.au>
* maintaining.texi (Tag Syntax): Add Lisp --declarations for
(defvar foo).
2010-02-19 Kevin Ryde <user42@zip.com.au>
* doc/man/etags.1 (--declarations): Add Lisp (defvar foo).
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: etags.c.defvar-2.diff --]
[-- Type: text/x-diff, Size: 1728 bytes --]
--- etags.c.~3.93.~ 2009-11-29 08:42:32.000000000 +1100
+++ etags.c 2010-02-20 10:14:45.000000000 +1100
@@ -433,6 +433,7 @@
static char *concat __P((char *, char *, char *));
static char *skip_spaces __P((char *));
static char *skip_non_spaces __P((char *));
+static char *skip_name __P((char *));
static char *savenstr __P((char *, int));
static char *savestr __P((char *));
static char *etags_strchr __P((const char *, int));
@@ -699,7 +700,9 @@
"In Lisp code, any function defined with `defun', any variable\n\
defined with `defvar' or `defconst', and in general the first\n\
argument of any expression that starts with `(def' in column zero\n\
-is a tag.";
+is a tag.\n\
+`--declarations' tags declarations \"(defvar foo)\" as well as\n\
+definitions.";
static char *Lua_suffixes [] =
{ "lua", "LUA", NULL };
@@ -4858,6 +4861,19 @@
if (dbp[0] != '(')
continue;
+ /* "(defvar foo)" is a declaration rather than a definition.
+ ENHANCE-ME: Maybe also Elisp (declare-function funcname ...),
+ and/or CL and Elisp (declare (special varname)), or (proclaim). */
+ if (! declarations) {
+ char *p = dbp+1;
+ if (LOOKING_AT (p, "defvar")) {
+ p = skip_name (p); /* past var name */
+ p = skip_spaces (p);
+ if (*p == ')')
+ continue;
+ }
+ }
+
if (strneq (dbp+1, "def", 3) || strneq (dbp+1, "DEF", 3))
{
dbp = skip_non_spaces (dbp);
@@ -6510,6 +6526,16 @@
cp++;
return cp;
}
+
+/* Skip past any chars at cp which are "name" class, meaning not notinname().*/
+static char *
+skip_name (char *cp)
+{
+ /* '\0' is a notinname() so loop stops there too */
+ while (! notinname (*cp))
+ cp++;
+ return cp;
+}
/* Print error message and exit. */
void
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: maintaining.texi.defvar-2.diff --]
[-- Type: text/x-diff, Size: 557 bytes --]
--- maintaining.texi.~1.22.~ 2009-11-29 08:42:21.000000000 +1100
+++ maintaining.texi 2010-02-20 10:32:11.000000000 +1100
@@ -1593,7 +1593,8 @@
In Lisp code, any function defined with @code{defun}, any variable
defined with @code{defvar} or @code{defconst}, and in general the first
argument of any expression that starts with @samp{(def} in column zero is
-a tag.
+a tag. The @option{--declarations} option tags declarations
+@code{(defvar foo)} as well as definitions.
@item
In Scheme code, tags include anything defined with @code{def} or with a
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: etags.1.defvar-2.diff --]
[-- Type: text/x-diff, Size: 432 bytes --]
--- etags.1.~1.8.~ 2009-01-12 11:01:43.000000000 +1100
+++ etags.1 2010-02-20 10:28:25.000000000 +1100
@@ -88,6 +88,8 @@
.B \-\-declarations
In C and derived languages, create tags for function declarations,
and create tags for extern variables unless \-\-no\-globals is used.
+
+In Lisp, create tags for declarations (defvar foo).
.TP
.B \-D, \-\-no\-defines
Do not create tag entries for C preprocessor constant definitions
next prev parent reply other threads:[~2010-02-20 0:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-19 0:00 bug#5600: 23.1; etags don't tag (defvar foo) declaration Kevin Ryde
2010-02-19 9:25 ` Francesco Potortì
2010-02-20 0:06 ` Kevin Ryde [this message]
2012-12-02 1:49 ` Chong Yidong
2010-02-19 9:32 ` Francesco Potortì
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d400rcsm.fsf@blah.blah \
--to=user42@zip.com.au \
--cc=5600@debbugs.gnu.org \
--cc=pot@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.