Mercurial > mxe-octave

comparison src/qt-1-pcre.patch @ 2997:4f9b72cf7ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow native builds too
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2013 17:31:59 -0400
parents
children
comparison
equal deleted inserted replaced
2996:446aa596bb99 2997:4f9b72cf7ee7
1 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h
2 --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h 1969-12-31 19:00:00.000000000 -0500
3 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h 2012-09-10 21:36:49.000000000 -0400
4 @@ -0,0 +1,68 @@
5 +/* This is the public header file for JavaScriptCore's variant of the PCRE
6 +library. While this library started out as a copy of PCRE, many of the
7 +features of PCRE have been removed. This library now supports only the
8 +regular expression features required by the JavaScript language
9 +specification, and has only the functions needed by JavaScriptCore and the
10 +rest of WebKit.
11 +
12 + Copyright (c) 1997-2005 University of Cambridge
13 + Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
14 +
15 +-----------------------------------------------------------------------------
16 +Redistribution and use in source and binary forms, with or without
17 +modification, are permitted provided that the following conditions are met:
18 +
19 + * Redistributions of source code must retain the above copyright notice,
20 + this list of conditions and the following disclaimer.
21 +
22 + * Redistributions in binary form must reproduce the above copyright
23 + notice, this list of conditions and the following disclaimer in the
24 + documentation and/or other materials provided with the distribution.
25 +
26 + * Neither the name of the University of Cambridge nor the names of its
27 + contributors may be used to endorse or promote products derived from
28 + this software without specific prior written permission.
29 +
30 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
31 +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
32 +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
33 +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
34 +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
35 +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
36 +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
37 +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
38 +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
39 +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
40 +POSSIBILITY OF SUCH DAMAGE.
41 +-----------------------------------------------------------------------------
42 +*/
43 +
44 +// FIXME: This file needs to be renamed to JSRegExp.h; it's no longer PCRE.
45 +
46 +#ifndef JSRegExp_h
47 +#define JSRegExp_h
48 +
49 +#include <wtf/unicode/Unicode.h>
50 +
51 +struct JSRegExp;
52 +
53 +enum JSRegExpIgnoreCaseOption { JSRegExpDoNotIgnoreCase, JSRegExpIgnoreCase };
54 +enum JSRegExpMultilineOption { JSRegExpSingleLine, JSRegExpMultiline };
55 +
56 +/* jsRegExpExecute error codes */
57 +const int JSRegExpErrorNoMatch = -1;
58 +const int JSRegExpErrorHitLimit = -2;
59 +const int JSRegExpErrorNoMemory = -3;
60 +const int JSRegExpErrorInternal = -4;
61 +
62 +JSRegExp* jsRegExpCompile(const UChar* pattern, int patternLength,
63 + JSRegExpIgnoreCaseOption, JSRegExpMultilineOption,
64 + unsigned* numSubpatterns, const char** errorMessage);
65 +
66 +int jsRegExpExecute(const JSRegExp*,
67 + const UChar* subject, int subjectLength, int startOffset,
68 + int* offsetsVector, int offsetsVectorLength);
69 +
70 +void jsRegExpFree(JSRegExp*);
71 +
72 +#endif
73 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h
74 --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h 2012-09-10 21:36:49.000000000 -0400
75 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h 1969-12-31 19:00:00.000000000 -0500
76 @@ -1,68 +0,0 @@
77 -/* This is the public header file for JavaScriptCore's variant of the PCRE
78 -library. While this library started out as a copy of PCRE, many of the
79 -features of PCRE have been removed. This library now supports only the
80 -regular expression features required by the JavaScript language
81 -specification, and has only the functions needed by JavaScriptCore and the
82 -rest of WebKit.
83 -
84 - Copyright (c) 1997-2005 University of Cambridge
85 - Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved.
86 -
87 ------------------------------------------------------------------------------
88 -Redistribution and use in source and binary forms, with or without
89 -modification, are permitted provided that the following conditions are met:
90 -
91 - * Redistributions of source code must retain the above copyright notice,
92 - this list of conditions and the following disclaimer.
93 -
94 - * Redistributions in binary form must reproduce the above copyright
95 - notice, this list of conditions and the following disclaimer in the
96 - documentation and/or other materials provided with the distribution.
97 -
98 - * Neither the name of the University of Cambridge nor the names of its
99 - contributors may be used to endorse or promote products derived from
100 - this software without specific prior written permission.
101 -
102 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
103 -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
104 -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
105 -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
106 -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
107 -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
108 -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
109 -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
110 -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
111 -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
112 -POSSIBILITY OF SUCH DAMAGE.
113 ------------------------------------------------------------------------------
114 -*/
115 -
116 -// FIXME: This file needs to be renamed to JSRegExp.h; it's no longer PCRE.
117 -
118 -#ifndef JSRegExp_h
119 -#define JSRegExp_h
120 -
121 -#include <wtf/unicode/Unicode.h>
122 -
123 -struct JSRegExp;
124 -
125 -enum JSRegExpIgnoreCaseOption { JSRegExpDoNotIgnoreCase, JSRegExpIgnoreCase };
126 -enum JSRegExpMultilineOption { JSRegExpSingleLine, JSRegExpMultiline };
127 -
128 -/* jsRegExpExecute error codes */
129 -const int JSRegExpErrorNoMatch = -1;
130 -const int JSRegExpErrorHitLimit = -2;
131 -const int JSRegExpErrorNoMemory = -3;
132 -const int JSRegExpErrorInternal = -4;
133 -
134 -JSRegExp* jsRegExpCompile(const UChar* pattern, int patternLength,
135 - JSRegExpIgnoreCaseOption, JSRegExpMultilineOption,
136 - unsigned* numSubpatterns, const char** errorMessage);
137 -
138 -int jsRegExpExecute(const JSRegExp*,
139 - const UChar* subject, int subjectLength, int startOffset,
140 - int* offsetsVector, int offsetsVectorLength);
141 -
142 -void jsRegExpFree(JSRegExp*);
143 -
144 -#endif
145 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h
146 --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h 2012-09-10 21:36:49.000000000 -0400
147 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h 2013-05-24 16:09:35.048637500 -0400
148 @@ -79,7 +79,7 @@
149 #pragma warning(disable: 4244)
150 #endif
151
152 -#include "pcre.h"
153 +#include "jspcre.h"
154
155 /* The value of LINK_SIZE determines the number of bytes used to store links as
156 offsets within the compiled regex. The default is 2, which allows for compiled
157 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp
158 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp 2012-09-10 21:36:49.000000000 -0400
159 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp 2013-05-24 16:09:26.692742617 -0400
160 @@ -44,7 +44,7 @@
161 #include "JIT.h"
162 #include "WRECGenerator.h"
163 #endif
164 -#include <pcre/pcre.h>
165 +#include <pcre/jspcre.h>
166
167 #endif
168
169 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp
170 --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp 2012-09-10 21:36:49.000000000 -0400
171 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp 2013-05-24 16:09:39.008587095 -0400
172 @@ -32,7 +32,7 @@
173 #include "MacroAssembler.h"
174 #include "RegexCompiler.h"
175
176 -#include "pcre.h" // temporary, remove when fallback is removed.
177 +#include "jspcre.h" // temporary, remove when fallback is removed.
178
179 #if ENABLE(YARR_JIT)
180
181 diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h
182 --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2012-09-10 21:36:49.000000000 -0400
183 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2013-05-24 16:09:46.276492643 -0400
184 @@ -34,7 +34,7 @@
185 #include "RegexPattern.h"
186 #include <UString.h>
187
188 -#include <pcre.h>
189 +#include <jspcre.h>
190 struct JSRegExp; // temporary, remove when fallback is removed.
191
192 #if CPU(X86) && !COMPILER(MSVC)