Ignore:
Timestamp:
Oct 16, 2007, 10:38:39 PM (18 years ago)
Author:
darin
Message:

Reviewed by Geoff.

  • merged PCRE changes between 6.4 and 6.5
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj: Removed pcre_config.c, pcre_globals.c, pcre_info.c, pcre_maketables.c, pcre_printint.src, pcre_refcount.c, pcre_study.c, pcre_try_flipped.c, pcre_ucp_findchar.c, pcre_version.c, and ucptable.c. Added pcre_ucp_searchfuncs.c.
  • pcre/AUTHORS:
  • pcre/LICENCE:
  • pcre/MERGING:
  • pcre/dftables.c:
  • pcre/pcre-config.h:
  • pcre/pcre.h:
  • pcre/pcre.pri:
  • pcre/pcre_compile.c:
  • pcre/pcre_exec.c:
  • pcre/pcre_fullinfo.c:
  • pcre/pcre_get.c:
  • pcre/pcre_internal.h:
  • pcre/pcre_maketables.c:
  • pcre/pcre_ord2utf8.c:
  • pcre/pcre_tables.c:
  • pcre/pcre_ucp_searchfuncs.c: Copied from pcre/pcre_ucp_findchar.c.
  • pcre/pcre_xclass.c:
  • pcre/ucp.h:
  • pcre/ucpinternal.h:
  • pcre/ucptable.c: Updated with new versions from the PCRE 6.5 release, merged with changes.
  • pcre/pcre_config.c: Removed.
  • pcre/pcre_globals.c: Removed.
  • pcre/pcre_info.c: Removed.
  • pcre/pcre_printint.src: Removed.
  • pcre/pcre_refcount.c: Removed.
  • pcre/pcre_study.c: Removed.
  • pcre/pcre_try_flipped.c: Removed.
  • pcre/pcre_ucp_findchar.c: Removed.
  • pcre/pcre_version.c: Removed.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/pcre/pcre-config.h

    r24453 r26697  
    1 /* On Unix systems config.in is converted by configure into config.h. PCRE is
    2 written in Standard C, but there are a few non-standard things it can cope
    3 with, allowing it to run on SunOS4 and other "close to standard" systems.
    41
    5 On a non-Unix system you should just copy this file into config.h, and set up
    6 the macros the way you need them. You should normally change the definitions of
    7 HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf
    8 works, these cannot be made the defaults. If your system has bcopy() and not
    9 memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your
    10 system has neither bcopy() nor memmove(), leave them both as 0; an emulation
    11 function will be used. */
     2/* On Unix-like systems config.in is converted by "configure" into config.h.
     3Some other environments also support the use of "configure". PCRE is written in
     4Standard C, but there are a few non-standard things it can cope with, allowing
     5it to run on SunOS4 and other "close to standard" systems.
     6
     7On a non-Unix-like system you should just copy this file into config.h, and set
     8up the macros the way you need them. You should normally change the definitions
     9of HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way
     10autoconf works, these cannot be made the defaults. If your system has bcopy()
     11and not memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE.
     12If your system has neither bcopy() nor memmove(), leave them both as 0; an
     13emulation function will be used. */
    1214
    1315/* If you are compiling for a system that uses EBCDIC instead of ASCII
    … …  
    1517this can be done via --enable-ebcdic. */
    1618
     19#ifndef EBCDIC
    1720#define EBCDIC 0
     21#endif
    1822
    19 /* If you are compiling for a system that needs some magic to be inserted
    20 before the definition of an exported function, define this macro to contain the
    21 relevant magic. It apears at the start of every exported function. */
     23/* If you are compiling for a system other than a Unix-like system or Win32,
     24and it needs some magic to be inserted before the definition of a function that
     25is exported by the library, define this macro to contain the relevant magic. If
     26you do not define this macro, it defaults to "extern" for a C compiler and
     27"extern C" for a C++ compiler on non-Win32 systems. This macro apears at the
     28start of every exported function that is part of the external API. It does not
     29appear on functions that are "external" in the C sense, but which are internal
     30to the library. */
    2231
    23 #define PCRE_EXPORT
     32#define PCRE_DATA_SCOPE extern
    2433
    25 /* Define to empty if the "const" keyword does not work. */
     34/* Define the following macro to empty if the "const" keyword does not work. */
    2635
    2736#undef const
    2837
    29 /* Define to "unsigned" if <stddef.h> doesn't define size_t. */
     38/* Define the following macro to "unsigned" if <stddef.h> does not define
     39size_t. */
    3040
    3141#undef size_t
    3242
    3343/* The following two definitions are mainly for the benefit of SunOS4, which
    34 doesn't have the strerror() or memmove() functions that should be present in
     44does not have the strerror() or memmove() functions that should be present in
    3545all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should
    3646normally be defined with the value 1 for other systems, but unfortunately we
    37 can't make this the default because "configure" files generated by autoconf
     47cannot make this the default because "configure" files generated by autoconf
    3848will only change 0 to 1; they won't change 1 to 0 if the functions are not
    3949found. */
    … …  
    4252#define HAVE_MEMMOVE  1
    4353
    44 /* There are some non-Unix systems that don't even have bcopy(). If this macro
    45 is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
     54/* There are some non-Unix-like systems that don't even have bcopy(). If this
     55macro is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
    4656HAVE_BCOPY is not relevant. */
    4757
    48 #define HAVE_BCOPY    1
     58#define HAVE_BCOPY    0
    4959
    5060/* The value of NEWLINE determines the newline character. The default is to
    5161leave it up to the compiler, but some sites want to force a particular value.
    52 On Unix systems, "configure" can be used to override this default. */
     62On Unix-like systems, "configure" can be used to override this default. */
    5363
     64#ifndef NEWLINE
    5465#define NEWLINE '\n'
     66#endif
    5567
    56 /* The value of LINK_SIZE determines the number of bytes used to store
    57 links as offsets within the compiled regex. The default is 2, which allows for
    58 compiled patterns up to 64K long. This covers the vast majority of cases.
    59 However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows for
    60 longer patterns in extreme cases. On Unix systems, "configure" can be used to
    61 override this default. */
     68/* The value of LINK_SIZE determines the number of bytes used to store links as
     69offsets within the compiled regex. The default is 2, which allows for compiled
     70patterns up to 64K long. This covers the vast majority of cases. However, PCRE
     71can also be compiled to use 3 or 4 bytes instead. This allows for longer
     72patterns in extreme cases. On systems that support it, "configure" can be used
     73to override this default. */
    6274
     75#ifndef LINK_SIZE
    6376#define LINK_SIZE   2
    64 
    65 /* The value of MATCH_LIMIT determines the default number of times the match()
    66 function can be called during a single execution of pcre_exec(). (There is a
    67 runtime method of setting a different limit.) The limit exists in order to
    68 catch runaway regular expressions that take for ever to determine that they do
    69 not match. The default is set very large so that it does not accidentally catch
    70 legitimate cases. On Unix systems, "configure" can be used to override this
    71 default default. */
    72 
    73 #define MATCH_LIMIT 10000000
     77#endif
    7478
    7579/* When calling PCRE via the POSIX interface, additional working storage is
    … …  
    7882the number of expected substrings is small, the wrapper function uses space on
    7983the stack, because this is faster than using malloc() for each call. The
    80 threshold above which the stack is no longer use is defined by POSIX_MALLOC_
    81 THRESHOLD. On Unix systems, "configure" can be used to override this default.
    82 */
     84threshold above which the stack is no longer used is defined by POSIX_MALLOC_
     85THRESHOLD. On systems that support it, "configure" can be used to override this
     86default. */
    8387
     88#ifndef POSIX_MALLOC_THRESHOLD
    8489#define POSIX_MALLOC_THRESHOLD 10
     90#endif
    8591
    8692/* PCRE uses recursive function calls to handle backtracking while matching.
    8793This can sometimes be a problem on systems that have stacks of limited size.
    8894Define NO_RECURSE to get a version that doesn't use recursion in the match()
    89 function; instead it creates its own stack by steam using pcre_recurse_malloc
    90 to get memory. For more detail, see comments and other stuff just above the
    91 match() function. On Unix systems, "configure" can be used to set this in the
    92 Makefile (use --disable-stack-for-recursion). */
     95function; instead it creates its own stack by steam using pcre_recurse_malloc()
     96to obtain memory from the heap. For more detail, see the comments and other
     97stuff just above the match() function. On systems that support it, "configure"
     98can be used to set this in the Makefile (use --disable-stack-for-recursion). */
    9399
    94100#define NO_RECURSE
    95101
    96 /* End */
     102/* The value of MATCH_LIMIT determines the default number of times the internal
     103match() function can be called during a single execution of pcre_exec(). There
     104is a runtime interface for setting a different limit. The limit exists in order
     105to catch runaway regular expressions that take for ever to determine that they
     106do not match. The default is set very large so that it does not accidentally
     107catch legitimate cases. On systems that support it, "configure" can be used to
     108override this default default. */
     109
     110#ifndef MATCH_LIMIT
     111#define MATCH_LIMIT 10000000
     112#endif
     113
     114/* The above limit applies to all calls of match(), whether or not they
     115increase the recursion depth. In some environments it is desirable to limit the
     116depth of recursive calls of match() more strictly, in order to restrict the
     117maximum amount of stack (or heap, if NO_RECURSE is defined) that is used. The
     118value of MATCH_LIMIT_RECURSION applies only to recursive calls of match(). To
     119have any useful effect, it must be less than the value of MATCH_LIMIT. There is
     120a runtime method for setting a different limit. On systems that support it,
     121"configure" can be used to override this default default. */
     122
     123#ifndef MATCH_LIMIT_RECURSION
     124#define MATCH_LIMIT_RECURSION MATCH_LIMIT
     125#endif
    97126
    98127#define SUPPORT_UCP 1
    … …  
    100129
    101130#define JAVASCRIPT 1
     131
     132/* End */
Note: See TracChangeset for help on using the changeset viewer.