updated files

1 files changed, 298 insertions, 310 deletions

diff --git a/tests/org.eclipse.m2m.atl.tests/data/inputs/Relational2UML/Relational2UML.asm b/tests/org.eclipse.m2m.atl.tests/data/inputs/Relational2UML/Relational2UML.asm
index 839f84c2..fae799a7 100644
--- a/tests/org.eclipse.m2m.atl.tests/data/inputs/Relational2UML/Relational2UML.asm
+++ b/tests/org.eclipse.m2m.atl.tests/data/inputs/Relational2UML/Relational2UML.asm
@@ -118,7 +118,6 @@
 		<constant value="Property"/>
 		<constant value="NTransientLink;.addTargetElement(SJ):V"/>
 		<constant value="NTransientLinkSet;.addLink2(NTransientLink;B):V"/>
-		<constant value="39:9-39:21"/>
 		<constant value="39:3-44:4"/>
 		<constant value="__applyColumn2Property"/>
 		<constant value="NTransientLink;"/>
@@ -151,11 +150,8 @@
 		<constant value="integer"/>
 		<constant value="PrimitiveType"/>
 		<constant value="string"/>
-		<constant value="57:9-57:18"/>
 		<constant value="57:3-60:4"/>
-		<constant value="61:13-61:30"/>
 		<constant value="61:3-63:4"/>
-		<constant value="64:12-64:29"/>
 		<constant value="64:3-66:4"/>
 		<constant value="__applyDatabase2Model"/>
 		<constant value="4"/>
@@ -297,7 +293,6 @@
 		<constant value="Table"/>
 		<constant value="t"/>
 		<constant value="Class"/>
-		<constant value="114:9-114:18"/>
 		<constant value="114:3-117:4"/>
 		<constant value="__applyTable2Class"/>
 		<constant value="ownedColumns"/>
@@ -317,7 +312,6 @@
 		<constant value="__matchSchema2Package"/>
 		<constant value="Schema"/>
 		<constant value="Package"/>
-		<constant value="127:9-127:20"/>
 		<constant value="127:3-130:4"/>
 		<constant value="__applySchema2Package"/>
 		<constant value="ownedTables"/>
@@ -668,29 +662,28 @@
 			<enditerate/>
 		</code>
 		<linenumbertable>
-			<lne id="117" begin="21" end="23"/>
-			<lne id="118" begin="19" end="24"/>
+			<lne id="117" begin="19" end="24"/>
 		</linenumbertable>
 		<localvariabletable>
 			<lve slot="1" name="104" begin="6" end="26"/>
 			<lve slot="0" name="23" begin="0" end="27"/>
 		</localvariabletable>
 	</operation>
-	<operation name="119">
+	<operation name="118">
 		<context type="8"/>
 		<parameters>
-			<parameter name="25" type="120"/>
+			<parameter name="25" type="119"/>
 		</parameters>
 		<code>
 			<load arg="25"/>
 			<push arg="104"/>
-			<call arg="121"/>
+			<call arg="120"/>
 			<store arg="34"/>
 			<load arg="25"/>
 			<push arg="113"/>
-			<call arg="122"/>
-			<store arg="123"/>
-			<load arg="123"/>
+			<call arg="121"/>
+			<store arg="122"/>
+			<load arg="122"/>
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
@@ -700,9 +693,9 @@
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
-			<get arg="124"/>
+			<get arg="123"/>
 			<call arg="35"/>
-			<set arg="124"/>
+			<set arg="123"/>
 			<dup/>
 			<getasm/>
 			<getasm/>
@@ -710,43 +703,43 @@
 			<call arg="35"/>
 			<set arg="62"/>
 			<pop/>
-			<load arg="123"/>
+			<load arg="122"/>
 			<getasm/>
 			<push arg="106"/>
-			<call arg="125"/>
-			<pcall arg="126"/>
+			<call arg="124"/>
+			<pcall arg="125"/>
 		</code>
 		<linenumbertable>
