Merge "(refs #7316) Improved error locations for invalid field access"

[simantics/platform.git] / bundles / org.simantics.modeling.ontology / graph / ModelingViewpoint.pgraph

diff --git a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
index 7e572df9f69e3aeb385fe98b5f4034bfaa0bd08d..0255339ac7bda279053ca6e30b98d744f2362ac2 100644 (file)
--- a/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
+++ b/bundles/org.simantics.modeling.ontology/graph/ModelingViewpoint.pgraph
@@ -20,7 +20,7 @@ MOD.Contributions : L0.Library
 MOD.SCLChildRule <T VP.ChildRule
   >-- MOD.SCLChildRule.getChildren ==> "Resource -> <ReadGraph> [Resource]" <R L0.HasProperty : L0.FunctionalRelation
 
-MOD.SCLLabelRule <T VP.ChildRule
+MOD.SCLLabelRule <T VP.VisualsRule
   >-- MOD.SCLLabelRule.getLabels ==> "Resource -> <ReadGraph> [String]" <R L0.HasProperty : L0.FunctionalRelation
 
 MOD.SCLAction <T ACT.Action
@@ -29,7 +29,7 @@ MOD.SCLAction <T ACT.Action
 MOD.SCLDropAction <T ACT.Action
   --> MOD.SCLDropAction.action ==> "Resource -> Dynamic -> Integer -> <Proc> ()" <R L0.HasProperty : L0.FunctionalRelation 
 
-MOD.SCLTest <T ACT.Action
+MOD.SCLTest <T VP.Test
   --> MOD.SCLTest.test ==> "Resource -> <ReadGraph> Boolean" <R L0.HasProperty : L0.FunctionalRelation 
 
 // Legacy ModelingBrowseContext
@@ -365,6 +365,20 @@ IMAGES.ComponentLock : IMAGE.PngImage
 MBC
     @VP.dropActionContribution MOD.Subscription MAC.Actions.SubscriptionDropAction 1.0
 
+MOD.sclChildRule : L0.Template
+    @template %action %expression
+        %action : MOD.SCLChildRule
+          MOD.SCLChildRule.getChildren _ : MOD.SCLValue
+            L0.SCLValue.expression %expression
+            L0.HasValueType "Resource -> <ReadGraph> [Resource]"
+
+MOD.sclLabelRule : L0.Template
+    @template %action %expression
+        %action : MOD.SCLLabelRule
+          MOD.SCLLabelRule.getLabels _ : MOD.SCLValue
+            L0.SCLValue.expression %expression
+            L0.HasValueType "Resource -> <ReadGraph> [String]"
+
 MOD.sclAction : L0.Template
     @template %action %expression
         %action : MOD.SCLAction
@@ -659,6 +673,15 @@ MOD.InstantiateUnder <T MOD.SCLAction
 ACTIONS.InstantiateUnder
   @MOD.sclAction "instantiateUnderAction self"
 
+MOD.InstanceOfTest <T MOD.SCLTest
+  >-- MOD.InstanceOfTest.HasType --> L0.Type <R L0.IsRelatedTo : L0.TotalFunction
+  @MOD.sclAssertion MOD.SCLTest.test "instanceOfTest self" "Resource -> <Proc> Boolean"
+
+MOD.instanceOfTest : L0.Template
+    @template %test %type
+        %test : MOD.InstanceOfTest
+          MOD.InstanceOfTest.HasType %type
+
 TESTS = MAC.Tests : L0.Library
 TESTS.IsNotPublished
   @MOD.sclTest "isNotPublished"