emacs: lib-src/etags.c comparison

comparison lib-src/etags.c @ 10754:cd1c0b5e8634

* etags.c (C_entries): Initialise the new members of TOKEN. (C_entries): Do not allocate a new space for each token found by consider_token. Let make_tag do that instead. (make_tag): Since now TOKEN has memory of where it is taken from, this new macro substitutes both make_tag_from_new_lb and make_tag_from_oth_lb. All callers changed. (TOKEN): Add linepos and buffer members. (main): Initialise token_str. (lang_extensions): Recognise .c++ and .h++ as C++ file suffixes. (token_str): New global variable used by C_entries.

author	Francesco Potortì <pot@gnu.org>
date	Tue, 14 Feb 1995 17:31:55 +0000
parents	8a73e71a55e3
children	7aa80669e697

comparison

equal deleted inserted replaced

-:e0de204ec865
+:cd1c0b5e8634
 *	Regexp tags by Tom Tromey.
 #endif
 *
 *	Francesco Potorti` (pot@cnuce.cnr.it) is the current maintainer.
 */
+char pot_etags_version[] = "@(#) pot revision number is 11.21";
-char pot_etags_version[] = "@(#) pot revision number is 11.19";
 #ifdef MSDOS
 #include <fcntl.h>
 #include <sys/param.h>
 #endif /* MSDOS */
 long size;
 char *buffer;
 };
 struct linebuffer lb;		/* the current line */
+struct linebuffer token_str;	/* used by C_entries as temporary area */
 struct
 {
 long linepos;
 struct linebuffer lb;		/* used by C_entries instead of lb */
 } lbs[2];
 /* Note that ".c" and ".h" can be considered C++, if the --c++
 flag was given.  That is why default_C_entries is called here. */
 { "c", default_C_entries },
 { "h", default_C_entries },
-/* .C or .H or .cpp or .cxx or .hxx or .hh or .cc or .cpp: a C++ file */
+/* .C or .H or .c++ or .cc or .cpp or .cxx or .h++ or .hh or .hxx:
+a C++ file */
 { "C", Cplusplus_entries },
 { "H", Cplusplus_entries },
+{ "c++", Cplusplus_entries },
 { "cc", Cplusplus_entries },
 { "cpp", Cplusplus_entries },
 { "cxx", Cplusplus_entries },
+{ "h++", Cplusplus_entries },
 { "hh", Cplusplus_entries },
 { "hxx", Cplusplus_entries },
 /* .y: a yacc file */
 { "y", Yacc_entries },
 }
 init ();			/* set up boolean "functions" */
 initbuffer (&lb);
+initbuffer (&token_str);
 initbuffer (&lbs[0].lb);
 initbuffer (&lbs[1].lb);
 initbuffer (&filename_lb);
 if (!CTAGS)
 	    }
 #endif
 	  break;
 	}
 }
 if (!CTAGS)
 {
 while (nincluded_files-- > 0)
 	fprintf (tagf, "\f\n%s,include\n", *included_files++);
 {
 char *str;
 logical named;
 int linelen;
 int lineno;
+long linepos;
+char *buffer;
 } TOKEN;
 #define current_lb_is_new (newndx == curndx)
 #define switch_line_buffers() (curndx = 1 - curndx)
 token_saved = FALSE;						\
 }									\
 definedef = dnone;							\
 } while (0)
-#define make_tag_from_new_lb(isfun)  pfnote (tok.str, isfun, tok.named,	\
+#define make_tag(isfun)  pfnote (savestr (token_str.buffer), isfun, \
-newlb.buffer, tok.linelen, tok.lineno, newlinepos)
+tok.named, tok.buffer, tok.linelen, tok.lineno, tok.linepos)
-#define make_tag_from_oth_lb(isfun)  pfnote (tok.str, isfun, tok.named,	\
-othlb.buffer, tok.linelen, tok.lineno, othlinepos)
 void
 C_entries (c_ext, inf)
 int c_ext;			/* extension of C */
 FILE *inf;			/* input file */
 			  if (structdef == sinbody
 			      && definedef == dnone
 			      && is_func)
 			    /* function defined in C++ class body */
 			    {
-			      char *cp = newlb.buffer + tokoff + toklen;
+			      int strsize = strlen(structtag) + 2 + toklen + 1;
-			      char c = *cp;
+			      while (token_str.size < strsize)
-			      *cp = '\0';
+				{
-			      tok.str = concat (structtag, "::",
+				  token_str.size *= 2;
-						newlb.buffer + tokoff);
+				  xrealloc (token_str.buffer, token_str.size);
-			      *cp = c;
+				}
+			      strcpy (token_str.buffer, structtag);
+			      strcat (token_str.buffer, "::");
+			      strncat (token_str.buffer,
+				       newlb.buffer+tokoff, toklen);
 			      tok.named = TRUE;
 			    }
 			  else
 			    {
-			      tok.str = savenstr (newlb.buffer+tokoff, toklen);
+			      while (token_str.size < toklen + 1)
+				{
+				  token_str.size *= 2;
+				  xrealloc (token_str.buffer, token_str.size);
+				}
+			      strncpy (token_str.buffer,
+				       newlb.buffer+tokoff, toklen);
+			      token_str.buffer[toklen] = '\0';
 			      if (structdef == stagseen
 				  || typdef == tend
 				  || (is_func
 				      && definedef == dignorerest)) /* macro */
 				tok.named = TRUE;
 			      else
 				tok.named = FALSE;
 			    }
 			  tok.lineno = lineno;
 			  tok.linelen = tokoff + toklen + 1;
+			  tok.buffer = newlb.buffer;
+			  tok.linepos = newlinepos;
 			  if (definedef == dnone
 			      && (funcdef == ftagseen
 				  || structdef == stagseen
 				  || typdef == tend))
 			    {
 			      if (current_lb_is_new)
 				switch_line_buffers ();
 			    }
 			  else
-			    make_tag_from_new_lb (is_func);
+			    make_tag (is_func);
 			}
 		      midtoken = FALSE;
 		    }
 		} /* if (endtoken (c)) */
 	      else if (intoken (c))
 		    {
 		    case fstartlist:
 		      funcdef = finlist;
 		      continue;
 		    case flistseen:
-		      make_tag_from_oth_lb (TRUE);
+		      make_tag (TRUE);
 		      funcdef = fignore;
 		      break;
 		    case ftagseen:
 		      funcdef = fnone;
 		      break;
 	    switch (funcdef)
 	      {
 	      case ftagseen:
 		if (yacc_rules)
 		  {
-		    make_tag_from_oth_lb (FALSE);
+		    make_tag (FALSE);
 		    funcdef = fignore;
 		  }
 		break;
 	      case fstartlist:
 		funcdef = fnone;
 	    break;
 	  if (cblev == 0)
 	    switch (typdef)
 	      {
 	      case tend:
-		make_tag_from_oth_lb (FALSE);
+		make_tag (FALSE);
 		/* FALLTHRU */
 	      default:
 		typdef = tnone;
 	      }
 	  if (funcdef != fignore)
 	  if (definedef != dnone)
 	    break;
 	  if (cblev == 0 && typdef == tend)
 	    {
 	      typdef = tignore;
-	      make_tag_from_oth_lb (FALSE);
+	      make_tag (FALSE);
 	      break;
 	    }
 	  if (funcdef != finlist && funcdef != fignore)
 	    funcdef = fnone;
 	  if (structdef == stagseen)
 		     This handles constructs like:
 		     typedef void OperatorFun (int fun); */
 		  if (*lp != '*')
 		    {
 		      typdef = tignore;
-		      make_tag_from_oth_lb (FALSE);
+		      make_tag (FALSE);
 		    }
 		  break;
 		} /* switch (typdef) */
 	      break;
 	    case ftagseen:
 		  break;
 		}
 	      if (cblev == 0 && typdef == tend)
 		{
 		  typdef = tignore;
-		  make_tag_from_oth_lb (FALSE);
+		  make_tag (FALSE);
 		}
 	    }
 	  else if (parlev < 0)	/* can happen due to ill-conceived #if's. */
 	    parlev = 0;
 	  break;
 	      structdef = sinbody;
 	      break;
 	    case stagseen:
 	    case scolonseen:	/* named struct */
 	      structdef = sinbody;
-	      make_tag_from_oth_lb (FALSE);
+	      make_tag (FALSE);
 	      break;
 	    }
 	  switch (funcdef)
 	    {
 	    case flistseen:
-	      make_tag_from_oth_lb (TRUE);
+	      make_tag (TRUE);
 	      /* FALLTHRU */
 	    case fignore:
 	      funcdef = fnone;
 	      break;
 	    case fnone:

Mercurial > emacs

comparison lib-src/etags.c @ 10754:cd1c0b5e8634