[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8436] 80include.t cpp_lines test
|
From: |
gavinsmith0123 |
|
Subject: |
[8436] 80include.t cpp_lines test |
|
Date: |
Sat, 27 Oct 2018 18:40:07 -0400 (EDT) |
Revision: 8436
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8436
Author: gavin
Date: 2018-10-27 18:40:06 -0400 (Sat, 27 Oct 2018)
Log Message:
-----------
80include.t cpp_lines test
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/t/input_files/cpp_lines.texi
trunk/tp/t/results/include/cpp_lines.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-27 22:35:37 UTC (rev 8435)
+++ trunk/ChangeLog 2018-10-27 22:40:06 UTC (rev 8436)
@@ -1,5 +1,11 @@
2018-10-27 Gavin Smith <address@hidden>
+ * tp/t/80include.t (cpp_lines): Add test of macro where a
+ line that looks like a #line directive is not the very first
+ line, as these may be treated differently by Parser.pm.
+
+2018-10-27 Gavin Smith <address@hidden>
+
* tp/Texinfo/Parser.pm (_check_line_directive, _save_line_directive)
(_next_text): Split out sub from _next_text.
(_parse_texi) <BEGIN LINE>: Call _check_line_directive and
Modified: trunk/tp/t/input_files/cpp_lines.texi
===================================================================
--- trunk/tp/t/input_files/cpp_lines.texi 2018-10-27 22:35:37 UTC (rev
8435)
+++ trunk/tp/t/input_files/cpp_lines.texi 2018-10-27 22:40:06 UTC (rev
8436)
@@ -25,8 +25,19 @@
@macr{}
address@hidden macro call}.
address@hidden macro call}.
address@hidden macrtwo
+line before
+# line 666 "x"
address@hidden macro
+
address@hidden macrotwo def}
+
address@hidden
+
address@hidden macrotwo call}.
+
@include file_with_cpp_lines.texi
@email{after inc}.
Modified: trunk/tp/t/results/include/cpp_lines.pl
===================================================================
--- trunk/tp/t/results/include/cpp_lines.pl 2018-10-27 22:35:37 UTC (rev
8435)
+++ trunk/tp/t/results/include/cpp_lines.pl 2018-10-27 22:40:06 UTC (rev
8436)
@@ -329,6 +329,157 @@
},
{
'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'macrtwo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'line before
+',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '# line 666 "x"',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'last_raw_newline'
+ }
+ ],
+ 'extra' => {
+ 'arg_line' => ' macrtwo
+'
+ },
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '63',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after macrotwo def'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '68',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'line before
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '# line 666 "x"
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'after macrotwo call'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => 'g_f',
+ 'line_nr' => '72',
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
'text' => '.
'
}
@@ -412,7 +563,7 @@
'contents' => [],
'line_nr' => {
'file_name' => 'g_f',
- 'line_nr' => '64',
+ 'line_nr' => '75',
'macro' => ''
},
'parent' => {}
@@ -462,7 +613,7 @@
},
'line_nr' => {
'file_name' => 'g_f',
- 'line_nr' => '66',
+ 'line_nr' => '77',
'macro' => ''
},
'parent' => {}
@@ -501,7 +652,7 @@
'contents' => [],
'line_nr' => {
'file_name' => 'g_f',
- 'line_nr' => '70',
+ 'line_nr' => '81',
'macro' => ''
},
'parent' => {}
@@ -607,33 +758,56 @@
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[13]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[14]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'contents'}[2]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[15]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[16]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[17]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[18]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[19]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[20]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[21]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[22]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[0]{'args'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[0];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23];
-$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[23]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[24]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[25]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[26]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[27]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[28]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[29]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[30]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[31]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'parent'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[32]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
+$result_trees{'cpp_lines'}{'contents'}[1]{'contents'}[33]{'parent'} =
$result_trees{'cpp_lines'}{'contents'}[1];
$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'cpp_lines'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'cpp_lines'}{'contents'}[1]{'extra'}{'node_content'};
$result_trees{'cpp_lines'}{'contents'}[1]{'parent'} =
$result_trees{'cpp_lines'};
@@ -664,10 +838,22 @@
# line 7 "k"
address@hidden macro call}.
address@hidden macro call}.
address@hidden macrtwo
+line before
+# line 666 "x"
address@hidden macro
address@hidden macrotwo def}
+line before
+# line 666 "x"
+
address@hidden macrotwo call}.
+
+
+
@email{in}
@email{after inc}.
@@ -698,10 +884,18 @@
# line 7 "k"
-after macro call.
+after macro call.
+after macrotwo def
+line before
+# line 666 "x"
+
+after macrotwo call.
+
+
+
in
after inc.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8436] 80include.t cpp_lines test,
gavinsmith0123 <=