emacs: lib-src/etags.c comparison

comparison lib-src/etags.c @ 90573:858cb33ae39d

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 357-381) - Merge from gnus--rel--5.10 - Update from CVS - Merge from erc--emacs--21 * gnus--rel--5.10 (patch 116-122) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98

author	Miles Bader <miles@gnu.org>
date	Thu, 03 Aug 2006 11:45:23 +0000
parents	8a8e69664178 15be100e5afb
children	7f3f771c85fa

comparison

equal deleted inserted replaced

-:ab9b8d043c39
+:858cb33ae39d
 * If you want to add support for a new language, start by looking at the LUA
 * language, which is the simplest.  Alternatively, consider shipping a
 * configuration file containing regexp definitions for etags.
 */
-char pot_etags_version[] = "@(#) pot revision number is 17.18";
+char pot_etags_version[] = "@(#) pot revision number is 17.20";
 #define	TRUE	1
 #define	FALSE	0
 #ifdef DEBUG
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 /* On some systems, Emacs defines static as nothing for the sake
 of unexec.  We don't want that here since we don't use unexec. */
 # undef static
-# define ETAGS_REGEXPS		/* use the regexp features */
+# ifndef PTR			/* for XEmacs */
-# define LONG_OPTIONS		/* accept long options */
-# ifndef PTR			/* for Xemacs */
 #   define PTR void *
 # endif
-# ifndef __P			/* for Xemacs */
+# ifndef __P			/* for XEmacs */
 #   define __P(args) args
 # endif
 #else  /* no config.h */
 # if defined(__STDC__) && (__STDC__ || defined(__SUNPRO_C))
 #   define __P(args) args	/* use prototypes */
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1		/* enables some compiler checks on GNU */
 #endif
-#ifdef LONG_OPTIONS
+/* WIN32_NATIVE is for XEmacs.
-#  undef LONG_OPTIONS
-#  define LONG_OPTIONS TRUE
-#else
-#  define LONG_OPTIONS  FALSE
-#endif
-/* WIN32_NATIVE is for Xemacs.
 MSDOS, WINDOWSNT, DOS_NT are for Emacs. */
 #ifdef WIN32_NATIVE
 # undef MSDOS
 # undef  WINDOWSNT
 # define WINDOWSNT
 #if !defined (S_ISREG) && defined (S_IFREG)
 # define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
 #endif
-#if LONG_OPTIONS
+#ifdef NO_LONG_OPTIONS		/* define this if you don't have GNU getopt */
-# include <getopt.h>
+# define NO_LONG_OPTIONS TRUE
-#else
 # define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
 extern char *optarg;
 extern int optind, opterr;
-#endif /* LONG_OPTIONS */
+#else
+# define NO_LONG_OPTIONS FALSE
-#ifdef ETAGS_REGEXPS
+# include <getopt.h>
-# ifndef HAVE_CONFIG_H		/* this is a standalone compilation */
+#endif /* NO_LONG_OPTIONS */
-#   ifdef __CYGWIN__         	/* compiling on Cygwin */
+#ifndef HAVE_CONFIG_H		/* this is a standalone compilation */
+# ifdef __CYGWIN__         	/* compiling on Cygwin */
 			     !!! NOTICE !!!
 the regex.h distributed with Cygwin is not compatible with etags, alas!
 If you want regular expression support, you should delete this notice and
 	      arrange to use the GNU regex.h and regex.c.
-#   endif
 # endif
-# include <regex.h>
+#endif
-#endif /* ETAGS_REGEXPS */
+#include <regex.h>
 /* Define CTAGS to make the program "ctags" compatible with the usual one.
 Leave it undefined to make the program "etags", which makes emacs-style
 tag tables and tags typedefs, #defines and struct/union/enum by default. */
 #ifdef CTAGS
 } arg_type;			/* argument type */
 language *lang;		/* language associated with the argument */
 char *what;			/* the argument itself */
 } argument;
-#ifdef ETAGS_REGEXPS
 /* Structure defining a regular expression. */
 typedef struct regexp
 {
 struct regexp *p_next;	/* pointer to next in list */
 language *lang;		/* if set, use only for this language */
 bool error_signaled;		/* already signaled for this regexp */
 bool force_explicit_name;	/* do not allow implict tag name */
 bool ignore_case;		/* ignore case when matching */
 bool multi_line;		/* do a multi-line match on the whole file */
 } regexp;
