X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.layer0%2Fgraph%2FLayer0Values.pgraph;h=9ccac10511ef9cdef5107cfd7bb5f3535bef65ac;hb=refs%2Fchanges%2F80%2F3880%2F1;hp=c36cf60e56cffc6faf7d53cc1e7c10d2d0a3bd40;hpb=84d7675119770bf431ff77a5628ca78515fba807;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.layer0/graph/Layer0Values.pgraph b/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
index c36cf60e5..9ccac1051 100644
--- a/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
+++ b/bundles/org.simantics.layer0/graph/Layer0Values.pgraph
@@ -1,6 +1,8 @@
 L0 = <http://www.simantics.org/Layer0-1.1>
 
-L0.Value <T L0.Entity
+L0.Value <T L0.Entity : L0.ValueType
+
+L0.ValueType <T L0.Type
     
 L0.ExternalValue <T L0.Value
 
@@ -28,9 +30,9 @@ 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.computeExpression
+    @L0.assert L0.ConvertsToValueWith L0.Functions.sclValue
 
-L0.SCLValueType <T L0.Entity
+L0.SCLValueType <T L0.ValueType
     >-- L0.SCLValueType.validator ==> "Variable -> <ReadGraph> String" <R L0.HasProperty
 
 L0.scl : L0.Template
@@ -40,6 +42,21 @@ L0.scl : L0.Template
               L0.SCLValue.expression %expression
               L0.HasValueType %valueType
 
+L0.sclValue : L0.Template
+    @template %subject %expression %valueType
+        %subject : 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