From c22d98a57173959209b8b29f214c849b7b870747 Mon Sep 17 00:00:00 2001 From: Tamas Szabo Date: Thu, 28 Jan 2016 14:31:27 +0100 Subject: [PATCH] early exit SCC lookup and enhanced cycle detection --- .../languageModels/behavior.mps | 80 +- .../languageModels/typesystem.mps | 9 +- .../languageModels/behavior.mps | 24 +- .../languageModels/typesystem.mps | 94 -- .../test.ts.core/models/tests1@tests.mps | 29 +- .../com/mbeddr/mpsutil/common/graph.mps | 1412 ++++++++++------- 6 files changed, 945 insertions(+), 703 deletions(-) diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps index 6036d493bfd..989e3b4a4a8 100755 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps @@ -16937,6 +16937,20 @@ + + + + + + + + + + + + + + @@ -17212,56 +17226,20 @@ - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -17270,7 +17248,7 @@ - + @@ -17279,7 +17257,7 @@ - + @@ -17289,7 +17267,7 @@ - + @@ -17314,7 +17292,7 @@ - + @@ -17344,7 +17322,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps index 1574508d4de..b72ac5ec514 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps @@ -2163,8 +2163,13 @@ - - + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps index 3a15b3398ff..c8ff4f9d275 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps @@ -4124,8 +4124,13 @@ - - + + + + + + + @@ -4174,6 +4179,21 @@ + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps index d6b0b0e5208..d5719f96ae2 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps @@ -316,7 +316,6 @@ - @@ -2324,99 +2323,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps index 81e5e374581..21c81408ce7 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps @@ -3099,11 +3099,7 @@ - - - - - + @@ -3119,13 +3115,6 @@ - - - - - - - @@ -3138,12 +3127,8 @@ - - - - - - + + @@ -3159,12 +3144,8 @@ - - - - - - + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps index e82a165e3c4..e436be15ef2 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps @@ -24,6 +24,7 @@ + @@ -143,6 +144,9 @@ + + + @@ -179,12 +183,33 @@ + + + + + + + + + + + + + + - + + + + + + + + @@ -202,6 +227,9 @@ + + + @@ -219,6 +247,7 @@ + @@ -236,7 +265,11 @@ + + + + @@ -247,7 +280,9 @@ + + @@ -1517,570 +1552,823 @@ + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - + + + + - - - - - + + + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - - - - + + + + + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - - - + + + + - - - + + + - - + + - - + + - - + + - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + - + - + - - - + + + - - + + - - - - + + + + - - - - - - - + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - + + - + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - + + - + - - - - + + + + - - - - + + + + - - + + - + - - - - - - + + + + + + - - - + + + - - + + - - - - - - - - + + + + + + + + - - - + + + - + - - + + - - - + + + - - + + - - - - - + + + + + - + - - + + - - + + - - - - + + + + - - + + - + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - + - - + + - - - + + + - - - - - + + + + + - - + + - - - - - - - - + + + + + + + + - + - - + - - - + + + + - + - - - - + + + + - - + + - + @@ -2088,64 +2376,64 @@ - - - - + + + + - - + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - + - + - - - + + + - + - - - - + + + + - - + + - + @@ -2158,113 +2446,113 @@ - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - + + + + - - + + - - - - + + + + - - + + - + - - + + - - + + - - - - - - - + + + + + + + - - + + - - - + + + - - - - + + + + - - - + + + - - + + - - - - + + + + - - + + - + @@ -2274,195 +2562,249 @@ - - - - - + + + + + - - + + - - - - - - + + + + + + - + - - - + + + - - + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - + + - - + + - + - - - - - - - - + + + + + + + + - + - - + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - + - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - + + + - + - - - - + + + + - - + + - - - - - + + + - + - - + + - - - - + + + + - - + + - + @@ -2470,36 +2812,46 @@ - - - - + + + + + + + + + - - - - - + + + + + - + - + + + + + + + - + - - + + -