From 6fbfd065a214780a96dafd8e32723e10b8094b6b Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 23 Jun 2025 23:08:12 -0500 Subject: [PATCH] xo-tokenizer: docs + error-handling improvement drop exceptions for return-value error object --- CMakeLists.txt | 4 +- cmake/xo-bootstrap-macros.cmake | 35 +++ conf.py | 8 + default.nix | 11 +- docs/glossary.rst | 13 +- docs/install.rst | 15 +- index.rst | 1 + xo-tokenizer/docs/CMakeLists.txt | 7 +- xo-tokenizer/docs/_static/README | 1 + xo-tokenizer/docs/_static/img/favicon.ico | Bin 0 -> 309803 bytes xo-tokenizer/docs/conf.py | 39 ++++ xo-tokenizer/docs/examples.rst | 17 +- xo-tokenizer/docs/implementation.rst | 36 ++++ xo-tokenizer/docs/index.rst | 9 +- xo-tokenizer/docs/install.rst | 17 +- xo-tokenizer/docs/span-class.rst | 84 ++++++++ xo-tokenizer/docs/token-class.rst | 94 ++++++++ xo-tokenizer/docs/tokenizer-class.rst | 27 +++ xo-tokenizer/docs/tokenizer-error-class.rst | 52 +++++ xo-tokenizer/docs/tokentype-enum.rst | 34 +++ xo-tokenizer/example/tokenrepl/tokenrepl.cpp | 30 ++- .../include/xo/tokenizer/error_token.hpp | 0 .../include/xo/tokenizer/scan_result.hpp | 12 +- xo-tokenizer/include/xo/tokenizer/span.hpp | 87 ++++++-- xo-tokenizer/include/xo/tokenizer/token.hpp | 76 ++++++- .../include/xo/tokenizer/tokenizer.hpp | 202 ++++++++++++------ .../include/xo/tokenizer/tokenizer_error.hpp | 106 +++++++-- .../include/xo/tokenizer/tokentype.hpp | 66 +++--- xo-tokenizer/utest/tokenizer.test.cpp | 163 ++++++++++++-- xo-unit/docs/scaled-unit-class.rst | 2 +- 30 files changed, 1086 insertions(+), 162 deletions(-) create mode 100644 cmake/xo-bootstrap-macros.cmake create mode 100644 xo-tokenizer/docs/_static/README create mode 100644 xo-tokenizer/docs/_static/img/favicon.ico create mode 100644 xo-tokenizer/docs/conf.py create mode 100644 xo-tokenizer/docs/implementation.rst create mode 100644 xo-tokenizer/docs/span-class.rst create mode 100644 xo-tokenizer/docs/token-class.rst create mode 100644 xo-tokenizer/docs/tokenizer-class.rst create mode 100644 xo-tokenizer/docs/tokenizer-error-class.rst create mode 100644 xo-tokenizer/docs/tokentype-enum.rst create mode 100644 xo-tokenizer/include/xo/tokenizer/error_token.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 90d5df2b..0e7d37ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,6 +115,6 @@ add_subdirectory(xo-pyjit) # ---------------------------------------------------------------- # documentation. must follow add_subdirectory() for satellite projects -xo_umbrella_doxygen_deps(xo_flatstring xo_ratio) +xo_umbrella_doxygen_deps(xo_flatstring xo_ratio xo_unit xo_tokenizer xo_jit) xo_umbrella_doxygen_config() -xo_umbrella_sphinx_config(index.rst docs/install.rst) +xo_umbrella_sphinx_config(index.rst docs/install.rst docs/glossary.rst) diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake new file mode 100644 index 00000000..aba31169 --- /dev/null +++ b/cmake/xo-bootstrap-macros.cmake @@ -0,0 +1,35 @@ +# ---------------------------------------------------------------- +# for example: +# $ PREFIX=/usr/local # for example +# $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build +# +# will get +# CMAKE_MODULE_PATH +# from xo-cmake-config --cmake-module-path +# +# and expect .cmake macros in +# CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake +# ---------------------------------------------------------------- + +find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED) + +if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND") + message(FATAL "could not find xo-cmake-config executable") +endif() + +message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") + +if (NOT XO_SUBMODULE_BUILD) + if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) + # default to typical install location for xo-project-macros + execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH) + message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") + endif() +endif() + +# needs to have been installed somewhere on CMAKE_MODULE_PATH, +# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX) +# +include(xo_macros/xo_cxx) + +xo_cxx_bootstrap_message() diff --git a/conf.py b/conf.py index cf43946b..1cb86062 100644 --- a/conf.py +++ b/conf.py @@ -44,3 +44,11 @@ pygments_style = 'sphinx' html_theme = 'sphinx_rtd_theme' html_static_path = ['_static'] html_favicon = '_static/img/favicon.ico' + +# disable caching (at least helpful in development) + +html_meta = { + 'http-equiv=Cache-Control': 'no-cache, no-store, must-revalidate', + 'http-equiv=Pragma': 'no-cache', + 'http-equiv=Expires': '0' +} diff --git a/default.nix b/default.nix index 15461d85..29ab7c9b 100644 --- a/default.nix +++ b/default.nix @@ -109,7 +109,7 @@ let # xo-expression = self.callPackage pkgs/xo-expression.nix {}; xo-pyexpression = self.callPackage pkgs/xo-pyexpression.nix {}; - xo-tokenizer = self.callPackage pkgs/xo-tokenizer.nix {}; + xo-tokenizer = self.callPackage pkgs/xo-tokenizer.nix { buildDocs = true; }; xo-reader = self.callPackage pkgs/xo-reader.nix {}; xo-jit = self.callPackage pkgs/xo-jit.nix { #stdenv = jitStdenv; @@ -152,11 +152,18 @@ pkgs.mkShell { pkgs.python3Packages.python pkgs.python3Packages.pybind11 pkgs.python3Packages.sphinx-rtd-theme + #pkgs.python3Packages.sphinx-autobuild # needs patch for typeguard; defer for now pkgs.python3Packages.breathe pkgs.python3Packages.sphinxcontrib-ditaa pkgs.python3Packages.sphinxcontrib-plantuml pkgs.python3Packages.pillow + pkgs.gdb + + pkgs.emacs + pkgs.ditaa + pkgs.ripgrep + pkgs.git pkgs.cloc pkgs.sphinx @@ -169,6 +176,8 @@ pkgs.mkShell { pkgs.eigen pkgs.cmake pkgs.catch2 + pkgs.zlib + pkgs.unzip ]; shellHook = '' diff --git a/docs/glossary.rst b/docs/glossary.rst index 03bb0751..b6b43838 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -1 +1,12 @@ -scm = schematika +.. _glossary: + +Glossary +-------- + +.. glossary:: + schematika + scm + | Experimental programming language. + | Designed for convenient integration with C++ and python. + +.. toctree:: diff --git a/docs/install.rst b/docs/install.rst index 33995524..611e34d9 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -92,8 +92,11 @@ Aternatively can enter nix environment, then follow instructions for cmake build # etc +Development +=========== + LSP Setup -========= +--------- To setup xo-umbrella2 build to work with a language server: @@ -105,3 +108,13 @@ To setup xo-umbrella2 build to work with a language server: In this case subsystem LSP setup should be omitted, git root is ``path/to/xo-umbrella2``, not ``path/to/xo-umbrella2/xo-ratio`` etc. + +Sphinx Autobuild Setup +---------------------- + +To serve cache-busting headers + +.. code-block:: + + $ cd xo-umbrella2 + $ sphinx-autobuild . .build/sphinx/html --port 3000 diff --git a/index.rst b/index.rst index 32ccaaf8..441d1ef4 100644 --- a/index.rst +++ b/index.rst @@ -17,5 +17,6 @@ Some features: kalman filters, stochastic processes, complex event processing, s xo-unit/docs/index xo-tokenizer/docs/index xo-jit/docs/index + glossary genindex search diff --git a/xo-tokenizer/docs/CMakeLists.txt b/xo-tokenizer/docs/CMakeLists.txt index 2943563d..c930092b 100644 --- a/xo-tokenizer/docs/CMakeLists.txt +++ b/xo-tokenizer/docs/CMakeLists.txt @@ -1,5 +1,8 @@ -# xo-tokenizer/CMakeLists.txt +# xo-tokenizer/docs/CMakeLists.txt xo_doxygen_collect_deps() xo_docdir_doxygen_config() -xo_docdir_sphinx_config(index.rst install.rst) +xo_docdir_sphinx_config( + index.rst install.rst examples.rst implementation.rst + token-class.rst tokenizer-error-class.rst span-class.rst tokentype-enum.rst +) diff --git a/xo-tokenizer/docs/_static/README b/xo-tokenizer/docs/_static/README new file mode 100644 index 00000000..8230095c --- /dev/null +++ b/xo-tokenizer/docs/_static/README @@ -0,0 +1 @@ +add any static {.html, .js, ..} files for sphinx to pickup here \ No newline at end of file diff --git a/xo-tokenizer/docs/_static/img/favicon.ico b/xo-tokenizer/docs/_static/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..15da2145f93eb26e6995c7868ab7883fb2361288 GIT binary patch literal 309803 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 uml diagrams + ] + +# note: breathe requires doxygen xml output -> must have GENERATE_XML = YES in Doxyfile.in +# match project name in Doxyfile.in +breathe_default_project = "xodoxxml" + +templates_path = ['_templates'] +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] + +pygments_style = 'sphinx' + +# -- Options for HTML output ------------------------------------------------- +# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output + +#html_theme = 'alabaster' +html_theme = 'sphinx_rtd_theme' +html_static_path = ['_static'] +html_favicon = '_static/img/favicon.ico' diff --git a/xo-tokenizer/docs/examples.rst b/xo-tokenizer/docs/examples.rst index 7a6df0ce..72e890e6 100644 --- a/xo-tokenizer/docs/examples.rst +++ b/xo-tokenizer/docs/examples.rst @@ -1,6 +1,6 @@ .. _examples: -.. toctree +.. toctree:: :maxdepth: 2 Examples @@ -31,19 +31,28 @@ See ``xo-tokenizer/examples/tokenrepl`` for (slighly elaborated) version of code // input may contain multiple tokens while (!input.empty()) { - auto [tk, nread] = tkz.scan(input); + auto [tk, consumed, error] = tkz.scan(input); if (tk.is_valid()) { cout << tk; } - input = input.after_prefix(nread); + input = input.after_prefix(consumed.size()); } } - auto tk = tkz.notify_eof(); + auto [tk, consumed, error] = tkz.notify_eof(spxn_type::from_string(input_str)); if (tk.is_valid()) { cout << tk; } } + +.. code-block:: + :linenos: + + $ .build/xo-tokenizer/utest/utest.tokenizer + > 123 + + > 123e5 + diff --git a/xo-tokenizer/docs/implementation.rst b/xo-tokenizer/docs/implementation.rst new file mode 100644 index 00000000..62a01100 --- /dev/null +++ b/xo-tokenizer/docs/implementation.rst @@ -0,0 +1,36 @@ +.. _implementation: + +.. toctree:: + :maxdepth: 2 + +Components +========== + +Library dependency tower for *xo-tokenizer*: + +.. ditaa:: + + +-----------------+ + | xo_unit | + +-----------------+ + | xo_indentlog | + +-----------------+ + | xo_cmake | + +-----------------+ + +Install instructions :doc:`here` + +Abstraction tower for *xo-tokenizer* components: + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + | tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + | token | tokenizer_error | | + +-----------------+-----------------------+ | + | tokentype | span | | + +-----------------+-----------------------+----------+ diff --git a/xo-tokenizer/docs/index.rst b/xo-tokenizer/docs/index.rst index 91075db3..bcbf1f6a 100644 --- a/xo-tokenizer/docs/index.rst +++ b/xo-tokenizer/docs/index.rst @@ -1,6 +1,6 @@ .. xo-tokenizer documentation master file. -xo-tokenizer documentation +Xo-tokenizer documentation ========================== xo-tokenizer provides a tokenizer for the Schematika language. @@ -15,5 +15,8 @@ may appear in variable names: ``one-of-those-days`` is an ordinary symbol. install examples - genindex - search + implementation + token-class + tokenizer-error-class + span-class + tokentype-enum diff --git a/xo-tokenizer/docs/install.rst b/xo-tokenizer/docs/install.rst index 55eacbb3..94f17794 100644 --- a/xo-tokenizer/docs/install.rst +++ b/xo-tokenizer/docs/install.rst @@ -1,8 +1,23 @@ .. _install: -.. toctree +.. toctree:: :maxdepth: 2 +Source +====== + +Souce code lives on github `here`_ + +.. _here: https://github.com/rconybea/xo-tokenizer + +To clone from git: + +.. code-block:: bash + + git clone https://github.com/rconybea/xo-tokenizer + +Tested with gcc 13.3 + Install ======= diff --git a/xo-tokenizer/docs/span-class.rst b/xo-tokenizer/docs/span-class.rst new file mode 100644 index 00000000..a935d309 --- /dev/null +++ b/xo-tokenizer/docs/span-class.rst @@ -0,0 +1,84 @@ + +.. _span-class: + +Span +==== + +Identify an unowned contiguous memory range + +Context +------- + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + | tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + | token | tokenizer_error | | + +-----------------+-----------------------+ | + | tokentype |cBLU span | | + +-----------------+-----------------------+----------+ + +.. code-block:: cpp + + #include + +.. uml:: + :scale: 99% + :align: center + + allowmixing + + object span1<> + span1 : lo = p + span2 : hi = p+25 + + object dest<> + dest : def fact(n : i64) { ... } + + +- Identify a sequence of characters stored in contiguous memory. + +- Lightweight, consists of a pair of pointers. + +- Does not own storage. Lifetime management for target memory is + up to the caller. + + +Class +----- + +.. doxygenclass:: xo::scm::span + +Member Variables +---------------- + +.. doxygengroup:: span-instance-vars + +Type Traits +----------- + +.. doxygengroup:: span-type-traits + +Constructors +------------ + +.. doxygengroup:: span-ctors + +Access Methods +-------------- + +.. doxygengroup:: span-access-methods + +General Methods +--------------- + +.. doxygengroup:: span-general-methods + +Operators +--------- + +.. doxygengroup:: span-operators diff --git a/xo-tokenizer/docs/token-class.rst b/xo-tokenizer/docs/token-class.rst new file mode 100644 index 00000000..e0f58299 --- /dev/null +++ b/xo-tokenizer/docs/token-class.rst @@ -0,0 +1,94 @@ + +.. _token-class: + +Token +===== + +Represent a single lexical token in the Schematika language + +Context +------- + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + | tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + |cBLU token | tokenizer_error | | + +-----------------+-----------------------+ | + | tokentype | span | | + +-----------------+-----------------------+----------+ + +.. code-block:: cpp + + #include + +.. uml:: + :scale: 99% + :align: center + + allowmixing + + object tk1<> + tk1 : tk_type = tk_i64 + tk1 : text = "123" + + object tk2<> + tk2 : tk_type = tk_string + tk2 : text = "the quick brown fox" + +- Represent a single lexical token + +- Does not share any storage with original input stream + (maintains a local copy). + +- Remembers copied input extent. + Convert on demand to native untagged representation + +Example +------- + +.. code-block:: cpp + + void foo() { + using namespace xo::scm; + + token tk = token::i64_token("123"); + + tk.is_valid(); // -> true + tk.text(); // -> "123"s; + + tk.tk_type(); // -> tokentype::tk_i64 + tk.i64_value(); // -> 123 + + cout << tk << endl; // -> + } + +Class +----- + +.. doxygenclass:: xo::scm::token + + +Instance Variables +------------------ + +.. doxygengroup:: token-instance-vars + +Constructors +------------ + +.. doxygengroup:: token-ctors + +Access Methods +-------------- + +.. doxygengroup:: token-access-methods + +General Methods +--------------- + +.. doxygengroup:: token-general-methods diff --git a/xo-tokenizer/docs/tokenizer-class.rst b/xo-tokenizer/docs/tokenizer-class.rst new file mode 100644 index 00000000..dac20549 --- /dev/null +++ b/xo-tokenizer/docs/tokenizer-class.rst @@ -0,0 +1,27 @@ + +.. _tokenizer-class: + +Tokenizer +========= + +Parse a Schematika character stream into lexical tokens + +Context +------- + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + |cBLU tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + | token | tokenizer_error | | + +-----------------+-----------------------+ | + | tokentype | span | | + +-----------------+-----------------------+----------+ + +.. code-block:: cpp + + #include diff --git a/xo-tokenizer/docs/tokenizer-error-class.rst b/xo-tokenizer/docs/tokenizer-error-class.rst new file mode 100644 index 00000000..0ff72520 --- /dev/null +++ b/xo-tokenizer/docs/tokenizer-error-class.rst @@ -0,0 +1,52 @@ + +.. _tokenizer-error-class + +Tokenizer Error +=============== + +Represent a possible tokenizer error result, including parsing context + +Context +------- + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + | tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + | token |cBLU tokenizer_error | | + +-----------------+-----------------------+ | + | tokentype | span | | + +-----------------+-----------------------+----------+ + +.. code-block:: cpp + + #include + +Class +------ + +.. doxygenclass:: xo::scm::tokenizer_error + +Instance Variables +------------------ + +.. doxygengroup:: tokenizer-error-instance-vars + +Constructors +------------ + +.. doxygengroup:: tokenizer-error-ctors + +Access Methods +-------------- + +.. doxygengroup:: tokenizer-error-access-methods + +General Methods +--------------- + +.. doxygengroup:: tokenizer-error-general-methods diff --git a/xo-tokenizer/docs/tokentype-enum.rst b/xo-tokenizer/docs/tokentype-enum.rst new file mode 100644 index 00000000..7342c700 --- /dev/null +++ b/xo-tokenizer/docs/tokentype-enum.rst @@ -0,0 +1,34 @@ + +.. _tokentype-enum: + +Tokentype +========= + +Distinguish different lexical tokens for the Schematika language. + +Context +------- + +.. ditaa:: + :--scale: 0.85 + + +-----------------------------------------+----------+ + | tokenizer | | + +-----------------------------------------+ | + | scan_result | | + +-----------------+-----------------------+ buffer | + | token | tokenizer_error | | + +-----------------+-----------------------+ | + |cBLU tokentype | span | | + +-----------------+-----------------------+----------+ + +.. code-block:: cpp + + #include + +Enum +---- + +.. doxygenfunction:: xo::scm::tokentype_descr + +.. doxygenfunction:: xo::scm::operator<<(std::ostream&,tokentype) diff --git a/xo-tokenizer/example/tokenrepl/tokenrepl.cpp b/xo-tokenizer/example/tokenrepl/tokenrepl.cpp index ce69b98f..77606a0b 100644 --- a/xo-tokenizer/example/tokenrepl/tokenrepl.cpp +++ b/xo-tokenizer/example/tokenrepl/tokenrepl.cpp @@ -41,21 +41,35 @@ main() { if (tk.is_valid()) { cout << tk << endl; } else if (error.is_error()) { - cout << "parsing error: " << error << endl; - /* discard remainder of input line */ + cout << "parsing error: " << endl; + error.report(cout); + break; } - input = input.after_prefix(consumed.size()); + input = tkz.consume(consumed, input); + //input = input.after_prefix(consumed.size()); } + + /* discard stashed remainder of input line + * (for nicely-formatted errors) + */ + tkz.discard_current_line(); } - auto [tk, consumed, error] = tkz.notify_eof(span_type::from_string(input_str)); + { + span_type input = span_type::from_string(input_str); - if (tk.is_valid()) { - cout << tk << endl; - } else if (error.is_error()) { - cout << "parsing error: " << error << endl; + auto [tk, consumed, error] = tkz.notify_eof(input); + + input = tkz.consume(consumed, input); + + if (tk.is_valid()) { + cout << tk << endl; + } else if (error.is_error()) { + cout << "parsing error: " << endl; + error.report(cout); + } } } diff --git a/xo-tokenizer/include/xo/tokenizer/error_token.hpp b/xo-tokenizer/include/xo/tokenizer/error_token.hpp new file mode 100644 index 00000000..e69de29b diff --git a/xo-tokenizer/include/xo/tokenizer/scan_result.hpp b/xo-tokenizer/include/xo/tokenizer/scan_result.hpp index 9d15b90f..fbc29105 100644 --- a/xo-tokenizer/include/xo/tokenizer/scan_result.hpp +++ b/xo-tokenizer/include/xo/tokenizer/scan_result.hpp @@ -10,8 +10,10 @@ namespace xo { namespace scm { - /** @brief Represent result of parsing one input token. + /** @class scan_result + * @brief Represent result of parsing one input token. * + * @code * Possible outcomes fall into several categories * (with T: @c token_.is_valid(), E: @cerror_.is_error()) * @@ -21,6 +23,7 @@ namespace xo { * | true | false | parsed token in T | * | false | true | parse error in E | * + * @endcode **/ template class scan_result { @@ -37,6 +40,7 @@ namespace xo { static scan_result make_whitespace(const span_type & prefix_input); static scan_result make_partial(const span_type & prefix_input); + static scan_result make_error(const error_type & error); bool is_eof_or_ambiguous() const { return token_.is_invalid() && error_.is_not_an_error(); } bool is_token() const { return token_.is_valid(); } @@ -67,6 +71,12 @@ namespace xo { return scan_result(token_type::invalid(), prefix_input /*consumed*/); } + template + auto scan_result::make_error(const error_type & error) -> scan_result + { + return scan_result(token_type::invalid(), span_type::make_null(), error); + } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-tokenizer/include/xo/tokenizer/span.hpp b/xo-tokenizer/include/xo/tokenizer/span.hpp index 6c9c5262..5381a440 100644 --- a/xo-tokenizer/include/xo/tokenizer/span.hpp +++ b/xo-tokenizer/include/xo/tokenizer/span.hpp @@ -11,21 +11,32 @@ namespace xo { namespace scm { /** @class span compression/span.hpp * - * @brief Represents a contiguous memory range, without ownership. + * @brief A contiguous range of characters, without ownership. * * @tparam CharT type for elements referred to by this span. **/ template class span { public: - /** @brief typealias for span size (in units of CharT) **/ + /** @defgroup span-type-traits span type traits **/ + ///@{ + + /** typealias for span size (in units of CharT) **/ using size_type = std::uint64_t; + ///@} + public: - /** @brief create span for the contiguous memory range [@p lo, @p hi) **/ + /** @defgroup span-ctors span constructors **/ + ///@{ + + /** Create span for the contiguous memory range [@p lo, @p hi) **/ span(CharT * lo, CharT * hi) : lo_{lo}, hi_{hi} {} - /** @brief create a null span (i.e. with null @p lo, @p hi pointers) **/ + /** Create a null span (i.e. with null @p lo, @p hi pointers) + * A null span can be concatenated with any other span + * without triggering matching-endpoint asserts. + **/ static span make_null() { return span(nullptr, nullptr); } /** @brief create span for C-style string @p cstr **/ @@ -65,16 +76,20 @@ namespace xo { return span(lo, hi); } - ///@{ + ///@} - /** @name getters **/ + /** @defgroup span-access-methods **/ + ///@{ CharT * lo() const { return lo_; } /* get member span::lo_ */ CharT * hi() const { return hi_; } /* get member span::hi_ */ ///@} - /** @brief create new span over supplied type, + /** @defgroup span-general-methods **/ + ///@{ + + /** Create new span over supplied type, * with identical (possibly misaligned) endpoints. * * @warning @@ -121,7 +136,9 @@ namespace xo { return after_prefix(prefix.size()); } - /** @brief create span starting with position p **/ + /** Create span starting with position @p p. + * Does boundary checking; will return empty span if @p p is outside @c [lo_,hi) + **/ span suffix_from(CharT * p) const { if ((lo_ <= p) && (p <= hi_)) return span(p, hi_); @@ -129,13 +146,16 @@ namespace xo { return span(hi_, hi_); } - /** @brief true iff this span is null. distinct from empty. **/ + /** true iff this span is null. distinct from empty. **/ bool is_null() const { return lo_ == nullptr && hi_ == nullptr; } - /** @brief true iff this span is empty (comprises 0 elements). **/ + /** true iff this span is empty (comprises 0 elements). **/ bool empty() const { return lo_ == hi_; } - /** @brief report the number of elements (of type CharT) in this span. **/ + /** report the number of elements (of type CharT) in this span. **/ size_type size() const { return hi_ - lo_; } + /** increase extent of this spans to include @p x. + * Requires @c hi() == @c x.lo() + **/ span & operator+=(const span & x) { if (hi_ == x.lo_) { hi_ = x.hi_; @@ -154,15 +174,18 @@ namespace xo { << " :text " << xo::print::quot(std::string_view(lo_, hi_)) << ">"; } + ///@} private: + /** @defgroup span-instance-vars **/ ///@{ - /** @brief start of span + /** start of span. Span comprises memory address between @p lo (inclusive) and @p hi (exclusive) **/ CharT * lo_ = nullptr; - /** @brief end of span + + /** @brief end of span. Span comprises memory address between @p lo (inclusive) and @p hi (exclusive) **/ CharT * hi_ = nullptr; @@ -170,6 +193,12 @@ namespace xo { ///@} }; /*span*/ + /** @defgroup span-operators **/ + ///@{ + + /** compare spans for equality. + * Two spans are equal iff both endpoints match exactly. + **/ template inline bool operator==(const span & lhs, const span & rhs) { @@ -177,6 +206,9 @@ namespace xo { && (lhs.hi() == rhs.hi())); } + /** compare spans for inequality. + * Two spans are unequal if either paired endpoint differs. + **/ template inline bool operator!=(const span & lhs, const span & rhs) { @@ -184,6 +216,7 @@ namespace xo { || (lhs.hi() != rhs.hi())); } + /** print a summary of @p x on stream @p os. Intended for diagnostics **/ template inline std::ostream & operator<<(std::ostream & os, @@ -191,5 +224,33 @@ namespace xo { x.print(os); return os; } + + ///@} } /*namespace scm*/ + + namespace print { + template + class printspan_impl { + public: + printspan_impl(xo::scm::span x) : span_{x} {} + + xo::scm::span span_; + }; + + template + printspan_impl printspan(const xo::scm::span& span) { + return printspan_impl(span); + } + + template + inline std::ostream & + operator<< (std::ostream & os, + const printspan_impl & x) + { + for (const CharT * p = x.span_.lo(); p < x.span_.hi(); ++p) + os << *p; + + return os; + } + } } /*namespace xo*/ diff --git a/xo-tokenizer/include/xo/tokenizer/token.hpp b/xo-tokenizer/include/xo/tokenizer/token.hpp index c9132183..68666da8 100644 --- a/xo-tokenizer/include/xo/tokenizer/token.hpp +++ b/xo-tokenizer/include/xo/tokenizer/token.hpp @@ -43,75 +43,137 @@ namespace xo { } } + /** @class token + * @brief Represent a Schematika lexical token + **/ template class token { public: + /** @defgroup token-ctors token constructors **/ + ///@{ + + /** default ctor creates token with type @c tk_invalid **/ token() = default; + /** create token with type @c tk_type and input text @c text **/ token(tokentype tk_type, const std::string & text = "") : tk_type_{tk_type}, text_{text} {} + /** create invalid token (same as null ctor, but explicit) **/ static token invalid() { return token(); } + /** Create token representing 64-bit signed integer literal parsed from decimal @p txt. + * The string @p txt must be a decimal integer literal, since @ref i64_value re-parses @p txt. + **/ static token i64_token(const std::string & txt) { return token(tokentype::tk_i64, txt); } + /** create token representing 64-bit floating-point literal parsed from decimal @p txt + * The string @p txt must be a decimal floating-point literal, since @ref f64_value re-parses @p txt. + **/ static token f64_token(const std::string & txt) { return token(tokentype::tk_f64, txt); } + /** create token representing literal string parsed from @p txt **/ static token string_token(const std::string & txt) { return token(tokentype::tk_string, txt); } + /** create token representing a symbol parsed from @p txt. + * Note that not all strings are valid symbol names. + **/ static token symbol_token(const std::string & txt) { return token(tokentype::tk_symbol, txt); } + /** token representing left angle bracket @c "<" **/ static token leftangle() { return token(tokentype::tk_leftangle); } + /** token representing right angle bracket @c ">" **/ static token rightangle() { return token(tokentype::tk_rightangle); } + /** token representing left parenthesis @c "(" **/ static token leftparen() { return token(tokentype::tk_leftparen); } + /** token representing right parenthesis @c ")" **/ static token rightparen() { return token(tokentype::tk_rightparen); } + /** token representing left bracket @c "[" **/ static token leftbracket() { return token(tokentype::tk_leftbracket); } + /** token representing right bracket @c "]" **/ static token rightbracket() { return token(tokentype::tk_rightbracket); } + /** token representing left brace @c "{" **/ static token leftbrace() { return token(tokentype::tk_leftbrace); } + /** token representing right brace @c "}' **/ static token rightbrace() { return token(tokentype::tk_rightbrace); } + /** token representing period @c "." **/ static token dot() { return token(tokentype::tk_dot); } + /** token representing comma @c "," **/ static token comma() { return token(tokentype::tk_comma); } + /** token representing colon @c ":" **/ static token colon() { return token(tokentype::tk_colon); } + /** token representing double-colo @c "::" **/ static token doublecolon() { return token(tokentype::tk_doublecolon); } + /** token representing semicolon @c ";" **/ static token semicolon() { return token(tokentype::tk_semicolon); } + /** token representing single-assignment @c "=" **/ static token singleassign() { return token(tokentype::tk_singleassign); } + /** token representing unrestricted assignment @c ":=" **/ static token assign_token() { return token(tokentype::tk_assign); } + /** token representing indirection @c "->" **/ static token yields() { return token(tokentype::tk_yields); } + /** token for @c "+" **/ static token plus_token() { return token(tokentype::tk_plus); } + /** token for @c "-" **/ static token minus_token() { return token(tokentype::tk_minus); } + /** token for @c "*" **/ static token star_token() { return token(tokentype::tk_star); } + /** token for @c "/" **/ static token slash_token() { return token(tokentype::tk_slash); } + /** token representing keyword @c type **/ static token type() { return token(tokentype::tk_type); } + /** token representing keyword @c def **/ static token def() { return token(tokentype::tk_def); } + /** token representing keyword @c lambda **/ static token lambda() { return token(tokentype::tk_lambda); } + /** token representing keyword @c if **/ static token if_token() { return token(tokentype::tk_if); } + /** token representing keyword @c let **/ static token let() { return token(tokentype::tk_let); } + /** token representing keyword @c in **/ static token in() { return token(tokentype::tk_in); } + /** token representing keyword @c end **/ static token end() { return token(tokentype::tk_end); } + ///@} + + /** @defgroup token-access-methods **/ + ///@{ + tokentype tk_type() const { return tk_type_; } const std::string & text() const { return text_; } + ///@} + + /** @defgroup token-general-methods **/ + ///@{ + + /** true if token understood to represent valid input + * i.e. any token type except @c tk_invalid + **/ bool is_valid() const { return tk_type_ != tokentype::tk_invalid; } + /** true for sentinel token with type tk_invalid **/ bool is_invalid() const { return tk_type_ == tokentype::tk_invalid; } - /** expect input matching - * [+|-][0-9][0-9]* - **/ + /** expect input matching @c "[+|-][0-9][0-9]*" **/ std::int64_t i64_value() const; - /** expect input matching - * [+|-][0-9]*[.][0-9]*[e|E][+|-][0-9]* - **/ + + /** expect input matching @c "[+|-][0-9]*[.][0-9]*[e|E][+|-][0-9]*" **/ double f64_value() const; /** print human-readable token representation on stream @p os **/ void print(std::ostream & os) const; + ///@} + private: + /** @defgroup token-instance-vars **/ + ///@{ + /** category for this token **/ tokentype tk_type_ = tokentype::tk_invalid; @@ -124,6 +186,8 @@ namespace xo { * tk_symbol **/ std::string text_; + + ///@} }; /*token*/ template diff --git a/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp b/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp index e36a54af..f0ebb4be 100644 --- a/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp +++ b/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp @@ -13,9 +13,15 @@ namespace xo { namespace scm { - /** + /** @class tokenizer + * @brief Parse a Schematika character stream into lexical tokens + * * Use: + * * @code + * // see xo-tokenizer/example/tokenrepl/tokenrepl.cpp + * // for exact working code + * * using tokenizer_type = tokenizer; * using span_type = tokenizer_type::span_type; * @@ -24,21 +30,19 @@ namespace xo { * * while (!input.empty()) { * auto res = tkz.scan(input); - * const auto & tk = res.first; + * auto [tk, consumed, error] = res.first; * * // do something with tk if tk.is_valid() * - * input = input.after_prefix(res.second); + * input = tkz.consume(res.second, input); * } * * if endofinput { - * auto tk = tzk.notify_eof() + * auto [tk, consumed, error] = tzk.notify_eof() * - * // do something with tk if tk.is_valid() + * // do something with (final) tk if tk.is_valid() * } * - * // expect !tkz.has_prefix() - * * @endcode * * See tokentype.hpp for token types @@ -47,6 +51,7 @@ namespace xo { class tokenizer { public: using token_type = token; + using error_type = tokenizer_error; using span_type = span; using result_type = scan_result; @@ -122,11 +127,22 @@ namespace xo { **/ result_type scan2(const span_type & input, bool eof); + /** @retval span with @p consumed permanently removed from @p input. + * + * Purpose of this method is to update @ref current_pos_. + **/ + span_type consume(const span_type & consumed, const span_type & input); + + /** discard current line after error. Just cleans up error-reporting state **/ + void discard_current_line(); + /** notify end of input, resolving any ambiguous input stashed in .prefix **/ result_type notify_eof(const span_type & input); private: + void capture_current_line(const span_type & input); + result_type scan_completion(const span_type & whitespace, const CharT* token_end, const span_type & input); @@ -134,8 +150,10 @@ namespace xo { private: /** true to log tokenizer activity to stdout **/ bool debug_flag_ = false; - /** remember start of current line here **/ + /** remember current input line. Used only to report errors **/ span_type current_line_ = span_type::make_null(); + /** current input position within @ref current_line_ **/ + size_t current_pos_ = 0; /** Accumulate partial token here. * This will happen if input sent to @ref tokenizer::scan * ends without a determinate token boundary. @@ -348,29 +366,35 @@ namespace xo { } else if (exponent_flag && !exponent_digit_flag) { exponent_sign_flag = true; } else { - throw std::runtime_error - (tostr("tokenizer::assemble_token", - ": improperly placed sign indicator", - xtag("pos", ix - tk_start), - xtag("char", *ix))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "improperly placed sign indicator", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } } else if (*ix == '.') { if (period_flag) { - throw (std::runtime_error - (tostr("tokenizer::assemble_token", - ": duplicate decimal point", - xtag("pos", ix - tk_start), - xtag("char", *ix)))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "duplicate decimal point in numeric literal", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } period_flag = true; } else if ((*ix == 'e') || (*ix == 'E')) { if (exponent_flag) { - throw (std::runtime_error - (tostr("tokenizer::assemble_token", - ": duplicate exponent marker", - xtag("pos", ix - tk_start), - xtag("char", *ix)))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "duplicate exponent marker in numeric literal", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } exponent_flag = true; @@ -382,12 +406,13 @@ namespace xo { number_flag = true; } } else { - /* invalid input */ - throw (std::runtime_error - (tostr("tokenizer::assemble_token", - ": unexpected character in numeric constant", - xtag("pos", ix - tk_start), - xtag("char", *ix)))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "unexpected character in numeric constant" /*error_description*/, + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } } @@ -443,11 +468,12 @@ namespace xo { ++ix; /*skip initial " char*/ + /* true on final " */ + bool endofstring = false; + for (; ix != token_text.hi(); ++ix) { log && log(xtag("*ix", *ix)); - bool endofstring = false; - switch(*ix) { case '"': endofstring = true; @@ -461,11 +487,13 @@ namespace xo { ++ix; if (ix == token_text.hi()) { - throw std::runtime_error - (tostr("tokenizer::assemble_token", - ": malformed string literal", - xtag("input", std::string_view(token_text.lo(), - token_text.hi())))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "expecting key following escape character \\", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } switch(*ix) { @@ -490,10 +518,13 @@ namespace xo { tk_text.push_back('"'); break; default: - throw std::runtime_error - (tostr("tokenizer::assemble_token", - ": unexpected \\-escaped char", - xtag("char", *ix))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "expecting one of n|r|\"|\\ following escape \\", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } break; default: @@ -505,12 +536,14 @@ namespace xo { break; } - if (ix != token_text.hi()) { - throw std::runtime_error - (tostr("tokenizer::assemble_token", - ": expected \" to end string literal", - xtag("input", std::string_view(token_text.lo(), - token_text.hi())))); + if (!endofstring) { + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "missing terminating '\"' to complete literal string", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } log && log(tostr("tokenizer::assemble_token", @@ -632,9 +665,13 @@ namespace xo { } if (tk_type == tokentype::tk_invalid) { - throw std::runtime_error(tostr("tokenizer::assemble_token", - ": unexpected input x", - xtag("x", *ix))); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "illegal input character", + current_line_, + current_pos_, + initial_whitespace, + (ix - tk_start))); } if ((tk_type == tokentype::tk_i64) @@ -719,6 +756,27 @@ namespace xo { } + template + void + tokenizer::capture_current_line(const span_type & input) + { + // see discard_current_line() + + scope log(XO_DEBUG(debug_flag_)); + + /* look ahead to {end of line, end of input}, whichever comes first */ + const CharT * sol = input.lo(); + const CharT * eol = sol; + + while ((eol < input.hi()) && (*eol != '\n')) + ++eol; + + this->current_line_ = span_type(sol, eol); + this->current_pos_ = 0; + + log && log(xtag("current_line", print::printspan(current_line_))); + } + template auto tokenizer::scan(const span_type & input) -> result_type @@ -729,21 +787,22 @@ namespace xo { const CharT * ix = input.lo(); + if (this->current_line_.is_null()) { + this->capture_current_line(input); + } + /* skip whitespace + remember beginning of most recent line */ while (is_whitespace(*ix) && (ix != input.hi())) { - if (is_newline(*ix)) { ++ix; - /* look ahead to {end of line, end of input}, whichever comes first */ - const CharT * sol = ix; - const CharT * eol = ix; - while ((eol < input.hi()) && (*eol != '\n')) - ++eol; - - this->current_line_ = span_type(sol, eol); + this->capture_current_line(span_type(ix, input.hi())); } else { ++ix; + +#ifdef OBSOLETE + ++(this->current_pos_); +#endif } } @@ -818,10 +877,12 @@ namespace xo { break; } } else if ((*ix == '\n') || (*ix == '\r')) { - throw std::runtime_error - (tostr("tokenizer::scan", - ": must use \\n or \\r to encode newline/cr in" - " string literal")); + return result_type::make_error + (error_type(__FUNCTION__ /*src_function*/, + "must use \\n or \\r to encode newline/cr in string literal", + current_line_, current_pos_, + whitespace.size(), + (ix - tk_start))); } prev_ch = *ix; @@ -945,6 +1006,25 @@ namespace xo { sr2.error()); } + template + auto + tokenizer::consume(const span_type & consumed, const span_type & input) -> span_type + { + this->current_pos_ += consumed.size(); + + return input.after_prefix(consumed); + } + + template + void + tokenizer::discard_current_line() + { + // see capture_current_line() + + this->current_line_ = span_type::make_null(); + this->current_pos_ = 0; + } + template auto tokenizer::notify_eof(const span_type & input) -> result_type { diff --git a/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp b/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp index 3f5b5944..c12fad72 100644 --- a/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp +++ b/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp @@ -7,47 +7,95 @@ #include "tokentype.hpp" #include "span.hpp" +#include namespace xo { namespace scm { - /** represent a lexing error, with context **/ + /** @class tokenizer_error + * @brief represent a lexing error, with context + * + * @tparam CharT representation for single characters + **/ template class tokenizer_error { public: using span_type = span; public: - /** @brief default ctor represent a not-an-error error object **/ + /** @defgroup tokenizer-error-ctors **/ + ///@{ + + /** Default ctor represent a not-an-error sentinel object **/ tokenizer_error() = default; - tokenizer_error(char const * src_function, - char const* error_description, - span_type input_line, size_t error_pos) + /** Constructor to capture parsing error context + * @p tk_start current position on entry to scanner + * @p whitespace number of chars initial whitespace + * @p error_pos error location relative to token start + **/ + tokenizer_error(const char * src_function, + const char * error_description, + span_type input_line, + size_t tk_start, + size_t whitespace, + size_t error_pos) : src_function_{src_function}, error_description_{error_description}, input_line_{input_line}, + tk_entry_{tk_start}, + whitespace_{whitespace}, error_pos_{error_pos} {} + ///@} - char const* src_function() const { return src_function_; } - char const* error_description() const { return error_description_; } - size_t error_pos() const { return error_pos_; } + /** @defgroup tokenizer-error-access-methods **/ + ///@{ + + const char * src_function() const { return src_function_; } + const char * error_description() const { return error_description_; } const span_type& input_line() const { return input_line_; } + size_t tk_start() const { return tk_entry_; } + size_t whitespace() const { return whitespace_; } + size_t error_pos() const { return error_pos_; } - bool is_not_an_error() const { return error_description_ == nullptr; } + ///@} + + /** @defgroup tokenizer-error-general-methods **/ + ///@{ + + /** true, except for a sentinel error object **/ bool is_error() const { return error_description_ != nullptr; } + /** true except for object in sentinel state **/ + bool is_not_an_error() const { return error_description_ == nullptr; } + /** Print representation to stream @p os. Intended for tokenizer diagnostics. + * For Schematika errors prefer @ref report + **/ void print(std::ostream & os) const; + /** Print human-oriented error report on @p os. **/ + void report(std::ostream & os) const; + + ///@} + private: + /** @defgroup tokenizer-error-instance-vars **/ + ///@{ + /** source location (in tokenizer) at which error identified **/ char const * src_function_ = nullptr; /** static error description **/ char const * error_description_ = nullptr; - /** position (relative to line_.lo) of error **/ - size_t error_pos_ = 0; - /** complete input line (to the extent available) - * containing error + /** complete current input line (to the extent captured) + * that contains error **/ span_type input_line_ = span_type::make_null(); + /** position (relative to line_.lo) of token start where error encountered **/ + size_t tk_entry_ = 0; + /** number of characters of initial whitespace skipped before token start **/ + size_t whitespace_ = 0; + /** position (relative to @ref tk_entry_) of error **/ + size_t error_pos_ = 0; + + ///@} }; /*error_token*/ template @@ -56,11 +104,41 @@ namespace xo { os << ""; } + template + void + tokenizer_error::report(std::ostream & os) const { + using namespace std; + + if (error_description_) { + const char * prefix = "input: "; + const size_t tk_indent = strlen(prefix) + tk_entry_ + whitespace_; + //const size_t msg_length = strlen(error_description_); + + const size_t error_pos = 1 + tk_entry_ + whitespace_ + error_pos_; + + os << "char: " << error_pos << endl; + os << prefix; + for (const char *p = input_line_.lo(), *e = input_line_.hi(); p < e; ++p) + os << *p; + os << endl; + os << std::setw(tk_indent) << " "; + + for (size_t i = 0; i < error_pos_; ++i) { + os << '_'; + } + os << '^' << endl; + + os << error_description_ << endl; + } + } + template inline std::ostream & operator<< (std::ostream & os, diff --git a/xo-tokenizer/include/xo/tokenizer/tokentype.hpp b/xo-tokenizer/include/xo/tokenizer/tokentype.hpp index 6a3ef8a6..35ff841c 100644 --- a/xo-tokenizer/include/xo/tokenizer/tokentype.hpp +++ b/xo-tokenizer/include/xo/tokenizer/tokentype.hpp @@ -11,10 +11,11 @@ namespace xo { namespace scm { /** @enum tokentype - * @brief enum to identify different schematica input token types + * Enum to identify different schematika input token types * * Schematica code examples: * + * @code * type point :: { xcoord : f64, ycoord : f64 }; * type matrix :: array; // 2-d array * @@ -41,6 +42,7 @@ namespace xo { * def matrixproduct(x : matrix, y : matrix) { * [i, j : x.row(i) * y.col(j)]; * }; + * @endcode **/ enum class tokentype { /** sentinel value **/ @@ -58,52 +60,52 @@ namespace xo { /** a symbol **/ tk_symbol, - /** left-hand parenthesis '(' **/ + /** left-hand parenthesis @c '(' **/ tk_leftparen, - /** right-hand parenthesis ')' **/ + /** right-hand parenthesis @c ')' **/ tk_rightparen, - /** left-hand bracket '[' **/ + /** left-hand bracket @c '[' **/ tk_leftbracket, - /** right-hand bracket ']' **/ + /** right-hand bracket @c ']' **/ tk_rightbracket, - /** left-hand brace '{' **/ + /** left-hand brace @c '{' **/ tk_leftbrace, - /** right-hand brace '}' **/ + /** right-hand brace @c '}' **/ tk_rightbrace, - /** left-hand angle bracket '<' **/ + /** left-hand angle bracket @c '<' **/ tk_leftangle, - /** right-hand angle bracket '>' **/ + /** right-hand angle bracket @c '>' **/ tk_rightangle, - /** dot '.' **/ + /** dot @c '.' **/ tk_dot, - /** comma ',' **/ + /** comma @c ',' **/ tk_comma, - /** colon ':' **/ + /** colon @c ':' **/ tk_colon, - /** double-colon '::' **/ + /** double-colon @c '::' **/ tk_doublecolon, - /** semi-colon ';' **/ + /** semi-colon @c ';' **/ tk_semicolon, - /** '=' **/ + /** single equals sign @c '=' **/ tk_singleassign, - /** ':=' **/ + /** assignment @c ':=' **/ tk_assign, - /** '->' **/ + /** indirection @c '->' **/ tk_yields, /** note: operators not treated as punctuation @@ -111,47 +113,53 @@ namespace xo { * as is 'maybe*2', 'maybe+1', 'path/to/foo' **/ - /** operator '+' **/ + /** operator @c '+' **/ tk_plus, - /** operator '-' **/ + /** operator @c '-' **/ tk_minus, - /** operator '*' **/ + /** operator @c '*' **/ tk_star, - /** operator '/' **/ + /** operator @c '/' **/ tk_slash, - /** keyword 'type' **/ + /** keyword @c 'type' **/ tk_type, - /** keyword 'def' **/ + /** keyword @c 'def' **/ tk_def, - /** keyword 'lambda' **/ + /** keyword @c 'lambda' **/ tk_lambda, - /** keyword 'if' **/ + /** keyword @c 'if' **/ tk_if, - /** keyword 'let' **/ + /** keyword @c 'let' **/ tk_let, - /** keyword 'in' **/ + /** keyword @c 'in' **/ tk_in, - /** keyword 'end' **/ + /** keyword @c 'end' **/ tk_end, - n_tokentype /* comes last, counts #of entries */ + /** counts number of entries **/ + n_tokentype }; /*tokentype*/ + /** String representation for enum value. + * For example @c tokentype_descr(tokentype::tk_if) -> @c "if" + **/ extern char const * tokentype_descr(tokentype tk_type); + /** Print enum value for @p tk_type on stream @p os **/ inline std::ostream & operator<< (std::ostream & os, tokentype tk_type) { os << tokentype_descr(tk_type); return os; } + } /*namespace scm*/ } /*namespace xo*/ diff --git a/xo-tokenizer/utest/tokenizer.test.cpp b/xo-tokenizer/utest/tokenizer.test.cpp index ed2cb515..ea4c886d 100644 --- a/xo-tokenizer/utest/tokenizer.test.cpp +++ b/xo-tokenizer/utest/tokenizer.test.cpp @@ -19,15 +19,17 @@ namespace xo { * On second pass, enable verbose logging **/ struct rehearser { + rehearser(std::uint32_t att = 0) : attention_{att} {} + /* expect at most one iterator to exist per TestRehearser instance **/ struct iterator { - iterator(rehearser* parent, std::uint32_t attention) : parent_{parent}, attention_{attention} {} + explicit iterator(rehearser* parent) : parent_{parent} {} iterator& operator++(); - std::uint32_t operator*() { return attention_; } + std::uint32_t operator*() { return parent_->attention_; } bool operator==(const iterator& ix2) const { - return (parent_ == ix2.parent_) && (attention_ == ix2.attention_); + return (parent_ == ix2.parent_); } rehearser* parent_ = nullptr; @@ -35,11 +37,12 @@ namespace xo { }; + bool is_first_pass() const { return attention_ == 0; } bool is_second_pass() const { return attention_ == 1; } bool enable_debug() const { return is_second_pass(); } - iterator begin() { return iterator(this, 0); } - iterator end() { return iterator(this, 2); } + iterator begin() { return iterator(this); } + iterator end() { return iterator(nullptr); } public: /** pass number: 0 or 1 **/ @@ -50,23 +53,27 @@ namespace xo { auto rehearser::iterator::operator++() -> iterator& { - ++attention_; + if (parent_) + ++(parent_->attention_); - if (parent_->ok_flag_ && attention_ == 1) { + if (parent_->ok_flag_ && (parent_->attention_ == 1)) { /* skip 2nd pass */ - ++attention_; + ++(parent_->attention_); } + if (parent_->attention_ == 2) + parent_ = nullptr; + return *this; } /* use this instead of REQUIRE(expr) in context of a test_rehearser */ -# define REHEARSE(rehearser, expr) \ - if (rehearser.is_second_pass()) { \ - REQUIRE((expr)); \ - } else { \ - REQUIRE(true); \ - rehearser.ok_flag_ &= (expr); \ +# define REHEARSE(rehearser, expr) \ + if (rehearser.is_first_pass()) { \ + bool _f = (expr); \ + rehearser.ok_flag_ = rehearser.ok_flag_ && _f; \ + } else { \ + REQUIRE(expr); \ } /* note: trivial REQUIRE() call in else branch bc we still want @@ -300,12 +307,14 @@ namespace xo { token::semicolon(), token::rightbrace() }}, +#ifdef TODO {"a.b", false, {token::symbol_token("a"), token::dot(), token::symbol_token("b") }}, +#endif {"a,b", false, {token::symbol_token("a"), @@ -431,6 +440,132 @@ namespace xo { } } /*TEST_CASE(tokenizer2)*/ + namespace { + using tkz_error_type = xo::scm::tokenizer_error; + using span_type = xo::scm::span; + + struct testcase_error { + std::string input_; + tkz_error_type expect_error_; + }; + + testcase_error + make_testcase(const char * input, const char * src_function, const char * error_descr, + size_t tk_start, size_t whitespace, size_t error_pos) + { + testcase_error retval; + retval.input_ = input; + retval.expect_error_ = tkz_error_type(src_function, error_descr, + span_type::from_string(retval.input_), + tk_start, whitespace, error_pos); + return retval; + } + + std::vector + s_testcase3_v = { + // 012345678 + // --------v + make_testcase("123.456ez", + "assemble_token", + "unexpected character in numeric constant", + 0, 0, 8), + // 01 + // -v + make_testcase("1-3", + "assemble_token", + "improperly placed sign indicator", + 0, 0, 1), + // 012 + // --v + make_testcase("1..2", + "assemble_token", + "duplicate decimal point in numeric literal", + 0, 0, 2), + // 0123456 + // ------v + make_testcase("1.23e4e", + "assemble_token", + "duplicate exponent marker in numeric literal", + 0, 0, 6), + // tokenizer sees string ["\"] + // 0 1 2 3 + // - - - v + make_testcase("\"\\\"", + "assemble_token", + "missing terminating '\"' to complete literal string", + //"expect \\ to escape one of n|t|r|\"|\\ in string literal", + 0, 0, 3), + // tokenizer sees literal with embedded newline + // 1 2 3 + // 01234567890123456789012345678901 2 + // -------------------------------- v + make_testcase("\"everything was going fine until\n\"", + "scan", + "must use \\n or \\r to encode newline/cr in string literal", + 0, 0, 32), + // tokenizer sees string ["\] + // 0 1 2 + // - - v + make_testcase("\"\\", + "assemble_token", + "expecting key following escape character \\", + 0, 0, 2), + // tokenizer sees string ["\q"] + // 0 12 + // - -v + make_testcase("\"\\q\"", + "assemble_token", + "expecting one of n|r|\"|\\ following escape \\", + 0, 0, 2), + // + make_testcase("#", + "assemble_token", + "illegal input character", + 0, 0, 0), + }; + + TEST_CASE("tokenizer3", "[tokenizer]") { + /* testing error handling */ + + using tokenizer = xo::scm::tokenizer; + + constexpr bool c_force_debug = true; + + for (std::size_t i_tc = 0, n_tc = s_testcase3_v.size(); i_tc < n_tc; ++i_tc) { + const testcase_error & testcase = s_testcase3_v[i_tc]; + + rehearser rh(0); + + for (auto _ : rh) { + scope log(XO_DEBUG2(c_force_debug || rh.enable_debug(), "tokenizer3")); + + log && log(xtag("pass", _), xtag("ok(-)", rh.ok_flag_)); + log && log(xtag("i_tc", i_tc), xtag("input", testcase.input_)); + + tokenizer tkz(c_force_debug || rh.enable_debug()); + + auto in_span = tokenizer::span_type::from_string(testcase.input_); + + auto sr = tkz.scan2(in_span, true /*eof*/); + + REHEARSE(rh, sr.is_error()); + + if (sr.error().src_function()) { + REHEARSE(rh, std::string(sr.error().src_function()) == std::string(testcase.expect_error_.src_function())); + } + if (sr.error().error_description()) { + REHEARSE(rh, std::string(sr.error().error_description()) == std::string(testcase.expect_error_.error_description())); + } + REHEARSE(rh, sr.error().whitespace() == testcase.expect_error_.whitespace()); + REHEARSE(rh, sr.error().tk_start() == testcase.expect_error_.tk_start()); + REHEARSE(rh, sr.error().error_pos() == testcase.expect_error_.error_pos()); + + log && log(xtag("ok(+)", rh.ok_flag_)); + } + } + } + } + } /*namespace ut*/ } /*namespace xo*/ diff --git a/xo-unit/docs/scaled-unit-class.rst b/xo-unit/docs/scaled-unit-class.rst index 42725e00..ec32844c 100644 --- a/xo-unit/docs/scaled-unit-class.rst +++ b/xo-unit/docs/scaled-unit-class.rst @@ -30,7 +30,7 @@ Context Introduction ------------ -.. code-block::cpp +.. code-block:: cpp #include