Skip to content

Commit d76f6ee

Browse files
Neko-Box-CoderNeko-Box-Coder
authored
Merge pull request #64 from Neko-Box-Coder/RemoveRYML
Renaming functions and types to get rid of the _LibYaml suffix
2 parents 7633ac0 + 9948e6c commit d76f6ee

31 files changed

+204
-229
lines changed

‎Include/runcpp2/ConfigParsing.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ namespace runcpp2
2020
std::string& outPreferredProfile,
2121
const std::string& customConfigPath = "");
2222

23-
bool ParseScriptInfo( const std::string& scriptInfo,
24-
Data::ScriptInfo& outScriptInfo);
25-
26-
bool ParseScriptInfo_LibYaml( const std::string& scriptInfo,
27-
Data::ScriptInfo& outScriptInfo);
23+
bool ParseScriptInfo(const std::string& scriptInfo, Data::ScriptInfo& outScriptInfo);
2824
}
2925

3026
#endif

‎Include/runcpp2/Data/DependencyLinkProperty.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace runcpp2
2727

2828
bool ParseYAML_Node(YAML::ConstNodePtr node);
2929

30-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
31-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
30+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
31+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
3232

3333
std::string ToString(std::string indentation) const;
3434
bool Equals(const DependencyLinkProperty& other) const;

‎Include/runcpp2/Data/FilesToCopyInfo.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ namespace runcpp2
1818

1919
bool ParseYAML_Node(YAML::ConstNodePtr node);
2020

21-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
22-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
21+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
22+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
2323

2424
std::string ToString(std::string indentation) const;
2525
bool Equals(const FilesToCopyInfo& other) const;

‎Include/runcpp2/Data/FlagsOverrideInfo.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace runcpp2
1616

1717
bool ParseYAML_Node(YAML::ConstNodePtr node);
1818

19-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
19+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
2020

2121
std::string ToString(std::string indentation) const;
2222
bool Equals(const FlagsOverrideInfo& other) const;

‎Include/runcpp2/Data/ProfilesCommands.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ namespace runcpp2
1919
std::unordered_map<ProfileName, std::vector<std::string>> CommandSteps;
2020

2121
bool ParseYAML_Node(YAML::ConstNodePtr node);
22-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
23-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
22+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
23+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
2424

2525
std::string ToString(std::string indentation) const;
2626
bool Equals(const ProfilesCommands& other) const;

‎Include/runcpp2/Data/ProfilesDefines.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ namespace runcpp2
2626

2727
bool ParseYAML_Node(YAML::ConstNodePtr node);
2828

29-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
30-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
29+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
30+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
3131
std::string ToString(std::string indentation) const;
3232
bool Equals(const ProfilesDefines& other) const;
3333
};

‎Include/runcpp2/Data/ProfilesFlagsOverride.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ namespace runcpp2
1717

1818
bool ParseYAML_Node(YAML::ConstNodePtr node);
1919

20-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
21-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
20+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
21+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
2222

2323
std::string ToString(std::string indentation) const;
2424
bool Equals(const ProfilesFlagsOverride& other) const;

‎Include/runcpp2/Data/ProfilesProcessPaths.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ namespace runcpp2
2323

2424
bool ParseYAML_Node(YAML::ConstNodePtr node);
2525

26-
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
27-
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
26+
bool ParseYAML_NodeWithProfile(YAML::ConstNodePtr node, ProfileName profile);
27+
bool IsYAML_NodeParsableAsDefault(YAML::ConstNodePtr node) const;
2828

2929
std::string ToString(std::string indentation) const;
3030
bool Equals(const ProfilesProcessPaths& other) const;

‎Include/runcpp2/DependenciesHelper.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ namespace runcpp2
4747
const Data::Profile& profile,
4848
std::vector<std::string>& outBinariesPaths);
4949

50-
bool HandleImport_LibYaml( Data::DependencyInfo& dependency,
51-
const ghc::filesystem::path& basePath);
50+
bool HandleImport(Data::DependencyInfo& dependency, const ghc::filesystem::path& basePath);
5251