-#endif /* ETAGS_REGEXPS */
 /* Many compilers barf on this:
 	Lang_function Ada_funcs;
 so let's write it this way */
 static void readline __P((linebuffer *, FILE *));
 static long readline_internal __P((linebuffer *, FILE *));
 static bool nocase_tail __P((char *));
 static void get_tag __P((char *, char **));
-#ifdef ETAGS_REGEXPS
 static void analyse_regex __P((char *));
 static void free_regexps __P((void));
 static void regex_tag_multiline __P((void));
-#endif /* ETAGS_REGEXPS */
 static void error __P((const char *, const char *));
 static void suggest_asking_for_help __P((void));
 void fatal __P((char *, char *));
 static void pfatal __P((char *));
 static void add_node __P((node *, node **));
 #endif
 #define STDIN 0x1001		/* returned by getopt_long on --parse-stdin */
 static bool parsing_stdin;	/* --parse-stdin used */
-#ifdef ETAGS_REGEXPS
 static regexp *p_head;		/* list of all regexps */
 static bool need_filebuf;	/* some regexes are multi-line */
-#else
-# define need_filebuf FALSE
-#endif /* ETAGS_REGEXPS */
-#if LONG_OPTIONS
 static struct option longopts[] =
 {
 { "append",		  no_argument,	     NULL,	     	 'a'   },
 { "packages-only",      no_argument,	     &packages_only, 	 TRUE  },
 { "c++",		  no_argument,	     NULL,	     	 'C'   },
 { "ignore-indentation", no_argument,	     NULL,     	     	 'I'   },
 { "language",           required_argument, NULL,     	     	 'l'   },
 { "members",		  no_argument,	     &members, 	     	 TRUE  },
 { "no-members",	  no_argument,	     &members, 	     	 FALSE },
 { "output",		  required_argument, NULL,	     	 'o'   },
-#ifdef ETAGS_REGEXPS
 { "regex",		  required_argument, NULL,	     	 'r'   },
 { "no-regex",		  no_argument,	     NULL,	     	 'R'   },
 { "ignore-case-regex",  required_argument, NULL,	     	 'c'   },
-#endif /* ETAGS_REGEXPS */
 { "parse-stdin",        required_argument, NULL,               STDIN },
 { "version",		  no_argument,	     NULL,     	     	 'V'   },
 #if CTAGS /* Ctags options */
 { "backward-search",	  no_argument,	     NULL,	     	 'B'   },
 { "no-globals",	  no_argument,	     &globals, 	     	 FALSE },
 { "include",		  required_argument, NULL,     	     	 'i'   },
 #endif
 { NULL }
 };
-#endif /* LONG_OPTIONS */
 static compressor compressors[] =
 {
 { "z", "gzip -d -c"},
 { "Z", "gzip -d -c"},
 "m",			/* Objective C file */
 NULL };
 static char Objc_help [] =
 "In Objective C code, tags include Objective C definitions for classes,\n\
 class categories, methods and protocols.  Tags for variables and\n\
-functions in classes are named `CLASS::VARIABLE' and `CLASS::FUNCTION'.";
+functions in classes are named `CLASS::VARIABLE' and `CLASS::FUNCTION'.\n\
+(Use --help --lang=c --lang=objc --lang=java for full help.)";
 static char *Pascal_suffixes [] =
 { "p", "pas", NULL };
 static char Pascal_help [] =
 "In Pascal code, the tags are the functions and procedures defined\n\
 in the file.";
+/* " // this is for working around an Emacs highlighting bug... */
 static char *Perl_suffixes [] =
 { "pl", "pm", NULL };
 static char *Perl_interpreters [] =
 { "perl", "@PERL@", NULL };
 exit (EXIT_SUCCESS);
 printf ("Usage: %s [options] [[regex-option ...] file-name] ...\n\
 \n\
 These are the options accepted by %s.\n", progname, progname);
-if (LONG_OPTIONS)
+if (NO_LONG_OPTIONS)
+puts ("WARNING: long option names do not work with this executable,\n\
+as it is not linked with GNU getopt.");
+else
 puts ("You may use unambiguous abbreviations for the long option names.");
