ALL: sync with scummvm

This commit is contained in:
Pawel Kolodziejski 2012-09-08 21:09:03 +02:00
parent a59b2167b8
commit c6c4bc7566
16 changed files with 425 additions and 190 deletions

View file

@ -97,30 +97,6 @@ struct FSNode {
};
typedef std::list<FSNode> FileList;
typedef StringList TokenList;
/**
* Takes a given input line and creates a list of tokens out of it.
*
* A token in this context is separated by whitespaces. A special case
* are quotation marks though. A string inside quotation marks is treated
* as single token, even when it contains whitespaces.
*
* Thus for example the input:
* foo bar "1 2 3 4" ScummVM
* will create a list with the following entries:
* "foo", "bar", "1 2 3 4", "ScummVM"
* As you can see the quotation marks will get *removed* too.
*
* You can also use this with non-whitespace by passing another separator
* character (e.g. ',').
*
* @param input The text to be tokenized.
* @param separator The token separator.
* @return A list of tokens.
*/
TokenList tokenize(const std::string &input, char separator = ' ');
} // End of anonymous namespace
enum ProjectType {
@ -526,7 +502,7 @@ int main(int argc, char *argv[]) {
projectWarnings["agos"].push_back("4511");
projectWarnings["dreamweb"].push_back("4355");
projectWarnings["lure"].push_back("4189");
projectWarnings["lure"].push_back("4355");
@ -787,6 +763,7 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
return true;
}
} // End of anonymous namespace
TokenList tokenize(const std::string &input, char separator) {
TokenList result;