-			<lne id="127" begin="11" end="11"/>
-			<lne id="128" begin="11" end="12"/>
-			<lne id="129" begin="9" end="14"/>
-			<lne id="130" begin="17" end="17"/>
-			<lne id="131" begin="17" end="18"/>
-			<lne id="132" begin="15" end="20"/>
-			<lne id="133" begin="23" end="23"/>
-			<lne id="134" begin="23" end="24"/>
-			<lne id="135" begin="21" end="26"/>
-			<lne id="118" begin="8" end="27"/>
-			<lne id="136" begin="28" end="28"/>
-			<lne id="137" begin="29" end="29"/>
-			<lne id="138" begin="30" end="30"/>
-			<lne id="139" begin="29" end="31"/>
+			<lne id="126" begin="11" end="11"/>
+			<lne id="127" begin="11" end="12"/>
+			<lne id="128" begin="9" end="14"/>
+			<lne id="129" begin="17" end="17"/>
+			<lne id="130" begin="17" end="18"/>
+			<lne id="131" begin="15" end="20"/>
+			<lne id="132" begin="23" end="23"/>
+			<lne id="133" begin="23" end="24"/>
+			<lne id="134" begin="21" end="26"/>
+			<lne id="117" begin="8" end="27"/>
+			<lne id="135" begin="28" end="28"/>
+			<lne id="136" begin="29" end="29"/>
+			<lne id="137" begin="30" end="30"/>
+			<lne id="138" begin="29" end="31"/>
+			<lne id="139" begin="28" end="32"/>
 			<lne id="140" begin="28" end="32"/>
-			<lne id="141" begin="28" end="32"/>
 		</linenumbertable>
 		<localvariabletable>
 			<lve slot="3" name="113" begin="7" end="32"/>
 			<lve slot="2" name="104" begin="3" end="32"/>
 			<lve slot="0" name="23" begin="0" end="32"/>
-			<lve slot="1" name="142" begin="0" end="32"/>
+			<lve slot="1" name="141" begin="0" end="32"/>
 		</localvariabletable>
 	</operation>
-	<operation name="143">
+	<operation name="142">
 		<context type="8"/>
 		<parameters>
 		</parameters>
 		<code>
-			<push arg="144"/>
+			<push arg="143"/>
 			<push arg="107"/>
 			<findme/>
 			<push arg="108"/>
@@ -762,24 +755,24 @@
 			<push arg="53"/>
 			<call arg="111"/>
 			<dup/>
-			<push arg="145"/>
+			<push arg="144"/>
 			<load arg="25"/>
 			<call arg="112"/>
 			<dup/>
 			<push arg="113"/>
-			<push arg="146"/>
+			<push arg="145"/>
 			<push arg="89"/>
 			<new/>
 			<call arg="115"/>
 			<dup/>
+			<push arg="146"/>
 			<push arg="147"/>
-			<push arg="148"/>
 			<push arg="89"/>
 			<new/>
 			<call arg="115"/>
 			<dup/>
-			<push arg="149"/>
 			<push arg="148"/>
+			<push arg="147"/>
 			<push arg="89"/>
 			<new/>
 			<call arg="115"/>
@@ -788,41 +781,38 @@
 			<enditerate/>
 		</code>
 		<linenumbertable>
-			<lne id="150" begin="21" end="23"/>
-			<lne id="151" begin="19" end="24"/>
-			<lne id="152" begin="27" end="29"/>
-			<lne id="153" begin="25" end="30"/>
-			<lne id="154" begin="33" end="35"/>
-			<lne id="155" begin="31" end="36"/>
+			<lne id="149" begin="19" end="24"/>
+			<lne id="150" begin="25" end="30"/>
+			<lne id="151" begin="31" end="36"/>
 		</linenumbertable>
 		<localvariabletable>
-			<lve slot="1" name="145" begin="6" end="38"/>
+			<lve slot="1" name="144" begin="6" end="38"/>
 			<lve slot="0" name="23" begin="0" end="39"/>
 		</localvariabletable>
 	</operation>
-	<operation name="156">
+	<operation name="152">
 		<context type="8"/>
 		<parameters>
-			<parameter name="25" type="120"/>
+			<parameter name="25" type="119"/>
 		</parameters>
 		<code>
 			<load arg="25"/>
-			<push arg="145"/>
-			<call arg="121"/>
+			<push arg="144"/>
+			<call arg="120"/>
 			<store arg="34"/>
 			<load arg="25"/>
 			<push arg="113"/>
-			<call arg="122"/>
-			<store arg="123"/>
+			<call arg="121"/>
+			<store arg="122"/>
 			<load arg="25"/>
-			<push arg="147"/>
-			<call arg="122"/>
-			<store arg="157"/>
+			<push arg="146"/>
+			<call arg="121"/>
+			<store arg="153"/>
 			<load arg="25"/>
-			<push arg="149"/>
-			<call arg="122"/>
-			<store arg="158"/>
-			<load arg="123"/>
+			<push arg="148"/>
+			<call arg="121"/>
+			<store arg="154"/>
+			<load arg="122"/>
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
@@ -835,63 +825,63 @@
 			<push arg="10"/>
 			<new/>
 			<load arg="34"/>
-			<get arg="159"/>
+			<get arg="155"/>
 			<call arg="93"/>
-			<load arg="157"/>
+			<load arg="153"/>
 			<call arg="93"/>
