r96887 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r96886‎ \| r96887 \| r96888 >
Date:	19:16, 12 September 2011
Author:	aaron
Status:	ok (Comments)
Tags:
Comment:	Reverted r86072, r86419 per CR. Lots of conflicts resolved here. Removes lineStart from r87346 code as well for preprocess parser tests.
Modified paths:	/trunk/phase3/includes/parser/Parser.php (modified) (history) /trunk/phase3/includes/parser/Preprocessor_DOM.php (modified) (history) /trunk/phase3/includes/parser/Preprocessor_Hash.php (modified) (history) /trunk/phase3/tests/parser/parserTests.txt (modified) (history) /trunk/phase3/tests/parser/preprocess/All_system_messages.expected (modified) (history) /trunk/phase3/tests/parser/preprocess/Factorial.expected (modified) (history) /trunk/phase3/tests/phpunit/includes/parser/PreprocessorTest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/parser/PreprocessorTest.php
—	—	@@ -49,43 +49,42 @@
50	50	array( "== Foo ==\n== Bar == \n", "<root><h level=\"2\" i=\"1\">== Foo ==</h>\n<h level=\"2\" i=\"2\">== Bar == </h>\n</root>" ),
51	51	array( "===========", "<root><h level=\"5\" i=\"1\">===========</h></root>" ),
52	52	array( "Foo\n=\n==\n=\n", "<root>Foo\n=\n==\n=\n</root>" ),
53		~~- array( "{{Foo}}", "<root><template lineStart=\"1\"><title>Foo</title></template></root>" ),~~
	53	+ array( "{{Foo}}", "<root><template><title>Foo</title></template></root>" ),
54	54	array( "\n{{Foo}}", "<root>\n<template lineStart=\"1\"><title>Foo</title></template></root>" ),
55		~~- array( "{{Foo\|bar}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>bar</value></part></template></root>" ),~~
56		~~- array( "{{Foo\|bar}}a", "<root><template lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>bar</value></part></template>a</root>" ),~~
57		- array( "{{Foo\|bar\|baz}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name index=\"2\" /><value>baz</value></part></template></root>" ),
58		~~- array( "{{Foo\|1=bar}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name>1</name>=<value>bar</value></part></template></root>" ),~~
59		~~- array( "{{Foo\|=bar}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name></name>=<value>bar</value></part></template></root>" ),~~
60		~~- array( "{{Foo\|bar=baz}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name>bar</name>=<value>baz</value></part></template></root>" ),~~
61		- array( "{{Foo\|1=bar\|baz}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name>1</name>=<value>bar</value></part><part><name index=\"1\" /><value>baz</value></part></template></root>" ),
62		~~- array( "{{Foo\|1=bar\|2=baz}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name>1</name>=<value>bar</value></part><part><name>2</name>=<value>baz</value></part></template></root>" ),~~
63		- array( "{{Foo\|bar\|foo=baz}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name>foo</name>=<value>baz</value></part></template></root>" ),
64		~~- array( "{{{1}}}", "<root><tplarg lineStart=\"1\"><title>1</title></tplarg></root>" ),~~
65		~~- array( "{{{1\|}}}", "<root><tplarg lineStart=\"1\"><title>1</title><part><name index=\"1\" /><value></value></part></tplarg></root>" ),~~
66		~~- array( "{{{Foo}}}", "<root><tplarg lineStart=\"1\"><title>Foo</title></tplarg></root>" ),~~
67		~~- array( "{{{Foo\|}}}", "<root><tplarg lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value></value></part></tplarg></root>" ),~~
68		- array( "{{{Foo\|bar\|baz}}}", "<root><tplarg lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name index=\"2\" /><value>baz</value></part></tplarg></root>" ),
	55	+ array( "{{Foo\|bar}}", "<root><template><title>Foo</title><part><name index=\"1\" /><value>bar</value></part></template></root>" ),
	56	+ array( "{{Foo\|bar}}a", "<root><template><title>Foo</title><part><name index=\"1\" /><value>bar</value></part></template>a</root>" ),
	57	+ array( "{{Foo\|bar\|baz}}", "<root><template><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name index=\"2\" /><value>baz</value></part></template></root>" ),
	58	+ array( "{{Foo\|1=bar}}", "<root><template><title>Foo</title><part><name>1</name>=<value>bar</value></part></template></root>" ),
	59	+ array( "{{Foo\|=bar}}", "<root><template><title>Foo</title><part><name></name>=<value>bar</value></part></template></root>" ),
	60	+ array( "{{Foo\|bar=baz}}", "<root><template><title>Foo</title><part><name>bar</name>=<value>baz</value></part></template></root>" ),
	61	+ array( "{{Foo\|1=bar\|baz}}", "<root><template><title>Foo</title><part><name>1</name>=<value>bar</value></part><part><name index=\"1\" /><value>baz</value></part></template></root>" ),
	62	+ array( "{{Foo\|bar\|foo=baz}}", "<root><template><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name>foo</name>=<value>baz</value></part></template></root>" ),
	63	+ array( "{{{1}}}", "<root><tplarg><title>1</title></tplarg></root>" ),
	64	+ array( "{{{1\|}}}", "<root><tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg></root>" ),
	65	+ array( "{{{Foo}}}", "<root><tplarg><title>Foo</title></tplarg></root>" ),
	66	+ array( "{{{Foo\|}}}", "<root><tplarg><title>Foo</title><part><name index=\"1\" /><value></value></part></tplarg></root>" ),
	67	+ array( "{{{Foo\|bar\|baz}}}", "<root><tplarg><title>Foo</title><part><name index=\"1\" /><value>bar</value></part><part><name index=\"2\" /><value>baz</value></part></tplarg></root>" ),
