Mercurial > mxe-octave
view src/qt-1-pcre.patch @ 3419:e7e29aeea726
Add octave forge 'fl-core' package
* Makefile.in: Add of-fl-core.
* build_packages.m: Add install of fl-core-1.0.3.tar.gz
* dist-files: Add of-fl-core.mk, of-fl-core-1-fixes.patch.
* index.html: Added of-fl-core-package.
* src/of-fl-core.mk: New file.
* src/of-fl-core-1-fixes.patch: New file.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 13 Jan 2014 18:26:59 -0500 |
parents | 4f9b72cf7ee7 |
children |
line wrap: on
line source
diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h 1969-12-31 19:00:00.000000000 -0500 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/jspcre.h 2012-09-10 21:36:49.000000000 -0400 @@ -0,0 +1,68 @@ +/* This is the public header file for JavaScriptCore's variant of the PCRE +library. While this library started out as a copy of PCRE, many of the +features of PCRE have been removed. This library now supports only the +regular expression features required by the JavaScript language +specification, and has only the functions needed by JavaScriptCore and the +rest of WebKit. + + Copyright (c) 1997-2005 University of Cambridge + Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved. + +----------------------------------------------------------------------------- +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +----------------------------------------------------------------------------- +*/ + +// FIXME: This file needs to be renamed to JSRegExp.h; it's no longer PCRE. + +#ifndef JSRegExp_h +#define JSRegExp_h + +#include <wtf/unicode/Unicode.h> + +struct JSRegExp; + +enum JSRegExpIgnoreCaseOption { JSRegExpDoNotIgnoreCase, JSRegExpIgnoreCase }; +enum JSRegExpMultilineOption { JSRegExpSingleLine, JSRegExpMultiline }; + +/* jsRegExpExecute error codes */ +const int JSRegExpErrorNoMatch = -1; +const int JSRegExpErrorHitLimit = -2; +const int JSRegExpErrorNoMemory = -3; +const int JSRegExpErrorInternal = -4; + +JSRegExp* jsRegExpCompile(const UChar* pattern, int patternLength, + JSRegExpIgnoreCaseOption, JSRegExpMultilineOption, + unsigned* numSubpatterns, const char** errorMessage); + +int jsRegExpExecute(const JSRegExp*, + const UChar* subject, int subjectLength, int startOffset, + int* offsetsVector, int offsetsVectorLength); + +void jsRegExpFree(JSRegExp*); + +#endif diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h 2012-09-10 21:36:49.000000000 -0400 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,68 +0,0 @@ -/* This is the public header file for JavaScriptCore's variant of the PCRE -library. While this library started out as a copy of PCRE, many of the -features of PCRE have been removed. This library now supports only the -regular expression features required by the JavaScript language -specification, and has only the functions needed by JavaScriptCore and the -rest of WebKit. - - Copyright (c) 1997-2005 University of Cambridge - Copyright (C) 2002, 2004, 2006, 2007 Apple Inc. All rights reserved. - ------------------------------------------------------------------------------ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of the University of Cambridge nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ -*/ - -// FIXME: This file needs to be renamed to JSRegExp.h; it's no longer PCRE. - -#ifndef JSRegExp_h -#define JSRegExp_h - -#include <wtf/unicode/Unicode.h> - -struct JSRegExp; - -enum JSRegExpIgnoreCaseOption { JSRegExpDoNotIgnoreCase, JSRegExpIgnoreCase }; -enum JSRegExpMultilineOption { JSRegExpSingleLine, JSRegExpMultiline }; - -/* jsRegExpExecute error codes */ -const int JSRegExpErrorNoMatch = -1; -const int JSRegExpErrorHitLimit = -2; -const int JSRegExpErrorNoMemory = -3; -const int JSRegExpErrorInternal = -4; - -JSRegExp* jsRegExpCompile(const UChar* pattern, int patternLength, - JSRegExpIgnoreCaseOption, JSRegExpMultilineOption, - unsigned* numSubpatterns, const char** errorMessage); - -int jsRegExpExecute(const JSRegExp*, - const UChar* subject, int subjectLength, int startOffset, - int* offsetsVector, int offsetsVectorLength); - -void jsRegExpFree(JSRegExp*); - -#endif diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h 2012-09-10 21:36:49.000000000 -0400 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_internal.h 2013-05-24 16:09:35.048637500 -0400 @@ -79,7 +79,7 @@ #pragma warning(disable: 4244) #endif -#include "pcre.h" +#include "jspcre.h" /* The value of LINK_SIZE determines the number of bytes used to store links as offsets within the compiled regex. The default is 2, which allows for compiled diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp 2012-09-10 21:36:49.000000000 -0400 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/RegExp.cpp 2013-05-24 16:09:26.692742617 -0400 @@ -44,7 +44,7 @@ #include "JIT.h" #include "WRECGenerator.h" #endif -#include <pcre/pcre.h> +#include <pcre/jspcre.h> #endif diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp 2012-09-10 21:36:49.000000000 -0400 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp 2013-05-24 16:09:39.008587095 -0400 @@ -32,7 +32,7 @@ #include "MacroAssembler.h" #include "RegexCompiler.h" -#include "pcre.h" // temporary, remove when fallback is removed. +#include "jspcre.h" // temporary, remove when fallback is removed. #if ENABLE(YARR_JIT) diff -uNr a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h --- a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2012-09-10 21:36:49.000000000 -0400 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2013-05-24 16:09:46.276492643 -0400 @@ -34,7 +34,7 @@ #include "RegexPattern.h" #include <UString.h> -#include <pcre.h> +#include <jspcre.h> struct JSRegExp; // temporary, remove when fallback is removed. #if CPU(X86) && !COMPILER(MSVC)