move files around, rename some stuff, and add pretty display messages

Author: robertDurst

CMakeLists.txt

@@ -5,10 +5,10 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Add sailfishc libs. TODO: write this more eloquently
 ADD_LIBRARY(SailfishcLibs 
-    ./src/lexar/Lexar2.cpp
-    ./src/lexar/Token2.cpp
-    ./src/parser/Parser2.cpp
-    ./src/errorhandler/Parser2ErrorHandler.cpp
+    ./src/lexar/Lexar.cpp
+    ./src/lexar/Token.cpp
+    ./src/parser/Parser.cpp
+    ./src/errorhandler/ParserErrorHandler.cpp
     ./src/errorhandler/SemanticAnalyzerErrorHandler.cpp 
     ./src/main/CommandLine.cpp
     ./src/semantics/SymbolTable.cpp

src/errorhandler/display.h src/common/display.hsrc/errorhandler/display.h renamed to src/common/display.h

@@ -12,10 +12,15 @@ namespace Prettify
 enum Code
 {
     RESET = 0,
+    BOLD = 1,
     UNDERLINE = 4,
     FG_RED = 31,
+    FG_GREEN = 32,
     FG_YELLOW = 33,
     FG_DEFAULT = 39,
+    BG_BLUE = 44,
+    FG_LIGHT_BLUE = 94,
+    FG_WHITE = 97,
 };
 class Formatter
 {

src/errorhandler/Error2.h src/errorhandler/Error.hsrc/errorhandler/Error2.h renamed to src/errorhandler/Error.h

@@ -3,11 +3,11 @@
  * Sailfish Programming Language
  */
 #pragma once
-#include "display.h"
+#include "../common/display.h"
 #include <iostream>
 #include <string>
 
-class Error2
+class Error
 {
   private:
     int col;
@@ -20,8 +20,8 @@ class Error2
     std::string filename;
 
   public:
-    Error2(int c, int l, const std::string& m, const std::string& le,
-           const std::string& mid, const std::string& ri)
+    Error(int c, int l, const std::string& m, const std::string& le,
+          const std::string& mid, const std::string& ri)
     {
         col = c;
         line = l;

src/errorhandler/Parser2ErrorHandler.h

@@ -2,10 +2,10 @@
  * Robert Durst 2019
  * Sailfish Programming Language
  */
-#include "Parser2ErrorHandler.h"
+#include "ParserErrorHandler.h"
 
 void
-Parser2ErrorHandler::handle(std::unique_ptr<Error2> err)
+ParserErrorHandler::handle(std::unique_ptr<Error> err)
 {
     // finish the initialization of Error
     err->setErrorType("PARSER");

src/errorhandler/Parser2ErrorHandler.cpp src/errorhandler/ParserErrorHandler.cppsrc/errorhandler/Parser2ErrorHandler.cpp renamed to src/errorhandler/ParserErrorHandler.cpp

@@ -0,0 +1,14 @@
+/*
+ * Robert Durst 2019
+ * Sailfish Programming Language
+ */
+#pragma once
+#include "Error.h"
+#include <memory>
+
+class ParserErrorHandler
+{
+  public:
+    ParserErrorHandler(){};
+    void handle(std::unique_ptr<Error>);
+};

src/errorhandler/ParserErrorHandler.h

@@ -5,7 +5,7 @@
 #include "SemanticAnalyzerErrorHandler.h"
 
 void
-SemanticAnalyzerErrorHandler::handle(std::unique_ptr<Error2> err)
+SemanticAnalyzerErrorHandler::handle(std::unique_ptr<Error> err)
 {
     // finish the initialization of Error
     err->setErrorType("SEMANTIC");
@@ -16,16 +16,3 @@ SemanticAnalyzerErrorHandler::handle(std::unique_ptr<Error2> err)
     err->displayMessage();
     // throw "";
 }
-
-void
-SemanticAnalyzerErrorHandler::handle(std::unique_ptr<Warning> err)
-{
-    // finish the initialization of Error
-    err->setWarningType("SEMANTIC");
-
-    err->setFilename(filename);
-
-    // throw an error since we stop at first error here
-    err->displayMessage();
-    // throw "";
-}

src/errorhandler/SemanticAnalyzerErrorHandler.cpp

@@ -3,17 +3,16 @@
  * Sailfish Programming Language
  */
 #pragma once
-#include "Error2.h"
-#include "Warning.h"
+#include "Error.h"
 #include <memory>
 #include <string>
 
 class SemanticAnalyzerErrorHandler
 {
   private:
     std::string filename;
+
   public:
-    SemanticAnalyzerErrorHandler(const std::string& f): filename(f){};
-    void handle(std::unique_ptr<Error2>);
-    void handle(std::unique_ptr<Warning>);
+    SemanticAnalyzerErrorHandler(const std::string& f) : filename(f){};
+    void handle(std::unique_ptr<Error>);
 };

src/errorhandler/SemanticAnalyzerErrorHandler.h

@@ -2,7 +2,7 @@
  * Robert Durst 2019
  * Sailfish Programming Language
  */
-#include "Lexar2.h"
+#include "Lexar.h"
 #include <iostream>
 
 /*
@@ -11,8 +11,8 @@
  * having found the end of the token. In the second case, I need the buffer to
  * pop the last char and to return this char to the scanner.
  */
-std::unique_ptr<Token2>
-Lexar2::makeToken(const TokenKind& k, const std::string& v)
+std::unique_ptr<Token>
+Lexar::makeToken(const TokenKind& k, const std::string& v)
 {
     auto kd = k; // since kd is constant we copy here
 
@@ -30,8 +30,6 @@ Lexar2::makeToken(const TokenKind& k, const std::string& v)
             kd = TokenKind::UAT;
         else if (v == "Ufn")
             kd = TokenKind::UFN;
-        else if (v == "Ife")
-            kd = TokenKind::IFE;
         else if (v == "fun")
             kd = TokenKind::FUN;
         else if (v == "empty")
@@ -51,11 +49,11 @@ Lexar2::makeToken(const TokenKind& k, const std::string& v)
         else if (v == "true" || v == "false")
             kd = TokenKind::BOOL;
     }
-    return std::make_unique<Token2>(kd, v, col, line);
+    return std::make_unique<Token>(kd, v, col, line);
 }
 
-std::unique_ptr<Token2>
-Lexar2::makeTokenPutback(const TokenKind& k, std::string& v, char& c)
+std::unique_ptr<Token>
+Lexar::makeTokenPutback(const TokenKind& k, std::string& v, char& c)
 {
     // readjust the col and line counters
     col = prevCol;
@@ -75,7 +73,7 @@ Lexar2::makeTokenPutback(const TokenKind& k, std::string& v, char& c)
 }
 
 char
-Lexar2::getNextChar()
+Lexar::getNextChar()
 {
     if (isFile)
     {
@@ -95,7 +93,7 @@ Lexar2::getNextChar()
     return c;
 }
 
-Lexar2::Lexar2(const std::string& fileString, bool isAFile)
+Lexar::Lexar(const std::string& fileString, bool isAFile)
 {
     if (isAFile)
     {
@@ -114,8 +112,8 @@ Lexar2::Lexar2(const std::string& fileString, bool isAFile)
     prevCol = 0;
 }
 
-std::unique_ptr<Token2>
-Lexar2::getNextToken()
+std::unique_ptr<Token>
+Lexar::getNextToken()
 {
     char c;
     int state = State::START;