Changeset 1409

Timestamp:

Apr 30, 2004, 10:39:38 AM (21 years ago)

Author:

bird

Message:

Fixed problem with GCC 3.3.3 and nextcolon().

File:

• trunk/src/emx/src/emxomf/stabshll.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/emxomf/stabshll.c

@@ -19 +19 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
+//#define HLL_DEBUG 1
 
 /*******************************************************************************
@@ -30 +30 @@
 #include <time.h>
 #include <alloca.h>
+#include <ctype.h>
 #include "defs.h"
 #include "emxomf.h"
@@ -407 +408 @@
     {
       if (parse_pindex && *parse_pindex >= 0 && *parse_pindex < sym_count)
-        fprintf (stderr, "emxomf info: parsing sym no.%d type=%d at char '%c' in position %ld:\n%s\n",
+        fprintf (stderr, "emxomf info: parsing sym no.%d type=%d at char '%c' in position %d:\n%s\n",
                  *parse_pindex, sym_ptr[*parse_pindex].n_type,
                  *parse_ptr, parse_ptr - parse_start, parse_start);
       else
-        fprintf (stderr, "emxomf info: parsing '%c' at position %ld:\n%s\n",
+        fprintf (stderr, "emxomf info: parsing '%c' at position %d:\n%s\n",
                  *parse_ptr, parse_ptr - parse_start, parse_start);
     }
@@ -1556 +1557 @@
  * @returns Pointer to next colon within psz.
  * @returns NULL if not found.
- * @param   psz     String to search.
+ * @param   pszString   String to search.
+ * @param   chType      Type we're parsing. Use '\0' if unknown or it 
+ *                      should be ignored
+ * @remark  Still a bad hack this.
  */
-static const char *nextcolon(const char *psz)
-{
-  int cNesting = 0;                     /* <> level */
-
-  for (;;psz++)
-    switch (*psz)
-      {
-        case '<':
-          if (psz[1] == ':')
-            return psz + 1;
-          if (psz[1] == '<')            /* hack for operators. */
+#ifdef COLON_DEBUG
+static const char *nextcolon2(const char *pszString, char chType)
+{
+    static const char *_nextcolon2(const char *pszString, char chType);
+    const char *psz = _nextcolon2(pszString, chType);
+    fprintf(stderr, "COLON: %.100s\n%.32s\n", pszString, psz);
+    return psz;
+}
+static const char *_nextcolon2(const char *pszString, char chType)
+#else
+static const char *nextcolon2(const char *pszString, char chType)
+#endif 
+{
+    const char *pszColon;
+    const char *psz;
+
+    /* permanent operator hack */
+    if (    pszString[0] == 'o'
+        &&  pszString[1] == 'p'
+        &&  pszString[2] == 'e'
+        &&  pszString[3] == 'r'
+        &&  pszString[4] == 'a'
+        &&  pszString[5] == 't'
+        &&  pszString[6] == 'o'
+        &&  pszString[7] == 'r')
+    {
+        psz = pszString + 8;
+        while (*psz && !isalnum(*psz) && *psz != '_') /* potential operator chars */
+        {
+            if (*psz == ':')
             {
-              psz++;
-              break;
+                if (    psz - pszString >= 1 + 8
+                    &&  psz - pszString <= 3 + 8)
+                    return psz;
+                break;
             }
-          cNesting++;
-          break;
-        case '>':
-          if (psz[1] == ':')
-            return psz + 1;
-          if (psz[1] == '>')            /* hack for operators. */
+            psz++;
+        }
+
+    }
+
+    /* normal life */
+    pszColon = strchr(pszString, ':');
+    if (!pszColon)
+        return NULL;
+    psz = strchr(pszString, '<');
+
+    if (psz && psz < pszColon && pszColon[1] == ':')
+    {
+        int   cNesting = 0;             /* <> level */
+
+        for (;;psz++)
+        {
+            switch (*psz)
             {
-              psz++;
-              break;
+                case '<':   cNesting++; break;
+                case '>':   cNesting--; break;
+                case ':':
+                    if (cNesting > 0)
+                        break;
+                    /* hack: continue on ">::" (but not on "operator...") */
+                    if (    psz[1] == ':' 
+                        &&  psz > pszString && psz[-1] == '>'
+                            ) 
+                    {
+                        psz++;
+                        break;
+                    }
+                    return psz;
+                case '\0':
+                    return NULL;
             }
-          cNesting--;
-          break;
-        case ':':
-          if (cNesting <= 0)
-            return psz;
-          break;
-        case '\0':
-          return NULL;
-      }
-  return NULL;
-}
+        }
+    }
+    else
+    {
+        if (chType != 'x')
+        {
+            /* skip '::' (hack:) if not followed by number. */
+            while (*pszColon && pszColon[1] == ':' && (pszColon[2] > '9' || pszColon[2] < '0'))
+            {
+                pszColon += 2;
+                while (*pszColon != ':' && *pszColon)
+                    pszColon++;
+            }
+        }
+    }
+
+    return pszColon;
+}
+
+/* old version */
+static inline const char *nextcolon(const char *pszString)
+{
+    return nextcolon2(pszString, '\0');
+}
+
 
 
@@ -1621 +1686 @@
       if (!parse_number (&num1))
         goto syntax;
+
       /* Special case: self reference => void */
       is_void = FALSE;
@@ -1968 +2034 @@
       ++parse_ptr;
       ch = *parse_ptr++;
-      p1 = nextcolon (parse_ptr);
+      p1 = nextcolon2 (parse_ptr, 'x');
       if (p1 == NULL)
         {