Backport js.c and asm.c from CTags SVN.

Fix Assembler tagmanager support and add appropriate symbol types.
Fix JavaScript parse bug (#1895242).
Change default return value of lookupKeyword() in keyword.c as it was done in CTags SVN(r339) and adjust affected parsers.


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

ChangeLog

@@ -6,6 +6,13 @@
    from this feature.
  * src/document.c:
    Don't open zero byte sized files read-only (e.g. files in /proc).
+ * src/symbols.c, tagmanager/fortran.c, tagmanager/keyword.c,
+   tagmanager/js.c, tagmanager/asm.c, tagmanager/c.c:
+   Backport js.c and asm.c from CTags SVN.
+   Fix Assembler tagmanager support and add appropriate symbol types.
+   Fix JavaScript parse bug (#1895242).
+   Change default return value of lookupKeyword() in keyword.c as it was
+   done in CTags SVN(r339) and adjust affected parsers.
 
 
 2008-03-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

src/symbols.c

@@ -718,6 +718,16 @@ static void init_tag_list(gint idx)
 				NULL);
 			break;
 		}
+		case GEANY_FILETYPES_ASM:
+		{
+			tag_list_add_groups(tag_store,
+				&(tv_iters.tag_namespace), _("Labels"), "classviewer-namespace",
+				&(tv_iters.tag_function), _("Macros"), "classviewer-method",
+				&(tv_iters.tag_macro), _("Defines"), "classviewer-macro",
+				&(tv_iters.tag_struct), _("Types"), "classviewer-struct",
+				NULL);
+			break;
+		}
 		case GEANY_FILETYPES_D:
 		default:
 		{

tagmanager/c.c

@@ -54,7 +54,7 @@ typedef enum eException {
 /*  Used to specify type of keyword.
  */
 typedef enum eKeywordId {
-	KEYWORD_NONE,
+	KEYWORD_NONE = -1,
 	KEYWORD_ATTRIBUTE, KEYWORD_ABSTRACT,
 	KEYWORD_BOOLEAN, KEYWORD_BYTE, KEYWORD_BAD_STATE, KEYWORD_BAD_TRANS,
 	KEYWORD_BIND, KEYWORD_BIND_VAR, KEYWORD_BIT,

tagmanager/fortran.c

@@ -58,7 +58,7 @@ typedef enum eFortranLineType {
 /*  Used to specify type of keyword.
  */
 typedef enum eKeywordId {
-    KEYWORD_NONE,
+    KEYWORD_NONE = -1,
     KEYWORD_allocatable,
     KEYWORD_assignment,
     KEYWORD_block,

tagmanager/keyword.c

@@ -162,7 +162,7 @@ extern int lookupKeyword (const char *const string, langType language)
 {
     const unsigned long hashedValue = hashValue (string);
     hashEntry *entry = getHashTableEntry (hashedValue);
-    int value = 0;
+    int value = -1;
 
     while (entry != NULL)
     {