jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #2114 from ewanmellor/swift-let-precedencedfa 

[Swift] Make DFA.precedenceDfa be a "let" rather than a "var".
This commit is contained in:
Terence Parr 2017-11-29 09:53:57 -08:00 committed by GitHub
parent aaca1b9f3c b548999b16
commit 3536a84b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
runtime/Swift/Sources/Antlr4/dfa/DFA.swift
View File

@ -27,7 +27,7 @@ public class DFA: CustomStringConvertible {
/// `true` if this DFA is for a precedence decision; otherwise,
/// `false`. This is the backing field for _#isPrecedenceDfa_.
///
private final var precedenceDfa: Bool
private let precedenceDfa: Bool
///
/// mutex for DFAState changes.
@ -42,19 +42,19 @@ public class DFA: CustomStringConvertible {
self.atnStartState = atnStartState
self.decision = decision
var precedenceDfa: Bool = false
if atnStartState is StarLoopEntryState {
if (atnStartState as! StarLoopEntryState).precedenceRuleDecision {
precedenceDfa = true
let precedenceState: DFAState = DFAState(ATNConfigSet())
precedenceState.edges = [DFAState]() //new DFAState[0];
precedenceState.isAcceptState = false
precedenceState.requiresFullContext = false
self.s0 = precedenceState
}
}
if let starLoopState = atnStartState as? StarLoopEntryState, starLoopState.precedenceRuleDecision {
let precedenceState = DFAState(ATNConfigSet())
precedenceState.edges = [DFAState]()
precedenceState.isAcceptState = false
precedenceState.requiresFullContext = false
self.precedenceDfa = precedenceDfa
precedenceDfa = true
s0 = precedenceState
}
else {
precedenceDfa = false
s0 = nil
}
}
///
@ -130,24 +130,6 @@ public class DFA: CustomStringConvertible {
}
}
///
/// Sets whether this is a precedence DFA.
///
/// - parameter precedenceDfa: `true` if this is a precedence DFA; otherwise,
/// `false`
///
/// - throws: ANTLRError.unsupportedOperation if `precedenceDfa` does not
/// match the value of _#isPrecedenceDfa_ for the current DFA.
///
/// - note: This method no longer performs any action.
///
public final func setPrecedenceDfa(_ precedenceDfa: Bool) throws {
if precedenceDfa != isPrecedenceDfa() {
throw ANTLRError.unsupportedOperation(msg: "The precedenceDfa field cannot change after a DFA is constructed.")
}
}
///
/// Return a list of all states in this DFA, ordered by state number.
///