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

refactor: validate defcfg values in parser #624

Merged
merged 17 commits into from
Nov 22, 2023
Merged

refactor: validate defcfg values in parser #624

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7290ba6
rename and fix grammar
rszyma Nov 12, 2023
38a1cdb
parse defcfg after deflocalkeys
rszyma Nov 12, 2023
a5dfbe6
refactor: move cfg values validation to parser
rszyma Nov 13, 2023
bf1b13b
cargo clippy -p kanata -p kanata-parser -p kanata-keyberon --fix
rszyma Nov 13, 2023
ecd65e4
cargo fmt --all
rszyma Nov 13, 2023
99b09cb
fix import error
rszyma Nov 13, 2023
79a22c0
use custom aprsing function for u16 values, so no need to pass an emp…
rszyma Nov 13, 2023
0219d3b
remove repeated text
rszyma Nov 13, 2023
be561b2
some more changes and fixes
rszyma Nov 13, 2023
101af60
move defcfg-related code to a new file
rszyma Nov 15, 2023
723e7a2
move more things to defcfg.rs
rszyma Nov 15, 2023
dd398bc
impl Default for AltGrBehaviour
rszyma Nov 15, 2023
5410d28
move stuff around - part 3
rszyma Nov 15, 2023
c9d8943
fix warnings
rszyma Nov 15, 2023
3323f3e
fix linux-x11-repeat-delay-rate
rszyma Nov 21, 2023
8c20a46
fix windows-interception-mouse-hwid
rszyma Nov 21, 2023
752c1e6
add unit test, fix config.adoc
jtroo Nov 22, 2023
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
234 changes: 90 additions & 144 deletions keyberon/src/action/switch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,11 @@ fn bool_evaluation_test_0() {
OpCode::new_key(KeyCode::F),
];
let keycodes = [KeyCode::A, KeyCode::B, KeyCode::D, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -309,14 +306,11 @@ fn bool_evaluation_test_1() {
KeyCode::E,
KeyCode::F,
];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -333,14 +327,11 @@ fn bool_evaluation_test_2() {
OpCode(KeyCode::F as u16),
];
let keycodes = [KeyCode::A, KeyCode::B, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
false
);
assert!(!evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -357,28 +348,22 @@ fn bool_evaluation_test_3() {
OpCode(KeyCode::F as u16),
];
let keycodes = [KeyCode::B, KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
false
);
assert!(!evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
fn bool_evaluation_test_4() {
let opcodes = [];
let keycodes = [];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -392,14 +377,11 @@ fn bool_evaluation_test_5() {
KeyCode::E,
KeyCode::F,
];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -413,28 +395,22 @@ fn bool_evaluation_test_6() {
KeyCode::E,
KeyCode::F,
];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
fn bool_evaluation_test_7() {
let opcodes = [OpCode(KeyCode::A as u16), OpCode(KeyCode::B as u16)];
let keycodes = [KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
false
);
assert!(!evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -446,14 +422,11 @@ fn bool_evaluation_test_9() {
OpCode(KeyCode::C as u16),
];
let keycodes = [KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -465,14 +438,11 @@ fn bool_evaluation_test_10() {
OpCode(KeyCode::C as u16),
];
let keycodes = [KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
false
);
assert!(!evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -483,14 +453,11 @@ fn bool_evaluation_test_11() {
OpCode(KeyCode::B as u16),
];
let keycodes = [KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
false
);
assert!(!evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -503,14 +470,11 @@ fn bool_evaluation_test_12() {
OpCode(KeyCode::C as u16),
];
let keycodes = [KeyCode::C, KeyCode::D, KeyCode::E, KeyCode::F];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -526,14 +490,11 @@ fn bool_evaluation_test_max_depth_does_not_panic() {
OpCode(0x1008),
];
let keycodes = [];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand All @@ -551,14 +512,11 @@ fn bool_evaluation_test_more_than_max_depth_panics() {
OpCode(0x1009),
];
let keycodes = [];
assert_eq!(
evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
),
true
);
assert!(evaluate_boolean(
opcodes.as_slice(),
keycodes.iter().copied(),
[].iter().copied()
));
}

#[test]
Expand Down Expand Up @@ -632,38 +590,26 @@ fn switch_historical_1() {
KeyCode::G,
KeyCode::H,
];
assert_eq!(
evaluate_boolean(
opcode_true.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
),
true
);
assert_eq!(
evaluate_boolean(
opcode_true2.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
),
true
);
assert_eq!(
evaluate_boolean(
opcode_false.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
),
false
);
assert_eq!(
evaluate_boolean(
opcode_false2.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
),
false
);
assert!(evaluate_boolean(
opcode_true.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
));
assert!(evaluate_boolean(
opcode_true2.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
));
assert!(!evaluate_boolean(
opcode_false.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
));
assert!(!evaluate_boolean(
opcode_false2.as_slice(),
[].iter().copied(),
hist_keycodes.iter().copied(),
));
}

#[test]
Expand Down
Loading