github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Onigmo submodule

Browse Source
This commit is contained in:
Allan Odgaard
2013-08-18 13:22:52 +02:00
parent e9fb8aa9ae
commit 37a40c9c04
3 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/Onigmo/target vendored
View File

@@ -1,5 +1,6 @@
SOURCES = vendor/{enc/{ascii,euc_jp,iso8859_1,sjis,unicode,utf*},{reg*,st}}.c
SOURCES += src/*.c
TESTS = tests/t_*.cc
EXPORT = vendor/oniguruma.h
FLAGS += -Ivendor/Onigmo -Ivendor/Onigmo/vendor

65
vendor/Onigmo/tests/t_string_anchors.cc vendored Normal file
View File

@@ -0,0 +1,65 @@
#include <Onigmo/oniguruma.h>
#define ONIG_OPTION_BACKWARD (ONIG_OPTION_MAXBIT << 1)
OnigRegex pattern (char const* ptrn, OnigOptionType options = ONIG_OPTION_NONE)
{
OnigErrorInfo einfo;
OnigRegex regex = nullptr;
OAK_ASSERT_EQ(ONIG_NORMAL, onig_new(&regex, (OnigUChar const*)ptrn, (OnigUChar const*)ptrn + strlen(ptrn), options, ONIG_ENCODING_UTF8, ONIG_SYNTAX_DEFAULT, &einfo));
return regex;
}
std::string match (OnigRegex regex, char const* buf, OnigOptionType options = ONIG_OPTION_NONE)
{
std::string res = "none";
size_t from = 0, to = strlen(buf);
if(options & ONIG_OPTION_BACKWARD)
std::swap(from, to);
OnigRegion* region = onig_region_new();
if(ONIG_MISMATCH != onig_search(regex, (OnigUChar const*)buf, (OnigUChar const*)buf + strlen(buf), (OnigUChar const*)buf + from, (OnigUChar const*)buf + to, region, options))
{
char* tmp = nullptr;
asprintf(&tmp, "%zu-%zu", region->beg[0], region->end[0]);
res = tmp;
free(tmp);
}
onig_region_free(region, 1);
return res;
}
void test_bol ()
{
char const* buf = "foo bar\nfoo bar";
OAK_ASSERT_EQ( "0-3", match(pattern("^foo"), buf));
OAK_ASSERT_EQ("8-11", match(pattern("^foo"), buf, ONIG_OPTION_NOTBOL));
OAK_ASSERT_EQ( "0-3", match(pattern("^foo"), buf, ONIG_OPTION_NOTBOS));
OAK_ASSERT_EQ( "0-3", match(pattern("\\Afoo"), buf));
OAK_ASSERT_EQ( "0-3", match(pattern("\\Afoo"), buf, ONIG_OPTION_NOTBOL));
OAK_ASSERT_EQ("none", match(pattern("\\Afoo"), buf, ONIG_OPTION_NOTBOS));
OAK_ASSERT_EQ( "0-3", match(pattern("^foo", ONIG_OPTION_SINGLELINE), buf));
OAK_ASSERT_EQ( "0-3", match(pattern("^foo", ONIG_OPTION_SINGLELINE), buf, ONIG_OPTION_NOTBOL));
OAK_ASSERT_EQ("none", match(pattern("^foo", ONIG_OPTION_SINGLELINE), buf, ONIG_OPTION_NOTBOS));
OAK_ASSERT_EQ( "0-3", match(pattern("\\Afoo", ONIG_OPTION_SINGLELINE), buf));
OAK_ASSERT_EQ( "0-3", match(pattern("\\Afoo", ONIG_OPTION_SINGLELINE), buf, ONIG_OPTION_NOTBOL));
OAK_ASSERT_EQ("none", match(pattern("\\Afoo", ONIG_OPTION_SINGLELINE), buf, ONIG_OPTION_NOTBOS));
}
void test_eol ()
{
char const* buf = "foo bar\nfoo bar";
OAK_ASSERT_EQ("12-15", match(pattern("bar$"), buf, ONIG_OPTION_BACKWARD));
OAK_ASSERT_EQ( "4-7", match(pattern("bar$"), buf, ONIG_OPTION_BACKWARD|ONIG_OPTION_NOTEOL));
OAK_ASSERT_EQ("12-15", match(pattern("bar$"), buf, ONIG_OPTION_BACKWARD|ONIG_OPTION_NOTEOS));
OAK_ASSERT_EQ("12-15", match(pattern("bar\\z"), buf));
OAK_ASSERT_EQ("12-15", match(pattern("bar\\z"), buf, ONIG_OPTION_NOTEOL));
OAK_ASSERT_EQ( "none", match(pattern("bar\\z"), buf, ONIG_OPTION_NOTEOS));
}

2
vendor/Onigmo/vendor vendored

Submodule vendor/Onigmo/vendor updated: ede75b8eb2...617815bef3