emacs: lib-src/etags.c comparison

comparison lib-src/etags.c @ 90751:52a7f3f50b89

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 624-636) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 200-201) - Merge from emacs--devo--0 - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171

author	Miles Bader <miles@gnu.org>
date	Tue, 13 Feb 2007 12:14:16 +0000
parents	95d0cdf160ea a3a7c25796a4
children	ec58e5c426ef

comparison

equal deleted inserted replaced

-:f8cc067aba62
+:52a7f3f50b89
 				/* member functions. */
 static bool constantypedefs;	/* -d: create tags for C #define, enum */
 				/* constants and variables. */
 				/* -D: opposite of -d.  Default under ctags. */
 static bool globals;		/* create tags for global variables */
+static bool members;		/* create tags for C member variables */
 static bool declarations;	/* --declarations: tag them and extern in C&Co*/
-static bool members;		/* create tags for C member variables */
 static bool no_line_directive;	/* ignore #line directives (undocumented) */
 static bool no_duplicates;	/* no duplicate tags for ctags (undocumented) */
 static bool update;		/* -u: update tags */
 static bool vgrind_style;	/* -v: create vgrind style index output */
 static bool no_warnings;	/* -w: suppress warnings (undocumented) */
 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\
 definitions and `enum' constants are tags unless you specify\n\
 `--no-defines'.  Global variables are tags unless you specify\n\
-`--no-globals'.  Use of `--no-globals' and `--no-defines'\n\
+`--no-globals' and so are struct members unless you specify\n\
-can make the tags table file much smaller.\n\
+`--no-members'.  Use of `--no-globals', `--no-defines' and\n\
+`--no-members' can make the tags table file much smaller.\n\
 You can tag function declarations and external variables by\n\
-using `--declarations', and struct members by using `--members'.";
+using `--declarations'.";
 static char *Cplusplus_suffixes [] =
 { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx",
 "M",			/* Objective C++ */
 "pdb",			/* Postscript with C syntax */
 NULL };
 static char Cplusplus_help [] =
 "In C++ code, all the tag constructs of C code are tagged.  (Use\n\
 --help --lang=c --lang=c++ for full help.)\n\
-In addition to C tags, member functions are also recognized, and\n\
+In addition to C tags, member functions are also recognized.  Member\n\
-optionally member variables if you use the `--members' option.\n\
+variables are recognized unless you use the `--no-members' option.\n\
 Tags for variables and functions in classes are named `CLASS::VARIABLE'\n\
 and `CLASS::FUNCTION'.  `operator' definitions have tag names like\n\
 `operator+'.";
 static char *Cjava_suffixes [] =
 defined in the default package is `main::SUB'.";
 static char *PHP_suffixes [] =
 { "php", "php3", "php4", NULL };
 static char PHP_help [] =
-"In PHP code, tags are functions, classes and defines.  When using\n\
+"In PHP code, tags are functions, classes and defines.  Unless you use\n\
-the `--members' option, vars are tags too.";
+the `--no-members' option, vars are tags too.";
 static char *plain_C_suffixes [] =
 { "pc",			/* Pro*C file */
 NULL };
 	Create tag entries for global variables in some languages.");
 else
 puts ("--no-globals\n\
 	Do not create tag entries for global variables in some\n\
 	languages.  This makes the tags file smaller.");
