Skip to content

GitLab

Commit 79b27453 authored by Sebastian Erdweg's avatar Sebastian Erdweg
Browse files
Options

fixed TypeLang->Inca generator: generate AssignStatement instead of AssertStatement

parent d0de4f7d
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 46 deletions
inca-translation/languages/TypeLang/TypeLang.mpl
View file @ 79b27453
......@@ -21,9 +21,7 @@
<dependency reexport="false">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</dependency>
<dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
<dependency reexport="false">d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)</dependency>
<dependency reexport="false">1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">ffdbca37-b97f-439c-8366-148d3b8b6c53(org.inca.extensions#01)</dependency>
</dependencies>
<languageVersions>
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
......@@ -66,18 +64,16 @@
<module reference="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)" version="0" />
<module reference="1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)" version="0" />
<module reference="bc791f96-4749-4311-a6e4-241e47ca97f9(org.inca.core.util)" version="0" />
<module reference="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)" version="0" />
<module reference="d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)" version="0" />
<module reference="3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)" version="0" />
<module reference="ffdbca37-b97f-439c-8366-148d3b8b6c53(org.inca.extensions#01)" version="0" />
<module reference="8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)" version="0" />
<module reference="cd2909da-ecb4-49dc-b176-33e5c619e516(org.inca.gp)" version="0" />
</dependencyVersions>
......@@ -90,21 +86,7 @@
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)" />
<generator generatorUID="ffdbca37-b97f-439c-8366-148d3b8b6c53(org.inca.extensions#01)" />
<external-mapping>
<all-local-mappings />
</external-mapping>
......@@ -119,11 +101,10 @@
<dependency reexport="false">80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
<dependency reexport="false">ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71(TypeLang)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2(org.inca.data)</dependency>
<dependency reexport="false">8c9a2720-9d21-4370-a226-819eb3e76e1e(org.inca.fun)</dependency>
<dependency reexport="false">b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</dependency>
</dependencies>
<languageVersions>
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="0" />
......@@ -166,7 +147,6 @@
<module reference="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
......@@ -182,7 +162,7 @@
<module reference="80e42679-e00d-400f-8714-aee80946d2f9(org.inca.styles)" version="0" />
</dependencyVersions>
<extendedLanguages>
<extendedLanguage>b802a056-92a2-4fbc-902e-f8e5004c331f(org.inca.core)</extendedLanguage>
<extendedLanguage>3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</extendedLanguage>
<extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
</extendedLanguages>
</language>
......
inca-translation/languages/TypeLang/generator/template/TypeLang.generator.util.mps
View file @ 79b27453
......@@ -3713,26 +3713,20 @@
<node concept="TSZUe" id="2U2uJPpXEVp" role="2OqNvi">
<node concept="2pJPEk" id="2U2uJPpXF8R" role="25WWJ7">
<node concept="2pJPED" id="2U2uJPpXFjP" role="2pJPEn">
<ref role="2pJxaS" to="ebqt:52HBLukNlug" resolve="AssertStatement" />
<node concept="2pIpSj" id="2U2uJPpXFtx" role="2pJxcM">
<ref role="2pIpSl" to="ebqt:52HBLukNlwv" resolve="condition" />
<node concept="2pJPED" id="2U2uJPpXFC6" role="2pJxcZ">
<ref role="2pJxaS" to="ebqt:52HBLukNm6H" resolve="Equality" />
<node concept="2pIpSj" id="2U2uJPpXFE4" role="2pJxcM">
<ref role="2pIpSl" to="ebqt:52HBLukNl30" resolve="left" />
<node concept="36biLy" id="2U2uJPpXFEu" role="2pJxcZ">
<node concept="37vLTw" id="2U2uJPpXFM3" role="36biLW">
<ref role="3cqZAo" node="2U2uJPpXp8B" resolve="funVar" />
</node>
</node>
<ref role="2pJxaS" to="ebqt:52HBLukNkCm" resolve="AssignmentStatement" />
<node concept="2pIpSj" id="2U2uJPqfc_m" role="2pJxcM">
<ref role="2pIpSl" to="ebqt:52HBLukNl30" resolve="left" />
<node concept="36biLy" id="2U2uJPqfdkW" role="2pJxcZ">
<node concept="37vLTw" id="2U2uJPqfdsx" role="36biLW">
<ref role="3cqZAo" node="2U2uJPpXp8B" resolve="funVar" />
</node>
<node concept="2pIpSj" id="2U2uJPpXFQh" role="2pJxcM">
<ref role="2pIpSl" to="ebqt:52HBLukNl33" resolve="right" />
<node concept="36biLy" id="2U2uJPpXFQP" role="2pJxcZ">
<node concept="37vLTw" id="2U2uJPpXFYq" role="36biLW">
<ref role="3cqZAo" node="2U2uJPpRhUI" resolve="matchee" />
</node>
</node>
</node>
</node>
<node concept="2pIpSj" id="2U2uJPqfdH4" role="2pJxcM">
<ref role="2pIpSl" to="ebqt:52HBLukNl33" resolve="right" />
<node concept="36biLy" id="2U2uJPqfdRw" role="2pJxcZ">
<node concept="37vLTw" id="2U2uJPqfdZ5" role="36biLW">
<ref role="3cqZAo" node="2U2uJPpRhUI" resolve="matchee" />
</node>
</node>
</node>
......
inca-translation/solutions/STLCN_Checker/models/model.mps
View file @ 79b27453
......@@ -545,7 +545,7 @@
</node>
<node concept="MuuBa" id="5kwek91gX8$" role="Muu84">
<node concept="Mu3nt" id="5kwek91gXeb" role="MuuBj">
<property role="Mu3ny" value="&quot;check failed&quot;" />
<property role="Mu3ny" value="check failed" />
</node>
</node>
</node>
......
inca-translation/solutions/TypeLangTest/models/test2.mps → inca-translation/solutions/TypeLangTest/models/test_genInca.mps
View file @ 79b27453
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:49cc3b7d-f942-49d5-abd9-3537b2e0b6f4(test2)">
<model ref="r:49cc3b7d-f942-49d5-abd9-3537b2e0b6f4(test_genInca)">
<persistence version="9" />
<languages>
<use id="ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71" name="TypeLang" version="0" />
......@@ -9,6 +9,7 @@
<imports>
<import index="5va7" ref="r:568f7667-a603-4374-adfa-c84f4fd5dac3(STLCN.structure)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="hqsm" ref="r:aa4c3470-43ab-4dad-b73e-20da0ee43be1(org.inca.core.structure)" />
</imports>
<registry>
<language id="e6d2ffd5-9c56-41f8-99ac-9d1ceb13daa2" name="org.inca.data">
......
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