Skip to content

[Swift] improvements to equality functions #3302

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.

Sign up for GitHub

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

Merged
parrt merged 3 commits into from
Mar 28, 2022
Merged

[Swift] improvements to equality functions #3302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ef17f
fix default equality
Dante-Broggi Oct 12, 2021
1d24a31
equality cases
Dante-Broggi Oct 12, 2021
dce2778
optional unwrapping
Dante-Broggi Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions runtime/Swift/Sources/Antlr4/atn/ATNConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ public func ==(lhs: ATNConfig, rhs: ATNConfig) -> Bool {
return true
}

if (lhs is LexerATNConfig) && (rhs is LexerATNConfig) {
return (lhs as! LexerATNConfig) == (rhs as! LexerATNConfig)
if let l = lhs as? LexerATNConfig, let r = rhs as? LexerATNConfig {
return l == r


}
Expand All @@ -185,19 +185,7 @@ public func ==(lhs: ATNConfig, rhs: ATNConfig) -> Bool {
return false
}

var contextCompare = false

if lhs.context == nil && rhs.context == nil {
contextCompare = true
} else if lhs.context == nil && rhs.context != nil {
contextCompare = false
} else if lhs.context != nil && rhs.context == nil {
contextCompare = false
} else {
contextCompare = (lhs.context! == rhs.context!)
}

if !contextCompare {
if lhs.context != rhs.context {
return false
}

Expand Down
23 changes: 2 additions & 21 deletions runtime/Swift/Sources/Antlr4/atn/LexerATNConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,11 @@ public func ==(lhs: LexerATNConfig, rhs: LexerATNConfig) -> Bool {
return false
}

if lhs.getLexerActionExecutor() == nil && rhs.getLexerActionExecutor() != nil {
if lhs.getLexerActionExecutor() != rhs.getLexerActionExecutor() {
return false
} else if lhs.getLexerActionExecutor() != nil && rhs.getLexerActionExecutor() == nil {
return false
} else if lhs.getLexerActionExecutor() == nil && rhs.getLexerActionExecutor() == nil {

} else if !(lhs.getLexerActionExecutor()! == rhs.getLexerActionExecutor()!) {
return false
}


var contextCompare = false

if lhs.context == nil && rhs.context == nil {
contextCompare = true
} else if lhs.context == nil && rhs.context != nil {
contextCompare = false
} else if lhs.context != nil && rhs.context == nil {
contextCompare = false
} else {
contextCompare = (lhs.context! == rhs.context!)
}

if !contextCompare{
if lhs.context != rhs.context {
return false
}

Expand Down
10 changes: 1 addition & 9 deletions runtime/Swift/Sources/Antlr4/atn/SingletonPredictionContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,8 @@ public func ==(lhs: SingletonPredictionContext, rhs: SingletonPredictionContext)
if lhs.returnState != rhs.returnState {
return false
}
var parentCompare = false
if (lhs.parent == nil) && (rhs.parent == nil) {
parentCompare = true
} else if lhs.parent == nil || rhs.parent == nil {
parentCompare = false
} else {
parentCompare = (lhs.parent! == rhs.parent!)
}

return parentCompare
return lhs.parent == rhs.parent
}


2 changes: 1 addition & 1 deletion runtime/Swift/Sources/Antlr4/tree/pattern/Chunk.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public class Chunk: Equatable {
}

public func isEqual(_ other: Chunk) -> Bool {
return false
return self === other
}
}