From 579f35511afebba2ea3b36c140f793b7efebf6d3 Mon Sep 17 00:00:00 2001
From: James Carty <jameslcarty@gmail.com>
Date: Sun, 12 Aug 2018 22:45:03 +0100
Subject: [PATCH] Add support for scietific notation flag for MessageBox

---
 components/compiler/lineparser.cpp      |  2 +-
 components/compiler/lineparser.hpp      |  2 +-
 components/interpreter/miscopcodes.hpp  |  8 ++++++--
 components/misc/messageformatparser.cpp | 10 ++++++----
 components/misc/messageformatparser.hpp |  8 +++++++-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 2d551348d..602bb826f 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -557,7 +557,7 @@ namespace Compiler
         mExplicit.clear();
     }
 
-    void GetArgumentsFromMessageFormat::visitedPlaceholder(Placeholder placeholder, char /*padding*/, int /*width*/, int /*precision*/)
+    void GetArgumentsFromMessageFormat::visitedPlaceholder(Placeholder placeholder, char /*padding*/, int /*width*/, int /*precision*/, Notation /*notation*/)
     {
         switch (placeholder)
         {
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index d92c4895e..8f7f64bf2 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -83,7 +83,7 @@ namespace Compiler
             std::string mArguments;
 
         protected:
-            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision);
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation);
             virtual void visitedCharacter(char c) {}
 
         public:
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 20a1b52be..8bca0aec1 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -24,7 +24,7 @@ namespace Interpreter
             Runtime& mRuntime;
 
         protected:
-            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision)
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation)
             {
                 std::ostringstream out;
                 out.fill(padding);
@@ -58,7 +58,11 @@ namespace Interpreter
                             float value = mRuntime[0].mFloat;
                             mRuntime.pop();
 
-                            out << std::fixed << value;
+                            if (notation == FixedNotation)
+                                out << std::fixed << value;
+                            else
+                                out << std::scientific << value;
+
                             mFormattedMessage += out.str();
                         }
                         break;
diff --git a/components/misc/messageformatparser.cpp b/components/misc/messageformatparser.cpp
index 3a35c83ea..708d9565d 100644
--- a/components/misc/messageformatparser.cpp
+++ b/components/misc/messageformatparser.cpp
@@ -49,11 +49,13 @@ namespace Misc
                                 width = (widthSet) ? width : -1;
 
                                 if (m[i] == 'S' || m[i] == 's')
-                                    visitedPlaceholder(StringPlaceholder, pad, width, precision);
-                                else if (m[i] == 'g' || m[i] == 'G')
-                                    visitedPlaceholder(IntegerPlaceholder, pad, width, precision);
+                                    visitedPlaceholder(StringPlaceholder, pad, width, precision, FixedNotation);
+                                else if (m[i] == 'd' || m[i] == 'i')
+                                    visitedPlaceholder(IntegerPlaceholder, pad, width, precision, FixedNotation);
                                 else if (m[i] == 'f' || m[i] == 'F')
-                                    visitedPlaceholder(FloatPlaceholder, pad, width, precision);
+                                    visitedPlaceholder(FloatPlaceholder, pad, width, precision, FixedNotation);
+                                else if (m[i] == 'e' || m[i] == 'E')
+                                    visitedPlaceholder(FloatPlaceholder, pad, width, precision, ScientificNotation);
                             }
                         }
                     }
diff --git a/components/misc/messageformatparser.hpp b/components/misc/messageformatparser.hpp
index c12b9352a..10da624d4 100644
--- a/components/misc/messageformatparser.hpp
+++ b/components/misc/messageformatparser.hpp
@@ -15,7 +15,13 @@ namespace Misc
                 FloatPlaceholder
             };
 
-            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision) = 0;
+            enum Notation
+            {
+                FixedNotation,
+                ScientificNotation
+            };
+
+            virtual void visitedPlaceholder(Placeholder placeholder, char padding, int width, int precision, Notation notation) = 0;
             virtual void visitedCharacter(char c) = 0;
 
         public: