vaclavt/mlisp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
VaclavT
2021-09-23 23:03:54 +02:00
parent 48f46289d6
commit 7f793bde61
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usql/main.cpp
View File

@@ -148,7 +148,7 @@ void debug() {
"insert into a (i, s, b) values(1, upper('zero'), 'Y')",
"insert into a (i, s, b, f) values(1 + 10000, upper('one'), 'N', 3.1415)",
"insert into a (i, s, f) values(2 + 10000, upper('two'), 9.1415)",
"select * from a order by i",
"select pp(f * 100, \"%.2f\"), i from a order by i",
// "select min(i), max(f), count(*) from a where b is not null",
// "select * from a where b is null",
// "select * from a where b is not null",

2
usql/parser.cpp
View File

@@ -424,7 +424,7 @@ namespace usql {
m_lexer.skipToken(TokenType::open_paren);
while (m_lexer.tokenType() != TokenType::close_paren && m_lexer.tokenType() != TokenType::eof) {
pars.push_back(parse_value());
pars.push_back(parse_expression());
m_lexer.skipTokenOptional(TokenType::comma);
}
m_lexer.skipToken(TokenType::close_paren);

2
usql/usql.cpp
View File

@@ -309,6 +309,8 @@ std::unique_ptr<ValueNode> USql::pp_function(const std::vector<std::unique_ptr<V
if (format == "100%")
std::snprintf(buf, 20, "%.2f%%", value);
else if (format == "%.2f")
std::snprintf(buf, 20, "%.2f", value);
else if (value >= 1000000000000)
std::snprintf(buf, 20, "%7.2fT", value/1000000000000);
else if (value >= 1000000000)