RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:38:11 +00:00
Code Issues Activity Actions

Userland/test: Handle '!' being used as a string

Browse source 
e.g. `test ! = !`.
Fixes #6465.
This commit is contained in:
Ali Mohammad Pur 2021-04-19 03:34:30 +04:30 • committed by Linus Groh
parent 6e2f2cd8b1
commit 061aaa33e8
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Utilities/test.cpp
View file

@ -356,15 +356,6 @@ static OwnPtr<Condition> parse_simple_expression(char* argv[])
fatal_error("Unmatched \033[1m("); fatal_error("Unmatched \033[1m(");
} }
if (arg == "!") {
if (should_treat_expression_as_single_string(argv[optind]))
return make<StringCompare>(move(arg), "", StringCompare::NotEqual);
auto command = parse_complex_expression(argv);
if (!command)
fatal_error("Expected an expression after \033[1m!");
return make<Not>(command.release_nonnull());
}
// Try to read a unary op. // Try to read a unary op.
if (arg.starts_with('-') && arg.length() == 2) { if (arg.starts_with('-') && arg.length() == 2) {
optind++; optind++;
@ -464,6 +455,17 @@ static OwnPtr<Condition> parse_simple_expression(char* argv[])
--optind; --optind;
return make<StringCompare>("", lhs, StringCompare::NotEqual); return make<StringCompare>("", lhs, StringCompare::NotEqual);
} else { } else {
// Now that we know it's not a well-formed expression, see if it's actually a negation
if (lhs == "!") {
if (should_treat_expression_as_single_string(arg))
return make<StringCompare>(move(lhs), "", StringCompare::NotEqual);
auto command = parse_complex_expression(argv);
if (!command)
fatal_error("Expected an expression after \x1b[1m!");
return make<Not>(command.release_nonnull());
}
--optind; --optind;
return make<StringCompare>("", lhs, StringCompare::NotEqual); return make<StringCompare>("", lhs, StringCompare::NotEqual);
} }