69	68	array( "{<!-- -->{Foo}}", "<root>{<comment><!-- --></comment>{Foo}}</root>" ),
70	69	array( "{{{{Foobar}}}}", "<root>{<tplarg><title>Foobar</title></tplarg>}</root>" ),
71		~~- array( "{{{ {{Foo}} }}}", "<root><tplarg lineStart=\"1\"><title> <template><title>Foo</title></template> </title></tplarg></root>" ),~~
72		~~- array( "{{ {{{Foo}}} }}", "<root><template lineStart=\"1\"><title> <tplarg><title>Foo</title></tplarg> </title></template></root>" ),~~
73		~~- array( "{{{{{Foo}}}}}", "<root><template lineStart=\"1\"><title><tplarg><title>Foo</title></tplarg></title></template></root>" ),~~
74		~~- array( "{{{{{Foo}} }}}", "<root><tplarg lineStart=\"1\"><title><template><title>Foo</title></template> </title></tplarg></root>" ),~~
75		~~- array( "{{{{{{Foo}}}}}}", "<root><tplarg lineStart=\"1\"><title><tplarg><title>Foo</title></tplarg></title></tplarg></root>" ),~~
	70	+ array( "{{{ {{Foo}} }}}", "<root><tplarg><title> <template><title>Foo</title></template> </title></tplarg></root>" ),
	71	+ array( "{{ {{{Foo}}} }}", "<root><template><title> <tplarg><title>Foo</title></tplarg> </title></template></root>" ),
	72	+ array( "{{{{{Foo}}}}}", "<root><template><title><tplarg><title>Foo</title></tplarg></title></template></root>" ),
	73	+ array( "{{{{{Foo}} }}}", "<root><tplarg><title><template><title>Foo</title></template> </title></tplarg></root>" ),
	74	+ array( "{{{{{{Foo}}}}}}", "<root><tplarg><title><tplarg><title>Foo</title></tplarg></title></tplarg></root>" ),
76	75	array( "{{{{{{Foo}}}}}", "<root>{<template><title><tplarg><title>Foo</title></tplarg></title></template></root>" ),
77	76	array( "[[[Foo]]", "<root>[[[Foo]]</root>" ),
78		- array( "{{Foo\|[[[[bar]]\|baz]]}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name index=\"1\" /><value>[[[[bar]]\|baz]]</value></part></template></root>" ), // This test is important, since it means the difference between having the [[ rule stacked or not
	77	+ array( "{{Foo\|[[[[bar]]\|baz]]}}", "<root><template><title>Foo</title><part><name index=\"1\" /><value>[[[[bar]]\|baz]]</value></part></template></root>" ), // This test is important, since it means the difference between having the [[ rule stacked or not
