From b283a02d2fd10896243e00cc8382cba09d2338cb Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Mon, 20 Apr 2020 22:45:20 +0200 Subject: [PATCH] to_code and to color conversion for ScriptNil --- src/script/value.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/script/value.cpp b/src/script/value.cpp index 4c95092d..e65871ce 100644 --- a/src/script/value.cpp +++ b/src/script/value.cpp @@ -361,18 +361,22 @@ ScriptValueP to_script(wxDateTime v) { // the nil object class ScriptNil : public ScriptValue { - public: - virtual ScriptType type() const { return SCRIPT_NIL; } - virtual String typeName() const { return _TYPE_("nil"); } - virtual operator String() const { return wxEmptyString; } - virtual operator double() const { return 0.0; } - virtual operator int() const { return 0; } - virtual operator bool() const { return false; } - virtual GeneratedImageP toImage(const ScriptValueP&) const { +public: + ScriptType type() const override { return SCRIPT_NIL; } + String typeName() const override { return _TYPE_("nil"); } + operator String() const override { return String(); } + operator double() const override { return 0.0; } + operator int() const override { return 0; } + operator bool() const override { return false; } + operator AColor() const override { return AColor(); } + GeneratedImageP toImage(const ScriptValueP&) const { return intrusive(new BlankImage()); } + String toCode() const override { + return "nil"; + } - protected: +protected: virtual ScriptValueP do_eval(Context& ctx, bool) const { // nil(input) == input return ctx.getVariable(SCRIPT_VAR_input);