Skip to content

Conversation

@JimLaskey
Copy link
Member

@JimLaskey JimLaskey commented Mar 31, 2023

Previous work had cleaned up the JavacTokenizer, but left JavadocTokenizer alone, mostly due to its perplexing state. This is follow up work to simplify the JavadocTokenizer.

Redo changes:

  1. Needed to check for end of data after @deprecated
  2. Position of newline in offset map was incorrect (out by one).
  3. Skip whitespace after first line (put offsets out by one).

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13265/head:pull/13265
$ git checkout pull/13265

Update a local copy of the PR:
$ git checkout pull/13265
$ git pull https://git.openjdk.org/jdk.git pull/13265/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13265

View PR using the GUI difftool:
$ git pr show -t 13265

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13265.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2023

👋 Welcome back jlaskey! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@JimLaskey
Copy link
Member Author

Original PR #12953

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 31, 2023
@openjdk
Copy link

openjdk bot commented Mar 31, 2023

@JimLaskey The following label will be automatically applied to this pull request:

  • compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the compiler compiler-dev@openjdk.org label Mar 31, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 31, 2023

Webrevs

Comment on lines +1351 to +1357
if (line.accept("@deprecated") &&
(!line.isAvailable() ||
line.isWhitespace() ||
line.isEOLN() ||
line.get() == EOI)) {
deprecatedFlag = true;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned recently elsewhere, this is generally insufficient, albeit no worse than before.
Generally, we should move away from this code, and eliminate deprecated Flag entirely. Deprecation is (or should be) indicated by the @Deprecated annotation, with associated documentation given by a plain/regular @deprecated tag, as read by DocCommentParser or equivalent.

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@openjdk
Copy link

openjdk bot commented Mar 31, 2023

@JimLaskey This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8305100: [REDO] Clean up JavadocTokenizer

Reviewed-by: jjg

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 48 new commits pushed to the master branch:

  • abfb900: 8304028: Port fdlibm IEEEremainder to Java
  • a565be4: 8297605: improve DelayQueue removal method javadoc
  • cccb019: 8304928: Optimize ClassDesc.resolveConstantDesc
  • bdbf8fc: 8303930: Fix ConstantUtils.skipOverFieldSignature void case return value
  • 4a5d7ca: 8305227: [s390x] build broken after JDK-8231349
  • dae1ab3: 8304844: JFR: Missing disk parameter in ActiveRecording event
  • e012685: 8305066: [JVMCI] guarantee(ik->is_initialized()) failed: java/lang/Long$LongCache must be initialized
  • fe42312: 8304820: Statically allocate ObjectSynchronizer mutexes
  • 2f36eb0: 8305323: Update java/net/httpclient/ContentLengthHeaderTest.java to use new HttpTestServer factory methods
  • 049b953: 8305223: IGV: mark osr compiled graphs with [OSR] in the name
  • ... and 38 more: https://git.openjdk.org/jdk/compare/50a995f03a0cc5c342929a0f48c43fd04fdf0b0d...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 31, 2023
@JimLaskey
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 3, 2023

Going to push as commit 790aced.
Since your change was applied there have been 59 commits pushed to the master branch:

  • 2e91585: 8303123: Add line break opportunity to single type parameters
  • 094e03d: 8299718: JavaDoc: Buttons to copy specific documentation URL are not accessible
  • 4de24cd: 8303210: [linux, Windows] Make UseSystemMemoryBarrier available as product flag
  • 336a23e: 8303229: JFR: Preserve disk repository after exit
  • ecec611: 8283404: [macos] a11y : Screen magnifier does not show JMenu name
  • aa76210: 8304893: Link Time Optimization with gcc can be faster
  • b8c748d: 8294266: Add a way to pre-touch java thread stacks
  • 41a3db2: 8304815: Use NMT for more precise hs_err location printing
  • 34e66ce: 8304295: harfbuzz build fails with GCC 7 after JDK-8301998
  • a19b28a: 8297539: Use PrimitiveConversions::cast for local uses of the int<->float union conversion trick
  • ... and 49 more: https://git.openjdk.org/jdk/compare/50a995f03a0cc5c342929a0f48c43fd04fdf0b0d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 3, 2023
@openjdk openjdk bot closed this Apr 3, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 3, 2023
@openjdk
Copy link

openjdk bot commented Apr 3, 2023

@JimLaskey Pushed as commit 790aced.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

compiler compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants