diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2017-03-07 19:23:25 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2017-03-07 19:23:25 +0100 |
| commit | 892248991babb55366860488678632ab4ccdb0ba (patch) | |
| tree | e2ed43f63c21dd7e70a62ff7cd6149cc150d54cc /src/qregisters.h | |
| parent | a2e52ca49c6a5495f134648e91647008dca4a742 (diff) | |
refactored commandline key processing: rewritten Cmdline::process_edit_cmd() as State::process_edit_cmd() virtual methods
* Cmdline::process_edit_cmd() was much too long and deeply nested.
It used RTTI excessively to implement the state-specific behaviour.
It became apparent that the behaviour is largely state-specific and could be
modelled much more elegantly as virtual methods of State.
* Basically, a state can now implement a method to customize its
commandline behaviour.
In the case that the state does not define custom behaviour for
the key pressed, it can "chain" to the parent class' process_edit_cmd().
This can be optimized to tail calls by the compiler.
* The State::process_edit_cmd() implementations are still isolated in
cmdline.cpp. This is not strictly necessary but allows us keep the
already large compilations units like parser.cpp small.
Also, the edit command processing has little to do with the rest of
a state's functionality and is only used in interactive mode.
* As a result, we have many small functions now which are much easier to
maintain.
This makes adding new and more complex context sensitive editing behaviour
easier.
* State-specific function key masking has been refactored by introducing
State::get_fnmacro_mask().
* This allowed us to remove the States::is_*() functions which have
always been a crutch to support context-sensitive key handling.
* RTTI is almost completely eradicated, except for exception handling
and StdError(). Both remaining cases can probably be avoided in the
future, allowing us to compile smaller binaries.
Diffstat (limited to 'src/qregisters.h')
| -rw-r--r-- | src/qregisters.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/qregisters.h b/src/qregisters.h index f185f03..d57323a 100644 --- a/src/qregisters.h +++ b/src/qregisters.h @@ -489,14 +489,9 @@ public: * Super class for states accepting Q-Register specifications */ class StateExpectQReg : public State { -public: - /* - * FIXME: Only public, so we can access it from - * cmdline.cpp. Will not be necessary if process_edit_cmd() - * is a State method. - */ QRegSpecMachine machine; +public: StateExpectQReg(QRegSpecType type = QREG_REQUIRED); private: @@ -504,6 +499,9 @@ private: protected: virtual State *got_register(QRegister *reg) = 0; + + /* in cmdline.cpp */ + void process_edit_cmd(gchar key); }; class StatePushQReg : public StateExpectQReg { @@ -637,12 +635,6 @@ namespace States { extern StateMacro macro; extern StateMacroFile macro_file; extern StateCopyToQReg copytoqreg; - - static inline bool - is_qreg() - { - return dynamic_cast<StateExpectQReg *>(current); - } } namespace QRegisters { |
