Transforming the parse tree into an Abstract Syntax Tree

.vscode/settings.json

@@ -0,0 +1,68 @@
+{
+  "files.associations": {
+    "*.tcc": "cpp",
+    "optional": "cpp",
+    "system_error": "cpp",
+    "array": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "string": "cpp",
+    "unordered_map": "cpp",
+    "vector": "cpp",
+    "string_view": "cpp",
+    "initializer_list": "cpp",
+    "any": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "codecvt": "cpp",
+    "compare": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "map": "cpp",
+    "set": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "future": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numbers": "cpp",
+    "ostream": "cpp",
+    "semaphore": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "stop_token": "cpp",
+    "streambuf": "cpp",
+    "thread": "cpp",
+    "cinttypes": "cpp",
+    "typeinfo": "cpp",
+    "variant": "cpp"
+  }
+}

CMakeLists.txt

@@ -4,11 +4,11 @@ project( networkprotocoldsl CXX )
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# # Enable ThreadSanitizer for Debug builds
+# # Enable sanitizers for Debug builds
 if(CMAKE_BUILD_TYPE MATCHES Debug)
- message(STATUS "Enabling ThreadSanitizer")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
- set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=thread")
+ message(STATUS "Enabling Sanitizers")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined")
+ set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=address -fsanitize=undefined")
 endif()
 
 include(FetchContent)
