New map_keys command

This commit is contained in:
sagie gur ari 2020-04-14 11:07:04 +00:00
parent 2ca953b171
commit abcacf85dc
7 changed files with 192 additions and 0 deletions

View file

@ -2,6 +2,7 @@
### v0.3.3
* New map_keys command.
* New temp_dir command.
* Runtime - Use default trait.

View file

@ -0,0 +1,33 @@
```sh
keys = map_keys handle
```
Returns a handle to an array holding all keys in the provided map handle.
#### Parameters
* The map handle.
#### Return Value
A handle to an array holding all map keys.
#### Examples
```sh
handle = map
result = map_put ${handle} key1 value1
assert_eq ${result} true
result = map_put ${handle} key2 value2
assert_eq ${result} true
keys = map_keys ${handle}
for key in ${keys}
value = map_get ${handle} ${key}
echo Key: ${key} Value: ${value}
end
release ${handle}
release ${keys}
```

View file

@ -0,0 +1,81 @@
use crate::utils::pckg;
use crate::utils::state::{get_handles_sub_state, put_handle};
use duckscript::types::command::{Command, CommandResult, Commands};
use duckscript::types::instruction::Instruction;
use duckscript::types::runtime::StateValue;
use std::collections::HashMap;
use std::str;
#[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, "MapKeys")
}
fn aliases(&self) -> Vec<String> {
vec!["map_keys".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.is_empty() {
CommandResult::Error("Map handle not provided.".to_string())
} else {
let handles_state = get_handles_sub_state(state);
match handles_state.get(&arguments[0]) {
Some(state_value) => match state_value {
StateValue::SubState(ref map) => {
let mut array = vec![];
for map_key in map.keys() {
array.push(StateValue::String(map_key.to_string()));
}
let key = put_handle(state, StateValue::List(array));
CommandResult::Continue(Some(key))
}
_ => CommandResult::Error("Invalid handle provided.".to_string()),
},
None => CommandResult::Error(
format!("Map for handle: {} not found.", &arguments[0]).to_string(),
),
}
}
}
}
pub(crate) fn create(package: &str) -> Box<dyn Command> {
Box::new(CommandImpl {
package: package.to_string(),
})
}

View file

@ -0,0 +1,38 @@
use super::*;
use crate::sdk::std::collections::{array_pop, map, map_put};
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 = map_keys", "out");
}
#[test]
fn run_not_found() {
test::run_script_and_error(vec![create("")], "out = map_keys bad_handle", "out");
}
#[test]
fn run_valid() {
test::run_script_and_validate(
vec![
create(""),
map::create(""),
map_put::create(""),
array_pop::create(""),
],
r#"
handle = map
map_put ${handle} a 1
keys = map_keys ${handle}
out = array_pop ${keys}
"#,
CommandValidation::Match("out".to_string(), "a".to_string()),
);
}

View file

@ -13,6 +13,7 @@ mod map;
mod map_clear;
mod map_get;
mod map_is_empty;
mod map_keys;
mod map_load_properties;
mod map_put;
mod map_remove;
@ -46,6 +47,7 @@ pub(crate) fn load(commands: &mut Commands, parent: &str) -> Result<(), ScriptEr
commands.set(map_clear::create(&package))?;
commands.set(map_get::create(&package))?;
commands.set(map_is_empty::create(&package)?)?;
commands.set(map_keys::create(&package))?;
commands.set(map_load_properties::create(&package))?;
commands.set(map_put::create(&package))?;
commands.set(map_remove::create(&package))?;

View file

@ -0,0 +1,16 @@
fn test_map_keys
handle = map
result = map_put ${handle} key value
assert_eq ${result} true
keys = map_keys ${handle}
size = array_length ${keys}
assert_eq ${size} 1
value = array_pop ${keys}
assert_eq ${value} key
release ${handle}
release ${keys}
end

View file

@ -38,3 +38,24 @@ fn test_range
assert_eq ${counter} 100
released = release ${args}
end
fn test_map_keys
handle = map
result = map_put ${handle} key1 value1
assert_eq ${result} true
result = map_put ${handle} key2 value2
assert_eq ${result} true
keys = map_keys ${handle}
for key in ${keys}
valid = starts_with ${key} key
assert ${valid}
value = map_get ${handle} ${key}
valid = starts_with ${value} value
assert ${valid}
end
release ${handle}
release ${keys}
end