From eeec9d7f71570de81c23b7230b540e06fe2dc18f Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 14 Jul 2014 15:50:37 +0200 Subject: [PATCH] Language for defining snode-isomorphic structures with variables, testing unification --- .../generator/template/main@generator.mps | 538 +++++++++++++ .../jetbrains.mps.logic.mpl | 13 +- .../languageModels/editor.mps | 733 ++++++++++++++++++ .../languageModels/structure.mps | 116 +++ .../languageModels/typesystem.mps | 31 + .../models/jetbrains/mps/logic/sandbox.mps | 266 +++++++ .../models/jetbrains/mps/unification/ast.mps | 74 +- 7 files changed, 1763 insertions(+), 8 deletions(-) diff --git a/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/languages/jetbrains.mps.logic/generator/template/main@generator.mps index bb6c6465..ac86e9b6 100644 --- a/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -6,10 +6,548 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl index a307546b..dd35d1a9 100644 --- a/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl +++ b/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl @@ -14,6 +14,9 @@ + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator) d7706f63-9be2-479c-a3da-ae92af1e64d5(jetbrains.mps.lang.generator.generationContext) @@ -26,12 +29,20 @@ + + 7526e0cf-1ce7-46f8-a555-9eca1e06c23b(jetbrains.mps.unification) + + + aee9cad2-acd4-4608-aef2-0004f6a1cdbd(jetbrains.mps.lang.actions) + 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime) - + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + diff --git a/languages/jetbrains.mps.logic/languageModels/editor.mps b/languages/jetbrains.mps.logic/languageModels/editor.mps index 29eebd57..410269d3 100644 --- a/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -2,6 +2,739 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.logic/languageModels/structure.mps b/languages/jetbrains.mps.logic/languageModels/structure.mps index f5ccc731..1b9e218d 100644 --- a/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -3,5 +3,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/languages/jetbrains.mps.logic/languageModels/typesystem.mps index bb71374e..fa7aa73b 100644 --- a/languages/jetbrains.mps.logic/languageModels/typesystem.mps +++ b/languages/jetbrains.mps.logic/languageModels/typesystem.mps @@ -3,5 +3,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps index 4664f22e..e47eeebe 100644 --- a/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps +++ b/languages/jetbrains.mps.logic/sandbox/models/jetbrains/mps/logic/sandbox.mps @@ -12,6 +12,7 @@ + @@ -923,5 +924,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps b/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps index 008bb894..af1bca81 100644 --- a/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps +++ b/solutions/jetbrains.mps.unification/models/jetbrains/mps/unification/ast.mps @@ -503,6 +503,22 @@ + + + + + + + + + + + + + + + + @@ -515,13 +531,8 @@ - - - - - - - + + @@ -551,6 +562,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +