diff options
| author | Hugo Bruneliere | 2017-11-02 12:22:10 +0000 |
|---|---|---|
| committer | Hugo Bruneliere | 2017-11-02 12:22:10 +0000 |
| commit | 066ff45f1c9883394487f2e4dad8d55a5223aed4 (patch) | |
| tree | 4afa1c7c9ffc4624bf5bd6cf8ad8b89290b660ba | |
| parent | cbb0a6fa97662ce4dbbabbf74c5d680fe3ab1069 (diff) | |
| download | org.eclipse.modisco-066ff45f1c9883394487f2e4dad8d55a5223aed4.tar.gz org.eclipse.modisco-066ff45f1c9883394487f2e4dad8d55a5223aed4.tar.xz org.eclipse.modisco-066ff45f1c9883394487f2e4dad8d55a5223aed4.zip | |
Update transformation javaToKdm.atl Bug 526229
Change-Id: I128fc62c53fe99d16bc9845713345069d6f80fb7
2 files changed, 716 insertions, 578 deletions
diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.asm b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.asm index 3af50c5ad..bf624b8d5 100644 --- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.asm +++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.asm @@ -756,12 +756,12 @@ <constant value="1795:7-1795:78"/>
<constant value="1795:3-1795:78"/>
<constant value="1797:5-1805:3"/>
- <constant value="2054:8-2054:11"/>
- <constant value="2054:8-2054:35"/>
- <constant value="2054:48-2054:76"/>
- <constant value="2054:8-2054:77"/>
- <constant value="2054:4-2054:77"/>
- <constant value="2055:5-2059:3"/>
+ <constant value="2074:8-2074:11"/>
+ <constant value="2074:8-2074:35"/>
+ <constant value="2074:48-2074:76"/>
+ <constant value="2074:8-2074:77"/>
+ <constant value="2074:4-2074:77"/>
+ <constant value="2075:5-2079:3"/>
<constant value="1060:8-1060:11"/>
<constant value="1060:8-1060:29"/>
<constant value="1060:8-1060:46"/>
@@ -914,19 +914,19 @@ <constant value="1903:5-1914:3"/>
<constant value="1920:5-1927:3"/>
<constant value="1933:5-1939:3"/>
- <constant value="1953:5-1960:3"/>
- <constant value="1966:5-1972:3"/>
- <constant value="1978:5-1993:3"/>
- <constant value="2000:5-2003:3"/>
- <constant value="2009:5-2014:3"/>
- <constant value="2020:5-2025:3"/>
- <constant value="2031:5-2036:3"/>
- <constant value="2042:5-2047:3"/>
- <constant value="2065:5-2079:3"/>
- <constant value="2085:5-2106:3"/>
- <constant value="2112:5-2117:3"/>
- <constant value="2123:5-2126:3"/>
- <constant value="2132:5-2138:3"/>
+ <constant value="1953:5-1980:3"/>
+ <constant value="1986:5-1992:3"/>
+ <constant value="1998:5-2013:3"/>
+ <constant value="2020:5-2023:3"/>
+ <constant value="2029:5-2034:3"/>
+ <constant value="2040:5-2045:3"/>
+ <constant value="2051:5-2056:3"/>
+ <constant value="2062:5-2067:3"/>
+ <constant value="2085:5-2099:3"/>
+ <constant value="2105:5-2126:3"/>
+ <constant value="2132:5-2137:3"/>
+ <constant value="2143:5-2146:3"/>
+ <constant value="2152:5-2158:3"/>
<constant value="f"/>
<constant value="__matchModifierToAttribute"/>
<constant value="Modifier"/>
@@ -3274,283 +3274,315 @@ <constant value="infix expression"/>
<constant value="leftOperand"/>
<constant value="rightOperand"/>
+ <constant value="73"/>
<constant value="extendedOperands"/>
- <constant value="103"/>
<constant value="1954:11-1954:29"/>
<constant value="1954:3-1954:29"/>
<constant value="1955:12-1955:15"/>
<constant value="1955:12-1955:24"/>
<constant value="1955:12-1955:35"/>
<constant value="1955:4-1955:35"/>
- <constant value="1957:19-1957:29"/>
- <constant value="1957:48-1957:51"/>
- <constant value="1957:48-1957:63"/>
- <constant value="1957:19-1957:64"/>
- <constant value="1957:4-1957:64"/>
- <constant value="1958:19-1958:29"/>
- <constant value="1958:48-1958:51"/>
- <constant value="1958:48-1958:64"/>
- <constant value="1958:19-1958:65"/>
- <constant value="1958:4-1958:65"/>
- <constant value="1959:19-1959:22"/>
- <constant value="1959:19-1959:39"/>
- <constant value="1959:53-1959:63"/>
- <constant value="1959:82-1959:83"/>
- <constant value="1959:53-1959:84"/>
- <constant value="1959:19-1959:85"/>
- <constant value="1959:19-1959:96"/>
- <constant value="1959:4-1959:96"/>
+ <constant value="1958:8-1958:11"/>
+ <constant value="1958:8-1958:23"/>
+ <constant value="1958:8-1958:40"/>
+ <constant value="1961:9-1961:12"/>
+ <constant value="1961:9-1961:24"/>
+ <constant value="1961:37-1961:62"/>
+ <constant value="1961:9-1961:63"/>
+ <constant value="1964:6-1964:16"/>
+ <constant value="1962:6-1962:16"/>
+ <constant value="1962:32-1962:35"/>
+ <constant value="1962:32-1962:47"/>
+ <constant value="1962:6-1962:48"/>
+ <constant value="1961:5-1965:10"/>
+ <constant value="1959:5-1959:15"/>
+ <constant value="1958:4-1966:9"/>
+ <constant value="1957:4-1966:9"/>
+ <constant value="1968:8-1968:11"/>
+ <constant value="1968:8-1968:24"/>
+ <constant value="1968:8-1968:41"/>
+ <constant value="1971:9-1971:12"/>
+ <constant value="1971:9-1971:25"/>
+ <constant value="1971:38-1971:63"/>
+ <constant value="1971:9-1971:64"/>
+ <constant value="1974:6-1974:16"/>
+ <constant value="1972:6-1972:16"/>
+ <constant value="1972:32-1972:35"/>
+ <constant value="1972:32-1972:48"/>
+ <constant value="1972:6-1972:49"/>
+ <constant value="1971:5-1975:10"/>
+ <constant value="1969:5-1969:15"/>
+ <constant value="1968:4-1976:9"/>
+ <constant value="1967:4-1976:9"/>
+ <constant value="1977:19-1977:29"/>
+ <constant value="1977:48-1977:51"/>
+ <constant value="1977:48-1977:63"/>
+ <constant value="1977:19-1977:64"/>
+ <constant value="1977:4-1977:64"/>
+ <constant value="1978:19-1978:29"/>
+ <constant value="1978:48-1978:51"/>
+ <constant value="1978:48-1978:64"/>
+ <constant value="1978:19-1978:65"/>
+ <constant value="1978:4-1978:65"/>
+ <constant value="1979:19-1979:22"/>
+ <constant value="1979:19-1979:39"/>
+ <constant value="1979:53-1979:63"/>
+ <constant value="1979:82-1979:83"/>
+ <constant value="1979:53-1979:84"/>
+ <constant value="1979:19-1979:85"/>
+ <constant value="1979:19-1979:96"/>
+ <constant value="1979:4-1979:96"/>
<constant value="__applyInstanceofExpressionToActionElement"/>
<constant value="instanceof"/>
- <constant value="1967:11-1967:23"/>
- <constant value="1967:3-1967:23"/>
- <constant value="1968:12-1968:24"/>
- <constant value="1968:4-1968:24"/>
- <constant value="1970:19-1970:29"/>
- <constant value="1970:48-1970:51"/>
- <constant value="1970:48-1970:63"/>
- <constant value="1970:19-1970:64"/>
- <constant value="1970:4-1970:64"/>
- <constant value="1971:25-1971:28"/>
- <constant value="1971:25-1971:41"/>
- <constant value="1971:25-1971:58"/>
- <constant value="1971:81-1971:91"/>
- <constant value="1971:108-1971:111"/>
- <constant value="1971:108-1971:124"/>
- <constant value="1971:81-1971:125"/>
- <constant value="1971:65-1971:75"/>
- <constant value="1971:22-1971:131"/>
- <constant value="1971:4-1971:131"/>
+ <constant value="1987:11-1987:23"/>
+ <constant value="1987:3-1987:23"/>
+ <constant value="1988:12-1988:24"/>
+ <constant value="1988:4-1988:24"/>
+ <constant value="1990:19-1990:29"/>
+ <constant value="1990:48-1990:51"/>
+ <constant value="1990:48-1990:63"/>
+ <constant value="1990:19-1990:64"/>
+ <constant value="1990:4-1990:64"/>
+ <constant value="1991:25-1991:28"/>
+ <constant value="1991:25-1991:41"/>
+ <constant value="1991:25-1991:58"/>
+ <constant value="1991:81-1991:91"/>
+ <constant value="1991:108-1991:111"/>
+ <constant value="1991:108-1991:124"/>
+ <constant value="1991:81-1991:125"/>
+ <constant value="1991:65-1991:75"/>
+ <constant value="1991:22-1991:131"/>
+ <constant value="1991:4-1991:131"/>
<constant value="__applyMethodInvocationToActionElement"/>
<constant value="method invocation"/>
- <constant value="1979:11-1979:30"/>
- <constant value="1979:3-1979:30"/>
- <constant value="1980:12-1980:31"/>
- <constant value="1980:4-1980:31"/>
- <constant value="1982:19-1982:29"/>
- <constant value="1982:48-1982:51"/>
- <constant value="1982:48-1982:62"/>
- <constant value="1982:19-1982:63"/>
- <constant value="1982:4-1982:63"/>
- <constant value="1983:19-1983:22"/>
- <constant value="1983:19-1983:32"/>
- <constant value="1983:46-1983:56"/>
- <constant value="1983:75-1983:76"/>
- <constant value="1983:46-1983:77"/>
- <constant value="1983:19-1983:78"/>
- <constant value="1983:19-1983:89"/>
- <constant value="1983:4-1983:89"/>
- <constant value="1984:25-1984:28"/>
- <constant value="1984:25-1984:35"/>
- <constant value="1984:25-1984:52"/>
- <constant value="1987:13-1987:16"/>
- <constant value="1987:13-1987:23"/>
- <constant value="1987:13-1987:38"/>
- <constant value="1987:13-1987:48"/>
- <constant value="1990:10-1990:20"/>
- <constant value="1990:50-1990:53"/>
- <constant value="1990:10-1990:54"/>
- <constant value="1988:10-1988:20"/>
- <constant value="1988:34-1988:37"/>
- <constant value="1988:10-1988:38"/>
- <constant value="1987:9-1991:14"/>
- <constant value="1985:9-1985:19"/>
- <constant value="1984:22-1992:13"/>
- <constant value="1984:4-1992:13"/>
+ <constant value="1999:11-1999:30"/>
+ <constant value="1999:3-1999:30"/>
+ <constant value="2000:12-2000:31"/>
+ <constant value="2000:4-2000:31"/>
+ <constant value="2002:19-2002:29"/>
+ <constant value="2002:48-2002:51"/>
+ <constant value="2002:48-2002:62"/>
+ <constant value="2002:19-2002:63"/>
+ <constant value="2002:4-2002:63"/>
+ <constant value="2003:19-2003:22"/>
+ <constant value="2003:19-2003:32"/>
+ <constant value="2003:46-2003:56"/>
+ <constant value="2003:75-2003:76"/>
+ <constant value="2003:46-2003:77"/>
+ <constant value="2003:19-2003:78"/>
+ <constant value="2003:19-2003:89"/>
+ <constant value="2003:4-2003:89"/>
+ <constant value="2004:25-2004:28"/>
+ <constant value="2004:25-2004:35"/>
+ <constant value="2004:25-2004:52"/>
+ <constant value="2007:13-2007:16"/>
+ <constant value="2007:13-2007:23"/>
+ <constant value="2007:13-2007:38"/>
+ <constant value="2007:13-2007:48"/>
+ <constant value="2010:10-2010:20"/>
+ <constant value="2010:50-2010:53"/>
+ <constant value="2010:10-2010:54"/>
+ <constant value="2008:10-2008:20"/>
+ <constant value="2008:34-2008:37"/>
+ <constant value="2008:10-2008:38"/>
+ <constant value="2007:9-2011:14"/>
+ <constant value="2005:9-2005:19"/>
+ <constant value="2004:22-2012:13"/>
+ <constant value="2004:4-2012:13"/>
<constant value="__applyNullLiteralToActionElement"/>
<constant value="null"/>
- <constant value="2001:11-2001:17"/>
- <constant value="2001:3-2001:17"/>
- <constant value="2002:12-2002:18"/>
- <constant value="2002:4-2002:18"/>
+ <constant value="2021:11-2021:17"/>
+ <constant value="2021:3-2021:17"/>
+ <constant value="2022:12-2022:18"/>
+ <constant value="2022:4-2022:18"/>
<constant value="__applyNumberLiteralToValue"/>
<constant value="number literal"/>
- <constant value="2010:11-2010:27"/>
- <constant value="2010:3-2010:27"/>
- <constant value="2011:11-2011:14"/>
- <constant value="2011:11-2011:25"/>
- <constant value="2011:4-2011:25"/>
- <constant value="2013:12-2013:27"/>
- <constant value="2013:12-2013:42"/>
- <constant value="2013:12-2013:51"/>
- <constant value="2013:4-2013:51"/>
+ <constant value="2030:11-2030:27"/>
+ <constant value="2030:3-2030:27"/>
+ <constant value="2031:11-2031:14"/>
+ <constant value="2031:11-2031:25"/>
+ <constant value="2031:4-2031:25"/>
+ <constant value="2033:12-2033:27"/>
+ <constant value="2033:12-2033:42"/>
+ <constant value="2033:12-2033:51"/>
+ <constant value="2033:4-2033:51"/>
<constant value="__applyParenthesizedExpressionToActionElement"/>
<constant value="parenthesized"/>
- <constant value="2021:11-2021:26"/>
- <constant value="2021:3-2021:26"/>
- <constant value="2022:12-2022:27"/>
- <constant value="2022:4-2022:27"/>
- <constant value="2024:19-2024:29"/>
- <constant value="2024:48-2024:51"/>
- <constant value="2024:48-2024:62"/>
- <constant value="2024:19-2024:63"/>
- <constant value="2024:4-2024:63"/>
+ <constant value="2041:11-2041:26"/>
+ <constant value="2041:3-2041:26"/>
+ <constant value="2042:12-2042:27"/>
+ <constant value="2042:4-2042:27"/>
+ <constant value="2044:19-2044:29"/>
+ <constant value="2044:48-2044:51"/>
+ <constant value="2044:48-2044:62"/>
+ <constant value="2044:19-2044:63"/>
+ <constant value="2044:4-2044:63"/>
<constant value="__applyPostfixExpressionToActionElement"/>
<constant value="postfix expression"/>
<constant value="operand"/>
- <constant value="2032:11-2032:31"/>
- <constant value="2032:3-2032:31"/>
- <constant value="2033:12-2033:15"/>
- <constant value="2033:12-2033:24"/>
- <constant value="2033:12-2033:35"/>
- <constant value="2033:4-2033:35"/>
- <constant value="2035:19-2035:29"/>
- <constant value="2035:48-2035:51"/>
- <constant value="2035:48-2035:59"/>
- <constant value="2035:19-2035:60"/>
- <constant value="2035:4-2035:60"/>
+ <constant value="2052:11-2052:31"/>
+ <constant value="2052:3-2052:31"/>
+ <constant value="2053:12-2053:15"/>
+ <constant value="2053:12-2053:24"/>
+ <constant value="2053:12-2053:35"/>
+ <constant value="2053:4-2053:35"/>
+ <constant value="2055:19-2055:29"/>
+ <constant value="2055:48-2055:51"/>
+ <constant value="2055:48-2055:59"/>
+ <constant value="2055:19-2055:60"/>
+ <constant value="2055:4-2055:60"/>
<constant value="__applyPrefixExpressionToActionElement"/>
<constant value="prefix expression"/>
- <constant value="2043:11-2043:30"/>
- <constant value="2043:3-2043:30"/>
- <constant value="2044:12-2044:15"/>
- <constant value="2044:12-2044:24"/>
- <constant value="2044:12-2044:35"/>
- <constant value="2044:4-2044:35"/>
- <constant value="2046:19-2046:29"/>
- <constant value="2046:48-2046:51"/>
- <constant value="2046:48-2046:59"/>
- <constant value="2046:19-2046:60"/>
- <constant value="2046:4-2046:60"/>
+ <constant value="2063:11-2063:30"/>
+ <constant value="2063:3-2063:30"/>
+ <constant value="2064:12-2064:15"/>
+ <constant value="2064:12-2064:24"/>
+ <constant value="2064:12-2064:35"/>
+ <constant value="2064:4-2064:35"/>
+ <constant value="2066:19-2066:29"/>
+ <constant value="2066:48-2066:51"/>
+ <constant value="2066:48-2066:59"/>
+ <constant value="2066:19-2066:60"/>
+ <constant value="2066:4-2066:60"/>
<constant value="__applyStringLiteralToValue"/>
<constant value="string literal"/>
- <constant value="2056:11-2056:27"/>
- <constant value="2056:3-2056:27"/>
- <constant value="2057:11-2057:14"/>
- <constant value="2057:11-2057:27"/>
- <constant value="2057:4-2057:27"/>
- <constant value="2058:12-2058:26"/>
- <constant value="2058:12-2058:41"/>
- <constant value="2058:12-2058:50"/>
- <constant value="2058:4-2058:50"/>
+ <constant value="2076:11-2076:27"/>
+ <constant value="2076:3-2076:27"/>
+ <constant value="2077:11-2077:14"/>
+ <constant value="2077:11-2077:27"/>
+ <constant value="2077:4-2077:27"/>
+ <constant value="2078:12-2078:26"/>
+ <constant value="2078:12-2078:41"/>
+ <constant value="2078:12-2078:50"/>
+ <constant value="2078:4-2078:50"/>
<constant value="__applySuperFieldAccessToActionElement"/>
<constant value="super field access"/>
<constant value="qualifier"/>
- <constant value="2066:11-2066:31"/>
- <constant value="2066:3-2066:31"/>
- <constant value="2067:12-2067:32"/>
- <constant value="2067:4-2067:32"/>
- <constant value="2069:25-2069:28"/>
- <constant value="2069:25-2069:34"/>
- <constant value="2069:25-2069:51"/>
- <constant value="2069:74-2069:84"/>
- <constant value="2069:101-2069:104"/>
- <constant value="2069:101-2069:110"/>
- <constant value="2069:74-2069:111"/>
- <constant value="2069:58-2069:68"/>
- <constant value="2069:22-2069:117"/>
- <constant value="2069:4-2069:117"/>
- <constant value="2070:25-2070:28"/>
- <constant value="2070:25-2070:38"/>
- <constant value="2070:25-2070:55"/>
- <constant value="2071:13-2071:16"/>
- <constant value="2071:13-2071:26"/>
- <constant value="2071:39-2071:64"/>
- <constant value="2071:13-2071:65"/>
- <constant value="2076:10-2076:20"/>
- <constant value="2072:10-2072:20"/>
- <constant value="2072:34-2072:37"/>
- <constant value="2072:34-2072:47"/>
- <constant value="2072:10-2072:48"/>
- <constant value="2071:9-2077:14"/>
- <constant value="2070:62-2070:72"/>
- <constant value="2070:22-2078:13"/>
- <constant value="2070:4-2078:13"/>
- <constant value="__applySuperMethodInvocationToActionElement"/>
- <constant value="super method invocation"/>
- <constant value="89"/>
- <constant value="2086:11-2086:36"/>
- <constant value="2086:3-2086:36"/>
- <constant value="2087:12-2087:37"/>
- <constant value="2087:4-2087:37"/>
- <constant value="2089:19-2089:22"/>
- <constant value="2089:19-2089:32"/>
- <constant value="2089:46-2089:56"/>
- <constant value="2089:75-2089:76"/>
- <constant value="2089:46-2089:77"/>
- <constant value="2089:19-2089:78"/>
- <constant value="2089:19-2089:89"/>
- <constant value="2089:4-2089:89"/>
+ <constant value="2086:11-2086:31"/>
+ <constant value="2086:3-2086:31"/>
+ <constant value="2087:12-2087:32"/>
+ <constant value="2087:4-2087:32"/>
+ <constant value="2089:25-2089:28"/>
+ <constant value="2089:25-2089:34"/>
+ <constant value="2089:25-2089:51"/>
+ <constant value="2089:74-2089:84"/>
+ <constant value="2089:101-2089:104"/>
+ <constant value="2089:101-2089:110"/>
+ <constant value="2089:74-2089:111"/>
+ <constant value="2089:58-2089:68"/>
+ <constant value="2089:22-2089:117"/>
+ <constant value="2089:4-2089:117"/>
<constant value="2090:25-2090:28"/>
- <constant value="2090:25-2090:35"/>
- <constant value="2090:25-2090:52"/>
- <constant value="2091:8-2091:11"/>
- <constant value="2091:8-2091:18"/>
- <constant value="2091:8-2091:33"/>
- <constant value="2091:8-2091:43"/>
- <constant value="2094:10-2094:20"/>
- <constant value="2094:50-2094:53"/>
- <constant value="2094:10-2094:54"/>
+ <constant value="2090:25-2090:38"/>
+ <constant value="2090:25-2090:55"/>
+ <constant value="2091:13-2091:16"/>
+ <constant value="2091:13-2091:26"/>
+ <constant value="2091:39-2091:64"/>
+ <constant value="2091:13-2091:65"/>
+ <constant value="2096:10-2096:20"/>
<constant value="2092:10-2092:20"/>
<constant value="2092:34-2092:37"/>
- <constant value="2092:10-2092:38"/>
- <constant value="2091:4-2095:14"/>
- <constant value="2090:59-2090:69"/>
- <constant value="2090:22-2096:9"/>
- <constant value="2090:4-2096:9"/>
- <constant value="2097:25-2097:28"/>
- <constant value="2097:25-2097:38"/>
- <constant value="2097:25-2097:55"/>
- <constant value="2098:13-2098:16"/>
- <constant value="2098:13-2098:26"/>
- <constant value="2098:39-2098:64"/>
- <constant value="2098:13-2098:65"/>
- <constant value="2103:10-2103:20"/>
- <constant value="2099:10-2099:20"/>
- <constant value="2099:34-2099:37"/>
- <constant value="2099:34-2099:47"/>
- <constant value="2099:10-2099:48"/>
- <constant value="2098:9-2104:14"/>
- <constant value="2097:62-2097:72"/>
- <constant value="2097:22-2105:13"/>
- <constant value="2097:4-2105:13"/>
+ <constant value="2092:34-2092:47"/>
+ <constant value="2092:10-2092:48"/>
+ <constant value="2091:9-2097:14"/>
+ <constant value="2090:62-2090:72"/>
+ <constant value="2090:22-2098:13"/>
+ <constant value="2090:4-2098:13"/>
+ <constant value="__applySuperMethodInvocationToActionElement"/>
+ <constant value="super method invocation"/>
+ <constant value="89"/>
+ <constant value="2106:11-2106:36"/>
+ <constant value="2106:3-2106:36"/>
+ <constant value="2107:12-2107:37"/>
+ <constant value="2107:4-2107:37"/>
+ <constant value="2109:19-2109:22"/>
+ <constant value="2109:19-2109:32"/>
+ <constant value="2109:46-2109:56"/>
+ <constant value="2109:75-2109:76"/>
+ <constant value="2109:46-2109:77"/>
+ <constant value="2109:19-2109:78"/>
+ <constant value="2109:19-2109:89"/>
+ <constant value="2109:4-2109:89"/>
+ <constant value="2110:25-2110:28"/>
+ <constant value="2110:25-2110:35"/>
+ <constant value="2110:25-2110:52"/>
+ <constant value="2111:8-2111:11"/>
+ <constant value="2111:8-2111:18"/>
+ <constant value="2111:8-2111:33"/>
+ <constant value="2111:8-2111:43"/>
+ <constant value="2114:10-2114:20"/>
+ <constant value="2114:50-2114:53"/>
+ <constant value="2114:10-2114:54"/>
+ <constant value="2112:10-2112:20"/>
+ <constant value="2112:34-2112:37"/>
+ <constant value="2112:10-2112:38"/>
+ <constant value="2111:4-2115:14"/>
+ <constant value="2110:59-2110:69"/>
+ <constant value="2110:22-2116:9"/>
+ <constant value="2110:4-2116:9"/>
+ <constant value="2117:25-2117:28"/>
+ <constant value="2117:25-2117:38"/>
+ <constant value="2117:25-2117:55"/>
+ <constant value="2118:13-2118:16"/>
+ <constant value="2118:13-2118:26"/>
+ <constant value="2118:39-2118:64"/>
+ <constant value="2118:13-2118:65"/>
+ <constant value="2123:10-2123:20"/>
+ <constant value="2119:10-2119:20"/>
+ <constant value="2119:34-2119:37"/>
+ <constant value="2119:34-2119:47"/>
+ <constant value="2119:10-2119:48"/>
+ <constant value="2118:9-2124:14"/>
+ <constant value="2117:62-2117:72"/>
+ <constant value="2117:22-2125:13"/>
+ <constant value="2117:4-2125:13"/>
<constant value="__applyThisExpressionToActionElement"/>
<constant value="this"/>
- <constant value="2113:11-2113:17"/>
- <constant value="2113:3-2113:17"/>
- <constant value="2114:12-2114:18"/>
- <constant value="2114:4-2114:18"/>
- <constant value="2116:25-2116:28"/>
- <constant value="2116:25-2116:38"/>
- <constant value="2116:25-2116:55"/>
- <constant value="2116:78-2116:88"/>
- <constant value="2116:105-2116:108"/>
- <constant value="2116:105-2116:118"/>
- <constant value="2116:78-2116:119"/>
- <constant value="2116:62-2116:72"/>
- <constant value="2116:22-2116:125"/>
- <constant value="2116:4-2116:125"/>
+ <constant value="2133:11-2133:17"/>
+ <constant value="2133:3-2133:17"/>
+ <constant value="2134:12-2134:18"/>
+ <constant value="2134:4-2134:18"/>
+ <constant value="2136:25-2136:28"/>
+ <constant value="2136:25-2136:38"/>
+ <constant value="2136:25-2136:55"/>
+ <constant value="2136:78-2136:88"/>
+ <constant value="2136:105-2136:108"/>
+ <constant value="2136:105-2136:118"/>
+ <constant value="2136:78-2136:119"/>
+ <constant value="2136:62-2136:72"/>
+ <constant value="2136:22-2136:125"/>
+ <constant value="2136:4-2136:125"/>
<constant value="__applyTypeLiteralToValue"/>
<constant value="type literal"/>
- <constant value="2124:11-2124:25"/>
- <constant value="2124:3-2124:25"/>
- <constant value="2125:12-2125:15"/>
- <constant value="2125:12-2125:20"/>
- <constant value="2125:12-2125:31"/>
- <constant value="2125:4-2125:31"/>
+ <constant value="2144:11-2144:25"/>
+ <constant value="2144:3-2144:25"/>
+ <constant value="2145:12-2145:15"/>
+ <constant value="2145:12-2145:20"/>
+ <constant value="2145:12-2145:31"/>
+ <constant value="2145:4-2145:31"/>
<constant value="__applyVariableDeclarationExpressionToActionElement"/>
- <constant value="2133:11-2133:33"/>
- <constant value="2133:3-2133:33"/>
- <constant value="2134:12-2134:34"/>
- <constant value="2134:4-2134:34"/>
- <constant value="2136:19-2136:22"/>
- <constant value="2136:19-2136:32"/>
- <constant value="2136:46-2136:56"/>
- <constant value="2136:75-2136:76"/>
- <constant value="2136:46-2136:77"/>
- <constant value="2136:19-2136:78"/>
- <constant value="2136:19-2136:89"/>
- <constant value="2136:4-2136:89"/>
- <constant value="2137:25-2137:28"/>
- <constant value="2137:25-2137:33"/>
- <constant value="2137:25-2137:50"/>
- <constant value="2137:73-2137:83"/>
- <constant value="2137:100-2137:103"/>
- <constant value="2137:100-2137:108"/>
- <constant value="2137:73-2137:109"/>
- <constant value="2137:57-2137:67"/>
- <constant value="2137:22-2137:115"/>
- <constant value="2137:4-2137:115"/>
+ <constant value="2153:11-2153:33"/>
+ <constant value="2153:3-2153:33"/>
+ <constant value="2154:12-2154:34"/>
+ <constant value="2154:4-2154:34"/>
+ <constant value="2156:19-2156:22"/>
+ <constant value="2156:19-2156:32"/>
+ <constant value="2156:46-2156:56"/>
+ <constant value="2156:75-2156:76"/>
+ <constant value="2156:46-2156:77"/>
+ <constant value="2156:19-2156:78"/>
+ <constant value="2156:19-2156:89"/>
+ <constant value="2156:4-2156:89"/>
+ <constant value="2157:25-2157:28"/>
+ <constant value="2157:25-2157:33"/>
+ <constant value="2157:25-2157:50"/>
+ <constant value="2157:73-2157:83"/>
+ <constant value="2157:100-2157:103"/>
+ <constant value="2157:100-2157:108"/>
+ <constant value="2157:73-2157:109"/>
+ <constant value="2157:57-2157:67"/>
+ <constant value="2157:22-2157:115"/>
+ <constant value="2157:4-2157:115"/>
</cp>
<field name="1" type="2"/>
<field name="3" type="4"/>
@@ -22473,6 +22505,60 @@ <set arg="42"/>
<dup/>
<getasm/>
+ <load arg="33"/>
+ <get arg="3271"/>
+ <call arg="269"/>
+ <if arg="1149"/>
+ <load arg="33"/>
+ <get arg="3271"/>
+ <push arg="424"/>
+ <push arg="278"/>
+ <findme/>
+ <call arg="402"/>
+ <if arg="1220"/>
+ <push arg="15"/>
+ <push arg="9"/>
+ <new/>
+ <goto arg="2561"/>
+ <getasm/>
+ <load arg="33"/>
+ <get arg="3271"/>
+ <call arg="3045"/>
+ <goto arg="1070"/>
+ <push arg="15"/>
+ <push arg="9"/>
+ <new/>
+ <call arg="34"/>
+ <set arg="2159"/>
+ <dup/>
+ <getasm/>
+ <load arg="33"/>
+ <get arg="3272"/>
+ <call arg="269"/>
+ <if arg="2160"/>
+ <load arg="33"/>
+ <get arg="3272"/>
+ <push arg="424"/>
+ <push arg="278"/>
+ <findme/>
+ <call arg="402"/>
+ <if arg="3273"/>
+ <push arg="15"/>
+ <push arg="9"/>
+ <new/>
+ <goto arg="1717"/>
+ <getasm/>
+ <load arg="33"/>
+ <get arg="3272"/>
+ <call arg="3045"/>
+ <goto arg="967"/>
+ <push arg="15"/>
+ <push arg="9"/>
+ <new/>
+ <call arg="34"/>
+ <set arg="2159"/>
+ <dup/>
+ <getasm/>
<getasm/>
<load arg="33"/>
<get arg="3271"/>
@@ -22493,7 +22579,7 @@ <push arg="9"/>
<new/>
<load arg="33"/>
- <get arg="3273"/>
+ <get arg="3274"/>
<iterate/>
<store arg="475"/>
<getasm/>
@@ -22539,10 +22625,10 @@ <load arg="33"/>
<get arg="281"/>
<call arg="269"/>
- <if arg="1898"/>
+ <if arg="2700"/>
<load arg="33"/>
<get arg="281"/>
- <goto arg="3274"/>
+ <goto arg="977"/>
<load arg="33"/>
<get arg="284"/>
<call arg="34"/>
@@ -22557,58 +22643,90 @@ <lne id="3279" begin="24" end="26"/>
<lne id="3280" begin="22" end="28"/>
<lne id="3281" begin="31" end="31"/>
- <lne id="3282" begin="32" end="32"/>
- <lne id="3283" begin="32" end="33"/>
- <lne id="3284" begin="31" end="34"/>
- <lne id="3285" begin="29" end="36"/>
- <lne id="3286" begin="39" end="39"/>
- <lne id="3287" begin="40" end="40"/>
- <lne id="3288" begin="40" end="41"/>
- <lne id="3289" begin="39" end="42"/>
- <lne id="3290" begin="37" end="44"/>
- <lne id="3291" begin="50" end="50"/>
- <lne id="3292" begin="50" end="51"/>
- <lne id="3293" begin="54" end="54"/>
- <lne id="3294" begin="55" end="55"/>
- <lne id="3295" begin="54" end="56"/>
- <lne id="3296" begin="47" end="58"/>
- <lne id="3297" begin="47" end="59"/>
- <lne id="3298" begin="45" end="61"/>
- <lne id="303" begin="64" end="64"/>
- <lne id="304" begin="64" end="65"/>
- <lne id="305" begin="62" end="67"/>
- <lne id="306" begin="70" end="70"/>
- <lne id="307" begin="68" end="72"/>
- <lne id="913" begin="16" end="73"/>
- <lne id="309" begin="77" end="77"/>
- <lne id="310" begin="75" end="79"/>
- <lne id="311" begin="82" end="82"/>
- <lne id="312" begin="80" end="84"/>
- <lne id="313" begin="74" end="85"/>
- <lne id="314" begin="89" end="89"/>
- <lne id="315" begin="87" end="91"/>
- <lne id="316" begin="94" end="94"/>
- <lne id="317" begin="94" end="95"/>
- <lne id="318" begin="94" end="96"/>
- <lne id="319" begin="98" end="98"/>
- <lne id="320" begin="98" end="99"/>
- <lne id="321" begin="101" end="101"/>
- <lne id="322" begin="101" end="102"/>
- <lne id="323" begin="94" end="102"/>
- <lne id="324" begin="92" end="104"/>
- <lne id="325" begin="86" end="105"/>
+ <lne id="3282" begin="31" end="32"/>
+ <lne id="3283" begin="31" end="33"/>
+ <lne id="3284" begin="35" end="35"/>
+ <lne id="3285" begin="35" end="36"/>
+ <lne id="3286" begin="37" end="39"/>
+ <lne id="3287" begin="35" end="40"/>
+ <lne id="3288" begin="42" end="44"/>
+ <lne id="3289" begin="46" end="46"/>
+ <lne id="3290" begin="47" end="47"/>
+ <lne id="3291" begin="47" end="48"/>
+ <lne id="3292" begin="46" end="49"/>
+ <lne id="3293" begin="35" end="49"/>
+ <lne id="3294" begin="51" end="53"/>
+ <lne id="3295" begin="31" end="53"/>
+ <lne id="3296" begin="29" end="55"/>
+ <lne id="3297" begin="58" end="58"/>
+ <lne id="3298" begin="58" end="59"/>
+ <lne id="3299" begin="58" end="60"/>
+ <lne id="3300" begin="62" end="62"/>
+ <lne id="3301" begin="62" end="63"/>
+ <lne id="3302" begin="64" end="66"/>
+ <lne id="3303" begin="62" end="67"/>
+ <lne id="3304" begin="69" end="71"/>
+ <lne id="3305" begin="73" end="73"/>
+ <lne id="3306" begin="74" end="74"/>
+ <lne id="3307" begin="74" end="75"/>
+ <lne id="3308" begin="73" end="76"/>
+ <lne id="3309" begin="62" end="76"/>
+ <lne id="3310" begin="78" end="80"/>
+ <lne id="3311" begin="58" end="80"/>
+ <lne id="3312" begin="56" end="82"/>
+ <lne id="3313" begin="85" end="85"/>
+ <lne id="3314" begin="86" end="86"/>
+ <lne id="3315" begin="86" end="87"/>
+ <lne id="3316" begin="85" end="88"/>
+ <lne id="3317" begin="83" end="90"/>
+ <lne id="3318" begin="93" end="93"/>
+ <lne id="3319" begin="94" end="94"/>
+ <lne id="3320" begin="94" end="95"/>
+ <lne id="3321" begin="93" end="96"/>
+ <lne id="3322" begin="91" end="98"/>
+ <lne id="3323" begin="104" end="104"/>
+ <lne id="3324" begin="104" end="105"/>
+ <lne id="3325" begin="108" end="108"/>
+ <lne id="3326" begin="109" end="109"/>
+ <lne id="3327" begin="108" end="110"/>
+ <lne id="3328" begin="101" end="112"/>
+ <lne id="3329" begin="101" end="113"/>
+ <lne id="3330" begin="99" end="115"/>
+ <lne id="303" begin="118" end="118"/>
+ <lne id="304" begin="118" end="119"/>
+ <lne id="305" begin="116" end="121"/>
+ <lne id="306" begin="124" end="124"/>
+ <lne id="307" begin="122" end="126"/>
+ <lne id="913" begin="16" end="127"/>
+ <lne id="309" begin="131" end="131"/>
+ <lne id="310" begin="129" end="133"/>
+ <lne id="311" begin="136" end="136"/>
+ <lne id="312" begin="134" end="138"/>
+ <lne id="313" begin="128" end="139"/>
+ <lne id="314" begin="143" end="143"/>
+ <lne id="315" begin="141" end="145"/>
+ <lne id="316" begin="148" end="148"/>
+ <lne id="317" begin="148" end="149"/>
+ <lne id="318" begin="148" end="150"/>
+ <lne id="319" begin="152" end="152"/>
+ <lne id="320" begin="152" end="153"/>
+ <lne id="321" begin="155" end="155"/>
+ <lne id="322" begin="155" end="156"/>
+ <lne id="323" begin="148" end="156"/>
+ <lne id="324" begin="146" end="158"/>
+ <lne id="325" begin="140" end="159"/>
</linenumbertable>
<localvariabletable>
- <lve slot="6" name="37" begin="53" end="57"/>
- <lve slot="3" name="259" begin="7" end="105"/>
- <lve slot="4" name="262" begin="11" end="105"/>
- <lve slot="5" name="264" begin="15" end="105"/>
- <lve slot="2" name="257" begin="3" end="105"/>
- <lve slot="0" name="22" begin="0" end="105"/>
- <lve slot="1" name="326" begin="0" end="105"/>
+ <lve slot="6" name="37" begin="107" end="111"/>
+ <lve slot="3" name="259" begin="7" end="159"/>
+ <lve slot="4" name="262" begin="11" end="159"/>
+ <lve slot="5" name="264" begin="15" end="159"/>
+ <lve slot="2" name="257" begin="3" end="159"/>
+ <lve slot="0" name="22" begin="0" end="159"/>
+ <lve slot="1" name="326" begin="0" end="159"/>
</localvariabletable>
</operation>
- <operation name="3299">
+ <operation name="3331">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -22633,12 +22751,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3300"/>
+ <push arg="3332"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3300"/>
+ <push arg="3332"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -22711,25 +22829,25 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3301" begin="19" end="19"/>
- <lne id="3302" begin="17" end="21"/>
- <lne id="3303" begin="24" end="24"/>
- <lne id="3304" begin="22" end="26"/>
- <lne id="3305" begin="29" end="29"/>
- <lne id="3306" begin="30" end="30"/>
- <lne id="3307" begin="30" end="31"/>
- <lne id="3308" begin="29" end="32"/>
- <lne id="3309" begin="27" end="34"/>
- <lne id="3310" begin="37" end="37"/>
- <lne id="3311" begin="37" end="38"/>
- <lne id="3312" begin="37" end="39"/>
- <lne id="3313" begin="41" end="41"/>
- <lne id="3314" begin="42" end="42"/>
- <lne id="3315" begin="42" end="43"/>
- <lne id="3316" begin="41" end="44"/>
- <lne id="3317" begin="46" end="48"/>
- <lne id="3318" begin="37" end="48"/>
- <lne id="3319" begin="35" end="50"/>
+ <lne id="3333" begin="19" end="19"/>
+ <lne id="3334" begin="17" end="21"/>
+ <lne id="3335" begin="24" end="24"/>
+ <lne id="3336" begin="22" end="26"/>
+ <lne id="3337" begin="29" end="29"/>
+ <lne id="3338" begin="30" end="30"/>
+ <lne id="3339" begin="30" end="31"/>
+ <lne id="3340" begin="29" end="32"/>
+ <lne id="3341" begin="27" end="34"/>
+ <lne id="3342" begin="37" end="37"/>
+ <lne id="3343" begin="37" end="38"/>
+ <lne id="3344" begin="37" end="39"/>
+ <lne id="3345" begin="41" end="41"/>
+ <lne id="3346" begin="42" end="42"/>
+ <lne id="3347" begin="42" end="43"/>
+ <lne id="3348" begin="41" end="44"/>
+ <lne id="3349" begin="46" end="48"/>
+ <lne id="3350" begin="37" end="48"/>
+ <lne id="3351" begin="35" end="50"/>
<lne id="303" begin="53" end="53"/>
<lne id="304" begin="53" end="54"/>
<lne id="305" begin="51" end="56"/>
@@ -22763,7 +22881,7 @@ <lve slot="1" name="326" begin="0" end="94"/>
</localvariabletable>
</operation>
- <operation name="3320">
+ <operation name="3352">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -22788,12 +22906,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3321"/>
+ <push arg="3353"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3321"/>
+ <push arg="3353"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -22891,40 +23009,40 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3322" begin="19" end="19"/>
- <lne id="3323" begin="17" end="21"/>
- <lne id="3324" begin="24" end="24"/>
- <lne id="3325" begin="22" end="26"/>
- <lne id="3326" begin="29" end="29"/>
- <lne id="3327" begin="30" end="30"/>
- <lne id="3328" begin="30" end="31"/>
- <lne id="3329" begin="29" end="32"/>
- <lne id="3330" begin="27" end="34"/>
- <lne id="3331" begin="40" end="40"/>
- <lne id="3332" begin="40" end="41"/>
- <lne id="3333" begin="44" end="44"/>
- <lne id="3334" begin="45" end="45"/>
- <lne id="3335" begin="44" end="46"/>
- <lne id="3336" begin="37" end="48"/>
- <lne id="3337" begin="37" end="49"/>
- <lne id="3338" begin="35" end="51"/>
- <lne id="3339" begin="54" end="54"/>
- <lne id="3340" begin="54" end="55"/>
- <lne id="3341" begin="54" end="56"/>
- <lne id="3342" begin="58" end="58"/>
- <lne id="3343" begin="58" end="59"/>
- <lne id="3344" begin="58" end="60"/>
- <lne id="3345" begin="58" end="61"/>
- <lne id="3346" begin="63" end="63"/>
- <lne id="3347" begin="64" end="64"/>
- <lne id="3348" begin="63" end="65"/>
- <lne id="3349" begin="67" end="67"/>
- <lne id="3350" begin="68" end="68"/>
- <lne id="3351" begin="67" end="69"/>
- <lne id="3352" begin="58" end="69"/>
- <lne id="3353" begin="71" end="73"/>
- <lne id="3354" begin="54" end="73"/>
- <lne id="3355" begin="52" end="75"/>
+ <lne id="3354" begin="19" end="19"/>
+ <lne id="3355" begin="17" end="21"/>
+ <lne id="3356" begin="24" end="24"/>
+ <lne id="3357" begin="22" end="26"/>
+ <lne id="3358" begin="29" end="29"/>
+ <lne id="3359" begin="30" end="30"/>
+ <lne id="3360" begin="30" end="31"/>
+ <lne id="3361" begin="29" end="32"/>
+ <lne id="3362" begin="27" end="34"/>
+ <lne id="3363" begin="40" end="40"/>
+ <lne id="3364" begin="40" end="41"/>
+ <lne id="3365" begin="44" end="44"/>
+ <lne id="3366" begin="45" end="45"/>
+ <lne id="3367" begin="44" end="46"/>
+ <lne id="3368" begin="37" end="48"/>
+ <lne id="3369" begin="37" end="49"/>
+ <lne id="3370" begin="35" end="51"/>
+ <lne id="3371" begin="54" end="54"/>
+ <lne id="3372" begin="54" end="55"/>
+ <lne id="3373" begin="54" end="56"/>
+ <lne id="3374" begin="58" end="58"/>
+ <lne id="3375" begin="58" end="59"/>
+ <lne id="3376" begin="58" end="60"/>
+ <lne id="3377" begin="58" end="61"/>
+ <lne id="3378" begin="63" end="63"/>
+ <lne id="3379" begin="64" end="64"/>
+ <lne id="3380" begin="63" end="65"/>
+ <lne id="3381" begin="67" end="67"/>
+ <lne id="3382" begin="68" end="68"/>
+ <lne id="3383" begin="67" end="69"/>
+ <lne id="3384" begin="58" end="69"/>
+ <lne id="3385" begin="71" end="73"/>
+ <lne id="3386" begin="54" end="73"/>
+ <lne id="3387" begin="52" end="75"/>
<lne id="303" begin="78" end="78"/>
<lne id="304" begin="78" end="79"/>
<lne id="305" begin="76" end="81"/>
@@ -22959,7 +23077,7 @@ <lve slot="1" name="326" begin="0" end="119"/>
</localvariabletable>
</operation>
- <operation name="3356">
+ <operation name="3388">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -22984,12 +23102,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3357"/>
+ <push arg="3389"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3357"/>
+ <push arg="3389"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23038,10 +23156,10 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3358" begin="19" end="19"/>
- <lne id="3359" begin="17" end="21"/>
- <lne id="3360" begin="24" end="24"/>
- <lne id="3361" begin="22" end="26"/>
+ <lne id="3390" begin="19" end="19"/>
+ <lne id="3391" begin="17" end="21"/>
+ <lne id="3392" begin="24" end="24"/>
+ <lne id="3393" begin="22" end="26"/>
<lne id="303" begin="29" end="29"/>
<lne id="304" begin="29" end="30"/>
<lne id="305" begin="27" end="32"/>
@@ -23075,7 +23193,7 @@ <lve slot="1" name="326" begin="0" end="70"/>
</localvariabletable>
</operation>
- <operation name="3362">
+ <operation name="3394">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23100,7 +23218,7 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3363"/>
+ <push arg="3395"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23164,15 +23282,15 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3364" begin="19" end="19"/>
- <lne id="3365" begin="17" end="21"/>
- <lne id="3366" begin="24" end="24"/>
- <lne id="3367" begin="24" end="25"/>
- <lne id="3368" begin="22" end="27"/>
- <lne id="3369" begin="30" end="32"/>
- <lne id="3370" begin="30" end="33"/>
- <lne id="3371" begin="30" end="34"/>
- <lne id="3372" begin="28" end="36"/>
+ <lne id="3396" begin="19" end="19"/>
+ <lne id="3397" begin="17" end="21"/>
+ <lne id="3398" begin="24" end="24"/>
+ <lne id="3399" begin="24" end="25"/>
+ <lne id="3400" begin="22" end="27"/>
+ <lne id="3401" begin="30" end="32"/>
+ <lne id="3402" begin="30" end="33"/>
+ <lne id="3403" begin="30" end="34"/>
+ <lne id="3404" begin="28" end="36"/>
<lne id="303" begin="39" end="39"/>
<lne id="304" begin="39" end="40"/>
<lne id="305" begin="37" end="42"/>
@@ -23206,7 +23324,7 @@ <lve slot="1" name="326" begin="0" end="80"/>
</localvariabletable>
</operation>
- <operation name="3373">
+ <operation name="3405">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23231,12 +23349,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3374"/>
+ <push arg="3406"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3374"/>
+ <push arg="3406"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23293,15 +23411,15 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3375" begin="19" end="19"/>
- <lne id="3376" begin="17" end="21"/>
- <lne id="3377" begin="24" end="24"/>
- <lne id="3378" begin="22" end="26"/>
- <lne id="3379" begin="29" end="29"/>
- <lne id="3380" begin="30" end="30"/>
- <lne id="3381" begin="30" end="31"/>
- <lne id="3382" begin="29" end="32"/>
- <lne id="3383" begin="27" end="34"/>
+ <lne id="3407" begin="19" end="19"/>
+ <lne id="3408" begin="17" end="21"/>
+ <lne id="3409" begin="24" end="24"/>
+ <lne id="3410" begin="22" end="26"/>
+ <lne id="3411" begin="29" end="29"/>
+ <lne id="3412" begin="30" end="30"/>
+ <lne id="3413" begin="30" end="31"/>
+ <lne id="3414" begin="29" end="32"/>
+ <lne id="3415" begin="27" end="34"/>
<lne id="303" begin="37" end="37"/>
<lne id="304" begin="37" end="38"/>
<lne id="305" begin="35" end="40"/>
@@ -23335,7 +23453,7 @@ <lve slot="1" name="326" begin="0" end="78"/>
</localvariabletable>
</operation>
- <operation name="3384">
+ <operation name="3416">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23360,7 +23478,7 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3385"/>
+ <push arg="3417"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
@@ -23374,7 +23492,7 @@ <getasm/>
<getasm/>
<load arg="33"/>
- <get arg="3386"/>
+ <get arg="3418"/>
<call arg="2028"/>
<call arg="34"/>
<set arg="267"/>
@@ -23424,17 +23542,17 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3387" begin="19" end="19"/>
- <lne id="3388" begin="17" end="21"/>
- <lne id="3389" begin="24" end="24"/>
- <lne id="3390" begin="24" end="25"/>
- <lne id="3391" begin="24" end="26"/>
- <lne id="3392" begin="22" end="28"/>
- <lne id="3393" begin="31" end="31"/>
- <lne id="3394" begin="32" end="32"/>
- <lne id="3395" begin="32" end="33"/>
- <lne id="3396" begin="31" end="34"/>
- <lne id="3397" begin="29" end="36"/>
+ <lne id="3419" begin="19" end="19"/>
+ <lne id="3420" begin="17" end="21"/>
+ <lne id="3421" begin="24" end="24"/>
+ <lne id="3422" begin="24" end="25"/>
+ <lne id="3423" begin="24" end="26"/>
+ <lne id="3424" begin="22" end="28"/>
+ <lne id="3425" begin="31" end="31"/>
+ <lne id="3426" begin="32" end="32"/>
+ <lne id="3427" begin="32" end="33"/>
+ <lne id="3428" begin="31" end="34"/>
+ <lne id="3429" begin="29" end="36"/>
<lne id="303" begin="39" end="39"/>
<lne id="304" begin="39" end="40"/>
<lne id="305" begin="37" end="42"/>
@@ -23468,7 +23586,7 @@ <lve slot="1" name="326" begin="0" end="80"/>
</localvariabletable>
</operation>
- <operation name="3398">
+ <operation name="3430">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23493,7 +23611,7 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3399"/>
+ <push arg="3431"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
@@ -23507,7 +23625,7 @@ <getasm/>
<getasm/>
<load arg="33"/>
- <get arg="3386"/>
+ <get arg="3418"/>
<call arg="2028"/>
<call arg="34"/>
<set arg="267"/>
@@ -23557,17 +23675,17 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3400" begin="19" end="19"/>
- <lne id="3401" begin="17" end="21"/>
- <lne id="3402" begin="24" end="24"/>
- <lne id="3403" begin="24" end="25"/>
- <lne id="3404" begin="24" end="26"/>
- <lne id="3405" begin="22" end="28"/>
- <lne id="3406" begin="31" end="31"/>
- <lne id="3407" begin="32" end="32"/>
- <lne id="3408" begin="32" end="33"/>
- <lne id="3409" begin="31" end="34"/>
- <lne id="3410" begin="29" end="36"/>
+ <lne id="3432" begin="19" end="19"/>
+ <lne id="3433" begin="17" end="21"/>
+ <lne id="3434" begin="24" end="24"/>
+ <lne id="3435" begin="24" end="25"/>
+ <lne id="3436" begin="24" end="26"/>
+ <lne id="3437" begin="22" end="28"/>
+ <lne id="3438" begin="31" end="31"/>
+ <lne id="3439" begin="32" end="32"/>
+ <lne id="3440" begin="32" end="33"/>
+ <lne id="3441" begin="31" end="34"/>
+ <lne id="3442" begin="29" end="36"/>
<lne id="303" begin="39" end="39"/>
<lne id="304" begin="39" end="40"/>
<lne id="305" begin="37" end="42"/>
@@ -23601,7 +23719,7 @@ <lve slot="1" name="326" begin="0" end="80"/>
</localvariabletable>
</operation>
- <operation name="3411">
+ <operation name="3443">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23626,7 +23744,7 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3412"/>
+ <push arg="3444"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23690,15 +23808,15 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3413" begin="19" end="19"/>
- <lne id="3414" begin="17" end="21"/>
- <lne id="3415" begin="24" end="24"/>
- <lne id="3416" begin="24" end="25"/>
- <lne id="3417" begin="22" end="27"/>
- <lne id="3418" begin="30" end="32"/>
- <lne id="3419" begin="30" end="33"/>
- <lne id="3420" begin="30" end="34"/>
- <lne id="3421" begin="28" end="36"/>
+ <lne id="3445" begin="19" end="19"/>
+ <lne id="3446" begin="17" end="21"/>
+ <lne id="3447" begin="24" end="24"/>
+ <lne id="3448" begin="24" end="25"/>
+ <lne id="3449" begin="22" end="27"/>
+ <lne id="3450" begin="30" end="32"/>
+ <lne id="3451" begin="30" end="33"/>
+ <lne id="3452" begin="30" end="34"/>
+ <lne id="3453" begin="28" end="36"/>
<lne id="303" begin="39" end="39"/>
<lne id="304" begin="39" end="40"/>
<lne id="305" begin="37" end="42"/>
@@ -23732,7 +23850,7 @@ <lve slot="1" name="326" begin="0" end="80"/>
</localvariabletable>
</operation>
- <operation name="3422">
+ <operation name="3454">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23757,12 +23875,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3423"/>
+ <push arg="3455"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3423"/>
+ <push arg="3455"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23784,11 +23902,11 @@ <dup/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="269"/>
<if arg="1897"/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<push arg="424"/>
<push arg="278"/>
<findme/>
@@ -23800,7 +23918,7 @@ <goto arg="1150"/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="3045"/>
<goto arg="966"/>
<push arg="15"/>
@@ -23854,36 +23972,36 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3425" begin="19" end="19"/>
- <lne id="3426" begin="17" end="21"/>
- <lne id="3427" begin="24" end="24"/>
- <lne id="3428" begin="22" end="26"/>
- <lne id="3429" begin="29" end="29"/>
- <lne id="3430" begin="29" end="30"/>
- <lne id="3431" begin="29" end="31"/>
- <lne id="3432" begin="33" end="33"/>
- <lne id="3433" begin="34" end="34"/>
- <lne id="3434" begin="34" end="35"/>
- <lne id="3435" begin="33" end="36"/>
- <lne id="3436" begin="38" end="40"/>
- <lne id="3437" begin="29" end="40"/>
- <lne id="3438" begin="27" end="42"/>
- <lne id="3439" begin="45" end="45"/>
- <lne id="3440" begin="45" end="46"/>
- <lne id="3441" begin="45" end="47"/>
- <lne id="3442" begin="49" end="49"/>
- <lne id="3443" begin="49" end="50"/>
- <lne id="3444" begin="51" end="53"/>
- <lne id="3445" begin="49" end="54"/>
- <lne id="3446" begin="56" end="58"/>
- <lne id="3447" begin="60" end="60"/>
- <lne id="3448" begin="61" end="61"/>
- <lne id="3449" begin="61" end="62"/>
- <lne id="3450" begin="60" end="63"/>
- <lne id="3451" begin="49" end="63"/>
- <lne id="3452" begin="65" end="67"/>
- <lne id="3453" begin="45" end="67"/>
- <lne id="3454" begin="43" end="69"/>
+ <lne id="3457" begin="19" end="19"/>
+ <lne id="3458" begin="17" end="21"/>
+ <lne id="3459" begin="24" end="24"/>
+ <lne id="3460" begin="22" end="26"/>
+ <lne id="3461" begin="29" end="29"/>
+ <lne id="3462" begin="29" end="30"/>
+ <lne id="3463" begin="29" end="31"/>
+ <lne id="3464" begin="33" end="33"/>
+ <lne id="3465" begin="34" end="34"/>
+ <lne id="3466" begin="34" end="35"/>
+ <lne id="3467" begin="33" end="36"/>
+ <lne id="3468" begin="38" end="40"/>
+ <lne id="3469" begin="29" end="40"/>
+ <lne id="3470" begin="27" end="42"/>
+ <lne id="3471" begin="45" end="45"/>
+ <lne id="3472" begin="45" end="46"/>
+ <lne id="3473" begin="45" end="47"/>
+ <lne id="3474" begin="49" end="49"/>
+ <lne id="3475" begin="49" end="50"/>
+ <lne id="3476" begin="51" end="53"/>
+ <lne id="3477" begin="49" end="54"/>
+ <lne id="3478" begin="56" end="58"/>
+ <lne id="3479" begin="60" end="60"/>
+ <lne id="3480" begin="61" end="61"/>
+ <lne id="3481" begin="61" end="62"/>
+ <lne id="3482" begin="60" end="63"/>
+ <lne id="3483" begin="49" end="63"/>
+ <lne id="3484" begin="65" end="67"/>
+ <lne id="3485" begin="45" end="67"/>
+ <lne id="3486" begin="43" end="69"/>
<lne id="303" begin="72" end="72"/>
<lne id="304" begin="72" end="73"/>
<lne id="305" begin="70" end="75"/>
@@ -23917,7 +24035,7 @@ <lve slot="1" name="326" begin="0" end="113"/>
</localvariabletable>
</operation>
- <operation name="3455">
+ <operation name="3487">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -23942,12 +24060,12 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3456"/>
+ <push arg="3488"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3456"/>
+ <push arg="3488"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -23994,11 +24112,11 @@ <dup/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="269"/>
<if arg="283"/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<push arg="424"/>
<push arg="278"/>
<findme/>
@@ -24007,10 +24125,10 @@ <push arg="15"/>
<push arg="9"/>
<new/>
- <goto arg="3457"/>
+ <goto arg="3489"/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="3045"/>
<goto arg="1790"/>
<push arg="15"/>
@@ -24064,51 +24182,51 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3458" begin="19" end="19"/>
- <lne id="3459" begin="17" end="21"/>
- <lne id="3460" begin="24" end="24"/>
- <lne id="3461" begin="22" end="26"/>
- <lne id="3462" begin="32" end="32"/>
- <lne id="3463" begin="32" end="33"/>
- <lne id="3464" begin="36" end="36"/>
- <lne id="3465" begin="37" end="37"/>
- <lne id="3466" begin="36" end="38"/>
- <lne id="3467" begin="29" end="40"/>
- <lne id="3468" begin="29" end="41"/>
- <lne id="3469" begin="27" end="43"/>
- <lne id="3470" begin="46" end="46"/>
- <lne id="3471" begin="46" end="47"/>
- <lne id="3472" begin="46" end="48"/>
- <lne id="3473" begin="50" end="50"/>
- <lne id="3474" begin="50" end="51"/>
- <lne id="3475" begin="50" end="52"/>
- <lne id="3476" begin="50" end="53"/>
- <lne id="3477" begin="55" end="55"/>
- <lne id="3478" begin="56" end="56"/>
- <lne id="3479" begin="55" end="57"/>
- <lne id="3480" begin="59" end="59"/>
- <lne id="3481" begin="60" end="60"/>
- <lne id="3482" begin="59" end="61"/>
- <lne id="3483" begin="50" end="61"/>
- <lne id="3484" begin="63" end="65"/>
- <lne id="3485" begin="46" end="65"/>
- <lne id="3486" begin="44" end="67"/>
- <lne id="3487" begin="70" end="70"/>
- <lne id="3488" begin="70" end="71"/>
- <lne id="3489" begin="70" end="72"/>
- <lne id="3490" begin="74" end="74"/>
- <lne id="3491" begin="74" end="75"/>
- <lne id="3492" begin="76" end="78"/>
- <lne id="3493" begin="74" end="79"/>
- <lne id="3494" begin="81" end="83"/>
- <lne id="3495" begin="85" end="85"/>
- <lne id="3496" begin="86" end="86"/>
- <lne id="3497" begin="86" end="87"/>
- <lne id="3498" begin="85" end="88"/>
- <lne id="3499" begin="74" end="88"/>
- <lne id="3500" begin="90" end="92"/>
- <lne id="3501" begin="70" end="92"/>
- <lne id="3502" begin="68" end="94"/>
+ <lne id="3490" begin="19" end="19"/>
+ <lne id="3491" begin="17" end="21"/>
+ <lne id="3492" begin="24" end="24"/>
+ <lne id="3493" begin="22" end="26"/>
+ <lne id="3494" begin="32" end="32"/>
+ <lne id="3495" begin="32" end="33"/>
+ <lne id="3496" begin="36" end="36"/>
+ <lne id="3497" begin="37" end="37"/>
+ <lne id="3498" begin="36" end="38"/>
+ <lne id="3499" begin="29" end="40"/>
+ <lne id="3500" begin="29" end="41"/>
+ <lne id="3501" begin="27" end="43"/>
+ <lne id="3502" begin="46" end="46"/>
+ <lne id="3503" begin="46" end="47"/>
+ <lne id="3504" begin="46" end="48"/>
+ <lne id="3505" begin="50" end="50"/>
+ <lne id="3506" begin="50" end="51"/>
+ <lne id="3507" begin="50" end="52"/>
+ <lne id="3508" begin="50" end="53"/>
+ <lne id="3509" begin="55" end="55"/>
+ <lne id="3510" begin="56" end="56"/>
+ <lne id="3511" begin="55" end="57"/>
+ <lne id="3512" begin="59" end="59"/>
+ <lne id="3513" begin="60" end="60"/>
+ <lne id="3514" begin="59" end="61"/>
+ <lne id="3515" begin="50" end="61"/>
+ <lne id="3516" begin="63" end="65"/>
+ <lne id="3517" begin="46" end="65"/>
+ <lne id="3518" begin="44" end="67"/>
+ <lne id="3519" begin="70" end="70"/>
+ <lne id="3520" begin="70" end="71"/>
+ <lne id="3521" begin="70" end="72"/>
+ <lne id="3522" begin="74" end="74"/>
+ <lne id="3523" begin="74" end="75"/>
+ <lne id="3524" begin="76" end="78"/>
+ <lne id="3525" begin="74" end="79"/>
+ <lne id="3526" begin="81" end="83"/>
+ <lne id="3527" begin="85" end="85"/>
+ <lne id="3528" begin="86" end="86"/>
+ <lne id="3529" begin="86" end="87"/>
+ <lne id="3530" begin="85" end="88"/>
+ <lne id="3531" begin="74" end="88"/>
+ <lne id="3532" begin="90" end="92"/>
+ <lne id="3533" begin="70" end="92"/>
+ <lne id="3534" begin="68" end="94"/>
<lne id="303" begin="97" end="97"/>
<lne id="304" begin="97" end="98"/>
<lne id="305" begin="95" end="100"/>
@@ -24143,7 +24261,7 @@ <lve slot="1" name="326" begin="0" end="138"/>
</localvariabletable>
</operation>
- <operation name="3503">
+ <operation name="3535">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -24168,23 +24286,23 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3504"/>
+ <push arg="3536"/>
<call arg="34"/>
<set arg="1804"/>
<dup/>
<getasm/>
- <push arg="3504"/>
+ <push arg="3536"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="269"/>
<if arg="962"/>
<getasm/>
<load arg="33"/>
- <get arg="3424"/>
+ <get arg="3456"/>
<call arg="3127"/>
<goto arg="2262"/>
<push arg="15"/>
@@ -24238,20 +24356,20 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3505" begin="19" end="19"/>
- <lne id="3506" begin="17" end="21"/>
- <lne id="3507" begin="24" end="24"/>
- <lne id="3508" begin="22" end="26"/>
- <lne id="3509" begin="29" end="29"/>
- <lne id="3510" begin="29" end="30"/>
- <lne id="3511" begin="29" end="31"/>
- <lne id="3512" begin="33" end="33"/>
- <lne id="3513" begin="34" end="34"/>
- <lne id="3514" begin="34" end="35"/>
- <lne id="3515" begin="33" end="36"/>
- <lne id="3516" begin="38" end="40"/>
- <lne id="3517" begin="29" end="40"/>
- <lne id="3518" begin="27" end="42"/>
+ <lne id="3537" begin="19" end="19"/>
+ <lne id="3538" begin="17" end="21"/>
+ <lne id="3539" begin="24" end="24"/>
+ <lne id="3540" begin="22" end="26"/>
+ <lne id="3541" begin="29" end="29"/>
+ <lne id="3542" begin="29" end="30"/>
+ <lne id="3543" begin="29" end="31"/>
+ <lne id="3544" begin="33" end="33"/>
+ <lne id="3545" begin="34" end="34"/>
+ <lne id="3546" begin="34" end="35"/>
+ <lne id="3547" begin="33" end="36"/>
+ <lne id="3548" begin="38" end="40"/>
+ <lne id="3549" begin="29" end="40"/>
+ <lne id="3550" begin="27" end="42"/>
<lne id="303" begin="45" end="45"/>
<lne id="304" begin="45" end="46"/>
<lne id="305" begin="43" end="48"/>
@@ -24285,7 +24403,7 @@ <lve slot="1" name="326" begin="0" end="86"/>
</localvariabletable>
</operation>
- <operation name="3519">
+ <operation name="3551">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -24310,7 +24428,7 @@ <load arg="261"/>
<dup/>
<getasm/>
- <push arg="3520"/>
+ <push arg="3552"/>
<call arg="34"/>
<set arg="42"/>
<dup/>
@@ -24366,12 +24484,12 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3521" begin="19" end="19"/>
- <lne id="3522" begin="17" end="21"/>
- <lne id="3523" begin="24" end="24"/>
- <lne id="3524" begin="24" end="25"/>
- <lne id="3525" begin="24" end="26"/>
- <lne id="3526" begin="22" end="28"/>
+ <lne id="3553" begin="19" end="19"/>
+ <lne id="3554" begin="17" end="21"/>
+ <lne id="3555" begin="24" end="24"/>
+ <lne id="3556" begin="24" end="25"/>
+ <lne id="3557" begin="24" end="26"/>
+ <lne id="3558" begin="22" end="28"/>
<lne id="303" begin="31" end="31"/>
<lne id="304" begin="31" end="32"/>
<lne id="305" begin="29" end="34"/>
@@ -24405,7 +24523,7 @@ <lve slot="1" name="326" begin="0" end="72"/>
</localvariabletable>
</operation>
- <operation name="3527">
+ <operation name="3559">
<context type="7"/>
<parameters>
<parameter name="24" type="256"/>
@@ -24517,28 +24635,28 @@ <pop/>
</code>
<linenumbertable>
- <lne id="3528" begin="19" end="19"/>
- <lne id="3529" begin="17" end="21"/>
- <lne id="3530" begin="24" end="24"/>
- <lne id="3531" begin="22" end="26"/>
- <lne id="3532" begin="32" end="32"/>
- <lne id="3533" begin="32" end="33"/>
- <lne id="3534" begin="36" end="36"/>
- <lne id="3535" begin="37" end="37"/>
- <lne id="3536" begin="36" end="38"/>
- <lne id="3537" begin="29" end="40"/>
- <lne id="3538" begin="29" end="41"/>
- <lne id="3539" begin="27" end="43"/>
- <lne id="3540" begin="46" end="46"/>
- <lne id="3541" begin="46" end="47"/>
- <lne id="3542" begin="46" end="48"/>
- <lne id="3543" begin="50" end="50"/>
- <lne id="3544" begin="51" end="51"/>
- <lne id="3545" begin="51" end="52"/>
- <lne id="3546" begin="50" end="53"/>
- <lne id="3547" begin="55" end="57"/>
- <lne id="3548" begin="46" end="57"/>
- <lne id="3549" begin="44" end="59"/>
+ <lne id="3560" begin="19" end="19"/>
+ <lne id="3561" begin="17" end="21"/>
+ <lne id="3562" begin="24" end="24"/>
+ <lne id="3563" begin="22" end="26"/>
+ <lne id="3564" begin="32" end="32"/>
+ <lne id="3565" begin="32" end="33"/>
+ <lne id="3566" begin="36" end="36"/>
+ <lne id="3567" begin="37" end="37"/>
+ <lne id="3568" begin="36" end="38"/>
+ <lne id="3569" begin="29" end="40"/>
+ <lne id="3570" begin="29" end="41"/>
+ <lne id="3571" begin="27" end="43"/>
+ <lne id="3572" begin="46" end="46"/>
+ <lne id="3573" begin="46" end="47"/>
+ <lne id="3574" begin="46" end="48"/>
+ <lne id="3575" begin="50" end="50"/>
+ <lne id="3576" begin="51" end="51"/>
+ <lne id="3577" begin="51" end="52"/>
+ <lne id="3578" begin="50" end="53"/>
+ <lne id="3579" begin="55" end="57"/>
+ <lne id="3580" begin="46" end="57"/>
+ <lne id="3581" begin="44" end="59"/>
<lne id="303" begin="62" end="62"/>
<lne id="304" begin="62" end="63"/>
<lne id="305" begin="60" end="65"/>
diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.atl b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.atl index 756d51be7..bb0605a8d 100644 --- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.atl +++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/resources/transformations/javaToKdm.atl @@ -8,7 +8,7 @@ --Contributors: -- Gabriel BARBIER (Mia-Software) - initial API and implementation -- Fabien GIQUEL (Mia-Software) - initial API and implementation - +-- Hugo Bruneliere (Inria) - Bug 526229 - InfixExpression rule update -- -- @nsURI kdm=http://www.eclipse.org/MoDisco/kdm/action -- @nsURI java=http://www.eclipse.org/MoDisco/Java/0.2.incubation/java @@ -1954,6 +1954,26 @@ rule InfixExpressionToActionElement extends ASTNodeToAbstractCodeElement { kind <- 'infix expression' ,name <- src.operator.toString() -- referenced elements + ,actionRelation <- + if (src.leftOperand.oclIsUndefined()) then + Sequence{} + else + if (src.leftOperand.oclIsTypeOf(java!SingleVariableAccess)) then + thisModule -> CreateReads(src.leftOperand) + else + Sequence{} + endif + endif + ,actionRelation <- + if (src.rightOperand.oclIsUndefined()) then + Sequence{} + else + if (src.rightOperand.oclIsTypeOf(java!SingleVariableAccess)) then + thisModule -> CreateReads(src.rightOperand) + else + Sequence{} + endif + endif ,codeElement <- thisModule->filterExpression(src.leftOperand) ,codeElement <- thisModule->filterExpression(src.rightOperand) ,codeElement <- src.extendedOperands->collect(e | thisModule->filterExpression(e))->flatten() |