[webkit-changes] cvs commit: JavaScriptCore/pcre pcre_compile.c
pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c
pcre_globals.c pcre_info.c pcre_internal.h pcre_maketables.c
pcre_ord2utf8.c pcre_printint.c pcre_refcount.c pcre_study.c
pcre_tables.c pcre_try_flipped.c pcre_ucp_findchar.c
pcre_version.c pcre_xclass.c ucp.h ucp_findchar.c
ucpinternal.h ucptable.c AUTHORS COPYING LICENCE dftables.c
pcre-config.h pcre.h get.c internal.h maketables.c pcre.c study.c
Darin
darin at opensource.apple.com
Thu Sep 8 17:51:11 PDT 2005
darin 05/09/08 17:51:10
Modified: . ChangeLog Info.plist
JavaScriptCore.xcodeproj project.pbxproj
pcre AUTHORS COPYING LICENCE dftables.c pcre-config.h
pcre.h
Added: pcre pcre_compile.c pcre_config.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c
pcre_info.c pcre_internal.h pcre_maketables.c
pcre_ord2utf8.c pcre_printint.c pcre_refcount.c
pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_ucp_findchar.c pcre_version.c pcre_xclass.c
ucp.h ucp_findchar.c ucpinternal.h ucptable.c
Removed: pcre get.c internal.h maketables.c pcre.c study.c
Log:
Reviewed by Geoff.
- updated to PCRE 6.1
The original PCRE 6.1 sources are checked into the tree with the tag
"pcre-6-1" for reference. What we're checking in right now is the original
plus our changes to make it support UTF-16 and at least one other tweak
(vertical tab considered whitespace). Our work to get our changes was
done on "pcre-6-1-branch", with an anchor at "pcre-6-1-anchor" so you can
see the evolution of the UTF-16 changes.
Note also that there was one small change made here that's not on the branch
in pcre_compile.c.
* Info.plist: Updated the part of the copyright message that's about PCRE.
* JavaScriptCore.xcodeproj/project.pbxproj: Added new PCRE source files,
removed obsolete ones.
* pcre/AUTHORS: Updated to PCRE 6.1. Includes credits for Apple's UTF-16
changes, but not the credits for Google's C++ wrapper, since we don't include that.
* pcre/COPYING: Updated to PCRE 6.1.
* pcre/LICENCE: Ditto.
* pcre/dftables.c: Ditto.
* pcre/pcre-config.h: Ditto.
* pcre/pcre.h: Ditto.
* pcre/pcre_compile.c: Added for PCRE 6.1.
* pcre/pcre_config.c: Ditto.
* pcre/pcre_exec.c: Ditto.
* pcre/pcre_fullinfo.c: Ditto.
* pcre/pcre_get.c: Ditto.
* pcre/pcre_globals.c: Ditto.
* pcre/pcre_info.c: Ditto.
* pcre/pcre_internal.h: Ditto.
* pcre/pcre_maketables.c: Ditto.
* pcre/pcre_ord2utf8.c: Ditto.
* pcre/pcre_printint.c: Ditto.
* pcre/pcre_refcount.c: Ditto.
* pcre/pcre_study.c: Ditto.
* pcre/pcre_tables.c: Ditto.
* pcre/pcre_try_flipped.c: Ditto.
* pcre/pcre_ucp_findchar.c: Ditto.
* pcre/pcre_version.c: Ditto.
* pcre/pcre_xclass.c: Ditto.
* pcre/ucp.h: Ditto.
* pcre/ucp_findchar.c: Ditto.
* pcre/ucpinternal.h: Ditto.
* pcre/ucptable.c: Ditto.
* pcre/get.c: Removed.
* pcre/internal.h: Removed.
* pcre/maketables.c: Removed.
* pcre/pcre.c: Removed.
* pcre/study.c: Removed.
Revision Changes Path
1.819 +58 -0 JavaScriptCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -r1.818 -r1.819
--- ChangeLog 7 Sep 2005 23:27:27 -0000 1.818
+++ ChangeLog 9 Sep 2005 00:51:05 -0000 1.819
@@ -1,3 +1,61 @@
+2005-09-08 Darin Adler <darin at apple.com>
+
+ Reviewed by Geoff.
+
+ - updated to PCRE 6.1
+
+ The original PCRE 6.1 sources are checked into the tree with the tag
+ "pcre-6-1" for reference. What we're checking in right now is the original
+ plus our changes to make it support UTF-16 and at least one other tweak
+ (vertical tab considered whitespace). Our work to get our changes was
+ done on "pcre-6-1-branch", with an anchor at "pcre-6-1-anchor" so you can
+ see the evolution of the UTF-16 changes.
+
+ Note also that there was one small change made here that's not on the branch
+ in pcre_compile.c.
+
+ * Info.plist: Updated the part of the copyright message that's about PCRE.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj: Added new PCRE source files,
+ removed obsolete ones.
+
+ * pcre/AUTHORS: Updated to PCRE 6.1. Includes credits for Apple's UTF-16
+ changes, but not the credits for Google's C++ wrapper, since we don't include that.
+ * pcre/COPYING: Updated to PCRE 6.1.
+ * pcre/LICENCE: Ditto.
+ * pcre/dftables.c: Ditto.
+ * pcre/pcre-config.h: Ditto.
+ * pcre/pcre.h: Ditto.
+
+ * pcre/pcre_compile.c: Added for PCRE 6.1.
+ * pcre/pcre_config.c: Ditto.
+ * pcre/pcre_exec.c: Ditto.
+ * pcre/pcre_fullinfo.c: Ditto.
+ * pcre/pcre_get.c: Ditto.
+ * pcre/pcre_globals.c: Ditto.
+ * pcre/pcre_info.c: Ditto.
+ * pcre/pcre_internal.h: Ditto.
+ * pcre/pcre_maketables.c: Ditto.
+ * pcre/pcre_ord2utf8.c: Ditto.
+ * pcre/pcre_printint.c: Ditto.
+ * pcre/pcre_refcount.c: Ditto.
+ * pcre/pcre_study.c: Ditto.
+ * pcre/pcre_tables.c: Ditto.
+ * pcre/pcre_try_flipped.c: Ditto.
+ * pcre/pcre_ucp_findchar.c: Ditto.
+ * pcre/pcre_version.c: Ditto.
+ * pcre/pcre_xclass.c: Ditto.
+ * pcre/ucp.h: Ditto.
+ * pcre/ucp_findchar.c: Ditto.
+ * pcre/ucpinternal.h: Ditto.
+ * pcre/ucptable.c: Ditto.
+
+ * pcre/get.c: Removed.
+ * pcre/internal.h: Removed.
+ * pcre/maketables.c: Removed.
+ * pcre/pcre.c: Removed.
+ * pcre/study.c: Removed.
+
2005-09-07 Geoffrey Garen <ggaren at apple.com>
-fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4781
1.3 +1 -1 JavaScriptCore/Info.plist
Index: Info.plist
===================================================================
RCS file: /cvs/root/JavaScriptCore/Info.plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Info.plist 10 Aug 2005 21:55:43 -0000 1.2
+++ Info.plist 9 Sep 2005 00:51:05 -0000 1.3
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>JavaScriptCore</string>
<key>CFBundleGetInfoString</key>
- <string>420+, Copyright 2005 Apple Computer, Inc.; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2001 Peter Kelly <pmk at post.com>; Copyright 1997-2001 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
+ <string>420+, Copyright 2005 Apple Computer, Inc.; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2001 Peter Kelly <pmk at post.com>; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.JavaScriptCore</string>
<key>CFBundleInfoDictionaryVersion</key>
1.10 +92 -32 JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.pbxproj 26 Aug 2005 23:42:16 -0000 1.9
+++ project.pbxproj 9 Sep 2005 00:51:05 -0000 1.10
@@ -33,6 +33,16 @@
65621E70089E85D300760F35 /* property_slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 65621E6C089E859700760F35 /* property_slot.h */; settings = {ATTRIBUTES = (Private, ); }; };
65EF2DF508BECC80000894BB /* shared_ptr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EF2DF408BECC80000894BB /* shared_ptr.h */; settings = {ATTRIBUTES = (Private, ); }; };
65EF2DF808BECC8A000894BB /* shared_ptr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65EF2DF408BECC80000894BB /* shared_ptr.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 930754C008B0F68000AB3056 /* pcre_compile.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754BF08B0F68000AB3056 /* pcre_compile.c */; };
+ 930754C108B0F68000AB3056 /* pcre_compile.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754BF08B0F68000AB3056 /* pcre_compile.c */; };
+ 930754CF08B0F74600AB3056 /* pcre_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754CE08B0F74500AB3056 /* pcre_tables.c */; };
+ 930754D008B0F74600AB3056 /* pcre_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754CE08B0F74500AB3056 /* pcre_tables.c */; };
+ 930754D208B0F76300AB3056 /* pcre_globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754D108B0F76200AB3056 /* pcre_globals.c */; };
+ 930754D308B0F76300AB3056 /* pcre_globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754D108B0F76200AB3056 /* pcre_globals.c */; };
+ 930754E708B0F77700AB3056 /* pcre_fullinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754E608B0F77700AB3056 /* pcre_fullinfo.c */; };
+ 930754E808B0F77700AB3056 /* pcre_fullinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754E608B0F77700AB3056 /* pcre_fullinfo.c */; };
+ 930754EA08B0F78500AB3056 /* pcre_exec.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754E908B0F78500AB3056 /* pcre_exec.c */; };
+ 930754EB08B0F78500AB3056 /* pcre_exec.c in Sources */ = {isa = PBXBuildFile; fileRef = 930754E908B0F78500AB3056 /* pcre_exec.c */; };
932F5B400822A1C700736975 /* array_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A84E0255597D01FF60F7 /* array_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
932F5B420822A1C700736975 /* collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
932F5B430822A1C700736975 /* date_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8560255597D01FF60F7 /* date_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -71,7 +81,6 @@
932F5B6B0822A1C700736975 /* dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 651F6413039D5B5F0078395C /* dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
932F5B6C0822A1C700736975 /* pcre.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541720F039E08B90058BFEB /* pcre.h */; settings = {ATTRIBUTES = (Private, ); }; };
932F5B6D0822A1C700736975 /* pcre-config.h in Headers */ = {isa = PBXBuildFile; fileRef = 65417217039E0B280058BFEB /* pcre-config.h */; };
- 932F5B6E0822A1C700736975 /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 937F4F24048E5B9900CA2AC4 /* internal.h */; };
932F5B6F0822A1C700736975 /* jni_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51856D900562EE95008B9D83 /* jni_utility.h */; };
932F5B700822A1C700736975 /* runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0870056468730080E486 /* runtime.h */; settings = {ATTRIBUTES = (Private, ); }; };
932F5B710822A1C700736975 /* jni_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0876056468BB0080E486 /* jni_runtime.h */; };
@@ -135,10 +144,6 @@
932F5BAF0822A1C700736975 /* scope_chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9374D3A8038D9D74008635CE /* scope_chain.cpp */; };
932F5BB00822A1C700736975 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 931C6CF0038EE8DE008635CE /* list.cpp */; };
932F5BB10822A1C700736975 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651F6412039D5B5F0078395C /* dtoa.cpp */; };
- 932F5BB20822A1C700736975 /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417205039E02E70058BFEB /* get.c */; };
- 932F5BB30822A1C700736975 /* maketables.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417206039E02E70058BFEB /* maketables.c */; };
- 932F5BB40822A1C700736975 /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417207039E02E70058BFEB /* pcre.c */; };
- 932F5BB50822A1C700736975 /* study.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417208039E02E70058BFEB /* study.c */; };
932F5BB60822A1C700736975 /* fpconst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9364B273045B7D6C00A9CAC1 /* fpconst.cpp */; };
932F5BB70822A1C700736975 /* jni_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51856D8F0562EE95008B9D83 /* jni_utility.cpp */; };
932F5BB80822A1C700736975 /* jni_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511B0877056468BB0080E486 /* jni_runtime.cpp */; };
@@ -177,8 +182,28 @@
932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */ = {isa = PBXBuildFile; fileRef = F692A8540255597D01FF60F7 /* create_hash_table */; settings = {ATTRIBUTES = (Private, ); }; };
935F69FE08245057003D1A45 /* dftables.c in Sources */ = {isa = PBXBuildFile; fileRef = 6541720E039E08B90058BFEB /* dftables.c */; };
93DE3E420868DCAB00B8897C /* grammar.y in Sources */ = {isa = PBXBuildFile; fileRef = 933A3499038AE7C6008635CE /* grammar.y */; };
+ 93E26BCA08B1511900F85226 /* pcre_ord2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */; };
+ 93E26BCB08B1511900F85226 /* pcre_ord2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */; };
+ 93E26BCE08B1512600F85226 /* pcre_ucp_findchar.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */; };
+ 93E26BCF08B1512600F85226 /* pcre_ucp_findchar.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */; };
+ 93E26BD108B1513800F85226 /* pcre_try_flipped.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BD008B1513800F85226 /* pcre_try_flipped.c */; };
+ 93E26BD208B1513800F85226 /* pcre_try_flipped.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BD008B1513800F85226 /* pcre_try_flipped.c */; };
+ 93E26BD408B1514100F85226 /* pcre_xclass.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BD308B1514100F85226 /* pcre_xclass.c */; };
+ 93E26BD508B1514100F85226 /* pcre_xclass.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26BD308B1514100F85226 /* pcre_xclass.c */; };
+ 93E26BE608B1517100F85226 /* pcre_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BE508B1517100F85226 /* pcre_internal.h */; };
+ 93E26BE708B1517100F85226 /* pcre_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BE508B1517100F85226 /* pcre_internal.h */; };
+ 93E26BFD08B151D400F85226 /* ucp.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFB08B151D400F85226 /* ucp.h */; };
+ 93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFC08B151D400F85226 /* ucpinternal.h */; };
+ 93E26BFF08B151D400F85226 /* ucp.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFB08B151D400F85226 /* ucp.h */; };
+ 93E26C0008B151D400F85226 /* ucpinternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFC08B151D400F85226 /* ucpinternal.h */; };
+ 93E26C0F08B1520900F85226 /* ucptable.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
+ 93E26C1308B1523D00F85226 /* ucptable.c in Headers */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
93E26CCF08B2921900F85226 /* softlinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26CCE08B2921900F85226 /* softlinking.h */; };
93E26CD008B2921900F85226 /* softlinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26CCE08B2921900F85226 /* softlinking.h */; };
+ 93E26CF708B29A1C00F85226 /* pcre_get.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26CF608B29A1C00F85226 /* pcre_get.c */; };
+ 93E26CF808B29A1C00F85226 /* pcre_get.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26CF608B29A1C00F85226 /* pcre_get.c */; };
+ 93E26DDC08B2A4F400F85226 /* pcre_printint.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26DDB08B2A4F400F85226 /* pcre_printint.c */; };
+ 93E26DDD08B2A4F400F85226 /* pcre_printint.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26DDB08B2A4F400F85226 /* pcre_printint.c */; };
A85D81F8087B2822006A9172 /* array_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A84E0255597D01FF60F7 /* array_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D81F9087B2822006A9172 /* collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D81FA087B2822006A9172 /* date_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8560255597D01FF60F7 /* date_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -217,7 +242,6 @@
A85D821B087B2822006A9172 /* dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 651F6413039D5B5F0078395C /* dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D821C087B2822006A9172 /* pcre.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541720F039E08B90058BFEB /* pcre.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D821D087B2822006A9172 /* pcre-config.h in Headers */ = {isa = PBXBuildFile; fileRef = 65417217039E0B280058BFEB /* pcre-config.h */; };
- A85D821E087B2822006A9172 /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 937F4F24048E5B9900CA2AC4 /* internal.h */; };
A85D821F087B2822006A9172 /* jni_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51856D900562EE95008B9D83 /* jni_utility.h */; };
A85D8220087B2822006A9172 /* runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0870056468730080E486 /* runtime.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D8221087B2822006A9172 /* jni_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0876056468BB0080E486 /* jni_runtime.h */; };
@@ -283,10 +307,6 @@
A85D825E087B2822006A9172 /* scope_chain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9374D3A8038D9D74008635CE /* scope_chain.cpp */; };
A85D825F087B2822006A9172 /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 931C6CF0038EE8DE008635CE /* list.cpp */; };
A85D8260087B2822006A9172 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651F6412039D5B5F0078395C /* dtoa.cpp */; };
- A85D8261087B2822006A9172 /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417205039E02E70058BFEB /* get.c */; };
- A85D8262087B2822006A9172 /* maketables.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417206039E02E70058BFEB /* maketables.c */; };
- A85D8263087B2822006A9172 /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417207039E02E70058BFEB /* pcre.c */; };
- A85D8264087B2822006A9172 /* study.c in Sources */ = {isa = PBXBuildFile; fileRef = 65417208039E02E70058BFEB /* study.c */; };
A85D8265087B2822006A9172 /* fpconst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9364B273045B7D6C00A9CAC1 /* fpconst.cpp */; };
A85D8266087B2822006A9172 /* jni_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51856D8F0562EE95008B9D83 /* jni_utility.cpp */; };
A85D8267087B2822006A9172 /* jni_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511B0877056468BB0080E486 /* jni_runtime.cpp */; };
@@ -460,10 +480,6 @@
651F6412039D5B5F0078395C /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; };
651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
65305EAE08A58DDE00F31E73 /* protected_object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = protected_object.h; sourceTree = "<group>"; };
- 65417205039E02E70058BFEB /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = get.c; path = pcre/get.c; sourceTree = "<group>"; };
- 65417206039E02E70058BFEB /* maketables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = maketables.c; path = pcre/maketables.c; sourceTree = "<group>"; };
- 65417207039E02E70058BFEB /* pcre.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre.c; path = pcre/pcre.c; sourceTree = "<group>"; };
- 65417208039E02E70058BFEB /* study.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = study.c; path = pcre/study.c; sourceTree = "<group>"; };
6541720E039E08B90058BFEB /* dftables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dftables.c; path = pcre/dftables.c; sourceTree = "<group>"; };
6541720F039E08B90058BFEB /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pcre.h; path = pcre/pcre.h; sourceTree = "<group>"; };
65417217039E0B280058BFEB /* pcre-config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "pcre-config.h"; path = "pcre/pcre-config.h"; sourceTree = "<group>"; };
@@ -486,6 +502,11 @@
70B16A270569A10900DB756D /* runtime_object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = runtime_object.h; path = bindings/runtime_object.h; sourceTree = "<group>"; };
8442A376074175C2000AE2ED /* softlinking.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = softlinking.c; path = bindings/softlinking.c; sourceTree = "<group>"; };
84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_impl.h; path = bindings/npruntime_impl.h; sourceTree = "<group>"; };
+ 930754BF08B0F68000AB3056 /* pcre_compile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_compile.c; path = pcre/pcre_compile.c; sourceTree = "<group>"; };
+ 930754CE08B0F74500AB3056 /* pcre_tables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_tables.c; path = pcre/pcre_tables.c; sourceTree = "<group>"; };
+ 930754D108B0F76200AB3056 /* pcre_globals.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_globals.c; path = pcre/pcre_globals.c; sourceTree = "<group>"; };
+ 930754E608B0F77700AB3056 /* pcre_fullinfo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_fullinfo.c; path = pcre/pcre_fullinfo.c; sourceTree = "<group>"; };
+ 930754E908B0F78500AB3056 /* pcre_exec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_exec.c; path = pcre/pcre_exec.c; sourceTree = "<group>"; };
931C6CEF038EE8DE008635CE /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
931C6CF0038EE8DE008635CE /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = list.cpp; sourceTree = "<group>"; };
9322A00306C341D3009067BB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
@@ -500,9 +521,18 @@
9373524E038DA8C2008635CE /* context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = context.h; sourceTree = "<group>"; };
9374D3A7038D9D74008635CE /* scope_chain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scope_chain.h; sourceTree = "<group>"; };
9374D3A8038D9D74008635CE /* scope_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope_chain.cpp; sourceTree = "<group>"; };
- 937F4F24048E5B9900CA2AC4 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = internal.h; path = pcre/internal.h; sourceTree = "<group>"; };
938772E5038BFE19008635CE /* array_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = array_instance.h; sourceTree = "<group>"; };
+ 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_ord2utf8.c; path = pcre/pcre_ord2utf8.c; sourceTree = "<group>"; };
+ 93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_ucp_findchar.c; path = pcre/pcre_ucp_findchar.c; sourceTree = "<group>"; };
+ 93E26BD008B1513800F85226 /* pcre_try_flipped.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_try_flipped.c; path = pcre/pcre_try_flipped.c; sourceTree = "<group>"; };
+ 93E26BD308B1514100F85226 /* pcre_xclass.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_xclass.c; path = pcre/pcre_xclass.c; sourceTree = "<group>"; };
+ 93E26BE508B1517100F85226 /* pcre_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pcre_internal.h; path = pcre/pcre_internal.h; sourceTree = "<group>"; };
+ 93E26BFB08B151D400F85226 /* ucp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucp.h; path = pcre/ucp.h; sourceTree = "<group>"; };
+ 93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucpinternal.h; path = pcre/ucpinternal.h; sourceTree = "<group>"; };
+ 93E26C0D08B1520900F85226 /* ucptable.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ucptable.c; path = pcre/ucptable.c; sourceTree = "<group>"; };
93E26CCE08B2921900F85226 /* softlinking.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = softlinking.h; path = bindings/softlinking.h; sourceTree = "<group>"; };
+ 93E26CF608B29A1C00F85226 /* pcre_get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_get.c; path = pcre/pcre_get.c; sourceTree = "<group>"; };
+ 93E26DDB08B2A4F400F85226 /* pcre_printint.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_printint.c; path = pcre/pcre_printint.c; sourceTree = "<group>"; };
93F1981A08245AAE001E9ABC /* keywords.table */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = keywords.table; sourceTree = "<group>"; };
A85D8288087B2822006A9172 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F50888B6030BB74C012A967E /* simple_number.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = simple_number.h; sourceTree = "<group>"; };
@@ -794,14 +824,24 @@
65417203039E01F90058BFEB /* pcre */ = {
isa = PBXGroup;
children = (
- 6541720E039E08B90058BFEB /* dftables.c */,
- 65417205039E02E70058BFEB /* get.c */,
- 937F4F24048E5B9900CA2AC4 /* internal.h */,
- 65417206039E02E70058BFEB /* maketables.c */,
65417217039E0B280058BFEB /* pcre-config.h */,
6541720F039E08B90058BFEB /* pcre.h */,
- 65417207039E02E70058BFEB /* pcre.c */,
- 65417208039E02E70058BFEB /* study.c */,
+ 93E26BE508B1517100F85226 /* pcre_internal.h */,
+ 93E26BFB08B151D400F85226 /* ucp.h */,
+ 93E26BFC08B151D400F85226 /* ucpinternal.h */,
+ 93E26C0D08B1520900F85226 /* ucptable.c */,
+ 930754BF08B0F68000AB3056 /* pcre_compile.c */,
+ 930754E908B0F78500AB3056 /* pcre_exec.c */,
+ 930754E608B0F77700AB3056 /* pcre_fullinfo.c */,
+ 93E26CF608B29A1C00F85226 /* pcre_get.c */,
+ 930754D108B0F76200AB3056 /* pcre_globals.c */,
+ 93E26BC908B1511900F85226 /* pcre_ord2utf8.c */,
+ 93E26DDB08B2A4F400F85226 /* pcre_printint.c */,
+ 930754CE08B0F74500AB3056 /* pcre_tables.c */,
+ 93E26BD008B1513800F85226 /* pcre_try_flipped.c */,
+ 93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */,
+ 93E26BD308B1514100F85226 /* pcre_xclass.c */,
+ 6541720E039E08B90058BFEB /* dftables.c */,
);
name = pcre;
sourceTree = "<group>";
@@ -887,7 +927,6 @@
932F5B6B0822A1C700736975 /* dtoa.h in Headers */,
932F5B6C0822A1C700736975 /* pcre.h in Headers */,
932F5B6D0822A1C700736975 /* pcre-config.h in Headers */,
- 932F5B6E0822A1C700736975 /* internal.h in Headers */,
932F5B6F0822A1C700736975 /* jni_utility.h in Headers */,
932F5B700822A1C700736975 /* runtime.h in Headers */,
932F5B710822A1C700736975 /* jni_runtime.h in Headers */,
@@ -922,6 +961,10 @@
932F5B8F0822A1C700736975 /* fast_malloc.h in Headers */,
932FC11D0824A6A3005B3C75 /* create_hash_table in Headers */,
65621E6E089E859700760F35 /* property_slot.h in Headers */,
+ 93E26BE608B1517100F85226 /* pcre_internal.h in Headers */,
+ 93E26BFD08B151D400F85226 /* ucp.h in Headers */,
+ 93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
+ 93E26C1308B1523D00F85226 /* ucptable.c in Headers */,
93E26CCF08B2921900F85226 /* softlinking.h in Headers */,
65EF2DF508BECC80000894BB /* shared_ptr.h in Headers */,
);
@@ -970,7 +1013,6 @@
A85D821B087B2822006A9172 /* dtoa.h in Headers */,
A85D821C087B2822006A9172 /* pcre.h in Headers */,
A85D821D087B2822006A9172 /* pcre-config.h in Headers */,
- A85D821E087B2822006A9172 /* internal.h in Headers */,
A85D821F087B2822006A9172 /* jni_utility.h in Headers */,
A85D8220087B2822006A9172 /* runtime.h in Headers */,
A85D8221087B2822006A9172 /* jni_runtime.h in Headers */,
@@ -1005,6 +1047,9 @@
A85D823E087B2822006A9172 /* fast_malloc.h in Headers */,
65621E70089E85D300760F35 /* property_slot.h in Headers */,
A85D823F087B2822006A9172 /* create_hash_table in Headers */,
+ 93E26BE708B1517100F85226 /* pcre_internal.h in Headers */,
+ 93E26BFF08B151D400F85226 /* ucp.h in Headers */,
+ 93E26C0008B151D400F85226 /* ucpinternal.h in Headers */,
93E26CD008B2921900F85226 /* softlinking.h in Headers */,
65EF2DF808BECC8A000894BB /* shared_ptr.h in Headers */,
);
@@ -1264,7 +1309,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"$BUILT_PRODUCTS_DIR/dftables\" > \"$DERIVED_FILE_DIR/chartables.c\"";
+ shellScript = "\"$BUILT_PRODUCTS_DIR/dftables\" \"$DERIVED_FILE_DIR/chartables.c\"";
};
93F197EC08245819001E9ABC /* lexer.lut.h */ = {
isa = PBXShellScriptBuildPhase;
@@ -1525,10 +1570,6 @@
932F5BAF0822A1C700736975 /* scope_chain.cpp in Sources */,
932F5BB00822A1C700736975 /* list.cpp in Sources */,
932F5BB10822A1C700736975 /* dtoa.cpp in Sources */,
- 932F5BB20822A1C700736975 /* get.c in Sources */,
- 932F5BB30822A1C700736975 /* maketables.c in Sources */,
- 932F5BB40822A1C700736975 /* pcre.c in Sources */,
- 932F5BB50822A1C700736975 /* study.c in Sources */,
932F5BB60822A1C700736975 /* fpconst.cpp in Sources */,
932F5BB70822A1C700736975 /* jni_utility.cpp in Sources */,
932F5BB80822A1C700736975 /* jni_runtime.cpp in Sources */,
@@ -1558,6 +1599,17 @@
932F5BD00822A1C700736975 /* softlinking.c in Sources */,
932F5BD10822A1C700736975 /* fast_malloc.cpp in Sources */,
65621E6D089E859700760F35 /* property_slot.cpp in Sources */,
+ 930754C108B0F68000AB3056 /* pcre_compile.c in Sources */,
+ 930754D008B0F74600AB3056 /* pcre_tables.c in Sources */,
+ 930754D308B0F76300AB3056 /* pcre_globals.c in Sources */,
+ 930754E808B0F77700AB3056 /* pcre_fullinfo.c in Sources */,
+ 930754EB08B0F78500AB3056 /* pcre_exec.c in Sources */,
+ 93E26BCA08B1511900F85226 /* pcre_ord2utf8.c in Sources */,
+ 93E26BCE08B1512600F85226 /* pcre_ucp_findchar.c in Sources */,
+ 93E26BD108B1513800F85226 /* pcre_try_flipped.c in Sources */,
+ 93E26BD408B1514100F85226 /* pcre_xclass.c in Sources */,
+ 93E26CF708B29A1C00F85226 /* pcre_get.c in Sources */,
+ 93E26DDC08B2A4F400F85226 /* pcre_printint.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1613,10 +1665,6 @@
A85D825E087B2822006A9172 /* scope_chain.cpp in Sources */,
A85D825F087B2822006A9172 /* list.cpp in Sources */,
A85D8260087B2822006A9172 /* dtoa.cpp in Sources */,
- A85D8261087B2822006A9172 /* get.c in Sources */,
- A85D8262087B2822006A9172 /* maketables.c in Sources */,
- A85D8263087B2822006A9172 /* pcre.c in Sources */,
- A85D8264087B2822006A9172 /* study.c in Sources */,
A85D8265087B2822006A9172 /* fpconst.cpp in Sources */,
A85D8266087B2822006A9172 /* jni_utility.cpp in Sources */,
A85D8267087B2822006A9172 /* jni_runtime.cpp in Sources */,
@@ -1646,6 +1694,18 @@
A85D827F087B2822006A9172 /* softlinking.c in Sources */,
A85D8280087B2822006A9172 /* fast_malloc.cpp in Sources */,
65621E6F089E85D300760F35 /* property_slot.cpp in Sources */,
+ 930754C008B0F68000AB3056 /* pcre_compile.c in Sources */,
+ 930754CF08B0F74600AB3056 /* pcre_tables.c in Sources */,
+ 930754D208B0F76300AB3056 /* pcre_globals.c in Sources */,
+ 930754E708B0F77700AB3056 /* pcre_fullinfo.c in Sources */,
+ 930754EA08B0F78500AB3056 /* pcre_exec.c in Sources */,
+ 93E26BCB08B1511900F85226 /* pcre_ord2utf8.c in Sources */,
+ 93E26BCF08B1512600F85226 /* pcre_ucp_findchar.c in Sources */,
+ 93E26BD208B1513800F85226 /* pcre_try_flipped.c in Sources */,
+ 93E26BD508B1514100F85226 /* pcre_xclass.c in Sources */,
+ 93E26C0F08B1520900F85226 /* ucptable.c in Sources */,
+ 93E26CF808B29A1C00F85226 /* pcre_get.c in Sources */,
+ 93E26DDD08B2A4F400F85226 /* pcre_printint.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1.4 +12 -2 JavaScriptCore/pcre/AUTHORS
Index: AUTHORS
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AUTHORS 12 Aug 2005 22:18:07 -0000 1.3
+++ AUTHORS 9 Sep 2005 00:51:06 -0000 1.4
@@ -1,6 +1,16 @@
-Written by: Philip Hazel <ph10 at cam.ac.uk>
+THE MAIN PCRE LIBRARY
+---------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England. Phone: +44 1223 334714.
-Copyright (c) 1997-2001 University of Cambridge
+Copyright (c) 1997-2005 University of Cambridge
+All rights reserved
+
+UTF-16 changes by Darin Adler and Geoff Garen
+Copyright (c) 2005 Apple Computer, Inc.
+All rights reserved
1.4 +46 -28 JavaScriptCore/pcre/COPYING
Index: COPYING
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/COPYING,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- COPYING 12 Aug 2005 22:18:07 -0000 1.3
+++ COPYING 9 Sep 2005 00:51:06 -0000 1.4
@@ -4,47 +4,65 @@
PCRE is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
-Written by: Philip Hazel <ph10 at cam.ac.uk>
+Release 6 of PCRE is distributed under the terms of the "BSD" licence, as
+specified below. The documentation for PCRE, supplied in the "doc"
+directory, is distributed under the same terms as the software itself.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a set of C++ wrapper functions.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England. Phone: +44 1223 334714.
-Copyright (c) 1997-2001 University of Cambridge
+Copyright (c) 1997-2005 University of Cambridge
+All rights reserved.
+
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following
-restrictions:
+THE C++ WRAPPER FUNCTIONS
+-------------------------
-1. This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Contributed by: Google Inc.
-2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. In practice, this means that if you use
- PCRE in software which you distribute to others, commercially or
- otherwise, you must put a sentence like this
+Copyright (c) 2005, Google Inc.
+All rights reserved.
- Regular expression support is provided by the PCRE library package,
- which is open source software, written by Philip Hazel, and copyright
- by the University of Cambridge, England.
- somewhere reasonably visible in your documentation and in any relevant
- files or online help data or similar. A reference to the ftp site for
- the source, that is, to
+THE "BSD" LICENCE
+-----------------
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- should also be given in the documentation.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
-3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
+ * 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.
-4. If PCRE is embedded in any software that is released under the GNU
- General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
- then the terms of that licence shall supersede any condition above with
- which it is incompatible.
+ * Neither the name of the University of Cambridge nor the name of Google
+ Inc. nor the names of their contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
-The documentation for PCRE, supplied in the "doc" directory, is distributed
-under the same terms as the software itself.
+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.
End
1.4 +46 -28 JavaScriptCore/pcre/LICENCE
Index: LICENCE
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/LICENCE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LICENCE 12 Aug 2005 22:18:08 -0000 1.3
+++ LICENCE 9 Sep 2005 00:51:06 -0000 1.4
@@ -4,47 +4,65 @@
PCRE is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
-Written by: Philip Hazel <ph10 at cam.ac.uk>
+Release 6 of PCRE is distributed under the terms of the "BSD" licence, as
+specified below. The documentation for PCRE, supplied in the "doc"
+directory, is distributed under the same terms as the software itself.
+
+The basic library functions are written in C and are freestanding. Also
+included in the distribution is a set of C++ wrapper functions.
+
+
+THE BASIC LIBRARY FUNCTIONS
+---------------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
University of Cambridge Computing Service,
Cambridge, England. Phone: +44 1223 334714.
-Copyright (c) 1997-2001 University of Cambridge
+Copyright (c) 1997-2005 University of Cambridge
+All rights reserved.
+
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following
-restrictions:
+THE C++ WRAPPER FUNCTIONS
+-------------------------
-1. This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Contributed by: Google Inc.
-2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. In practice, this means that if you use
- PCRE in software which you distribute to others, commercially or
- otherwise, you must put a sentence like this
+Copyright (c) 2005, Google Inc.
+All rights reserved.
- Regular expression support is provided by the PCRE library package,
- which is open source software, written by Philip Hazel, and copyright
- by the University of Cambridge, England.
- somewhere reasonably visible in your documentation and in any relevant
- files or online help data or similar. A reference to the ftp site for
- the source, that is, to
+THE "BSD" LICENCE
+-----------------
- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- should also be given in the documentation.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
-3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
+ * 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.
-4. If PCRE is embedded in any software that is released under the GNU
- General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
- then the terms of that licence shall supersede any condition above with
- which it is incompatible.
+ * Neither the name of the University of Cambridge nor the name of Google
+ Inc. nor the names of their contributors may be used to endorse or
+ promote products derived from this software without specific prior
+ written permission.
-The documentation for PCRE, supplied in the "doc" directory, is distributed
-under the same terms as the software itself.
+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.
End
1.5 +100 -78 JavaScriptCore/pcre/dftables.c
Index: dftables.c
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/dftables.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dftables.c 12 Aug 2005 22:18:08 -0000 1.4
+++ dftables.c 9 Sep 2005 00:51:06 -0000 1.5
@@ -1,116 +1,136 @@
/*************************************************
* Perl-Compatible Regular Expressions *
-* extended to UTF-16 for use in JavaScriptCore *
*************************************************/
-/*
-PCRE is a library of functions to support regular expressions whose syntax
+/* PCRE is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
-Written by: Philip Hazel <ph10 at cam.ac.uk>
+ Written by Philip Hazel
+ Copyright (c) 1997-2005 University of Cambridge
- Copyright (c) 1997-2001 University of Cambridge
- Copyright (C) 2004 Apple Computer, Inc.
-
------------------------------------------------------------------------------
-Permission is granted to anyone to use this software for any purpose on any
-computer system, and to redistribute it freely, subject to the following
-restrictions:
-
-1. This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission.
-
-3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
-4. If PCRE is embedded in any software that is released under the GNU
- General Purpose Licence (GPL), then the terms of that licence shall
- supersede any condition above with which it is incompatible.
-----------------------------------------------------------------------------
+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.
-See the file Tech.Notes for some information on the internals.
+ * 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.
+-----------------------------------------------------------------------------
*/
-/* This is a support program to generate the file chartables.c, containing
-character tables of various kinds. They are built according to the default C
-locale and used as the default tables by PCRE. Now that pcre_maketables is
-a function visible to the outside world, we make use of its code from here in
-order to be consistent. */
+/* This is a freestanding support program to generate a file containing default
+character tables for PCRE. The tables are built according to the default C
+locale. Now that pcre_maketables is a function visible to the outside world, we
+make use of its code from here in order to be consistent. */
#include <ctype.h>
#include <stdio.h>
#include <string.h>
-#include "internal.h"
+#include "pcre_internal.h"
-#define DFTABLES /* maketables.c notices this */
-#include "maketables.c"
+#define DFTABLES /* pcre_maketables.c notices this */
+#include "pcre_maketables.c"
-int main(void)
+int main(int argc, char **argv)
{
int i;
+FILE *f;
const unsigned char *tables = pcre_maketables();
+const unsigned char *base_of_tables = tables;
+
+if (argc != 2)
+ {
+ fprintf(stderr, "dftables: one filename argument is required\n");
+ return 1;
+ }
+
+f = fopen(argv[1], "w");
+if (f == NULL)
+ {
+ fprintf(stderr, "dftables: failed to open %s for writing\n", argv[1]);
+ return 1;
+ }
+
+/* There are two fprintf() calls here, because gcc in pedantic mode complains
+about the very long string otherwise. */
-printf(
+fprintf(f,
"/*************************************************\n"
"* Perl-Compatible Regular Expressions *\n"
"*************************************************/\n\n"
"/* This file is automatically written by the dftables auxiliary \n"
"program. If you edit it by hand, you might like to edit the Makefile to \n"
- "prevent its ever being regenerated.\n\n"
- "This file is #included in the compilation of pcre.c to build the default\n"
- "character tables which are used when no tables are passed to the compile\n"
- "function. */\n\n"
- "static const unsigned char pcre_default_tables[] = {\n\n"
+ "prevent its ever being regenerated.\n\n");
+fprintf(f,
+ "This file contains the default tables for characters with codes less than\n"
+ "128 (ASCII characters). These tables are used when no external tables are\n"
+ "passed to PCRE. */\n\n"
+ "const unsigned char _pcre_default_tables[] = {\n\n"
"/* This table is a lower casing table. */\n\n");
-printf(" ");
-for (i = 0; i < (int)ICHAR_MAP_SIZE; i++)
+fprintf(f, " ");
+for (i = 0; i < 256; i++)
{
- if ((i & 7) == 0 && i != 0) printf("\n ");
- printf("%3d", *tables++);
- if (i != ICHAR_MAP_SIZE - 1) printf(",");
+ if ((i & 7) == 0 && i != 0) fprintf(f, "\n ");
+ fprintf(f, "%3d", *tables++);
+ if (i != 255) fprintf(f, ",");
}
-printf(",\n\n");
+fprintf(f, ",\n\n");
-printf("/* This table is a case flipping table. */\n\n");
+fprintf(f, "/* This table is a case flipping table. */\n\n");
-printf(" ");
-for (i = 0; i < (int)ICHAR_MAP_SIZE; i++)
+fprintf(f, " ");
+for (i = 0; i < 256; i++)
{
- if ((i & 7) == 0 && i != 0) printf("\n ");
- printf("%3d", *tables++);
- if (i != ICHAR_MAP_SIZE - 1) printf(",");
+ if ((i & 7) == 0 && i != 0) fprintf(f, "\n ");
+ fprintf(f, "%3d", *tables++);
+ if (i != 255) fprintf(f, ",");
}
-printf(",\n\n");
+fprintf(f, ",\n\n");
-printf(
+fprintf(f,
"/* This table contains bit maps for various character classes.\n"
"Each map is 32 bytes long and the bits run from the least\n"
"significant end of each byte. The classes that have their own\n"
"maps are: space, xdigit, digit, upper, lower, word, graph\n"
"print, punct, and cntrl. Other classes are built from combinations. */\n\n");
-printf(" ");
+fprintf(f, " ");
for (i = 0; i < cbit_length; i++)
{
if ((i & 7) == 0 && i != 0)
{
- if ((i & 31) == 0) printf("\n");
- printf("\n ");
+ if ((i & 31) == 0) fprintf(f, "\n");
+ fprintf(f, "\n ");
}
- printf("0x%02x", *tables++);
- if (i != cbit_length - 1) printf(",");
+ fprintf(f, "0x%02x", *tables++);
+ if (i != cbit_length - 1) fprintf(f, ",");
}
-printf(",\n\n");
+fprintf(f, ",\n\n");
-printf(
+fprintf(f,
"/* This table identifies various classes of character by individual bits:\n"
" 0x%02x white space character\n"
" 0x%02x letter\n"
@@ -121,29 +141,31 @@
ctype_space, ctype_letter, ctype_digit, ctype_xdigit, ctype_word,
ctype_meta);
-printf(" ");
-for (i = 0; i < ICHAR_COUNT; i++)
+fprintf(f, " ");
+for (i = 0; i < 256; i++)
{
if ((i & 7) == 0 && i != 0)
{
- printf(" /* ");
- if (isprint(i-8)) printf(" %c -", i-8);
- else printf("%3d-", i-8);
- if (isprint(i-1)) printf(" %c ", i-1);
- else printf("%3d", i-1);
- printf(" */\n ");
+ fprintf(f, " /* ");
+ if (isprint(i-8)) fprintf(f, " %c -", i-8);
+ else fprintf(f, "%3d-", i-8);
+ if (isprint(i-1)) fprintf(f, " %c ", i-1);
+ else fprintf(f, "%3d", i-1);
+ fprintf(f, " */\n ");
}
- printf("0x%02x", *tables++);
- if (i != ICHAR_COUNT - 1) printf(",");
+ fprintf(f, "0x%02x", *tables++);
+ if (i != 255) fprintf(f, ",");
}
-printf("};/* ");
-if (isprint(i-8)) printf(" %c -", i-8);
- else printf("%3d-", i-8);
-if (isprint(i-1)) printf(" %c ", i-1);
- else printf("%3d", i-1);
-printf(" */\n\n/* End of chartables.c */\n");
+fprintf(f, "};/* ");
+if (isprint(i-8)) fprintf(f, " %c -", i-8);
+ else fprintf(f, "%3d-", i-8);
+if (isprint(i-1)) fprintf(f, " %c ", i-1);
+ else fprintf(f, "%3d", i-1);
+fprintf(f, " */\n\n/* End of chartables.c */\n");
+fclose(f);
+free((void *)base_of_tables);
return 0;
}
1.2 +97 -3 JavaScriptCore/pcre/pcre-config.h
Index: pcre-config.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/pcre-config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcre-config.h 4 Dec 2002 21:57:20 -0000 1.1
+++ pcre-config.h 9 Sep 2005 00:51:06 -0000 1.2
@@ -1,5 +1,99 @@
-#define HAVE_MEMMOVE 1
-#define HAVE_BCOPY 1
+/* On Unix systems config.in is converted by configure into config.h. PCRE is
+written in Standard C, but there are a few non-standard things it can cope
+with, allowing it to run on SunOS4 and other "close to standard" systems.
+
+On a non-Unix system you should just copy this file into config.h, and set up
+the macros the way you need them. You should normally change the definitions of
+HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf
+works, these cannot be made the defaults. If your system has bcopy() and not
+memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your
+system has neither bcopy() nor memmove(), leave them both as 0; an emulation
+function will be used. */
+
+/* If you are compiling for a system that uses EBCDIC instead of ASCII
+character codes, define this macro as 1. On systems that can use "configure",
+this can be done via --enable-ebcdic. */
+
+#define EBCDIC 0
+
+/* If you are compiling for a system that needs some magic to be inserted
+before the definition of an exported function, define this macro to contain the
+relevant magic. It apears at the start of every exported function. */
+
+#define EXPORT
+
+/* Define to empty if the "const" keyword does not work. */
+
+#undef const
+
+/* Define to "unsigned" if <stddef.h> doesn't define size_t. */
+
+#undef size_t
+
+/* The following two definitions are mainly for the benefit of SunOS4, which
+doesn't have the strerror() or memmove() functions that should be present in
+all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should
+normally be defined with the value 1 for other systems, but unfortunately we
+can't make this the default because "configure" files generated by autoconf
+will only change 0 to 1; they won't change 1 to 0 if the functions are not
+found. */
+
#define HAVE_STRERROR 1
-#define NEWLINE 10
+#define HAVE_MEMMOVE 1
+
+/* There are some non-Unix systems that don't even have bcopy(). If this macro
+is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
+HAVE_BCOPY is not relevant. */
+
+#define HAVE_BCOPY 1
+
+/* The value of NEWLINE determines the newline character. The default is to
+leave it up to the compiler, but some sites want to force a particular value.
+On Unix systems, "configure" can be used to override this default. */
+
+#define NEWLINE '\n'
+
+/* 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 patterns up to 64K long. This covers the vast majority of cases.
+However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows for
+longer patterns in extreme cases. On Unix systems, "configure" can be used to
+override this default. */
+
+#define LINK_SIZE 2
+
+/* The value of MATCH_LIMIT determines the default number of times the match()
+function can be called during a single execution of pcre_exec(). (There is a
+runtime method of setting a different limit.) The limit exists in order to
+catch runaway regular expressions that take for ever to determine that they do
+not match. The default is set very large so that it does not accidentally catch
+legitimate cases. On Unix systems, "configure" can be used to override this
+default default. */
+
+#define MATCH_LIMIT 10000000
+
+/* When calling PCRE via the POSIX interface, additional working storage is
+required for holding the pointers to capturing substrings because PCRE requires
+three integers per substring, whereas the POSIX interface provides only two. If
+the number of expected substrings is small, the wrapper function uses space on
+the stack, because this is faster than using malloc() for each call. The
+threshold above which the stack is no longer use is defined by POSIX_MALLOC_
+THRESHOLD. On Unix systems, "configure" can be used to override this default.
+*/
+
+#define POSIX_MALLOC_THRESHOLD 10
+
+/* PCRE uses recursive function calls to handle backtracking while matching.
+This can sometimes be a problem on systems that have stacks of limited size.
+Define NO_RECURSE to get a version that doesn't use recursion in the match()
+function; instead it creates its own stack by steam using pcre_recurse_malloc
+to get memory. For more detail, see comments and other stuff just above the
+match() function. On Unix systems, "configure" can be used to set this in the
+Makefile (use --disable-stack-for-recursion). */
+
+/* #define NO_RECURSE */
+
+/* End */
+
+#define SUPPORT_UCP 1
#define SUPPORT_UTF8 1
1.6 +234 -70 JavaScriptCore/pcre/pcre.h
Index: pcre.h
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/pcre.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcre.h 12 Aug 2005 22:18:08 -0000 1.5
+++ pcre.h 9 Sep 2005 00:51:06 -0000 1.6
@@ -1,34 +1,98 @@
/*************************************************
* Perl-Compatible Regular Expressions *
-* extended to UTF-16 for use in JavaScriptCore *
*************************************************/
-/* Copyright (c) 1997-2001 University of Cambridge */
-/* Copyright (C) 2004 Apple Computer, Inc. */
+/* In its original form, this is the .in file that is transformed by
+"configure" into pcre.h.
+
+ Copyright (c) 1997-2005 University of Cambridge
+ Copyright (c) 2004, 2005 Apple Computer, Inc.
+
+-----------------------------------------------------------------------------
+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.
+-----------------------------------------------------------------------------
+*/
#ifndef _PCRE_H
#define _PCRE_H
+#define pcre_callout kjs_pcre_callout
#define pcre_compile kjs_pcre_compile
+#define pcre_compile2 kjs_pcre_compile2
+#define pcre_config kjs_pcre_config
+#define pcre_copy_named_substring kjs_pcre_copy_named_substring
#define pcre_copy_substring kjs_pcre_copy_substring
+#define pcre_dfa_exec kjs_pcre_dfa_exec
#define pcre_exec kjs_pcre_exec
#define pcre_free kjs_pcre_free
#define pcre_free_substring kjs_pcre_free_substring
#define pcre_free_substring_list kjs_pcre_free_substring_list
#define pcre_fullinfo kjs_pcre_fullinfo
+#define pcre_get_named_substring kjs_pcre_get_named_substring
#define pcre_get_substring kjs_pcre_get_substring
#define pcre_get_substring_list kjs_pcre_get_substring_list
#define pcre_info kjs_pcre_info
#define pcre_maketables kjs_pcre_maketables
#define pcre_malloc kjs_pcre_malloc
+#define pcre_refcount kjs_pcre_refcount
+#define pcre_stack_free kjs_pcre_stack_free
+#define pcre_stack_malloc kjs_pcre_stack_malloc
#define pcre_study kjs_pcre_study
#define pcre_version kjs_pcre_version
-#define PCRE_MAJOR 3
-#define PCRE_MINOR 9
-#define PCRE_DATE 02-Jan-2002
-#define PCRE_DL_IMPORT
-#define PCRE_UTF16 1
+#define PCRE_MAJOR 6
+#define PCRE_MINOR 1
+#define PCRE_DATE 21-Jun-2005
+
+#define PCRE_UTF16 1
+
+/* Win32 uses DLL by default; it needs special stuff for exported functions. */
+
+#ifdef _WIN32
+# ifdef PCRE_DEFINITION
+# ifdef DLL_EXPORT
+# define PCRE_DATA_SCOPE __declspec(dllexport)
+# endif
+# else
+# ifndef PCRE_STATIC
+# define PCRE_DATA_SCOPE extern __declspec(dllimport)
+# endif
+# endif
+#endif
+
+/* For other operating systems, we use the standard "extern". */
+
+#ifndef PCRE_DATA_SCOPE
+# ifdef __cplusplus
+# define PCRE_DATA_SCOPE extern "C"
+# else
+# define PCRE_DATA_SCOPE extern
+# endif
+#endif
/* Have to include stdlib.h in order to ensure that size_t is defined;
it is needed here for malloc. */
@@ -43,79 +107,179 @@
/* Options */
-#define PCRE_CASELESS 0x0001
-#define PCRE_MULTILINE 0x0002
-#define PCRE_DOTALL 0x0004
-#define PCRE_EXTENDED 0x0008
-#define PCRE_ANCHORED 0x0010
-#define PCRE_DOLLAR_ENDONLY 0x0020
-#define PCRE_EXTRA 0x0040
-#define PCRE_NOTBOL 0x0080
-#define PCRE_NOTEOL 0x0100
-#define PCRE_UNGREEDY 0x0200
-#define PCRE_NOTEMPTY 0x0400
-#define PCRE_UTF8 0x0800
-
-/* Exec-time and get-time error codes */
-
-#define PCRE_ERROR_NOMATCH (-1)
-#define PCRE_ERROR_NULL (-2)
-#define PCRE_ERROR_BADOPTION (-3)
-#define PCRE_ERROR_BADMAGIC (-4)
-#define PCRE_ERROR_UNKNOWN_NODE (-5)
-#define PCRE_ERROR_NOMEMORY (-6)
-#define PCRE_ERROR_NOSUBSTRING (-7)
+#define PCRE_CASELESS 0x00000001
+#define PCRE_MULTILINE 0x00000002
+#define PCRE_DOTALL 0x00000004
+#define PCRE_EXTENDED 0x00000008
+#define PCRE_ANCHORED 0x00000010
+#define PCRE_DOLLAR_ENDONLY 0x00000020
+#define PCRE_EXTRA 0x00000040
+#define PCRE_NOTBOL 0x00000080
+#define PCRE_NOTEOL 0x00000100
+#define PCRE_UNGREEDY 0x00000200
+#define PCRE_NOTEMPTY 0x00000400
+#define PCRE_UTF8 0x00000800
+#define PCRE_NO_AUTO_CAPTURE 0x00001000
+#define PCRE_NO_UTF8_CHECK 0x00002000
+#define PCRE_AUTO_CALLOUT 0x00004000
+#define PCRE_PARTIAL 0x00008000
+#define PCRE_DFA_SHORTEST 0x00010000
+#define PCRE_DFA_RESTART 0x00020000
+#define PCRE_FIRSTLINE 0x00040000
+
+/* Exec-time and get/set-time error codes */
+
+#define PCRE_ERROR_NOMATCH (-1)
+#define PCRE_ERROR_NULL (-2)
+#define PCRE_ERROR_BADOPTION (-3)
+#define PCRE_ERROR_BADMAGIC (-4)
+#define PCRE_ERROR_UNKNOWN_NODE (-5)
+#define PCRE_ERROR_NOMEMORY (-6)
+#define PCRE_ERROR_NOSUBSTRING (-7)
+#define PCRE_ERROR_MATCHLIMIT (-8)
+#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */
+#define PCRE_ERROR_BADUTF8 (-10)
+#define PCRE_ERROR_BADUTF8_OFFSET (-11)
+#define PCRE_ERROR_PARTIAL (-12)
+#define PCRE_ERROR_BADPARTIAL (-13)
+#define PCRE_ERROR_INTERNAL (-14)
+#define PCRE_ERROR_BADCOUNT (-15)
+#define PCRE_ERROR_DFA_UITEM (-16)
+#define PCRE_ERROR_DFA_UCOND (-17)
+#define PCRE_ERROR_DFA_UMLIMIT (-18)
+#define PCRE_ERROR_DFA_WSSIZE (-19)
+#define PCRE_ERROR_DFA_RECURSE (-20)
/* Request types for pcre_fullinfo() */
-#define PCRE_INFO_OPTIONS 0
-#define PCRE_INFO_SIZE 1
-#define PCRE_INFO_CAPTURECOUNT 2
-#define PCRE_INFO_BACKREFMAX 3
-#define PCRE_INFO_FIRSTCHAR 4
-#define PCRE_INFO_FIRSTTABLE 5
-#define PCRE_INFO_LASTLITERAL 6
+#define PCRE_INFO_OPTIONS 0
+#define PCRE_INFO_SIZE 1
+#define PCRE_INFO_CAPTURECOUNT 2
+#define PCRE_INFO_BACKREFMAX 3
+#define PCRE_INFO_FIRSTBYTE 4
+#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */
+#define PCRE_INFO_FIRSTTABLE 5
+#define PCRE_INFO_LASTLITERAL 6
+#define PCRE_INFO_NAMEENTRYSIZE 7
+#define PCRE_INFO_NAMECOUNT 8
+#define PCRE_INFO_NAMETABLE 9
+#define PCRE_INFO_STUDYSIZE 10
+#define PCRE_INFO_DEFAULT_TABLES 11
+
+/* Request types for pcre_config() */
+
+#define PCRE_CONFIG_UTF8 0
+#define PCRE_CONFIG_NEWLINE 1
+#define PCRE_CONFIG_LINK_SIZE 2
+#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3
+#define PCRE_CONFIG_MATCH_LIMIT 4
+#define PCRE_CONFIG_STACKRECURSE 5
+#define PCRE_CONFIG_UNICODE_PROPERTIES 6
+
+/* Bit flags for the pcre_extra structure */
+
+#define PCRE_EXTRA_STUDY_DATA 0x0001
+#define PCRE_EXTRA_MATCH_LIMIT 0x0002
+#define PCRE_EXTRA_CALLOUT_DATA 0x0004
+#define PCRE_EXTRA_TABLES 0x0008
/* Types */
-struct real_pcre; /* declaration; the definition is private */
-struct real_pcre_extra; /* declaration; the definition is private */
-
-typedef struct real_pcre pcre;
-typedef struct real_pcre_extra pcre_extra;
-
#if PCRE_UTF16
-#include <stdint.h>
-typedef uint16_t pcre_char;
+typedef unsigned short pcre_char;
#else
typedef char pcre_char;
#endif
-/* Store get and free functions. These can be set to alternative malloc/free
-functions if required. Some magic is required for Win32 DLL; it is null on
-other OS. */
-
-PCRE_DL_IMPORT extern void *(*pcre_malloc)(size_t);
-PCRE_DL_IMPORT extern void (*pcre_free)(void *);
-
-#undef PCRE_DL_IMPORT
-
-/* Functions */
-
-extern pcre *pcre_compile(const pcre_char *, int, const char **, int *,
- const unsigned char *);
-extern int pcre_copy_substring(const pcre_char *, int *, int, int, pcre_char *, int);
-extern int pcre_exec(const pcre *, const pcre_extra *, const pcre_char *,
- int, int, int, int *, int);
-extern void pcre_free_substring(const pcre_char *);
-extern void pcre_free_substring_list(const pcre_char **);
-extern int pcre_get_substring(const pcre_char *, int *, int, int, const pcre_char **);
-extern int pcre_get_substring_list(const pcre_char *, int *, int, const pcre_char ***);
-extern int pcre_info(const pcre *, int *, int *);
-extern int pcre_fullinfo(const pcre *, const pcre_extra *, int, void *);
-extern const unsigned char *pcre_maketables(void);
-extern pcre_extra *pcre_study(const pcre *, int, const char **);
-extern const char *pcre_version(void);
+struct real_pcre; /* declaration; the definition is private */
+typedef struct real_pcre pcre;
+
+/* The structure for passing additional data to pcre_exec(). This is defined in
+such as way as to be extensible. Always add new fields at the end, in order to
+remain compatible. */
+
+typedef struct pcre_extra {
+ unsigned long int flags; /* Bits for which fields are set */
+ void *study_data; /* Opaque data from pcre_study() */
+ unsigned long int match_limit; /* Maximum number of calls to match() */
+ void *callout_data; /* Data passed back in callouts */
+ const unsigned char *tables; /* Pointer to character tables */
+} pcre_extra;
+
+/* The structure for passing out data via the pcre_callout_function. We use a
+structure so that new fields can be added on the end in future versions,
+without changing the API of the function, thereby allowing old clients to work
+without modification. */
+
+typedef struct pcre_callout_block {
+ int version; /* Identifies version of block */
+ /* ------------------------ Version 0 ------------------------------- */
+ int callout_number; /* Number compiled into pattern */
+ int *offset_vector; /* The offset vector */
+ const pcre_char *subject; /* The subject being matched */
+ int subject_length; /* The length of the subject */
+ int start_match; /* Offset to start of this match attempt */
+ int current_position; /* Where we currently are in the subject */
+ int capture_top; /* Max current capture */
+ int capture_last; /* Most recently closed capture */
+ void *callout_data; /* Data passed in with the call */
+ /* ------------------- Added for Version 1 -------------------------- */
+ int pattern_position; /* Offset to next item in the pattern */
+ int next_item_length; /* Length of next item in the pattern */
+ /* ------------------------------------------------------------------ */
+} pcre_callout_block;
+
+/* Indirection for store get and free functions. These can be set to
+alternative malloc/free functions if required. Special ones are used in the
+non-recursive case for "frames". There is also an optional callout function
+that is triggered by the (?) regex item. For Virtual Pascal, these definitions
+have to take another form. */
+
+#ifndef VPCOMPAT
+PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t);
+PCRE_DATA_SCOPE void (*pcre_free)(void *);
+PCRE_DATA_SCOPE void *(*pcre_stack_malloc)(size_t);
+PCRE_DATA_SCOPE void (*pcre_stack_free)(void *);
+PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *);
+#else /* VPCOMPAT */
+PCRE_DATA_SCOPE void *pcre_malloc(size_t);
+PCRE_DATA_SCOPE void pcre_free(void *);
+PCRE_DATA_SCOPE void *pcre_stack_malloc(size_t);
+PCRE_DATA_SCOPE void pcre_stack_free(void *);
+PCRE_DATA_SCOPE int pcre_callout(pcre_callout_block *);
+#endif /* VPCOMPAT */
+
+/* Exported PCRE functions */
+
+PCRE_DATA_SCOPE pcre *pcre_compile(const pcre_char *, int, const char **, int *,
+ const unsigned char *);
+PCRE_DATA_SCOPE pcre *pcre_compile2(const pcre_char *, int, int *, const char **,
+ int *, const unsigned char *);
+PCRE_DATA_SCOPE int pcre_config(int, void *);
+PCRE_DATA_SCOPE int pcre_copy_named_substring(const pcre *, const pcre_char *,
+ int *, int, const pcre_char *, pcre_char *, int);
+PCRE_DATA_SCOPE int pcre_copy_substring(const pcre_char *, int *, int, int, pcre_char *,
+ int);
+PCRE_DATA_SCOPE int pcre_dfa_exec(const pcre *, const pcre_extra *,
+ const pcre_char *, int, int, int, int *, int , int *, int);
+PCRE_DATA_SCOPE int pcre_exec(const pcre *, const pcre_extra *, const pcre_char *,
+ int, int, int, int *, int);
+PCRE_DATA_SCOPE void pcre_free_substring(const pcre_char *);
+PCRE_DATA_SCOPE void pcre_free_substring_list(const pcre_char **);
+PCRE_DATA_SCOPE int pcre_fullinfo(const pcre *, const pcre_extra *, int,
+ void *);
+PCRE_DATA_SCOPE int pcre_get_named_substring(const pcre *, const pcre_char *,
+ int *, int, const pcre_char *, const pcre_char **);
+PCRE_DATA_SCOPE int pcre_get_stringnumber(const pcre *, const pcre_char *);
+PCRE_DATA_SCOPE int pcre_get_substring(const pcre_char *, int *, int, int,
+ const pcre_char **);
+PCRE_DATA_SCOPE int pcre_get_substring_list(const pcre_char *, int *, int,
+ const pcre_char ***);
+PCRE_DATA_SCOPE int pcre_info(const pcre *, int *, int *);
+PCRE_DATA_SCOPE const unsigned char *pcre_maketables(void);
+PCRE_DATA_SCOPE int pcre_refcount(pcre *, int);
+PCRE_DATA_SCOPE pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_DATA_SCOPE const char *pcre_version(void);
#ifdef __cplusplus
} /* extern "C" */
1.3 +162 -69 JavaScriptCore/pcre/pcre_compile.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_config.c
1.3 +173 -32 JavaScriptCore/pcre/pcre_exec.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_fullinfo.c
1.3 +26 -23 JavaScriptCore/pcre/pcre_get.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_globals.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_info.c
1.3 +99 -31 JavaScriptCore/pcre/pcre_internal.h
1.3 +2 -1 JavaScriptCore/pcre/pcre_maketables.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_ord2utf8.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_printint.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_refcount.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_study.c
1.3 +2 -0 JavaScriptCore/pcre/pcre_tables.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_try_flipped.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_ucp_findchar.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_version.c
1.3 +0 -0 JavaScriptCore/pcre/pcre_xclass.c
1.3 +0 -0 JavaScriptCore/pcre/ucp.h
1.3 +0 -0 JavaScriptCore/pcre/ucp_findchar.c
1.3 +0 -0 JavaScriptCore/pcre/ucpinternal.h
1.3 +0 -0 JavaScriptCore/pcre/ucptable.c
More information about the webkit-changes
mailing list