Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add String#byterindex #2193

Merged
merged 4 commits into from
Jul 6, 2024
Merged

Add String#byterindex #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67467fa
Add String#byterindex
seven1m Jul 4, 2024
ce10731
Check if already FixedEncoding before building temp regexp
seven1m Jul 6, 2024
2212280
Don't create a region for Regexp::has_match since it isn't used
seven1m Jul 6, 2024
fd71f8b
Fix bug not freeing onigmo region on mismatch
seven1m Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion include/natalie/regexp_object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class RegexpObject : public Object {
return m_options & RegexOpts::IgnoreCase;
}

int search(Env *env, const StringObject *string_obj, int start, OnigRegion *region, OnigOptionType options);
long search(Env *env, const StringObject *string_obj, long start, OnigRegion *region, OnigOptionType options, bool reverse = false);

bool eq(Env *env, Value other) const {
assert_initialized(env);
Expand All @@ -163,6 +163,10 @@ class RegexpObject : public Object {
return this->send(env, "=~"_s, { env->global_get("$_"_s) });
}

bool is_fixed_encoding() const {
return m_options & RegexOpts::FixedEncoding;
}

bool has_match(Env *env, Value, Value);
Value initialize(Env *, Value, Value);
Value inspect(Env *env);
Expand Down
1 change: 1 addition & 0 deletions include/natalie/string_object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ class StringObject : public Object {
StringObject *successive_in_place(Env *);

Value byteindex(Env *, Value, Value = nullptr) const;
Value byterindex(Env *, Value, Value = nullptr) const;

Value index(Env *, Value, Value);
Value index(Env *, Value, size_t start);
Expand Down
1 change: 1 addition & 0 deletions lib/natalie/compiler/binding_gen.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,7 @@ def generate_name
gen.binding('String', 'b', 'StringObject', 'b', argc: 0, pass_env: true, pass_block: false, return_type: :Object)
gen.binding('String', 'bytes', 'StringObject', 'bytes', argc: 0, pass_env: true, pass_block: true, return_type: :Object)
gen.binding('String', 'byteindex', 'StringObject', 'byteindex', argc: 1..2, pass_env: true, pass_block: false, return_type: :Object)
gen.binding('String', 'byterindex', 'StringObject', 'byterindex', argc: 1..2, pass_env: true, pass_block: false, return_type: :Object)
gen.binding('String', 'byteslice', 'StringObject', 'byteslice', argc: 1..2, pass_env: true, pass_block: false, return_type: :Object)
gen.binding('String', 'bytesize', 'StringObject', 'bytesize', argc: 0, pass_env: false, pass_block: false, return_type: :size_t)
gen.binding('String', 'capitalize', 'StringObject', 'capitalize', argc: 0..2, pass_env: true, pass_block: false, return_type: :Object)
Expand Down
Loading
Loading