gcc/rust/ChangeLog:

* ast/rust-ast-collector.cc (TokenCollector::visit): * ast/rust-ast.h: * lex/rust-token.cc (Token::as_string): * lex/rust-token.h (enum PrimitiveCoreType): * parse/rust-parse-impl.h (Parser::parse_inner_attribute): (Parser::parse_outer_attribute): Signed-off-by: lucas.plantrose <[email protected]>
Rust-GCC · Oct 17, 2024 · fe3f733 · fe3f733
1 parent 0b18bae
commit fe3f733
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc
@@ -141,6 +141,20 @@ TokenCollector::visit (VariadicParam &param)
 void
 TokenCollector::visit (Attribute &attrib)
 {
+  if (attrib.is_from_comment() && attrib.has_attr_input())
+  {
+      if (attrib.is_inner_attribute())
+          push(Rust::Token::make (INNER_DOC_COMMENT, attrib.get_locus ()));
+      else
+          push(Rust::Token::make (OUTER_DOC_COMMENT, attrib.get_locus ()));
+      auto lit = (static_cast<AttrInputLiteral &> (attrib.get_attr_input ())).get_literal().get_literal();
+      push(Rust::Token::make_doc_string_literal(attrib.get_locus (), lit.as_string ()));
+      push(Rust::Token::make (DOC_COMMENT_END, attrib.get_locus ()));
+      return;
+  }
+  else
+  {
+
   push (Rust::Token::make (HASH, attrib.get_locus ()));
   if (attrib.is_inner_attribute ())
     push (Rust::Token::make (EXCLAM, UNDEF_LOCATION));
@@ -173,6 +187,7 @@ TokenCollector::visit (Attribute &attrib)
 	}
     }
   push (Rust::Token::make (RIGHT_SQUARE, UNDEF_LOCATION));
+  }
 }
 
 void

diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h
@@ -636,6 +636,9 @@ struct Attribute
 
   bool inner_attribute;
 
+  // Only relevant in case of a doc attribute
+  bool from_comment;
+
   // TODO: maybe a variable storing whether attr input is parsed or not
 
 public:
@@ -644,9 +647,10 @@ struct Attribute
 
   // Constructor has pointer AttrInput for polymorphism reasons
   Attribute (SimplePath path, std::unique_ptr<AttrInput> input,
-	     location_t locus = UNDEF_LOCATION, bool inner_attribute = false)
+	     location_t locus = UNDEF_LOCATION, bool inner_attribute = false,
+             bool from_comment = false)
     : path (std::move (path)), attr_input (std::move (input)), locus (locus),
-      inner_attribute (inner_attribute)
+      inner_attribute (inner_attribute), from_comment (from_comment)
   {}
 
   bool is_derive () const;
@@ -681,6 +685,8 @@ struct Attribute
   // Returns whether the attribute is considered an "empty" attribute.
   bool is_empty () const { return attr_input == nullptr && path.is_empty (); }
 
+  bool is_from_comment () { return from_comment; }
+
   location_t get_locus () const { return locus; }
 
   AttrInput &get_attr_input () const { return *attr_input; }

diff --git a/gcc/rust/lex/rust-token.cc b/gcc/rust/lex/rust-token.cc
@@ -268,6 +268,8 @@ Token::as_string () const
 	    return get_str ();
 	  else
 	    return get_str () + get_type_hint_str ();
+        case DOC_STRING_LITERAL:
+          return escape_special_chars(*std::move (str), Context::String);
 	default:
 	  return get_str ();
 	}

diff --git a/gcc/rust/lex/rust-token.h b/gcc/rust/lex/rust-token.h
@@ -144,8 +144,10 @@ enum PrimitiveCoreType
   /* Macros */                                                                 \
   RS_TOKEN (DOLLAR_SIGN, "$")                                                  \
   /* Doc Comments */                                                           \
-  RS_TOKEN (INNER_DOC_COMMENT, "#![doc]")                                      \
-  RS_TOKEN (OUTER_DOC_COMMENT, "#[doc]")                                       \
+  RS_TOKEN (INNER_DOC_COMMENT, "/**!")                                         \
+  RS_TOKEN (OUTER_DOC_COMMENT, "/**")                                          \
+  RS_TOKEN (DOC_COMMENT_END, "*/")                                             \
+  RS_TOKEN (DOC_STRING_LITERAL, "string")                                      \
   RS_TOKEN_KEYWORD_2015 (ABSTRACT, "abstract") /* unused */                    \
   RS_TOKEN_KEYWORD_2015 (AS, "as")                                             \
   RS_TOKEN_KEYWORD_2018 (ASYNC, "async") /* unused */                          \
@@ -396,6 +398,11 @@ class Token
     return TokenPtr (new Token (OUTER_DOC_COMMENT, locus, std::move (str)));
   }
 
+  static TokenPtr make_doc_string_literal (location_t locus, std::string &&str)
+  {
+    return TokenPtr (new Token (DOC_STRING_LITERAL, locus, std::move (str)));
+  }
+
   // Makes and returns a new TokenPtr of type LIFETIME.
   static TokenPtr make_lifetime (location_t locus, std::string &&str)
   {
@@ -458,6 +465,7 @@ return *str;
       case BYTE_CHAR_LITERAL:
       case BYTE_STRING_LITERAL:
       case RAW_STRING_LITERAL:
+      case DOC_STRING_LITERAL:
 	return true;
       default:
 	return false;

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
@@ -523,7 +523,8 @@ Parser<ManagedTokenSource>::parse_inner_attribute ()
       auto path = std::move (std::get<0> (values));
       auto input = std::move (std::get<1> (values));
       auto loc = std::get<2> (values);
-      return AST::Attribute (std::move (path), std::move (input), loc, true);
+      return AST::Attribute (std::move (path), std::move (input), loc, true,
+                             true);
     }
 
   if (lexer.peek_token ()->get_id () != HASH)
@@ -1242,7 +1243,8 @@ Parser<ManagedTokenSource>::parse_outer_attribute ()
       auto path = std::move (std::get<0> (values));
       auto input = std::move (std::get<1> (values));
       auto loc = std::get<2> (values);
-      return AST::Attribute (std::move (path), std::move (input), loc, false);
+      return AST::Attribute (std::move (path), std::move (input), loc, false,
+              true);
     }
 
   if (lexer.peek_token ()->get_id () == INNER_DOC_COMMENT)