[valadoc] driver/*, libvaladoc: Move ChildSymbolRegistrar to libvaladoc



commit 9822d0d87e828fab55ed67fbdac20af00ca1b423
Author: Florian Brosch <flo brosch gmail com>
Date:   Fri Aug 12 22:29:46 2011 +0200

    driver/*, libvaladoc: Move ChildSymbolRegistrar to libvaladoc

 src/driver/0.10.x/Makefile.am                      |    1 -
 src/driver/0.10.x/driver.vala                      |    3 -
 src/driver/0.11.0/Makefile.am                      |    1 -
 src/driver/0.11.0/childsymbolregistrar.vala        |   95 --------------------
 src/driver/0.11.0/driver.vala                      |    3 -
 src/driver/0.11.x/Makefile.am                      |    1 -
 src/driver/0.11.x/childsymbolregistrar.vala        |   95 --------------------
 src/driver/0.11.x/driver.vala                      |    3 -
 src/driver/0.12.x/Makefile.am                      |    1 -
 src/driver/0.12.x/childsymbolregistrar.vala        |   95 --------------------
 src/driver/0.12.x/driver.vala                      |    3 -
 src/driver/0.13.x/Makefile.am                      |    1 -
 src/driver/0.13.x/childsymbolregistrar.vala        |   95 --------------------
 src/driver/0.13.x/driver.vala                      |    3 -
 src/libvaladoc/Makefile.am                         |    1 +
 .../api}/childsymbolregistrar.vala                 |   16 ++--
 src/valadoc/valadoc.vala                           |    3 +
 17 files changed, 12 insertions(+), 408 deletions(-)
---
diff --git a/src/driver/0.10.x/Makefile.am b/src/driver/0.10.x/Makefile.am
index 9c57051..9c285fd 100755
--- a/src/driver/0.10.x/Makefile.am
+++ b/src/driver/0.10.x/Makefile.am
@@ -30,7 +30,6 @@ driver_LTLIBRARIES =  \
 
 libdriver_la_VALASOURCES = \
 	initializerbuilder.vala \
-	childsymbolregistrar.vala \
 	symbolresolver.vala \
 	treebuilder.vala \
 	driver.vala \
diff --git a/src/driver/0.10.x/driver.vala b/src/driver/0.10.x/driver.vala
index 75d4c6b..6fc87d9 100755
--- a/src/driver/0.10.x/driver.vala
+++ b/src/driver/0.10.x/driver.vala
@@ -40,9 +40,6 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 		SymbolResolver resolver = new SymbolResolver (builder);
 		tree.accept (resolver);
 
-		ChildSymbolRegistrar registrar = new ChildSymbolRegistrar ();
-		tree.accept (registrar);
-
 		return tree;
 	}
 }
diff --git a/src/driver/0.11.0/Makefile.am b/src/driver/0.11.0/Makefile.am
index f577cb4..4ceef45 100755
--- a/src/driver/0.11.0/Makefile.am
+++ b/src/driver/0.11.0/Makefile.am
@@ -30,7 +30,6 @@ driver_LTLIBRARIES =  \
 
 libdriver_la_VALASOURCES = \
 	initializerbuilder.vala \
-	childsymbolregistrar.vala \
 	symbolresolver.vala \
 	treebuilder.vala \
 	driver.vala \
diff --git a/src/driver/0.11.0/driver.vala b/src/driver/0.11.0/driver.vala
index 75d4c6b..6fc87d9 100755
--- a/src/driver/0.11.0/driver.vala
+++ b/src/driver/0.11.0/driver.vala
@@ -40,9 +40,6 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 		SymbolResolver resolver = new SymbolResolver (builder);
 		tree.accept (resolver);
 
-		ChildSymbolRegistrar registrar = new ChildSymbolRegistrar ();
-		tree.accept (registrar);
-
 		return tree;
 	}
 }
diff --git a/src/driver/0.11.x/Makefile.am b/src/driver/0.11.x/Makefile.am
index 6cc4c1f..6dfaf07 100755
--- a/src/driver/0.11.x/Makefile.am
+++ b/src/driver/0.11.x/Makefile.am
@@ -30,7 +30,6 @@ driver_LTLIBRARIES =  \
 
 libdriver_la_VALASOURCES = \
 	initializerbuilder.vala \
-	childsymbolregistrar.vala \
 	symbolresolver.vala \
 	treebuilder.vala \
 	driver.vala \
diff --git a/src/driver/0.11.x/driver.vala b/src/driver/0.11.x/driver.vala
index 75d4c6b..6fc87d9 100755
--- a/src/driver/0.11.x/driver.vala
+++ b/src/driver/0.11.x/driver.vala
@@ -40,9 +40,6 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 		SymbolResolver resolver = new SymbolResolver (builder);
 		tree.accept (resolver);
 
-		ChildSymbolRegistrar registrar = new ChildSymbolRegistrar ();
-		tree.accept (registrar);
-
 		return tree;
 	}
 }
diff --git a/src/driver/0.12.x/Makefile.am b/src/driver/0.12.x/Makefile.am
index 89fb0ab..b5544e2 100755
--- a/src/driver/0.12.x/Makefile.am
+++ b/src/driver/0.12.x/Makefile.am
@@ -30,7 +30,6 @@ driver_LTLIBRARIES =  \
 
 libdriver_la_VALASOURCES = \
 	initializerbuilder.vala \
-	childsymbolregistrar.vala \
 	symbolresolver.vala \
 	treebuilder.vala \
 	driver.vala \
diff --git a/src/driver/0.12.x/driver.vala b/src/driver/0.12.x/driver.vala
index 75d4c6b..6fc87d9 100755
--- a/src/driver/0.12.x/driver.vala
+++ b/src/driver/0.12.x/driver.vala
@@ -40,9 +40,6 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 		SymbolResolver resolver = new SymbolResolver (builder);
 		tree.accept (resolver);
 
-		ChildSymbolRegistrar registrar = new ChildSymbolRegistrar ();
-		tree.accept (registrar);
-
 		return tree;
 	}
 }
diff --git a/src/driver/0.13.x/Makefile.am b/src/driver/0.13.x/Makefile.am
index c9d267f..282932a 100755
--- a/src/driver/0.13.x/Makefile.am
+++ b/src/driver/0.13.x/Makefile.am
@@ -32,7 +32,6 @@ driver_LTLIBRARIES =  \
 
 libdriver_la_VALASOURCES = \
 	initializerbuilder.vala \
-	childsymbolregistrar.vala \
 	symbolresolver.vala \
 	treebuilder.vala \
 	driver.vala \
diff --git a/src/driver/0.13.x/driver.vala b/src/driver/0.13.x/driver.vala
index 75d4c6b..6fc87d9 100755
--- a/src/driver/0.13.x/driver.vala
+++ b/src/driver/0.13.x/driver.vala
@@ -40,9 +40,6 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 		SymbolResolver resolver = new SymbolResolver (builder);
 		tree.accept (resolver);
 
-		ChildSymbolRegistrar registrar = new ChildSymbolRegistrar ();
-		tree.accept (registrar);
-
 		return tree;
 	}
 }
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index aa9e01d..9fba548 100755
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -44,6 +44,7 @@ libvaladoc_la_VALASOURCES = \
 	api/attributeargument.vala \
 	api/attribute.vala \
 	api/array.vala \
+	api/childsymbolregistrar.vala \
 	api/class.vala \
 	api/constant.vala \
 	api/delegate.vala \
diff --git a/src/driver/0.10.x/childsymbolregistrar.vala b/src/libvaladoc/api/childsymbolregistrar.vala
similarity index 86%
rename from src/driver/0.10.x/childsymbolregistrar.vala
rename to src/libvaladoc/api/childsymbolregistrar.vala
index 2454242..c3288e0 100644
--- a/src/driver/0.10.x/childsymbolregistrar.vala
+++ b/src/libvaladoc/api/childsymbolregistrar.vala
@@ -24,26 +24,26 @@ using Valadoc.Api;
 using Gee;
 
 
-public class Valadoc.Drivers.ChildSymbolRegistrar : Visitor {
+public class Valadoc.Api.ChildSymbolRegistrar : Visitor {
 	/**
 	 * { inheritDoc}
 	 */
 	public override void visit_tree (Api.Tree item) {
-		item.accept_children (this);			
+		item.accept_children (this);
 	}
 
 	/**
 	 * { inheritDoc}
 	 */
 	public override void visit_package (Package item) {
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 
 	/**
 	 * { inheritDoc}
 	 */
 	public override void visit_namespace (Namespace item) {
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 
 	/**
@@ -59,7 +59,7 @@ public class Valadoc.Drivers.ChildSymbolRegistrar : Visitor {
 			((Class) item.base_type.data_type).register_derived_interface (item);
 		}
 
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 
 	/**
@@ -75,21 +75,21 @@ public class Valadoc.Drivers.ChildSymbolRegistrar : Visitor {
 			((Class) item.base_type.data_type).register_child_class (item);
 		}
 
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 
 	/**
 	 * { inheritDoc}
 	 */
 	public override void visit_struct (Struct item) {
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 
 	/**
 	 * { inheritDoc}
 	 */
 	public override void visit_property (Property item) {
-		item.accept_all_children (this);
+		item.accept_all_children (this, false);
 	}
 }
 
diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index bd4a544..1697c9e 100755
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -337,6 +337,9 @@ public class ValaDoc : Object {
 			return quit (reporter);
 		}
 
+		// register child symbols:
+		Valadoc.Api.ChildSymbolRegistrar registrar = new Valadoc.Api.ChildSymbolRegistrar ();
+		doctree.accept (registrar);
 
 		// process documentation
 		Valadoc.DocumentationParser docparser = new Valadoc.DocumentationParser (settings, reporter, doctree, modules);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]