update parser

enterprise-macros/src/ast.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 #[derive(Debug)]
 pub enum Toplevel {
     Use(Use),
@@ -10,11 +12,23 @@ pub struct Use(pub Vec<String>);
 #[derive(Debug)]
 pub struct Component {
     pub name: String,
+    pub body: Vec<ComponentBody>,
 }
 
 #[derive(Debug)]
 pub enum ComponentBody {
     Constructor(),
-    View(),
+    View(Rsx),
     Fn(),
 }
+
+#[derive(Debug)]
+pub enum Rsx {
+    Tag {
+        tag: String,
+        attrs: HashMap<String, String>,
+        inner: Vec<Rsx>,
+    },
+    CodeSegment(String),
+    Text(String),
+}

enterprise-macros/src/parser.lalrpop

@@ -1,4 +1,5 @@
 use std::iter::FromIterator;
+use std::collections::HashMap;
 
 use proc_macro2::{Ident, Punct, TokenTree, Delimiter, TokenStream, Group, Spacing, Literal};
 
@@ -22,6 +23,7 @@ Component: Component = {
     "component" <name:Ident> <body:Body<ComponentBody*>> => {
         Component {
             name: name.to_string(),
+            body,
         }
     }
 };
@@ -30,8 +32,8 @@ ComponentBody: ComponentBody = {
     "constructor" "(" ")" BraceGrouper => {
         ComponentBody::Constructor()
     },
-    "view" BraceGrouper => {
+    "view" <rsx:Body<Rsx>> => {
-        ComponentBody::View()
+        ComponentBody::View(rsx)
     },
     "fn" Ident "(" Delim<Arg, ","> ")" BraceGrouper => {
         ComponentBody::Fn()
@@ -44,6 +46,29 @@ Arg: () = {
     Ident ":" Ident => {},
 };
 
+Rsx: Rsx = {
+    "<" <tag:Ident> <attrs:Attrs> "/" ">" => { Rsx::Tag { tag: tag.to_string(), attrs, inner: Vec::new(), } },
+    "<" <tag:Ident> <attrs:Attrs> ">" <inner:Rsx*> "<" "/" <closeTag:Ident> ">" => {
+        assert_eq!(tag, closeTag, "Tags {} and {} do not match.", tag, closeTag);
+        Rsx::Tag { tag: tag.to_string(), attrs, inner }
+    },
+    BraceGrouper => { Rsx::CodeSegment(<>.to_string()) },
+    AnyText => { Rsx::Text(<>) },
+};
+
+Attrs: HashMap<String, String> = {
+    (AttrLhs "=" BraceGrouper)* => {
+        <>.into_iter()
+            .map(|(lhs, _, rhs)| (lhs.to_string(), rhs.to_string()))
+            .collect()
+    }
+};
+
+AttrLhs: String = {
+    <a:Ident> ":" <b:Ident> => format!("{}:{}", a, b),
+    Ident => <>.to_string(),
+};
+
 //
 
 pub ArbitraryBlocks: Vec<TokenTree> = AnyToken*;
@@ -58,6 +83,12 @@ BraceGrouper: TokenTree = {
     "{" <b:AnyToken*> "}" => TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::from_iter(b.into_iter()))),
 };
 
+AnyText: String = {
+    Ident => <>.to_string(),
+    Punct => <>.to_string(),
+    Literal => <>.to_string(),
+};
+
 AnyToken: TokenTree = {
     Grouper => <>,
 
@@ -70,6 +101,10 @@ AnyToken: TokenTree = {
     ":" => TokenTree::Punct(Punct::new(':', Spacing::Alone)),
     ";" => TokenTree::Punct(Punct::new(';', Spacing::Alone)),
     "," => TokenTree::Punct(Punct::new(',', Spacing::Alone)),
+    "<" => TokenTree::Punct(Punct::new('<', Spacing::Alone)),
+    ">" => TokenTree::Punct(Punct::new('>', Spacing::Alone)),
+    "/" => TokenTree::Punct(Punct::new('/', Spacing::Alone)),
+    "=" => TokenTree::Punct(Punct::new('=', Spacing::Alone)),
 
     Ident => TokenTree::Ident(<>),
     Punct => TokenTree::Punct(<>),
@@ -115,6 +150,10 @@ extern {
         ")" => TokenType::Punct(')', _),
         "[" => TokenType::Punct('[', _),
         "]" => TokenType::Punct(']', _),
+        "<" => TokenType::Punct('<', _),
+        ">" => TokenType::Punct('>', _),
+        "/" => TokenType::Punct('/', _),
+        "=" => TokenType::Punct('=', _),
 
         Punct => TokenType::Punct(_, <Punct>),
         Ident => TokenType::Ident(<Ident>),