X-Git-Url: http://git.megacz.com/?p=org.ibex.xt.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fxt%2FPrevalence.java;h=b237619514ba0fd9bed80f8d50e3e618faf16575;hp=ef871474e9cc694058d1623e62a257eeb4ffb387;hb=ceef03aad63c852ca44925dad0d417db07fd166e;hpb=5365f47787b1b4eeca31ad5da2373237371e264e

diff --git a/src/org/ibex/xt/Prevalence.java b/src/org/ibex/xt/Prevalence.java
index ef87147..b237619 100644
--- a/src/org/ibex/xt/Prevalence.java
+++ b/src/org/ibex/xt/Prevalence.java
@@ -56,6 +56,7 @@ public class Prevalence {
                         };
                     System.err.println("configuring with " + manager);
                     pf.configureSnapshotManager(manager);
+                    //pf.configureSnapshotManager(new SnapshotManager(new JS(), base));
                     //pf.configureClassLoader(JSTransaction.class.getClassLoader());
                     prevayler = pf.create();
                     prevaylers.put(cx, prevayler);
@@ -68,10 +69,27 @@ public class Prevalence {
     public static class JSTransaction implements Transaction {
         public static final long serialVersionUid = 0xfb2aa281;
         private JS js;
-        public JSTransaction(JS js) { this.js = js; }
+        JSScope newscope;
+        Vec v;
+        public JSTransaction(JS js) throws JSExn {
+            newscope = new JSScope(null);
+            this.js = JS.cloneWithNewParentScope(js, newscope);
+            v = JS.getFormalArgs(this.js);
+            for(int i=0; i<v.size(); i++) {
+                if ("prevalent".equals(v.elementAt(i))) continue;
+                newscope.put(v.elementAt(i), JS.getParentScope(js).get(v.elementAt(i)));
+            }
+        }
         public void executeOn(Object o, Date now) {
             try {
-                js.call(o, new JSDate(now.getTime()), null, null, 2);
+                newscope.put("prevalent", o);
+                newscope.put("now", new JSDate(now.getTime()));
+                Object a = v.size() <= 0 ? null : newscope.get(v.elementAt(0));
+                Object b = v.size() <= 1 ? null : newscope.get(v.elementAt(1));
+                Object c = v.size() <= 2 ? null : newscope.get(v.elementAt(2));
+                Object[] rest = v.size() <= 3 ? null : new Object[v.size() - 3];
+                for(int i=3; i<v.size(); i++) rest[i-3] = v.elementAt(i);
+                js.call(a, b, c, rest, v.size());
             } catch (Exception e) { throw new RuntimeException(e); }
         }
     }
@@ -79,10 +97,11 @@ public class Prevalence {
     public static class JSQuery implements Query {
         public static final long serialVersionUid = 0xfb2aa282;
         private JS js;
-        public JSQuery(JS js) { this.js = js; }
+        private Object a;
+        public JSQuery(JS js, Object a) { this.js = JS.cloneWithNewParentScope(js, null); this.a = a; }
         public Object query(Object o, Date now) {
             try {
-                return js.call(o, new JSDate(now.getTime()), null, null, 2);
+                return js.call(o, a, new JSDate(now.getTime()), null, 3);
             } catch (Exception e) { throw new RuntimeException(e); }
         }
     }