From 152e48f0d06a2aa4e64ec37cf600b5fb98ca0448 Mon Sep 17 00:00:00 2001 From: jbeder Date: Wed, 2 Mar 2011 20:59:39 +0000 Subject: [PATCH] Prettied up the bool formatting code --- src/emitter.cpp | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/emitter.cpp b/src/emitter.cpp index eb9c339..8dcc45c 100644 --- a/src/emitter.cpp +++ b/src/emitter.cpp @@ -613,36 +613,32 @@ namespace YAML switch(mainFmt) { case YesNoBool: switch(caseFmt) { - case UpperCase: - return b ? "YES" : "NO"; - case CamelCase: - return b ? "Yes" : "No"; - case LowerCase: // fall through to default - default: - return b ? "yes" : "no"; + case UpperCase: return b ? "YES" : "NO"; + case CamelCase: return b ? "Yes" : "No"; + case LowerCase: return b ? "yes" : "no"; + default: break; } + break; case OnOffBool: switch(caseFmt) { - case UpperCase: - return b ? "ON" : "OFF"; - case CamelCase: - return b ? "On" : "Off"; - case LowerCase: // fall through to default - default: - return b ? "on" : "off"; + case UpperCase: return b ? "ON" : "OFF"; + case CamelCase: return b ? "On" : "Off"; + case LowerCase: return b ? "on" : "off"; + default: break; } - case TrueFalseBool: // fall through to default - default: + break; + case TrueFalseBool: switch(caseFmt) { - case UpperCase: - return b ? "TRUE" : "FALSE"; - case CamelCase: - return b ? "True" : "False"; - case LowerCase: // fall through to default - default: - return b ? "true" : "false"; + case UpperCase: return b ? "TRUE" : "FALSE"; + case CamelCase: return b ? "True" : "False"; + case LowerCase: return b ? "true" : "false"; + default: break; } + break; + default: + break; } + return b ? "y" : "n"; // should never get here, but it can't hurt to give these answers } Emitter& Emitter::Write(bool b)