Sync VCC Plus 3.7.1 build 67 source
Refresh reviewed MCP output export, four-drive owned playtests, bounded BASIC readiness, and pinned CMOC 0.1.101 source/patches. Preserve independent source-edition identity, empty libraries, notices and privacy boundaries. Validated 74 export/privacy checks, pinned dependency sources, and an independent unsigned universal Release build. A subsequent documentation-only correction removes an excluded qualification link; all build inputs remain identical.
This commit is contained in:
1 parent
4abc194001
commit
5534005799
54 files changed
+2950
-435
No files matched your search
@@ -1227,7 +1227,8 @@ final class MachineModel: ObservableObject {
|
||||
}
|
||||
|
||||
func loadBASICSource(_ source: String, run: Bool, breakpoints: Set<Int> = [],
|
||||
review: (expected: VCCMachineSnapshot, existing: String)? = nil) async -> VCCMachineSnapshot? {
|
||||
review: (expected: VCCMachineSnapshot, existing: String)? = nil,
|
||||
reviewIsCurrent: (() -> Bool)? = nil) async -> VCCMachineSnapshot? {
|
||||
guard !busy, !diskSaving, state != .closed else {
|
||||
fileError = "The machine is busy. Try the BASIC transfer again when it is ready."
|
||||
return nil
|
||||
@@ -1235,17 +1236,39 @@ final class MachineModel: ObservableObject {
|
||||
busy = true; inputEpoch += 1; fileError = nil
|
||||
defer { busy = false }
|
||||
let points = breakpoints.sorted().map { NSNumber(value: $0) }
|
||||
let result = await diskStep { completion in
|
||||
if let review {
|
||||
controller.assistantLoad(source: source, breakpoints: points, expected: review.expected, existing: review.existing, completion: completion)
|
||||
} else {
|
||||
controller.basicLoadSource(source, run: run, breakpoints: points, completion: completion)
|
||||
let retryDeadline = ContinuousClock.now.advanced(by: .seconds(2))
|
||||
while true {
|
||||
if review != nil {
|
||||
guard reviewIsCurrent?() != false, !Task.isCancelled else {
|
||||
fileError = Task.isCancelled ? "The BASIC transfer was cancelled." : "The approved revision or connection changed."
|
||||
return nil
|
||||
}
|
||||
}
|
||||
let result = await diskStep { completion in
|
||||
if let review {
|
||||
controller.assistantLoad(source: source, breakpoints: points, expected: review.expected, existing: review.existing, completion: completion)
|
||||
} else {
|
||||
controller.basicLoadSource(source, run: run, breakpoints: points, completion: completion)
|
||||
}
|
||||
}
|
||||
if let error = result.errorMessage {
|
||||
// A running ROM can leave its input loop between readiness and
|
||||
// loading. This exact core refusal precedes every mutation;
|
||||
// each retry rechecks the same reviewed machine/source/media.
|
||||
guard review != nil, reviewIsCurrent != nil,
|
||||
error == "Wait at the BASIC OK prompt before loading or running from the editor; use BREAK to stop the current program first",
|
||||
ContinuousClock.now.advanced(by: .milliseconds(45)) < retryDeadline else {
|
||||
fileError = error; return nil
|
||||
}
|
||||
do { try await Task.sleep(for: .milliseconds(45)) }
|
||||
catch { fileError = "The BASIC transfer was cancelled."; return nil }
|
||||
guard ContinuousClock.now < retryDeadline else { fileError = error; return nil }
|
||||
continue // Approval and cancellation are rechecked after the wait.
|
||||
}
|
||||
binaryName = nil
|
||||
if run { focusRequest += 1 }
|
||||
return result
|
||||
}
|
||||
if let error = result.errorMessage { fileError = error; return nil }
|
||||
binaryName = nil
|
||||
if run { focusRequest += 1 }
|
||||
return result
|
||||
}
|
||||
func configureBASICBreakpoints(_ lines: Set<Int>, source: String) async -> Bool {
|
||||
guard !busy, !diskSaving, state != .closed else { return false }
|
||||
|
||||
Reference in new issue
Block a user