-			<load arg="158"/>
+			<load arg="154"/>
 			<call arg="93"/>
-			<call arg="160"/>
+			<call arg="156"/>
 			<call arg="35"/>
-			<set arg="161"/>
+			<set arg="157"/>
 			<pop/>
-			<load arg="157"/>
+			<load arg="153"/>
 			<dup/>
 			<getasm/>
-			<push arg="162"/>
+			<push arg="158"/>
 			<call arg="35"/>
 			<set arg="43"/>
 			<pop/>
-			<load arg="158"/>
+			<load arg="154"/>
 			<dup/>
 			<getasm/>
-			<push arg="163"/>
+			<push arg="159"/>
 			<call arg="35"/>
 			<set arg="43"/>
 			<pop/>
 			<getasm/>
-			<load arg="158"/>
+			<load arg="154"/>
 			<set arg="5"/>
 			<getasm/>
-			<load arg="157"/>
+			<load arg="153"/>
 			<set arg="6"/>
-			<load arg="123"/>
+			<load arg="122"/>
 			<push arg="16"/>
 			<push arg="10"/>
 			<new/>
-			<push arg="164"/>
+			<push arg="160"/>
 			<push arg="89"/>
 			<findme/>
 			<push arg="90"/>
 			<call arg="91"/>
 			<iterate/>
-			<store arg="165"/>
-			<load arg="165"/>
+			<store arg="161"/>
+			<load arg="161"/>
 			<get arg="43"/>
-			<push arg="166"/>
+			<push arg="162"/>
 			<call arg="65"/>
 			<call arg="92"/>
-			<if arg="167"/>
-			<load arg="165"/>
+			<if arg="163"/>
+			<load arg="161"/>
 			<call arg="93"/>
 			<enditerate/>
 			<call arg="94"/>
-			<pcall arg="168"/>
-			<load arg="123"/>
+			<pcall arg="164"/>
+			<load arg="122"/>
 			<getasm/>
-			<push arg="144"/>
-			<call arg="125"/>
-			<pcall arg="126"/>
+			<push arg="143"/>
+			<call arg="124"/>
+			<pcall arg="125"/>
 			<push arg="16"/>
 			<push arg="10"/>
 			<new/>
@@ -899,7 +889,7 @@
 			<call arg="93"/>
 			<pushi arg="34"/>
 			<call arg="93"/>
-			<pushi arg="123"/>
+			<pushi arg="122"/>
 			<call arg="93"/>
 			<push arg="16"/>
 			<push arg="10"/>
@@ -908,11 +898,11 @@
 			<call arg="93"/>
 			<pushi arg="34"/>
 			<call arg="93"/>
-			<pushi arg="123"/>
+			<pushi arg="122"/>
 			<call arg="93"/>
-			<call arg="169"/>
-			<push arg="170"/>
-			<pcall arg="171"/>
+			<call arg="165"/>
+			<push arg="166"/>
+			<pcall arg="167"/>
 			<push arg="16"/>
 			<push arg="10"/>
 			<new/>
@@ -920,7 +910,7 @@
 			<call arg="93"/>
 			<pushi arg="34"/>
 			<call arg="93"/>
-			<pushi arg="123"/>
+			<pushi arg="122"/>
 			<call arg="93"/>
 			<push arg="16"/>
 			<push arg="10"/>
@@ -929,206 +919,206 @@
 			<call arg="93"/>
 			<pushi arg="34"/>
 			<call arg="93"/>
-			<pushi arg="157"/>
+			<pushi arg="153"/>
 			<call arg="93"/>
-			<call arg="169"/>
-			<push arg="172"/>
-			<pcall arg="171"/>
+			<call arg="165"/>
+			<push arg="168"/>
+			<pcall arg="167"/>
 		</code>
 		<linenumbertable>
