summaryrefslogtreecommitdiff
path: root/CyteKit
diff options
context:
space:
mode:
Diffstat (limited to 'CyteKit')
-rw-r--r--CyteKit/PerlCompatibleRegEx.hpp115
-rw-r--r--CyteKit/RegEx.hpp127
-rw-r--r--CyteKit/WebViewController.mm6
3 files changed, 130 insertions, 118 deletions
diff --git a/CyteKit/PerlCompatibleRegEx.hpp b/CyteKit/PerlCompatibleRegEx.hpp
deleted file mode 100644
index 52136f6..0000000
--- a/CyteKit/PerlCompatibleRegEx.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2014 Jay Freeman (saurik)
-*/
-
-/* GNU General Public License, Version 3 {{{ */
-/*
- * Cydia is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Cydia 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. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cydia. If not, see <http://www.gnu.org/licenses/>.
-**/
-/* }}} */
-
-#ifndef Cydia_PerlCompatibleRegEx_HPP
-#define Cydia_PerlCompatibleRegEx_HPP
-
-#include <pcre.h>
-
-#include "CyteKit/UCPlatform.h"
-#include "CyteKit/stringWithUTF8Bytes.h"
-
-class Pcre {
- private:
- pcre *code_;
- pcre_extra *study_;
- int capture_;
- int *matches_;
- const char *data_;
-
- public:
- Pcre() :
- code_(NULL),
- study_(NULL),
- data_(NULL)
- {
- }
-
- Pcre(const char *regex, NSString *data = nil) :
- code_(NULL),
- study_(NULL),
- data_(NULL)
- {
- this->operator =(regex);
-
- if (data != nil)
- this->operator ()(data);
- }
-
- void operator =(const char *regex) {
- _assert(code_ == NULL);
-
- const char *error;
- int offset;
- code_ = pcre_compile(regex, 0, &error, &offset, NULL);
-
- if (code_ == NULL) {
- fprintf(stderr, "%d:%s\n", offset, error);
- _assert(false);
- }
-
- pcre_fullinfo(code_, study_, PCRE_INFO_CAPTURECOUNT, &capture_);
- _assert(capture_ >= 0);
- matches_ = new int[(capture_ + 1) * 3];
- }
-
- ~Pcre() {
- pcre_free(code_);
- delete matches_;
- }
-
- NSString *operator [](size_t match) const {
- return [NSString stringWithUTF8Bytes:(data_ + matches_[match * 2]) length:(matches_[match * 2 + 1] - matches_[match * 2])];
- }
-
- _finline bool operator ()(NSString *data) {
- // XXX: length is for characters, not for bytes
- return operator ()([data UTF8String], [data length]);
- }
-
- _finline bool operator ()(const char *data) {
- return operator ()(data, strlen(data));
- }
-
- bool operator ()(const char *data, size_t size) {
- if (pcre_exec(code_, study_, data, size, 0, 0, matches_, (capture_ + 1) * 3) >= 0) {
- data_ = data;
- return true;
- } else {
- data_ = NULL;
- return false;
- }
- }
-
- operator bool() const {
- return data_ != NULL;
- }
-
- NSString *operator ->*(NSString *format) const {
- id values[capture_];
- for (int i(0); i != capture_; ++i)
- values[i] = this->operator [](i + 1);
-
- return [[[NSString alloc] initWithFormat:format arguments:reinterpret_cast<va_list>(values)] autorelease];
- }
-};
-
-#endif//Cydia_PerlCompatibleRegEx_HPP
diff --git a/CyteKit/RegEx.hpp b/CyteKit/RegEx.hpp
new file mode 100644
index 0000000..5799946
--- /dev/null
+++ b/CyteKit/RegEx.hpp
@@ -0,0 +1,127 @@
+/* Cydia - iPhone UIKit Front-End for Debian APT
+ * Copyright (C) 2008-2014 Jay Freeman (saurik)
+*/
+
+/* GNU General Public License, Version 3 {{{ */
+/*
+ * Cydia is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * Cydia 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. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cydia. If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+#ifndef Cydia_RegEx_HPP
+#define Cydia_RegEx_HPP
+
+#include <unicode/uregex.h>
+
+#include "CyteKit/UCPlatform.h"
+#include "CyteKit/stringWithUTF8Bytes.h"
+
+#define _rgxcall(code, args...) ({ \
+ UErrorCode status(U_ZERO_ERROR); \
+ auto _value(code(args, &status)); \
+ if (U_FAILURE(status)) { \
+ fprintf(stderr, "%d:%s\n", error.offset, u_errorName(status)); \
+ _assert(false); \
+ } \
+_value; })
+
+#define _rgxcallv(code, args...) ({ \
+ UErrorCode status(U_ZERO_ERROR); \
+ code(args, &status); \
+ if (U_FAILURE(status)) { \
+ fprintf(stderr, "%d:%s\n", error.offset, u_errorName(status)); \
+ _assert(false); \
+ } \
+})
+
+class RegEx {
+ private:
+ URegularExpression *regex_;
+ int capture_;
+ size_t size_;
+
+ public:
+ RegEx() :
+ regex_(NULL),
+ size_(_not(size_t))
+ {
+ }
+
+ RegEx(const char *regex, NSString *data = nil) :
+ regex_(NULL),
+ size_(_not(size_t))
+ {
+ this->operator =(regex);
+
+ if (data != nil)
+ this->operator ()(data);
+ }
+
+ void operator =(const char *regex) {
+ _assert(regex_ == NULL);
+ UParseError error;
+ regex_ = _rgxcall(uregex_openC, regex, 0, &error);
+ capture_ = _rgxcall(uregex_groupCount, regex_);
+ }
+
+ ~RegEx() {
+ uregex_close(regex_);
+ }
+
+ NSString *operator [](size_t match) const {
+ UParseError error;
+ size_t size(size_);
+ UChar data[size];
+ size = _rgxcall(uregex_group, regex_, match, data, size);
+ return [[[NSString alloc] initWithBytes:data length:(size * sizeof(UChar)) encoding:NSUTF16LittleEndianStringEncoding] autorelease];
+ }
+
+ _finline bool operator ()(NSString *string) {
+ return operator ()(reinterpret_cast<const uint16_t *>([string cStringUsingEncoding:NSUTF16LittleEndianStringEncoding]), [string length]);
+ }
+
+ _finline bool operator ()(const char *data) {
+ return operator ()([NSString stringWithUTF8String:data]);
+ }
+
+ bool operator ()(const UChar *data, size_t size) {
+ UParseError error;
+ _rgxcallv(uregex_setText, regex_, data, size);
+
+ if (_rgxcall(uregex_matches, regex_, -1)) {
+ size_ = size;
+ return true;
+ } else {
+ size_ = _not(size_t);
+ return false;
+ }
+ }
+
+ bool operator ()(const char *data, size_t size) {
+ return operator ()([[[NSString alloc] initWithBytes:data length:size encoding:NSUTF8StringEncoding] autorelease]);
+ }
+
+ operator bool() const {
+ return size_ != _not(size_t);
+ }
+
+ NSString *operator ->*(NSString *format) const {
+ id values[capture_];
+ for (int i(0); i != capture_; ++i)
+ values[i] = this->operator [](i + 1);
+ return [[[NSString alloc] initWithFormat:format arguments:reinterpret_cast<va_list>(values)] autorelease];
+ }
+};
+
+#endif//Cydia_RegEx_HPP
diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index a7ff586..daa0a57 100644
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -8,7 +8,7 @@
#include "CyteKit/IndirectDelegate.h"
#include "CyteKit/Localize.h"
#include "CyteKit/WebViewController.h"
-#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "CyteKit/RegEx.hpp"
#include "CyteKit/WebThreadLocked.hpp"
//#include <QuartzCore/CALayer.h>
@@ -443,10 +443,10 @@ float CYScrollViewDecelerationRateNormal;
// CyteWebViewDelegate {{{
- (void) webView:(WebView *)view addMessageToConsole:(NSDictionary *)message {
#if LogMessages
- static Pcre irritating("^(?"
+ static RegEx irritating("(?"
":" "The page at .* displayed insecure content from .*\\."
"|" "Unsafe JavaScript attempt to access frame with URL .* from frame with URL .*\\. Domains, protocols and ports must match\\."
- ")\\n$");
+ ")\\n");
if (NSString *data = [message objectForKey:@"message"])
if (irritating(data))
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 06:53:55 +0000