Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed, +11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that turns concurrent battles into a type-system property rather than a scope contract. ## What landed **Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a cascading cull across the skill graph, view layer, and receive-path periphery. Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/ IsAINetwork) became `const false`, every guarded block deleted. Field*.cs subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan family reworked to take a mgr param through IMulliganMgr.InitMulligan. Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/ skill filters converted from static ambient reads to per-mgr reads via SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr. **Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient- Context / TestBattleScope in full. Every per-battle mutable slot now lives on the mgr instance itself: mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo / InstanceViewerId / InstanceNetworkAgent / GameMgr BattleManagerBase.GetIns() returns null unconditionally; the residual static flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo, ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the handful of engine-internal readers that still reference their types. Zero BattleAmbient references anywhere in engine + node + tests. Added pre-seeded GameMgr ctor overload threaded through the mgr chain (BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard- BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it to the mgr's ctor — no ambient reach. Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal BEFORE mgr construction. Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to `HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten around per-mgr construction (GetIns() → null is the pinned invariant). ## Regression fixes - **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied by the WireMulliganPhase seam; unit tests exposed the live-path gap. ## Ship state - SVSim.BattleEngine.Tests: 56/56 pass, 2 skip - SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48) - Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs in SVSim.EmulatedEntrypoint, unrelated) - Sequential PVP smoke: verified live (two back-to-back battles, no regression on cleanup/spinup) - Concurrent PVP smoke: verified live Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure analyzer needed to make future cascade cleanup safe (per feedback memory "Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
339 lines
7.3 KiB
C#
339 lines
7.3 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
|
|
namespace LitJson;
|
|
|
|
public class JsonReader
|
|
{
|
|
private static IDictionary<int, IDictionary<int, int[]>> parse_table;
|
|
|
|
private Stack<int> automaton_stack;
|
|
|
|
private int current_input;
|
|
|
|
private int current_symbol;
|
|
|
|
private bool end_of_json;
|
|
|
|
private bool end_of_input;
|
|
|
|
private Lexer lexer;
|
|
|
|
private bool parser_in_string;
|
|
|
|
private bool parser_return;
|
|
|
|
private bool read_started;
|
|
|
|
private TextReader reader;
|
|
|
|
private bool reader_is_owned;
|
|
|
|
private bool skip_non_members;
|
|
|
|
private object token_value;
|
|
|
|
private JsonToken token;
|
|
|
|
public bool SkipNonMembers
|
|
{
|
|
get
|
|
{
|
|
return skip_non_members;
|
|
}
|
|
set
|
|
{
|
|
skip_non_members = value;
|
|
}
|
|
}
|
|
|
|
public JsonToken Token => token;
|
|
|
|
public object Value => token_value;
|
|
|
|
static JsonReader()
|
|
{
|
|
PopulateParseTable();
|
|
}
|
|
|
|
public JsonReader(string json_text)
|
|
: this(new StringReader(json_text), owned: true)
|
|
{
|
|
}
|
|
|
|
public JsonReader(TextReader reader)
|
|
: this(reader, owned: false)
|
|
{
|
|
}
|
|
|
|
private JsonReader(TextReader reader, bool owned)
|
|
{
|
|
if (reader == null)
|
|
{
|
|
throw new ArgumentNullException("reader");
|
|
}
|
|
parser_in_string = false;
|
|
parser_return = false;
|
|
read_started = false;
|
|
automaton_stack = new Stack<int>();
|
|
automaton_stack.Push(65553);
|
|
automaton_stack.Push(65543);
|
|
lexer = new Lexer(reader);
|
|
end_of_input = false;
|
|
end_of_json = false;
|
|
skip_non_members = true;
|
|
this.reader = reader;
|
|
reader_is_owned = owned;
|
|
}
|
|
|
|
private static void PopulateParseTable()
|
|
{
|
|
parse_table = new Dictionary<int, IDictionary<int, int[]>>();
|
|
TableAddRow(ParserToken.Array);
|
|
TableAddCol(ParserToken.Array, 91, 91, 65549);
|
|
TableAddRow(ParserToken.ArrayPrime);
|
|
TableAddCol(ParserToken.ArrayPrime, 34, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 91, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 93, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 123, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 65537, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 65538, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 65539, 65550, 65551, 93);
|
|
TableAddCol(ParserToken.ArrayPrime, 65540, 65550, 65551, 93);
|
|
TableAddRow(ParserToken.Object);
|
|
TableAddCol(ParserToken.Object, 123, 123, 65545);
|
|
TableAddRow(ParserToken.ObjectPrime);
|
|
TableAddCol(ParserToken.ObjectPrime, 34, 65546, 65547, 125);
|
|
TableAddCol(ParserToken.ObjectPrime, 125, 125);
|
|
TableAddRow(ParserToken.Pair);
|
|
TableAddCol(ParserToken.Pair, 34, 65552, 58, 65550);
|
|
TableAddRow(ParserToken.PairRest);
|
|
TableAddCol(ParserToken.PairRest, 44, 44, 65546, 65547);
|
|
TableAddCol(ParserToken.PairRest, 125, 65554);
|
|
TableAddRow(ParserToken.String);
|
|
TableAddCol(ParserToken.String, 34, 34, 65541, 34);
|
|
TableAddRow(ParserToken.Text);
|
|
TableAddCol(ParserToken.Text, 91, 65548);
|
|
TableAddCol(ParserToken.Text, 123, 65544);
|
|
TableAddRow(ParserToken.Value);
|
|
TableAddCol(ParserToken.Value, 34, 65552);
|
|
TableAddCol(ParserToken.Value, 91, 65548);
|
|
TableAddCol(ParserToken.Value, 123, 65544);
|
|
TableAddCol(ParserToken.Value, 65537, 65537);
|
|
TableAddCol(ParserToken.Value, 65538, 65538);
|
|
TableAddCol(ParserToken.Value, 65539, 65539);
|
|
TableAddCol(ParserToken.Value, 65540, 65540);
|
|
TableAddRow(ParserToken.ValueRest);
|
|
TableAddCol(ParserToken.ValueRest, 44, 44, 65550, 65551);
|
|
TableAddCol(ParserToken.ValueRest, 93, 65554);
|
|
}
|
|
|
|
private static void TableAddCol(ParserToken row, int col, params int[] symbols)
|
|
{
|
|
parse_table[(int)row].Add(col, symbols);
|
|
}
|
|
|
|
private static void TableAddRow(ParserToken rule)
|
|
{
|
|
parse_table.Add((int)rule, new Dictionary<int, int[]>());
|
|
}
|
|
|
|
private void ProcessNumber(string number)
|
|
{
|
|
int result2;
|
|
long result3;
|
|
if ((number.IndexOf('.') != -1 || number.IndexOf('e') != -1 || number.IndexOf('E') != -1) && double.TryParse(number, out var result))
|
|
{
|
|
token = JsonToken.Double;
|
|
token_value = result;
|
|
}
|
|
else if (int.TryParse(number, out result2))
|
|
{
|
|
token = JsonToken.Int;
|
|
token_value = result2;
|
|
}
|
|
else if (long.TryParse(number, out result3))
|
|
{
|
|
token = JsonToken.Long;
|
|
token_value = result3;
|
|
}
|
|
else
|
|
{
|
|
token = JsonToken.Int;
|
|
token_value = 0;
|
|
}
|
|
}
|
|
|
|
private void ProcessSymbol()
|
|
{
|
|
if (current_symbol == 91)
|
|
{
|
|
token = JsonToken.ArrayStart;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 93)
|
|
{
|
|
token = JsonToken.ArrayEnd;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 123)
|
|
{
|
|
token = JsonToken.ObjectStart;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 125)
|
|
{
|
|
token = JsonToken.ObjectEnd;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 34)
|
|
{
|
|
if (parser_in_string)
|
|
{
|
|
parser_in_string = false;
|
|
parser_return = true;
|
|
return;
|
|
}
|
|
if (token == JsonToken.None)
|
|
{
|
|
token = JsonToken.String;
|
|
}
|
|
parser_in_string = true;
|
|
}
|
|
else if (current_symbol == 65541)
|
|
{
|
|
token_value = lexer.StringValue;
|
|
}
|
|
else if (current_symbol == 65539)
|
|
{
|
|
token = JsonToken.Boolean;
|
|
token_value = false;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 65540)
|
|
{
|
|
token = JsonToken.Null;
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 65537)
|
|
{
|
|
ProcessNumber(lexer.StringValue);
|
|
parser_return = true;
|
|
}
|
|
else if (current_symbol == 65546)
|
|
{
|
|
token = JsonToken.PropertyName;
|
|
}
|
|
else if (current_symbol == 65538)
|
|
{
|
|
token = JsonToken.Boolean;
|
|
token_value = true;
|
|
parser_return = true;
|
|
}
|
|
}
|
|
|
|
private bool ReadToken()
|
|
{
|
|
if (end_of_input)
|
|
{
|
|
return false;
|
|
}
|
|
lexer.NextToken();
|
|
if (lexer.EndOfInput)
|
|
{
|
|
Close();
|
|
return false;
|
|
}
|
|
current_input = lexer.Token;
|
|
return true;
|
|
}
|
|
|
|
public void Close()
|
|
{
|
|
if (!end_of_input)
|
|
{
|
|
end_of_input = true;
|
|
end_of_json = true;
|
|
if (reader_is_owned)
|
|
{
|
|
reader.Dispose();
|
|
}
|
|
reader = null;
|
|
}
|
|
}
|
|
|
|
public bool Read()
|
|
{
|
|
if (end_of_input)
|
|
{
|
|
return false;
|
|
}
|
|
if (end_of_json)
|
|
{
|
|
end_of_json = false;
|
|
automaton_stack.Clear();
|
|
automaton_stack.Push(65553);
|
|
automaton_stack.Push(65543);
|
|
}
|
|
parser_in_string = false;
|
|
parser_return = false;
|
|
token = JsonToken.None;
|
|
token_value = null;
|
|
if (!read_started)
|
|
{
|
|
read_started = true;
|
|
if (!ReadToken())
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
while (true)
|
|
{
|
|
if (parser_return)
|
|
{
|
|
if (automaton_stack.Peek() == 65553)
|
|
{
|
|
end_of_json = true;
|
|
}
|
|
return true;
|
|
}
|
|
current_symbol = automaton_stack.Pop();
|
|
ProcessSymbol();
|
|
if (current_symbol == current_input)
|
|
{
|
|
if (!ReadToken())
|
|
{
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
int[] array;
|
|
try
|
|
{
|
|
array = parse_table[current_symbol][current_input];
|
|
}
|
|
catch (KeyNotFoundException inner_exception)
|
|
{
|
|
throw new JsonException((ParserToken)current_input, inner_exception);
|
|
}
|
|
if (array[0] != 65554)
|
|
{
|
|
for (int num = array.Length - 1; num >= 0; num--)
|
|
{
|
|
automaton_stack.Push(array[num]);
|
|
}
|
|
}
|
|
}
|
|
if (automaton_stack.Peek() != 65553)
|
|
{
|
|
throw new JsonException("Input doesn't evaluate to proper JSON text");
|
|
}
|
|
if (parser_return)
|
|
{
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|