src/ikj/main/com/google/common/base/FinalizablePhantomReference.java src/ikj/main/com/google/common/base/FinalizableReference.java src/ikj/main/com/google/common/base/FinalizableReferenceQueue.java src/ikj/main/com/google/common/base/FinalizableSoftReference.java src/ikj/main/com/google/common/base/FinalizableWeakReference.java src/ikj/main/com/google/common/base/Function.java src/ikj/main/com/google/common/base/Functions.java src/ikj/main/com/google/common/base/Joiner.java src/ikj/main/com/google/common/base/Objects.java src/ikj/main/com/google/common/base/Platform.java src/ikj/main/com/google/common/base/Preconditions.java src/ikj/main/com/google/common/base/Predicate.java src/ikj/main/com/google/common/base/Predicates.java src/ikj/main/com/google/common/base/internal/Finalizer.java src/ikj/main/com/google/common/collect/AbstractMapEntry.java src/ikj/main/com/google/common/collect/AsynchronousComputationException.java src/ikj/main/com/google/common/collect/ComputationException.java src/ikj/main/com/google/common/collect/CustomConcurrentHashMap.java src/ikj/main/com/google/common/collect/ExpirationTimer.java src/ikj/main/com/google/common/collect/MapMaker.java src/ikj/main/com/google/common/collect/NullOutputException.java @@ -4,6 +4,7 @@ ikj: The package ioke.lang is covered by the file LICENSE. The package gnu.math is covered by the file LICENSE.kawa. The package org.jregex and subpackages contains their own licensing information in the source files. +The package com.google.common and subpackages contain their own licensing information. ikc: The namepsace Ioke.Lang is covered by the file LICENSE. COPYING @@ -13,7 +13,7 @@ iterativeFib = method(n, curr = succ succ += old ) - return curr + curr ) generativeFib = method( examples/misc/fibonacci.ik @@ -8,7 +8,8 @@ import java.util.Map; import java.util.IdentityHashMap; import ioke.lang.exceptions.ControlFlow; -import ioke.lang.util.ObjectProxyCache; + +import com.google.common.collect.MapMaker; /** * @@ -20,29 +21,14 @@ public class IokeRegistry { } public Runtime runtime; - private Creator regularCreator; - private Creator integratedCreator; - - private final ObjectProxyCache<IokeObject, Creator> wrappedObjects = - new ObjectProxyCache<IokeObject, Creator>(ObjectProxyCache.ReferenceType.WEAK) { - public IokeObject allocateProxy(Object javaObject, Creator creator) { - return creator.create(javaObject); - } - }; + private final Map<Object, IokeObject> wrappedObjects = new MapMaker() + .weakKeys() + .weakValues() + .makeMap(); public IokeRegistry(final Runtime runtime) { this.runtime = runtime; - this.regularCreator = new Creator() { - public IokeObject create(Object javaObject) { - return runtime.createJavaWrapper(javaObject); - } - }; - this.integratedCreator = new Creator() { - public IokeObject create(Object javaObject) { - return runtime.createIntegratedJavaWrapper((Class)javaObject); - } - }; } public static void makeWrapped(Object on, IokeObject wrapped, IokeObject context) { @@ -61,8 +47,14 @@ public class IokeRegistry { } else if(on instanceof Boolean) { return ((Boolean)on).booleanValue() ? runtime._true : runtime._false; } - - return wrappedObjects.getOrCreate(on, regularCreator); + + if(!wrappedObjects.containsKey(on)) { + IokeObject val = runtime.createJavaWrapper(on); + wrappedObjects.put(on, val); + return val; + } + + return wrappedObjects.get(on); } public IokeObject integratedWrap(Class on) { @@ -70,11 +62,17 @@ public class IokeRegistry { return runtime.nil; } - return wrappedObjects.getOrCreate(on, integratedCreator); + if(!wrappedObjects.containsKey(on)) { + IokeObject val = runtime.createIntegratedJavaWrapper(on); + wrappedObjects.put(on, val); + return val; + } + + return wrappedObjects.get(on); } public boolean isWrapped(Object on) { - return wrappedObjects.get(on) != null; + return wrappedObjects.containsKey(on); } public static boolean isWrapped(Object on, IokeObject context) { src/ikj/main/ioke/lang/IokeRegistry.java @@ -1,14 +1,22 @@ use("ispec") -describe(Message, - describe("rewrite!", - it("should rewrite a very simple message chain") +; describe(Message, +; describe("rewrite!", +; it("should rewrite a very simple message chain", ; msg = 'foo ; msg rewrite!( ; '(:x) => '(something(:x)) ; ) -; msg should == 'blah(foo) +; msg should == 'something(foo) ; ) - ) -) + +; it("should rewrite a next into an argument", +; msg = '(foo bar) +; msg rewrite!( +; '(:x :y) => '(:x(:y)) +; ) +; msg should == 'foo(bar) +; ) +; ) +; ) test/rewrite_spec.ik src/ikj/main/ioke/lang/util/ObjectProxyCache.java 87e67975b9bb30a00dbef97b72088e7e4fb9f12a Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/656e33a040753de2f7a1fbf2a9de8a4c1800a451 656e33a040753de2f7a1fbf2a9de8a4c1800a451 2009-06-03T18:22:45-07:00 2009-06-03T18:22:45-07:00 Add Google MapMaker to handle references to Java objects correctly 4d4dbf1e39dab3059d8a1bca5edce9c08bf9b053 Ola Bini ola.bini@gmail.com