From 505a77d0e2722ad67d00aa75b72e660ce3bf100d Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 9 Aug 2014 22:00:23 -0700 Subject: [PATCH] LOG_TRACE YAML events --- src/reader_yaml.cc | 76 ++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/src/reader_yaml.cc b/src/reader_yaml.cc index a7924f8..d376024 100644 --- a/src/reader_yaml.cc +++ b/src/reader_yaml.cc @@ -14,11 +14,15 @@ #include "yaml.h" #include "charles.hh" +#include "log.hh" #include "reader_yaml.hh" #include "yaml/parsers.hh" #include "yaml/sceneParser.hh" +#define LOG_NAME "yaml" +#include "logModule.hh" + #if 0 struct ObjectParser @@ -87,47 +91,45 @@ YAMLReader::read_file(const std::string& filename) goto error; } - if (verbosity >= 4) { - switch (event.type) { - case YAML_NO_EVENT: - printf("YAML_NO_EVENT\n"); - break; + switch (event.type) { + case YAML_NO_EVENT: + LOG_TRACE << "YAML_NO_EVENT"; + break; - case YAML_STREAM_START_EVENT: - printf("YAML_STREAM_START_EVENT\n"); - break; - case YAML_STREAM_END_EVENT: - printf("YAML_STREAM_END_EVENT\n"); - break; + case YAML_STREAM_START_EVENT: + LOG_TRACE << "YAML_STREAM_START_EVENT"; + break; + case YAML_STREAM_END_EVENT: + LOG_TRACE << "YAML_STREAM_END_EVENT"; + break; - case YAML_DOCUMENT_START_EVENT: - printf("YAML_DOCUMENT_START_EVENT\n"); - break; - case YAML_DOCUMENT_END_EVENT: - printf("YAML_DOCUMENT_END_EVENT\n"); - break; + case YAML_DOCUMENT_START_EVENT: + LOG_TRACE << "YAML_DOCUMENT_START_EVENT"; + break; + case YAML_DOCUMENT_END_EVENT: + LOG_TRACE << "YAML_DOCUMENT_END_EVENT"; + break; - case YAML_ALIAS_EVENT: - printf("YAML_ALIAS_EVENT\n"); - break; - case YAML_SCALAR_EVENT: - printf("YAML_SCALAR_EVENT\n"); - break; + case YAML_ALIAS_EVENT: + LOG_TRACE << "YAML_ALIAS_EVENT"; + break; + case YAML_SCALAR_EVENT: + LOG_TRACE << "YAML_SCALAR_EVENT"; + break; - case YAML_SEQUENCE_START_EVENT: - printf("YAML_SEQUENCE_START_EVENT\n"); - break; - case YAML_SEQUENCE_END_EVENT: - printf("YAML_SEQUENCE_END_EVENT\n"); - break; + case YAML_SEQUENCE_START_EVENT: + LOG_TRACE << "YAML_SEQUENCE_START_EVENT"; + break; + case YAML_SEQUENCE_END_EVENT: + LOG_TRACE << "YAML_SEQUENCE_END_EVENT"; + break; - case YAML_MAPPING_START_EVENT: - printf("YAML_MAPPING_START_EVENT\n"); - break; - case YAML_MAPPING_END_EVENT: - printf("YAML_MAPPING_END_EVENT\n"); - break; - } + case YAML_MAPPING_START_EVENT: + LOG_TRACE << "YAML_MAPPING_START_EVENT"; + break; + case YAML_MAPPING_END_EVENT: + LOG_TRACE << "YAML_MAPPING_END_EVENT"; + break; } if (event.type == YAML_DOCUMENT_START_EVENT) { @@ -154,4 +156,4 @@ error: return success; } -} /* namespace charles */ \ No newline at end of file +} /* namespace charles */