updating expected output for follow-ignore changes

Since we create more tokens for a particular grammar a number of the expected
output files change. Token names for literals and ignores are derived from the
token id, which are being used up by duplicates.

11 files changed, 11 insertions, 11 deletions

diff --git a/test/btscan1.exp b/test/btscan1.exp
index d8464386..e8fef50c 100644
--- a/test/btscan1.exp
+++ b/test/btscan1.exp
@@ -1 +1 @@
-<btscan><_repeat_item><item><r2::line><r2::_literal_0005>!</r2::_literal_0005><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0005>!</r2::_literal_0005><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file
+<btscan><_repeat_item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file
diff --git a/test/btscan2.exp b/test/btscan2.exp
index d8464386..e8fef50c 100644
--- a/test/btscan2.exp
+++ b/test/btscan2.exp
@@ -1 +1 @@
-<btscan><_repeat_item><item><r2::line><r2::_literal_0005>!</r2::_literal_0005><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0005>!</r2::_literal_0005><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file
+<btscan><_repeat_item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file
diff --git a/test/commitbt.exp b/test/commitbt.exp
index 24df31ca..49b762ac 100644
--- a/test/commitbt.exp
+++ b/test/commitbt.exp
@@ -1,2 +1,2 @@
-<stuff><_repeat_item><item>1</item></_repeat_item><_literal_0007>!</_literal_0007><EOL>
+<stuff><_repeat_item><item>1</item></_repeat_item><_literal_0008>!</_literal_0008><EOL>
 </EOL></stuff>
\ No newline at end of file
diff --git a/test/context2.exp b/test/context2.exp
index 49e03483..f0f31173 100644
--- a/test/context2.exp
+++ b/test/context2.exp
@@ -1,4 +1,4 @@
-<ruby_here::start><ruby_here::_repeat_item><ruby_here::item><ruby_here::statement><ruby_here::call><ruby_here::id>print</ruby_here::id><ruby_here::_literal_0007>(</ruby_here::_literal_0007><ruby_here::_opt_arglist><ruby_here::arglist><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0004>&lt;&lt;</ruby_here::_literal_0004><ruby_here::here_id>DATA1</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary><ruby_here::_repeat_arglist_more><ruby_here::arglist_more><ruby_here::_literal_0006>,</ruby_here::_literal_0006><ruby_here::primary><ruby_here::id>more</ruby_here::id></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0006>,</ruby_here::_literal_0006><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0004>&lt;&lt;</ruby_here::_literal_0004><ruby_here::here_id>DATA2</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0006>,</ruby_here::_literal_0006><ruby_here::primary><ruby_here::number>99</ruby_here::number></ruby_here::primary></ruby_here::arglist_more></ruby_here::_repeat_arglist_more></ruby_here::arglist></ruby_here::_opt_arglist><ruby_here::_literal_0008>)</ruby_here::_literal_0008></ruby_here::call></ruby_here::statement><ruby_here::_literal_0009>!</ruby_here::_literal_0009></ruby_here::item><ruby_here::item><ruby_here::foobar>
+<ruby_here::start><ruby_here::_repeat_item><ruby_here::item><ruby_here::statement><ruby_here::call><ruby_here::id>print</ruby_here::id><ruby_here::_literal_0008>(</ruby_here::_literal_0008><ruby_here::_opt_arglist><ruby_here::arglist><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0005>&lt;&lt;</ruby_here::_literal_0005><ruby_here::here_id>DATA1</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary><ruby_here::_repeat_arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::id>more</ruby_here::id></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0005>&lt;&lt;</ruby_here::_literal_0005><ruby_here::here_id>DATA2</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::number>99</ruby_here::number></ruby_here::primary></ruby_here::arglist_more></ruby_here::_repeat_arglist_more></ruby_here::arglist></ruby_here::_opt_arglist><ruby_here::_literal_0009>)</ruby_here::_literal_0009></ruby_here::call></ruby_here::statement><ruby_here::_literal_000a>!</ruby_here::_literal_000a></ruby_here::item><ruby_here::item><ruby_here::foobar>
 print( &lt;&lt;DATA1, more, &lt;&lt;DATA2, 99 )
 "&amp;^#(@ almost
 !arbitrary text!