@@ -162,6 +162,29 @@ add_library(
     src/networkprotocoldsl/parser/tree/typeparametermap.hpp
     src/networkprotocoldsl/parser/tree/typeparametervalue.cpp
     src/networkprotocoldsl/parser/tree/typeparametervalue.hpp
+    src/networkprotocoldsl/sema/analyze.cpp
+    src/networkprotocoldsl/sema/analyze.hpp
+    src/networkprotocoldsl/sema/partstoreadactions.cpp
+    src/networkprotocoldsl/sema/partstoreadactions.hpp
+    src/networkprotocoldsl/sema/partstowriteactions.cpp
+    src/networkprotocoldsl/sema/partstowriteactions.hpp
+    src/networkprotocoldsl/sema/support.cpp
+    src/networkprotocoldsl/sema/support.hpp
+    src/networkprotocoldsl/sema/ast/action.cpp
+    src/networkprotocoldsl/sema/ast/action.hpp
+    src/networkprotocoldsl/sema/ast/action/loop.cpp
+    src/networkprotocoldsl/sema/ast/action/loop.hpp
+    src/networkprotocoldsl/sema/ast/action/read.cpp
+    src/networkprotocoldsl/sema/ast/action/read.hpp
+    src/networkprotocoldsl/sema/ast/action/write.cpp
+    src/networkprotocoldsl/sema/ast/action/write.hpp
+    src/networkprotocoldsl/sema/ast/agent.cpp
+    src/networkprotocoldsl/sema/ast/agent.hpp
+    src/networkprotocoldsl/sema/ast/protocol.hpp
+    src/networkprotocoldsl/sema/ast/state.cpp
+    src/networkprotocoldsl/sema/ast/state.hpp
+    src/networkprotocoldsl/sema/ast/transition.cpp
+    src/networkprotocoldsl/sema/ast/transition.hpp
     src/networkprotocoldsl/support/mutexlockqueue.cpp
     src/networkprotocoldsl/support/mutexlockqueue.hpp
     src/networkprotocoldsl/support/notificationsignal.cpp

src/networkprotocoldsl/parser/grammar/traits.hpp

@@ -50,16 +50,32 @@ using NodeVariant =
 
 using TokenIterator = std::vector<lexer::Token>::const_iterator;
 
+// Trait to check for the presence of the stringify method
+template <typename T, typename = void>
+struct has_stringify : std::false_type {};
+
+template <typename T>
+struct has_stringify<T, std::void_t<decltype(std::declval<T>().stringify())>>
+    : std::true_type {};
+
+// Placeholder value
+constexpr const char *placeholder = "<no stringify>";
+
 static int indent_level(int modify) {
   static int indent = 0;
   indent += modify;
-  for (int i = 0; i < indent; ++i) {
-    std::cerr << ' ';
-  }
-  std::cerr << '(' << indent << ") ";
   return indent;
 }
 
+static std::string indent_str() {
+  std::stringstream r;
+  for (int i = 0; i < indent_level(0); ++i) {
+    r << ' ';
+  }
+  r << "(" << indent_level(0) << ")";
+  return r.str();
+}
+
 static bool trace_enabled() {
   static bool r = getenv("GRAMMAR_TRACER") != nullptr;
   return r;
@@ -69,12 +85,23 @@ static bool trace_enabled() {
 
 template <typename ParserContext> class Tracer {
 public:
-  static void output_tokens(const TokenIterator begin,
-                            const TokenIterator end) {
+  using TokenIterator = ParserContext::TokenIterator;
+  static void output_tokens(TokenIterator begin, TokenIterator end) {
     int max = 10;
+    std::cerr << " (" << &begin << "-" << &end << ") ";
+    std::cerr << " [" << std::distance(begin, end) << "]:";
     TokenIterator b = begin;
     while (max > 0 && b != end) {
-      std::cerr << " " << std::visit([&](auto t) { return t.stringify(); }, *b);
+      std::cerr << " "
+                << std::visit(
+                       [&](auto t) {
+                         if constexpr (has_stringify<decltype(t)>::value) {
+                           return t.stringify();
+                         } else {
+                           return placeholder;
+                         }
+                       },
+                       *b);
       b++;
       max--;
     }
@@ -83,37 +110,39 @@ template <typename ParserContext> class Tracer {
     }
   }
 
-  using TokenIterator = ParserContext::TokenIterator;
   template <typename... Args>
-  static void trace_start(const char *attempt_type, const TokenIterator &begin,
-                          const TokenIterator &end, Args... args) {
+  static void trace_start(const char *attempt_type, TokenIterator begin,
+                          TokenIterator end, Args... args) {
     if (!trace_enabled())
       return;
-    indent_level(1);
-    std::cerr << "> " << attempt_type << " " << ParserContext::name << " ("
-              << sizeof...(args) << "):";
+    std::cerr << indent_str() << "> " << attempt_type << " "
+              << ParserContext::name << " (" << sizeof...(args) << "):";
     output_tokens(begin, end);
-    std::cerr << std::endl;
+    std::cerr << std::endl << std::flush;
+    indent_level(1);
   }
   template <typename... Args>
-  static void trace_success(const TokenIterator &begin,
-                            const TokenIterator &end, Args... args) {
+  static void trace_success(const char *attempt_type, TokenIterator begin,
+                            TokenIterator end, Args... args) {
     if (!trace_enabled())
       return;
     indent_level(-1);
-    std::cerr << "< " << ParserContext::name << " [SUCCESS]";
+    std::cerr << indent_str() << "< " << attempt_type << " "
+              << ParserContext::name << " [SUCCESS]";
     output_tokens(begin, end);
-    std::cerr << std::endl;
+    std::cerr << std::endl << std::flush;
+    ;
   }
   template <typename... Args>
-  static void trace_fail(const TokenIterator &begin, const TokenIterator &end,
-                         Args... args) {
+  static void trace_fail(const char *attempt_type, TokenIterator begin,
+                         TokenIterator end, Args... args) {
     if (!trace_enabled())
       return;
     indent_level(-1);
-    std::cerr << "< " << ParserContext::name << " [FAIL]";
+    std::cerr << indent_str() << "< " << attempt_type << " "
+              << ParserContext::name << " [FAIL]";
     output_tokens(begin, end);
-    std::cerr << std::endl;
+    std::cerr << std::endl << std::flush;
   }
 };