Use the definitions from (newer) upstream PEGTL.

diff --git a/include/gemmi/cif.hpp b/include/gemmi/cif.hpp
index c7ffdb44..35d24210 100644
--- a/include/gemmi/cif.hpp
+++ b/include/gemmi/cif.hpp
@@ -37,7 +37,6 @@ namespace pegtl = tao::pegtl;
 namespace rules {
 
   template<int TableVal> struct lookup_char {
-    using analyze_t = pegtl::analysis::generic<pegtl::analysis::rule_type::ANY>;
     template<typename Input> static bool match(Input& in) {
       if (!in.empty() && cif::char_table(in.peek_char()) == TableVal) {
         if (TableVal == 2)  // this set includes new-line
@@ -71,11 +70,11 @@ namespace rules {
   struct ws_or_eof : pegtl::sor<whitespace, pegtl::eof> {};
 
   // (b) Reserved words.
-  struct str_data : TAOCPP_PEGTL_ISTRING("data_") {};
-  struct str_loop : TAOCPP_PEGTL_ISTRING("loop_") {};
-  struct str_global : TAOCPP_PEGTL_ISTRING("global_") {};
-  struct str_save : TAOCPP_PEGTL_ISTRING("save_") {};
-  struct str_stop : TAOCPP_PEGTL_ISTRING("stop_") {};
+  struct str_data : TAO_PEGTL_ISTRING("data_") {};
+  struct str_loop : TAO_PEGTL_ISTRING("loop_") {};
+  struct str_global : TAO_PEGTL_ISTRING("global_") {};
+  struct str_save : TAO_PEGTL_ISTRING("save_") {};
+  struct str_stop : TAO_PEGTL_ISTRING("stop_") {};
   struct keyword : pegtl::sor<str_data, str_loop, str_global,
                               str_save, str_stop> {};
 
ref='/guix/commit/tests/guix-shell-export-manifest.sh?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c'>commit</a><a href='/guix/diff/tests/guix-shell-export-manifest.sh?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-shell-export-manifest.sh'>
<input type='hidden' name='id' value='0fbb356714f4ae3ea18e4997131a0e1746cc923c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c'>root</a>/<a href='/guix/log/tests?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c'>tests</a>/<a href='/guix/log/tests/guix-shell-export-manifest.sh?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c'>guix-shell-export-manifest.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-shell-export-manifest.sh?id=0fbb356714f4ae3ea18e4997131a0e1746cc923c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-16 23:57:40 +0200'>2022-06-16</span></td><td><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=925a57c5d04553ff6c514867348e7d3c5c22ca66'>shell: Fix '--export-manifest' for cached profiles and when '-p' is used.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-01 22:22:19 +0200'>2022-06-01</span></td><td><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=2acc83daa5a3dd1b4ed3f8c32ecadf1313e6fd18'>shell: '--export-manifest -D x -D y' generates a valid manifest.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-08 18:14:35 +0200'>2022-04-08</span></td><td><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=20691c70cf2c5a61af7f906b65d57a524ecfc4f3'>tests: 'guix shell --export-manifest' test no longer needs networking.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-04 22:58:04 +0200'>2022-04-04</span></td><td><a href='/guix/commit/tests/guix-shell-export-manifest.sh?id=c42b7baf13c7633b4512e94da7445299c57b247d'>shell: Add '--export-manifest'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>