SF.net SVN: geany: [893] trunk

[ntrel at users.sourceforge.net]

Revision: 893
          http://svn.sourceforge.net/geany/?rev=893&view=rev
Author:   ntrel
Date:     2006-10-13 05:40:37 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Fix infinite loop from parsing current function name.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-12 23:02:59 UTC (rev 892)
+++ trunk/ChangeLog	2006-10-13 12:40:37 UTC (rev 893)
@@ -1,3 +1,8 @@
+2006-10-13  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/utils.c: Fix infinite loop from parsing current function name.
+
+
 2006-10-12  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * src/utils.c: Improved function name parsing to fix some invalid

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2006-10-12 23:02:59 UTC (rev 892)
+++ trunk/src/utils.c	2006-10-13 12:40:37 UTC (rev 893)
@@ -554,22 +554,64 @@
 }
 
 
-// Parse the function name
+/* Parse the function name up to 2 lines before tag_line.
+ * C++ like syntax should be parsed by parse_cpp_function_at_line, otherwise the return
+ * type or argument names can be confused with the function name. */
 static gchar *parse_function_at_line(ScintillaObject *sci, gint tag_line)
 {
-	gint start, end, first_pos;
+	gint start, end, max_pos;
+	gchar *cur_tag;
+	gint fn_style;
+
+	switch (sci_get_lexer(sci))
+	{
+		case SCLEX_RUBY:	fn_style = SCE_RB_DEFNAME; break;
+		case SCLEX_PYTHON:	fn_style = SCE_P_DEFNAME; break;
+		default: fn_style = SCE_C_IDENTIFIER;	// several lexers use SCE_C_IDENTIFIER
+	}
+	start = sci_get_position_from_line(sci, tag_line - 2);
+	max_pos = sci_get_position_from_line(sci, tag_line + 1);
+	while (sci_get_style_at(sci, start) != fn_style
+		&& start < max_pos) start++;
+
+	end = start;
+	while (sci_get_style_at(sci, end) == fn_style
+		&& end < max_pos) end++;
+
+	if (start == end) return NULL;
+	cur_tag = g_malloc(end - start + 1);
+	sci_get_text_range(sci, start, end, cur_tag);
+	return cur_tag;
+}
+
+
+// Parse the function name
+static gchar *parse_cpp_function_at_line(ScintillaObject *sci, gint tag_line)
+{
+	gint start, end, first_pos, max_pos;
 	gint tmp;
 	gchar c;
 	gchar *cur_tag;
 
 	first_pos = end = sci_get_position_from_line(sci, tag_line);
-	while (sci_get_char_at(sci, end) != '{') end++; // goto the begin of function body
-	while (sci_get_char_at(sci, end) != '(') end--; // go back to the end of function identifier
+	max_pos = sci_get_position_from_line(sci, tag_line + 1);
+	// goto the begin of function body
+	while (end < max_pos &&
+		(tmp = sci_get_char_at(sci, end)) != '{' &&
+		tmp != 0) end++;
+	if (tmp == 0) end --;
+
+	// go back to the end of function identifier
+	while (end > 0 && end > first_pos - 1000 &&
+		(tmp = sci_get_char_at(sci, end)) != '(' &&
+		tmp != 0) end--;
 	end--;
-	while (isspace(sci_get_char_at(sci, end))) end--; // skip whitespaces between identifier and (
+	if (end < 0) end = 0;
 
+	// skip whitespaces between identifier and (
+	while (isspace(sci_get_char_at(sci, end))) end--;
+
 	start = end;
-	tmp = 0;
 	c = 0;
 	// Use tmp to find SCE_C_IDENTIFIER or SCE_C_GLOBALCLASS chars
 	while (((tmp = sci_get_style_at(sci, start)) == SCE_C_IDENTIFIER
@@ -577,10 +619,12 @@
 		 || (c = sci_get_char_at(sci, start)) == '~'
 		 ||  c == ':'))
 		start--;
+	if (start < 0) start = 0;
 
 	if (sci_get_char_at(sci, start) == ' ') start++; // skip possible whitespace
 	if (sci_get_char_at(sci, start) == '*') start++; // skip possible * char
 
+	if (start == end) return NULL;
 	cur_tag = g_malloc(end - start + 2);
 	sci_get_text_range(sci, start, end + 1, cur_tag);
 	return cur_tag;
@@ -650,9 +694,16 @@
 
 		if (tag_line >= 0)
 		{
-			cur_tag = parse_function_at_line(doc_list[idx].sci, tag_line);
-			*tagname = cur_tag;
-			return tag_line;
+			if (sci_get_lexer(doc_list[idx].sci) == SCLEX_CPP)
+				cur_tag = parse_cpp_function_at_line(doc_list[idx].sci, tag_line);
+			else
+				cur_tag = parse_function_at_line(doc_list[idx].sci, tag_line);
+
+			if (cur_tag != NULL)
+			{
+				*tagname = cur_tag;
+				return tag_line;
+			}
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.