This program 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 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* NB To comply with the above BSD license, copyright information is
* configuration file containing regexp definitions for etags.
*/
-char pot_etags_version[] = "@(#) pot revision number is 17.31";
+char pot_etags_version[] = "@(#) pot revision number is 17.38";
#define TRUE 1
#define FALSE 0
# include <stdlib.h>
# include <string.h>
# else /* no standard C headers */
- extern char *getenv ();
- extern char *strcpy ();
- extern char *strncpy ();
- extern char *strcat ();
- extern char *strncat ();
- extern unsigned long strlen ();
- extern PTR malloc ();
- extern PTR realloc ();
+ extern char *getenv __P((const char *));
+ extern char *strcpy __P((char *, const char *));
+ extern char *strncpy __P((char *, const char *, unsigned long));
+ extern char *strcat __P((char *, const char *));
+ extern char *strncat __P((char *, const char *, unsigned long));
+ extern int strcmp __P((const char *, const char *));
+ extern int strncmp __P((const char *, const char *, unsigned long));
+ extern int system __P((const char *));
+ extern unsigned long strlen __P((const char *));
+ extern void *malloc __P((unsigned long));
+ extern void *realloc __P((void *, unsigned long));
+ extern void exit __P((int));
+ extern void free __P((void *));
+ extern void *memmove __P((void *, const void *, unsigned long));
# ifdef VMS
# define EXIT_SUCCESS 1
# define EXIT_FAILURE 0
*midtk = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz$0123456789";
static bool append_to_tagfile; /* -a: append to tags */
-/* The next five default to TRUE for etags, but to FALSE for ctags. */
+/* The next five default to TRUE in C and derived languages. */
static bool typedefs; /* -t: create tags for C and Ada typedefs */
static bool typedefs_or_cplusplus; /* -T: create tags for C typedefs, level */
/* 0 struct/enum/union decls, and C++ */
# define EMACS_NAME "standalone"
#endif
#ifndef VERSION
-# define VERSION "17.31"
+# define VERSION "17.38"
#endif
static void
print_version ()
exit (EXIT_SUCCESS);
}
+#ifndef PRINT_UNDOCUMENTED_OPTIONS_HELP
+# define PRINT_UNDOCUMENTED_OPTIONS_HELP FALSE
+#endif
+
static void
print_help (argbuffer)
argument *argbuffer;
puts ("--no-globals\n\
Do not create tag entries for global variables in some\n\
languages. This makes the tags file smaller.");
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("--no-line-directive\n\
+ Ignore #line preprocessor directives in C and derived languages.");
+
if (CTAGS)
puts ("--members\n\
Create tag entries for members of structures in some languages.");
MODS are optional one-letter modifiers: `i' means to ignore case,\n\
`m' means to allow multi-line matches, `s' implies `m' and\n\
causes dot to match any character, including newline.");
+
puts ("-R, --no-regex\n\
Don't create tags from regexps for the following files.");
+
puts ("-I, --ignore-indentation\n\
In C and C++ do not assume that a closing brace in the first\n\
column is the final brace of a function or structure definition.");
+
puts ("-o FILE, --output=FILE\n\
Write the tags to FILE.");
+
puts ("--parse-stdin=NAME\n\
Read from standard input and record tags as belonging to file NAME.");
Print on the standard output an index of items intended for\n\
human consumption, similar to the output of vgrind. The index\n\
is sorted, and gives the page number of each item.");
-# if PRINT_UNDOCUMENTED_OPTIONS_HELP
- puts ("-w, --no-duplicates\n\
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("-w, --no-duplicates\n\
Do not create duplicate tag entries, for compatibility with\n\
traditional ctags.");
- puts ("-w, --no-warn\n\
+
+ if (PRINT_UNDOCUMENTED_OPTIONS_HELP)
+ puts ("-w, --no-warn\n\
Suppress warning messages about duplicate tag entries.");
-# endif /* PRINT_UNDOCUMENTED_OPTIONS_HELP */
+
puts ("-x, --cxref\n\
Like --vgrind, but in the style of cxref, rather than vgrind.\n\
The output uses line numbers instead of page numbers, but\n\
argbuffer = xnew (argc, argument);
/*
- * If etags, always find typedefs and structure tags. Why not?
+ * Always find typedefs and structure tags.
* Also default to find macro constants, enum constants, struct
- * members and global variables.
+ * members and global variables. Do it for both etags and ctags.
*/
- if (!CTAGS)
- {
- typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
- globals = members = TRUE;
- }
+ typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
+ globals = members = TRUE;
/* When the optstring begins with a '-' getopt_long does not rearrange the
non-options arguments to be at the end, but leaves them alone. */
exit (EXIT_SUCCESS);
}
+ /* From here on, we are in (CTAGS && !cxref_style) */
if (update)
{
char cmd[BUFSIZ];
* function or variable, or corresponds to a typedef, or
* is a struct/union/enum tag, or #define, or an enum constant.
*
- * *IS_FUNC gets TRUE iff the token is a function or #define macro
+ * *IS_FUNC gets TRUE if the token is a function or #define macro
* with args. C_EXTP points to which language we are looking at.
*
* Globals
return TRUE;
}
- /*
- * This structdef business is NOT invoked when we are ctags and the
- * file is plain C. This is because a struct tag may have the same
- * name as another tag, and this loses with ctags.
- */
switch (toktype)
{
case st_C_javastruct:
{
/* This function is never called when token.valid is FALSE, but
we must protect against invalid input or internal errors. */
- if (!DEBUG && !token.valid)
- return;
-
if (token.valid)
make_tag (token_name.buffer, token_name.len, isfun, token.line,
token.offset+token.length+1, token.lineno, token.linepos);
- else /* this case is optimised away if !DEBUG */
- make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
- token_name.len + 17, isfun, token.line,
- token.offset+token.length+1, token.lineno, token.linepos);
+ else if (DEBUG)
+ { /* this branch is optimised away if !DEBUG */
+ make_tag (concat ("INVALID TOKEN:-->", token_name.buffer, ""),
+ token_name.len + 17, isfun, token.line,
+ token.offset+token.length+1, token.lineno, token.linepos);
+ error ("INVALID TOKEN", NULL);
+ }
token.valid = FALSE;
}
make_C_tag (FALSE); /* a struct or enum */
break;
}
- bracelev++;
+ bracelev += 1;
break;
case '*':
if (definedef != dnone)
case '}':
if (definedef != dnone)
break;
+ bracelev -= 1;
if (!ignoreindent && lp == newlb.buffer + 1)
{
if (bracelev != 0)
- token.valid = FALSE;
+ token.valid = FALSE; /* unexpected value, token unreliable */
bracelev = 0; /* reset brace level if first column */
parlev = 0; /* also reset paren level, just in case... */
}
- else if (bracelev > 0)
- bracelev--;
- else
- token.valid = FALSE; /* something gone amiss, token unreliable */
+ else if (bracelev < 0)
+ {
+ token.valid = FALSE; /* something gone amiss, token unreliable */
+ bracelev = 0;
+ }
+ if (bracelev == 0 && fvdef == vignore)
+ fvdef = fvnone; /* end of function */
popclass_above (bracelev);
structdef = snone;
/* Only if typdef == tinbody is typdefbracelev significant. */
int save_lineno, namelen, taglen;
char c, *name;
- bool /* each of these flags is TRUE iff: */
+ bool /* each of these flags is TRUE if: */
incomment, /* point is inside a comment */
inquote, /* point is inside '..' string */
get_tagname, /* point is after PROCEDURE/FUNCTION