-puts ("--members\n\
+puts ("--no-members\n\
-	Create tag entries for members of structures in some languages.");
+	Do not create tag entries for members of structures\n\
+	in some languages.");
 puts ("-r REGEXP, --regex=REGEXP or --regex=@regexfile\n\
 Make a tag for each line matching a regular expression pattern\n\
 	in the following files.  {LANGUAGE}REGEXP uses REGEXP for LANGUAGE\n\
 	files only.  REGEXFILE is a file containing one REGEXP per line.\n\
 is small. */
 argbuffer = xnew (argc, argument);
 /*
 * If etags, always find typedefs and structure tags.  Why not?
-* Also default to find macro constants, enum constants and
+* Also default to find macro constants, enum constants, struct
-* global variables.
+* members and global variables.
 */
 if (!CTAGS)
 {
 typedefs = typedefs_or_cplusplus = constantypedefs = TRUE;
 globals = TRUE;
 __attribute__,	0,			st_C_attribute
 @interface,	0,			st_C_objprot
 @protocol,	0,			st_C_objprot
 @implementation,0,			st_C_objimpl
 @end,		0,			st_C_objend
-import,		(C_JAVA & !C_PLPL),	st_C_ignore
+import,		(C_JAVA & ~C_PLPL),	st_C_ignore
-package,	(C_JAVA & !C_PLPL),	st_C_ignore
+package,	(C_JAVA & ~C_PLPL),	st_C_ignore
 friend,		C_PLPL,			st_C_ignore
-extends,	(C_JAVA & !C_PLPL),	st_C_javastruct
+extends,	(C_JAVA & ~C_PLPL),	st_C_javastruct
-implements,	(C_JAVA & !C_PLPL),	st_C_javastruct
+implements,	(C_JAVA & ~C_PLPL),	st_C_javastruct
-interface,	(C_JAVA & !C_PLPL),	st_C_struct
+interface,	(C_JAVA & ~C_PLPL),	st_C_struct
 class,		0,			st_C_class
 namespace,	C_PLPL,			st_C_struct
 domain,		C_STAR,			st_C_struct
 union,		0,			st_C_struct
 struct,		0,			st_C_struct
 {"if",		0,			st_C_ignore},
 {""},
 {"@end",		0,			st_C_objend},
 {"union",		0,			st_C_struct},
 {"define",		0,			st_C_define},
-{"import",		(C_JAVA & !C_PLPL),	st_C_ignore},
+{"import",		(C_JAVA & ~C_PLPL),	st_C_ignore},
 {"template",	0,			st_C_template},
 {"operator",	C_PLPL,			st_C_operator},
 {"@interface",	0,			st_C_objprot},
-{"implements",	(C_JAVA & !C_PLPL),	st_C_javastruct},
+{"implements",	(C_JAVA & ~C_PLPL),	st_C_javastruct},
 {"friend",		C_PLPL,			st_C_ignore},
 {"typedef",	0,			st_C_typedef},
 {"return",		0,			st_C_ignore},
 {"@implementation",0,			st_C_objimpl},
 {"@protocol",	0,			st_C_objprot},
-{"interface",	(C_JAVA & !C_PLPL),	st_C_struct},
+{"interface",	(C_JAVA & ~C_PLPL),	st_C_struct},
 {"extern",		0,			st_C_extern},
-{"extends",	(C_JAVA & !C_PLPL),	st_C_javastruct},
+{"extends",	(C_JAVA & ~C_PLPL),	st_C_javastruct},
 {"struct",		0,			st_C_struct},
 {"domain",		C_STAR,			st_C_struct},
 {"switch",		0,			st_C_ignore},
 {"enum",		0,			st_C_enum},
 {"for",		0,			st_C_ignore},
 {"namespace",	C_PLPL,			st_C_struct},
 {"class",		0,			st_C_class},
 {"while",		0,			st_C_ignore},
 {"undef",		0,			st_C_define},
-{"package",	(C_JAVA & !C_PLPL),	st_C_ignore},
+{"package",	(C_JAVA & ~C_PLPL),	st_C_ignore},
 {"__attribute__",	0,			st_C_attribute},
 {"SYSCALL",	0,			st_C_gnumacro},
 {"ENTRY",		0,			st_C_gnumacro},
 {"PSEUDO",		0,			st_C_gnumacro},
 {"DEFUN",		0,			st_C_gnumacro}
 * Local Variables:
 * indent-tabs-mode: t
 * tab-width: 8
 * fill-column: 79
 * c-font-lock-extra-types: ("FILE" "bool" "language" "linebuffer" "fdesc" "node" "regexp")
-* c-file-style: gnu
+* c-file-style: "gnu"
 * End:
 */
 /* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
 (do not change this comment) */

Mercurial > emacs

comparison lib-src/etags.c @ 90751:52a7f3f50b89