refactor amas parser

src/CMakeLists.txt

@@ -8,11 +8,10 @@ project(adt2amas_exec C CXX)
 add_subdirectory(linear_expression)
 add_subdirectory(adtree)
 add_subdirectory(amas)
-add_subdirectory(parsers)
 
 # translator library
 add_library(adt2amas_lib translator.cpp)
-target_link_libraries(adt2amas_lib adtree_lib amas_lib linear_expr_lib parser_lib)
+target_link_libraries(adt2amas_lib adtree_lib amas_lib linear_expr_lib )
 target_include_directories(adt2amas_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # The main programn

src/amas/CMakeLists.txt

 # Specify the minimum version for CMake
 cmake_minimum_required(VERSION 3.0.0)
 
+# Linear Expression Library
+set(PARSER_FILES
+  ${CMAKE_CURRENT_LIST_DIR}/parser/amas_visitor.hpp
+  ${CMAKE_CURRENT_LIST_DIR}/parser/tikz_visitor.cpp)
+
+
+
 # Asynchronous Multi-Agent System Library
 add_library(
   amas_lib
@@ -14,9 +21,10 @@ add_library(
   state.cpp
   state_type.cpp
   automata.cpp
-  automaton.cpp)
+  automaton.cpp
+  ${PARSER_FILES})
 
 
-target_link_libraries(amas_lib linear_expr_lib parser_lib)
+target_link_libraries(amas_lib linear_expr_lib)
 
 target_include_directories(amas_lib PUBLIC ${CMAKE_CURRENT_LIST_DIR})

src/amas/automata.hpp

 #ifndef AUTOMATA_HPP
 #define AUTOMATA_HPP
 
-#include "amas_visitor.hpp"
 #include "automaton.hpp"
 #include "channel.hpp"
+#include "parser/amas_visitor.hpp"
 
 class Automaton;
 class AMASVisitor;

src/amas/automaton.hpp

@@ -4,7 +4,7 @@
 #include <set>
 #include <vector>
 #include "action.hpp"
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state.hpp"
 #include "transition.hpp"
 #include "update.hpp"

src/amas/label.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "action.hpp"
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 
 class AMASVisitor;
 

src/amas/state.hpp

@@ -2,7 +2,7 @@
 #define STATE_HPP
 
 #include <string>
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state_type.hpp"
 #include "transition.hpp"
 

src/amas/synchronization.hpp

@@ -2,8 +2,8 @@
 #define SYNCHRONIZATION_HPP
 
 #include "action.hpp"
-#include "amas_visitor.hpp"
 #include "channel.hpp"
+#include "parser/amas_visitor.hpp"
 #include "synchronization_type.hpp"
 
 class AMASVisitor;

src/amas/transition.hpp

@@ -2,8 +2,8 @@
 #define TRANSITION_HPP
 
 #include <bits/stdc++.h>
-#include "amas_visitor.hpp"
 #include "label.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state.hpp"
 #include "synchronization.hpp"
 #include "update.hpp"

src/amas/update.hpp

@@ -2,8 +2,8 @@
 #define UPDATE_HPP
 
 #include <string>
-#include "amas_visitor.hpp"
 #include "linear_expression.hpp"
+#include "parser/amas_visitor.hpp"
 
 class AMASVisitor;
 

src/parsers/CMakeLists.txt

-# Specify the minimum version for CMake
-cmake_minimum_required(VERSION 3.0.0)
-
-add_library(parser_lib
-  amas_visitor.hpp
-  tikz_visitor.cpp)
-
-
-target_link_libraries(parser_lib amas_lib)
-target_include_directories(parser_lib PUBLIC ${CMAKE_CURRENT_LIST_DIR})

tests/case_studies/treasure_hunters.cpp

@@ -2,8 +2,8 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include "amas/parser/tikz_visitor.hpp"
 #include "factory.cpp"
-#include "parsers/tikz_visitor.hpp"
 #include "translator.hpp"
 
 using namespace std;