Add topic macro

profi248 · Jun 7, 2022 · 4ec9d17 · 4ec9d17
1 parent 4c4ac55
commit 4ec9d17
Show file tree

Hide file tree

Showing 7 changed files with 296 additions and 69 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -1,17 +1,13 @@
 name: Build coordinator Dockerfile
-
 on:
   push:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
     - name: Build the Docker image

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     depends_on:
       - postgres
       - mosquitto
+    restart: always
   postgres:
     image: postgres
     restart: always

diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -10,4 +10,7 @@ proc-macro = true
 
 [dependencies]
 syn = "1.0.95"
-quote = "1.0.18"
+quote = "1.0.18"
+proc-macro2 = "1.0.39"
+regex = "1.5.6"
+lazy_static = "1.4.0"
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
@@ -1,4 +1,7 @@
 extern crate proc_macro;
+
+mod topics;
+
 use proc_macro::TokenStream;
 
 use syn::{ parse_macro_input, LitStr };
@@ -23,4 +26,11 @@ pub fn wordlist(tokens: TokenStream) -> TokenStream {
             #(#words),*
         ]
     }).into()
-}
+}
+
+#[proc_macro]
+pub fn define_topics(tokens: TokenStream) -> TokenStream {
+    let topics = parse_macro_input!(tokens as topics::RootTopic);
+
+    topics::expand_root(topics).into()
+}