X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fclone.cpp;h=81b6d11051790b307827ad10c7a2a56ffab695bc;hb=29f0ad69120092c93021e37f764777d5ccd84d3e;hp=5bdfbc66849771e40f876916a48df7a06d2e4446;hpb=4c1b8f968fe31be2528b49ab8ad956e79b8617f5;p=xml-template

diff --git a/c++0x/clone.cpp b/c++0x/clone.cpp
index 5bdfbc6..81b6d11 100644
--- a/c++0x/clone.cpp
+++ b/c++0x/clone.cpp
@@ -6,33 +6,16 @@ using namespace std;
 
 int main(int argc, char **argv)
 {
-	vector<Directive *> things;
+	Substitute master_directive = {
+		make_pair("color", new Replace("blue")),
+		make_pair("#things", new Clone {
+			new Substitute { make_pair("li", new Replace("Raindrops on roses")) },
+			new Substitute { make_pair("li", new Replace("Whiskers on kittens")) },
+			new Substitute { make_pair("li", new Replace("Bright copper kettles")) },
+			new Substitute { make_pair("li", new Replace("Warm, woolen mittens")) },
+		}),
+	};
 
-	{
-		unordered_map<string, Directive *> submap;
-		submap.insert(make_pair("li", new Replace("Raindrops on roses")));
-		things.push_back(new Substitute(submap));
-	}
-	{
-		unordered_map<string, Directive *> submap;
-		submap.insert(make_pair("li", new Replace("Whiskers on kittens")));
-		things.push_back(new Substitute(submap));
-	}
-	{
-		unordered_map<string, Directive *> submap;
-		submap.insert(make_pair("li", new Replace("Bright copper kettles")));
-		things.push_back(new Substitute(submap));
-	}
-	{
-		unordered_map<string, Directive *> submap;
-		submap.insert(make_pair("li", new Replace("Warm, woolen mittens")));
-		things.push_back(new Substitute(submap));
-	}
-
-	unordered_map<string, Directive *> master_map;
-	master_map.insert(make_pair("color", new Replace("blue")));
-	master_map.insert(make_pair("#things", new Clone(things)));
-
-	process_file("../xml/clone.xml", argv[1], new Substitute(master_map));
+	process_file("../xml/clone.xml", argv[1], &master_directive);
 	return(0);
 }