-			<lne id="173" begin="19" end="19"/>
-			<lne id="174" begin="19" end="20"/>
-			<lne id="175" begin="17" end="22"/>
-			<lne id="176" begin="28" end="28"/>
-			<lne id="177" begin="28" end="29"/>
-			<lne id="178" begin="31" end="31"/>
-			<lne id="179" begin="33" end="33"/>
-			<lne id="180" begin="25" end="34"/>
-			<lne id="181" begin="25" end="35"/>
-			<lne id="182" begin="23" end="37"/>
-			<lne id="151" begin="16" end="38"/>
-			<lne id="183" begin="42" end="42"/>
-			<lne id="184" begin="40" end="44"/>
-			<lne id="153" begin="39" end="45"/>
-			<lne id="185" begin="49" end="49"/>
-			<lne id="186" begin="47" end="51"/>
-			<lne id="155" begin="46" end="52"/>
-			<lne id="187" begin="53" end="53"/>
-			<lne id="188" begin="54" end="54"/>
-			<lne id="189" begin="53" end="55"/>
-			<lne id="190" begin="56" end="56"/>
-			<lne id="191" begin="57" end="57"/>
-			<lne id="192" begin="56" end="58"/>
-			<lne id="193" begin="59" end="59"/>
-			<lne id="194" begin="63" end="65"/>
-			<lne id="195" begin="66" end="66"/>
-			<lne id="196" begin="63" end="67"/>
-			<lne id="197" begin="70" end="70"/>
-			<lne id="198" begin="70" end="71"/>
-			<lne id="199" begin="72" end="72"/>
-			<lne id="200" begin="70" end="73"/>
-			<lne id="201" begin="60" end="78"/>
-			<lne id="202" begin="60" end="79"/>
-			<lne id="203" begin="59" end="80"/>
-			<lne id="204" begin="81" end="81"/>
-			<lne id="205" begin="82" end="82"/>
-			<lne id="206" begin="83" end="83"/>
-			<lne id="207" begin="82" end="84"/>
-			<lne id="208" begin="81" end="85"/>
-			<lne id="209" begin="89" end="89"/>
-			<lne id="210" begin="91" end="91"/>
-			<lne id="211" begin="93" end="93"/>
-			<lne id="212" begin="86" end="94"/>
-			<lne id="213" begin="98" end="98"/>
-			<lne id="214" begin="100" end="100"/>
-			<lne id="215" begin="102" end="102"/>
-			<lne id="216" begin="95" end="103"/>
-			<lne id="217" begin="86" end="104"/>
-			<lne id="218" begin="105" end="105"/>
-			<lne id="219" begin="86" end="106"/>
-			<lne id="220" begin="110" end="110"/>
-			<lne id="221" begin="112" end="112"/>
-			<lne id="222" begin="114" end="114"/>
-			<lne id="223" begin="107" end="115"/>
-			<lne id="224" begin="119" end="119"/>
-			<lne id="225" begin="121" end="121"/>
-			<lne id="226" begin="123" end="123"/>
-			<lne id="227" begin="116" end="124"/>
-			<lne id="228" begin="107" end="125"/>
-			<lne id="229" begin="126" end="126"/>
-			<lne id="230" begin="107" end="127"/>
-			<lne id="231" begin="53" end="127"/>
+			<lne id="169" begin="19" end="19"/>
+			<lne id="170" begin="19" end="20"/>
+			<lne id="171" begin="17" end="22"/>
+			<lne id="172" begin="28" end="28"/>
+			<lne id="173" begin="28" end="29"/>
+			<lne id="174" begin="31" end="31"/>
+			<lne id="175" begin="33" end="33"/>
+			<lne id="176" begin="25" end="34"/>
+			<lne id="177" begin="25" end="35"/>
+			<lne id="178" begin="23" end="37"/>
+			<lne id="149" begin="16" end="38"/>
+			<lne id="179" begin="42" end="42"/>
+			<lne id="180" begin="40" end="44"/>
+			<lne id="150" begin="39" end="45"/>
+			<lne id="181" begin="49" end="49"/>
+			<lne id="182" begin="47" end="51"/>
+			<lne id="151" begin="46" end="52"/>
+			<lne id="183" begin="53" end="53"/>
+			<lne id="184" begin="54" end="54"/>
+			<lne id="185" begin="53" end="55"/>
+			<lne id="186" begin="56" end="56"/>
+			<lne id="187" begin="57" end="57"/>
+			<lne id="188" begin="56" end="58"/>
+			<lne id="189" begin="59" end="59"/>
+			<lne id="190" begin="63" end="65"/>
+			<lne id="191" begin="66" end="66"/>
+			<lne id="192" begin="63" end="67"/>
+			<lne id="193" begin="70" end="70"/>
+			<lne id="194" begin="70" end="71"/>
+			<lne id="195" begin="72" end="72"/>
+			<lne id="196" begin="70" end="73"/>
+			<lne id="197" begin="60" end="78"/>
+			<lne id="198" begin="60" end="79"/>
+			<lne id="199" begin="59" end="80"/>
+			<lne id="200" begin="81" end="81"/>
+			<lne id="201" begin="82" end="82"/>
+			<lne id="202" begin="83" end="83"/>
+			<lne id="203" begin="82" end="84"/>
+			<lne id="204" begin="81" end="85"/>
+			<lne id="205" begin="89" end="89"/>
+			<lne id="206" begin="91" end="91"/>
+			<lne id="207" begin="93" end="93"/>
+			<lne id="208" begin="86" end="94"/>
+			<lne id="209" begin="98" end="98"/>
+			<lne id="210" begin="100" end="100"/>
+			<lne id="211" begin="102" end="102"/>
+			<lne id="212" begin="95" end="103"/>
+			<lne id="213" begin="86" end="104"/>
+			<lne id="214" begin="105" end="105"/>
+			<lne id="215" begin="86" end="106"/>
+			<lne id="216" begin="110" end="110"/>
+			<lne id="217" begin="112" end="112"/>
+			<lne id="218" begin="114" end="114"/>
+			<lne id="219" begin="107" end="115"/>
+			<lne id="220" begin="119" end="119"/>
+			<lne id="221" begin="121" end="121"/>
+			<lne id="222" begin="123" end="123"/>
+			<lne id="223" begin="116" end="124"/>
+			<lne id="224" begin="107" end="125"/>
+			<lne id="225" begin="126" end="126"/>
+			<lne id="226" begin="107" end="127"/>
+			<lne id="227" begin="53" end="127"/>
 		</linenumbertable>
 		<localvariabletable>
 			<lve slot="6" name="104" begin="69" end="77"/>
 			<lve slot="3" name="113" begin="7" end="127"/>
