Commit 64edc5fb authored by Sebastian Erdweg's avatar Sebastian Erdweg
Browse files

Merge branch 'master' of gitlab.rlp.net:plmz/itypes

# Conflicts:
#	inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
parents 8c1d05fe a2b843b7
......@@ -2,9 +2,9 @@
<model ref="r:6c771c8d-9cb2-4fab-8275-d58f36a74b25(TypeLang.generator.util)">
<persistence version="9" />
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="-1" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
</languages>
<imports>
......@@ -8763,57 +8763,166 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="7oauUzuzj82" role="3cqZAp">
<node concept="3cpWsn" id="7oauUzuzj83" role="3cpWs9">
<property role="TrG5h" value="transformedUserInputArguments" />
<node concept="_YKpA" id="7oauUzuzj7F" role="1tU5fm">
<node concept="3Tqbb2" id="7oauUzuzj7I" role="_ZDj9">
<node concept="3cpWs8" id="5n5KhV3B3iD" role="3cqZAp">
<node concept="3cpWsn" id="5n5KhV3B3iE" role="3cpWs9">
<property role="TrG5h" value="inputArgs" />
<node concept="_YKpA" id="5n5KhV3B3iy" role="1tU5fm">
<node concept="3Tqbb2" id="5n5KhV3B3i_" role="_ZDj9">
<ref role="ehGHo" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
</node>
<node concept="2OqwBi" id="7oauUzuzj84" role="33vP2m">
<node concept="2OqwBi" id="7oauUzuzj85" role="2Oq$k0">
<node concept="2OqwBi" id="7oauUzuzj86" role="2Oq$k0">
<node concept="37vLTw" id="7oauUzuzj87" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzurNP7" resolve="instance" />
<node concept="2OqwBi" id="5n5KhV3B3iF" role="33vP2m">
<node concept="2OqwBi" id="5n5KhV3B3iG" role="2Oq$k0">
<node concept="37vLTw" id="5n5KhV3B3iH" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzurNP7" resolve="instance" />
</node>
<node concept="2qgKlT" id="5n5KhV3B3iI" role="2OqNvi">
<ref role="37wK5l" to="pgas:2KaZpbaqbhN" resolve="getSyntaxDirectedInputArguments" />
</node>
</node>
<node concept="ANE8D" id="5n5KhV3B3iJ" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3SKdUt" id="5n5KhV3Ra37" role="3cqZAp">
<node concept="3SKdUq" id="5n5KhV3Ra39" role="3SKWNk">
<property role="3SKdUp" value="TODO QUICK HACK needs to work for more than one input" />
</node>
</node>
<node concept="3clFbJ" id="5n5KhV3QgGc" role="3cqZAp">
<node concept="3clFbS" id="5n5KhV3QgGe" role="3clFbx">
<node concept="3clFbF" id="5n5KhV3RrK5" role="3cqZAp">
<node concept="2OqwBi" id="5n5KhV3RrK6" role="3clFbG">
<node concept="37vLTw" id="5n5KhV3ZIsH" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzuszB7" resolve="argumentsOfProjectionInstance" />
</node>
<node concept="TSZUe" id="5n5KhV3RrK8" role="2OqNvi">
<node concept="2OqwBi" id="5n5KhV3RrK9" role="25WWJ7">
<node concept="2OqwBi" id="5n5KhV3RsVC" role="2Oq$k0">
<node concept="37vLTw" id="5n5KhV3RGxM" role="2Oq$k0">
<ref role="3cqZAo" node="5n5KhV3B3iE" resolve="inputArgs" />
</node>
<node concept="1uHKPH" id="5n5KhV3RVS4" role="2OqNvi" />
</node>
<node concept="2qgKlT" id="5n5KhV3RXII" role="2OqNvi">
<ref role="37wK5l" to="pgas:1s4iOmSk85T" resolve="getNameOfMetaTermIfAvaiable" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5n5KhV3QUmS" role="3clFbw">
<node concept="2OqwBi" id="5n5KhV3QEvp" role="2Oq$k0">
<node concept="37vLTw" id="5n5KhV3QvoR" role="2Oq$k0">
<ref role="3cqZAo" node="5n5KhV3B3iE" resolve="inputArgs" />
</node>
<node concept="1uHKPH" id="5n5KhV3QQTV" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="5n5KhV3R9am" role="2OqNvi">
<node concept="chp4Y" id="5n5KhV3RqWh" role="cj9EA">
<ref role="cht4Q" to="b83y:5jddR$DhDKJ" resolve="NamedMetaTerm" />
</node>
</node>
</node>
<node concept="9aQIb" id="5n5KhV3RZnz" role="9aQIa">
<node concept="3clFbS" id="5n5KhV3RZn$" role="9aQI4">
<node concept="3cpWs8" id="5n5KhV3SdVP" role="3cqZAp">
<node concept="3cpWsn" id="5n5KhV3SdVQ" role="3cpWs9">
<property role="TrG5h" value="namedString" />
<node concept="17QB3L" id="5n5KhV3SdVR" role="1tU5fm" />
<node concept="2OqwBi" id="5n5KhV3SdVS" role="33vP2m">
<node concept="37vLTw" id="5n5KhV3SdVT" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzt1JwH" resolve="genContext" />
</node>
<node concept="2piZGk" id="5n5KhV3SdVU" role="2OqNvi">
<node concept="Xl_RD" id="5n5KhV3SdVV" role="2piZGb">
<property role="Xl_RC" value="named" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5n5KhV3Wh28" role="3cqZAp">
<node concept="3cpWsn" id="5n5KhV3Wh29" role="3cpWs9">
<property role="TrG5h" value="namedVar" />
<node concept="3Tqbb2" id="5n5KhV3Wh27" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
<node concept="2qgKlT" id="5croPxszw7a" role="2OqNvi">
<ref role="37wK5l" to="pgas:2KaZpbaqbhN" resolve="getSyntaxDirectedInputArguments" />
<node concept="2pJPEk" id="5n5KhV3Wh2a" role="33vP2m">
<node concept="2pJPED" id="5n5KhV3Wh2b" role="2pJPEn">
<ref role="2pJxaS" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
<node concept="2pJxcG" id="5n5KhV3Wh2c" role="2pJxcM">
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
<node concept="37vLTw" id="5n5KhV3Wh2d" role="2pJxcZ">
<ref role="3cqZAo" node="5n5KhV3SdVQ" resolve="namedString" />
</node>
</node>
</node>
</node>
</node>
<node concept="3$u5V9" id="7oauUzuzj89" role="2OqNvi">
<node concept="1bVj0M" id="7oauUzuzj8a" role="23t8la">
<node concept="3clFbS" id="7oauUzuzj8b" role="1bW5cS">
<node concept="3clFbF" id="7oauUzuzj8c" role="3cqZAp">
<node concept="2OqwBi" id="1s4iOmSAlW5" role="3clFbG">
<node concept="37vLTw" id="1s4iOmSAkph" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzuzj8f" resolve="it" />
</node>
<node concept="3cpWs8" id="5n5KhV3SdVW" role="3cqZAp">
<node concept="3cpWsn" id="5n5KhV3SdVX" role="3cpWs9">
<property role="TrG5h" value="namedTerm" />
<node concept="3Tqbb2" id="5n5KhV3SdVY" role="1tU5fm">
<ref role="ehGHo" to="b83y:5jddR$DhDKJ" resolve="NamedMetaTerm" />
</node>
<node concept="2pJPEk" id="5n5KhV3SdVZ" role="33vP2m">
<node concept="2pJPED" id="5n5KhV3SdW0" role="2pJPEn">
<ref role="2pJxaS" to="b83y:5jddR$DhDKJ" resolve="NamedMetaTerm" />
<node concept="2pIpSj" id="5n5KhV3SdW1" role="2pJxcM">
<ref role="2pIpSl" to="b83y:5jddR$Dk5XW" resolve="var" />
<node concept="36biLy" id="5n5KhV3WiHh" role="2pJxcZ">
<node concept="37vLTw" id="5n5KhV3WjRL" role="36biLW">
<ref role="3cqZAo" node="5n5KhV3Wh29" resolve="namedVar" />
</node>
<node concept="2qgKlT" id="1s4iOmSAnIV" role="2OqNvi">
<ref role="37wK5l" to="pgas:1s4iOmSk85T" resolve="getNameOfMetaTermIfAvaiable" />
</node>
</node>
<node concept="2pIpSj" id="5n5KhV3SdW5" role="2pJxcM">
<ref role="2pIpSl" to="b83y:5jddR$DhDKZ" resolve="metaterm" />
<node concept="36biLy" id="5n5KhV3SdW6" role="2pJxcZ">
<node concept="2OqwBi" id="5n5KhV3SdW7" role="36biLW">
<node concept="2OqwBi" id="5n5KhV3Sshj" role="2Oq$k0">
<node concept="37vLTw" id="5n5KhV3Sfp9" role="2Oq$k0">
<ref role="3cqZAo" node="5n5KhV3B3iE" resolve="inputArgs" />
</node>
<node concept="1uHKPH" id="5n5KhV3SF94" role="2OqNvi" />
</node>
<node concept="1$rogu" id="5n5KhV3SdW9" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="7oauUzuzj8f" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7oauUzuzj8g" role="1tU5fm" />
</node>
</node>
</node>
<node concept="3clFbF" id="5n5KhV3SdWa" role="3cqZAp">
<node concept="2OqwBi" id="5n5KhV3SdWb" role="3clFbG">
<node concept="37vLTw" id="5n5KhV3ZJTK" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzuszB7" resolve="argumentsOfProjectionInstance" />
</node>
<node concept="TSZUe" id="5n5KhV3SdWd" role="2OqNvi">
<node concept="37vLTw" id="5n5KhV3WmCl" role="25WWJ7">
<ref role="3cqZAo" node="5n5KhV3Wh29" resolve="namedVar" />
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="7oauUzuzj8h" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbF" id="7oauUzusN_L" role="3cqZAp">
<node concept="2OqwBi" id="7oauUzusRdL" role="3clFbG">
<node concept="37vLTw" id="7oauUzusQ7F" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzuszB7" resolve="argumentsOfProjectionInstance" />
</node>
<node concept="X8dFx" id="7oauUzusTRK" role="2OqNvi">
<node concept="37vLTw" id="7oauUzuzlYe" role="25WWJ7">
<ref role="3cqZAo" node="7oauUzuzj83" resolve="transformedUserInputArguments" />
<node concept="3clFbF" id="5n5KhV3SdWf" role="3cqZAp">
<node concept="2OqwBi" id="5n5KhV3SdWg" role="3clFbG">
<node concept="2OqwBi" id="5n5KhV3STZS" role="2Oq$k0">
<node concept="37vLTw" id="5n5KhV3T7Um" role="2Oq$k0">
<ref role="3cqZAo" node="5n5KhV3B3iE" resolve="inputArgs" />
</node>
<node concept="1uHKPH" id="5n5KhV3TnrT" role="2OqNvi" />
</node>
<node concept="1P9Npp" id="5n5KhV3SdWi" role="2OqNvi">
<node concept="37vLTw" id="5n5KhV3WlND" role="1P9ThW">
<ref role="3cqZAo" node="5n5KhV3SdVX" resolve="namedTerm" />
</node>
</node>
</node>
</node>
</node>
</node>
......@@ -9450,10 +9559,6 @@
<ref role="ehGHo" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
</node>
</node>
<node concept="37vLTG" id="7kqDxo2BrvV" role="3clF46">
<property role="TrG5h" value="model" />
<node concept="H_c77" id="7kqDxo2BzyW" role="1tU5fm" />
</node>
<node concept="3clFbS" id="6OMXo1Qmp0C" role="3clF47">
<node concept="3clFbH" id="6OMXo1Qmp0J" role="3cqZAp" />
<node concept="3cpWs8" id="6OMXo1QntvY" role="3cqZAp">
......@@ -10155,6 +10260,10 @@
</node>
<node concept="3Tm1VV" id="6OMXo1Qmp2i" role="1B3o_S" />
<node concept="3cqZAl" id="6OMXo1TE1Bl" role="3clF45" />
<node concept="37vLTG" id="7kqDxo2BrvV" role="3clF46">
<property role="TrG5h" value="model" />
<node concept="H_c77" id="7kqDxo2BzyW" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="6cGgHUfirdO" role="jymVt" />
<node concept="3clFb_" id="6OMXo1T_YW1" role="jymVt">
......@@ -10678,14 +10787,12 @@
<ref role="2pJxaS" to="tpee:fzcpWvY" resolve="ReturnStatement" />
<node concept="2pIpSj" id="7Yh4ZTHwUmw" role="2pJxcM">
<ref role="2pIpSl" to="tpee:fzcqZ_G" resolve="expression" />
<node concept="2pJPED" id="7Yh4ZTHwUmx" role="2pJxcZ">
<ref role="2pJxaS" to="tpee:fz7vLUo" resolve="VariableReference" />
<node concept="2pIpSj" id="7Yh4ZTHwUmy" role="2pJxcM">
<ref role="2pIpSl" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
<node concept="36biLy" id="7Yh4ZTHwUmz" role="2pJxcZ">
<node concept="37vLTw" id="7Yh4ZTHx1WP" role="36biLW">
<ref role="3cqZAo" node="7Yh4ZTHw0rE" resolve="self" />
</node>
<node concept="2pJPED" id="6$nJCixVXLd" role="2pJxcZ">
<ref role="2pJxaS" to="tpee:fzclF81" resolve="BooleanConstant" />
<node concept="2pJxcG" id="6$nJCixVYx0" role="2pJxcM">
<ref role="2pJxcJ" to="tpee:fzclF82" resolve="value" />
<node concept="3clFbT" id="6$nJCixVYYX" role="2pJxcZ">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
......@@ -10715,8 +10822,12 @@
<ref role="2pJxaS" to="tpee:fzcpWvY" resolve="ReturnStatement" />
<node concept="2pIpSj" id="7Yh4ZTHwUmJ" role="2pJxcM">
<ref role="2pIpSl" to="tpee:fzcqZ_G" resolve="expression" />
<node concept="2pJPED" id="7Yh4ZTHwUmK" role="2pJxcZ">
<ref role="2pJxaS" to="tpee:f_0Nm5B" resolve="NullLiteral" />
<node concept="2pJPED" id="6$nJCixVSnF" role="2pJxcZ">
<ref role="2pJxaS" to="tpee:fzclF81" resolve="BooleanConstant" />
<node concept="2pJxcG" id="6$nJCixVTvf" role="2pJxcM">
<ref role="2pJxcJ" to="tpee:fzclF82" resolve="value" />
<node concept="3clFbT" id="6$nJCixVTXc" role="2pJxcZ" />
</node>
</node>
</node>
</node>
......@@ -10768,16 +10879,8 @@
</node>
<node concept="2pIpSj" id="7Yh4ZTHyExl" role="2pJxcM">
<ref role="2pIpSl" to="tpee:fzclF7X" resolve="returnType" />
<node concept="2pJPED" id="7Yh4ZTHyExm" role="2pJxcZ">
<ref role="2pJxaS" to="uu1k:3l0M8IaAFF7" resolve="TypeConstructorType" />
<node concept="2pIpSj" id="7Yh4ZTHyExn" role="2pJxcM">
<ref role="2pIpSl" to="uu1k:3l0M8IaAFF8" resolve="constructor" />
<node concept="36biLy" id="7Yh4ZTHyExo" role="2pJxcZ">
<node concept="37vLTw" id="7Yh4ZTHyExp" role="36biLW">
<ref role="3cqZAo" node="7Yh4ZTHvbHM" resolve="lattice" />
</node>
</node>
</node>
<node concept="2pJPED" id="6$nJCixVtCr" role="2pJxcZ">
<ref role="2pJxaS" to="tpee:f_0P_4Y" resolve="BooleanType" />
</node>
</node>
<node concept="2pIpSj" id="7Yh4ZTHyExq" role="2pJxcM">
......@@ -205,15 +205,6 @@
<node concept="3F0ifn" id="5VGMV8rNLG$" role="3EZMnx">
<property role="3F0ifm" value="fix" />
</node>
<node concept="3F0ifn" id="5VGMV8rNLGK" role="3EZMnx">
<property role="3F0ifm" value="{" />
</node>
<node concept="3F1sOY" id="5VGMV8rNLH2" role="3EZMnx">
<ref role="1NtTu8" to="jzuy:5VGMV8rNKCH" resolve="ty" />
</node>
<node concept="3F0ifn" id="5VGMV8rNLHq" role="3EZMnx">
<property role="3F0ifm" value="}" />
</node>
<node concept="l2Vlx" id="5VGMV8rNLGq" role="2iSdaV" />
<node concept="3F1sOY" id="5VGMV8rNLHS" role="3EZMnx">
<ref role="1NtTu8" to="jzuy:5VGMV8rNKCL" resolve="t" />
......@@ -243,24 +234,6 @@
</node>
</node>
</node>
<node concept="24kQdi" id="5VGMV8rNLJK">
<property role="3GE5qa" value="type" />
<ref role="1XX52x" to="jzuy:1Da9ityUTfU" resolve="ParensType" />
<node concept="1WcQYu" id="5VGMV8rNLK1" role="2wV5jI">
<node concept="2ElW$n" id="5VGMV8rNLK3" role="2El2Yn" />
<node concept="drBAd" id="6AVADwUz_tW" role="1LiK7o">
<node concept="3F0ifn" id="6AVADwUz_tY" role="drBA7">
<property role="3F0ifm" value="(" />
</node>
<node concept="3F1sOY" id="6AVADwUz_u0" role="drBAU">
<ref role="1NtTu8" to="jzuy:1Da9ityUTfZ" resolve="ty" />
</node>
<node concept="3F0ifn" id="6AVADwUz_u2" role="drBAZ">
<property role="3F0ifm" value=")" />
</node>
</node>
</node>
</node>
<node concept="24kQdi" id="5VGMV8rNLKS">
<property role="3GE5qa" value="type" />
<ref role="1XX52x" to="jzuy:1Da9ityUTfG" resolve="Nat" />
......
......@@ -232,22 +232,6 @@
<ref role="PrY4T" node="1Da9ityUTef" resolve="Type" />
</node>
</node>
<node concept="1TIwiD" id="1Da9ityUTfU">
<property role="EcuMT" value="1894367444356273146" />
<property role="3GE5qa" value="type" />
<property role="TrG5h" value="ParensType" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="PrWs8" id="1Da9ityUTfV" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTef" resolve="Type" />
</node>
<node concept="1TJgyj" id="1Da9ityUTfZ" role="1TKVEi">
<property role="IQ2ns" value="1894367444356273151" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="ty" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTef" resolve="Type" />
</node>
</node>
<node concept="1TIwiD" id="5VGMV8rNKC5">
<property role="EcuMT" value="6840065899900111365" />
<property role="3GE5qa" value="term" />
......@@ -310,13 +294,6 @@
<node concept="PrWs8" id="5VGMV8rNKCD" role="PzmwI">
<ref role="PrY4T" node="1Da9ityUTbh" resolve="Term" />
</node>
<node concept="1TJgyj" id="5VGMV8rNKCH" role="1TKVEi">
<property role="IQ2ns" value="6840065899900111405" />
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="ty" />
<property role="20lbJX" value="1" />
<ref role="20lvS9" node="1Da9ityUTef" resolve="Type" />
</node>
<node concept="1TJgyj" id="5VGMV8rNKCL" role="1TKVEi">
<property role="IQ2ns" value="6840065899900111409" />
<property role="20lmBu" value="aggregation" />
......
......@@ -202,15 +202,7 @@
<node concept="1FvUUU" id="5VGMV8rUkgD" role="1FvB8I">
<property role="TrG5h" value="t1" />
</node>
<node concept="1FvUUU" id="7CP9_v5Ko0P" role="1FvB8J">
<property role="TrG5h" value="T1" />
</node>
</node>
<node concept="1FckbG" id="7CP9_v5Ko1b" role="1FvUVk">
<node concept="1FvUUU" id="7CP9_v5Ko1T" role="1FfB6u">
<property role="TrG5h" value="T1" />
</node>
<node concept="27Pwox" id="7CP9_v5Ko2x" role="1FfB6v">
<node concept="27Pwox" id="6$nJCiy1378" role="1FvB8J">
<ref role="1F1YRu" to="jzuy:1Da9ityUTfG" resolve="Nat" />
</node>
</node>
......@@ -222,15 +214,7 @@
<node concept="1FvUUU" id="5VGMV8rUkiV" role="1FvB8I">
<property role="TrG5h" value="t2" />
</node>
<node concept="1FvUUU" id="7CP9_v5Ko2T" role="1FvB8J">
<property role="TrG5h" value="T2" />
</node>
</node>
<node concept="1FckbG" id="7CP9_v5Ko3l" role="1FvUVk">
<node concept="1FvUUU" id="7CP9_v5Ko49" role="1FfB6u">
<property role="TrG5h" value="T2" />
</node>
<node concept="27Pwox" id="7CP9_v5Ko4L" role="1FfB6v">
<node concept="27Pwox" id="6$nJCiy14$3" role="1FvB8J">
<ref role="1F1YRu" to="jzuy:1Da9ityUTfG" resolve="Nat" />
</node>
</node>
......@@ -492,15 +476,7 @@
<node concept="1FvUUU" id="5VGMV8rUlCU" role="1FvB8I">
<property role="TrG5h" value="cond" />
</node>
<node concept="1FvUUU" id="7CP9_v5Ko5H" role="1FvB8J">
<property role="TrG5h" value="TCond" />
</node>
</node>
<node concept="1FckbG" id="7CP9_v5Ko6h" role="1FvUVk">
<node concept="1FvUUU" id="7CP9_v5Ko7L" role="1FfB6u">
<property role="TrG5h" value="TCond" />
</node>
<node concept="27Pwox" id="7CP9_v5Ko8p" role="1FfB6v">
<node concept="27Pwox" id="6$nJCiy33j0" role="1FvB8J">
<ref role="1F1YRu" to="jzuy:1Da9ityUTfG" resolve="Nat" />
</node>
</node>
......@@ -547,12 +523,6 @@
</node>
<node concept="27Pwox" id="5VGMV8rUm2x" role="1FvB8I">
<ref role="1F1YRu" to="jzuy:5VGMV8rNKCC" resolve="Fix" />
<node concept="bFJCQ" id="5VGMV8rUm2E" role="27Pwov">
<ref role="3zVwH8" to="jzuy:5VGMV8rNKCH" resolve="ty" />
<node concept="1FvUUU" id="5VGMV8rUm3d" role="bFJCb">
<property role="TrG5h" value="T" />
</node>
</node>
<node concept="bFJCQ" id="5VGMV8rUm2U" role="27Pwov">
<ref role="3zVwH8" to="jzuy:5VGMV8rNKCL" resolve="t" />
<node concept="1FvUUU" id="5VGMV8rUm3p" role="bFJCb">
......@@ -590,17 +560,9 @@
</node>
<node concept="1FckbG" id="VV4Z5J6mPT" role="1FvUVk">
<node concept="1FvUUU" id="VV4Z5J6mQw" role="1FfB6u">
<property role="TrG5h" value="T" />
</node>
<node concept="1FvUUU" id="VV4Z5J6mQR" role="1FfB6v">
<property role="TrG5h" value="T1" />
</node>
</node>
<node concept="1FckbG" id="VV4Z5J6mRj" role="1FvUVk">
<node concept="1FvUUU" id="VV4Z5J6mS0" role="1FfB6u">
<property role="TrG5h" value="T" />
</node>
<node concept="1FvUUU" id="VV4Z5J6mSn" role="1FfB6v">
<node concept="1FvUUU" id="VV4Z5J6mQR" role="1FfB6v">
<property role="TrG5h" value="T2" />
</node>
</node>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment