aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/error.h
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2021-05-30 02:38:43 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2021-05-30 03:12:56 +0200
commit432ad24e382681f1c13b07e8486e91063dd96e2e (patch)
tree51838adac822767bd5884b9383cd4c72f29d3840 /src/error.h
parent524bc3960e6a6e5645ce904e20f72479e24e0a23 (diff)
downloadsciteco-432ad24e382681f1c13b07e8486e91063dd96e2e.tar.gz
THE GREAT CEEIFICATION EVENT
This is a total conversion of SciTECO to plain C (GNU C11). The chance was taken to improve a lot of internal datastructures, fix fundamental bugs and lay the foundations of future features. The GTK user interface is now in an useable state! All changes have been squashed together. The language itself has almost not changed at all, except for: * Detection of string terminators (usually Escape) now takes the string building characters into account. A string is only terminated outside of string building characters. In other words, you can now for instance write I^EQ[Hello$world]$ This removes one of the last bits of shellisms which is out of place in SciTECO where no tokenization/lexing is performed. Consequently, the current termination character can also be escaped using ^Q/^R. This is used by auto completions to make sure that strings are inserted verbatim and without unwanted sideeffects. * All strings can now safely contain null-characters (see also: 8-bit cleanliness). The null-character itself (^@) is not (yet) a valid SciTECO command, though. An incomplete list of changes: * We got rid of the BSD headers for RB trees and lists/queues. The problem with them was that they used a form of metaprogramming only to gain a bit of type safety. It also resulted in less readble code. This was a C++ desease. The new code avoids metaprogramming only to gain type safety. The BSD tree.h has been replaced by rb3ptr by Jens Stimpfle (https://github.com/jstimpfle/rb3ptr). This implementation is also more memory efficient than BSD's. The BSD list.h and queue.h has been replaced with a custom src/list.h. * Fixed crashes, performance issues and compatibility issues with the Gtk 3 User Interface. It is now more or less ready for general use. The GDK lock is no longer used to avoid using deprecated functions. On the downside, the new implementation (driving the Gtk event loop stepwise) is even slower than the old one. A few glitches remain (see TODO), but it is hoped that they will be resolved by the Scintilla update which will be performed soon. * A lot of program units have been split up, so they are shorter and easier to maintain: core-commands.c, qreg-commands.c, goto-commands.c, file-utils.h. * Parser states are simply structs of callbacks now. They still use a kind of polymorphy using a preprocessor trick. TECO_DEFINE_STATE() takes an initializer list that will be merged with the default list of field initializers. To "subclass" states, you can simply define new macros that add initializers to existing macros. * Parsers no longer have a "transitions" table but the input_cb() may use switch-case statements. There are also teco_machine_main_transition_t now which can be used to implement simple transitions. Additionally, you can specify functions to execute during transitions. This largely avoids long switch-case-statements. * Parsers are embeddable/reusable now, at least in parse-only mode. This does not currently bring any advantages but may later be used to write a Scintilla lexer for TECO syntax highlighting. Once parsers are fully embeddable, it will also be possible to run TECO macros in a kind of coroutine which would allow them to process string arguments in real time. * undo.[ch] still uses metaprogramming extensively but via the C preprocessor of course. On the downside, most undo token generators must be initiated explicitly (theoretically we could have used embedded functions / trampolines to instantiate automatically but this has turned out to be dangereous). There is a TECO_DEFINE_UNDO_CALL() to generate closures for arbitrary functions now (ie. to call an arbitrary function at undo-time). This simplified a lot of code and is much shorter than manually pushing undo tokens in many cases. * Instead of the ridiculous C++ Curiously Recurring Template Pattern to achieve static polymorphy for user interface implementations, we now simply declare all functions to implement in interface.h and link in the implementations. This is possible since we no longer hace to define interface subclasses (all state is static variables in the interface's *.c files). * Headers are now significantly shorter than in C++ since we can often hide more of our "class" implementations. * Memory counting is based on dlmalloc for most platforms now. Unfortunately, there is no malloc implementation that provides an efficient constant-time memory counter that is guaranteed to decrease when freeing memory. But since we use a defined malloc implementation now, malloc_usable_size() can be used safely for tracking memory use. malloc() replacement is very tricky on Windows, so we use a poll thread on Windows. This can also be enabled on other supported platforms using --disable-malloc-replacement. All in all, I'm still not pleased with the state of memory limiting. It is a mess. * Error handling uses GError now. This has the advantage that the GError codes can be reused once we support error catching in the SciTECO language. * Added a few more test suite cases. * Haiku is no longer supported as builds are instable and I did not manage to debug them - quite possibly Haiku bugs were responsible. * Glib v2.44 or later are now required. The GTK UI requires Gtk+ v3.12 or later now. The GtkFlowBox fallback and sciteco-wrapper workaround are no longer required. * We now extensively use the GCC/Clang-specific g_auto feature (automatic deallocations when leaving the current code block). * Updated copyright to 2021. SciTECO has been in continuous development, even though there have been no commits since 2018. * Since these changes are so significant, the target release has been set to v2.0. It is planned that beginning with v3.0, the language will be kept stable.
Diffstat (limited to 'src/error.h')
-rw-r--r--src/error.h316
1 files changed, 123 insertions, 193 deletions
diff --git a/src/error.h b/src/error.h
index a12a76b..16136b9 100644
--- a/src/error.h
+++ b/src/error.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2017 Robin Haberkorn
+ * Copyright (C) 2012-2021 Robin Haberkorn
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,205 +14,135 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-#ifndef __ERROR_H
-#define __ERROR_H
-
-#include <exception>
-#include <typeinfo>
+#pragma once
#include <glib.h>
-#include <glib/gprintf.h>
#include "sciteco.h"
-#include "memory.h"
#include "string-utils.h"
-namespace SciTECO {
-
-/**
- * Thrown as exception to signify that program
- * should be terminated.
- */
-class Quit : public Object {};
-
-/**
- * Thrown as exception to cause a macro to
- * return or a command-line termination.
+/*
+ * FIXME: Introducing a second error quark might be useful to distinguish
+ * errors that can be cought by SciTECO macros from errors that must always
+ * propagate (TECO_ERROR_QUIT, TECO_ERROR_RETURN).
+ * On the other hand, these error codes will probably soon become obsolete
+ * when the SciTECO call stack no longer corresponds with the C callstack.
*/
-class Return : public Object {
-public:
- guint args;
-
- Return(guint _args = 0) : args(_args) {}
-};
-
-class Error : public Object {
- GSList *frames;
-
-public:
- gchar *description;
- gint pos;
- gint line, column;
-
- class Frame : public Object {
- public:
- gint pos;
- gint line, column;
-
- virtual Frame *copy() const = 0;
- virtual ~Frame() {}
-
- virtual void display(gint nr) = 0;
- };
-
- class QRegFrame : public Frame {
- gchar *name;
-
- public:
- QRegFrame(const gchar *_name)
- : name(g_strdup(_name)) {}
-
- Frame *copy() const;
-
- ~QRegFrame()
- {
- g_free(name);
- }
-
- void display(gint nr);
- };
-
- class FileFrame : public Frame {
- gchar *name;
-
- public:
- FileFrame(const gchar *_name)
- : name(g_strdup(_name)) {}
-
- Frame *copy() const;
-
- ~FileFrame()
- {
- g_free(name);
- }
-
- void display(gint nr);
- };
-
- class EDHookFrame : public Frame {
- gchar *type;
-
- public:
- EDHookFrame(const gchar *_type)
- : type(g_strdup(_type)) {}
-
- Frame *copy() const;
-
- ~EDHookFrame()
- {
- g_free(type);
- }
-
- void display(gint nr);
- };
-
- class ToplevelFrame : public Frame {
- public:
- Frame *copy() const;
-
- void display(gint nr);
- };
-
- Error(const gchar *fmt, ...) G_GNUC_PRINTF(2, 3);
- Error(const Error &inst);
- ~Error();
-
- inline void
- set_coord(const gchar *str, gint _pos)
- {
- pos = _pos;
- String::get_coord(str, pos, line, column);
- }
-
- void add_frame(Frame *frame);
-
- void display_short(void);
- void display_full(void);
-};
+#define TECO_ERROR (g_quark_from_static_string("sciteco-error-quark"))
-class StdError : public Error {
-public:
- StdError(const gchar *type, const std::exception &error)
- : Error("%s: %s", type, error.what()) {}
- StdError(const std::exception &error)
- : Error("%s: %s", typeid(error).name(), error.what()) {}
-};
+typedef enum {
+ /** Default (catch-all) error code */
+ TECO_ERROR_FAILED = 0,
-class GlibError : public Error {
-public:
- /**
- * Construct error for glib's GError.
- * Ownership of the error's resources is passed
- * the GlibError object.
+ /*
+ * FIXME: Subsume all these errors under TECO_ERROR_SYNTAX or TECO_ERROR_FAIL?
+ * They will mainly be different in their error message.
*/
- GlibError(GError *gerror)
- : Error("%s", gerror->message)
- {
- g_error_free(gerror);
- }
-};
-
-class SyntaxError : public Error {
-public:
- SyntaxError(gchar chr)
- : Error("Syntax error \"%c\" (%d)", chr, chr) {}
-};
-
-class ArgExpectedError : public Error {
-public:
- ArgExpectedError(const gchar *cmd)
- : Error("Argument expected for <%s>", cmd) {}
- ArgExpectedError(gchar cmd)
- : Error("Argument expected for <%c>", cmd) {}
-};
-
-class MoveError : public Error {
-public:
- MoveError(const gchar *cmd)
- : Error("Attempt to move pointer off page with <%s>",
- cmd) {}
- MoveError(gchar cmd)
- : Error("Attempt to move pointer off page with <%c>",
- cmd) {}
-};
-
-class RangeError : public Error {
-public:
- RangeError(const gchar *cmd)
- : Error("Invalid range specified for <%s>", cmd) {}
- RangeError(gchar cmd)
- : Error("Invalid range specified for <%c>", cmd) {}
-};
-
-class InvalidQRegError : public Error {
-public:
- InvalidQRegError(const gchar *name, bool local = false)
- : Error("Invalid Q-Register \"%s%s\"",
- local ? "." : "", name) {}
- InvalidQRegError(gchar name, bool local = false)
- : Error("Invalid Q-Register \"%s%c\"",
- local ? "." : "", name) {}
-};
-
-class QRegOpUnsupportedError : public Error {
-public:
- QRegOpUnsupportedError(const gchar *name, bool local = false)
- : Error("Operation unsupported on "
- "Q-Register \"%s%s\"",
- local ? "." : "", name) {}
-};
-
-} /* namespace SciTECO */
-
-#endif
+ TECO_ERROR_SYNTAX,
+ TECO_ERROR_ARGEXPECTED,
+ TECO_ERROR_MOVE,
+ TECO_ERROR_WORDS,
+ TECO_ERROR_RANGE,
+ TECO_ERROR_INVALIDQREG,
+ TECO_ERROR_QREGOPUNSUPPORTED,
+ TECO_ERROR_QREGCONTAINSNULL,
+ TECO_ERROR_MEMLIMIT,
+
+ /** Interrupt current operation */
+ TECO_ERROR_INTERRUPTED,
+
+ /** Thrown to signal command line replacement */
+ TECO_ERROR_CMDLINE = 0x80,
+ /** Thrown as exception to cause a macro to return or a command-line termination. */
+ TECO_ERROR_RETURN,
+ /** Thrown as exception to signify that program should be terminated. */
+ TECO_ERROR_QUIT
+} teco_error_t;
+
+static inline void
+teco_error_syntax_set(GError **error, gchar chr)
+{
+ g_set_error(error, TECO_ERROR, TECO_ERROR_SYNTAX,
+ "Syntax error \"%c\" (%d)", chr, chr);
+}
+
+static inline void
+teco_error_argexpected_set(GError **error, const gchar *cmd)
+{
+ g_set_error(error, TECO_ERROR, TECO_ERROR_ARGEXPECTED,
+ "Argument expected for <%s>", cmd);
+}
+
+static inline void
+teco_error_move_set(GError **error, const gchar *cmd)
+{
+ g_set_error(error, TECO_ERROR, TECO_ERROR_MOVE,
+ "Attempt to move pointer off page with <%s>", cmd);
+}
+
+static inline void
+teco_error_words_set(GError **error, const gchar *cmd)
+{
+ g_set_error(error, TECO_ERROR, TECO_ERROR_MOVE,
+ "Not enough words to delete with <%s>", cmd);
+}
+
+static inline void
+teco_error_range_set(GError **error, const gchar *cmd)
+{
+ g_set_error(error, TECO_ERROR, TECO_ERROR_RANGE,
+ "Invalid range specified for <%s>", cmd);
+}
+
+static inline void
+teco_error_invalidqreg_set(GError **error, const gchar *name, gsize len, gboolean local)
+{
+ g_autofree gchar *name_printable = teco_string_echo(name, len);
+ g_set_error(error, TECO_ERROR, TECO_ERROR_INVALIDQREG,
+ "Invalid %sQ-Register \"%s\"", local ? "local " : "", name_printable);
+}
+
+static inline void
+teco_error_qregopunsupported_set(GError **error, const gchar *name, gsize len, gboolean local)
+{
+ g_autofree gchar *name_printable = teco_string_echo(name, len);
+ g_set_error(error, TECO_ERROR, TECO_ERROR_QREGOPUNSUPPORTED,
+ "Operation unsupported on %sQ-Register \"%s\"", local ? "local " : "", name_printable);
+}
+
+static inline void
+teco_error_qregcontainsnull_set(GError **error, const gchar *name, gsize len, gboolean local)
+{
+ g_autofree gchar *name_printable = teco_string_echo(name, len);
+ g_set_error(error, TECO_ERROR, TECO_ERROR_QREGCONTAINSNULL,
+ "%sQ-Register \"%s\" contains null-byte", local ? "Local " : "", name_printable);
+}
+
+static inline void
+teco_error_interrupted_set(GError **error)
+{
+ g_set_error_literal(error, TECO_ERROR, TECO_ERROR_INTERRUPTED, "Interrupted");
+}
+
+extern guint teco_error_return_args;
+
+static inline void
+teco_error_return_set(GError **error, guint args)
+{
+ teco_error_return_args = args;
+ g_set_error_literal(error, TECO_ERROR, TECO_ERROR_RETURN, "");
+}
+
+extern guint teco_error_pos, teco_error_line, teco_error_column;
+
+void teco_error_set_coord(const gchar *str, guint pos);
+
+void teco_error_display_short(const GError *error);
+void teco_error_display_full(const GError *error);
+
+void teco_error_add_frame_qreg(const gchar *name, gsize len);
+void teco_error_add_frame_file(const gchar *name);
+void teco_error_add_frame_edhook(const gchar *type);
+void teco_error_add_frame_toplevel(void);
+
+void teco_error_clear_frames(void);