comparison lib-src/etags.c @ 4051:73aa16fc728d

(consider_token): was `==', now is `='. (consider_token): DEFUNs now treated like funcs in ctags mode. (LEVEL_OK_FOR_FUNCDEF): removed. (C_entries): optimized the test that used LEVEL_OK_FOR_FUNCDEF. (C_entries): removed a piece of useless code. (C_entries): making typedef tags is delayed until a semicolon is met. This handles "typedef int X, Y, Z;" correctly.

4050:0439eaf6f94a

{
  snone,			/* nothing seen yet */
  skeyseen,			/* struct-like keyword seen */
  stagseen,			/* struct-like tag seen */
  scolonseen,			/* colon seen after struct-like tag */
  sinbody			/* in class body: recognize member func defs */
} STRUCTST;
STRUCTST structdef;
/*
 * When structdef is stagseen, scolonseen, or sinbody, structtag is the
 * struct tag, and structkey is the preceding struct-like keyword.

 * C_entries ()
 *	This routine finds functions, typedefs, #define's and
 * 	struct/union/enum definitions in C syntax and adds them
 *	to the list.
 */

/*
 * LEVEL_OK_FOR_FUNCDEF allows C++ function definition within class body.
 * Currently typdef and structdef stuff (typedefs and struct
 * definitions) are only noticed when level==0, but that may change.
 */
#define LEVEL_OK_FOR_FUNCDEF()					\
	(level==0 || (cplpl && level==1 && structdef==sinbody))

