(refs #7250) Merging master, minor CHR bugfixes

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / codegen / chr / ExampleStore.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/chr/ExampleStore.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/chr/ExampleStore.java
index 197fefe2fbc3ee4e54bd0cd2dd804adc374f3987..d4c102204fe95e50f6bfa126c1868301ce5f7065 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/chr/ExampleStore.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/chr/ExampleStore.java
@@ -1,93 +1,80 @@
-package org.simantics.scl.compiler.internal.codegen.chr;\r
-\r
-import org.simantics.scl.runtime.chr.CHRHashIndex;\r
-import org.simantics.scl.runtime.chr.Fact;\r
-import org.simantics.scl.runtime.chr.FactActivationQueue;\r
-\r
-public class ExampleStore {\r
-    /*\r
-     * constraint ExampleFact Integer Integer where\r
-     *     index(bf)\r
-     *     \r
-     * =>\r
-     * \r
-     * data Store       // class Module$123\r
-     * data ExampleFact // class Module$123/ExampleFact\r
-     * \r
-     * add     :: Store -> ExampleFact -> <Proc> ()\r
-     * remove  :: Store -> ExampleFact -> <Proc> ()\r
-     * get_bf  :: Store -> Integer -> <Proc> ExampleFact\r
-     * next_bf :: ExampleFact -> <Proc> Maybe ExampleFact\r
-     * idOf    :: ExampleFact -> <Proc> Integer\r
-     * isAlive :: ExampleFact -> <Proc> Boolean\r
-     */\r
-    \r
-    CHRHashIndex ExampleFact_bfIndex = new CHRHashIndex() {\r
-        @Override\r
-        protected boolean keyEquals(Object a, Object b) {\r
-            return ((ExampleFact)a).c0 == ((ExampleFact)b).c0;\r
-        }\r
-        @Override\r
-        protected int keyHashCode(Object key) {\r
-            return ((ExampleFact)key).c0;\r
-        }\r
-    };\r
-    \r
-    public FactActivationQueue queue = new FactActivationQueue(2);\r
-    \r
-    private ExampleFact ExampleFact_temp = new ExampleFact();\r
-        \r
-    public ExampleFact getExampleFact_bf(int c0) {\r
-        ExampleFact_temp.c0 = c0;\r
-        return (ExampleFact)ExampleFact_bfIndex.getEqual(ExampleFact_temp);\r
-    }\r
-    \r
-    public static class ExampleFact implements Fact {\r
-        public int id;\r
-        public int c0; // key\r
-        public int c1;\r
-        public ExampleFact bfPrev;\r
-        public ExampleFact bfNext;\r
-        \r
-        public ExampleFact() {\r
-        }\r
-        \r
-        public ExampleFact(int c0, int c1) {\r
-            this.c0 = c0;\r
-            this.c1 = c1;\r
-        }\r
-        \r
-        public void add(ExampleStore store) {\r
-            bfNext = (ExampleFact)store.ExampleFact_bfIndex.addFreshAndReturnOld(this);\r
-            if(bfNext != null)\r
-                bfNext.bfPrev = this;\r
-        }\r
-        \r
-        public void remove(ExampleStore store) {\r
-            if(bfPrev == null) {\r
-                if(bfNext == null)\r
-                    store.ExampleFact_bfIndex.removeKnownToExistKey(this);\r
-                else {\r
-                    bfNext.bfPrev = null;\r
-                    store.ExampleFact_bfIndex.replaceKnownToExistKey(this, bfNext);\r
-                }\r
-            }\r
-            else {\r
-                bfPrev.bfNext = bfNext;\r
-                if(bfNext != null)\r
-                    bfNext.bfPrev = bfPrev;\r
-            }\r
-        }\r
-\r
-        @Override\r
-        public int activate(Object context, int priority) {\r
-            return -1;\r
-        }\r
-\r
-        @Override\r
-        public boolean isAlive() {\r
-            return id >= 0;\r
-        }\r
-    }\r
-\r
-}\r
+package org.simantics.scl.compiler.internal.codegen.chr;
+
+import org.simantics.scl.runtime.chr.CHRFact;
+import org.simantics.scl.runtime.chr.CHRHashIndex;
+import org.simantics.scl.runtime.chr.CHRRuntimeRuleset;
+
+public class ExampleStore extends CHRRuntimeRuleset {
+    /*
+     * constraint ExampleFact Integer Integer where
+     *     index(bf)
+     *     
+     * =>
+     * 
+     * data Store       // class Module$123
+     * data ExampleFact // class Module$123/ExampleFact
+     * 
+     * add     :: Store -> ExampleFact -> <Proc> ()
+     * remove  :: Store -> ExampleFact -> <Proc> ()
+     * get_bf  :: Store -> Integer -> <Proc> ExampleFact
+     * next_bf :: ExampleFact -> <Proc> Maybe ExampleFact
+     * idOf    :: ExampleFact -> <Proc> Integer
+     * isAlive :: ExampleFact -> <Proc> Boolean
+     */
+    
+    CHRHashIndex ExampleFact_bfIndex = new CHRHashIndex() {
+        @Override
+        protected boolean keyEquals(Object a, Object b) {
+            return ((ExampleFact)a).c0 == ((ExampleFact)b).c0;
+        }
+        @Override
+        protected int keyHashCode(Object key) {
+            return ((ExampleFact)key).c0;
+        }
+    };
+    
+    private ExampleFact ExampleFact_temp = new ExampleFact();
+        
+    public ExampleFact getExampleFact_bf(int c0) {
+        ExampleFact_temp.c0 = c0;
+        return (ExampleFact)ExampleFact_bfIndex.getEqual(ExampleFact_temp);
+    }
+    
+    public static class ExampleFact extends CHRFact {
+        public int c0; // key
+        public int c1;
+        public ExampleFact bfPrev;
+        public ExampleFact bfNext;
+        
+        public ExampleFact() {
+        }
+        
+        public ExampleFact(int c0, int c1) {
+            this.c0 = c0;
+            this.c1 = c1;
+        }
+        
+        public void add(ExampleStore store) {
+            bfNext = (ExampleFact)store.ExampleFact_bfIndex.addFreshAndReturnOld(this);
+            if(bfNext != null)
+                bfNext.bfPrev = this;
+        }
+        
+        public void remove(ExampleStore store) {
+            if(bfPrev == null) {
+                if(bfNext == null)
+                    store.ExampleFact_bfIndex.removeKnownToExistKey(this);
+                else {
+                    bfNext.bfPrev = null;
+                    store.ExampleFact_bfIndex.replaceKnownToExistKey(this, bfNext);
+                }
+            }
+            else {
+                bfPrev.bfNext = bfNext;
+                if(bfNext != null)
+                    bfNext.bfPrev = bfPrev;
+            }
+        }
+    }
+
+}