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

chore(ssa): indent NumericType into ObjectType #810

Merged
merged 8 commits into from
Mar 31, 2023

Conversation

kevaundray
Copy link
Contributor

Related issue(s)

Description

Before this PR, the NumericType and ObjectType looked like:

// node.rs
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
pub enum ObjectType {
    NativeField,
    Boolean,
    Unsigned(u32), //bit size
    Signed(u32),   //bit size
    Pointer(ArrayId),
    Function,
    NotAnObject, //not an object
}

#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum NumericType {
    Signed(u32),
    Unsigned(u32),
    NativeField,
}

Noting that Signed, Unsigned and NativeField were duplicated. This PR deduplicates the structure by doing:

pub enum ObjectType {
    Numeric(NumericType)
    Boolean,
    Pointer(ArrayId),
    Function,
    NotAnObject, //not an object
}

Summary of changes

Dependency additions / changes

Test additions / changes

Checklist

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt with default settings.
  • I have linked this PR to the issue(s) that it resolves.
  • I have reviewed the changes on GitHub, line by line.
  • I have ensured all changes are covered in the description.
  • This PR requires documentation updates when merged.

Additional context

@jfecher
Copy link
Contributor

jfecher commented Feb 14, 2023

This PR looks good but needs merge conflict resolution

jfecher
jfecher previously approved these changes Feb 14, 2023
Copy link
Contributor

@jfecher jfecher left a comment

Choose a reason for hiding this comment

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

👍

auto-merge was automatically disabled February 28, 2023 17:40

Merge queue setting changed

@kevaundray kevaundray added this pull request to the merge queue Mar 31, 2023
Merged via the queue into master with commit a901967 Mar 31, 2023
@kevaundray kevaundray deleted the kw/dedup-numeric-type branch March 31, 2023 14:27
TomAFrench added a commit that referenced this pull request Apr 3, 2023
* master:
  chore: handle public parameters and return values separately in evaluator (#1062)
  chore(ssa): Rename ObjectType::Pointer to ObjectType::ArrayPointer (#1077)
  chore(ssa): indent NumericType into ObjectType (#810)
  chore: apply spelling fixes (#1073)
  feat: Implement `std::unsafe::zeroed` (#1048)
  fix: crash when typechecking fields that don't exist (#1070)
  feat: Implement arrays of structs (#1068)
  feat(nargo): split `nargo` into core and cli packages (#1065)
  chore: split wasm crate into submodules (#1066)
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.

3 participants