Skip to content

Commit f681a07

Browse files
markusvoelterslisson
markusvoelter
authored and
slisson
committed
facrtory now with better defaults
1 parent 4764349 commit f681a07

File tree

6 files changed

+344
-106
lines changed

6 files changed

+344
-106
lines changed

‎mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
1212
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
1313
<import index="6g1h" ref="r:f15de0ef-f102-4f26-b0fe-38162dc98a6a(org.modelix.mps.react.stdlib.modelix)" />
14-
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
1514
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
1615
<import index="wrwm" ref="r:44d56dac-a204-4926-8f4e-cd6684c153aa(ReactDemoLanguage.behavior)" implicit="true" />
1716
</imports>
@@ -81,7 +80,6 @@
8180
<child id="1068498886295" name="lValue" index="37vLTJ" />
8281
</concept>
8382
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
84-
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
8583
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
8684
<child id="1197027771414" name="operand" index="2Oq$k0" />
8785
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -109,9 +107,6 @@
109107
<child id="1068581517665" name="statement" index="3cqZAp" />
110108
</concept>
111109
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
112-
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
113-
<child id="1081516765348" name="expression" index="3fr31v" />
114-
</concept>
115110
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
116111
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
117112
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -235,10 +230,7 @@
235230
<concept id="2879488090856848295" name="org.modelix.mps.react.muicomponents.structure.TextField" flags="ng" index="2Ly8ie">
236231
<child id="2041619518470150050" name="valueConverter" index="28JTQ0" />
237232
</concept>
238-
<concept id="6743690039082362463" name="org.modelix.mps.react.muicomponents.structure.NodeFactory" flags="ng" index="Vj$03">
239-
<child id="6743690039082370882" name="createFun" index="Vjy4u" />
240-
<child id="6743690039082366092" name="concepts" index="Vj_bg" />
241-
</concept>
233+
<concept id="6743690039082362463" name="org.modelix.mps.react.muicomponents.structure.NodeFactory" flags="ng" index="Vj$03" />
242234
<concept id="6743690039083720913" name="org.modelix.mps.react.muicomponents.structure.IHasSingleChildBinding" flags="ngI" index="VuCqd">
243235
<child id="6743690039083720914" name="data" index="VuCqe" />
244236
</concept>
@@ -305,15 +297,8 @@
305297
</concept>
306298
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
307299
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
308-
<concept id="1181949435690" name="jetbrains.mps.lang.smodel.structure.Concept_NewInstance" flags="nn" index="LFhST" />
309-
<concept id="1181952871644" name="jetbrains.mps.lang.smodel.structure.Concept_GetAllSubConcepts" flags="nn" index="LSoRf">
310-
<child id="1182506816063" name="smodel" index="1iTxcG" />
311-
</concept>
312300
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
313301
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7" />
314-
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
315-
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
316-
</concept>
317302
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
318303
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
319304
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -347,10 +332,8 @@
347332
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
348333
<child id="540871147943773366" name="argument" index="25WWJ7" />
349334
</concept>
350-
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
351335
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
352336
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
353-
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
354337
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
355338
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
356339
</language>
@@ -474,54 +457,10 @@
474457
<node concept="3w_OXm" id="3XUo8X8iAOR" role="2OqNvi" />
475458
</node>
476459
<node concept="Vj$03" id="5Qmp_LAQXbN" role="1nAWF$">
477-
<node concept="2OqwBi" id="5SVlYwCLJVN" role="Vj_bg">
478-
<node concept="2OqwBi" id="5SVlYwCLF1V" role="2Oq$k0">
479-
<node concept="2OqwBi" id="5Qmp_LAQYzB" role="2Oq$k0">
480-
<node concept="35c_gC" id="5Qmp_LAQXuU" role="2Oq$k0">
481-
<ref role="35c_gD" to="oyym:1XYAF4MuRQV" resolve="Type" />
482-
</node>
483-
<node concept="LSoRf" id="5Qmp_LAQZJL" role="2OqNvi">
484-
<node concept="2OqwBi" id="5Qmp_LAR0dh" role="1iTxcG">
485-
<node concept="ggAI9" id="5Qmp_LAR02L" role="2Oq$k0" />
486-
<node concept="I4A8Y" id="5Qmp_LAR0Dx" role="2OqNvi" />
487-
</node>
488-
</node>
489-
</node>
490-
<node concept="3zZkjj" id="5SVlYwCLGr8" role="2OqNvi">
491-
<node concept="1bVj0M" id="5SVlYwCLGra" role="23t8la">
492-
<node concept="3clFbS" id="5SVlYwCLGrb" role="1bW5cS">
493-
<node concept="3clFbF" id="5SVlYwCLGMn" role="3cqZAp">
494-
<node concept="3fqX7Q" id="5SVlYwCLJ2N" role="3clFbG">
495-
<node concept="2OqwBi" id="5SVlYwCLJ2P" role="3fr31v">
496-
<node concept="37vLTw" id="5SVlYwCLJ2Q" role="2Oq$k0">
497-
<ref role="3cqZAo" node="5SVlYwCLGrc" resolve="it" />
498-
</node>
499-
<node concept="liA8E" id="5SVlYwCLJ2R" role="2OqNvi">
500-
<ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
501-
</node>
502-
</node>
503-
</node>
504-
</node>
505-
</node>
506-
<node concept="gl6BB" id="5SVlYwCLGrc" role="1bW2Oz">
507-
<property role="TrG5h" value="it" />
508-
<node concept="2jxLKc" id="5SVlYwCLGrd" role="1tU5fm" />
509-
</node>
510-
</node>
511-
</node>
512-
</node>
513-
<node concept="ANE8D" id="5SVlYwCLLhe" role="2OqNvi" />
514-
</node>
515460
<node concept="Vvv9j" id="5Qmp_LAWeAc" role="VuCqe">
516461
<ref role="Vvshh" to="oyym:1XYAF4MuUxD" resolve="type" />
517462
<node concept="ggAI9" id="5Qmp_LAWeTn" role="VvvGQ" />
518463
</node>
519-
<node concept="28B5xO" id="5SVlYwCZTU1" role="Vjy4u">
520-
<node concept="2OqwBi" id="5SVlYwCZV6L" role="28B56T">
521-
<node concept="28Bezj" id="5SVlYwCZUil" role="2Oq$k0" />
522-
<node concept="LFhST" id="5SVlYwCZVLF" role="2OqNvi" />
523-
</node>
524-
</node>
525464
</node>
526465
</node>
527466
<node concept="2Ln$92" id="3XUo8X8iC1n" role="1nAWFW">

