sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

"div", or "//", is now the operator of division.

Browse source
This commit is contained in:
John Wiegley 2009-01-31 01:21:14 -04:00
parent 75f1cd727c
commit c5795c66c9
2 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/op.cc
View file

@ -291,7 +291,7 @@ bool expr_t::op_t::print(std::ostream& out, const context_t& context) const
out << "(";
if (left() && left()->print(out, context))
found = true;
out << " / ";
out << " // ";
if (has_right() && right()->print(out, context))
found = true;
out << ")";

45
src/token.cc
View file

@ -38,12 +38,11 @@ int expr_t::token_t::parse_reserved_word(std::istream& in)
{
char c = in.peek();
if (c == 'a' || c == 'f' || c == 'o' || c == 'n' || c == 't') {
if (c == 'a' || c == 'd' || c == 'f' || c == 'o' || c == 'n' || c == 't') {
length = 0;
char buf[256];
READ_INTO_(in, buf, 255, c, length,
std::isalnum(c) || c == '_' || c == '.' || c == '-');
char buf[5];
READ_INTO_(in, buf, 4, c, length, std::isalpha(c));
switch (buf[0]) {
case 'a':
@ -55,6 +54,16 @@ int expr_t::token_t::parse_reserved_word(std::istream& in)
}
break;
case 'd':
if (std::strcmp(buf, "div") == 0) {
symbol[0] = '/';
symbol[1] = '/';
symbol[2] = '\0';
kind = KW_DIV;
return 1;
}
break;
case 'f':
if (std::strcmp(buf, "false") == 0) {
kind = VALUE;
@ -255,17 +264,25 @@ void expr_t::token_t::next(std::istream& in, const uint_least8_t pflags)
case '/': {
in.get(c);
c = in.peek();
if (c == '/') {
in.get(c);
symbol[1] = c;
symbol[2] = '\0';
kind = KW_DIV;
length = 2;
} else {
// Read in the regexp
char buf[256];
READ_INTO_(in, buf, 255, c, length, c != '/');
if (c != '/')
expected('/', c);
in.get(c);
length++;
// Read in the regexp
char buf[256];
READ_INTO_(in, buf, 255, c, length, c != '/');
if (c != '/')
expected('/', c);
in.get(c);
length++;
kind = MASK;
value.set_string(buf);
kind = MASK;
value.set_string(buf);
}
break;
}