SF.net SVN: geany: [1244] trunk

[ntrel at users.sourceforge.net]

Revision: 1244
          http://svn.sourceforge.net/geany/?rev=1244&view=rev
Author:   ntrel
Date:     2007-02-03 05:24:27 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Make anonymous typenames use anon_typename_n instead of
typename_anon_n (it seems we can't use <> brackets because of
missing scope problem).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-03 13:14:34 UTC (rev 1243)
+++ trunk/ChangeLog	2007-02-03 13:24:27 UTC (rev 1244)
@@ -3,6 +3,10 @@
  * src/document.c:
    Prevent scroll bar from moving when using document_find_text() and
    no match is found.
+ * tagmanager/c.c:
+   Make anonymous typenames use anon_typename_n instead of
+   typename_anon_n (it seems we can't use <> brackets because of
+   missing scope problem).
 
 
 2007-02-01  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c	2007-02-03 13:14:34 UTC (rev 1243)
+++ trunk/tagmanager/c.c	2007-02-03 13:24:27 UTC (rev 1244)
@@ -2427,22 +2427,24 @@
 		    tokenInfo *contextual_token = (tokenInfo *)prev;
 		    if(isContextualKeyword (contextual_token))
 		    {
-			char buffer[64];
-			sprintf(buffer, "_anon_%d", contextual_fake_count++);
+				char buffer[64];
 
-			name_token = newToken ();
-			copyToken (name_token, contextual_token);
-			vStringCatS(name_token->name, buffer);
+				name_token = newToken ();
+				copyToken (name_token, contextual_token);
 
-			name_token->type = TOKEN_NAME;
-			name_token->keyword	= KEYWORD_NONE;
+				sprintf(buffer, "anon_%s_%d", name_token->name->buffer, contextual_fake_count++);
+				vStringClear(name_token->name);
+				vStringCatS(name_token->name, buffer);
 
-			advanceToken (st);
-			contextual_token = activeToken (st);
-			copyToken (contextual_token, token);
-			copyToken ((tokenInfo *const)token, name_token);
-			copyToken (st->blockName, name_token);
-			copyToken (st->firstToken, name_token);
+				name_token->type = TOKEN_NAME;
+				name_token->keyword	= KEYWORD_NONE;
+
+				advanceToken (st);
+				contextual_token = activeToken (st);
+				copyToken (contextual_token, token);
+				copyToken ((tokenInfo *const)token, name_token);
+				copyToken (st->blockName, name_token);
+				copyToken (st->firstToken, name_token);
 		    }
 		}
 		qualifyBlockTag (st, name_token);


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