xemacs-beta: lib-src/etags.c comparison

comparison lib-src/etags.c @ 134:34a5b81f86ba r20-2b1

Import from CVS: tag r20-2b1

author	cvs
date	Mon, 13 Aug 2007 09:30:11 +0200
parents	b82b59fe008d
children	1856695b1fa9

comparison

equal deleted inserted replaced

-:b27e67717092
+:34a5b81f86ba
 *	Regexp tags by Tom Tromey.
 *
 *	Francesco Potorti` (F.Potorti@cnuce.cnr.it) is the current maintainer.
 */
-char pot_etags_version[] = "@(#) pot revision number is 11.78";
+char pot_etags_version[] = "@(#) pot revision number is 11.83";
 #define	TRUE	1
 #define	FALSE	0
 #ifndef DEBUG
 #ifdef ETAGS_REGEXPS
 # include <regex.h>
 #endif /* ETAGS_REGEXPS */
 /* Define CTAGS to make the program "ctags" compatible with the usual one.
-Let it undefined to make the program "etags", which makes emacs-style
+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
 # undef  CTAGS
 # define CTAGS TRUE
 #else
 /* C extensions. */
 #define C_PLPL	0x00001		/* C++ */
 #define C_STAR	0x00003		/* C* */
 #define YACC	0x10000		/* yacc file */
-#define streq(s,t)	((DEBUG &&!(s)&&!(t)&&(abort(),1)) || !strcmp(s,t))
+#define streq(s,t)	((DEBUG && (s) == NULL && (t) == NULL	\
-#define strneq(s,t,n)	((DEBUG &&!(s)&&!(t)&&(abort(),1)) || !strncmp(s,t,n))
+			  && (abort (), 1)) || !strcmp (s, t))
+#define strneq(s,t,n)	((DEBUG && (s) == NULL && (t) == NULL	\
+			  && (abort (), 1)) || !strncmp (s, t, n))
 #define lowcase(c)	tolower ((char)c)
 #define	iswhite(arg)	(_wht[arg])	/* T if char is white		*/
 #define	begtoken(arg)	(_btk[arg])	/* T if char can start token	*/
 at_language,
 at_regexp,
 at_filename
 };
-/* This structure helps us allow mixing of --lang and filenames. */
+/* This structure helps us allow mixing of --lang and file names. */
 typedef struct
 {
 enum argument_type arg_type;
 char *what;
 Lang_function *function;
 char    body[MAX_FILE_SPEC_LEN + 1];
 } vspec;
 /*
 v1.05 nmm 26-Jun-86 fn_exp - expand specification of list of file names
-returning in each successive call the next filename matching the input
+returning in each successive call the next file name matching the input
 spec. The function expects that each in_spec passed
 to it will be processed to completion; in particular, up to and
 including the call following that in which the last matching name
 is returned, the function ignores the value of in_spec, and will
 only start processing a new spec with the following call.
 If an error occurs, on return out_spec contains the value
 of in_spec when the error occurred.
-With each successive filename returned in out_spec, the
+With each successive file name returned in out_spec, the
 function's return value is one. When there are no more matching
 names the function returns zero. If on the first call no file
 matches in_spec, or there is any other error, -1 is returned.
 */
 	  /* If getopt returns 0, then it has already processed a
 	     long-named option.  We should do nothing.  */
 	  break;
 	case 1:
-	  /* This means that a filename has been seen.  Record it. */
+	  /* This means that a file name has been seen.  Record it. */
 	  argbuffer[current_arg].arg_type = at_filename;
 	  argbuffer[current_arg].what = optarg;
 	  ++current_arg;
 	  ++file_count;
 	  break;
 {
 char *filename;
 if (absolutefn (file))
 	{
-	  /* file is an absolute filename.  Canonicalise it. */
+	  /* file is an absolute file name.  Canonicalise it. */
 	  filename = absolute_filename (file, cwd);
 	}
 else
 	{
-	  /* file is a filename relative to cwd.  Make it relative
+	  /* file is a file name relative to cwd.  Make it relative
 	     to the directory of the tags file. */
 	  filename = relative_filename (file, tagfiledir);
 	}
 fprintf (tagf, "\f\n%s,%d\n", filename, total_size_of_entries (head));
 free (filename);
 savetok.valid = FALSE;						\
 }									\
 definedef = dnone;							\
 } while (0)
-/* This macro should never be called when tok.valid is FALSE, but
-we must protect about both invalid input and internal errors. */
+void
-#define make_C_tag(isfun)  do \
+make_C_tag (isfun, tokp)
-if (tok.valid) {							\
+logical isfun;
-char *name = NULL;							\
+TOKEN *tokp;
-if (CTAGS || tok.named)						\
+{
-name = savestr (token_name.buffer);					\
+char *name = NULL;
-pfnote (name, isfun, tok.buffer, tok.linelen, tok.lineno, tok.linepos); \
-tok.valid = FALSE;							\
+/* This function should never be called when tok.valid is FALSE, but
-} /* else if (DEBUG) abort (); */ while (0)
+we must protect against invalid input or internal errors. */
+if (tokp->valid)
+{
+if (CTAGS || tokp->named)
+	name = savestr (token_name.buffer);
+pfnote (name, isfun,
+	      tokp->buffer, tokp->linelen, tokp->lineno, tokp->linepos);
+tokp->valid = FALSE;
+}
+else if (DEBUG)
+abort ();
+}
 void
 C_entries (c_ext, inf)
 int c_ext;			/* extension of C */
 FILE *inf;			/* input file */
 			    {
 			      if (current_lb_is_new)
 				switch_line_buffers ();
 			    }
 			  else
-			    make_C_tag (is_func);
+			    make_C_tag (is_func, &tok);
 			}
 		      midtoken = FALSE;
 		    }
 		} /* if (endtoken (c)) */
 	      else if (intoken (c))
 		    {
 		    case fstartlist:
 		      funcdef = finlist;
 		      continue;
 		    case flistseen:
-		      make_C_tag (TRUE);
+		      make_C_tag (TRUE, &tok);
 		      funcdef = fignore;
 		      break;
 		    case ftagseen:
 		      funcdef = fnone;
 		      break;
 	    break;
 	  switch (objdef)
 	    {
 	    case  otagseen:
 	      objdef = oignore;
-	      make_C_tag (TRUE);
+	      make_C_tag (TRUE, &tok);
 	      break;
 	    case omethodtag:
 	    case omethodparm:
 	      objdef = omethodcolon;
 	      methodlen += 1;
 	    switch (funcdef)
 	      {
 	      case ftagseen:
 		if (yacc_rules)
 		  {
-		    make_C_tag (FALSE);
+		    make_C_tag (FALSE, &tok);
 		    funcdef = fignore;
 		  }
 		break;
 	      case fstartlist:
 		funcdef = fnone;
 	    break;
 	  if (cblev == 0)
 	    switch (typdef)
 	      {
 	      case tend:
-		make_C_tag (FALSE);
+		make_C_tag (FALSE, &tok);
 		/* FALLTHRU */
 	      default:
 		typdef = tnone;
 	      }
 	  if (funcdef != fignore)
 	    break;
 	  switch (objdef)
 	    {
 	    case omethodtag:
 	    case omethodparm:
-	      make_C_tag (TRUE);
+	      make_C_tag (TRUE, &tok);
 	      objdef = oinbody;
 	      break;
 	    }
 	  if (funcdef != finlist && funcdef != fignore)
 	    funcdef = fnone;
 	  if (definedef != dnone)
 	    break;
 	  if (cblev == 0 && typdef == tend)
 	    {
 	      typdef = tignore;
-	      make_C_tag (FALSE);
+	      make_C_tag (FALSE, &tok);
 	      break;
 	    }
 	  if (funcdef != finlist && funcdef != fignore)
 	    funcdef = fnone;
 	  if (structdef == stagseen)
 		case ttypedseen:
 		case tend:
 		  /* Make sure that the next char is not a '*'.
 		     This handles constructs like:
 		     typedef void OperatorFun (int fun); */
-		  if (*lp != '*')
+		  if (tok.valid && *lp != '*')
 		    {
 		      typdef = tignore;
-		      make_C_tag (FALSE);
+		      make_C_tag (FALSE, &tok);
 		    }
 		  break;
 		} /* switch (typdef) */
 	      break;
 	    case ftagseen:
 	case ')':
 	  if (definedef != dnone)
 	    break;
 	  if (objdef == ocatseen && parlev == 1)
 	    {
-	      make_C_tag (TRUE);
+	      make_C_tag (TRUE, &tok);
 	      objdef = oignore;
 	    }
 	  if (--parlev == 0)
 	    {
 	      switch (funcdef)
 		  break;
 		}
 	      if (cblev == 0 && typdef == tend)
 		{
 		  typdef = tignore;
-		  make_C_tag (FALSE);
+		  make_C_tag (FALSE, &tok);
 		}
 	    }
 	  else if (parlev < 0)	/* can happen due to ill-conceived #if's. */
 	    parlev = 0;
 	  break;
 	      structtag = "_anonymous_";
 	      break;
 	    case stagseen:
 	    case scolonseen:	/* named struct */
 	      structdef = sinbody;
-	      make_C_tag (FALSE);
+	      make_C_tag (FALSE, &tok);
 	      break;
 	    }
 	  switch (funcdef)
 	    {
 	    case flistseen:
-	      make_C_tag (TRUE);
+	      make_C_tag (TRUE, &tok);
 	      /* FALLTHRU */
 	    case fignore:
 	      funcdef = fnone;
 	      break;
 	    case fnone:
 	      switch (objdef)
 		{
 		case otagseen:
-		  make_C_tag (TRUE);
+		  make_C_tag (TRUE, &tok);
 		  objdef = oignore;
 		  break;
 		case omethodtag:
 		case omethodparm:
-		  make_C_tag (TRUE);
+		  make_C_tag (TRUE, &tok);
 		  objdef = oinbody;
 		  break;
 		default:
 		  /* Neutralize `extern "C" {' grot. */
 		  if (cblev == 0 && structdef == snone && typdef == tnone)
 	    funcdef = fnone;
 	  break;
 	case '\0':
 	  if (objdef == otagseen)
 	    {
-	      make_C_tag (TRUE);
+	      make_C_tag (TRUE, &tok);
 	      objdef = oignore;
 	    }
 	  /* If a macro spans multiple lines don't reset its state. */
 	  if (quotednl)
 	    CNL_SAVE_DEFINEDEF;
 else if (dbp[0] == '/' && dbp[1] == '*')	/* comment. */
 	prolog_skip_comment (&lb, inf);
 else if (len = prolog_pred (dbp, last))
 	{
 	  /* Predicate.  Store the function name so that we only
-	   * generates a tag for the first clause.  */
+	     generate a tag for the first clause.  */
 	  if (last == NULL)
 	    last = xnew(len + 1, char);
 	  else if (len + 1 > allocated)
 	    last = (char *) xrealloc(last, len + 1);
 	  allocated = len + 1;
 return path.buffer;
 #endif /* not MSDOS */
 #endif /* not HAVE_GETCWD */
 }
-/* Return a newly allocated string containing the filename
+/* Return a newly allocated string containing the file name
 of FILE relative to the absolute directory DIR (which
 should end with a slash). */
 char *
 relative_filename (file, dir)
 char *file, *dir;
 {
 char *fp, *dp, *abs, *res;
+int i;
 /* Find the common root of file and dir (with a trailing slash). */
 abs = absolute_filename (file, cwd);
 fp = abs;
 dp = dir;
 while (*fp++ == *dp++)
 continue;
 fp--, dp--;			/* back to the first differing char */
-do				/* look at the equal chars until / */
+do				/* look at the equal chars until '/' */
 fp--, dp--;
 while (*fp != '/');
-/* Build a sequence of "../" strings for the resulting relative filename. */
+/* Build a sequence of "../" strings for the resulting relative file name. */
-for (dp = etags_strchr (dp + 1, '/'), res = "";
+i = 0;
-dp != NULL;
+while ((dp = etags_strchr (dp + 1, '/')) != NULL)
-dp = etags_strchr (dp + 1, '/'))
+i += 1;
-{
+res = xnew (3*i + strlen (fp + 1) + 1, char);
-res = concat (res, "../", "");
+res[0] = '\0';
-}
+while (i-- > 0)
+strcat (res, "../");
-/* Add the filename relative to the common root of file and dir. */
-res = concat (res, fp + 1, "");
+/* Add the file name relative to the common root of file and dir. */
+strcat (res, fp + 1);
 free (abs);
 return res;
 }
 /* Return a newly allocated string containing the
-absolute filename of FILE given CWD (which should
+absolute file name of FILE given CWD (which should
 end with a slash). */
 char *
 absolute_filename (file, cwd)
 char *file, *cwd;
 {
 char *slashp, *cp, *res;
 if (absolutefn (file))
-res = concat (file, "", "");
+res = savestr (file);
 #ifdef DOS_NT
-/* We don't support non-absolute filenames with a drive
+/* We don't support non-absolute file names with a drive
 letter, like `d:NAME' (it's too much hassle).  */
 else if (file[1] == ':')
-fatal ("%s: relative filenames with drive letters not supported", file);
+fatal ("%s: relative file names with drive letters not supported", file);
 #endif
 else
 res = concat (cwd, file, "");
 /* Delete the "/dirname/.." and "/." substrings. */
 	    {
 	      cp = slashp;
 	      do
 		cp--;
 	      while (cp >= res && !absolutefn (cp));
-	      if (*cp == '/')
+	      if (cp < res)
-		{
+		cp = slashp;	/* the absolute name begins with "/.." */
-		  strcpy (cp, slashp + 3);
-		}
 #ifdef DOS_NT
 	      /* Under MSDOS and NT we get `d:/NAME' as absolute
-		 filename, so the luser could say `d:/../NAME'.
+		 file name, so the luser could say `d:/../NAME'.
 		 We silently treat this as `d:/NAME'.  */
-	      else if (cp[1] == ':')
+	      else if (cp[0] != '/')
-		strcpy (cp + 3, slashp + 4);
+		cp = slashp;
 #endif
-	      else		/* else (cp == res) */
+	      strcpy (cp, slashp + 3);
-		{
-		  if (slashp[3] != '\0')
-		    strcpy (cp, slashp + 4);
-		  else
-		    return ".";
-		}
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
 	    }
 	}
 slashp = etags_strchr (slashp + 1, '/');
 }
-return res;
+if (res[0] == '\0')
+return savestr ("/");
+else
+return res;
 }
 /* Return a newly allocated string containing the absolute
-filename of dir where FILE resides given CWD (which should
+file name of dir where FILE resides given CWD (which should
 end with a slash). */
 char *
 absolute_dirname (file, cwd)
 char *file, *cwd;
 {
 *p = '/';
 #endif
 slashp = etags_strrchr (file, '/');
 if (slashp == NULL)
-return cwd;
+return savestr (cwd);
 save = slashp[1];
 slashp[1] = '\0';
 res = absolute_filename (file, cwd);
 slashp[1] = save;

Mercurial > hg > xemacs-beta

comparison lib-src/etags.c @ 134:34a5b81f86ba r20-2b1