Replaced 'blank' by 'include "..."'. Fixed a bug in utils_brace_match() which…

Replaced 'blank' by 'include "..."'. Fixed a bug in utils_brace_match() which prevents correctly matching.
Made auto completion work only for the current filetype (i.e. it hides symbols from other filetypes).
Removed unneeded code.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@474 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-06-24  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/utils.c: Replaced 'blank' by 'include "..."'. Fixed a bug in
+                utils_brace_match() which prevents correctly matching.
+ * src/document.c, src/sci_cb.c, src/filetypes.c:
+   Made auto completion work only for the current filetype
+   (i.e. it hides symbols from other filetypes).
+ * tagmanager/options.c, tagmanager/parse.c: Removed unneeded code.
+ * tagmanager/tm_workspace.c, tagmanager/tm_source_file
+   tagmanager/tm_tag.c, tagmanager/tm_project, tagmanager/parsers.h,
+   tagmanager/tm_file_entry.c, tagmanager/entry.c, src/highlighting.c,
+   data/latex.tags, data/php.tags, Makefile.am:
+   Added global auto completion tags for PHP and LaTeX.   
+
+
 2006-06-23  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/msgwindow.c: Add a timestamp to messages in the Status window

src/document.c

@@ -930,17 +930,13 @@ void document_update_tag_list(gint idx, gboolean update)
 	if (doc_list[idx].tm_file == NULL)
 	{
 		gchar *locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL);
-		doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE);
+		doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE,
+												   doc_list[idx].file_type->name);
 		g_free(locale_filename);
 		if (! doc_list[idx].tm_file) return;
 		tm_workspace_add_object(doc_list[idx].tm_file);
 		if (update)
-		{
-			// parse the file after setting the filetype
-			// this is necessary to switch between filetypes
-			TM_SOURCE_FILE(doc_list[idx].tm_file)->lang = getNamedLanguage((doc_list[idx].file_type)->name);
 			tm_source_file_update(doc_list[idx].tm_file, TRUE, FALSE, TRUE);
-		}
 		utils_update_tag_list(idx, TRUE);
 	}
 	else

src/filetypes.c

@@ -48,6 +48,7 @@ void filetypes_init_types(void)
 #define C	// these macros are only to ease navigation
 	filetypes[GEANY_FILETYPES_C] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_C]->id = GEANY_FILETYPES_C;
+	filetypes[GEANY_FILETYPES_C]->lang = 0;
 	filetypes[GEANY_FILETYPES_C]->name = g_strdup("C");
 	filetypes[GEANY_FILETYPES_C]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_C]->title = g_strdup(_("C source file"));
@@ -66,6 +67,8 @@ void filetypes_init_types(void)
 #define CPP
 	filetypes[GEANY_FILETYPES_CPP] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_CPP]->id = GEANY_FILETYPES_CPP;
+	// C++ has langType 1, but to get the global tags for C, too, we use the langType of C
+	filetypes[GEANY_FILETYPES_CPP]->lang = 0;
 	filetypes[GEANY_FILETYPES_CPP]->name = g_strdup("C++");
 	filetypes[GEANY_FILETYPES_CPP]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_CPP]->title = g_strdup(_("C++ source file"));
@@ -93,6 +96,7 @@ void filetypes_init_types(void)
 	filetypes[GEANY_FILETYPES_JAVA] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_JAVA]->id = GEANY_FILETYPES_JAVA;
 	filetypes[GEANY_FILETYPES_JAVA]->name = g_strdup("Java");
+	filetypes[GEANY_FILETYPES_JAVA]->lang = 2;
 	filetypes[GEANY_FILETYPES_JAVA]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup(_("Java source file"));
 	filetypes[GEANY_FILETYPES_JAVA]->extension = g_strdup("java");
@@ -109,6 +113,7 @@ void filetypes_init_types(void)
 #define PERL
 	filetypes[GEANY_FILETYPES_PERL] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_PERL]->id = GEANY_FILETYPES_PERL;
+	filetypes[GEANY_FILETYPES_PERL]->lang = 5;
 	filetypes[GEANY_FILETYPES_PERL]->name = g_strdup("Perl");
 	filetypes[GEANY_FILETYPES_PERL]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_PERL]->title = g_strdup(_("Perl source file"));
