github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 21:33:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename CalcManagerHistoryToken

Browse source
This commit is contained in:
Tian Liao 2024-11-05 14:49:53 +08:00
commit a50753f166
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/CalcViewModel/Snapshots.cpp
View file

@ -121,13 +121,13 @@ namespace CalculatorApp::ViewModel::Snapshot
} }
} }
CalcManagerHistoryToken::CalcManagerHistoryToken() CalcManagerToken::CalcManagerToken()
{ {
OpCodeName = ref new Platform::String(); OpCodeName = ref new Platform::String();
CommandIndex = 0; CommandIndex = 0;
} }
CalcManagerHistoryToken::CalcManagerHistoryToken(Platform::String ^ opCodeName, int cmdIndex) CalcManagerToken::CalcManagerToken(Platform::String ^ opCodeName, int cmdIndex)
{ {
assert(opCodeName != nullptr && "opCodeName is mandatory."); assert(opCodeName != nullptr && "opCodeName is mandatory.");
OpCodeName = opCodeName; OpCodeName = opCodeName;
@ -136,7 +136,7 @@ namespace CalculatorApp::ViewModel::Snapshot
CalcManagerHistoryItem::CalcManagerHistoryItem() CalcManagerHistoryItem::CalcManagerHistoryItem()
{ {
Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>(); Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>(); Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
Expression = ref new Platform::String(); Expression = ref new Platform::String();
Result = ref new Platform::String(); Result = ref new Platform::String();
@ -144,11 +144,11 @@ namespace CalculatorApp::ViewModel::Snapshot
CalcManagerHistoryItem::CalcManagerHistoryItem(const CalculationManager::HISTORYITEM& item) CalcManagerHistoryItem::CalcManagerHistoryItem(const CalculationManager::HISTORYITEM& item)
{ {
Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>(); Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
assert(item.historyItemVector.spTokens != nullptr && "spTokens shall not be null."); assert(item.historyItemVector.spTokens != nullptr && "spTokens shall not be null.");
for (auto& [opCode, cmdIdx] : *item.historyItemVector.spTokens) for (auto& [opCode, cmdIdx] : *item.historyItemVector.spTokens)
{ {
Tokens->Append(ref new CalcManagerHistoryToken(ref new Platform::String(opCode.c_str()), cmdIdx)); Tokens->Append(ref new CalcManagerToken(ref new Platform::String(opCode.c_str()), cmdIdx));
} }
Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>(); Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
assert(item.historyItemVector.spCommands != nullptr && "spCommands shall not be null."); assert(item.historyItemVector.spCommands != nullptr && "spCommands shall not be null.");
@ -193,7 +193,7 @@ namespace CalculatorApp::ViewModel::Snapshot
ExpressionDisplaySnapshot::ExpressionDisplaySnapshot() ExpressionDisplaySnapshot::ExpressionDisplaySnapshot()
{ {
Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>(); Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>(); Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
} }
@ -201,10 +201,10 @@ namespace CalculatorApp::ViewModel::Snapshot
const std::vector<CalcHistoryToken>& tokens, const std::vector<CalcHistoryToken>& tokens,
const std::vector<std::shared_ptr<IExpressionCommand>>& commands) const std::vector<std::shared_ptr<IExpressionCommand>>& commands)
{ {
Tokens = ref new Platform::Collections::Vector<CalcManagerHistoryToken ^>(); Tokens = ref new Platform::Collections::Vector<CalcManagerToken ^>();
for (auto& [opCode, cmdIdx] : tokens) for (auto& [opCode, cmdIdx] : tokens)
{ {
Tokens->Append(ref new CalcManagerHistoryToken(ref new Platform::String(opCode.c_str()), cmdIdx)); Tokens->Append(ref new CalcManagerToken(ref new Platform::String(opCode.c_str()), cmdIdx));
} }
Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>(); Commands = ref new Platform::Collections::Vector<ICalcManagerIExprCommand ^>();
@ -229,7 +229,7 @@ namespace CalculatorApp::ViewModel::Snapshot
{ {
CalculationManager::HISTORYITEMVECTOR nativeItem; CalculationManager::HISTORYITEMVECTOR nativeItem;
nativeItem.spTokens = std::make_shared<std::vector<std::pair<std::wstring, int>>>(); nativeItem.spTokens = std::make_shared<std::vector<std::pair<std::wstring, int>>>();
for (CalcManagerHistoryToken ^ token : item->Tokens) for (CalcManagerToken ^ token : item->Tokens)
{ {
nativeItem.spTokens->push_back(std::make_pair(token->OpCodeName->Data(), token->CommandIndex)); nativeItem.spTokens->push_back(std::make_pair(token->OpCodeName->Data(), token->CommandIndex));
} }

10
src/CalcViewModel/Snapshots.h
View file

@ -70,21 +70,21 @@ public
}; };
public public
ref struct CalcManagerHistoryToken sealed ref struct CalcManagerToken sealed
{ {
property Platform::String ^ OpCodeName; // mandatory property Platform::String ^ OpCodeName; // mandatory
property int CommandIndex; property int CommandIndex;
CalcManagerHistoryToken(); CalcManagerToken();
internal :; internal :;
explicit CalcManagerHistoryToken(Platform::String ^ opCodeName, int cmdIndex); explicit CalcManagerToken(Platform::String ^ opCodeName, int cmdIndex);
}; };
public public
ref struct CalcManagerHistoryItem sealed ref struct CalcManagerHistoryItem sealed
{ {
property Windows::Foundation::Collections::IVector<CalcManagerHistoryToken ^> ^ Tokens; // mandatory property Windows::Foundation::Collections::IVector<CalcManagerToken ^> ^ Tokens; // mandatory
property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands; // mandatory property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands; // mandatory
property Platform::String ^ Expression; // mandatory property Platform::String ^ Expression; // mandatory
property Platform::String ^ Result; // mandatory property Platform::String ^ Result; // mandatory
@ -121,7 +121,7 @@ public
public public
ref struct ExpressionDisplaySnapshot sealed ref struct ExpressionDisplaySnapshot sealed
{ {
property Windows::Foundation::Collections::IVector<CalcManagerHistoryToken ^> ^ Tokens; property Windows::Foundation::Collections::IVector<CalcManagerToken ^> ^ Tokens;
property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands; property Windows::Foundation::Collections::IVector<ICalcManagerIExprCommand ^> ^ Commands;
ExpressionDisplaySnapshot(); ExpressionDisplaySnapshot();

2
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -1827,7 +1827,7 @@ void CalculatorApp::ViewModel::StandardCalculatorViewModel::Snapshot::set(Calcul
{ {
using RawTokenCollection = std::vector<std::pair<std::wstring, int>>; using RawTokenCollection = std::vector<std::pair<std::wstring, int>>;
RawTokenCollection rawTokens; RawTokenCollection rawTokens;
for (CalculatorApp::ViewModel::Snapshot::CalcManagerHistoryToken ^ token : snapshot->ExpressionDisplay->Tokens) for (CalculatorApp::ViewModel::Snapshot::CalcManagerToken ^ token : snapshot->ExpressionDisplay->Tokens)
{ {
rawTokens.push_back(std::pair{ token->OpCodeName->Data(), token->CommandIndex }); rawTokens.push_back(std::pair{ token->OpCodeName->Data(), token->CommandIndex });
} }

20
src/Calculator/Utils/JsonUtils.cs
View file

@ -7,10 +7,10 @@ using Windows.ApplicationModel;
namespace CalculatorApp.JsonUtils namespace CalculatorApp.JsonUtils
{ {
internal class CalcManagerHistoryTokenAlias internal class CalcManagerTokenAlias
{ {
[JsonIgnore] [JsonIgnore]
public CalcManagerHistoryToken Value; public CalcManagerToken Value;
[JsonPropertyName("t")] [JsonPropertyName("t")]
public string OpCodeName public string OpCodeName
@ -25,8 +25,8 @@ namespace CalculatorApp.JsonUtils
set => Value.CommandIndex = value; set => Value.CommandIndex = value;
} }
public CalcManagerHistoryTokenAlias() => Value = new CalcManagerHistoryToken(); public CalcManagerTokenAlias() => Value = new CalcManagerToken();
public CalcManagerHistoryTokenAlias(CalcManagerHistoryToken value) => Value = value; public CalcManagerTokenAlias(CalcManagerToken value) => Value = value;
} }
[JsonPolymorphic(TypeDiscriminatorPropertyName = "$t")] [JsonPolymorphic(TypeDiscriminatorPropertyName = "$t")]
@ -126,9 +126,9 @@ namespace CalculatorApp.JsonUtils
public CalcManagerHistoryItem Value; public CalcManagerHistoryItem Value;
[JsonPropertyName("t")] [JsonPropertyName("t")]
public IEnumerable<CalcManagerHistoryTokenAlias> Tokens public IEnumerable<CalcManagerTokenAlias> Tokens
{ {
get => Value.Tokens.Select(x => new CalcManagerHistoryTokenAlias(x)); get => Value.Tokens.Select(x => new CalcManagerTokenAlias(x));
set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList(); set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList();
} }
[JsonPropertyName("c")] [JsonPropertyName("c")]
@ -204,9 +204,9 @@ namespace CalculatorApp.JsonUtils
public ExpressionDisplaySnapshot Value; public ExpressionDisplaySnapshot Value;
[JsonPropertyName("t")] [JsonPropertyName("t")]
public IEnumerable<CalcManagerHistoryTokenAlias> Tokens public IEnumerable<CalcManagerTokenAlias> Tokens
{ {
get => Value.Tokens.Select(x => new CalcManagerHistoryTokenAlias(x)); get => Value.Tokens.Select(x => new CalcManagerTokenAlias(x));
set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList(); set => Value.Tokens = value.Select(Helpers.MapHistoryToken).ToList();
} }
[JsonPropertyName("c")] [JsonPropertyName("c")]
@ -274,9 +274,9 @@ namespace CalculatorApp.JsonUtils
internal static class Helpers internal static class Helpers
{ {
public static CalcManagerHistoryToken MapHistoryToken(CalcManagerHistoryTokenAlias token) public static CalcManagerToken MapHistoryToken(CalcManagerTokenAlias token)
{ {
return new CalcManagerHistoryToken { OpCodeName = token.OpCodeName, CommandIndex = token.CommandIndex }; return new CalcManagerToken { OpCodeName = token.OpCodeName, CommandIndex = token.CommandIndex };
} }
public static ICalcManagerIExprCommandAlias MapCommandAlias(ICalcManagerIExprCommand exprCmd) public static ICalcManagerIExprCommandAlias MapCommandAlias(ICalcManagerIExprCommand exprCmd)