RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-10 04:17:34 +00:00
Code Issues Activity Actions

Shell: Immediately resolve value when setting a variable

Browse source 
The lazy resolution mechanism made it so that the variables were linked
together, causing unexpected behaviour:

    true
    x=$? # expected: x=0
    false
    echo $x # expected: 0, actual: 1
This commit is contained in:
Ali Mohammad Pur 2022-07-02 19:30:22 +04:30 • committed by Ali Mohammad Pur
parent f94c7fc880
commit 6e24d845e0
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Shell/AST.cpp
View file

@ -3414,6 +3414,7 @@ RefPtr<Value> VariableDeclarations::run(RefPtr<Shell> shell)
auto value = var.value->run(shell); auto value = var.value->run(shell);
if (shell && shell->has_any_error()) if (shell && shell->has_any_error())
break; break;
value = value->resolve_without_cast(shell);
shell->set_local_variable(name, value.release_nonnull()); shell->set_local_variable(name, value.release_nonnull());
} }
@ -3703,6 +3704,14 @@ Vector<String> SpecialVariableValue::resolve_as_list(RefPtr<Shell> shell)
} }
} }
NonnullRefPtr<Value> SpecialVariableValue::resolve_without_cast(RefPtr<Shell> shell)
{
if (!shell)
return *this;
return make_ref_counted<ListValue>(resolve_as_list(shell));
}
TildeValue::~TildeValue() TildeValue::~TildeValue()
{ {
} }

13
Userland/Shell/AST.h
View file

@ -381,6 +381,7 @@ class SpecialVariableValue final : public Value {
public: public:
virtual Vector<String> resolve_as_list(RefPtr<Shell>) override; virtual Vector<String> resolve_as_list(RefPtr<Shell>) override;
virtual String resolve_as_string(RefPtr<Shell>) override; virtual String resolve_as_string(RefPtr<Shell>) override;
virtual NonnullRefPtr<Value> resolve_without_cast(RefPtr<Shell>) override;
virtual NonnullRefPtr<Value> clone() const override { return make_ref_counted<SpecialVariableValue>(m_name)->set_slices(m_slices); } virtual NonnullRefPtr<Value> clone() const override { return make_ref_counted<SpecialVariableValue>(m_name)->set_slices(m_slices); }
virtual ~SpecialVariableValue(); virtual ~SpecialVariableValue();
SpecialVariableValue(char name) SpecialVariableValue(char name)
@ -512,9 +513,15 @@ protected:
RefPtr<SyntaxError> m_syntax_error_node; RefPtr<SyntaxError> m_syntax_error_node;
}; };
#define NODE(name) \ #define NODE(name) \
virtual String class_name() const override { return #name; } \ virtual String class_name() const override \
virtual Kind kind() const override { return Kind::name; } { \
return #name; \
} \
virtual Kind kind() const override \
{ \
return Kind::name; \
}
class PathRedirectionNode : public Node { class PathRedirectionNode : public Node {
public: public: