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> {};
 
ec355d9b19ad5ca210d90c15fd7'>commit</a><a href='/guix/diff/gnu/packages/cook.scm?id=de3c03a47160dec355d9b19ad5ca210d90c15fd7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/cook.scm'>
<input type='hidden' name='id' value='de3c03a47160dec355d9b19ad5ca210d90c15fd7'/><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=de3c03a47160dec355d9b19ad5ca210d90c15fd7'>root</a>/<a href='/guix/log/gnu?id=de3c03a47160dec355d9b19ad5ca210d90c15fd7'>gnu</a>/<a href='/guix/log/gnu/packages?id=de3c03a47160dec355d9b19ad5ca210d90c15fd7'>packages</a>/<a href='/guix/log/gnu/packages/cook.scm?id=de3c03a47160dec355d9b19ad5ca210d90c15fd7'>cook.scm</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/gnu/packages/cook.scm?id=de3c03a47160dec355d9b19ad5ca210d90c15fd7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-14 22:48:52 +0200'>2020-04-14</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=2e3d5fdf055906a7de356d8f161cebaa3a40e691'>gnu: cook: Fix test failure.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cook.scm (cook)[arguments]: Override LC_ALL for one test.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-16 16:48:31 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=1fddf8ef1702f96340d7bede8ecbd90b64c2019f'>gnu: cook: Fix.</a><span class='msg-avail'>...<span class='msg-tooltip'>This follows up on commit 5adc59e6fe8abb701df8fc97d56a6e60258318a4.

* gnu/packages/cook.scm (cook)[home-page]: Better.

Reported-by: Marius Bakke &lt;mbakke@fastmail.com&gt;
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-03-16 16:32:43 +0100'>2020-03-16</span></td><td><a href='/guix/commit/gnu/packages/cook.scm?id=5adc59e6fe8abb701df8fc97d56a6e60258318a4'>gnu: cook: Use archived home page.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cook.scm (cook)[home-page]: Use a Web Archived copy.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>