-else
-puts ("Long option names do not work with this executable, as it is not\n\
-linked with GNU getopt.");
 puts ("  A - as file name means read names from stdin (one per line).\n\
 Absolute names are stored in the output file as they are.\n\
 Relative ones are stored relative to the output file's directory.\n");
 puts ("-a, --append\n\
 	Do not create tag entries for global variables in some\n\
 	languages.  This makes the tags file smaller.");
 puts ("--members\n\
 	Create tag entries for members of structures in some languages.");
-#ifdef ETAGS_REGEXPS
 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\
 	REGEXP takes the form /TAGREGEXP/TAGNAME/MODS, where TAGNAME/ is\n\
 	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.");
-#endif /* ETAGS_REGEXPS */
 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.");
 globals = 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. */
-optstring = "-";
+optstring = concat (NO_LONG_OPTIONS ? "" : "-",
-#ifdef ETAGS_REGEXPS
+		      "ac:Cf:Il:o:r:RSVhH",
-optstring = "-r:Rc:";
-#endif /* ETAGS_REGEXPS */
-if (!LONG_OPTIONS)
-optstring += 1;		/* remove the initial '-' */
-optstring = concat (optstring,
-		      "aCf:Il:o:SVhH",
 		      (CTAGS) ? "BxdtTuvw" : "Di:");
 while ((opt = getopt_long (argc, argv, optstring, longopts, NULL)) != EOF)
 switch (opt)
 {
 switch (argbuffer[i].arg_type)
 	{
 	case at_language:
 	  lang = argbuffer[i].lang;
 	  break;
-#ifdef ETAGS_REGEXPS
 	case at_regexp:
 	  analyse_regex (argbuffer[i].what);
 	  break;
-#endif
 	case at_filename:
 #ifdef VMS
 	  while ((this_file = gfnames (argbuffer[i].what, &got_err)) != NULL)
 	    {
 	      if (got_err)
 process_file (stdin, this_file, lang);
 break;
 	}
 }
-#ifdef ETAGS_REGEXPS
 free_regexps ();
-#endif /* ETAGS_REGEXPS */
 free (lb.buffer);
 free (filebuf.buffer);
 free (token_name.buffer);
 if (!CTAGS || cxref_style)
 charno = 0;		       /* reset global char number */
 linecharno = 0;	       /* reset global char number of line start */
 parser (inf);
-#ifdef ETAGS_REGEXPS
 regex_tag_multiline ();
-#endif /* ETAGS_REGEXPS */
 }
 /*
 * Check whether an implicitly named tag should be created,
 int attrparlev;		/* __attribute__ parenthesis level */
 int templatelev;		/* current template level */
 int typdefbracelev;		/* bracelev where a typedef struct body begun */
 bool incomm, inquote, inchar, quotednl, midtoken;
 bool yacc_rules;		/* in the rules part of a yacc file */
-struct tok savetoken;	        /* token saved during preprocessor handling */
+struct tok savetoken = {0};	/* token saved during preprocessor handling */
 linebuffer_init (&lbs[0].lb);
 linebuffer_init (&lbs[1].lb);
 if (cstack.size == 0)
 return pos;
 }
-#ifdef ETAGS_REGEXPS
 static char *scan_separators __P((char *));
 static void add_regex __P((char *, language *));
 static char *substitute __P((char *, char *, struct re_registers *));
 /*
 	      break;
 	    }
 	}
 }
 }
-#endif /* ETAGS_REGEXPS */
 static bool
 nocase_tail (cp)
 char *cp;
 	  discard_until_line_directive = FALSE;
 	  return;
 	}
 } /* if #line directives should be considered */
-#ifdef ETAGS_REGEXPS
 {
 int match;
 regexp *rp;
 char *name;
 			  lbp->buffer, match, lineno, linecharno);
 	      break;
 	    }
 	}
 }
-#endif /* ETAGS_REGEXPS */
 }
 /*
 * Return a pointer to a space of size strlen(cp)+1 allocated
 static void
 suggest_asking_for_help ()
 {
 fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
-	   progname, LONG_OPTIONS ? "--help" : "-h");
+	   progname, NO_LONG_OPTIONS ? "-h" : "--help");
 exit (EXIT_FAILURE);
 }
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
 static void

Mercurial > emacs

comparison lib-src/etags.c @ 90573:858cb33ae39d