Refactored parse.cpp so that VS doesn't complain, added MinSizeRel build setting, and fixed numbering in the spec tests

This commit is contained in:
Jesse Beder
2011-03-03 20:01:32 +00:00
parent cb632b3968
commit 943d000ab3
3 changed files with 18 additions and 10 deletions

View File

@@ -34,15 +34,8 @@ public:
virtual void OnMapEnd() {}
};
int main(int argc, char **argv)
void parse(std::istream& input)
{
Params p = ParseArgs(argc, argv);
std::ifstream fin;
if(argc > 1)
fin.open(argv[1]);
std::istream& input = (argc > 1 ? fin : std::cin);
try {
YAML::Parser parser(input);
YAML::Node doc;
@@ -55,5 +48,19 @@ int main(int argc, char **argv)
} catch(const YAML::Exception& e) {
std::cerr << e.what() << "\n";
}
}
int main(int argc, char **argv)
{
Params p = ParseArgs(argc, argv);
if(argc > 1) {
std::ifstream fin;
fin.open(argv[1]);
parse(fin);
} else {
parse(std::cin);
}
return 0;
}