Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mbeddr/mbeddr.core
Browse files Browse the repository at this point in the history
  • Loading branch information
@wsafonov
wsafonov committed Jan 12, 2016
2 parents 15e26cd + a4ffcdb commit ef3ba38
Show file tree
Hide file tree
Showing 15 changed files with 2,504 additions and 626 deletions.
123 changes: 123 additions & 0 deletions ...guages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4017,6 +4017,129 @@
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="2NXPZ9" id="1N1hUWXfbur" role="N3F5h">
<property role="TrG5h" value="empty_1452508364965_1" />
</node>
<node concept="N3Fnw" id="1N1hUWXfdj4" role="N3F5h">
<property role="TrG5h" value="qsort" />
<property role="2OOxQR" value="false" />
<node concept="19Rifw" id="1N1hUWXfcsM" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
<node concept="19RgSI" id="1N1hUWXfe97" role="1UOdpc">
<property role="TrG5h" value="base" />
<node concept="3wxxNl" id="1N1hUWXfe9m" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
<node concept="19Rifw" id="1N1hUWXfe96" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfeae" role="1UOdpc">
<property role="TrG5h" value="num" />
<node concept="2O5j3L" id="1N1hUWXfeac" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfeaX" role="1UOdpc">
<property role="TrG5h" value="size" />
<node concept="2O5j3L" id="1N1hUWXfeaV" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfebA" role="1UOdpc">
<property role="TrG5h" value="compar" />
<node concept="pFrBc" id="1N1hUWXfebY" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
<node concept="3wxxNl" id="1N1hUWXfedH" role="pFrBa">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="true" />
<node concept="19Rifw" id="1N1hUWXfedb" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="3wxxNl" id="1N1hUWXfekQ" role="pFrBa">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="true" />
<node concept="19Rifw" id="1N1hUWXfek8" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="3TlMh2" id="1N1hUWXfemT" role="pFrBb">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
</node>
</node>
<node concept="N3Fnw" id="1N1hUWXfeq5" role="N3F5h">
<property role="TrG5h" value="qsort_r" />
<property role="2OOxQR" value="false" />
<node concept="19Rifw" id="1N1hUWXfeq6" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
<node concept="19RgSI" id="1N1hUWXfeq7" role="1UOdpc">
<property role="TrG5h" value="base" />
<node concept="3wxxNl" id="1N1hUWXfeq8" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
<node concept="19Rifw" id="1N1hUWXfeq9" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfeqa" role="1UOdpc">
<property role="TrG5h" value="num" />
<node concept="2O5j3L" id="1N1hUWXfeqb" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfeqc" role="1UOdpc">
<property role="TrG5h" value="size" />
<node concept="2O5j3L" id="1N1hUWXfeqd" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="19RgSI" id="1N1hUWXfeqe" role="1UOdpc">
<property role="TrG5h" value="compar" />
<node concept="pFrBc" id="1N1hUWXfeqf" role="2C2TGm">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
<node concept="3wxxNl" id="1N1hUWXfeqg" role="pFrBa">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="true" />
<node concept="19Rifw" id="1N1hUWXfeqh" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="3wxxNl" id="1N1hUWXfeqi" role="pFrBa">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="true" />
<node concept="19Rifw" id="1N1hUWXfeqj" role="2umbIo">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
<node concept="3TlMh2" id="1N1hUWXfeqk" role="pFrBb">
<property role="2caQfQ" value="false" />
<property role="2c7vTL" value="false" />
</node>
</node>
</node>
</node>
<node concept="rcWE1" id="1WTn9U1b1j2" role="rcWEr">
<property role="rcWEL" value="&lt;stdlib.h&gt;" />
</node>
Expand Down
8 changes: 8 additions & 0 deletions ...il.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,5 +968,13 @@
</node>
</node>
</node>
<node concept="24kQdi" id="7FkgTXZtQf_">
<ref role="1XX52x" to="ibwz:7FkgTXZtQe1" resolve="TEST_EnumWrapper" />
<node concept="1kIj98" id="7FkgTXZtQg5" role="2wV5jI">
<node concept="3F0A7n" id="7FkgTXZtQgm" role="1kIj9b">
<ref role="1NtTu8" to="ibwz:7FkgTXZtQgh" resolve="enum1" />
</node>
</node>
</node>
</model>

42 changes: 42 additions & 0 deletions ...grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@
</imports>
<registry>
<language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
<concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
<property id="1197591154882" name="memberIdentifierPolicy" index="3lZH7k" />
<reference id="1083171729157" name="memberDataType" index="M4eZT" />
<child id="1083172003582" name="member" index="M5hS2" />
</concept>
<concept id="1082978499127" name="jetbrains.mps.lang.structure.structure.ConstrainedDataTypeDeclaration" flags="ng" index="Az7Fb">
<property id="1083066089218" name="constraint" index="FLfZY" />
</concept>
<concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
<property id="1083923523172" name="externalValue" index="1uS6qo" />
<property id="1083923523171" name="internalValue" index="1uS6qv" />
</concept>
<concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
<property id="4628067390765956807" name="final" index="R5$K2" />
<property id="4628067390765956802" name="abstract" index="R5$K7" />
Expand Down Expand Up @@ -465,5 +474,38 @@
<ref role="PrY4T" node="1x69AmkdYA2" resolve="IStatement" />
</node>
</node>
<node concept="1TIwiD" id="7FkgTXZtQe1">
<property role="1pbfSe" value="95705312" />
<property role="TrG5h" value="TEST_EnumWrapper" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyi" id="7FkgTXZtQgh" role="1TKVEl">
<property role="TrG5h" value="enum1" />
<ref role="AX2Wp" node="7FkgTXZtQev" resolve="Enum1" />
</node>
<node concept="PrWs8" id="7FkgTXZtQeq" role="PzmwI">
<ref role="PrY4T" node="6oKG1kMxn8A" resolve="IExpression" />
</node>
</node>
<node concept="AxPO7" id="7FkgTXZtQev">
<property role="TrG5h" value="Enum1" />
<property role="3lZH7k" value="derive_from_internal_value" />
<ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
<node concept="M4N5e" id="7FkgTXZtQew" role="M5hS2">
<property role="1uS6qo" value="a" />
<property role="1uS6qv" value="100" />
</node>
<node concept="M4N5e" id="7FkgTXZtQeT" role="M5hS2">
<property role="1uS6qo" value="b" />
<property role="1uS6qv" value="101" />
</node>
<node concept="M4N5e" id="7FkgTXZtQf2" role="M5hS2">
<property role="1uS6qo" value="c" />
<property role="1uS6qv" value="102" />
</node>
<node concept="M4N5e" id="7FkgTXZtQff" role="M5hS2">
<property role="1uS6qo" value="d" />
<property role="1uS6qv" value="103" />
</node>
</node>
</model>

Loading

0 comments on commit ef3ba38

Please sign in to comment.