mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
The 'Big Whine' patch:
Any use of a file from another package without a declared dependency will give a warning; Also added some more _LOCALE_123_ macros so we need less format_string calls git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@753 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -13,6 +13,8 @@
|
||||
#include <util/error.hpp>
|
||||
#include <script/script.hpp>
|
||||
|
||||
class Packaged;
|
||||
|
||||
// ----------------------------------------------------------------------------- : Parser
|
||||
|
||||
/// Parse a String to a Script
|
||||
@@ -21,8 +23,10 @@
|
||||
*
|
||||
* Errors are stored in the output vector.
|
||||
* If there are errors, the result is a null pointer
|
||||
*
|
||||
* The package is for loading included files, it may be null
|
||||
*/
|
||||
ScriptP parse(const String& s, bool string_mode, vector<ScriptParseError>& errors_out);
|
||||
ScriptP parse(const String& s, Packaged* package, bool string_mode, vector<ScriptParseError>& errors_out);
|
||||
|
||||
/// Parse a String to a Script
|
||||
/** If string_mode then s is interpreted as a string,
|
||||
@@ -30,7 +34,7 @@ ScriptP parse(const String& s, bool string_mode, vector<ScriptParseError>& error
|
||||
*
|
||||
* If an error is encountered, an exception is thrown.
|
||||
*/
|
||||
ScriptP parse(const String& s, bool string_mode = false);
|
||||
ScriptP parse(const String& s, Packaged* package = nullptr, bool string_mode = false);
|
||||
|
||||
// ----------------------------------------------------------------------------- : EOF
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user