-			<lve slot="4" name="147" begin="11" end="127"/>
-			<lve slot="5" name="149" begin="15" end="127"/>
-			<lve slot="2" name="145" begin="3" end="127"/>
+			<lve slot="4" name="146" begin="11" end="127"/>
+			<lve slot="5" name="148" begin="15" end="127"/>
+			<lve slot="2" name="144" begin="3" end="127"/>
 			<lve slot="0" name="23" begin="0" end="127"/>
-			<lve slot="1" name="142" begin="0" end="127"/>
+			<lve slot="1" name="141" begin="0" end="127"/>
 		</localvariabletable>
 	</operation>
-	<operation name="232">
+	<operation name="228">
 		<context type="41"/>
 		<parameters>
 		</parameters>
 		<code>
 			<load arg="61"/>
-			<call arg="233"/>
+			<call arg="229"/>
 			<store arg="25"/>
 			<load arg="25"/>
-			<call arg="234"/>
+			<call arg="230"/>
 			<store arg="34"/>
-			<push arg="235"/>
-			<call arg="234"/>
-			<store arg="123"/>
+			<push arg="231"/>
+			<call arg="230"/>
+			<store arg="122"/>
 			<load arg="34"/>
 			<call arg="94"/>
-			<push arg="236"/>
+			<push arg="232"/>
 			<call arg="65"/>
 			<if arg="70"/>
-			<load arg="123"/>
+			<load arg="122"/>
 			<load arg="34"/>
-			<call arg="169"/>
-			<push arg="237"/>
-			<call arg="171"/>
+			<call arg="165"/>
+			<push arg="233"/>
+			<call arg="167"/>
 			<if arg="69"/>
 			<push arg="16"/>
 			<push arg="10"/>
 			<new/>
 			<call arg="17"/>
-			<goto arg="238"/>
+			<goto arg="234"/>
 			<load arg="25"/>
-			<call arg="239"/>
-			<goto arg="240"/>
+			<call arg="235"/>
+			<goto arg="236"/>
 			<load arg="34"/>
-			<push arg="236"/>
-			<call arg="241"/>
-			<store arg="157"/>
-			<load arg="123"/>
-			<load arg="157"/>
-			<call arg="169"/>
-			<if arg="242"/>
+			<push arg="232"/>
+			<call arg="237"/>
+			<store arg="153"/>
+			<load arg="122"/>
+			<load arg="153"/>
+			<call arg="165"/>
+			<if arg="238"/>
 			<push arg="16"/>
 			<push arg="10"/>
 			<new/>
 			<call arg="17"/>
-			<goto arg="240"/>
+			<goto arg="236"/>
 			<pushi arg="61"/>
-			<push arg="237"/>
-			<store arg="158"/>
-			<load arg="157"/>
+			<push arg="233"/>
+			<store arg="154"/>
+			<load arg="153"/>
 			<iterate/>
-			<store arg="165"/>
-			<load arg="158"/>
-			<load arg="165"/>
-			<call arg="243"/>
-			<store arg="158"/>
-			<enditerate/>
-			<load arg="158"/>
+			<store arg="161"/>
+			<load arg="154"/>
+			<load arg="161"/>
 			<call arg="239"/>
-			<call arg="244"/>
+			<store arg="154"/>
+			<enditerate/>
+			<load arg="154"/>
+			<call arg="235"/>
+			<call arg="240"/>
 		</code>
 		<linenumbertable>
