Changeset 4140 for trunk/lib-src/etags.c

Timestamp:

08/10/06 11:19:54 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lib-src/etags.c (modified) (27 diffs)

trunk/lib-src/etags.c

@@ -42 +42 @@
- */
-
-18
+20
-
-#define TRUE    1
@@ -60 +60 @@
-     of unexec.  We don't want that here since we don't use unexec. */
-# undef static
-
-
-
+
-#   define PTR void *
-# endif
-e
+E
-#   define __P(args) args
-# endif
@@ -83 +81 @@
-#endif
-
-
-
-
-
-
-
-
-
+
-   MSDOS, WINDOWSNT, DOS_NT are for Emacs. */
-#ifdef WIN32_NATIVE
@@ -168 +159 @@
-#endif
-
-
-
-
+
+
-# define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
-  extern char *optarg;
-  extern int optind, opterr;
-
-
-
-
-
+
+
+
+
+
+
+
-                             !!! 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 /* ETAGS_REGEXPS */
+endif
+include <regex.h>
-
-/* Define CTAGS to make the program "ctags" compatible with the usual one.
@@ -313 +304 @@
-} argument;
-
-#ifdef ETAGS_REGEXPS
-/* Structure defining a regular expression. */
-typedef struct regexp
@@ -328 +318 @@
-  bool multi_line;              /* do a multi-line match on the whole file */
-} regexp;
-#endif /* ETAGS_REGEXPS */
-
-
@@ -376 +365 @@
-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));
@@ -486 +473 @@
-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 */
-
-
-
-
-
+
-static struct option longopts[] =
-{
@@ -508 +490 @@
-  { "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'   },
@@ -534 +514 @@
-  { NULL }
-};
-#endif /* LONG_OPTIONS */
-
-static compressor compressors[] =
@@ -682 +661 @@
-"In Objective C code, tags include Objective C definitions for classes,\n\
-class categories, methods and protocols.  Tags for variables and\n\
-
+
+
-
-static char *Pascal_suffixes [] =
@@ -689 +669 @@
-"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 [] =
@@ -886 +867 @@
-\n\
-These are the options accepted by %s.\n", progname, progname);
-
+
+
+
+
-    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\
@@ -950 +931 @@
-        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\
@@ -965 +945 @@
-  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\
@@ -1195 +1174 @@
-  /* When the optstring begins with a '-' getopt_long does not rearrange the
-     non-options arguments to be at the end, but leaves them alone. */
-
-
-
-
-
-
-
-
+
+
-                      (CTAGS) ? "BxdtTuvw" : "Di:");
-
@@ -1376 +1349 @@
-          lang = argbuffer[i].lang;
-          break;
-#ifdef ETAGS_REGEXPS
-        case at_regexp:
-          analyse_regex (argbuffer[i].what);
-          break;
-#endif
-        case at_filename:
-#ifdef VMS
@@ -1420 +1391 @@
-    }
-
-#ifdef ETAGS_REGEXPS
-  free_regexps ();
-#endif /* ETAGS_REGEXPS */
-  free (lb.buffer);
-  free (filebuf.buffer);
@@ -1980 +1949 @@
-  parser (inf);
-
-#ifdef ETAGS_REGEXPS
-  regex_tag_multiline ();
-#endif /* ETAGS_REGEXPS */
-}
-
@@ -3240 +3207 @@
-  bool incomm, inquote, inchar, quotednl, midtoken;
-  bool yacc_rules;              /* in the rules part of a yacc file */
-;                
+ = {0};  
-
-
@@ -5199 +5166 @@
-      /* Skip to next line if we hit the TeX comment char. */
-      if (c == '%')
-
+ && c != EOF
-          c = getc (inf);
-      else if (c == TEX_LESC || c == TEX_SESC )
@@ -5736 +5703 @@
-
-
-#ifdef ETAGS_REGEXPS
-
-static char *scan_separators __P((char *));
-static void add_regex __P((char *, language *));
@@ -6142 +6107 @@
-}
-
-#endif /* ETAGS_REGEXPS */
-
-
-static bool
@@ -6297 +6260 @@
-
-          if (DEBUG) start = 0; /* shut up the compiler */
-
-
-
+
+
+
+
-
-              assert (start > 0);
@@ -6406 +6370 @@
-    } /* if #line directives should be considered */
-
-#ifdef ETAGS_REGEXPS
-  {
-    int match;
@@ -6463 +6426 @@
-        }
-  }
-#endif /* ETAGS_REGEXPS */
-}
-
@@ -6624 +6586 @@
-{
-  fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
-LONG_OPTIONS ? "--help" : "-h
+NO_LONG_OPTIONS ? "-h" : "--help
-  exit (EXIT_FAILURE);
-}