emacs: lib-src/etags.c comparison

comparison lib-src/etags.c @ 47157:e47f0756e65a

(consider_token, C_entries): Switch to C++ parsing when auto-detection is enabled and the `::' qualifier is met. (consider_token, C_entries): Several bugs corrected that tagged some declarations even though --declarations was not used. (plainc): New macro. (C_entries): Use it. (C_entries): Several cosmetic changes. (C_entries): Invalidate the token is some cases.

author	Francesco Potortì <pot@gnu.org>
date	Fri, 30 Aug 2002 16:38:58 +0000
parents	4098bad57f21
children	66c5d66d21f6

comparison

equal deleted inserted replaced

-:293b7469c8bf
+:e47f0756e65a
 *
 * Francesco Potortė <pot@gnu.org> has maintained and improved it since 1993.
 *
 */
-char pot_etags_version[] = "@(#) pot revision number is 16.46";
+char pot_etags_version[] = "@(#) pot revision number is 16.54";
 #define	TRUE	1
 #define	FALSE	0
 #ifdef DEBUG
 	  /* We found one of those!  We must delete both the file description
 	     and all tags referring to it. */
 	  {
 	    fdesc *badfdp = *fdpp;
-	    if (DEBUG)
+	    /* Delete the tags referring to badfdp->taggedfname
-	      fprintf (stderr,
+	       that were obtained from badfdp->infname. */
-		       "Removing references to \"%s\" obtained from \"%s\"\n",
-		       badfdp->taggedfname, badfdp->infname);
-	    /* Delete the tags referring to badfdp. */
 	    invalidate_nodes (badfdp, &nodehead);
 	    *fdpp = badfdp->next; /* remove the bad description from the list */
 	    free_fdesc (badfdp);
 	  }
 * Use this structure to keep info about the token read, and how it
 * should be tagged.  Used by the make_C_tag function to build a tag.
 */
 static struct tok
 {
-bool valid;
+char *line;			/* string containing the token */
-bool named;
+int offset;			/* where the token starts in LINE */
-int offset;
+int length;			/* token length */
-int length;
+/*
-int lineno;
+The previous members can be used to pass strings around for generic
-long linepos;
+purposes.  The following ones specifically refer to creating tags.  In this
-char *line;
+case the token contained here is the pattern that will be used to create a
+tag.
+*/
+bool valid;			/* do not create a tag; the token should be
+				   invalidated whenever a state machine is
+				   reset prematurely */
+bool named;			/* create a named tag */
+int lineno;			/* source line number of tag */
+long linepos;			/* source char number of tag */
 } token;			/* latest token read */
 /*
 * Variables and functions for dealing with nested structures.
 * Idea by Mykola Dzyuba <mdzyuba@yahoo.com> (2001)
 if (structdef == stagseen)
 structdef = scolonseen;
 return FALSE;
 case st_C_template:
 case st_C_class:
-if (cblev == 0
+if ((*c_extp & C_AUTO)	/* automatic detection of C++ language */
-	  && (*c_extp & C_AUTO)	/* automatic detection of C++ language */
+	  && cblev == 0
 	  && definedef == dnone && structdef == snone
 	  && typdef == tnone && fvdef == fvnone)
 	*c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
 if (toktype == st_C_template)
 	break;
 {
 case st_C_extern:
 fvextern = TRUE;
 /* FALLTHRU */
 case st_C_typespec:
-if (fvdef != finlist && fvdef != fignore && fvdef != vignore)
+switch  (fvdef)
-	fvdef = fvnone;		/* should be useless */
+	{
+	case finlist:
+	case flistseen:
+	case fignore:
+	case vignore:
+	  break;
+	default:
+	  fvdef = fvnone;
+	}
 return FALSE;
 case st_C_ignore:
 fvextern = FALSE;
 fvdef = vignore;
 return FALSE;
 	      || (strneq (str, "__asm__", 7) && endtoken (str[7])))
 	    {
 	      fvdef = vignore;
 	      return FALSE;
 	    }
-	  if ((*c_extp & C_PLPL) && strneq (str+len-10, "::operator", 10))
+	  if (strneq (str+len-10, "::operator", 10))
 	    {
+	      if (*c_extp & C_AUTO) /* automatic detection of C++ */
+		*c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
 	      fvdef = foperator;
 	      *is_func_or_var = TRUE;
 	      return TRUE;
 	    }
 	  if (cblev > 0 && !instruct)
 #define curlb (lbs[curndx].lb)
 #define newlb (lbs[newndx].lb)
 #define curlinepos (lbs[curndx].linepos)
 #define newlinepos (lbs[newndx].linepos)
-#define cplpl ((c_ext & C_PLPL) == C_PLPL)
+#define plainc ((c_ext & C_EXT) == C_PLAIN)
+#define cplpl (c_ext & C_PLPL)
 #define cjava ((c_ext & C_JAVA) == C_JAVA)
 #define CNL_SAVE_DEFINEDEF()						\
 do {									\
 curlinepos = charno;							\
 /* This function should never be called when token.valid is FALSE, but
 we must protect against invalid input or internal errors. */
 if (!DEBUG && !token.valid)
 return;
-if (!token.valid)		/* this case is optimised away if !DEBUG */
+if (token.valid)
-make_tag (concat (token_name.buffer, "##invalid token##", ""),
+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
-make_tag (token_name.buffer, token_name.len, isfun, token.line,
 	      token.offset+token.length+1, token.lineno, token.linepos);
 token.valid = FALSE;
 }
 	{
 	  if (midtoken)
 	    {
 	      if (endtoken (c))
 		{
-		  if (c == ':' && cplpl && *lp == ':' && begtoken (lp[1]))
+		  if (c == ':' && *lp == ':' && begtoken (lp[1]))
+		    /* This handles :: in the middle,
+		       but not at the beginning of an identifier.
+		       Also, space-separated :: is not recognised. */
 		    {
-		      /*
+		      if (c_ext & C_AUTO) /* automatic detection of C++ */
-		       * This handles :: in the middle, but not at the
+			c_ext = (c_ext | C_PLPL) & ~C_AUTO;
-		       * beginning of an identifier.  Also, space-separated
-		       * :: is not recognised.
-		       */
 		      lp += 2;
 		      toklen += 2;
 		      c = lp[-1];
 		      goto still_in_token;
 		    }
 				lp += 1;
 			      c = *lp++;
 			      toklen += lp - oldlp;
 			    }
 			  token.named = FALSE;
-			  if ((c_ext & C_EXT)	/* not pure C */
+			  if (!plainc
 			      && nestlev > 0 && definedef == dnone)
 			    /* in struct body */
 			    {
 write_classname (&token_name, qualifier);
 			      linebuffer_setlen (&token_name,
 		    {
 		    case fstartlist:
 		      fvdef = finlist;
 		      continue;
 		    case flistseen:
-#if 0
+		      if (plainc || declarations)
-		      if (!instruct || members)
+			{
-#endif
+			  make_C_tag (TRUE); /* a function */
-			make_C_tag (TRUE); /* a function */
+			  fvdef = fignore;
-		      fvdef = fignore;
+			}
 		      break;
 		    case fvnameseen:
 		      fvdef = fvnone;
 		      break;
 		    }
 	  if (structdef == stagseen)
 	    {
 	      structdef = scolonseen;
 	      break;
 	    }
-#if 0
+	  /* Should be useless, but may be work as a safety net. */
 	  if (cplpl && fvdef == flistseen)
 	    {
 	      make_C_tag (TRUE); /* a function */
 	      fvdef = fignore;
 	      break;
 	    }
-#endif
 	  break;
 	case ';':
 	  if (definedef != dnone)
 	    break;
 	  switch (typdef)
 		  fvextern = FALSE;
 		  fvdef = fvnone;
 		  token.valid = FALSE;
 		  break;
 		case flistseen:
-		  if ((declarations && typdef == tnone && !instruct)
+		  if (declarations
-		      || (members && typdef != tignore && instruct))
+		      && (typdef == tnone || (typdef != tignore && instruct)))
 		    make_C_tag (TRUE);  /* a function declaration */
 		  /* FALLTHRU */
 		default:
 		  fvextern = FALSE;
 		  fvdef = fvnone;
 		  if (declarations
-		      && structdef == stagseen && (c_ext & C_PLPL))
+		       && cplpl && structdef == stagseen)
 		    make_C_tag (FALSE);	/* forward declaration */
 		  else
-		    /* The following instruction invalidates the token.
-		       Probably the token should be invalidated in all other
-		       cases where some state machine is reset prematurely. */
 		    token.valid = FALSE;
 		} /* switch (fvdef) */
 	      /* FALLTHRU */
 	    default:
 	      if (!instruct)
 	  break;
 	case '*':
 	  if (definedef != dnone)
 	    break;
 	  if (fvdef == fstartlist)
-	    fvdef = fvnone;	/* avoid tagging `foo' in `foo (*bar()) ()' */
+	    {
+	      fvdef = fvnone;	/* avoid tagging `foo' in `foo (*bar()) ()' */
+	      token.valid = FALSE;
+	    }
 	  break;
 	case '}':
 	  if (definedef != dnone)
 	    break;
 	  if (!ignoreindent && lp == newlb.buffer + 1)
 	    {
+	      if (cblev != 0)
+		token.valid = FALSE;
 	      cblev = 0;	/* reset curly brace level if first column */
 	      parlev = 0;	/* also reset paren level, just in case... */
 	    }
 	  else if (cblev > 0)
 	    cblev--;
+	  else
+	    token.valid = FALSE; /* something gone amiss, token unreliable */
 	  popclass_above (cblev);
 	  structdef = snone;
 	  /* Only if typdef == tinbody is typdefcblev significant. */
 	  if (typdef == tinbody && cblev <= typdefcblev)
 	    {

Mercurial > emacs

comparison lib-src/etags.c @ 47157:e47f0756e65a