From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Thu, 18 Aug 2016 16:21:08 +0000 (+0300)
Subject: Removed equations context from org.simantics.scl.runtime
X-Git-Tag: v1.25.0~159
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F38%2F2;p=simantics%2Fplatform.git

Removed equations context from org.simantics.scl.runtime

Change-Id: I0c7c3a6d1abd4f9c7c4039e3e666d591b83c6f0c
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
index f0c9dbddf..5e332742a 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/types/Types.java
@@ -86,6 +86,8 @@ public class Types {
     public static final TCon VEC_COMP = con(BUILTIN, "VecComp");
     public static final TCon BINDING = con(BUILTIN, "Binding");
 
+    public static final TCon TYPE = con(BUILTIN, "Type");
+    
     public static final TCon DYNAMIC = con("Prelude", "Dynamic");
     public static final TCon VARIANT = con(BUILTIN, "Variant");
     
diff --git a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF
index d88e4403a..64d5ac63d 100755
--- a/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.runtime/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 0.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.simantics.scl.runtime,
  org.simantics.scl.runtime.collection,
- org.simantics.scl.runtime.equations,
  org.simantics.scl.runtime.exceptions,
  org.simantics.scl.runtime.function,
  org.simantics.scl.runtime.io,
diff --git a/bundles/org.simantics.scl.runtime/scl/Expressions/Equations.scl b/bundles/org.simantics.scl.runtime/scl/Expressions/Equations.scl
deleted file mode 100644
index e695a0089..000000000
--- a/bundles/org.simantics.scl.runtime/scl/Expressions/Equations.scl
+++ /dev/null
@@ -1,13 +0,0 @@
-effect Equation
-    "equation"
-    "org.simantics.scl.runtime.equations.EquationContext"
-
-importJava "org.simantics.scl.runtime.equations.EquationContext" where
-    data EquationContext
-
-    listenEquationVariable :: String -> (a -> <Equation,Proc> ()) -> <Equation,Proc> ()
-    setEquationVariable :: String -> a -> <Equation> ()
-    applyEquationContext :: (<Equation,Proc> a) -> EquationContext -> <Proc> a 
-    
-importJava "org.simantics.scl.runtime.equations.TestEquationContext" where
-    solveEquations :: (<Equation,e> a) -> <e> [(String,String)]
\ No newline at end of file
diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/EquationContext.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/EquationContext.java
deleted file mode 100644
index f20dd6fb3..000000000
--- a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/EquationContext.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.simantics.scl.runtime.equations;
-
-import org.simantics.scl.runtime.SCLContext;
-import org.simantics.scl.runtime.function.Function;
-import org.simantics.scl.runtime.tuple.Tuple0;
-
-public interface EquationContext {
-    void listenEquationVariable(String variableName, Function callback);
-    void setEquationVariable(String variableName, Object value);
-    
-    public static Object applyEquationContext(Function f, EquationContext equationContext) {
-        SCLContext context = SCLContext.getCurrent();
-        Object oldEquationContext = context.put("equation", equationContext);
-        try {
-            return f.apply(Tuple0.INSTANCE);
-        } finally {
-            context.put("equation", oldEquationContext);
-        }
-    }
-}
diff --git a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/TestEquationContext.java b/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/TestEquationContext.java
deleted file mode 100644
index 856ef2870..000000000
--- a/bundles/org.simantics.scl.runtime/src/org/simantics/scl/runtime/equations/TestEquationContext.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.simantics.scl.runtime.equations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.simantics.scl.runtime.SCLContext;
-import org.simantics.scl.runtime.function.Function;
-import org.simantics.scl.runtime.tuple.Tuple0;
-import org.simantics.scl.runtime.tuple.Tuple2;
-
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.procedure.TObjectObjectProcedure;
-
-public class TestEquationContext implements EquationContext {
-
-    public static final boolean TRACE = true;
-    
-    THashMap<String, Object> values = new THashMap<String, Object>(); 
-    THashMap<String, ArrayList<Function>> listenerMap = new THashMap<String, ArrayList<Function>>(); 
-
-    @Override
-    public void listenEquationVariable(String variableName, Function listener) {
-        if(TRACE)
-            System.out.println("listenEquationVariable(" + variableName + ", " + listener + ")");
-        if(values.containsKey(variableName)) {
-            Object value = values.get(variableName);
-            if(TRACE)
-                System.out.println("    apply " + value);
-            listener.apply(value);
-        }
-        else {
-            if(TRACE)
-                System.out.println("    add listener");
-            ArrayList<Function> listeners = listenerMap.get(variableName);
-            if(listeners == null) {
-                listeners = new ArrayList<Function>();
-                listenerMap.put(variableName, listeners);
-            }
-            listeners.add(listener);
-        }
-    }
-
-    @Override
-    public void setEquationVariable(String variableName, Object value) {
-        if(TRACE)
-            System.out.println("setEquationVariable(" + variableName + ", " + value + ")");
-        if(values.containsKey(variableName))
-            throw new IllegalStateException("Value for " + variableName + " already defined (oldValue=" + values.get(variableName) + 
-                    ", newValue=" + value + ").");
-        values.put(variableName, value);
-        ArrayList<Function> listeners = listenerMap.remove(variableName);
-        SCLContext context = SCLContext.getCurrent();
-        if(listeners != null) {
-            Object oldEquationContex = context.put("equation", this);
-            try {
-                for(Function listener : listeners) {
-                    if(TRACE)
-                        System.out.println("    apply " + listener + " " + value);
-                    listener.apply(value);
-                }
-            } finally {
-                context.put("equation", oldEquationContex);
-            }
-        }
-    }
-    
-    public static List<Tuple2> solveEquations(Function f) {
-        TestEquationContext equationContext = new TestEquationContext();
-        SCLContext context = SCLContext.getCurrent();
-        Object oldEquationContext = context.put("equation", equationContext);
-        try {
-            f.apply(Tuple0.INSTANCE);
-        } finally {
-            context.put("equation", oldEquationContext);
-        }
-        ArrayList<Tuple2> result = new ArrayList<Tuple2>(equationContext.values.size());
-        equationContext.values.forEachEntry(new TObjectObjectProcedure<String, Object>() {
-            @Override
-            public boolean execute(String a, Object b) {
-                result.add(new Tuple2(a, String.valueOf(b)));
-                return true;
-            }
-        });
-        Collections.sort(result, (t1, t2) -> {
-            return ((String)t1.c0).compareTo((String)t2.c0);
-        });
-        return result;
-    }
-    
-    public THashMap<String, Object> getValues() {
-        return values;
-    }
-
-}