79	78	array( "{{Foo\|[[[[bar]\|baz]]}}", "<root>{{Foo\|[[[[bar]\|baz]]}}</root>" ),
80	79	array( "{{Foo\|Foo [[[[bar]\|baz]]}}", "<root>{{Foo\|Foo [[[[bar]\|baz]]}}</root>" ),
81	80	array( "Foo <display map>Bar</display map >Baz", "<root>Foo <ext><name>display map</name><attr></attr><inner>Bar</inner><close></display map ></close></ext>Baz</root>" ),
82	81	array( "Foo <display map foo>Bar</display map >Baz", "<root>Foo <ext><name>display map</name><attr> foo</attr><inner>Bar</inner><close></display map ></close></ext>Baz</root>" ),
83	82	array( "Foo <gallery bar=\"baz\" />", "<root>Foo <ext><name>gallery</name><attr> bar="baz" </attr></ext></root>" ),
84	83	array( "</foo>Foo<//foo>", "<root><ext><name>/foo</name><attr></attr><inner>Foo</inner><close><//foo></close></ext></root>" ), # Worth blacklisting IMHO
85		- array( "{{#ifexpr: ({{{1\|1}}} = 2) \| Foo \| Bar }}", "<root><template lineStart=\"1\"><title>#ifexpr: (<tplarg><title>1</title><part><name index=\"1\" /><value>1</value></part></tplarg> = 2) </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> Bar </value></part></template></root>"),
86		- array( "{{#if: {{{1\|}}} \| Foo \| {{Bar}} }}", "<root><template lineStart=\"1\"><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> <template><title>Bar</title></template> </value></part></template></root>"),
87		- array( "{{#if: {{{1\|}}} \| Foo \| [[Bar]] }}", "<root><template lineStart=\"1\"><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> [[Bar]] </value></part></template></root>"),
88		- array( "{{#if: {{{1\|}}} \| [[Foo]] \| Bar }}", "<root><template lineStart=\"1\"><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> [[Foo]] </value></part><part><name index=\"2\" /><value> Bar </value></part></template></root>"),
89		- array( "{{#if: {{{1\|}}} \| 1 \| {{#if: {{{1\|}}} \| 2 \| 3 }} }}", "<root><template lineStart=\"1\"><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> 1 </value></part><part><name index=\"2\" /><value> <template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> 2 </value></part><part><name index=\"2\" /><value> 3 </value></part></template> </value></part></template></root>"),
	84	+ array( "{{#ifexpr: ({{{1\|1}}} = 2) \| Foo \| Bar }}", "<root><template><title>#ifexpr: (<tplarg><title>1</title><part><name index=\"1\" /><value>1</value></part></tplarg> = 2) </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> Bar </value></part></template></root>"),
	85	+ array( "{{#if: {{{1\|}}} \| Foo \| {{Bar}} }}", "<root><template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> <template><title>Bar</title></template> </value></part></template></root>"),
	86	+ array( "{{#if: {{{1\|}}} \| Foo \| [[Bar]] }}", "<root><template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> Foo </value></part><part><name index=\"2\" /><value> [[Bar]] </value></part></template></root>"),
	87	+ array( "{{#if: {{{1\|}}} \| [[Foo]] \| Bar }}", "<root><template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> [[Foo]] </value></part><part><name index=\"2\" /><value> Bar </value></part></template></root>"),
	88	+ array( "{{#if: {{{1\|}}} \| 1 \| {{#if: {{{1\|}}} \| 2 \| 3 }} }}", "<root><template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> 1 </value></part><part><name index=\"2\" /><value> <template><title>#if: <tplarg><title>1</title><part><name index=\"1\" /><value></value></part></tplarg> </title><part><name index=\"1\" /><value> 2 </value></part><part><name index=\"2\" /><value> 3 </value></part></template> </value></part></template></root>"),
90	89	array( "{{ {{Foo}}", "<root>{{ <template><title>Foo</title></template></root>"),
91	90	array( "{{Foobar {{Foo}} {{Bar}} {{Baz}} ", "<root>{{Foobar <template><title>Foo</title></template> <template><title>Bar</title></template> <template><title>Baz</title></template> </root>"),
92	91	array( "[[Foo]] \|", "<root>[[Foo]] \|</root>"),
—	—	@@ -97,10 +96,10 @@
98	97	array( "{{Foo\|bar=[[baz]}}", "<root>{{Foo\|bar=[[baz]}}</root>"),
99	98	array( "{{foo\|", "<root>{{foo\|</root>"),
100	99	array( "{{foo\|}", "<root>{{foo\|}</root>"),
101		~~- array( "{{foo\|} }}", "<root><template lineStart=\"1\"><title>foo</title><part><name index=\"1\" /><value>} </value></part></template></root>"),~~
	100	+ array( "{{foo\|} }}", "<root><template><title>foo</title><part><name index=\"1\" /><value>} </value></part></template></root>"),