@@ -127,6 +132,7 @@ void filetypes_init_types(void)
 #define PHP
 	filetypes[GEANY_FILETYPES_PHP] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_PHP]->id = GEANY_FILETYPES_PHP;
+	filetypes[GEANY_FILETYPES_PHP]->lang = 6;
 	filetypes[GEANY_FILETYPES_PHP]->name = g_strdup("PHP");
 	filetypes[GEANY_FILETYPES_PHP]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_PHP]->title = g_strdup(_("PHP / HTML source file"));
@@ -149,6 +155,7 @@ void filetypes_init_types(void)
 #define XML
 	filetypes[GEANY_FILETYPES_XML] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_XML]->id = GEANY_FILETYPES_XML;
+	filetypes[GEANY_FILETYPES_XML]->lang = -2;
 	filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML");
 	filetypes[GEANY_FILETYPES_XML]->has_tags = FALSE;
 	filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file"));
@@ -166,6 +173,7 @@ void filetypes_init_types(void)
 #define DOCBOOK
 	filetypes[GEANY_FILETYPES_DOCBOOK] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_DOCBOOK]->id = GEANY_FILETYPES_DOCBOOK;
+	filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12;
 	filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook");
 	filetypes[GEANY_FILETYPES_DOCBOOK]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup(_("Docbook source file"));
@@ -182,6 +190,7 @@ void filetypes_init_types(void)
 #define PYTHON
 	filetypes[GEANY_FILETYPES_PYTHON] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_PYTHON]->id = GEANY_FILETYPES_PYTHON;
+	filetypes[GEANY_FILETYPES_PYTHON]->lang = 7;
 	filetypes[GEANY_FILETYPES_PYTHON]->name = g_strdup("Python");
 	filetypes[GEANY_FILETYPES_PYTHON]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_PYTHON]->title = g_strdup(_("Python source file"));
@@ -199,6 +208,7 @@ void filetypes_init_types(void)
 #define LATEX
 	filetypes[GEANY_FILETYPES_LATEX] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_LATEX]->id = GEANY_FILETYPES_LATEX;
+	filetypes[GEANY_FILETYPES_LATEX]->lang = 8;
 	filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX");
 	filetypes[GEANY_FILETYPES_LATEX]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup(_("LaTeX source file"));
@@ -217,6 +227,7 @@ void filetypes_init_types(void)
 #define PASCAL
 	filetypes[GEANY_FILETYPES_PASCAL] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_PASCAL]->id = GEANY_FILETYPES_PASCAL;
+	filetypes[GEANY_FILETYPES_PASCAL]->lang = 4;
 	filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal");
 	filetypes[GEANY_FILETYPES_PASCAL]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup(_("Pascal source file"));
@@ -238,6 +249,7 @@ void filetypes_init_types(void)
 #define SH
 	filetypes[GEANY_FILETYPES_SH] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_SH]->id = GEANY_FILETYPES_SH;
+	filetypes[GEANY_FILETYPES_SH]->lang = 16;
 	filetypes[GEANY_FILETYPES_SH]->name = g_strdup("Sh");
 	filetypes[GEANY_FILETYPES_SH]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_SH]->title = g_strdup(_("Shell script file"));
@@ -260,6 +272,7 @@ void filetypes_init_types(void)
 #define MAKE
 	filetypes[GEANY_FILETYPES_MAKE] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_MAKE]->id = GEANY_FILETYPES_MAKE;
+	filetypes[GEANY_FILETYPES_MAKE]->lang = 3;
 	filetypes[GEANY_FILETYPES_MAKE]->name = g_strdup("Make");
 	filetypes[GEANY_FILETYPES_MAKE]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile"));
@@ -277,6 +290,7 @@ void filetypes_init_types(void)
 #define CSS
 	filetypes[GEANY_FILETYPES_CSS] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_CSS]->id = GEANY_FILETYPES_CSS;
+	filetypes[GEANY_FILETYPES_CSS]->lang = 13;
 	filetypes[GEANY_FILETYPES_CSS]->name = g_strdup("CSS");
 	filetypes[GEANY_FILETYPES_CSS]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_CSS]->title = g_strdup(_("Cascading StyleSheet"));
