Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two tiny cleanups to convert-uast #25906

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Conversation

mppf
Copy link
Member

@mppf mppf commented Sep 9, 2024

This PR makes two tiny changes to convert-uast.cpp:

  1. It removes an unused function that is local to this file.
  2. It switches from using a query to decide if scope resolution should be attempted to checking the current modTag. (Note: we are currently using MOD_STANDARD for package modules, and as a result, only MOD_USER code is not in a bundled module. See also this code that sets modTag
    ModTag modTag = MOD_USER;
    if (chpl::parsing::filePathIsInInternalModule(gContext, path)) {
    modTag = MOD_INTERNAL;
    } else if (chpl::parsing::filePathIsInStandardModule(gContext, path)) {
    modTag = MOD_STANDARD;
    } else if (chpl::parsing::filePathIsInBundledModule(gContext, path)) {
    // TODO: this considers code in modules/packages as MOD_STANDARD but
    // we would like this to be MOD_USER.
    // See also issue #24998.
    modTag = MOD_STANDARD;
    }

No behavior changes in this PR.

Reviewed by @arezaii - thanks!

  • full comm=none testing

---
Signed-off-by: Michael Ferguson <[email protected]>
@mppf mppf merged commit 28a9b68 into chapel-lang:main Sep 9, 2024
7 checks passed
@mppf mppf deleted the tidy-convert-uast branch September 9, 2024 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants