SF.net SVN: geany:[5894] trunk

[colombanw at users.sourceforge.net]

Revision: 5894
          http://geany.svn.sourceforge.net/geany/?rev=5894&view=rev
Author:   colombanw
Date:     2011-08-19 22:15:59 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
Fix tags for one-letter Haskell symbols

The tokens were not properly terminated when they were 1 character long,
leading them to contain parts of the previous token.

Closes #3289160.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/haskell.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-08-19 13:12:53 UTC (rev 5893)
+++ trunk/ChangeLog	2011-08-19 22:15:59 UTC (rev 5894)
@@ -1,3 +1,9 @@
+2011-08-20  Colomban Wendling  <colomban(at)geany(dot)org>
+
+ * tagmanager/haskell.c:
+   Fix tags for one-letter Haskell symbols (closes #3289160).
+
+
 2011-08-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * doc/plugins.dox:

Modified: trunk/tagmanager/haskell.c
===================================================================
--- trunk/tagmanager/haskell.c	2011-08-19 13:12:53 UTC (rev 5893)
+++ trunk/tagmanager/haskell.c	2011-08-19 22:15:59 UTC (rev 5894)
@@ -122,10 +122,10 @@
 	i++;
 	c = fileGetc();
     }
+    token[i] = '\0';
     if (c == EOF)
 	return 0;
     if (i != n) {
-	token[i] = '\0';
 	fileUngetc(c);
 	return 1;
     } else {
@@ -283,7 +283,6 @@
             }
         }
 	token[0] = c;
-	token[1] = '\0';
 	if (!isident(c)) {
 		skip_rest_of_line();
 		c = get_next_char();


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