From 693e4fa80dd6dbf138299a7fe623974b683a8b87 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 19 Jul 2014 11:39:22 -0700
Subject: [PATCH] Make SceneParser a subclass of ScalarMappingParser

---
 src/yaml/scene_parser.cc | 58 ++++++++++++++--------------------------
 src/yaml/scene_parser.hh | 19 ++++++++-----
 2 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/src/yaml/scene_parser.cc b/src/yaml/scene_parser.cc
index 590402d..52f1dbb 100644
--- a/src/yaml/scene_parser.cc
+++ b/src/yaml/scene_parser.cc
@@ -17,7 +17,7 @@ namespace yaml {
 
 SceneParser::SceneParser(Scene& scene,
                          ParserStack& parsers)
-    : Parser(scene, parsers),
+    : ScalarMappingParser(scene, parsers),
       mSection(SceneParser::NoSection)
 { }
 
@@ -27,12 +27,25 @@ SceneParser::~SceneParser()
 
 
 void
-SceneParser::HandleEvent(yaml_event_t& event)
+SceneParser::HandleKeyEvent(const std::string& key)
+{
+    static const std::map<std::string, Section> sSections = {
+        {"dimensions", DimensionsSection},
+    };
+
+    if (sSections.count(key) > 0) {
+        mSection = sSections.at(key);
+    }
+    else {
+        mSection = NoSection;
+    }
+}
+
+
+void
+SceneParser::HandleValueEvent(yaml_event_t& event)
 {
     switch (mSection) {
-        case NoSection:
-            HandleTopLevelEvent(event);
-            break;
         case CameraSection:
             break;
         case DimensionsSection:
@@ -45,40 +58,8 @@ SceneParser::HandleEvent(yaml_event_t& event)
             assert(false);
             break;
     }
-}
 
-
-void
-SceneParser::HandleTopLevelEvent(yaml_event_t& event)
-{
-    static const std::string CAMERA = "camera";
-    static const std::string DIMENSIONS = "dimensions";
-    static const std::string OBJECTS = "objects";
-
-    if (event.type == YAML_MAPPING_END_EVENT) {
-        SetDone(true);
-        return;
-    }
-
-    if (event.type != YAML_SCALAR_EVENT) {
-        /* TODO: Invalid event type for top-level Scene. Fail. */
-        abort();
-    }
-
-    std::string key = (char *)event.data.scalar.value;
-    if (key == CAMERA) {
-        mSection = SceneParser::CameraSection;
-    }
-    else if (key == DIMENSIONS) {
-        mSection = SceneParser::DimensionsSection;
-    }
-    else if (key == OBJECTS) {
-        mSection = SceneParser::ObjectsSection;
-    }
-    else {
-        /* TODO: Invalid key. Fail. */
-        abort();
-    }
+    SetShouldExpectKey(false);
 }
 
 
@@ -94,6 +75,7 @@ SceneParser::HandleDimensionsEvent(yaml_event_t& event)
         sc.set_height(dimensions.at(1));
 
         mSection = NoSection;
+        SetShouldExpectKey(true);
     };
 
     switch (event.type) {
diff --git a/src/yaml/scene_parser.hh b/src/yaml/scene_parser.hh
index 9028eac..18e792c 100644
--- a/src/yaml/scene_parser.hh
+++ b/src/yaml/scene_parser.hh
@@ -9,28 +9,35 @@
 #ifndef __YAML_SCENE_PARSER_HH__
 #define __YAML_SCENE_PARSER_HH__
 
+#include <string>
+
 #include "parsers.hh"
+#include "scalarMappingParser.hh"
 
 
 namespace yaml {
 
 struct SceneParser
-    : public Parser
+    : public ScalarMappingParser
 {
     SceneParser(Scene& scene, ParserStack& parsers);
     ~SceneParser();
 
-    void HandleEvent(yaml_event_t& event);
-    void HandleTopLevelEvent(yaml_event_t& event);
-    void HandleDimensionsEvent(yaml_event_t& event);
+protected:
+    void HandleKeyEvent(const std::string& key);
+    void HandleValueEvent(yaml_event_t& event);
 
 private:
-    enum {
+    enum Section {
         NoSection,
         CameraSection,
         DimensionsSection,
         ObjectsSection,
-    } mSection;
+    };
+
+    void HandleDimensionsEvent(yaml_event_t& event);
+
+    Section mSection;
 };
 
 } /* namespace yaml */