From: Philip Herron <philip.herron@embecosm.com>
To: Mark Wielaard <mark@klomp.org>
Cc: gcc-rust@gcc.gnu.org
Subject: Re: [PATCH] Handle doc comment strings in lexer and parser
Date: Mon, 12 Jul 2021 11:06:01 +0100 [thread overview]
Message-ID: <b21c6fe1-4e83-0796-9506-81d39faf0606@embecosm.com> (raw)
In-Reply-To: <YOv+MTNzHnHWZdb3@wildebeest.org>
[-- Attachment #1.1: Type: text/plain, Size: 3901 bytes --]
On 12/07/2021 09:32, Mark Wielaard wrote:
> Hi Philip,
>
> On Mon, Jul 12, 2021 at 09:09:09AM +0100, Philip Herron wrote:
>> This patch looks good to me. When I tried to apply it to merge it I got
>> the following:
>>
>> ```
>> $ git am '[PATCH] Handle doc comment strings in lexer and parser.eml'
>> Applying: Handle doc comment strings in lexer and parser
>> error: corrupt patch at line 531
>> Patch failed at 0001 Handle doc comment strings in lexer and parser
>> hint: Use 'git am --show-current-patch' to see the failed patch
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>> ```
>>
>> Not sure if I have done something wrong, have you any pointers?
> Looks like that is one of the IsolatedCR tests (a bare \r not at the
> end of a line followed by \n in a doc comment string). I assume some
> mailer ate it and/or added a \n somehwere to "correct" it.
>
> Would you be able to pull directly from my git repo?
>
> The following changes since commit 4560f469ee33536cec6af0f8e5816ff97de60de0:
>
> Merge #551 (2021-07-10 21:02:06 +0000)
>
> are available in the Git repository at:
>
> https://code.wildebeest.org/git/user/mjw/gccrs doc-comments
>
> for you to fetch changes up to e1e14958a90397a1ed6ab7236dc5a6f1c2f22505:
>
> Handle doc comment strings in lexer and parser (2021-07-11 21:09:21 +0200)
>
> ----------------------------------------------------------------
> Mark Wielaard (1):
> Handle doc comment strings in lexer and parser
>
> gcc/rust/ast/rust-ast.h | 2 +
> gcc/rust/lex/rust-lex.cc | 214 +++++++++++++++++++--
> gcc/rust/lex/rust-token.h | 25 ++-
> gcc/rust/parse/rust-parse-impl.h | 60 +++++-
> gcc/rust/parse/rust-parse.h | 1 +
> gcc/testsuite/rust/compile/bad_inner_doc.rs | 15 ++
> .../rust/compile/doc_isolated_cr_block_comment.rs | 3 +
> .../compile/doc_isolated_cr_inner_block_comment.rs | 5 +
> .../compile/doc_isolated_cr_inner_line_comment.rs | 5 +
> .../rust/compile/doc_isolated_cr_line_comment.rs | 3 +
> .../compile/torture/all_doc_comment_line_blocks.rs | 47 +++++
> .../torture/all_doc_comment_line_blocks_crlf.rs | 47 +++++
> .../compile/torture/isolated_cr_block_comment.rs | 2 +
> .../compile/torture/isolated_cr_line_comment.rs | 2 +
> 14 files changed, 401 insertions(+), 30 deletions(-)
> create mode 100644 gcc/testsuite/rust/compile/bad_inner_doc.rs
> create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_block_comment.rs
> create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_inner_block_comment.rs
> create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_inner_line_comment.rs
> create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_line_comment.rs
> create mode 100644 gcc/testsuite/rust/compile/torture/all_doc_comment_line_blocks.rs
> create mode 100644 gcc/testsuite/rust/compile/torture/all_doc_comment_line_blocks_crlf.rs
> create mode 100644 gcc/testsuite/rust/compile/torture/isolated_cr_block_comment.rs
> create mode 100644 gcc/testsuite/rust/compile/torture/isolated_cr_line_comment.rs
>
Thanks Mark that worked its up now:
https://github.com/Rust-GCC/gccrs/pull/561
Great work once again. I am aiming to spend some time towards the end of
the week to add more tickets and info for new contributors to get
involved, which I will post the interesting ones onto the mailing list
as well. I think it should be interesting to contributors of all levels.
The main one that sticks out in my mind is the AST, HIR dumps which are
a bit of a mess at the moment.
Thanks
--Phil
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]
next prev parent reply other threads:[~2021-07-12 10:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 20:10 Mark Wielaard
2021-07-12 8:09 ` Philip Herron
2021-07-12 8:32 ` Mark Wielaard
2021-07-12 10:06 ` Philip Herron [this message]
2021-07-12 22:44 ` New contributor tasks Mark Wielaard
2021-07-13 13:16 ` Philip Herron
[not found] ` <CADYxmzTdEH2pHba1+1nq5AXEQAyb6UhT8xvRKdWB7bu41ex1UA@mail.gmail.com>
2021-07-17 14:25 ` Fwd: " The Other
2021-07-17 21:23 ` Mark Wielaard
2021-07-18 20:45 ` Mark Wielaard
2021-07-13 13:30 ` Thomas Schwinge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b21c6fe1-4e83-0796-9506-81d39faf0606@embecosm.com \
--to=philip.herron@embecosm.com \
--cc=gcc-rust@gcc.gnu.org \
--cc=mark@klomp.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).