@@ -293,6 +307,7 @@ void filetypes_init_types(void)
 #define CONF
 	filetypes[GEANY_FILETYPES_CONF] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_CONF]->id = GEANY_FILETYPES_CONF;
+	filetypes[GEANY_FILETYPES_CONF]->lang = 10;
 	filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf");
 	filetypes[GEANY_FILETYPES_CONF]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file"));
@@ -312,8 +327,9 @@ void filetypes_init_types(void)
 #define ASM
 	filetypes[GEANY_FILETYPES_ASM] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_ASM]->id = GEANY_FILETYPES_ASM;
+	filetypes[GEANY_FILETYPES_ASM]->lang = 9;
 	filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM");
-	filetypes[GEANY_FILETYPES_ASM]->has_tags = FALSE;
+	filetypes[GEANY_FILETYPES_ASM]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_ASM]->title = g_strdup(_("Assembler source file"));
 	filetypes[GEANY_FILETYPES_ASM]->extension = g_strdup("asm");
 	filetypes[GEANY_FILETYPES_ASM]->pattern = g_new0(gchar*, 2);
@@ -328,6 +344,7 @@ void filetypes_init_types(void)
 #define SQL
 	filetypes[GEANY_FILETYPES_SQL] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_SQL]->id = GEANY_FILETYPES_SQL;
+	filetypes[GEANY_FILETYPES_SQL]->lang = 11;
 	filetypes[GEANY_FILETYPES_SQL]->name = g_strdup("SQL");
 	filetypes[GEANY_FILETYPES_SQL]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_SQL]->title = g_strdup(_("SQL Dump file"));
@@ -344,6 +361,7 @@ void filetypes_init_types(void)
 #define CAML
 	filetypes[GEANY_FILETYPES_CAML] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_CAML]->id = GEANY_FILETYPES_CAML;
+	filetypes[GEANY_FILETYPES_CAML]->lang = -2;
 	filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML");
 	filetypes[GEANY_FILETYPES_CAML]->has_tags = FALSE;
 	filetypes[GEANY_FILETYPES_CAML]->title = g_strdup(_("(O)Caml source file"));
@@ -361,6 +379,7 @@ void filetypes_init_types(void)
 #define OMS
 	filetypes[GEANY_FILETYPES_OMS] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_OMS]->id = GEANY_FILETYPES_OMS;
+	filetypes[GEANY_FILETYPES_OMS]->lang = -2;
 	filetypes[GEANY_FILETYPES_OMS]->name = g_strdup("O-Matrix");
 	filetypes[GEANY_FILETYPES_OMS]->has_tags = FALSE;
 	filetypes[GEANY_FILETYPES_OMS]->title = g_strdup(_("O-Matrix source file"));
@@ -377,6 +396,7 @@ void filetypes_init_types(void)
 #define RUBY
 	filetypes[GEANY_FILETYPES_RUBY] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_RUBY]->id = GEANY_FILETYPES_RUBY;
+	filetypes[GEANY_FILETYPES_RUBY]->lang = 14;
 	filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby");
 	filetypes[GEANY_FILETYPES_RUBY]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup(_("Ruby source file"));
@@ -395,6 +415,7 @@ void filetypes_init_types(void)
 #define TCL
 	filetypes[GEANY_FILETYPES_TCL] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_TCL]->id = GEANY_FILETYPES_TCL;
+	filetypes[GEANY_FILETYPES_TCL]->lang = 15;
 	filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl");
 	filetypes[GEANY_FILETYPES_TCL]->has_tags = TRUE;
 	filetypes[GEANY_FILETYPES_TCL]->title = g_strdup(_("Tcl source file"));
@@ -414,6 +435,7 @@ void filetypes_init_types(void)
 	filetypes[GEANY_FILETYPES_ALL] = g_new0(filetype, 1);
 	filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL;
 	filetypes[GEANY_FILETYPES_ALL]->name = g_strdup("None");
+	filetypes[GEANY_FILETYPES_ALL]->lang = -2;
 	filetypes[GEANY_FILETYPES_ALL]->has_tags = FALSE;
 	filetypes[GEANY_FILETYPES_ALL]->title = g_strdup(_("All files"));
 	filetypes[GEANY_FILETYPES_ALL]->extension = g_strdup("*");

src/filetypes.h

