- exposing random source

so that external functions can tap in

Author: martinpi

Common/RuleCandidateSelector.swift

@@ -40,8 +40,6 @@ private extension MutableCollection {
             guard d != 0 else { continue }
             let i = index(firstUnshuffled, offsetBy: d)
             swapAt(firstUnshuffled, i)
-			
-			
         }
     }
 }

Common/Tracery.Eval.swift

@@ -138,7 +138,7 @@ extension Tracery {
                 contextStack.contexts[top].args.removeAll()
 
             case let .any(values, selector, mods):
-                let choice = values[selector.pick(count: values.count, randomSource: randomSource)]
+                let choice = values[selector.pick(count: values.count, randomSource: randomSource_)]
                 try applyMods(nodes: choice.nodes, mods: mods)
                 // try pushContext(choice.nodes, affectsEvaluationLevel: false)
                 trace("🎲 picked \(choice.nodes)")
@@ -272,7 +272,7 @@ extension Tracery {
 
                 func selectCandidate(_ mapping: RuleMapping, runTime: Bool) {
 
-					let index = mapping.selector.pick(count: mapping.candidates.count, randomSource: randomSource)
+					let index = mapping.selector.pick(count: mapping.candidates.count, randomSource: randomSource_)
 					guard index >= 0 && index < mapping.candidates.count else {
 						state = .noExpansion(reason: "no candidates found")
 						return
@@ -290,7 +290,7 @@ extension Tracery {
                     state = .apply([.text("")])
                 }
                 else if let mapping = tagStorage.get(name: name) {
-                    let i = mapping.selector.pick(count: mapping.candidates.count, randomSource: randomSource)
+                    let i = mapping.selector.pick(count: mapping.candidates.count, randomSource: randomSource_)
                     let value = mapping.candidates[i]
                     trace("📗 get tag[\(name)] --> \(value)")
                     state = .apply([.text(value)])

Common/Tracery.swift

@@ -42,8 +42,12 @@ public class Tracery {
     var mods: [String: (String,[String])->String]
     var tagStorage: TagStorage
     var contextStack: ContextStack
-	var randomSource: RandomSource = FallbackRandomSource.shared
-    
+	var randomSource_: RandomSource = FallbackRandomSource.shared
+	
+	// wonky workaround for getting readonly access to randomSource
+	public var randomSource: RandomSource {
+		return randomSource_
+	}
     public var ruleNames: [String] { return ruleSet.keys.map { $0 } }
 	public var modifierNames: [String] { return mods.keys.map { $0 } }
 
@@ -80,12 +84,12 @@ public class Tracery {
         info("tracery ready")
     }
 
-	func setSeed(_ seed:Int) {
+	public func setSeed(_ seed:Int) {
 		var s = seed
 		let data = withUnsafePointer(to: &s) {
 			Data(bytes: UnsafePointer($0), count: MemoryLayout.size(ofValue: seed))
 		}
-		randomSource = DeterministicRandomSource( seed: data )
+		randomSource_ = DeterministicRandomSource( seed: data )
 	}
 
     func createRuleCandidate(rule:String, text: String) -> RuleCandidate? {
@@ -102,7 +106,7 @@ public class Tracery {
             return nil
         }
     }
-    
+	
     public func add(modifier: String, transform: @escaping (String)->String) {
         if mods[modifier] != nil {
             warn("overwriting modifier '\(modifier)'")