Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
This file is not considered part of GNU Emacs.
* configuration file containing regexp definitions for etags.
*/
-char pot_etags_version[] = "@(#) pot revision number is 17.34";
+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++ */
static bool vgrind_style; /* -v: create vgrind style index output */
static bool no_warnings; /* -w: suppress warnings (undocumented) */
static bool cxref_style; /* -x: create cxref style output */
-static bool cplusplus; /* .[hc] means C++, not C */
+static bool cplusplus; /* .[hc] means C++, not C (undocumented) */
static bool ignoreindent; /* -I: ignore indentation in C */
static bool packages_only; /* --packages-only: in Ada, only tag packages*/
/* Note that .c and .h can be considered C++, if the --c++ flag was
- given, or if the `class' or `template' keyowrds are met inside the file.
+ given, or if the `class' or `template' keywords are met inside the file.
That is why default_C_entries is called for these. */
static char *default_C_suffixes [] =
{ "c", "h", NULL };
+#if CTAGS /* C help for Ctags */
+static char default_C_help [] =
+"In C code, any C function is a tag. Use -t to tag typedefs.\n\
+Use -T to tag definitions of `struct', `union' and `enum'.\n\
+Use -d to tag `#define' macro definitions and `enum' constants.\n\
+Use --globals to tag global variables.\n\
+You can tag function declarations and external variables by\n\
+using `--declarations', and struct members by using `--members'.";
+#else /* C help for Etags */
static char default_C_help [] =
"In C code, any C function or typedef is a tag, and so are\n\
definitions of `struct', `union' and `enum'. `#define' macro\n\
`--no-members' can make the tags table file much smaller.\n\
You can tag function declarations and external variables by\n\
using `--declarations'.";
+#endif /* C help for Ctags and Etags */
static char *Cplusplus_suffixes [] =
{ "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
# define EMACS_NAME "standalone"
#endif
#ifndef VERSION
-# define VERSION "17.34"
+# define VERSION "17.38"
#endif
static void
print_version ()
{
/* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2007 Free Software Foundation, Inc.";
+ char emacs_copyright[] = "Copyright (C) 2008 Free Software Foundation, Inc.";
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts (emacs_copyright);
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];
switch, 0, st_C_ignore
return, 0, st_C_ignore
__attribute__, 0, st_C_attribute
+GTY, 0, st_C_attribute
@interface, 0, st_C_objprot
@protocol, 0, st_C_objprot
@implementation,0, st_C_objimpl
35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
- 35, 35, 35, 35, 35, 35, 35, 35, 35, 15,
- 14, 35, 35, 35, 35, 35, 35, 35, 14, 35,
- 35, 35, 35, 12, 13, 35, 35, 35, 35, 12,
+ 35, 35, 35, 35, 35, 35, 35, 35, 35, 3,
+ 26, 35, 35, 35, 35, 35, 35, 35, 27, 35,
+ 35, 35, 35, 24, 0, 35, 35, 35, 35, 0,
35, 35, 35, 35, 35, 1, 35, 16, 35, 6,
23, 0, 0, 35, 22, 0, 35, 35, 5, 0,
0, 15, 1, 35, 6, 35, 8, 19, 35, 16,
{
enum
{
- TOTAL_KEYWORDS = 32,
+ TOTAL_KEYWORDS = 33,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 15,
MIN_HASH_VALUE = 2,
{
{""}, {""},
{"if", 0, st_C_ignore},
- {""},
+ {"GTY", 0, st_C_attribute},
{"@end", 0, st_C_objend},
{"union", 0, st_C_struct},
{"define", 0, st_C_define},
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
+ else if (bracelev < 0)
{
- if (--bracelev < 0)
- {
- bracelev = 0;
- token.valid = FALSE; /* something gone amiss, token unreliable */
- }
- if (bracelev == 0 && fvdef == vignore)
- fvdef = fvnone; /* end of function */
+ 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. */
LOOP_ON_INPUT_LINES (inf, lb, cp)
{
- skip_spaces(cp);
+ cp = skip_spaces (cp);
if (LOOKING_AT (cp, "package"))
{
HCoop / bpt / emacs.git / blobdiff