replaced uses of std::string with MultiType; still need to replace many conversions with MultiType's conversions

Author: yaxollum

include/MultiType.h

@@ -1,16 +1,26 @@
+#pragma once
+
 #include <string>
-#include <iostream>
+#include <stdexcept>
+
+enum Type {STRING,DOUBLE};
 
 class MultiType
 {
 public:
     MultiType(const std::string &s);
+    MultiType(double d);
     std::string getString();
     double getDouble();
     void setString(const std::string &s);
     void setDouble(const double &d);
+    bool operator==(const MultiType &other) const;
+    bool operator<(const MultiType &other) const;
+    bool operator>(const MultiType &other) const;
 private:
-    enum Type {STRING,DOUBLE};
+    friend std::ostream& operator<<(std::ostream& out, const MultiType& obj);
+    enum CompareResult {EQUAL,LESS,GREATER};
+    static CompareResult stringDoubleCompare(std::string s,double d);
     std::string stringVar;
     double doubleVar;
     Type type;

include/NestedBlock/NestedBlock.h

@@ -1,11 +1,14 @@
 #pragma once
 
 #include "Block.h"
-#include <string>
+#include "MultiType.h"
+
+class MultiType;
 
 class NestedBlock : public Block
 {
 public:
-    virtual std::string getValue() const=0;
-    virtual double getDouble() const=0;
+    virtual MultiType getValue() const=0;
+    virtual double getDouble();
+    virtual std::string getString();
 };

include/NestedBlock/RoundBlock/AnswerBlock.h

@@ -1,4 +1,5 @@
 #include "NestedBlock/RoundBlock/RoundBlock.h"
+#include "MultiType.h"
 #include <memory>
 #include <string>
 
@@ -7,8 +8,8 @@ class Variable;
 class AnswerBlock : public RoundBlock
 {
 public:
-    std::string getValue() const override;
-    void setValue(std::string val);
+    MultiType getValue() const override;
+    void setValue(MultiType val);
     AnswerBlock(std::shared_ptr<Variable> av);
 private:
     std::shared_ptr<Variable> answerVariable;

include/NestedBlock/RoundBlock/BinaryFunction/BinaryFunction.h

@@ -8,7 +8,7 @@
 class BinaryFunction : public RoundBlock
 {
 public:
-    std::string getValue() const override=0;
+    MultiType getValue() const override=0;
     BinaryFunction(const std::shared_ptr<NestedBlock> l,const std::shared_ptr<NestedBlock> r);
 protected:
     const std::shared_ptr<NestedBlock> left, right;

include/NestedBlock/RoundBlock/BinaryFunction/FunctionAdd.h

@@ -6,6 +6,6 @@
 class FunctionAdd : public BinaryFunction
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     using BinaryFunction::BinaryFunction;
 };

include/NestedBlock/RoundBlock/BinaryFunction/FunctionDivide.h

@@ -6,6 +6,6 @@
 class FunctionDivide : public BinaryFunction
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     using BinaryFunction::BinaryFunction;
 };

include/NestedBlock/RoundBlock/BinaryFunction/FunctionMultiply.h

@@ -6,6 +6,6 @@
 class FunctionMultiply : public BinaryFunction
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     using BinaryFunction::BinaryFunction;
 };

include/NestedBlock/RoundBlock/BinaryFunction/FunctionSubtract.h

@@ -6,6 +6,6 @@
 class FunctionSubtract : public BinaryFunction
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     using BinaryFunction::BinaryFunction;
 };

include/NestedBlock/RoundBlock/Constant.h

@@ -2,12 +2,13 @@
 
 #include <string>
 #include "NestedBlock/RoundBlock/RoundBlock.h"
+#include "MultiType.h"
 
 class Constant : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     Constant(std::string v);
 private:
-    std::string val;
+    MultiType val;
 };

include/NestedBlock/RoundBlock/List/List.h

@@ -9,22 +9,22 @@ struct ListFindResult;
 class List : public RoundBlock
 {
 public:
-    std::string getValue() const override;
-    std::vector<std::string> getVector() const;
-    std::string getIndex(int index) const;
-    void setVector(std::vector<std::string> v);
-    void add(std::string v);
+    MultiType getValue() const override;
+    //std::vector<std::string> getVector() const;
+    MultiType getIndex(int index) const;
+    //void setVector(std::vector<std::string> v);
+    void add(MultiType v);
     void remove(int index);
     void clear();
-    void insert(int index, std::string v);
-    void replace(int index, std::string v);
+    void insert(int index, MultiType v);
+    void replace(int index, MultiType v);
     int length() const;
-    ListFindResult find(std::string v);
+    ListFindResult find(MultiType v);
 
     List(std::vector<std::string> v);
     List();
 private:
-    std::vector<std::string> val;
+    std::vector<MultiType> val;
 };
 
 struct ListFindResult

include/NestedBlock/RoundBlock/List/ListFindItem.h

@@ -7,7 +7,7 @@ class ListFindItem : public RoundBlock
 public:
     ListFindItem(const std::shared_ptr<List> l,
         const std::shared_ptr<NestedBlock> val);