@@ -73,6 +73,8 @@ struct build_programs
 typedef struct filetype
 {
 	guint	 		  id;
+	langType 		  lang;				// represents the langType of tagmanager(see the table
+										// in tagmanager/parsers.h), -1 represents all, -2 none
 	gchar	 		 *name;				// will be used as name for tagmanager
 	gboolean 		  has_tags;			// indicates whether there is a tag parser for it or not
 	gchar	 		 *title;			// will be shown in the file open dialog

src/geany.h

@@ -65,7 +65,7 @@
 #define GEANY_SESSION_FILES				25
 #define GEANY_MAX_TAGS_COUNT			1000
 #define GEANY_CHECK_FILE_DELAY			30
-#define GEANY_WORDCHARS					"_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#define GEANY_WORDCHARS					"_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\"
 #define GEANY_MAX_WORD_LENGTH			192
 #define GEANY_MAX_AUTOCOMPLETE_WORDS	30
 #define GEANY_STRING_UNTITLED			_("untitled")
@@ -263,9 +263,6 @@ enum {
 	GIGABYTE = (MEGABYTE*1024)
 };
 
-// prototype from tagmanager/parse.h, used in document.c, ugly but it works
-extern langType getNamedLanguage(const char *const name);
-
 // implementation in main.c
 void geany_debug(gchar const *format, ...);
 

src/sci_cb.c

@@ -182,6 +182,7 @@ void on_editor_notification(GtkWidget *editor, gint scn, gpointer lscn, gpointer
 				case '{':
 				{	// Tex auto-closing
 					sci_cb_auto_close_bracket(sci, pos, nt->ch);	// Tex auto-closing
+					sci_cb_show_calltip(sci, pos);
 					break;
 				}
 				case '}':
@@ -365,24 +366,26 @@ gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos)
 	gint lexer = SSM(sci, SCI_GETLEXER, 0, 0);
 	gint style;
 	gchar word[GEANY_MAX_WORD_LENGTH];
+	gint idx = document_find_by_sci(sci);
 	const GPtrArray *tags;
 
 	word[0] = '\0';
 	if (pos == -1)
 	{	// position of '(' is unknown, so go backwards to find it
 		pos = SSM(sci, SCI_GETCURRENTPOS, 0, 0);
-		while (pos >= 0 && SSM(sci, SCI_GETCHARAT, pos, 0) != '(') pos--;
+		// I'm not sure if utils_isbrace() is a good idea, but it is the simplest way, but we need
+		// something more intelligent than only check for '(' because e.g. LaTeX uses {, [ or (
+		while (pos >= 0 && ! utils_isbrace(SSM(sci, SCI_GETCHARAT, pos, 0))) pos--;
 	}
 
 	style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
-	if (lexer != SCLEX_CPP) return FALSE;
 	if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT ||
 			style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC)) return FALSE;
 
 	utils_find_current_word(sci, pos - 1, word, sizeof word);
 	if (word[0] == '\0') return FALSE;
 
-	tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE);
+	tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, doc_list[idx].file_type->lang);
 	if (tags->len == 1 && TM_TAG(tags->pdata[0])->atts.entry.arglist)
 	{
 		SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) TM_TAG(tags->pdata[0])->atts.entry.arglist);
@@ -439,25 +442,27 @@ gboolean sci_cb_start_auto_complete(ScintillaObject *sci, gint pos)
 		g_strfreev(ents);
 	}
 	else
-	{	// C and C++ tag autocompletion
+	{	// PHP, LaTeX, C and C++ tag autocompletion
 		gint i = 0;
+		gint idx = document_find_by_sci(sci);
+		TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 };
 
 		while ((line_pos - i >= 0) && ! g_ascii_isspace(linebuf[line_pos - i])) i++;
 		if (i < 4) return FALSE;	// go home if typed less than 4 chars
 
-		tags = tm_workspace_find(root, tm_tag_max_t, NULL, TRUE);
+		tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc_list[idx].file_type->lang);
 		if (NULL != tags && tags->len > 0)
 		{
 			GString *words = g_string_sized_new(150);
-			TMTag *tag;
 			guint j;
+
 			for (j = 0; ((j < tags->len) && (j < GEANY_MAX_AUTOCOMPLETE_WORDS)); ++j)
 			{
-				tag = (TMTag *) tags->pdata[j];
 				if (j > 0) g_string_append_c(words, ' ');
-				g_string_append(words, tag->name);
+				g_string_append(words, ((TMTag *) tags->pdata[j])->name);
 			}
 			SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words->str);
