feat(ast): add String and return values

Co-authored-by: Samyak S Sarnayak <[email protected]>
ishwar00 · Nov 11, 2023 · a5953e6 · a5953e6
1 parent b4a46b4
commit a5953e6
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/compiler/src/ast/mod.rs b/compiler/src/ast/mod.rs
@@ -368,6 +368,10 @@ pub enum Expr<'i> {
         value: f64, // TODO: other float types?
         span: Span<'i>,
     },
+    String {
+        value: String,
+        span: Span<'i>,
+    },
     FunctionCall {
         function: Box<Expr<'i>>,
         args: Args<'i>,
@@ -399,6 +403,15 @@ impl<'i> Node<'i> for Expr<'i> {
                 value: pair.as_str().parse().unwrap(),
                 span: pair.as_span(),
             }),
+            Rule::RawStringLit => Ok(Expr::String {
+                value: pair.as_str().trim_matches('`').to_owned(),
+                span: pair.as_span(),
+            }),
+            Rule::InterpretedStringLit => Ok(Expr::String {
+                // TODO: parse escape characters
+                value: pair.as_str().trim_matches('"').to_owned(),
+                span: pair.as_span(),
+            }),
             Rule::TupleExpr => {
                 let expr_list = pair
                     .into_inner()
@@ -457,6 +470,8 @@ impl<'i> Expr<'i> {
                 Rule::FloatLit
                 | Rule::IntLit
                 | Rule::Ident
+                | Rule::InterpretedStringLit
+                | Rule::RawStringLit
                 | Rule::FunctionCall
                 | Rule::TupleExpr => Expr::parse(primary),
                 invalid_rule => Err(BakugoParsingError::new(
@@ -567,7 +582,7 @@ impl<'i> Expr<'i> {
 
 #[derive(Debug)]
 pub enum Statement<'i> {
-    Return, // TODO: add expression list
+    Return(Option<Vec<Expr<'i>>>),
     Declaration(Decl<'i>),
     Expression(Expr<'i>),
 }
@@ -712,7 +727,20 @@ impl<'i> Node<'i> for StatementList<'i> {
                             parsed_stmts.push(Statement::Expression(expr))
                         }
 
-                        Rule::ReturnStmt => parsed_stmts.push(Statement::Return),
+                        Rule::ReturnStmt => {
+                            let expr_list = pair
+                                .into_inner()
+                                .next()
+                                .unwrap()
+                                .into_inner()
+                                .map(Expr::parse)
+                                .collect::<Result<Vec<_>, _>>()?;
+                            parsed_stmts.push(Statement::Return(if expr_list.is_empty() {
+                                None
+                            } else {
+                                Some(expr_list)
+                            }))
+                        }
 
                         Rule::Semicolon => {}
 

diff --git a/compiler/src/bakugo.pest b/compiler/src/bakugo.pest
@@ -64,7 +64,7 @@ BigUValue      = @{ "\\" ~ "U" ~ HexDigit{8} }
 EscapedChar    = @{ "\\" ~ ("a" | "b" | "f" | "n" | "r" | "t" | "v" | "\\" | "'" | "\"") }
 
 /// string literals
-StringLit = { RawStringLit | InterpretedStringLit }
+StringLit = _{ RawStringLit | InterpretedStringLit }
 // `UnicodeChar | NewLine` is equivalent to `ANY``
 RawStringLit         = @{ "`" ~ (!"`" ~ ANY)* ~ "`" }
 InterpretedStringLit = @{ "\"" ~ (!"\"" ~ (ByteValue | UnicodeValue))* ~ "\"" }

diff --git a/compiler/tests/examples/11_return_value.bakugo b/compiler/tests/examples/11_return_value.bakugo
@@ -0,0 +1,15 @@
+func main() {
+	return 34;
+	return (34, "hey", 4.5,);
+};
+
+
+func primary() {
+	return func_call(
+		`hi
+		there	`, 
+		45, 
+		(4, 2),
+		"hey"
+	);
+};