102	101	array( "{{foo\|bar=\|}", "<root>{{foo\|bar=\|}</root>"),
103	102	array( "{{Foo\|} Bar=", "<root>{{Foo\|} Bar=</root>"),
104		~~- array( "{{Foo\|} Bar=}}", "<root><template lineStart=\"1\"><title>Foo</title><part><name>} Bar</name>=<value></value></part></template></root>"),~~
	103	+ array( "{{Foo\|} Bar=}}", "<root><template><title>Foo</title><part><name>} Bar</name>=<value></value></part></template></root>"),
105	104	/* array( file_get_contents( dirname( __FILE__ ) . '/QuoteQuran.txt' ), file_get_contents( dirname( __FILE__ ) . '/QuoteQuranExpanded.txt' ) ), */
106	105	);
107	106	}
Index: trunk/phase3/tests/parser/preprocess/All_system_messages.expected
—	—	@@ -1,4 +1,4 @@
2		~~-<root><template lineStart="1"><title>int:allmessagestext</title></template>~~
	2	+<root><template><title>int:allmessagestext</title></template>
3	3
4	4	<table border=1 width=100%><tr><td>
5	5	'''Name'''
Index: trunk/phase3/tests/parser/preprocess/Factorial.expected
—	—	@@ -1,4 +1,4 @@
2		-<root><template lineStart="1"><title>#expr:<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=00</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>01<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=01</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>01<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=02</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>02<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=03</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>03<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=04</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>04<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=05</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>05<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=06</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>06<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=07</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>07<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=08</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>08<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=09</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>09<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=10</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>10<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=11</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>11<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=12</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>12<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=13</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>13<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=14</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>14<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=15</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>15<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=16</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>16<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=17</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>17<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=18</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>18<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=19</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>19<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=20</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>20<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=21</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>21<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=22</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>22<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=23</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>23<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=24</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>24<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=25</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>25<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=26</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>26<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=27</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>27<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=28</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>28<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=29</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>29<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=30</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>30<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=31</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>31<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=32</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>32<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=33</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>33<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=34</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>34<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=35</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>35<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=36</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>36<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=37</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>37<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=38</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>38<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=39</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>39<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=40</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>40<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=41</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>41<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=42</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>42<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=43</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>43<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=44</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>44<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=45</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>45<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=46</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>46<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=47</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>47<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=48</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>48<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=49</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>49<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=50</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>50<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=51</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>51<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=52</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>52<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=53</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>53<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=54</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>54<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=55</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>55<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=56</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>56<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=57</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>57<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=58</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>58<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=59</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>59<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=60</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>60<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=61</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>61<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=62</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>62<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=63</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>63<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=64</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>64<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=65</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>65<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=66</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>66<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=67</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>67<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=68</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>68<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=69</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>69<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=70</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>70<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=71</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>71<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=72</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>72<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=73</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>73<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=74</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>74<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=75</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>75<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=76</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>76<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=77</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>77<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=78</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>78<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=79</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>79<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=80</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>80<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=81</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>81<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=82</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>82<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=83</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>83<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=84</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>84<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=85</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>85<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=86</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>86<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=87</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>87<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=88</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>88<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=89</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>89<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=90</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>90<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=91</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>91<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=92</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>92<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=93</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>93<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=94</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>94<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=95</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>95<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=96</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>96<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=97</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>97<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=98</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>98<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=99</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>*99</value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></title></template><ignore><noinclude></ignore>
	2	+<root><template><title>#expr:<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=00</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>01<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=01</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>01<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=02</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>02<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=03</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>03<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=04</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>04<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=05</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>05<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=06</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>06<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=07</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>07<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=08</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>08<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=09</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>09<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=10</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>10<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=11</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>11<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=12</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>12<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=13</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>13<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=14</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>14<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=15</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>15<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=16</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>16<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=17</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>17<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=18</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>18<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=19</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>19<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=20</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>20<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=21</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>21<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=22</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>22<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=23</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>23<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=24</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>24<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=25</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>25<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=26</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>26<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=27</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>27<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=28</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>28<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=29</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>29<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=30</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>30<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=31</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>31<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=32</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>32<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=33</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>33<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=34</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>34<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=35</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>35<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=36</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>36<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=37</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>37<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=38</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>38<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=39</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>39<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=40</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>40<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=41</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>41<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=42</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>42<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=43</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>43<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=44</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>44<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=45</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>45<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=46</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>46<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=47</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>47<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=48</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>48<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=49</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>49<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=50</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>50<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=51</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>51<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=52</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>52<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=53</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>53<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=54</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>54<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=55</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>55<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=56</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>56<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=57</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>57<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=58</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>58<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=59</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>59<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=60</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>60<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=61</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>61<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=62</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>62<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=63</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>63<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=64</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>64<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=65</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>65<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=66</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>66<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=67</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>67<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=68</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>68<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=69</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>69<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=70</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>70<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=71</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>71<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=72</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>72<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=73</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>73<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=74</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>74<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=75</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>75<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=76</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>76<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=77</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>77<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=78</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>78<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=79</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>79<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=80</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>80<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=81</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>81<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=82</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>82<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=83</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>83<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=84</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>84<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=85</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>85<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=86</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>86<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=87</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>87<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=88</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>88<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=89</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>89<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=90</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>90<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=91</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>91<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=92</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>92<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=93</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>93<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=94</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>94<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=95</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>95<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=96</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>96<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=97</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>97<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=98</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>98<template><title>#ifeq:<template><title>#expr:<tplarg><title>1</title></tplarg>>=99</title></template></title><part><name index="1" /><value>1</value></part><part><name index="2" /><value>*99</value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></value></part></template></title></template><ignore><noinclude></ignore>
