if(token==string::npos)
expression.insert(StringMap::value_type(*i, "="));
else if(token==0 && (*i)[0]=='!')
- expression.insert(StringMap::value_type(*i, "!"));
+ expression.insert(StringMap::value_type(i->substr(1), "!"));
else
expression.insert(StringMap::value_type(i->substr(0, token), i->substr(token)));
}