+			//geany_debug("string size: %d", words->len);
 			g_string_free(words, TRUE);
 		}
 	}

src/utils.c

@@ -308,19 +308,18 @@ gboolean utils_isbrace(gchar c)
 			case '>':	return TRUE;
 		}
 	}
-	else
+
+	switch (c)
 	{
-		switch (c)
-		{
-			case '(':
-			case ')':
-			case '{':
-			case '}':
-			case '[':
-			case ']':	return TRUE;
-			default:	return FALSE;
-		}
+		case '(':
+		case ')':
+		case '{':
+		case '}':
+		case '[':
+		case ']':	return TRUE;
+		default:	return FALSE;
 	}
+
 	return FALSE;
 }
 
@@ -1827,16 +1826,24 @@ void utils_create_insert_menu_items(void)
 		"iterator", "functional", "string", "complex", "valarray", NULL
 	};
 	
-	blank = gtk_menu_item_new_with_label(_("(blank)"));
+	blank = gtk_menu_item_new_with_label("#include \"...\"");
 	gtk_container_add(GTK_CONTAINER(menu_edit), blank);
 	gtk_widget_show(blank);
 	g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate),
 																	(gpointer) "blank");
-	blank = gtk_menu_item_new_with_label(_("(blank)"));
+	blank = gtk_separator_menu_item_new ();
+	gtk_container_add(GTK_CONTAINER(menu_edit), blank);
+	gtk_widget_show(blank);
+
+	blank = gtk_menu_item_new_with_label("#include \"...\"");
 	gtk_container_add(GTK_CONTAINER(menu_popup), blank);
 	gtk_widget_show(blank);
 	g_signal_connect((gpointer) blank, "activate", G_CALLBACK(on_insert_include_activate),
 																	(gpointer) "blank");
+	blank = gtk_separator_menu_item_new ();
+	gtk_container_add(GTK_CONTAINER(menu_popup), blank);
+	gtk_widget_show(blank);
+
 	insert_items(menu_edit, menu_popup, (gchar**) c_includes_stdlib, _("C Standard Library"));
 	insert_items(menu_edit, menu_popup, (gchar**) c_includes_c99, _("ISO C99"));
 	insert_items(menu_edit, menu_popup, (gchar**) c_includes_cpp, _("C++ (C Standard Library)"));

tagmanager/options.h

@@ -32,19 +32,6 @@
 *   DATA DECLARATIONS
 */
 
-typedef enum { OPTION_NONE, OPTION_SHORT, OPTION_LONG } optionType;
-
-typedef struct sCookedArgs {
-/* private */
-    Arguments* args;
-    char *shortOptions;
-    char simple[2];
-    boolean isOption;
-    boolean longOption;
-    const char* parameter;
-/* public */
-    char* item;
-} cookedArgs;
 
 /*  This stores the command line options.
  */