-			<lne id="245" begin="0" end="0"/>
-			<lne id="246" begin="0" end="1"/>
-			<lne id="247" begin="3" end="3"/>
-			<lne id="248" begin="3" end="4"/>
-			<lne id="249" begin="6" end="6"/>
-			<lne id="250" begin="6" end="7"/>
-			<lne id="251" begin="9" end="9"/>
-			<lne id="252" begin="9" end="10"/>
-			<lne id="253" begin="11" end="11"/>
-			<lne id="254" begin="9" end="12"/>
-			<lne id="255" begin="14" end="14"/>
-			<lne id="256" begin="15" end="15"/>
-			<lne id="257" begin="14" end="16"/>
-			<lne id="258" begin="17" end="17"/>
-			<lne id="259" begin="14" end="18"/>
-			<lne id="260" begin="20" end="23"/>
-			<lne id="261" begin="25" end="25"/>
-			<lne id="262" begin="25" end="26"/>
-			<lne id="263" begin="14" end="26"/>
-			<lne id="264" begin="28" end="28"/>
-			<lne id="265" begin="29" end="29"/>
-			<lne id="266" begin="28" end="30"/>
-			<lne id="267" begin="32" end="32"/>
-			<lne id="268" begin="33" end="33"/>
-			<lne id="269" begin="32" end="34"/>
-			<lne id="270" begin="36" end="39"/>
-			<lne id="271" begin="41" end="41"/>
-			<lne id="272" begin="42" end="42"/>
-			<lne id="273" begin="44" end="44"/>
-			<lne id="274" begin="47" end="47"/>
-			<lne id="275" begin="48" end="48"/>
-			<lne id="276" begin="47" end="49"/>
-			<lne id="277" begin="42" end="52"/>
-			<lne id="278" begin="42" end="53"/>
-			<lne id="279" begin="41" end="54"/>
-			<lne id="280" begin="32" end="54"/>
-			<lne id="281" begin="28" end="54"/>
-			<lne id="282" begin="9" end="54"/>
-			<lne id="283" begin="6" end="54"/>
-			<lne id="284" begin="3" end="54"/>
-			<lne id="285" begin="0" end="54"/>
+			<lne id="241" begin="0" end="0"/>
+			<lne id="242" begin="0" end="1"/>
+			<lne id="243" begin="3" end="3"/>
+			<lne id="244" begin="3" end="4"/>
+			<lne id="245" begin="6" end="6"/>
+			<lne id="246" begin="6" end="7"/>
+			<lne id="247" begin="9" end="9"/>
+			<lne id="248" begin="9" end="10"/>
+			<lne id="249" begin="11" end="11"/>
+			<lne id="250" begin="9" end="12"/>
+			<lne id="251" begin="14" end="14"/>
+			<lne id="252" begin="15" end="15"/>
+			<lne id="253" begin="14" end="16"/>
+			<lne id="254" begin="17" end="17"/>
+			<lne id="255" begin="14" end="18"/>
+			<lne id="256" begin="20" end="23"/>
+			<lne id="257" begin="25" end="25"/>
+			<lne id="258" begin="25" end="26"/>
+			<lne id="259" begin="14" end="26"/>
+			<lne id="260" begin="28" end="28"/>
+			<lne id="261" begin="29" end="29"/>
+			<lne id="262" begin="28" end="30"/>
+			<lne id="263" begin="32" end="32"/>
+			<lne id="264" begin="33" end="33"/>
+			<lne id="265" begin="32" end="34"/>
+			<lne id="266" begin="36" end="39"/>
+			<lne id="267" begin="41" end="41"/>
+			<lne id="268" begin="42" end="42"/>
+			<lne id="269" begin="44" end="44"/>
+			<lne id="270" begin="47" end="47"/>
+			<lne id="271" begin="48" end="48"/>
+			<lne id="272" begin="47" end="49"/>
+			<lne id="273" begin="42" end="52"/>
+			<lne id="274" begin="42" end="53"/>
+			<lne id="275" begin="41" end="54"/>
+			<lne id="276" begin="32" end="54"/>
+			<lne id="277" begin="28" end="54"/>
+			<lne id="278" begin="9" end="54"/>
+			<lne id="279" begin="6" end="54"/>
+			<lne id="280" begin="3" end="54"/>
+			<lne id="281" begin="0" end="54"/>
 		</linenumbertable>
 		<localvariabletable>
