From 282e626ac112b1ca7a9bf9f9d4c0239db8fbd97a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 10 Jun 2016 21:17:23 -0700
Subject: =?UTF-8?q?[core]=20Make=20enum=20=E2=86=94=20string=20conversion?=
 =?UTF-8?q?=20more=20generic-friendly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rewrite enum.hpp in such a way that parseConstant can be defined generically for all enumerated types.

While there, properly validated enumerated property values.
---
 platform/darwin/src/log_nslog.mm | 3 ++-
 platform/default/log_stderr.cpp  | 3 ++-
 platform/node/src/node_log.cpp   | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'platform')

diff --git a/platform/darwin/src/log_nslog.mm b/platform/darwin/src/log_nslog.mm
index a2e31968ab..49583ae3c4 100644
--- a/platform/darwin/src/log_nslog.mm
+++ b/platform/darwin/src/log_nslog.mm
@@ -1,4 +1,5 @@
 #include <mbgl/platform/log.hpp>
+#include <mbgl/util/enum.hpp>
 
 #import <Foundation/Foundation.h>
 
@@ -7,7 +8,7 @@ namespace mbgl {
 void Log::platformRecord(EventSeverity severity, const std::string &msg) {
     NSString *message =
         [[NSString alloc] initWithBytes:msg.data() length:msg.size() encoding:NSUTF8StringEncoding];
-    NSLog(@"[%s] %@", EventSeverityClass(severity).c_str(), message);
+    NSLog(@"[%s] %@", Enum<EventSeverity>::toString(severity), message);
 }
 
 }
diff --git a/platform/default/log_stderr.cpp b/platform/default/log_stderr.cpp
index 536841617a..145cdeda03 100644
--- a/platform/default/log_stderr.cpp
+++ b/platform/default/log_stderr.cpp
@@ -1,11 +1,12 @@
 #include <mbgl/platform/log.hpp>
+#include <mbgl/util/enum.hpp>
 
 #include <iostream>
 
 namespace mbgl {
 
 void Log::platformRecord(EventSeverity severity, const std::string &msg) {
-    std::cerr << "[" << severity << "] " << msg << std::endl;
+    std::cerr << "[" << Enum<EventSeverity>::toString(severity) << "] " << msg << std::endl;
 }
 
 } // namespace mbgl
diff --git a/platform/node/src/node_log.cpp b/platform/node/src/node_log.cpp
index a741109b27..21eaa55bca 100644
--- a/platform/node/src/node_log.cpp
+++ b/platform/node/src/node_log.cpp
@@ -1,6 +1,8 @@
 #include "node_log.hpp"
 #include "util/async_queue.hpp"
 
+#include <mbgl/util/enum.hpp>
+
 namespace node_mbgl {
 
 struct NodeLogObserver::LogMessage {
@@ -23,10 +25,10 @@ NodeLogObserver::NodeLogObserver(v8::Local<v8::Object> target)
           auto msg = Nan::New<v8::Object>();
 
           Nan::Set(msg, Nan::New("class").ToLocalChecked(),
-              Nan::New(mbgl::EventClass(message.event).c_str()).ToLocalChecked());
+              Nan::New(mbgl::Enum<mbgl::Event>::toString(message.event)).ToLocalChecked());
 
           Nan::Set(msg, Nan::New("severity").ToLocalChecked(),
-              Nan::New(mbgl::EventSeverityClass(message.severity).c_str()).ToLocalChecked());
+              Nan::New(mbgl::Enum<mbgl::EventSeverity>::toString(message.severity)).ToLocalChecked());
 
           if (message.code != -1) {
               Nan::Set(msg, Nan::New("code").ToLocalChecked(),
-- 
cgit v1.2.1