Ignore:
Timestamp:
Apr 27, 2004, 8:39:34 PM (21 years ago)
Author:
bird
Message:

GCC v3.3.3 sources.

Location:
branches/GNU/src/gcc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/GNU/src/gcc

    • Property svn:ignore

      •  

        old new  
        2626configure.vr
        2727configure.vrs
         28dir.info
        2829Makefile
        29 dir.info
        3030lost+found
        3131update.out

  • branches/GNU/src/gcc/libiberty/regex.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    33   (Implements POSIX draft P1003.2/D11.2, except for some of the
    44   internationalization features.)
    5    Copyright (C) 1993-1999, 2000, 2001 Free Software Foundation, Inc.
     5   Copyright (C) 1993-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    66   This file is part of the GNU C Library.
    77
    … …  
    2626   routines or with other components regex routines. */
    2727/* AIX requires this to be the first thing in the file. */
    28 #if defined _AIX && !defined REGEX_MALLOC
     28#if defined _AIX && !defined __GNUC__ && !defined REGEX_MALLOC
    2929  #pragma alloca
    3030#endif
    … …  
    13821382   but why not be nice?  */
    13831383
    1384 static const char re_error_msgid[] =
     1384static const char *re_error_msgid[] =
    13851385  {
    1386 # define REG_NOERROR_IDX        0
    1387     gettext_noop ("Success")    /* REG_NOERROR */
    1388     "\0"
    1389 # define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
    1390     gettext_noop ("No match")   /* REG_NOMATCH */
    1391     "\0"
    1392 # define REG_BADPAT_IDX (REG_NOMATCH_IDX + sizeof "No match")
    1393     gettext_noop ("Invalid regular expression") /* REG_BADPAT */
    1394     "\0"
    1395 # define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
    1396     gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
    1397     "\0"
    1398 # define REG_ECTYPE_IDX (REG_ECOLLATE_IDX + sizeof "Invalid collation character")
    1399     gettext_noop ("Invalid character class name") /* REG_ECTYPE */
    1400     "\0"
    1401 # define REG_EESCAPE_IDX        (REG_ECTYPE_IDX + sizeof "Invalid character class name")
    1402     gettext_noop ("Trailing backslash") /* REG_EESCAPE */
    1403     "\0"
    1404 # define REG_ESUBREG_IDX        (REG_EESCAPE_IDX + sizeof "Trailing backslash")
    1405     gettext_noop ("Invalid back reference") /* REG_ESUBREG */
    1406     "\0"
    1407 # define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference")
    1408     gettext_noop ("Unmatched [ or [^")  /* REG_EBRACK */
    1409     "\0"
    1410 # define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
    1411     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
    1412     "\0"
    1413 # define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
    1414     gettext_noop ("Unmatched \\{") /* REG_EBRACE */
    1415     "\0"
    1416 # define REG_BADBR_IDX  (REG_EBRACE_IDX + sizeof "Unmatched \\{")
    1417     gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
    1418     "\0"
    1419 # define REG_ERANGE_IDX (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
    1420     gettext_noop ("Invalid range end")  /* REG_ERANGE */
    1421     "\0"
    1422 # define REG_ESPACE_IDX (REG_ERANGE_IDX + sizeof "Invalid range end")
    1423     gettext_noop ("Memory exhausted") /* REG_ESPACE */
    1424     "\0"
    1425 # define REG_BADRPT_IDX (REG_ESPACE_IDX + sizeof "Memory exhausted")
    1426     gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
    1427     "\0"
    1428 # define REG_EEND_IDX   (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
    1429     gettext_noop ("Premature end of regular expression") /* REG_EEND */
    1430     "\0"
    1431 # define REG_ESIZE_IDX  (REG_EEND_IDX + sizeof "Premature end of regular expression")
    1432     gettext_noop ("Regular expression too big") /* REG_ESIZE */
    1433     "\0"
    1434 # define REG_ERPAREN_IDX        (REG_ESIZE_IDX + sizeof "Regular expression too big")
     1386    gettext_noop ("Success"),   /* REG_NOERROR */
     1387    gettext_noop ("No match"),  /* REG_NOMATCH */
     1388    gettext_noop ("Invalid regular expression"), /* REG_BADPAT */
     1389    gettext_noop ("Invalid collation character"), /* REG_ECOLLATE */
     1390    gettext_noop ("Invalid character class name"), /* REG_ECTYPE */
     1391    gettext_noop ("Trailing backslash"), /* REG_EESCAPE */
     1392    gettext_noop ("Invalid back reference"), /* REG_ESUBREG */
     1393    gettext_noop ("Unmatched [ or [^"), /* REG_EBRACK */
     1394    gettext_noop ("Unmatched ( or \\("), /* REG_EPAREN */
     1395    gettext_noop ("Unmatched \\{"), /* REG_EBRACE */
     1396    gettext_noop ("Invalid content of \\{\\}"), /* REG_BADBR */
     1397    gettext_noop ("Invalid range end"), /* REG_ERANGE */
     1398    gettext_noop ("Memory exhausted"), /* REG_ESPACE */
     1399    gettext_noop ("Invalid preceding regular expression"), /* REG_BADRPT */
     1400    gettext_noop ("Premature end of regular expression"), /* REG_EEND */
     1401    gettext_noop ("Regular expression too big"), /* REG_ESIZE */
    14351402    gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
    1436   };
    1437 
    1438 static const size_t re_error_msgid_idx[] =
    1439   {
    1440     REG_NOERROR_IDX,
    1441     REG_NOMATCH_IDX,
    1442     REG_BADPAT_IDX,
    1443     REG_ECOLLATE_IDX,
    1444     REG_ECTYPE_IDX,
    1445     REG_EESCAPE_IDX,
    1446     REG_ESUBREG_IDX,
    1447     REG_EBRACK_IDX,
    1448     REG_EPAREN_IDX,
    1449     REG_EBRACE_IDX,
    1450     REG_BADBR_IDX,
    1451     REG_ERANGE_IDX,
    1452     REG_ESPACE_IDX,
    1453     REG_BADRPT_IDX,
    1454     REG_EEND_IDX,
    1455     REG_ESIZE_IDX,
    1456     REG_ERPAREN_IDX
    14571403  };
    14581404
    … …  
    47174663  while (1)
    47184664    {
    4719       if (p == pend || *p == succeed)
     4665      if (p == pend || *p == (UCHAR_T) succeed)
    47204666        {
    47214667          /* We have reached the (effective) end of pattern.  */
    … …  
    79647910  if (!ret)
    79657911    return NULL;
    7966   return gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
     7912  return gettext (re_error_msgid[(int) ret]);
    79677913}
    79687914#ifdef _LIBC
    … …  
    80027948      re_comp_buf.buffer = (unsigned char *) malloc (200);
    80037949      if (re_comp_buf.buffer == NULL)
    8004         return (char *) gettext (re_error_msgid
    8005                                  + re_error_msgid_idx[(int) REG_ESPACE]);
     7950        return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
    80067951      re_comp_buf.allocated = 200;
    80077952
    80087953      re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH);
    80097954      if (re_comp_buf.fastmap == NULL)
    8010         return (char *) gettext (re_error_msgid
    8011                                  + re_error_msgid_idx[(int) REG_ESPACE]);
     7955        return (char *) gettext (re_error_msgid[(int) REG_ESPACE]);
    80127956    }
    80137957
    … …  
    80297973
    80307974  /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
    8031   return (char *) gettext (re_error_msgid + re_error_msgid_idx[(int) ret]);
     7975  return (char *) gettext (re_error_msgid[(int) ret]);
    80327976}
    80337977
    … …  
    82618205
    82628206  if (errcode < 0
    8263       || errcode >= (int) (sizeof (re_error_msgid_idx)
    8264                            / sizeof (re_error_msgid_idx[0])))
     8207      || errcode >= (int) (sizeof (re_error_msgid)
     8208                           / sizeof (re_error_msgid[0])))
    82658209    /* Only error codes returned by the rest of the code should be passed
    82668210       to this routine.  If we are given anything else, or if other regex
    … …  
    82698213    abort ();
    82708214
    8271   msg = gettext (re_error_msgid + re_error_msgid_idx[errcode]);
     8215  msg = gettext (re_error_msgid[errcode]);
    82728216
    82738217  msg_size = strlen (msg) + 1; /* Includes the null.  */
    … …  
    82788222        {
    82798223#if defined HAVE_MEMPCPY || defined _LIBC
    8280           *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
     8224          *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
    82818225#else
    82828226          memcpy (errbuf, msg, errbuf_size - 1);
Note: See TracChangeset for help on using the changeset viewer.