#define curlb (lbs[curndx].lb)
#define othlb (lbs[1-curndx].lb)
#define newlb (lbs[newndx].lb)
#define curlinepos (lbs[curndx].linepos)

  int curndx, newndx;		/* indices for current and new lb */
  TOKEN tok;			/* latest token read for funcdef & structdef */
  char tokb[BUFSIZ];		/* latest token name for funcdef & structdef */
  register int tokoff;		/* offset in line of start of latest token */
  register int toklen;		/* length of latest token */
  int level;			/* current curly brace level */
  logical incomm, inquote, inchar, quotednl, midtoken;
  logical cplpl;

  curndx = newndx = 0;
  lineno = 0;

  *lp = 0;

  definedef = dnone; funcdef = fnone; typdef= tnone; structdef= snone;
  next_token_is_func = yacc_rules = FALSE;
  midtoken = inquote = inchar = incomm = quotednl = FALSE;
  level = 0;
  cplpl = c_ext & C_PLPL;

  C_create_stabs ();

  while (!feof (inf))

		lp++;
		definedef = dnone; funcdef = fnone;
		typdef= tnone; structdef= snone;
		next_token_is_func = FALSE;
		midtoken = inquote = inchar = incomm = quotednl = FALSE;
		level = 0;
		yacc_rules = !yacc_rules;
		continue;
	      }
	  case '#':
	    if (lp == newlb.buffer + 1 && definedef == dnone)
	      definedef = dsharpseen;
	    continue;
	  } /* switch (c) */


      if (LEVEL_OK_FOR_FUNCDEF ()
	  && definedef != dignorerest
	  && structdef != scolonseen
	  && funcdef != finlist)
	{
	  if (midtoken)
	    {
	      if (endtoken (c))

		      tok.p = newlb.buffer + tokoff;
		      tok.len = toklen;
		      tok.rewritten = FALSE;
		      if (yacc_rules
			  || consider_token (c, lp, &tok,
					     c_ext, level, &is_func))
			{
			  if (structdef == sinbody
			      && definedef == dnone && is_func)
			    {	/* function defined in C++ class body */
			      sprintf (tokb, "%s::%.*s",

			  else
			    {
			      sprintf (tokb, "%.*s", tok.len, tok.p);
			    }

			  if (funcdef == ftagseen || structdef == stagseen)
			    {
			      if (newndx == curndx)
				curndx = 1 - curndx; /* switch line buffers */
			    }
			  else

	      MAKE_TAG_FROM_OTH_LB (FALSE);
	      funcdef == fnone;
	    }
	  break;
	case ';':
	  funcdef = fnone;
	  /* FALLTHRU */
	case ',':
	  if (funcdef != finlist)
	    funcdef = fnone;
	  if (level == 0 && typdef == tend)
	    typdef = tnone;
	  /* FALLTHRU */
	case '[':
	  if (funcdef != finlist)
	    funcdef = fnone;
	  if (structdef == stagseen)

	    case scolonseen:	/* named struct */
	      structdef = sinbody;
	      MAKE_TAG_FROM_OTH_LB (FALSE);
	      break;
	    }
	  level++;
	  /* FALLTHRU */
	case '*':
	  if (funcdef == flistseen)
	    {
	      MAKE_TAG_FROM_OTH_LB (TRUE);
	      funcdef = fnone;
	    }
	  break;
	case '}':
	  if (!noindentypedefs && lp == newlb.buffer + 1)
	    level = 0;	/* reset level if first column */
	  else if (level > 0)
	    level--;
	  if (level == 0)
	    {
	      if (typdef == tinbody)
		typdef = tend;
	      structdef = snone;
	      (void) strcpy (structtag, "<error 2>");

 *	typdef			IN OUT
 *	next_token_is_func	IN OUT
 */

logical
consider_token (c, lp, tokp, c_ext, level, is_func)
     register char c;		/* IN: first char after the token */
     register char *lp;		/* IN: lp points to 2nd char after the token */
     register TOKEN *tokp;	/* IN */
     int c_ext;			/* IN */
     int level;			/* IN */
     logical *is_func;		/* OUT */
{
  logical firsttok;		/* TRUE if have seen first token in ()'s */
  Stab_entry *tokse = stab_find (get_C_stab (c_ext), tokp->p, tokp->len);
  enum sym_type toktype = stab_type (tokse);

	}
      return (TRUE);
    }

  /*
   * This structdef business is currently only invoked when level==0.
   * It should be recursively invoked whatever the level, and a stack of
   * states kept, to allow for definitions of structs within structs.
   *
   * This structdef business is NOT invoked when we are ctags and the
   * file is plain C.  This is because a struct tag may have the same
   * name as another tag, and this loses with ctags.
   *

  switch (toktype)
    {
    case st_C_struct:
    case st_C_enum:
      if (typdef == ttypedseen
	  || (typedefs_and_cplusplus && level == 0 && structdef == snone))
	{
	  structdef = skeyseen;
	  structkey = tokse;
	}
      return (FALSE);

	}
    }
  if (next_token_is_func)
    {
      next_token_is_func = FALSE;
      return (TRUE);
    }

  /* A function? */
  switch (toktype)
    {
    case st_C_typespec:
      funcdef == fnone;		/* should be useless */
      return (FALSE);
    default:
      funcdef = ftagseen;
      *is_func = TRUE;
      return (TRUE);

    continue;
  c = cp[0];
  cp[0] = 0;
  (void) strcpy (nambuf, dbp);
  cp[0] = c;
  pfnote (nambuf, TRUE, FALSE, lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
  pfcnt++;
}

/*
 * Scheme tag functions

4051:73aa16fc728d

{
  snone,			/* nothing seen yet */
  skeyseen,			/* struct-like keyword seen */
  stagseen,			/* struct-like tag seen */
  scolonseen,			/* colon seen after struct-like tag */
  sinbody			/* in struct body: recognize member func defs*/
} STRUCTST;
STRUCTST structdef;
/*
 * When structdef is stagseen, scolonseen, or sinbody, structtag is the
 * struct tag, and structkey is the preceding struct-like keyword.

 * C_entries ()
 *	This routine finds functions, typedefs, #define's and
 * 	struct/union/enum definitions in C syntax and adds them
 *	to the list.
 */

#define curlb (lbs[curndx].lb)
#define othlb (lbs[1-curndx].lb)
#define newlb (lbs[newndx].lb)
#define curlinepos (lbs[curndx].linepos)

  int curndx, newndx;		/* indices for current and new lb */
  TOKEN tok;			/* latest token read for funcdef & structdef */
  char tokb[BUFSIZ];		/* latest token name for funcdef & structdef */
  register int tokoff;		/* offset in line of start of latest token */
  register int toklen;		/* length of latest token */
  int cblev;			/* current curly brace level */
  logical incomm, inquote, inchar, quotednl, midtoken;
  logical cplpl;

  curndx = newndx = 0;
  lineno = 0;

  *lp = 0;

  definedef = dnone; funcdef = fnone; typdef= tnone; structdef= snone;
  next_token_is_func = yacc_rules = FALSE;
  midtoken = inquote = inchar = incomm = quotednl = FALSE;
  cblev = 0;
  cplpl = c_ext & C_PLPL;

  C_create_stabs ();

  while (!feof (inf))

		lp++;
		definedef = dnone; funcdef = fnone;
		typdef= tnone; structdef= snone;
		next_token_is_func = FALSE;
		midtoken = inquote = inchar = incomm = quotednl = FALSE;
		cblev = 0;
		yacc_rules = !yacc_rules;
		continue;
 	      }
	  case '#':
	    if (lp == newlb.buffer + 1 && definedef == dnone)
	      definedef = dsharpseen;
	    continue;
	  } /* switch (c) */


      /* Consider token only if some complicated conditions are satisfied. */
      if (((cblev == 0 && structdef != scolonseen)
	   || (cblev == 1 && cplpl && structdef == sinbody))
	  && definedef != dignorerest
	  && funcdef != finlist)
	{
	  if (midtoken)
	    {
	      if (endtoken (c))

		      tok.p = newlb.buffer + tokoff;
		      tok.len = toklen;
		      tok.rewritten = FALSE;
		      if (yacc_rules
			  || consider_token (c, lp, &tok,
					     c_ext, cblev, &is_func))
			{
			  if (structdef == sinbody
			      && definedef == dnone && is_func)
			    {	/* function defined in C++ class body */
			      sprintf (tokb, "%s::%.*s",

			  else
			    {
			      sprintf (tokb, "%.*s", tok.len, tok.p);
			    }

			  if (funcdef == ftagseen
			      || structdef == stagseen
			      || typdef == tend)
			    {
			      if (newndx == curndx)
				curndx = 1 - curndx; /* switch line buffers */
			    }
			  else

	      MAKE_TAG_FROM_OTH_LB (FALSE);
	      funcdef == fnone;
	    }
	  break;
	case ';':
	  if (cblev == 0 && typdef == tend)
	    {
	      typdef = tnone;
	      MAKE_TAG_FROM_OTH_LB (FALSE);
	    }
	  funcdef = fnone;
	  /* FALLTHRU */
	case ',':
	  /* FALLTHRU */
	case '[':
	  if (funcdef != finlist)
	    funcdef = fnone;
	  if (structdef == stagseen)

	    case scolonseen:	/* named struct */
	      structdef = sinbody;
	      MAKE_TAG_FROM_OTH_LB (FALSE);
	      break;
	    }
	  cblev++;
	  /* FALLTHRU */
	case '*':
	  if (funcdef == flistseen)
	    {
	      MAKE_TAG_FROM_OTH_LB (TRUE);
	      funcdef = fnone;
	    }
	  break;
	case '}':
	  if (!noindentypedefs && lp == newlb.buffer + 1)
	    cblev = 0;	/* reset curly brace level if first column */
	  else if (cblev > 0)
	    cblev--;
	  if (cblev == 0)
	    {
	      if (typdef == tinbody)
		typdef = tend;
	      structdef = snone;
	      (void) strcpy (structtag, "<error 2>");

 *	typdef			IN OUT
 *	next_token_is_func	IN OUT
 */

logical
consider_token (c, lp, tokp, c_ext, cblev, is_func)
     register char c;		/* IN: first char after the token */
     register char *lp;		/* IN: lp points to 2nd char after the token */
     register TOKEN *tokp;	/* IN: token pointer */
     int c_ext;			/* IN: C extensions mask */
     int cblev;			/* IN: curly brace level */
     logical *is_func;		/* OUT */
{
  logical firsttok;		/* TRUE if have seen first token in ()'s */
  Stab_entry *tokse = stab_find (get_C_stab (c_ext), tokp->p, tokp->len);
  enum sym_type toktype = stab_type (tokse);

	}
      return (TRUE);
    }

  /*
   * This structdef business is currently only invoked when cblev==0.
   * It should be recursively invoked whatever the curly brace level,
   * and a stack of states kept, to allow for definitions of structs
   * within structs.
   *
   * This structdef business is NOT invoked when we are ctags and the
   * file is plain C.  This is because a struct tag may have the same
   * name as another tag, and this loses with ctags.
   *

  switch (toktype)
    {
    case st_C_struct:
    case st_C_enum:
      if (typdef == ttypedseen
	  || (typedefs_and_cplusplus && cblev == 0 && structdef == snone))
	{
	  structdef = skeyseen;
	  structkey = tokse;
	}
      return (FALSE);

	}
    }
  if (next_token_is_func)
    {
      next_token_is_func = FALSE;
      *is_func = TRUE;
      return (TRUE);
    }

  /* A function? */
  switch (toktype)
    {
    case st_C_typespec:
      funcdef = fnone;		/* should be useless */
      return (FALSE);
    default:
      funcdef = ftagseen;
      *is_func = TRUE;
      return (TRUE);

    continue;
  c = cp[0];
  cp[0] = 0;
  (void) strcpy (nambuf, dbp);
  cp[0] = c;
  pfnote (nambuf, TRUE, FALSE, lb.buffer,
	  cp - lb.buffer + 1, lineno, linecharno);
  pfcnt++;
}

/*
 * Scheme tag functions