Bit operations tokenization is implemented

CMakeLists.txt

@@ -3,6 +3,21 @@ project(etude)
 
 include(FetchContent)
 
+function(fetch_package pakcage_name git_link git_tag)
+  find_package("${pakcage_name}" QUIET)
+
+  if (NOT "${${pakcage_name}_FOUND}")
+
+    FetchContent_Declare("${pakcage_name}"
+      GIT_REPOSITORY "${git_link}"
+      GIT_TAG "${git_tag}"
+    )
+
+    FetchContent_MakeAvailable("${pakcage_name}")
+
+  endif (NOT "${${pakcage_name}_FOUND}")
+endfunction()
+
 # --------------------------------------------------------------------
 
 set(CMAKE_CXX_STANDARD 20)
@@ -15,20 +30,7 @@ add_compile_options(-Wall -Wextra -g -Og -fsanitize=undefined)
 
 # --------------------------------------------------------------------
 
-find_package(fmt QUIET)
-
-if (NOT fmt_FOUND)
-
-  FetchContent_Declare(fmt
-    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-    GIT_TAG master
-  )
-
-  FetchContent_MakeAvailable(fmt)
-
-endif (NOT fmt_FOUND)
-
-# find_package(Catch2 2 REQUIRED)
+fetch_package(fmt https://github.com/fmtlib/fmt.git master)
 
 # --------------------------------------------------------------------
 

src/lex/lexer.cpp

@@ -149,7 +149,7 @@ std::optional<TokenType> Lexer::MatchOperator() {
         scanner_.MoveRight();
         return TokenType::ARROW_CAST;
       } else {
-        std::abort();
+        return TokenType::TILDE;
       }
 
     case '+':
@@ -180,6 +180,8 @@ std::optional<TokenType> Lexer::MatchOperator() {
       return TokenType::ADDR;
     case '|':
       return TokenType::BIT_OR;
+    case '^':
+      return TokenType::BIT_XOR;
     case '(':
       return TokenType::LEFT_PAREN;
     case ')':

src/lex/token_type.cpp

@@ -62,6 +62,8 @@ namespace lex {
   code(IF)                  \
   code(MATCH)               \
   code(BIT_OR)              \
+  code(BIT_XOR)             \
+  code(TILDE)               \
   code(THEN)                \
   code(ELSE)                \
   code(COLON)               \

src/lex/token_type.hpp

@@ -68,7 +68,7 @@ enum class TokenType {
   STRUCT,
   SUM,
   UNION,
-  
+
   OF,
   FOR,
   IMPL,
@@ -84,6 +84,8 @@ enum class TokenType {
   IF,
   MATCH,
   BIT_OR,
+  BIT_XOR,
+  TILDE,
   THEN,
   ELSE,
 

tests/CMakeLists.txt

@@ -1,3 +1,5 @@
+fetch_package(Catch2 https://github.com/catchorg/Catch2.git devel)
+
 message(STATUS "Generating tests")
 
 get_filename_component(TESTS_PATH "." ABSOLUTE)

tests/lex/cases.cpp

@@ -92,6 +92,19 @@ TEST_CASE("Statement", "[lex]") {
 
 //////////////////////////////////////////////////////////////////////
 
+TEST_CASE("Bit operations", "[lex]") {
+  std::stringstream source("~ ^ & |");
+  lex::Lexer l{source};
+
+  CHECK(l.Matches(lex::TokenType::TILDE));
+  CHECK(l.Matches(lex::TokenType::BIT_XOR));
+  CHECK(l.Matches(lex::TokenType::ADDR));
+  CHECK(l.Matches(lex::TokenType::BIT_OR));
+  CHECK(l.Matches(lex::TokenType::TOKEN_EOF));
+}
+
+//////////////////////////////////////////////////////////////////////
+
 TEST_CASE("String literal", "[lex]") {
   std::stringstream source("\"Hello world\"");
   lex::Lexer l{source};