Update PEGTL.

taocpp · Sep 23, 2023 · d243d30 · d243d30
1 parent 75032c5
commit d243d30
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/external/json b/external/json
diff --git a/include/tao/config/internal/json_base.hpp b/include/tao/config/internal/json_base.hpp
@@ -16,7 +16,7 @@ namespace tao::config::internal
       pegtl::position position;
 
       json_base()
-         : position( pegtl::internal::frobnicator{ nullptr, 1, 1, 1 }, "TODO: Delete the default c'tor!" )
+         : position( pegtl::internal::inputerator{ nullptr, 1, 1, 1 }, "TODO: Delete the default c'tor!" )
       {}
       //      json_base() = delete;
 

diff --git a/include/tao/config/internal/try_catch.hpp b/include/tao/config/internal/try_catch.hpp
@@ -7,6 +7,8 @@
 #include <iostream>
 #include <stdexcept>
 
+#include <tao/pegtl/contrib/nested_exceptions.hpp>
+
 #include "pegtl.hpp"
 #include "reverse.hpp"
 
@@ -18,12 +20,11 @@ namespace tao::config::internal
       try {
          f();
       }
-      catch( const pegtl::parse_error& e ) {
+      catch( const pegtl::parse_error& ) {
          std::cerr << "*** config parse error ***" << std::endl;
-         for( const auto& p : reverse( e.positions() ) ) {
-            std::cerr << "  at " << p << std::endl;
+         for( const auto& e : pegtl::nested::flatten() ) {
+            std::cerr << e.message() << ": " << e.position_string() << std::endl;
          }
-         std::cerr << e.message() << std::endl;
       }
       catch( const std::exception& e ) {
          std::cerr << "*** config error ***" << std::endl;

diff --git a/src/test/config/failure.cpp b/src/test/config/failure.cpp
@@ -7,6 +7,8 @@
 
 #include <tao/config.hpp>
 
+#include <tao/pegtl/contrib/nested_exceptions.hpp>
+
 const char* ansi_reset = "\033[0m";
 const char* ansi_message = "\033[1;31m";
 const char* ansi_source = "\033[36m";
@@ -29,12 +31,9 @@ namespace tao
          std::cerr << ccs << std::endl;
          std::cerr << ">>> Config parsed as config >>>" << std::endl;
       }
-      catch( const pegtl::parse_error& e ) {
-         const auto& pos = e.positions();
-         auto it = pos.begin();
-         std::cout << ansi_text << "pegtl::parse_error: " << ansi_source << *it << ": " << ansi_message << e.message() << ansi_reset << std::endl;
-         while( ++it != pos.end() ) {
-            std::cout << ansi_text << "  from: " << ansi_source << *it << ansi_reset << std::endl;
+      catch( const pegtl::parse_error& ) {
+         for( const auto& e : pegtl::nested::flatten() ) {
+            std::cout << ansi_text << "pegtl::parse_error: " << ansi_message << e.message() << ": " << ansi_source << e.position_string() << ansi_reset << std::endl;
          }
       }
       catch( const std::exception& e ) {
+0 −22		.cmake/test_filesystem.cpp.in
+1 −1		external/PEGTL
+0 −6		include/tao/json/binding/element.hpp
+0 −54		include/tao/json/binding/internal/elementw.hpp
+9 −6		include/tao/json/binding/internal/object.hpp
+4 −4		include/tao/json/external/itoa.hpp
+22 −1		src/test/json/binding_object.cpp