X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.layer0%2Fgraph%2FLayer0Values.pgraph;h=14aa774e8e6111642b569c2dd261121a7b686d8b;hp=7bb446c7f8272205041854a3df08e2ff491bc39e;hb=4d223932100ff887612995124a49bd4b181dcba9;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.layer0/graph/Layer0Values.pgraph b/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
index 7bb446c7f..14aa774e8 100644
--- a/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
+++ b/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
@@ -1,51 +1,63 @@
-L0 = <http://www.simantics.org/Layer0-1.1>
-
-L0.Value <T L0.Entity
-    
-L0.ExternalValue <T L0.Value
-
-L0.ConvertsToValueWith <R L0.HasProperty : L0.FunctionalRelation
-    <-- L0.Value
-    --> L0.Entity    
-
-L0.HasValueType <R L0.HasProperty : L0.FunctionalRelation
-    <-- L0.Value
-    --> L0.String
-    
-L0.RequiresValueType <R L0.HasProperty : L0.FunctionalRelation
-    <-- L0.Relation
-    --> L0.String
-
-L0.HasDefaultLiteralType <R L0.DependsOn : L0.FunctionalRelation    
-    <-- L0.Relation
-    --> L0.Type
-    
-L0.HasSubliteralPredicate <R L0.DependsOn
-
-L0.RVIContext <T L0.Entity
-
-L0.SCLValue <T L0.Value
-    @L0.tag L0.Abstract
-    >-- L0.SCLValue.expression --> L0.String <R L0.HasProperty : L0.TotalFunction
-    >-- L0.SCLValue.environment --> L0.SCLValue.Environment <R L0.IsRelatedTo : L0.TotalFunction
-    @L0.assert L0.ConvertsToValueWith L0.Functions.computeExpression
-
-L0.scl : L0.Template
-    @template %subject %property %expression %valueType
-        %subject
-            %property _ : L0.SCLValue
-              L0.SCLValue.expression %expression
-              L0.HasValueType %valueType
-
-L0.SCLValue.Environment <T L0.Entity
-    >-- L0.SCLValue.Environment.moduleName --> L0.String <R L0.HasProperty : L0.TotalFunction
-    >-- L0.SCLValue.Environment.namespace --> L0.String <R L0.HasProperty : L0.TotalFunction
-    >-- L0.SCLValue.Environment.uses --> L0.SCLValue.Environment <R L0.IsRelatedTo
-    @L0.assert L0.SCLValue.Environment.namespace ""
-    
-L0.Property <T L0.Value
-    @L0.tag L0.Abstract
-    @L0.tag L0.Deprecated
-    @L0.assert L0.ConvertsToValueWith L0.Functions.composedPropertyValue
-    
-    
\ No newline at end of file
+L0 = <http://www.simantics.org/Layer0-1.1>
+
+L0.Value <T L0.Entity : L0.ValueType
+
+L0.ValueType <T L0.Type
+    
+L0.ExternalValue <T L0.Value
+
+L0.ConvertsToValueWith <R L0.HasProperty : L0.FunctionalRelation
+    <-- L0.Value
+    --> L0.Entity    
+
+L0.HasValueType <R L0.HasProperty : L0.FunctionalRelation
+    <-- L0.Value
+    --> L0.String
+    
+L0.RequiresValueType <R L0.HasProperty : L0.FunctionalRelation
+    <-- L0.Relation
+    --> L0.String
+
+L0.HasDefaultLiteralType <R L0.DependsOn : L0.FunctionalRelation
+    <-- L0.Relation
+    --> L0.Type
+    
+L0.HasSubliteralPredicate <R L0.DependsOn
+
+L0.RVIContext <T L0.Entity
+
+L0.SCLValue <T L0.Value : L0.SCLValueType
+    @L0.tag L0.Abstract
+    >-- L0.SCLValue.expression --> L0.String <R L0.HasProperty : L0.TotalFunction
+    >-- L0.SCLValue.environment --> L0.SCLValue.Environment <R L0.IsRelatedTo : L0.TotalFunction
+    @L0.assert L0.ConvertsToValueWith L0.Functions.sclValue
+
+L0.SCLValueType <T L0.ValueType
+    >-- L0.SCLValueType.validator ==> "Variable -> <ReadGraph> String" <R L0.HasProperty
+
+L0.scl : L0.Template
+    @template %subject %property %expression %valueType
+        %subject
+            %property _ : L0.SCLValue
+              L0.SCLValue.expression %expression
+              L0.HasValueType %valueType
+
+L0.sclAssertion : L0.Template
+    @template %type %property %expression %valueType
+        %type
+            L0.Asserts _ : L0.Assertion
+              L0.HasPredicate %property
+              L0.HasObject _ : L0.SCLValue
+                L0.SCLValue.expression %expression
+                L0.HasValueType %valueType
+
+L0.SCLValue.Environment <T L0.Entity
+    >-- L0.SCLValue.Environment.moduleName --> L0.String <R L0.HasProperty : L0.TotalFunction
+    >-- L0.SCLValue.Environment.namespace --> L0.String <R L0.HasProperty : L0.TotalFunction
+    >-- L0.SCLValue.Environment.uses --> L0.SCLValue.Environment <R L0.IsRelatedTo
+    @L0.assert L0.SCLValue.Environment.namespace ""
+    
+L0.Property <T L0.Value
+    @L0.tag L0.Abstract
+    @L0.tag L0.Deprecated
+    @L0.assert L0.ConvertsToValueWith L0.Functions.composedPropertyValue