More improvment with what can be done with a Token

Author: Avi SZYCHTER

include/Token.h

@@ -15,12 +15,32 @@ struct Token {
       Separator,
       PositiveNumber,
       NegativeNumber,
+      FloatingPointNumber,
       Number,
       Identifier,
       ArithmeticSign,
       Eof
   };
 
+  /**
+   * @return A Token representing an arithmetic sign
+   */
+  static Token createArithmeticSign(char src);
+  
+  /**
+   * @return A Token representing a separator
+   */
+  static Token createSeparator(char src);
+
+  /**
+   * The Token's type returned here depends on is_positive and is_float
+   * @param number The image of the number
+   * @param is_positive true if number represents a positive number
+   * @param is_float true if the number represents a floating-point number
+   * @return A Token representing a number
+   */
+  static Token createNumber(const std::string& number, bool is_positive, bool is_float);
+  
   /**
    * @brief Constructs an EOF token.
    */
@@ -50,7 +70,7 @@ struct Token {
 
   /**
    * If the token's type is Number or if other is Number,
-   * then it also matches PositiveNumber and NegativeNumber
+   * then it also matches PositiveNumber, NegativeNumber and FloatingPointNumber
    *  
    * @return true if the token's type is equal to other
    * @param other Type to compare

src/parsing/Tokenizer.cpp

@@ -43,10 +43,12 @@ bool Token::operator==(const std::string& other) const {
 
 bool Token::operator==(Token::Type other) const {
   if(type == Number) {
-    return other == Number || other == PositiveNumber || other == NegativeNumber;
+    return other == Number || other == PositiveNumber || 
+           other == NegativeNumber || other == FloatingPointNumber;
   }
   else if(other == Number) {
-    return type == Number || type == PositiveNumber || type == NegativeNumber;
+    return type == Number || type == PositiveNumber || 
+           type == NegativeNumber || type == FloatingPointNumber;
   }
 
   return type == other;
@@ -79,6 +81,25 @@ long long Token::toInt() const {
 double Token::toDouble() const {
   return std::stod(image);
 }
+
+Token Token::createArithmeticSign(char src) {
+  return Token(ArithmeticSign, std::string(1, src));
+}
+
+Token Token::createSeparator(char src) {
+  return Token(Separator, std::string(1, src));
+}
+
+Token Token::createNumber(const std::string& number, bool is_positive, bool is_float) {
+  if(is_float) {
+    return Token(FloatingPointNumber, number);
+  }
+  else if(is_positive) {
+    return Token(PositiveNumber, number);
+  }
+
+  return Token(NegativeNumber, number);
+}
 //    END OF IMPLEMENTATION Token class
 
 Token Tokenizer::getCurrentToken() const {