3	3	<template lineStart="1"><title>Template documentation</title></template>
4	4	This template finds the [[factorial]] of a number. To use it, enter:<br />
5	5	<code><nowiki><template><title>factorial</title><part><name index="1" /><value>input</value></part></template></nowiki></code><br />
Index: trunk/phase3/tests/parser/parserTests.txt
—	—	@@ -1559,38 +1559,6 @@
1560	1560
1561	1561	!! end
1562	1562	!! test
1563		~~-Table with broken up list inside~~
1564		~~-!! input~~
1565		~~-{\|~~
1566		~~-\|style="width: 5em; text-align: center"\| gives~~
1567		~~-\|style="border: 1px dashed #2F6FAB; padding: 0.5em; margin: 0.5em"\|~~
1568		~~-# Some~~
1569		~~-# list~~
1570		~~-# Lorem~~
1571		-
1572		~~-# ipsum~~
1573		~~-# dolor~~
1574		~~-\|}~~
1575		~~-!! result~~
1576		~~-<table>~~
1577		~~-<tr>~~
1578		~~-<td style="width: 5em; text-align: center">gives~~
1579		~~-</td>~~
1580		~~-<td style="border: 1px dashed #2F6FAB; padding: 0.5em; margin: 0.5em">~~
1581		~~-<ol><li> Some~~
1582		~~-</li><li> list~~
1583		~~-</li><li> Lorem~~
1584		~~-</li></ol>~~
1585		~~-<ol><li> ipsum~~
1586		~~-</li><li> dolor~~
1587		~~-</li></ol>~~
1588		~~-</td>~~
1589		~~-</tr>~~
1590		~~-</table>~~
1591		-
1592		~~-!! end~~
1593		-
1594		~~-!! test~~
1595	1563	Indented table wrapped in html tags (Related to Bug 26362)
1596	1564	!! input
1597	1565	<div>
—	—	@@ -1947,8 +1915,6 @@
1948	1916	<td>1
1949	1917	</td>
1950	1918	<td>2
1951		~~-<p><br />~~
1952		~~-</p>~~
1953	1919	</td>
1954	1920	</tr>
1955	1921	<tr>
—	—	@@ -3571,36 +3537,7 @@
3572	3538	!! result
3573	3539	==Section 1==
3574	3540	!! end
3575		~~-!! article~~
3576		~~-Template:Top-level template~~
3577		~~-!! text~~
3578		~~-{{Nested template}}~~
3579		~~-!! endarticle~~
3580	3541
3581		~~-!! article~~
3582		~~-Template:Nested template~~
3583		~~-!! text~~
3584		~~-*Item 1~~
3585		~~-*Item 2~~
3586		~~-!! endarticle~~
3587		-
3588		~~-!! test~~
3589		~~-Line-start flag in a nested template call~~
3590		~~-!! input~~
3591		~~-*Item A~~
3592		~~-*Item B~~
3593		-
3594		~~-{{Top-level template}}~~
3595		~~-!! result~~
3596		~~-<ul><li>Item A~~
3597		~~-</li><li>Item B~~
3598		~~-</li></ul>~~
3599		~~-<ul><li>Item 1~~
3600		~~-</li><li>Item 2~~
3601		~~-</li></ul>~~
3602		-
3603		~~-!! end~~
3604		-
3605	3542	###
3606	3543	### Pre-save transform tests
3607	3544	###
—	—	@@ -6288,7 +6225,6 @@
6289	6226
6290	6227	!!result
6291	6228	<p><a rel="nofollow" class="external free" href="http://===r:::https://b">http://===r:::https://b</a>
6292		~~-</p><p><br />~~
6293	6229	</p>
6294	6230	!! end
6295	6231
—	—	@@ -6327,7 +6263,7 @@
6328	6264	<p>{{{\|
6329	6265	<u class="\|">}}}} >
6330	6266	<br style="onmouseover='alert(document.cookie);'" />
6331		~~-</p><p>MOVE YOUR MOUSE CURSOR OVER THIS TEXT~~
	6267	+MOVE YOUR MOUSE CURSOR OVER THIS TEXT
