Merge branch 'master' into refactor/seperate_code_gen

Author: Chronostasys

src/ast/node/ret.rs

@@ -34,6 +34,7 @@ impl Node for RetNode {
                 return Err(err);
             }
             let (ret, tp, _) = ret.emit(ctx, builder)?;
+            ctx.emit_comment_highlight(&self.comments[0]);
             let (ret, v) = ctx.try_load2var(self.range, ret.unwrap(), tp.unwrap(), builder)?;
             if v != rettp.unwrap() {
                 let err = ctx.add_err(self.range, ErrorCode::RETURN_TYPE_MISMATCH);
@@ -44,7 +45,7 @@ impl Node for RetNode {
             builder.build_unconditional_branch(ctx.return_block.unwrap().0);
         } else {
             if rettp.is_some() && &*rettp.clone().unwrap().borrow() != &PLType::VOID {
-                let _s = format!("return type is {:?}", &*rettp.unwrap().borrow());
+                ctx.emit_comment_highlight(&self.comments[0]);
                 let err = ctx.add_err(self.range, ErrorCode::NO_RETURN_VALUE_IN_NON_VOID_FUNCTION);
                 return Err(err);
             }

src/nomparser/comment.rs

@@ -1,8 +1,8 @@
 use nom::{
     branch::alt,
     bytes::complete::{tag, take_until},
-    combinator::map_res,
-    sequence::delimited,
+    combinator::{map_res, rest},
+    sequence::{pair, terminated},
     IResult, InputTake,
 };
 use nom_locate::LocatedSpan;
@@ -12,32 +12,20 @@ use crate::{ast::node::comment::CommentNode, ast::range::Range};
 use super::*;
 
 pub fn comment(input: Span) -> IResult<Span, Box<NodeEnum>> {
-    alt((
-        map_res(
-            delimited(tag("///"), take_until("\n"), tag("\n")),
-            |c: LocatedSpan<&str>| {
-                res_enum(
-                    CommentNode {
-                        comment: c.to_string(),
-                        range: Range::new(input, c.take_split(c.len()).0),
-                        is_doc: true,
-                    }
-                    .into(),
-                )
-            },
+    map_res(
+        pair(
+            alt((tag("///"), tag("//"))),
+            alt((terminated(take_until("\n"), tag("\n")), rest)),
         ),
-        map_res(
-            delimited(tag("//"), take_until("\n"), tag("\n")),
-            |c: LocatedSpan<&str>| {
-                res_enum(
-                    CommentNode {
-                        comment: c.to_string(),
-                        range: Range::new(input, c.take_split(c.len()).0),
-                        is_doc: false,
-                    }
-                    .into(),
-                )
-            },
-        ),
-    ))(input)
+        |(a, c): (LocatedSpan<&str>, LocatedSpan<&str>)| {
+            res_enum(
+                CommentNode {
+                    comment: c.to_string(),
+                    range: Range::new(input, c.take_split(c.len()).0),
+                    is_doc: a.contains("///"),
+                }
+                .into(),
+            )
+        },
+    )(input)
 }

test/main.pi

@@ -425,4 +425,5 @@ fn test_primitives() void {
     utest = utest + 2;
     return;
 }
-
+//123
+//