Re: parser of GLOBAL version 4.8.3 seems to be broken.

[Shigio Yamaguchi]

> Hi,  parser of GLOBAL version 4.8.3 seems to be broken.

I have fixed the bug.
I will release GLOBAL-4.8.4 soon, because this is a big bug.
Thank you for your report!

Index: gtags-parser/C.c
===================================================================
RCS file: /cvsroot/global/global/gtags-parser/C.c,v
retrieving revision 1.2
diff -c -r1.2 C.c
*** gtags-parser/C.c    24 Feb 2005 01:33:48 -0000      1.2
--- gtags-parser/C.c    2 Mar 2005 14:48:48 -0000
***************
*** 109,121 ****
        savelevel = -1;
        target = (sflag) ? SYM : (rflag) ? REF : DEF;
        startmacro = startsharp = 0;
        cmode = 1;                      /* allow token like '#xxx' */
        crflag = 1;                     /* require '\n' as a token */
        if (yaccflag)
                ymode = 1;              /* allow token like '%xxx' */
  
-       if (!opentoken(file))
-               die("'%s' cannot open.", file);
        while ((cc = nexttoken(interested, reserved_word)) != EOF) {
                switch (cc) {
                case SYMBOL:            /* symbol       */
--- 109,122 ----
        savelevel = -1;
        target = (sflag) ? SYM : (rflag) ? REF : DEF;
        startmacro = startsharp = 0;
+ 
+       if (!opentoken(file))
+               die("'%s' cannot open.", file);
        cmode = 1;                      /* allow token like '#xxx' */
        crflag = 1;                     /* require '\n' as a token */
        if (yaccflag)
                ymode = 1;              /* allow token like '%xxx' */
  
        while ((cc = nexttoken(interested, reserved_word)) != EOF) {
                switch (cc) {
                case SYMBOL:            /* symbol       */
Index: gtags-parser/Cpp.c
===================================================================
RCS file: /cvsroot/global/global/gtags-parser/Cpp.c,v
retrieving revision 1.2
diff -c -r1.2 Cpp.c
*** gtags-parser/Cpp.c  24 Feb 2005 01:33:48 -0000      1.2
--- gtags-parser/Cpp.c  2 Mar 2005 14:48:49 -0000
***************
*** 98,109 ****
        savelevel = -1;
        target = (sflag) ? SYM : (rflag) ? REF : DEF;
        startclass = startthrow = startmacro = startsharp = startequal = 0;
        cmode = 1;                      /* allow token like '#xxx' */
        crflag = 1;                     /* require '\n' as a token */
        cppmode = 1;                    /* treat '::' as a token */
  
-       if (!opentoken(file))
-               die("'%s' cannot open.", file);
        while ((cc = nexttoken(interested, reserved_word)) != EOF) {
                if (cc == '~' && level == stack[classlevel].level)
                        continue;
--- 98,110 ----
        savelevel = -1;
        target = (sflag) ? SYM : (rflag) ? REF : DEF;
        startclass = startthrow = startmacro = startsharp = startequal = 0;
+ 
+       if (!opentoken(file))
+               die("'%s' cannot open.", file);
        cmode = 1;                      /* allow token like '#xxx' */
        crflag = 1;                     /* require '\n' as a token */
        cppmode = 1;                    /* treat '::' as a token */
  
        while ((cc = nexttoken(interested, reserved_word)) != EOF) {
                if (cc == '~' && level == stack[classlevel].level)
                        continue;
--
Shigio YAMAGUCHI <address@hidden> - Tama Communications Corporation
PGP fingerprint: D1CB 0B89 B346 4AB6 5663  C4B6 3CA5 BBB3 57BE DDA3