Skip to content

Commit bf459e1

Browse files
Alexander Pannarimer
Alexander Pann
authored and
arimer
committed
physunits: hardcode unitless reference in Unit constraints
1 parent 4714e53 commit bf459e1

File tree

1 file changed

+11
-80
lines changed

1 file changed

+11
-80
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.constraints.mps‎

Lines changed: 11 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
2222
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
2323
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
24-
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
2524
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
2625
<import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" implicit="true" />
2726
</imports>
@@ -57,6 +56,7 @@
5756
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
5857
</concept>
5958
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
59+
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
6060
<concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
6161
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
6262
<child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -94,9 +94,6 @@
9494
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
9595
<child id="1068499141038" name="actualArgument" index="37wK5m" />
9696
</concept>
97-
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
98-
<reference id="1107535924139" name="classifier" index="3uigEE" />
99-
</concept>
10097
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
10198
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
10299
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -110,10 +107,6 @@
110107
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
111108
<child id="8356039341262087992" name="line" index="1aUNEU" />
112109
</concept>
113-
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
114-
<reference id="1116615189566" name="classifier" index="3VsUkX" />
115-
</concept>
116-
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
117110
</language>
118111
<language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
119112
<concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
@@ -159,10 +152,6 @@
159152
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
160153
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
161154
</concept>
162-
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
163-
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
164-
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
165-
</concept>
166155
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
167156
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
168157
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
@@ -665,62 +654,9 @@
665654
<ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
666655
<node concept="Eqf_E" id="3xwfj1ivqJx" role="EtsB7">
667656
<node concept="3clFbS" id="3xwfj1ivqJy" role="2VODD2">
668-
<node concept="3cpWs8" id="3xwfj1iDGp$" role="3cqZAp">
669-
<node concept="3cpWsn" id="3xwfj1iDGp_" role="3cpWs9">
670-
<property role="TrG5h" value="repository" />
671-
<node concept="3uibUv" id="3xwfj1iDG7i" role="1tU5fm">
672-
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
673-
</node>
674-
<node concept="2OqwBi" id="3xwfj1iDGpA" role="33vP2m">
675-
<node concept="2JrnkZ" id="3xwfj1iDGpB" role="2Oq$k0">
676-
<node concept="2OqwBi" id="3xwfj1iDGpC" role="2JrQYb">
677-
<node concept="EsrRn" id="3xwfj1iDGpD" role="2Oq$k0" />
678-
<node concept="I4A8Y" id="3xwfj1iDGpE" role="2OqNvi" />
679-
</node>
680-
</node>
681-
<node concept="liA8E" id="3xwfj1iDGpF" role="2OqNvi">
682-
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
683-
</node>
684-
</node>
685-
</node>
686-
</node>
687-
<node concept="3clFbJ" id="3xwfj1iDGGE" role="3cqZAp">
688-
<node concept="3clFbS" id="3xwfj1iDGGG" role="3clFbx">
689-
<node concept="3clFbF" id="3xwfj1iDHcG" role="3cqZAp">
690-
<node concept="37vLTI" id="3xwfj1iIHEZ" role="3clFbG">
691-
<node concept="37vLTw" id="3xwfj1iDHcE" role="37vLTJ">
692-
<ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
693-
</node>
694-
<node concept="2OqwBi" id="4wvzrd4Fdye" role="37vLTx">
695-
<node concept="2OqwBi" id="4wvzrd4Fcgl" role="2Oq$k0">
696-
<node concept="2YIFZM" id="4wvzrd4FbSN" role="2Oq$k0">
697-
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
698-
<ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
699-
</node>
700-
<node concept="liA8E" id="4wvzrd4Fd3P" role="2OqNvi">
701-
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
702-
</node>
703-
</node>
704-
<node concept="liA8E" id="4wvzrd4Fe1R" role="2OqNvi">
705-
<ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
706-
<node concept="3VsKOn" id="4wvzrd4Fj$z" role="37wK5m">
707-
<ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
708-
</node>
709-
</node>
710-
</node>
711-
</node>
712-
</node>
713-
</node>
714-
<node concept="3clFbC" id="3xwfj1iDGZp" role="3clFbw">
715-
<node concept="10Nm6u" id="3xwfj1iDH7j" role="3uHU7w" />
716-
<node concept="37vLTw" id="3xwfj1iDGP5" role="3uHU7B">
717-
<ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
718-
</node>
719-
</node>
720-
</node>
721-
<node concept="3clFbJ" id="3xwfj1ivqTE" role="3cqZAp">
722-
<node concept="3clFbS" id="3xwfj1ivqTG" role="3clFbx">
723-
<node concept="3cpWs6" id="3xwfj1ivuHD" role="3cqZAp">
657+
<node concept="3clFbJ" id="7amkF1KMrHA" role="3cqZAp">
658+
<node concept="3clFbS" id="7amkF1KMrHC" role="3clFbx">
659+
<node concept="3cpWs6" id="7amkF1KMtPH" role="3cqZAp">
724660
<node concept="2OqwBi" id="3xwfj1ivyIG" role="3cqZAk">
725661
<node concept="2YIFZM" id="3xwfj1ivyvg" role="2Oq$k0">
726662
<ref role="37wK5l" to="65nr:4qv99IrBnzk" resolve="getConfig" />
@@ -732,19 +668,14 @@
732668
</node>
733669
</node>
734670
</node>
735-
<node concept="1Wc70l" id="3xwfj1iILD7" role="3clFbw">
736-
<node concept="3y3z36" id="3xwfj1iILYH" role="3uHU7B">
737-
<node concept="10Nm6u" id="3xwfj1iIM8q" role="3uHU7w" />
738-
<node concept="37vLTw" id="3xwfj1iILLo" role="3uHU7B">
739-
<ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
740-
</node>
671+
<node concept="17R0WA" id="7amkF1KMtFP" role="3clFbw">
672+
<node concept="Xl_RD" id="7amkF1KMtIz" role="3uHU7w">
673+
<property role="Xl_RC" value="unitless" />
741674
</node>
742-
<node concept="2YIFZM" id="3xwfj1ivsdh" role="3uHU7w">
743-
<ref role="37wK5l" to="rppw:l_FyLXfCFW" resolve="isUnitLessUnit" />
744-
<ref role="1Pybhc" to="rppw:3xM68GMxWv0" resolve="StandardUnitHelper" />
745-
<node concept="EsrRn" id="3xwfj1ivsjE" role="37wK5m" />
746-
<node concept="37vLTw" id="3xwfj1iDGpG" role="37wK5m">
747-
<ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
675+
<node concept="2OqwBi" id="7amkF1KMsaW" role="3uHU7B">
676+
<node concept="EsrRn" id="7amkF1KMrIt" role="2Oq$k0" />
677+
<node concept="3TrcHB" id="7amkF1KMsMI" role="2OqNvi">
678+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
748679
</node>
749680
</node>
750681
</node>

0 commit comments

Comments
 (0)