-    std::string getValue() const override;
+    MultiType getValue() const override;
 private:
     const std::shared_ptr<List> list;
     const std::shared_ptr<NestedBlock> value;

include/NestedBlock/RoundBlock/List/ListGetItem.h

@@ -7,7 +7,7 @@ class ListGetItem : public RoundBlock
 public:
     ListGetItem(const std::shared_ptr<List> l,
         const std::shared_ptr<NestedBlock> i);
-    std::string getValue() const override;
+    MultiType getValue() const override;
 private:
     const std::shared_ptr<List> list;
     const std::shared_ptr<NestedBlock> index;

include/NestedBlock/RoundBlock/List/ListLength.h

@@ -6,7 +6,7 @@ class ListLength : public RoundBlock
 {
 public:
     ListLength(const std::shared_ptr<List> l);
-    std::string getValue() const override;
+    MultiType getValue() const override;
 private:
     const std::shared_ptr<List> list;
 };

include/NestedBlock/RoundBlock/Operators/OperatorsJoin.h

@@ -8,7 +8,7 @@
 class OperatorsJoin : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsJoin(std::shared_ptr<NestedBlock> lb, std::shared_ptr<NestedBlock> rb);
 private:
     std::shared_ptr<NestedBlock> left;

include/NestedBlock/RoundBlock/Operators/OperatorsLength.h

@@ -8,7 +8,7 @@
 class OperatorsLength : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsLength(std::shared_ptr<NestedBlock> s);
 private:
     std::shared_ptr<NestedBlock> str;

include/NestedBlock/RoundBlock/Operators/OperatorsLetterOf.h

@@ -8,7 +8,7 @@
 class OperatorsLetterOf : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsLetterOf(std::shared_ptr<NestedBlock> l, std::shared_ptr<NestedBlock> s);
 private:
     std::shared_ptr<NestedBlock> letter;

include/NestedBlock/RoundBlock/Operators/OperatorsMathOp.h

@@ -9,7 +9,7 @@
 class OperatorsMathOp : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsMathOp(std::shared_ptr<Constant> o, std::shared_ptr<NestedBlock> n);
 private:
     std::shared_ptr<Constant> op;

include/NestedBlock/RoundBlock/Operators/OperatorsMod.h

@@ -8,7 +8,7 @@
 class OperatorsMod : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsMod(std::shared_ptr<NestedBlock> n1, std::shared_ptr<NestedBlock> n2);
 private:
     std::shared_ptr<NestedBlock> num1;

include/NestedBlock/RoundBlock/Operators/OperatorsRandom.h

@@ -8,7 +8,7 @@
 class OperatorsRandom : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsRandom(std::shared_ptr<NestedBlock> lb, std::shared_ptr<NestedBlock> ub);
 private:
     std::shared_ptr<NestedBlock> lower;

include/NestedBlock/RoundBlock/Operators/OperatorsRound.h

@@ -8,7 +8,7 @@
 class OperatorsRound : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     OperatorsRound(std::shared_ptr<NestedBlock> n);
 private:
     std::shared_ptr<NestedBlock> num;

include/NestedBlock/RoundBlock/RoundBlock.h

@@ -3,9 +3,10 @@
 #include <string>
 #include "NestedBlock/NestedBlock.h"
 
+class MultiType;
+
 class RoundBlock : public NestedBlock
 {
 public:
-    virtual std::string getValue() const=0;
-    double getDouble() const override;
+    virtual MultiType getValue() const=0;
 };

include/NestedBlock/RoundBlock/Time/CurrentTime.h

@@ -7,7 +7,7 @@ class CurrentTime : public RoundBlock
 {
 public:
     CurrentTime(std::shared_ptr<Constant> opt);
-    std::string getValue() const override;
+    MultiType getValue() const override;
 private:
     std::shared_ptr<Constant> option;
 };

include/NestedBlock/RoundBlock/Time/DaysSince2000.h

@@ -4,5 +4,5 @@
 class DaysSince2000 : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
 };

include/NestedBlock/RoundBlock/Time/TimerBlock.h

@@ -6,7 +6,7 @@ class GlobalTimer;
 class TimerBlock : public RoundBlock
 {
 public:
-    std::string getValue() const override;
+    MultiType getValue() const override;
     TimerBlock(std::shared_ptr<GlobalTimer> gt);
 private:
     std::shared_ptr<GlobalTimer> globalTimer;

include/NestedBlock/RoundBlock/Variable.h

@@ -2,14 +2,15 @@
 
 #include <string>
 #include "NestedBlock/RoundBlock/RoundBlock.h"
+#include "MultiType.h"
 
 class Variable : public RoundBlock
 {
 public:
-    std::string getValue() const override;
-    void setValue(std::string v);
+    MultiType getValue() const override;
+    void setValue(MultiType v);
     Variable(std::string v);
     Variable();
 private:
-    std::string val;
+    MultiType val;
 };

include/NestedBlock/SharpBlock/SharpBlock.h

@@ -6,7 +6,8 @@
 class SharpBlock : public NestedBlock
 {
 public:
+    MultiType getValue() const override;
     virtual bool getBool() const=0;
-    std::string getValue() const override;
-    double getDouble() const override;
+    std::string getString() override;
+    double getDouble() override;
 };