5352
bool ResolveImports(Data::ScriptInfo& scriptInfo,
5453
const ghc::filesystem::path& scriptPath,

‎Include/runcpp2/ParseUtil.hpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace runcpp2
1313
struct NodeRequirement
1414
{
1515
std::string Name;
16-
YAML::NodeType NodeType_LibYaml;
16+
YAML::NodeType NodeType;
1717
bool Required;
1818
bool Nullable;
1919

@@ -24,53 +24,53 @@ namespace runcpp2
2424
bool nullable);
2525
};
2626

27-
bool CheckNodeRequirement_LibYaml( YAML::ConstNodePtr parentNode,
28-
const std::string childName,
29-
YAML::NodeType childType,
30-
bool required,
31-
bool nullable);
27+
bool CheckNodeRequirement( YAML::ConstNodePtr parentNode,
28+
const std::string childName,
29+
YAML::NodeType childType,
30+
bool required,
31+
bool nullable);
3232

33-
bool CheckNodeRequirements_LibYaml( YAML::ConstNodePtr node,
34-
const std::vector<NodeRequirement>& requirements);
33+
bool CheckNodeRequirements( YAML::ConstNodePtr node,
34+
const std::vector<NodeRequirement>& requirements);
3535

3636

3737
bool GetParsableInfo(const std::string& contentToParse, std::string& outParsableInfo);
3838

39-
bool MergeYAML_NodeChildren_LibYaml(YAML::NodePtr nodeToMergeFrom,
39+
bool MergeYAML_NodeChildren(YAML::NodePtr nodeToMergeFrom,
4040
YAML::NodePtr nodeToMergeTo,
4141
YAML::ResourceHandle& yamlResouce);
4242

43-
bool ExistAndHasChild_LibYaml( YAML::ConstNodePtr node,
44-
const std::string& childName,
45-
bool nullable = false);
43+
bool ExistAndHasChild( YAML::ConstNodePtr node,
44+
const std::string& childName,
45+
bool nullable = false);
4646

4747

4848
std::string GetEscapedYAMLString(const std::string& input);
4949

5050
bool ParseIncludes(const std::string& line, std::string& outIncludePath);
5151

5252
template<typename T>
53-
bool ParsePlatformProfileMap_LibYaml( YAML::ConstNodePtr node,
54-
const std::string& key,
55-
std::unordered_map<PlatformName, T>& result,
56-
const std::string& errorMessage)
53+
bool ParsePlatformProfileMap( YAML::ConstNodePtr node,
54+
const std::string& key,
55+
std::unordered_map<PlatformName, T>& result,
56+
const std::string& errorMessage)
5757
{
58-
if(ExistAndHasChild_LibYaml(node, key))
58+
if(ExistAndHasChild(node, key))
5959
{
6060
YAML::ConstNodePtr mapNode = node->GetMapValueNode(key);
6161

6262
//If we skip platform profile
6363
T defaultValue;
64-
if(defaultValue.IsYAML_NodeParsableAsDefault_LibYaml(mapNode))
64+
if(defaultValue.IsYAML_NodeParsableAsDefault(mapNode))
6565
{
66-
if(defaultValue.ParseYAML_NodeWithProfile_LibYaml(mapNode, "DefaultProfile"))
66+
if(defaultValue.ParseYAML_NodeWithProfile(mapNode, "DefaultProfile"))
6767
result["DefaultPlatform"] = defaultValue;
6868
else
6969
return false;
7070
}
7171
else
7272
{
73-
if(!CheckNodeRequirement_LibYaml(node, key, YAML::NodeType::Map, false, true))
73+
if(!CheckNodeRequirement(node, key, YAML::NodeType::Map, false, true))
7474
return false;
7575

7676
for(int i = 0; i < mapNode->GetChildrenCount(); ++i)

0 commit comments

Comments
 (0)