Cache relevant properties

ooc-lang · Feb 20, 2013 · bfb9ea1 · bfb9ea1
1 parent 7c06871
commit bfb9ea1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/source/rock/backend/cnaughty/ModuleWriter.ooc b/source/rock/backend/cnaughty/ModuleWriter.ooc
@@ -29,8 +29,6 @@ ModuleWriter: abstract class extends Skeleton {
         if(!module includes empty?()) current nl()
 
         for(uze in module uses) {
-            "Writing includes" println()
-
             // FIXME: have ifdef barriers instead
             props := uze useDef getRelevantProperties(module params)
             for(ynclude in props includes) {

diff --git a/source/rock/middle/UseDef.ooc b/source/rock/middle/UseDef.ooc
@@ -77,6 +77,9 @@ UseDef: class {
     properties := ArrayList<UseProperties> new()
     versionStack := Stack<UseProperties> new()
 
+    // cache relevant properties
+    _relevantProperties: UseProperties
+
     init: func (=identifier) {
         requirements        = ArrayList<Requirement> new()
         pkgs                = ArrayList<String> new()
@@ -418,13 +421,16 @@ UseDef: class {
     }
 
     getRelevantProperties: func (params: BuildParams) -> UseProperties {
-        result := UseProperties new(this, UseVersion new(this))
+        if (!_relevantProperties) {
+            _relevantProperties = UseProperties new(this, UseVersion new(this))
 
-        properties filter(|p| p useVersion satisfied?(params)) each(|p|
-            "%s is satisfied" printfln(p useVersion toString())
-            result merge!(p)
-        )
-        result
+            properties filter(|p| p useVersion satisfied?(params)) each(|p|
+                "%s is satisfied" printfln(p useVersion toString())
+                _relevantProperties merge!(p)
+            )
+        }
+
+        _relevantProperties
     }
 }