[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7463] revert change that didnt record menus
From: |
gavinsmith0123 |
Subject: |
[7463] revert change that didnt record menus |
Date: |
Sun, 23 Oct 2016 08:40:08 +0000 (UTC) |
Revision: 7463
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7463
Author: gavin
Date: 2016-10-23 08:40:08 +0000 (Sun, 23 Oct 2016)
Log Message:
-----------
revert change that didnt record menus
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/menu/menu_in_deffn.pl
trunk/tp/t/results/menu/menu_in_example.pl
trunk/tp/t/results/menu/sc_in_menu.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-10-18 23:27:16 UTC (rev 7462)
+++ trunk/ChangeLog 2016-10-23 08:40:08 UTC (rev 7463)
@@ -1,3 +1,9 @@
+2016-10-23 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_parse_texi): Record menu regardless of
+ where it occurred. (Revert change on 2016-10-08 in order to
+ avoid failure of "long tests" under tp/tests.)
+
2016-10-19 Gavin Smith <address@hidden>
* tp/Texinfo/Structuring.pm (sectioning_structure): Use 'next'
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-10-18 23:27:16 UTC (rev 7462)
+++ trunk/tp/Texinfo/Parser.pm 2016-10-23 08:40:08 UTC (rev 7463)
@@ -4810,12 +4810,7 @@
$line_nr);
}
} elsif ($command eq 'menu') {
- if ($root_commands{$current->{'parent'}->{'cmdname'}}) {
- push @{$self->{'current_node'}->{'menus'}}, $current;
- } else {
- $self->line_warn($self->__("address@hidden in invalid
context"),
- $line_nr);
- }
+ push @{$self->{'current_node'}->{'menus'}}, $current;
}
} elsif ($command ne 'direntry') {
if ($self->{'SHOW_MENU'}) {
Modified: trunk/tp/t/results/menu/menu_in_deffn.pl
===================================================================
--- trunk/tp/t/results/menu/menu_in_deffn.pl 2016-10-18 23:27:16 UTC (rev
7462)
+++ trunk/tp/t/results/menu/menu_in_deffn.pl 2016-10-23 08:40:08 UTC (rev
7463)
@@ -429,6 +429,31 @@
'extra' => {
'normalized' => 'Top'
},
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'mynode'
+ }
+ ]
+ }
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'menu',
+ 'text_arg' => 'menu'
+ }
+ }
+ }
+ }
+ ],
+ 'node_next' => {},
'node_up' => {
'extra' => {
'manual_content' => [
@@ -441,26 +466,27 @@
'type' => 'top_node_up'
}
};
+$result_nodes{'menu_in_deffn'}{'menus'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_nodes{'menu_in_deffn'}{'menus'}[0];
+$result_nodes{'menu_in_deffn'}{'node_next'} =
$result_nodes{'menu_in_deffn'}{'menu_child'};
$result_nodes{'menu_in_deffn'}{'node_up'}{'extra'}{'top_node_up'} =
$result_nodes{'menu_in_deffn'};
$result_menus{'menu_in_deffn'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
+ },
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'mynode'
+ }
+ ]
+ }
}
};
-$result_errors{'menu_in_deffn'} = [
- {
- 'error_line' => ':4: warning: @menu in invalid context
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@menu in invalid context',
- 'type' => 'warning'
- }
-];
+$result_errors{'menu_in_deffn'} = [];
1;
Modified: trunk/tp/t/results/menu/menu_in_example.pl
===================================================================
--- trunk/tp/t/results/menu/menu_in_example.pl 2016-10-18 23:27:16 UTC (rev
7462)
+++ trunk/tp/t/results/menu/menu_in_example.pl 2016-10-23 08:40:08 UTC (rev
7463)
@@ -736,6 +736,31 @@
'extra' => {
'normalized' => 'Top'
},
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'entry'
+ }
+ ]
+ }
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'menu',
+ 'text_arg' => 'menu'
+ }
+ }
+ }
+ }
+ ],
+ 'node_next' => {},
'node_up' => {
'extra' => {
'manual_content' => [
@@ -748,26 +773,27 @@
'type' => 'top_node_up'
}
};
+$result_nodes{'menu_in_example'}{'menus'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_nodes{'menu_in_example'}{'menus'}[0];
+$result_nodes{'menu_in_example'}{'node_next'} =
$result_nodes{'menu_in_example'}{'menu_child'};
$result_nodes{'menu_in_example'}{'node_up'}{'extra'}{'top_node_up'} =
$result_nodes{'menu_in_example'};
$result_menus{'menu_in_example'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
+ },
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'entry'
+ }
+ ]
+ }
}
};
-$result_errors{'menu_in_example'} = [
- {
- 'error_line' => ':4: warning: @menu in invalid context
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => '@menu in invalid context',
- 'type' => 'warning'
- }
-];
+$result_errors{'menu_in_example'} = [];
@@ -868,7 +894,7 @@
-$result_converted{'xml'}->{'menu_in_example'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+$result_converted{'xml'}->{'menu_in_example'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodenext automatic="on">(entry)</nodenext><nodeup
automatic="on">(dir)</nodeup></node>
<example endspaces=" ">
<menu endspaces=" ">
Modified: trunk/tp/t/results/menu/sc_in_menu.pl
===================================================================
--- trunk/tp/t/results/menu/sc_in_menu.pl 2016-10-18 23:27:16 UTC (rev
7462)
+++ trunk/tp/t/results/menu/sc_in_menu.pl 2016-10-23 08:40:08 UTC (rev
7463)
@@ -1101,6 +1101,31 @@
'extra' => {
'normalized' => 'NODE'
},
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'normalized' => 'EXAMPLE-NODE'
+ }
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'menu',
+ 'text_arg' => 'menu'
+ }
+ }
+ }
+ }
+ ],
'node_prev' => {},
'node_up' => {}
},
@@ -1132,6 +1157,7 @@
'type' => 'top_node_up'
}
};
+$result_nodes{'sc_in_menu'}{'menu_child'}{'menus'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_nodes{'sc_in_menu'}{'menu_child'}{'menus'}[0];
$result_nodes{'sc_in_menu'}{'menu_child'}{'node_prev'} =
$result_nodes{'sc_in_menu'};
$result_nodes{'sc_in_menu'}{'menu_child'}{'node_up'} =
$result_nodes{'sc_in_menu'};
$result_nodes{'sc_in_menu'}{'menus'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_nodes{'sc_in_menu'}{'menus'}[0];
@@ -1148,6 +1174,16 @@
'extra' => {
'normalized' => 'NODE'
},
+ 'menu_child' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'normalized' => 'EXAMPLE-NODE'
+ }
+ },
'menu_up' => {},
'menu_up_hash' => {
'Top' => 1
@@ -1156,17 +1192,7 @@
};
$result_menus{'sc_in_menu'}{'menu_child'}{'menu_up'} =
$result_menus{'sc_in_menu'};
-$result_errors{'sc_in_menu'} = [
- {
- 'error_line' => ':19: warning: @menu in invalid context
-',
- 'file_name' => '',
- 'line_nr' => 19,
- 'macro' => '',
- 'text' => '@menu in invalid context',
- 'type' => 'warning'
- }
-];
+$result_errors{'sc_in_menu'} = [];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7463] revert change that didnt record menus,
gavinsmith0123 <=