LLL: properly support dashes (-) as part of variable names

This commit is contained in:
Alex Beregszaszi 2016-11-01 02:06:40 +00:00
parent dc5e05681d
commit ac3c8a553a

View File

@ -87,7 +87,7 @@ CodeFragment::CodeFragment(sp::utree const& _t, CompilerState& _s, bool _allowAS
m_asm.append(_s.args.at(s).m_asm); m_asm.append(_s.args.at(s).m_asm);
else if (_s.outers.count(s)) else if (_s.outers.count(s))
m_asm.append(_s.outers.at(s).m_asm); m_asm.append(_s.outers.at(s).m_asm);
else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_") == string::npos) else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_-") == string::npos)
{ {
auto it = _s.vars.find(s); auto it = _s.vars.find(s);
if (it == _s.vars.end()) if (it == _s.vars.end())
@ -581,7 +581,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
{ {
m_asm.appendJump(m_asm.errorTag()); m_asm.appendJump(m_asm.errorTag());
} }
else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_") == string::npos) else if (us.find_first_of("1234567890") != 0 && us.find_first_not_of("QWERTYUIOPASDFGHJKLZXCVBNM1234567890_-") == string::npos)
m_asm.append((u256)varAddress(s)); m_asm.append((u256)varAddress(s));
else else
error<InvalidOperation>("Unsupported keyword: '" + us + "'"); error<InvalidOperation>("Unsupported keyword: '" + us + "'");