Skip to content

Commit ccfe81d

Browse files
mgronovermgronover
committed
fixed filtering of objects in enum generator to fit to OHs expectations on compare #750 
1 parent bf729cd commit ccfe81d

File tree

2 files changed

+146
-83
lines changed

2 files changed

+146
-83
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/[email protected]‎

Lines changed: 6 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@
3939
</concept>
4040
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
4141
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
42-
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
43-
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
44-
</concept>
45-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
46-
<child id="1188208488637" name="annotation" index="2AJF6D" />
47-
</concept>
4842
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
4943
<child id="1197027771414" name="operand" index="2Oq$k0" />
5044
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -88,9 +82,6 @@
8882
<property id="1176718929932" name="isFinal" index="3TUv4t" />
8983
<child id="1068431790190" name="initializer" index="33vP2m" />
9084
</concept>
91-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
92-
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
93-
</concept>
9485
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
9586
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
9687
</concept>
@@ -5468,43 +5459,9 @@
54685459
</node>
54695460
<node concept="liA8E" id="29KNCey4pod" role="2OqNvi">
54705461
<ref role="37wK5l" to="1ctc:~Stream.filter(java.util.function.Predicate)" resolve="filter" />
5471-
<node concept="2ShNRf" id="29KNCey8WE5" role="37wK5m">
5472-
<node concept="YeOm9" id="29KNCey8WE6" role="2ShVmc">
5473-
<node concept="1Y3b0j" id="29KNCey8WE7" role="YeSDq">
5474-
<property role="2bfB8j" value="true" />
5475-
<property role="373rjd" value="true" />
5476-
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
5477-
<ref role="1Y3XeK" to="82uw:~Predicate" resolve="Predicate" />
5478-
<node concept="3Tm1VV" id="29KNCey8WE8" role="1B3o_S" />
5479-
<node concept="3clFb_" id="29KNCey8WE9" role="jymVt">
5480-
<property role="TrG5h" value="test" />
5481-
<node concept="3Tm1VV" id="29KNCey8WEa" role="1B3o_S" />
5482-
<node concept="10P_77" id="29KNCey8WEb" role="3clF45" />
5483-
<node concept="37vLTG" id="29KNCey8WEc" role="3clF46">
5484-
<property role="TrG5h" value="it" />
5485-
<node concept="3uibUv" id="29KNCey8WEd" role="1tU5fm">
5486-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
5487-
</node>
5488-
</node>
5489-
<node concept="3clFbS" id="29KNCey8WEe" role="3clF47">
5490-
<node concept="3cpWs6" id="29KNCey8WEf" role="3cqZAp">
5491-
<node concept="3y3z36" id="29KNCey8WEg" role="3cqZAk">
5492-
<node concept="10Nm6u" id="29KNCey8WEh" role="3uHU7w" />
5493-
<node concept="37vLTw" id="29KNCey8WEi" role="3uHU7B">
5494-
<ref role="3cqZAo" node="29KNCey8WEc" resolve="it" />
5495-
</node>
5496-
</node>
5497-
</node>
5498-
</node>
5499-
<node concept="2AHcQZ" id="29KNCey8WEj" role="2AJF6D">
5500-
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
5501-
</node>
5502-
</node>
5503-
<node concept="3uibUv" id="29KNCey8WEk" role="2Ghqu4">
5504-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
5505-
</node>
5506-
</node>
5507-
</node>
5462+
<node concept="2YIFZM" id="4UpGdVfRO3$" role="37wK5m">
5463+
<ref role="37wK5l" to="dj6k:4UpGdVfRtuP" resolve="predicate" />
5464+
<ref role="1Pybhc" to="dj6k:36hsHVf8gww" resolve="OH" />
55085465
</node>
55095466
</node>
55105467
</node>
@@ -5711,43 +5668,9 @@
57115668
</node>
57125669
<node concept="liA8E" id="29KNCey4xGi" role="2OqNvi">
57135670
<ref role="37wK5l" to="1ctc:~Stream.filter(java.util.function.Predicate)" resolve="filter" />
5714-
<node concept="2ShNRf" id="29KNCey8N2Y" role="37wK5m">
5715-
<node concept="YeOm9" id="29KNCey8Pm9" role="2ShVmc">
5716-
<node concept="1Y3b0j" id="29KNCey8Pmc" role="YeSDq">
5717-
<property role="2bfB8j" value="true" />
5718-
<property role="373rjd" value="true" />
5719-
<ref role="1Y3XeK" to="82uw:~Predicate" resolve="Predicate" />
5720-
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
5721-
<node concept="3Tm1VV" id="29KNCey8Pmd" role="1B3o_S" />
5722-
<node concept="3clFb_" id="29KNCey8Pmr" role="jymVt">
5723-
<property role="TrG5h" value="test" />
5724-
<node concept="3Tm1VV" id="29KNCey8Pms" role="1B3o_S" />
5725-
<node concept="10P_77" id="29KNCey8Pmu" role="3clF45" />
5726-
<node concept="37vLTG" id="29KNCey8Pmv" role="3clF46">
5727-
<property role="TrG5h" value="it" />
5728-
<node concept="3uibUv" id="29KNCey8PmG" role="1tU5fm">
5729-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
5730-
</node>
5731-
</node>
5732-
<node concept="3clFbS" id="29KNCey8Pmx" role="3clF47">
5733-
<node concept="3cpWs6" id="29KNCey5PMP" role="3cqZAp">
5734-
<node concept="3y3z36" id="29KNCey4xGm" role="3cqZAk">
5735-
<node concept="10Nm6u" id="29KNCey4xGn" role="3uHU7w" />
5736-
<node concept="37vLTw" id="29KNCey4xGo" role="3uHU7B">
5737-
<ref role="3cqZAo" node="29KNCey8Pmv" resolve="it" />
5738-
</node>
5739-
</node>
5740-
</node>
5741-
</node>
5742-
<node concept="2AHcQZ" id="29KNCey8Pmz" role="2AJF6D">
5743-
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
5744-
</node>
5745-
</node>
5746-
<node concept="3uibUv" id="29KNCey8PmF" role="2Ghqu4">
5747-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
5748-
</node>
5749-
</node>
5750-
</node>
5671+
<node concept="2YIFZM" id="4UpGdVfRZwi" role="37wK5m">
5672+
<ref role="37wK5l" to="dj6k:4UpGdVfRtuP" resolve="predicate" />
5673+
<ref role="1Pybhc" to="dj6k:36hsHVf8gww" resolve="OH" />
57515674
</node>
57525675
</node>
57535676
</node>

0 commit comments

Comments
 (0)