From 0bbc63f865f4248b314262541581bc400ccd8e41 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 15 Feb 2009 06:01:46 -0600
Subject: [PATCH] ui.images: use MEMO: instead of explicit cache
---
basis/ui/images/images.factor | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index f483367e62..7c69cbe2b3 100644
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -1,28 +1,18 @@
! Copyright (C) 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: namespaces cache images images.loader accessors assocs
-kernel opengl opengl.gl opengl.textures ui.gadgets.worlds ;
+kernel opengl opengl.gl opengl.textures ui.gadgets.worlds
+memoize ;
IN: ui.images
TUPLE: image-name path ;
C: <image-name> image-name
-<PRIVATE
-
-SYMBOL: image-cache
-
-image-cache [ <cache-assoc> ] initialize
-
-PRIVATE>
-
-: cached-image ( image-name -- image )
- path>> image-cache get [ load-image ] cache ;
+MEMO: cached-image ( image-name -- image ) path>> load-image ;
<PRIVATE
-SLOT: images
-
: image-texture-cache ( world -- texture-cache )
[ [ <cache-assoc> ] unless* ] change-images images>> ;