ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2025-08-02 22:09:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use deluxe, no difference

Browse Source
This commit is contained in:
Roberto Alsina
2024-08-13 21:34:05 -03:00
parent 32816eb207
commit 8e8296139a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/onigmo/onigwrap.c
View File

@@ -17,9 +17,18 @@ regex_t *onigwrap_create(char *pattern, int len, int ignoreCase, int multiline,
if (dotall == 1) if (dotall == 1)
onigOptions |= ONIG_OPTION_DOTALL; onigOptions |= ONIG_OPTION_DOTALL;
OnigCompileInfo ci;
ci.num_of_elements = 5;
ci.pattern_enc = ONIG_ENCODING_UTF8;
ci.target_enc = ONIG_ENCODING_UTF8;
ci.syntax = ONIG_SYNTAX_PYTHON;
ci.option = onigOptions;
ci.case_fold_flag = ONIGENC_CASE_FOLD_MIN;
OnigUChar *stringStart = (OnigUChar*) pattern; OnigUChar *stringStart = (OnigUChar*) pattern;
OnigUChar *stringEnd = (OnigUChar*) pattern + len; OnigUChar *stringEnd = (OnigUChar*) pattern + len;
int res = onig_new(&reg, stringStart, stringEnd, onigOptions, ONIG_ENCODING_UTF8, ONIG_SYNTAX_PYTHON, &einfo); // int res = onig_new(&reg, stringStart, stringEnd, onigOptions, ONIG_ENCODING_UTF8, ONIG_SYNTAX_PYTHON, &einfo);
int res = onig_new_deluxe(&reg, stringStart, stringEnd, &ci, &einfo);
return reg; return reg;
} }

10
src/rules.cr
View File

@@ -15,13 +15,11 @@ module Tartrazine
class Rule class Rule
property pattern : Regex = Regex.new "" property pattern : Regex = Regex.new ""
property pattern2 : ::Regex = ::Regex.new ""
property actions : Array(Action) = [] of Action property actions : Array(Action) = [] of Action
property xml : String = "foo" property xml : String = "foo"
def match(text, pos, lexer) : Tuple(Bool, Int32, Array(Token)) def match(text, pos, lexer) : Tuple(Bool, Int32, Array(Token))
match = pattern.match(text, pos) match = pattern.match(text, pos)
match2 = pattern2.match(text, pos)
# We don't match if the match doesn't move the cursor # We don't match if the match doesn't move the cursor
# because that causes infinite loops # because that causes infinite loops
# The `match.begin > pos` is the same as the ANCHORED option # The `match.begin > pos` is the same as the ANCHORED option
@@ -41,16 +39,8 @@ module Tartrazine
def initialize(node : XML::Node, multiline, dotall, ignorecase) def initialize(node : XML::Node, multiline, dotall, ignorecase)
@xml = node.to_s @xml = node.to_s
pattern = node["pattern"] pattern = node["pattern"]
# flags = Regex::Options::ANCHORED
flags = ::Regex::Options::NO_UTF_CHECK
# MULTILINE implies DOTALL which we don't want, so we
# use in-pattern flag (?m) instead
flags |= ::Regex::Options::MULTILINE if multiline
pattern = "(?m)" + pattern if multiline pattern = "(?m)" + pattern if multiline
flags |= ::Regex::Options::DOTALL if dotall
flags |= ::Regex::Options::IGNORE_CASE if ignorecase
@pattern = Regex.new(pattern, ignorecase, multiline, dotall) @pattern = Regex.new(pattern, ignorecase, multiline, dotall)
@pattern2 = ::Regex.new(pattern, flags)
add_actions(node) add_actions(node)
end end