Refactoring: Split out FileModule from Module, Added LocalScope renamed some confusing 'evaluate' methods to 'instantiate', added FileContext (not yet used)

12 files changed, 15 insertions, 15 deletions

diff --git a/tests/cgalcachetest.cc b/tests/cgalcachetest.cc
index b65a2c8..fbc7350 100644
--- a/tests/cgalcachetest.cc
+++ b/tests/cgalcachetest.cc
@@ -145,7 +145,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
+	AbstractNode *absolute_root_node = root_module->instantiate(&root_ctx, &root_inst);
 	AbstractNode *root_node;
 	// Do we have an explicit root node (! modifier)?
 	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node;
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc
index afc3128..deaf080 100644
--- a/tests/cgalpngtest.cc
+++ b/tests/cgalpngtest.cc
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
+	AbstractNode *absolute_root_node = root_module->instantiate(&root_ctx, &root_inst);
 	AbstractNode *root_node;
 	// Do we have an explicit root node (! modifier)?
 	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node;
diff --git a/tests/cgalstlsanitytest.cc b/tests/cgalstlsanitytest.cc
index 49a3f8e..01ab5fb 100644
--- a/tests/cgalstlsanitytest.cc
+++ b/tests/cgalstlsanitytest.cc
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
+	AbstractNode *absolute_root_node = root_module->instantiate(&root_ctx, &root_inst);
 	AbstractNode *root_node;
 	// Do we have an explicit root node (! modifier)?
 	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node;
diff --git a/tests/cgaltest.cc b/tests/cgaltest.cc
index b7ae669..5e8803a 100644
--- a/tests/cgaltest.cc
+++ b/tests/cgaltest.cc
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
+	AbstractNode *absolute_root_node = root_module->instantiate(&root_ctx, &root_inst);
 	AbstractNode *root_node;
 	// Do we have an explicit root node (! modifier)?
 	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node;
diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc
index f4a88e0..8b98190 100644
--- a/tests/csgtermtest.cc
+++ b/tests/csgtermtest.cc
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	Tree tree(root_node);
 
diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc
index 6da6411..8cae5ef 100644
--- a/tests/csgtestcore.cc
+++ b/tests/csgtestcore.cc
@@ -154,7 +154,7 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
 	}
 
 	AbstractNode::resetIndexCounter();
-	AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
+	AbstractNode *absolute_root_node = root_module->instantiate(&root_ctx, &root_inst);
 	AbstractNode *root_node;
 	// Do we have an explicit root node (! modifier)?
 	if (!(root_node = find_root_tag(absolute_root_node))) root_node = absolute_root_node;
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc
index 3e26814..be2dc34 100644
--- a/tests/csgtexttest.cc
+++ b/tests/csgtexttest.cc
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	Tree tree;
 	tree.setRoot(root_node);
diff --git a/tests/dumptest.cc b/tests/dumptest.cc
index e0d2776..6e687d9 100644
--- a/tests/dumptest.cc
+++ b/tests/dumptest.cc
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	Tree tree;
 	tree.setRoot(root_node);
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	tree.setRoot(root_node);
 
diff --git a/tests/echotest.cc b/tests/echotest.cc
index 9924d11..96dd39e 100644
--- a/tests/echotest.cc
+++ b/tests/echotest.cc
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	delete root_node;
 	delete root_module;
diff --git a/tests/modulecachetest.cc b/tests/modulecachetest.cc
index 62f9543..fc9f325 100644
--- a/tests/modulecachetest.cc
+++ b/tests/modulecachetest.cc
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	delete root_node;
 	delete root_module;
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 	}
 
 	AbstractNode::resetIndexCounter();
-	root_node = root_module->evaluate(&root_ctx, &root_inst);
+	root_node = root_module->instantiate(&root_ctx, &root_inst);
 
 	delete root_node;
 	delete root_module;
diff --git a/tests/tests-common.cc b/tests/tests-common.cc
index 703e1c5..ac85e37 100644
--- a/tests/tests-common.cc
+++ b/tests/tests-common.cc
@@ -7,9 +7,9 @@
 #include <sstream>
 #include <fstream>
 
-Module *parsefile(const char *filename)
+FileModule *parsefile(const char *filename)
 {
-	Module *root_module = NULL;
+	FileModule *root_module = NULL;
 
 	handle_dep(filename);
 	std::ifstream ifs(filename);
diff --git a/tests/tests-common.h b/tests/tests-common.h
index 0047562..3393884 100644
--- a/tests/tests-common.h
+++ b/tests/tests-common.h
@@ -1,6 +1,6 @@
 #ifndef TESTS_COMMON_H_
 #define TESTS_COMMON_H_
 
-class Module *parsefile(const char *filename);
+class FileModule *parsefile(const char *filename);
 
 #endif