@@ -71,7 +58,6 @@ typedef struct sOptionValues {
     stringList* ignore;	    /* -I  name of file containing tokens to ignore */
     boolean append;	    /* -a  append to "tags" file */
     boolean backward;	    /* -B  regexp patterns search backwards */
-    boolean etags;	    /* -e  output Emacs style tags file */
     enum eLocate {
 	EX_MIX,		    /* line numbers for defines, patterns otherwise */
 	EX_LINENUM,	    /* -n  only line numbers in tag file */
@@ -97,10 +83,6 @@ typedef struct sOptionValues {
     boolean printTotals;    /* --totals  print cumulative statistics */
     boolean lineDirectives; /* --linedirectives  process #line directives */
 	boolean nestFunction; /* --nest Nest inside function blocks for tags */
-#ifdef TM_DEBUG
-    long debugLevel;	    /* -D  debugging output */
-    unsigned long breakLine;/* -b  source line at which to call lineBreak() */
-#endif
 } optionValues;
 
 /*
@@ -114,25 +96,10 @@ extern CONST_OPTION optionValues	Option;
 extern void verbose (const char *const format, ...) __printf__ (1, 2);
 extern void freeList (stringList** const pString);
 extern void setDefaultTagFileName (void);
-extern void checkOptions (void);
-extern void testEtagsInvocation (void);
-
-extern cookedArgs* cArgNewFromString (const char* string);
-extern cookedArgs* cArgNewFromArgv (char* const* const argv);
-extern cookedArgs* cArgNewFromFile (FILE* const fp);
-extern cookedArgs* cArgNewFromLineFile (FILE* const fp);
-extern void cArgDelete (cookedArgs* const current);
-extern boolean cArgOff (cookedArgs* const current);
-extern boolean cArgIsOption (cookedArgs* const current);
-extern const char* cArgItem (cookedArgs* const current);
-extern void cArgForth (cookedArgs* const current);
 
 extern const char *fileExtension (const char *const fileName);
 extern boolean isIncludeFile (const char *const fileName);
 extern boolean isIgnoreToken (const char *const name, boolean *const pIgnoreParens, const char **const replacement);
-extern void parseOption (cookedArgs* const cargs);
-extern void parseOptions (cookedArgs* const cargs);
-extern void previewFirstOption (cookedArgs* const cargs);
 extern void readOptionConfiguration (void);
 extern void initOptions (void);
 extern void freeOptionResources (void);

tagmanager/parse.c

@@ -239,9 +239,6 @@ extern void installLanguageMapDefault (const langType language)
 	LanguageTable [language]->currentExtensions =
 	    stringListNewFromArgv (LanguageTable [language]->extensions);
     }
-    if (Option.verbose)
-	printLanguageMap (language);
-    verbose ("\n");
 }
 
 extern void installLanguageMapDefaults (void)
@@ -249,7 +246,6 @@ extern void installLanguageMapDefaults (void)
     unsigned int i;
     for (i = 0  ;  i < LanguageCount  ;  ++i)
     {
-	//verbose ("    %s: ", getLanguageName (i));
 	installLanguageMapDefault (i);
     }
 }
@@ -307,7 +303,6 @@ extern void initializeParsing (void)
     builtInCount = sizeof (BuiltInParsers) / sizeof (BuiltInParsers [0]);
     LanguageTable = xMalloc (builtInCount, parserDefinition*);
 
-    verbose ("Installing parsers: ");
     for (i = 0  ;  i < builtInCount  ;  ++i)
     {
 	parserDefinition* const def = (*BuiltInParsers [i]) ();
@@ -331,13 +326,11 @@ extern void initializeParsing (void)
 		accepted = TRUE;
 	    if (accepted)
 	    {
-		verbose ("%s%s", i > 0 ? ", " : "", def->name);
 		def->id = LanguageCount++;
 		LanguageTable [def->id] = def;
 	    }
 	}
     }
-    verbose ("\n");
     enableLanguages (TRUE);
     initializeParsers ();
 }
@@ -603,8 +596,6 @@ static boolean createTagsForFile (const char *const fileName,
 
     if (fileOpen (fileName, language))
     {
-	if (Option.etags)
-	    beginEtagsFile ();
 
 	makeFileTag (fileName);
 
@@ -613,8 +604,6 @@ static boolean createTagsForFile (const char *const fileName,
 	else if (LanguageTable [language]->parser2 != NULL)
 	    retried = LanguageTable [language]->parser2 (passCount);
 
-	if (Option.etags)
-	    endEtagsFile (getSourceFileTagPath ());
 
 	fileClose ();
     }
@@ -649,23 +638,13 @@ extern boolean parseFile (const char *const fileName)
     if (Option.language == LANG_AUTO)
 	language = getFileLanguage (fileName);
     Assert (language != LANG_AUTO);
-    if (language == LANG_IGNORE)
-	verbose ("ignoring %s (unknown language)\n", fileName);
-    else if (! LanguageTable [language]->enabled)
-	verbose ("ignoring %s (language disabled)\n", fileName);
-    else
-    {
 	if (Option.filter)
 	    openTagFile ();
 
 	tagFileResized = createTagsWithFallback (fileName, language);
 
-	if (Option.filter)
-	    closeTagFile (tagFileResized);
 	addTotals (1, 0L, 0L);
 
-	return tagFileResized;
-    }
     return tagFileResized;
 }