Skip to content

GitLab

Commit a3db3bd4 authored by André Pacak's avatar André Pacak
Browse files

fix error for adding elements while iterating

parent f980c61d
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 39 deletions
inca-translation/languages/TypeLang/TypeLang.mpl
View file @ a3db3bd4
......@@ -16,6 +16,7 @@
<external-templates />
<dependencies>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
......
inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
View file @ a3db3bd4
......@@ -8,15 +8,18 @@
<imports>
<import index="b83y" ref="r:63340c72-1a1f-4a8d-acb4-c73b4c9c590a(TypeLang.structure)" />
<import index="pgas" ref="r:c75f6d0a-e344-4076-8a9a-431398544fab(TypeLang.behavior)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
<concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
<child id="1076505808688" name="condition" index="2$JKZa" />
</concept>
<concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
<child id="1239714902950" name="expression" index="2$L3a6" />
</concept>
......@@ -78,10 +81,17 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
<child id="1212687122400" name="typeParameter" index="1pMfVU" />
</concept>
<concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
</concept>
<concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
<child id="1109201940907" name="parameter" index="11_B2D" />
</concept>
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
......@@ -145,10 +155,6 @@
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
<child id="1226511765987" name="elementType" index="2hN53Y" />
</concept>
<concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
......@@ -161,11 +167,7 @@
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
</concept>
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
......@@ -246,30 +248,33 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="2groWwY9k_B" role="3cqZAp">
<node concept="3cpWsn" id="2groWwY9k_E" role="3cpWs9">
<node concept="3cpWs8" id="3l1hjk$17fH" role="3cqZAp">
<node concept="3cpWsn" id="3l1hjk$17fI" role="3cpWs9">
<property role="TrG5h" value="variables" />
<node concept="2hMVRd" id="2groWwY9k_z" role="1tU5fm">
<node concept="3Tqbb2" id="2groWwY9l8F" role="2hN53Y">
<node concept="3uibUv" id="3l1hjk$17fF" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3Tqbb2" id="3l1hjk$18nt" role="11_B2D">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
</node>
<node concept="2ShNRf" id="2groWwY9lmT" role="33vP2m">
<node concept="2i4dXS" id="2groWwY9llx" role="2ShVmc">
<node concept="3Tqbb2" id="2groWwY9lly" role="HW$YZ">
<node concept="2ShNRf" id="3l1hjk$18sw" role="33vP2m">
<node concept="1pGfFk" id="3l1hjk$18Wh" role="2ShVmc">
<ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;()" resolve="LinkedList" />
<node concept="3Tqbb2" id="3l1hjk$19gn" role="1pMfVU">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2groWwY9Egy" role="3cqZAp">
<node concept="2OqwBi" id="2groWwY9Fjr" role="3clFbG">
<node concept="37vLTw" id="2groWwY9Egw" role="2Oq$k0">
<ref role="3cqZAo" node="2groWwY9k_E" resolve="variables" />
<node concept="3clFbF" id="3l1hjkzY3Wh" role="3cqZAp">
<node concept="2OqwBi" id="3l1hjkzY5iZ" role="3clFbG">
<node concept="37vLTw" id="3l1hjk$2yW0" role="2Oq$k0">
<ref role="3cqZAo" node="3l1hjk$17fI" resolve="variables" />
</node>
<node concept="TSZUe" id="2groWwY9Idp" role="2OqNvi">
<node concept="Jnkvi" id="2groWwYkEOp" role="25WWJ7">
<node concept="liA8E" id="3l1hjkzY5QH" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
<node concept="Jnkvi" id="3l1hjkzY6bD" role="37wK5m">
<ref role="1M0zk5" node="2groWwYky0L" resolve="criteriavar" />
</node>
</node>
......@@ -292,14 +297,43 @@
<ref role="2Gs0qQ" node="2groWwY9trg" resolve="premise" />
</node>
<node concept="3clFbS" id="2groWwY9_CQ" role="Jncv$">
<node concept="2Gpval" id="2groWwY9Jjg" role="3cqZAp">
<node concept="2GrKxI" id="2groWwY9Jji" role="2Gsz3X">
<property role="TrG5h" value="var" />
</node>
<node concept="37vLTw" id="2groWwY9J$g" role="2GsD0m">
<ref role="3cqZAo" node="2groWwY9k_E" resolve="variables" />
<node concept="3cpWs8" id="3l1hjk$3KOT" role="3cqZAp">
<node concept="3cpWsn" id="3l1hjkzXzL9" role="3cpWs9">
<property role="TrG5h" value="variablesListIterator" />
<node concept="3uibUv" id="3l1hjkzXzKK" role="1tU5fm">
<ref role="3uigEE" to="33ny:~ListIterator" resolve="ListIterator" />
<node concept="3Tqbb2" id="3l1hjkzXzKN" role="11_B2D">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
</node>
<node concept="2OqwBi" id="3l1hjkzXzLa" role="33vP2m">
<node concept="37vLTw" id="3l1hjk$19x3" role="2Oq$k0">
<ref role="3cqZAo" node="3l1hjk$17fI" resolve="variables" />
</node>
<node concept="liA8E" id="3l1hjkzXzLc" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.listIterator():java.util.ListIterator" resolve="listIterator" />
</node>
</node>
</node>
<node concept="3clFbS" id="2groWwY9Jjm" role="2LFqv$">
</node>
<node concept="2$JKZl" id="3l1hjkzXpAl" role="3cqZAp">
<node concept="3clFbS" id="3l1hjkzXpAn" role="2LFqv$">
<node concept="3cpWs8" id="3l1hjkzYbzJ" role="3cqZAp">
<node concept="3cpWsn" id="3l1hjkzYbzK" role="3cpWs9">
<property role="TrG5h" value="var" />
<node concept="3Tqbb2" id="3l1hjkzYbzh" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
<node concept="2OqwBi" id="3l1hjkzYbzL" role="33vP2m">
<node concept="37vLTw" id="3l1hjkzYbzM" role="2Oq$k0">
<ref role="3cqZAo" node="3l1hjkzXzL9" resolve="variablesListIterator" />
</node>
<node concept="liA8E" id="3l1hjkzYbzN" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ListIterator.next():java.lang.Object" resolve="next" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="2groWwY9K3n" role="3cqZAp">
<node concept="3clFbS" id="2groWwY9K3p" role="3clFbx">
<node concept="3cpWs8" id="2groWwYa54p" role="3cqZAp">
......@@ -316,14 +350,25 @@
</node>
</node>
</node>
<node concept="3clFbF" id="2groWwYa6$4" role="3cqZAp">
<node concept="2OqwBi" id="2groWwYa7wC" role="3clFbG">
<node concept="37vLTw" id="2groWwYa6$2" role="2Oq$k0">
<ref role="3cqZAo" node="2groWwY9k_E" resolve="variables" />
</node>
<node concept="X8dFx" id="2groWwYa83N" role="2OqNvi">
<node concept="37vLTw" id="2groWwYa8aU" role="25WWJ7">
<ref role="3cqZAo" node="2groWwYa54q" resolve="inputs" />
<node concept="2Gpval" id="3l1hjkzYjIR" role="3cqZAp">
<node concept="2GrKxI" id="3l1hjkzYjIT" role="2Gsz3X">
<property role="TrG5h" value="input" />
</node>
<node concept="37vLTw" id="3l1hjkzYlxP" role="2GsD0m">
<ref role="3cqZAo" node="2groWwYa54q" resolve="inputs" />
</node>
<node concept="3clFbS" id="3l1hjkzYjIX" role="2LFqv$">
<node concept="3clFbF" id="3l1hjkzYl$j" role="3cqZAp">
<node concept="2OqwBi" id="3l1hjkzYlO2" role="3clFbG">
<node concept="37vLTw" id="3l1hjkzYl$i" role="2Oq$k0">
<ref role="3cqZAo" node="3l1hjkzXzL9" resolve="variablesListIterator" />
</node>
<node concept="liA8E" id="3l1hjkzYuTK" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ListIterator.add(java.lang.Object):void" resolve="add" />
<node concept="2GrUjf" id="3l1hjkzYuX7" role="37wK5m">
<ref role="2Gs0qQ" node="3l1hjkzYjIT" resolve="input" />
</node>
</node>
</node>
</node>
</node>
......@@ -346,8 +391,8 @@
</node>
<node concept="1rXfSq" id="2groWwY9Tya" role="3clFbw">
<ref role="37wK5l" node="2groWwY9D7e" resolve="isVarInOutput" />
<node concept="2GrUjf" id="2groWwY9TGJ" role="37wK5m">
<ref role="2Gs0qQ" node="2groWwY9Jji" resolve="var" />
<node concept="37vLTw" id="3l1hjkzYdLO" role="37wK5m">
<ref role="3cqZAo" node="3l1hjkzYbzK" resolve="var" />
</node>
<node concept="Jnkvi" id="2groWwY9TY5" role="37wK5m">
<ref role="1M0zk5" node="2groWwY9_CS" resolve="premisewd" />
......@@ -355,6 +400,14 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="3l1hjkzY74U" role="2$JKZa">
<node concept="37vLTw" id="3l1hjkzY6LB" role="2Oq$k0">
<ref role="3cqZAo" node="3l1hjkzXzL9" resolve="variablesListIterator" />
</node>
<node concept="liA8E" id="3l1hjkzY7no" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ListIterator.hasNext():boolean" resolve="hasNext" />
</node>
</node>
</node>
</node>
<node concept="JncvC" id="2groWwY9_CS" role="JncvA">
......
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