languages/duckscript
languages/duckscript
1
0
Fork 0
mirror of https://github.com/sagiegurari/duckscript synced 2024-10-14 11:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix in substring when using negative end index only

Browse source
This commit is contained in:
sagie gur ari 2020-07-31 10:46:09 +00:00
parent c039360eaa
commit 28e6e6f7da
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
## CHANGELOG ## CHANGELOG
### v0.6.5 (2020-07-31)
* Bug fix in substring when using end index only.
### v0.6.4 (2020-07-31) ### v0.6.4 (2020-07-31)
* New json_encode command #124 * New json_encode command #124

6
duckscript_sdk/src/sdk/std/string/substring/mod.rs
View file

@ -57,15 +57,15 @@ impl Command for CommandImpl {
(value, string_len) (value, string_len)
} }
} else { } else {
let start_index = value + string_len; let end_index = string_len + value;
if start_index < 0 { if end_index < 0 {
return CommandResult::Error( return CommandResult::Error(
"Index from end cannot be bigger than total text size." "Index from end cannot be bigger than total text size."
.to_string(), .to_string(),
); );
} else { } else {
(start_index, string_len) (0, end_index)
} }
} }
} }

4
duckscript_sdk/src/sdk/std/string/substring/mod_test.rs
View file

@ -43,8 +43,8 @@ fn run_text_only_start() {
fn run_text_only_end() { fn run_text_only_end() {
test::run_script_and_validate( test::run_script_and_validate(
vec![create("")], vec![create("")],
"out = substring text -1", "out = substring abcd -1",
CommandValidation::Match("out".to_string(), "t".to_string()), CommandValidation::Match("out".to_string(), "abc".to_string()),
); );
} }

4
test/std/string/substring_test.ds
View file

@ -26,7 +26,7 @@ end
fn test_text_with_end fn test_text_with_end
output = substring "test" -2 output = substring "test" -2
assert_eq ${output} "st" assert_eq ${output} "te"
end end
fn test_text_with_range_and_start_too_big fn test_text_with_range_and_start_too_big
@ -45,4 +45,4 @@ fn test_text_with_range_and_end_too_big
output = substring "test" 0 8 output = substring "test" 0 8
assert_eq ${output} "false" assert_eq ${output} "false"
end end