amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

added 'string mode' to script parser; added Keyword and related classes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@85 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-11-21 14:35:14 +00:00
parent b6f1a9aac7
commit 7148d90bcb
14 changed files with 221 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions.cpp
+9
View File
@@ -291,6 +291,14 @@ SCRIPT_FUNCTION(substring) {
}
}
// does a string contain a substring?
SCRIPT_FUNCTION(contains) {
SCRIPT_PARAM(String, input);
SCRIPT_PARAM(String, match);
SCRIPT_RETURN(input.find(match) != String::npos);
}
// ----------------------------------------------------------------------------- : Vector stuff
/// position of some element in a vector
@@ -322,6 +330,7 @@ void init_script_functions(Context& ctx) {
ctx.setVariable(_("to lower"), script_to_lower);
ctx.setVariable(_("to title"), script_to_title);
ctx.setVariable(_("substring"), script_substring);
ctx.setVariable(_("contains"), script_contains);
ctx.setVariable(_("position"), script_position_of);
ctx.setVariable(_("number of items"), script_number_of_items);
}
src/script/parser.cpp
+51 -18
View File
@@ -44,11 +44,16 @@ struct Token {
inline operator != (const String& s) const { return type == TOK_STRING || value != s; }
};
enum OpenBrace
{ BRACE_STRING // "
, BRACE_STRING_MODE // fake brace for string mode
, BRACE_PAREN // (, [, {
};
/// Iterator over a string, one token at a time
class TokenIterator {
public:
TokenIterator(const String& str);
TokenIterator(const String& str, bool string_mode);
/// Peek at the next token, doesn't move to the one after that
/** Can peek further forward by using higher values of offset.
@@ -65,9 +70,9 @@ class TokenIterator {
private:
String input;
size_t pos;
vector<Token> buffer; ///< buffer of unread tokens, front() = current
stack<bool> open_braces; ///< braces we entered, true if the brace was from a smart string escape
bool newline; ///< Did we just pass a newline?
vector<Token> buffer; ///< buffer of unread tokens, front() = current
stack<OpenBrace> open_braces; ///< braces/quotes we entered from script mode
bool newline; ///< Did we just pass a newline?
// more input?
struct MoreInput {
String input;
@@ -96,11 +101,17 @@ bool isLongOper(const String& s) { return s==_(":=") || s==_("==") || s==_("!=")
// ----------------------------------------------------------------------------- : Tokenizing
TokenIterator::TokenIterator(const String& str)
TokenIterator::TokenIterator(const String& str, bool string_mode)
: input(str)
, pos(0)
, newline(false)
{}
{
if (string_mode) {
open_braces.push(BRACE_STRING_MODE);
putBack();//dummy
readStringToken();
}
}
const Token& TokenIterator::peek(size_t offset) {
// read the next token until we have enough
@@ -190,16 +201,16 @@ void TokenIterator::readToken() {
}
} else if (c==_('"')) {
// string
open_braces.push(BRACE_STRING);
readStringToken();
} else if (c == _('}') && !open_braces.empty() && open_braces.top()) {
} else if (c == _('}') && !open_braces.empty() && open_braces.top() != BRACE_PAREN) {
// closing smart string, resume to string parsing
// "a{e}b" --> "a" "{ e }" "b"
open_braces.pop();
addToken(TOK_RPAREN, _("}\""));
readStringToken();
} else if (isLparen(c)) {
// paranthesis/brace
open_braces.push(false);
open_braces.push(BRACE_PAREN);
addToken(TOK_LPAREN, String(1,c));
} else if (isRparen(c)) {
// paranthesis/brace
@@ -216,17 +227,26 @@ void TokenIterator::readToken() {
void TokenIterator::readStringToken() {
String str;
while (true) {
if (pos >= input.size()) throw ScriptParseError(_("Unexpected end of input in string constant"));
Char c = input[pos++]; //% input.GetChar(pos++);
if (pos >= input.size()) {
if (!open_braces.empty() && open_braces.top() == BRACE_STRING_MODE) {
// in string mode: end of input = end of string
addToken(TOK_STRING, str);
return;
} else {
throw ScriptParseError(_("Unexpected end of input in string constant"));
}
}
Char c = input.GetChar(pos++);
// parse the string constant
if (c == _('"')) {
if (c == _('"') && !open_braces.empty() && open_braces.top() == BRACE_STRING) {
// end of string
addToken(TOK_STRING, str);
open_braces.pop();
return;
} else if (c == _('\\')) {
// escape
if (pos >= input.size()) throw ScriptParseError(_("Unexpected end of input in string constant"));
c = input[pos++];
c = input.GetChar(pos++);
if (c == _('n')) str += _('\n');
if (c == _('<')) str += _('\1'); // escape for <
else str += c; // \ or { or "
@@ -234,7 +254,6 @@ void TokenIterator::readStringToken() {
// smart string
// "a{e}b" --> "a" "{ e }" "b"
addToken(TOK_STRING, str);
open_braces.push(true);
addToken(TOK_LPAREN, _("\"{"));
return;
} else {
@@ -280,8 +299,8 @@ void parseExpr(TokenIterator& input, Script& script, Precedence minPrec);
*/
void parseOper(TokenIterator& input, Script& script, Precedence minPrec, InstructionType closeWith = I_NOP, int closeWithData = 0);
ScriptP parse(const String& s) {
TokenIterator input(s);
ScriptP parse(const String& s, bool string_mode) {
TokenIterator input(s, string_mode);
ScriptP script(new Script);
parseOper(input, *script, PREC_ALL, I_RET);
if (input.peek() != TOK_EOF) {
@@ -500,9 +519,23 @@ void parseOper(TokenIterator& input, Script& script, Precedence minPrec, Instruc
}
} else if (minPrec <= PREC_STRING && token==_("\"{")) {
// for smart strings: "x" {{ e }} "y"
parseOper(input, script, PREC_ALL, I_BINARY, I_ADD); // e
// optimize: "" + e -> e
Instruction i = script.getInstructions().back();
if (i.instr == I_PUSH_CONST && String(*script.getConstants()[i.data]).empty()) {
script.getInstructions().pop_back();
parseOper(input, script, PREC_ALL); // e
} else {
parseOper(input, script, PREC_ALL, I_BINARY, I_ADD); // e
}
expectToken(input, _("}\""));
parseOper(input, script, PREC_NONE, I_BINARY, I_ADD); // y
parseOper(input, script, PREC_NONE); // y
// optimize: e + "" -> e
i = script.getInstructions().back();
if (i.instr == I_PUSH_CONST && String(*script.getConstants()[i.data]).empty()) {
script.getInstructions().pop_back();
} else {
script.addInstruction(I_BINARY, I_ADD);
}
} else if (minPrec <= PREC_NEWLINE && token.newline) {
// newline functions as ;
// only if we don't match another token!
src/script/parser.hpp
+5 -2
View File
@@ -14,8 +14,11 @@
// ----------------------------------------------------------------------------- : Parser
// Parse a String to a Script
ScriptP parse(const String& s);
/// Parse a String to a Script
/** If string_mode then s is interpreted as a string,
* escaping to script mode can be done with {}
*/
ScriptP parse(const String& s, bool string_mode = false);
// ----------------------------------------------------------------------------- : EOF
#endif
src/script/script.hpp
+2
View File
@@ -134,6 +134,8 @@ class Script : public ScriptValue {
/// Get access to the vector of instructions
inline vector<Instruction>& getInstructions() { return instructions; }
/// Get access to the vector of constants
inline vector<ScriptValueP>& getConstants() { return constants; }
/// Output the instructions in a human readable format
String dumpScript() const;
src/script/scriptable.cpp
+2 -2
View File
@@ -38,9 +38,9 @@ ScriptValueP OptionalScript::invoke(Context& ctx, bool open_scope) const {
}
}
void OptionalScript::parse(Reader& reader) {
void OptionalScript::parse(Reader& reader, bool string_mode) {
try {
script = ::parse(unparsed);
script = ::parse(unparsed, string_mode);
} catch (const ParseError& e) {
reader.warning(e.what());
}
src/script/scriptable.hpp
+3 -1
View File
@@ -77,7 +77,7 @@ class OptionalScript {
ScriptP script; ///< The script, may be null if there is no script
String unparsed; ///< Unparsed script, for writing back to a file
// parse the unparsed string, while reading
void parse(Reader&);
void parse(Reader&, bool string_mode = false);
DECLARE_REFLECTION();
template <typename T> friend class Scriptable;
};
@@ -126,6 +126,8 @@ void Reader::handle(Scriptable<T>& s) {
if (starts_with(s.script.unparsed, _("script:"))) {
s.script.unparsed = s.script.unparsed.substr(7);
s.script.parse(*this);
} else if (s.script.unparsed.find_first_of('{') != String.npos) {
s.script.parse(*this, true);
} else {
handle(s.value);
}
src/script/value.cpp
+11
View File
@@ -170,6 +170,14 @@ class ScriptString : public ScriptValue {
throw ScriptError(_("Not a number: '") + value + _("'"));
}
}
virtual operator Color() const {
UInt r,g,b;
if (wxSscanf(value.c_str(),_("rgb(%u,%u,%u)"),&r,&g,&b)) {
return Color(r, g, b);
} else {
throw ScriptError(_("Not a color: '") + value + _("'"));
}
}
virtual int itemCount() const { return (int)value.size(); }
virtual ScriptValueP getMember(const String& name) const {
// get member returns characters
@@ -198,6 +206,9 @@ class ScriptColor : public ScriptValue {
virtual ScriptType type() const { return SCRIPT_COLOR; }
virtual String typeName() const { return _("color"); }
virtual operator Color() const { return value; }
virtual operator String() const {
return String::Format(_("rgb(%u,%u,%u)"), value.Red(), value.Green(), value.Blue());
}
private:
Color value;
};