New array_set command

This commit is contained in:
sagie gur ari 2020-04-04 12:14:54 +00:00
parent 09da298b29
commit a0ce056bae
7 changed files with 269 additions and 0 deletions

View file

@ -2,6 +2,7 @@
### v0.3.2
* New array_set command.
* New array_get command #94
### v0.3.1 (2020-03-28)

View file

@ -9,11 +9,13 @@
* [std::ShowCommandDocumentation (man)](#std__ShowCommandDocumentation)
* [std::collections::Array (array)](#std__collections__Array)
* [std::collections::ArrayConcat (array_concat)](#std__collections__ArrayConcat)
* [std::collections::ArrayGet (array_get)](#std__collections__ArrayGet)
* [std::collections::ArrayIsEmpty (array_is_empty)](#std__collections__ArrayIsEmpty)
* [std::collections::ArrayJoin (array_join)](#std__collections__ArrayJoin)
* [std::collections::ArrayLength (array_length, arrlen)](#std__collections__ArrayLength)
* [std::collections::ArrayPop (array_pop)](#std__collections__ArrayPop)
* [std::collections::ArrayPush (array_push)](#std__collections__ArrayPush)
* [std::collections::ArraySet (array_set)](#std__collections__ArraySet)
* [std::collections::IsArray (is_array)](#std__collections__IsArray)
* [std::collections::IsMap (is_map)](#std__collections__IsMap)
* [std::collections::Map (map)](#std__collections__Map)
@ -512,6 +514,35 @@ set ${scope::array_concat::array}
#### Aliases:
array_concat
<a name="std__collections__ArrayGet"></a>
## std::collections::ArrayGet
```sh
var = array_get handle index
```
Returns the element from the array at a given index or none if the index is bigger than the array length.
#### Parameters
* The array handle.
* The element index.
#### Return Value
The element at the given index from the array or none.
#### Examples
```sh
handle = array 1 2 3
element = array_get ${handle} 2
assert_eq ${element} 3
```
#### Aliases:
array_get
<a name="std__collections__ArrayIsEmpty"></a>
## std::collections::ArrayIsEmpty
@ -720,6 +751,35 @@ assert_eq ${last_element} 4
#### Aliases:
array_push
<a name="std__collections__ArraySet"></a>
## std::collections::ArraySet
```sh
var = array_get handle index
```
Returns the element from the array at a given index or none if the index is bigger than the array length.
#### Parameters
* The array handle.
* The element index.
#### Return Value
The element at the given index from the array or none.
#### Examples
```sh
handle = array 1 2 3
element = array_get ${handle} 2
assert_eq ${element} 3
```
#### Aliases:
array_set
<a name="std__collections__IsArray"></a>
## std::collections::IsArray
```sh

View file

@ -0,0 +1,22 @@
```sh
var = array_get handle index
```
Returns the element from the array at a given index or none if the index is bigger than the array length.
#### Parameters
* The array handle.
* The element index.
#### Return Value
The element at the given index from the array or none.
#### Examples
```sh
handle = array 1 2 3
element = array_get ${handle} 2
assert_eq ${element} 3
```

View file

@ -0,0 +1,90 @@
use crate::utils::pckg;
use crate::utils::state::{get_handles_sub_state, mutate_list};
use duckscript::types::command::{Command, CommandResult, Commands};
use duckscript::types::instruction::Instruction;
use duckscript::types::runtime::StateValue;
use std::collections::HashMap;
#[cfg(test)]
#[path = "./mod_test.rs"]
mod mod_test;
#[derive(Clone)]
pub(crate) struct CommandImpl {
package: String,
}
impl Command for CommandImpl {
fn name(&self) -> String {
pckg::concat(&self.package, "ArraySet")
}
fn aliases(&self) -> Vec<String> {
vec!["array_set".to_string()]
}
fn help(&self) -> String {
include_str!("help.md").to_string()
}
fn clone_and_box(&self) -> Box<dyn Command> {
Box::new((*self).clone())
}
fn requires_context(&self) -> bool {
true
}
fn run_with_context(
&self,
arguments: Vec<String>,
state: &mut HashMap<String, StateValue>,
_variables: &mut HashMap<String, String>,
_output_variable: Option<String>,
_instructions: &Vec<Instruction>,
_commands: &mut Commands,
_line: usize,
) -> CommandResult {
if arguments.len() < 3 {
CommandResult::Error("Invalid input provided.".to_string())
} else {
let state = get_handles_sub_state(state);
let key = arguments[0].clone();
let index: usize = match arguments[1].parse() {
Ok(value) => value,
Err(_) => {
return CommandResult::Error(
format!("Non numeric value: {} provided.", &arguments[1]).to_string(),
);
}
};
let result = mutate_list(key, state, |list| {
let list_length = list.len();
if list_length > index {
list[index] = StateValue::String(arguments[2].clone());
Ok(Some("true".to_string()))
} else {
Err(format!(
"Index: {} is greater than list size: {}",
index, list_length
))
}
});
match result {
Ok(value) => CommandResult::Continue(value),
Err(error) => CommandResult::Error(error),
}
}
}
}
pub(crate) fn create(package: &str) -> Box<dyn Command> {
Box::new(CommandImpl {
package: package.to_string(),
})
}

View file

@ -0,0 +1,57 @@
use super::*;
use crate::sdk::std::collections::array;
use crate::test;
use crate::test::CommandValidation;
#[test]
fn common_functions() {
test::test_common_command_functions(create(""));
}
#[test]
fn run_no_args() {
test::run_script_and_error(vec![create("")], "out = array_set", "out");
}
#[test]
fn run_only_handle() {
test::run_script_and_error(vec![create("")], "out = array_set handle", "out");
}
#[test]
fn run_only_handle_and_index() {
test::run_script_and_error(vec![create("")], "out = array_set handle 3", "out");
}
#[test]
fn run_not_found() {
test::run_script_and_error(
vec![create("")],
"out = array_set bad_handle 2 value",
"out",
);
}
#[test]
fn run_found() {
test::run_script_and_validate(
vec![create(""), array::create("")],
r#"
handle = array a b c "d e"
out = array_set ${handle} 3 value
"#,
CommandValidation::Match("out".to_string(), "true".to_string()),
);
}
#[test]
fn run_found_out_of_bounds() {
test::run_script_and_error(
vec![create(""), array::create("")],
r#"
handle = array a b c "d e"
out = array_set ${handle} 20 value
"#,
"out",
);
}

View file

@ -6,6 +6,7 @@ mod array_join;
pub(crate) mod array_length;
pub(crate) mod array_pop;
mod array_push;
mod array_set;
mod is_array;
mod is_map;
mod map;
@ -34,6 +35,7 @@ pub(crate) fn load(commands: &mut Commands, parent: &str) -> Result<(), ScriptEr
commands.set(array_concat::create(&package)?)?;
commands.set(array_get::create(&package))?;
commands.set(array_push::create(&package))?;
commands.set(array_set::create(&package))?;
commands.set(array_is_empty::create(&package)?)?;
commands.set(array_join::create(&package)?)?;
commands.set(array_length::create(&package))?;

View file

@ -0,0 +1,37 @@
fn test_array_with_data
arr = array 1
element = array_get ${arr} 0
assert_eq ${element} 1
result = array_set ${arr} 0 10
assert ${result}
element = array_get ${arr} 0
assert_eq ${element} 10
result = array_set ${arr} 0 100
assert ${result}
element = array_get ${arr} 0
assert_eq ${element} 100
result = array_set ${arr} 1 10
assert_false ${result}
released = release ${arr}
assert ${released}
end
fn test_array_no_data
arr = array
element = array_get ${arr} 0
defined = is_defined element
assert_false ${defined}
result = array_set ${arr} 0 10
assert_false ${result}
released = release ${arr}
assert ${released}
end