Skip to content

Commit 599c5ff

Browse files
Add and switch to LibYaml version for all yaml parsing
1 parent 81bd2ab commit 599c5ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2056
-162
lines changed

Include/runcpp2/ConfigParsing.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ namespace runcpp2
2222

2323
bool ParseScriptInfo( const std::string& scriptInfo,
2424
Data::ScriptInfo& outScriptInfo);
25+
26+
bool ParseScriptInfo_LibYaml( const std::string& scriptInfo,
27+
Data::ScriptInfo& outScriptInfo);
2528
}
2629

2730
#endif

Include/runcpp2/Data/DependencyInfo.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ namespace runcpp2
3131
std::unordered_map<PlatformName, FilesToCopyInfo> FilesToCopy;
3232

3333
bool ParseYAML_Node(ryml::ConstNodeRef node);
34+
bool ParseYAML_Node(YAML::ConstNodePtr node);
3435

3536
std::string ToString(std::string indentation) const;
3637
bool Equals(const DependencyInfo& other) const;

Include/runcpp2/Data/DependencyLinkProperty.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@ namespace runcpp2
2626
std::unordered_map<ProfileName, ProfileLinkProperty> ProfileProperties;
2727

2828
bool ParseYAML_Node(ryml::ConstNodeRef node);
29+
bool ParseYAML_Node(YAML::ConstNodePtr node);
30+
2931
bool ParseYAML_NodeWithProfile(ryml::ConstNodeRef node, ProfileName profile);
3032
bool IsYAML_NodeParsableAsDefault(ryml::ConstNodeRef node) const;
33+
34+
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
35+
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
36+
3137
std::string ToString(std::string indentation) const;
3238
bool Equals(const DependencyLinkProperty& other) const;
3339
};

Include/runcpp2/Data/DependencySource.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ namespace runcpp2
2222
std::vector<std::shared_ptr<DependencySource>> ImportedSources;
2323

2424
bool ParseYAML_Node(ryml::ConstNodeRef node);
25+
bool ParseYAML_Node(YAML::ConstNodePtr node);
2526
std::string ToString(std::string indentation) const;
2627
bool Equals(const DependencySource& other) const;
2728
};

Include/runcpp2/Data/FileProperties.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace runcpp2
1616
std::unordered_map<PlatformName, std::string> Extension;
1717

1818
bool ParseYAML_Node(ryml::ConstNodeRef node);
19+
bool ParseYAML_Node(YAML::ConstNodePtr node);
1920

2021
std::string ToString(std::string indentation) const;
2122
bool Equals(const FileProperties& other) const;

Include/runcpp2/Data/FilesToCopyInfo.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,14 @@ namespace runcpp2
1717
std::unordered_map<ProfileName, std::vector<std::string>> ProfileFiles;
1818

1919
bool ParseYAML_Node(ryml::ConstNodeRef node);
20+
bool ParseYAML_Node(YAML::ConstNodePtr node);
21+
2022
bool ParseYAML_NodeWithProfile(ryml::ConstNodeRef node, ProfileName profile);
2123
bool IsYAML_NodeParsableAsDefault(ryml::ConstNodeRef node) const;
24+
25+
bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
26+
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
27+
2228
std::string ToString(std::string indentation) const;
2329
bool Equals(const FilesToCopyInfo& other) const;
2430
};

Include/runcpp2/Data/FilesTypesInfo.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace runcpp2
1818
FileProperties DebugSymbolFile;
1919

2020
bool ParseYAML_Node(ryml::ConstNodeRef node);
21+
bool ParseYAML_Node(YAML::ConstNodePtr node);
2122

2223
std::string ToString(std::string indentation) const;
2324
bool Equals(const FilesTypesInfo& other) const;

Include/runcpp2/Data/FlagsOverrideInfo.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ namespace runcpp2
1515
std::string Append;
1616

1717
bool ParseYAML_Node(ryml::ConstNodeRef node);
18+
bool ParseYAML_Node(YAML::ConstNodePtr node);
19+
1820
bool IsYAML_NodeParsableAsDefault(ryml::ConstNodeRef node) const;
21+
bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
22+
1923
std::string ToString(std::string indentation) const;
2024
bool Equals(const FlagsOverrideInfo& other) const;
2125
};

Include/runcpp2/Data/GitSource.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ namespace runcpp2
1919
SubmoduleInitType CurrentSubmoduleInitType = SubmoduleInitType::SHALLOW;
2020

2121
bool ParseYAML_Node(ryml::ConstNodeRef node);
22+
bool ParseYAML_Node(YAML::ConstNodePtr node);
23+
2224
std::string ToString(std::string indentation) const;
2325
bool Equals(const GitSource& other) const;
2426
};

Include/runcpp2/Data/LocalSource.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ namespace runcpp2
2424
LocalCopyMode CopyMode = LocalCopyMode::Auto;
2525

2626
bool ParseYAML_Node(ryml::ConstNodeRef node);
27+
bool ParseYAML_Node(YAML::ConstNodePtr node);
28+
2729
std::string ToString(std::string indentation) const;
2830
bool Equals(const LocalSource& other) const;
2931
};

0 commit comments

Comments
 (0)