-			<lve slot="6" name="286" begin="46" end="50"/>
-			<lve slot="5" name="287" begin="43" end="52"/>
-			<lve slot="4" name="288" begin="31" end="54"/>
-			<lve slot="3" name="289" begin="8" end="54"/>
-			<lve slot="2" name="290" begin="5" end="54"/>
-			<lve slot="1" name="291" begin="2" end="54"/>
+			<lve slot="6" name="282" begin="46" end="50"/>
+			<lve slot="5" name="283" begin="43" end="52"/>
+			<lve slot="4" name="284" begin="31" end="54"/>
+			<lve slot="3" name="285" begin="8" end="54"/>
+			<lve slot="2" name="286" begin="5" end="54"/>
+			<lve slot="1" name="287" begin="2" end="54"/>
 			<lve slot="0" name="23" begin="0" end="54"/>
 		</localvariabletable>
 	</operation>
-	<operation name="292">
+	<operation name="288">
 		<context type="8"/>
 		<parameters>
 		</parameters>
 		<code>
-			<push arg="293"/>
+			<push arg="289"/>
 			<push arg="107"/>
 			<findme/>
 			<push arg="108"/>
@@ -1144,12 +1134,12 @@
 			<push arg="55"/>
 			<call arg="111"/>
 			<dup/>
-			<push arg="294"/>
+			<push arg="290"/>
 			<load arg="25"/>
 			<call arg="112"/>
 			<dup/>
 			<push arg="113"/>
-			<push arg="295"/>
+			<push arg="291"/>
 			<push arg="89"/>
 			<new/>
 			<call arg="115"/>
@@ -1158,29 +1148,28 @@
 			<enditerate/>
 		</code>
 		<linenumbertable>
-			<lne id="296" begin="21" end="23"/>
-			<lne id="297" begin="19" end="24"/>
+			<lne id="292" begin="19" end="24"/>
 		</linenumbertable>
 		<localvariabletable>
-			<lve slot="1" name="294" begin="6" end="26"/>
+			<lve slot="1" name="290" begin="6" end="26"/>
 			<lve slot="0" name="23" begin="0" end="27"/>
 		</localvariabletable>
 	</operation>
-	<operation name="298">
+	<operation name="293">
 		<context type="8"/>
 		<parameters>
-			<parameter name="25" type="120"/>
+			<parameter name="25" type="119"/>
 		</parameters>
 		<code>
 			<load arg="25"/>
-			<push arg="294"/>
-			<call arg="121"/>
+			<push arg="290"/>
+			<call arg="120"/>
 			<store arg="34"/>
 			<load arg="25"/>
 			<push arg="113"/>
-			<call arg="122"/>
-			<store arg="123"/>
-			<load arg="123"/>
+			<call arg="121"/>
+			<store arg="122"/>
+			<load arg="122"/>
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
@@ -1190,44 +1179,44 @@
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
-			<get arg="299"/>
+			<get arg="294"/>
 			<call arg="35"/>
-			<set arg="300"/>
+			<set arg="295"/>
 			<pop/>
-			<load arg="123"/>
+			<load arg="122"/>
 			<getasm/>
-			<push arg="293"/>
-			<call arg="125"/>
-			<pcall arg="126"/>
+			<push arg="289"/>
+			<call arg="124"/>
+			<pcall arg="125"/>
 		</code>
 		<linenumbertable>
-			<lne id="301" begin="11" end="11"/>
-			<lne id="302" begin="11" end="12"/>
-			<lne id="303" begin="9" end="14"/>
-			<lne id="304" begin="17" end="17"/>
-			<lne id="305" begin="17" end="18"/>
-			<lne id="306" begin="15" end="20"/>
-			<lne id="297" begin="8" end="21"/>
-			<lne id="307" begin="22" end="22"/>
-			<lne id="308" begin="23" end="23"/>
-			<lne id="309" begin="24" end="24"/>
-			<lne id="310" begin="23" end="25"/>
-			<lne id="311" begin="22" end="26"/>
-			<lne id="312" begin="22" end="26"/>
+			<lne id="296" begin="11" end="11"/>
+			<lne id="297" begin="11" end="12"/>
+			<lne id="298" begin="9" end="14"/>
+			<lne id="299" begin="17" end="17"/>
+			<lne id="300" begin="17" end="18"/>
+			<lne id="301" begin="15" end="20"/>
+			<lne id="292" begin="8" end="21"/>
+			<lne id="302" begin="22" end="22"/>
+			<lne id="303" begin="23" end="23"/>
+			<lne id="304" begin="24" end="24"/>
+			<lne id="305" begin="23" end="25"/>
+			<lne id="306" begin="22" end="26"/>
+			<lne id="307" begin="22" end="26"/>
 		</linenumbertable>
 		<localvariabletable>
 			<lve slot="3" name="113" begin="7" end="26"/>
-			<lve slot="2" name="294" begin="3" end="26"/>
+			<lve slot="2" name="290" begin="3" end="26"/>
 			<lve slot="0" name="23" begin="0" end="26"/>