6332	6268	</p>
6333	6269	<table>
6334	6270	<tr>
Index: trunk/phase3/includes/parser/Preprocessor_Hash.php
—	—	@@ -498,7 +498,7 @@
499	499	'open' => $curChar,
500	500	'close' => $rule['end'],
501	501	'count' => $count,
502		~~- 'lineStart' => ($i == 0 \|\| $text[$i-1] == "\n"),~~
	502	+ 'lineStart' => ($i > 0 && $text[$i-1] == "\n"),
503	503	);
504	504
505	505	$stack->push( $piece );
Index: trunk/phase3/includes/parser/Parser.php
—	—	@@ -857,8 +857,11 @@
858	858
859	859	# empty line, go to next line,
860	860	# but only append \n if outside of table
861		~~- if ( $line === '') {~~
862		~~- $output .= $outLine . "\n";~~
	861	+ if ( $line === '' ) {
	862	+ $output .= $outLine;
	863	+ if ( !isset( $tables[0] ) ) {
	864	+ $output .= "\n";
	865	+ }
863	866	continue;
864	867	}
865	868	$firstChars = $line[0];
Index: trunk/phase3/includes/parser/Preprocessor_DOM.php
—	—	@@ -543,7 +543,7 @@
544	544	'open' => $curChar,
545	545	'close' => $rule['end'],
546	546	'count' => $count,
547		~~- 'lineStart' => ($i == 0 \|\| $text[$i-1] == "\n"),~~
	547	+ 'lineStart' => ($i > 0 && $text[$i-1] == "\n"),
548	548	);
549	549
550	550	$stack->push( $piece );

Follow-up revisions

Revision	Commit summary	Author	Date
r101283	Revert r87211 as r86072 which it was mimicking was also reverted in r96887....	platonides	21:13, 29 October 2011
r101284	The test "{{Foo\|1=bar\|2=baz}}" got removed in r96887....	platonides	21:19, 29 October 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r86072	Followup to r86064 (List with double line-breaks inside tables). Also contain...	diebuche	19:28, 14 April 2011
r86419	Change tests to match preprocessor changes in r86072....	platonides	18:39, 19 April 2011
r87346	We can't check if it's a parentNode->type == name_node so early, since...	platonides	19:48, 3 May 2011

Comments

#Comment by Reedy (talk | contribs) 20:02, 12 September 2011

http://ci2.tesla.usability.wikimedia.org:8080/job/MediaWiki-phpunit/450/testReport/(root)/ParserTests__testParserTest/testParserTest_with_data_set__105/

I think that might've been you...

#Comment by Platonides (talk | contribs) 21:24, 29 October 2011

After my follow-ups, I signoff this as a correct revert (except the parserTests.txt which I didn't check).

Status & tagging log

03:26, 21 September 2011 Meno25 (talk | contribs) changed the status of r96887 [removed: new added: ok]