From 01cfa4a6044b3304d29aca03e64d2a676b3e520b Mon Sep 17 00:00:00 2001 From: Lukas Aldershaab Date: Wed, 27 Sep 2023 20:40:38 +0200 Subject: [PATCH] Add sensible defaults for Console Module interface --- Engine/source/console/module.h | 17 ++++++++--------- Engine/source/console/torquescript/codeBlock.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Engine/source/console/module.h b/Engine/source/console/module.h index 4b5b35bb5..bc417f74a 100644 --- a/Engine/source/console/module.h +++ b/Engine/source/console/module.h @@ -1,4 +1,4 @@ -#ifndef _SCRIPT_MODULE_H_ +#ifndef _SCRIPT_MODULE_H_ #define _SCRIPT_MODULE_H_ #include "runtime.h" #include "console/console.h" @@ -23,22 +23,21 @@ namespace Con virtual EvalResult exec(U32 offset, const char* fnName, Namespace* ns, U32 argc, ConsoleValue* argv, bool noCalls, StringTableEntry packageName, S32 setFrame = -1) = 0; - virtual void findBreakLine(U32 ip, U32& line, U32& instruction) = 0; - virtual const char *getFileLine(U32 ip) = 0; + virtual void findBreakLine(U32 ip, U32& line, U32& instruction) {} /// Returns the first breakable line or 0 if none was found. /// @param lineNumber The one based line number. - virtual U32 findFirstBreakLine(U32 lineNumber) = 0; + virtual U32 findFirstBreakLine(U32 lineNumber) { return 0; } /// Set a OP_BREAK instruction on a line. If a break /// is not possible on that line it returns false. /// @param lineNumber The one based line number. - virtual bool setBreakpoint(U32 lineNumber) = 0; + virtual bool setBreakpoint(U32 lineNumber) { return false;} - virtual void setAllBreaks() = 0; - virtual void clearAllBreaks() = 0; - virtual void clearBreakpoint(U32 lineNumber) = 0; - virtual Vector getBreakableLines() = 0; + virtual void setAllBreaks() {} + virtual void clearAllBreaks() {} + virtual void clearBreakpoint(U32 lineNumber) {} + virtual Vector getBreakableLines() { return {}; } }; } diff --git a/Engine/source/console/torquescript/codeBlock.h b/Engine/source/console/torquescript/codeBlock.h index b9d7dd207..b86df621e 100644 --- a/Engine/source/console/torquescript/codeBlock.h +++ b/Engine/source/console/torquescript/codeBlock.h @@ -115,7 +115,7 @@ public: bool setBreakpoint(U32 lineNumber) override; void findBreakLine(U32 ip, U32 &line, U32 &instruction) override; - const char *getFileLine(U32 ip) override; + const char *getFileLine(U32 ip); /// String getFunctionArgs(U32 offset);