‎mps/modules/ReactDemoLanguage.sandbox/models/ReactDemoLanguage.sandbox.m1.mps‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
<child id="3230484732390143835" name="children" index="2yIKJ$" />
2525
</concept>
2626
<concept id="223742654175067082" name="ReactDemoLanguage.structure.Blank" flags="ng" index="GbXW8" />
27-
<concept id="2269421348088144220" name="ReactDemoLanguage.structure.Member" flags="ng" index="H1vJH" />
27+
<concept id="2269421348088157535" name="ReactDemoLanguage.structure.IntType" flags="ng" index="H1gZI" />
28+
<concept id="2269421348088144220" name="ReactDemoLanguage.structure.Member" flags="ng" index="H1vJH">
29+
<child id="2269421348088162409" name="type" index="H1jbo" />
30+
</concept>
2831
<concept id="2879488090880630244" name="ReactDemoLanguage.structure.ReadOrEdit" flags="ng" index="2K7qbd">
2932
<property id="2879488090881171739" name="a" index="2K1lSM" />
3033
<property id="2879488090881171741" name="c" index="2K1lSO" />
@@ -3704,6 +3707,7 @@
37043707
</node>
37053708
<node concept="H1vJH" id="3XUo8X8irsG">
37063709
<property role="TrG5h" value="StringMember" />
3710+
<node concept="H1gZI" id="af0_0CHm$E" role="H1jbo" />
37073711
</node>
37083712
</model>
37093713

‎mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
<property role="IQ2ns" value="2269421348088149062" />
230230
<property role="20lmBu" value="fLJjDmT/aggregation" />
231231
<property role="20kJfa" value="members" />
232-
<property role="20lbJX" value="fLJekj5/_0__n" />
232+
<property role="20lbJX" value="fLJekj4/_1" />
233233
<ref role="20lvS9" node="1XYAF4MuQ5s" resolve="Member" />
234234
</node>
235235
</node>

0 commit comments

Comments
 (0)