diff --git a/test/nestedcomm.exp b/test/nestedcomm.exp
index bfb6bc98..96c4229e 100644
--- a/test/nestedcomm.exp
+++ b/test/nestedcomm.exp
@@ -1 +1 @@
-hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not<nested><_repeat_id><id>hello</id><id>there</id><id>and</id><id>this</id><id>is</id><id>not</id></_repeat_id></nested><nested><_repeat_id><id>hello</id><_ignore_0001> </_ignore_0001><id>there</id><_ignore_0001> </_ignore_0001><nested_comment><_literal_0004>(</_literal_0004><_repeat_nc_item><nc_item><nc_data> </nc_data></nc_item><nc_item><nested_comment><_literal_0004>(</_literal_0004><_repeat_nc_item><nc_item><nc_data>this is a nested comment /*sdf;asd_++_stuff</nc_data></nc_item></_repeat_nc_item><_literal_0005>)</_literal_0005></nested_comment></nc_item><nc_item><nc_data> </nc_data></nc_item></_repeat_nc_item><_literal_0005>)</_literal_0005></nested_comment><_ignore_0001> </_ignore_0001><id>and</id><_ignore_0001> </_ignore_0001><id>this</id><_ignore_0001> </_ignore_0001><id>is</id><_ignore_0001> </_ignore_0001><id>not</id></_repeat_id></nested>hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not
+hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not<nested><_repeat_id><id>hello</id><id>there</id><id>and</id><id>this</id><id>is</id><id>not</id></_repeat_id></nested><nested><_repeat_id><id>hello</id><_ignore_0001> </_ignore_0001><id>there</id><_ignore_0001> </_ignore_0001><nested_comment><_literal_0005>(</_literal_0005><_repeat_nc_item><nc_item><nc_data> </nc_data></nc_item><nc_item><nested_comment><_literal_0005>(</_literal_0005><_repeat_nc_item><nc_item><nc_data>this is a nested comment /*sdf;asd_++_stuff</nc_data></nc_item></_repeat_nc_item><_literal_0006>)</_literal_0006></nested_comment></nc_item><nc_item><nc_data> </nc_data></nc_item></_repeat_nc_item><_literal_0006>)</_literal_0006></nested_comment><_ignore_0001> </_ignore_0001><id>and</id><_ignore_0001> </_ignore_0001><id>this</id><_ignore_0001> </_ignore_0001><id>is</id><_ignore_0001> </_ignore_0001><id>not</id></_repeat_id></nested>hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not
diff --git a/test/ragelambig1.exp b/test/ragelambig1.exp
index 41aed01f..af337d33 100644
--- a/test/ragelambig1.exp
+++ b/test/ragelambig1.exp
@@ -1 +1 @@
-<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression><_literal_0004>-</_literal_0004><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression></start>
\ No newline at end of file
+<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression><_literal_0005>-</_literal_0005><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression></start>
\ No newline at end of file
diff --git a/test/ragelambig2.exp b/test/ragelambig2.exp
index c97b5172..556c9c80 100644
--- a/test/ragelambig2.exp
+++ b/test/ragelambig2.exp
@@ -1 +1 @@
-<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression><_literal_0004>-</_literal_0004><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression></start>
\ No newline at end of file
+<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression><_literal_0005>-</_literal_0005><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression></start>
\ No newline at end of file
diff --git a/test/ragelambig3.exp b/test/ragelambig3.exp
index 14571047..b32841a1 100644
--- a/test/ragelambig3.exp
+++ b/test/ragelambig3.exp
@@ -1 +1 @@
-<start><expression><expression><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression><_literal_0004>-</_literal_0004><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression></start>
\ No newline at end of file
+<start><expression><expression><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression><_literal_0005>-</_literal_0005><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression></start>
\ No newline at end of file
diff --git a/test/ragelambig4.exp b/test/ragelambig4.exp
index fb1fb0d3..1989f17b 100644
--- a/test/ragelambig4.exp
+++ b/test/ragelambig4.exp
@@ -1 +1 @@
-<start><expression><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term><_repeat_expression_op><expression_op><_literal_0004>-</_literal_0004><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term></expression_op></_repeat_expression_op></expression></start>
\ No newline at end of file
+<start><expression><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term><_repeat_expression_op><expression_op><_literal_0005>-</_literal_0005><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term></expression_op></_repeat_expression_op></expression></start>
\ No newline at end of file
diff --git a/test/rubyhere.exp b/test/rubyhere.exp
index b3f6a7aa..ea9adf01 100644
--- a/test/rubyhere.exp
+++ b/test/rubyhere.exp
@@ -1,4 +1,4 @@
-<start><_repeat_item><item><statement><call><id>print</id><_literal_0007>(</_literal_0007><_opt_arglist><arglist><primary><heredoc><_literal_0004>&lt;&lt;</_literal_0004><here_id>DATA1</here_id></heredoc></primary><_repeat_arglist_more><arglist_more><_literal_0006>,</_literal_0006><primary><id>more</id></primary></arglist_more><arglist_more><_literal_0006>,</_literal_0006><primary><heredoc><_literal_0004>&lt;&lt;</_literal_0004><here_id>DATA2</here_id></heredoc></primary></arglist_more><arglist_more><_literal_0006>,</_literal_0006><primary><number>99</number></primary></arglist_more></_repeat_arglist_more></arglist></_opt_arglist><_literal_0008>)</_literal_0008></call></statement><_literal_0009>!</_literal_0009></item><item><foobar>
+<start><_repeat_item><item><statement><call><id>print</id><_literal_0008>(</_literal_0008><_opt_arglist><arglist><primary><heredoc><_literal_0005>&lt;&lt;</_literal_0005><here_id>DATA1</here_id></heredoc></primary><_repeat_arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><id>more</id></primary></arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><heredoc><_literal_0005>&lt;&lt;</_literal_0005><here_id>DATA2</here_id></heredoc></primary></arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><number>99</number></primary></arglist_more></_repeat_arglist_more></arglist></_opt_arglist><_literal_0009>)</_literal_0009></call></statement><_literal_000a>!</_literal_000a></item><item><foobar>
 print( &lt;&lt;DATA1, more, &lt;&lt;DATA2, 99 )
 "&amp;^#(@ almost
 !arbitrary text!
diff --git a/test/tags3.exp b/test/tags3.exp
index 8fbff518..af380f30 100644
--- a/test/tags3.exp
+++ b/test/tags3.exp
@@ -1,4 +1,4 @@
-<start><_repeat_item><item><tag><open_tag><_literal_000d>&lt;</_literal_000d><tag_id>t1</tag_id><_repeat_attr></_repeat_attr><_literal_0007>&gt;</_literal_0007></open_tag><_repeat_item><item><tag><open_tag><_literal_000d>&lt;</_literal_000d><tag_id>t2</tag_id><_repeat_attr></_repeat_attr><_literal_0007>&gt;</_literal_0007></open_tag><_repeat_item></_repeat_item><opt_close_tag></opt_close_tag></tag></item><item><tag><open_tag><_literal_000d>&lt;</_literal_000d><tag_id>a</tag_id><_repeat_attr><attr><attr_name>href</attr_name><_opt_eql_attr_val><eql_attr_val><_literal_0005>=</_literal_0005><attr_val><dquote_val>"foo"</dquote_val></attr_val></eql_attr_val></_opt_eql_attr_val></attr></_repeat_attr><_literal_0007>&gt;</_literal_0007></open_tag><_repeat_item><item><doc_data>FOO</doc_data></item></_repeat_item><opt_close_tag><_literal_000e>&lt;/</_literal_000e><close_id>a</close_id><_literal_0007>&gt;</_literal_0007></opt_close_tag></tag></item><item><tag><open_tag><_literal_000d>&lt;</_literal_000d><tag_id>t3</tag_id><_repeat_attr></_repeat_attr><_literal_0007>&gt;</_literal_0007></open_tag><_repeat_item></_repeat_item><opt_close_tag><_literal_000e>&lt;/</_literal_000e><close_id>t3</close_id><_literal_0007>&gt;</_literal_0007></opt_close_tag></tag></item></_repeat_item><opt_close_tag><_literal_000e>&lt;/</_literal_000e><close_id>t1</close_id><_literal_0007>&gt;</_literal_0007></opt_close_tag></tag></item></_repeat_item><trailing>
+<start><_repeat_item><item><tag><open_tag><_literal_0011>&lt;</_literal_0011><tag_id>t1</tag_id><_repeat_attr></_repeat_attr><_literal_000a>&gt;</_literal_000a></open_tag><_repeat_item><item><tag><open_tag><_literal_0011>&lt;</_literal_0011><tag_id>t2</tag_id><_repeat_attr></_repeat_attr><_literal_000a>&gt;</_literal_000a></open_tag><_repeat_item></_repeat_item><opt_close_tag></opt_close_tag></tag></item><item><tag><open_tag><_literal_0011>&lt;</_literal_0011><tag_id>a</tag_id><_repeat_attr><attr><attr_name>href</attr_name><_opt_eql_attr_val><eql_attr_val><_literal_0007>=</_literal_0007><attr_val><dquote_val>"foo"</dquote_val></attr_val></eql_attr_val></_opt_eql_attr_val></attr></_repeat_attr><_literal_000a>&gt;</_literal_000a></open_tag><_repeat_item><item><doc_data>FOO</doc_data></item></_repeat_item><opt_close_tag><_literal_0012>&lt;/</_literal_0012><close_id>a</close_id><_literal_000a>&gt;</_literal_000a></opt_close_tag></tag></item><item><tag><open_tag><_literal_0011>&lt;</_literal_0011><tag_id>t3</tag_id><_repeat_attr></_repeat_attr><_literal_000a>&gt;</_literal_000a></open_tag><_repeat_item></_repeat_item><opt_close_tag><_literal_0012>&lt;/</_literal_0012><close_id>t3</close_id><_literal_000a>&gt;</_literal_000a></opt_close_tag></tag></item></_repeat_item><opt_close_tag><_literal_0012>&lt;/</_literal_0012><close_id>t1</close_id><_literal_000a>&gt;</_literal_000a></opt_close_tag></tag></item></_repeat_item><trailing>
 </trailing></start>link: FOO
 target: "foo"