-			<lve slot="1" name="142" begin="0" end="26"/>
+			<lve slot="1" name="141" begin="0" end="26"/>
 		</localvariabletable>
 	</operation>
-	<operation name="313">
+	<operation name="308">
 		<context type="8"/>
 		<parameters>
 		</parameters>
 		<code>
-			<push arg="314"/>
+			<push arg="309"/>
 			<push arg="107"/>
 			<findme/>
 			<push arg="108"/>
@@ -1243,12 +1232,12 @@
 			<push arg="57"/>
 			<call arg="111"/>
 			<dup/>
-			<push arg="291"/>
+			<push arg="287"/>
 			<load arg="25"/>
 			<call arg="112"/>
 			<dup/>
 			<push arg="113"/>
-			<push arg="315"/>
+			<push arg="310"/>
 			<push arg="89"/>
 			<new/>
 			<call arg="115"/>
@@ -1257,29 +1246,28 @@
 			<enditerate/>
 		</code>
 		<linenumbertable>
-			<lne id="316" begin="21" end="23"/>
-			<lne id="317" begin="19" end="24"/>
+			<lne id="311" begin="19" end="24"/>
 		</linenumbertable>
 		<localvariabletable>
-			<lve slot="1" name="291" begin="6" end="26"/>
+			<lve slot="1" name="287" begin="6" end="26"/>
 			<lve slot="0" name="23" begin="0" end="27"/>
 		</localvariabletable>
 	</operation>
-	<operation name="318">
+	<operation name="312">
 		<context type="8"/>
 		<parameters>
-			<parameter name="25" type="120"/>
+			<parameter name="25" type="119"/>
 		</parameters>
 		<code>
 			<load arg="25"/>
-			<push arg="291"/>
-			<call arg="121"/>
+			<push arg="287"/>
+			<call arg="120"/>
 			<store arg="34"/>
 			<load arg="25"/>
 			<push arg="113"/>
-			<call arg="122"/>
-			<store arg="123"/>
-			<load arg="123"/>
+			<call arg="121"/>
+			<store arg="122"/>
+			<load arg="122"/>
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
@@ -1289,36 +1277,36 @@
 			<dup/>
 			<getasm/>
 			<load arg="34"/>
-			<get arg="319"/>
+			<get arg="313"/>
 			<call arg="35"/>
-			<set arg="161"/>
+			<set arg="157"/>
 			<pop/>
-			<load arg="123"/>
+			<load arg="122"/>
 			<getasm/>
-			<push arg="314"/>
-			<call arg="125"/>
-			<pcall arg="126"/>
+			<push arg="309"/>
+			<call arg="124"/>
+			<pcall arg="125"/>
 		</code>
 		<linenumbertable>
-			<lne id="320" begin="11" end="11"/>
-			<lne id="321" begin="11" end="12"/>
-			<lne id="322" begin="9" end="14"/>
-			<lne id="323" begin="17" end="17"/>
-			<lne id="324" begin="17" end="18"/>
-			<lne id="325" begin="15" end="20"/>
-			<lne id="317" begin="8" end="21"/>
-			<lne id="326" begin="22" end="22"/>
-			<lne id="327" begin="23" end="23"/>
-			<lne id="328" begin="24" end="24"/>
-			<lne id="329" begin="23" end="25"/>
-			<lne id="330" begin="22" end="26"/>
-			<lne id="331" begin="22" end="26"/>
+			<lne id="314" begin="11" end="11"/>
+			<lne id="315" begin="11" end="12"/>
+			<lne id="316" begin="9" end="14"/>
+			<lne id="317" begin="17" end="17"/>
+			<lne id="318" begin="17" end="18"/>
+			<lne id="319" begin="15" end="20"/>
+			<lne id="311" begin="8" end="21"/>
+			<lne id="320" begin="22" end="22"/>
+			<lne id="321" begin="23" end="23"/>
+			<lne id="322" begin="24" end="24"/>
+			<lne id="323" begin="23" end="25"/>
+			<lne id="324" begin="22" end="26"/>
+			<lne id="325" begin="22" end="26"/>
 		</linenumbertable>
 		<localvariabletable>
 			<lve slot="3" name="113" begin="7" end="26"/>
-			<lve slot="2" name="291" begin="3" end="26"/>
+			<lve slot="2" name="287" begin="3" end="26"/>
 			<lve slot="0" name="23" begin="0" end="26"/>
-			<lve slot="1" name="142" begin="0" end="26"/>
+			<lve slot="1" name="141" begin="0" end="26"/>
 		</localvariabletable>
 	</operation>
 </asm>