From 68dd884b1fbf4ffc8fa05d46e1c0681cdb238d7c Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 18 Mar 2014 21:23:30 +0400 Subject: [PATCH] dbms: tiny modification [#METR-10489]. --- dbms/src/Parsers/formatAST.cpp | 39 ++++++++++++++++------------------ 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/dbms/src/Parsers/formatAST.cpp b/dbms/src/Parsers/formatAST.cpp index 04d3e459aeb..556a2e6a53e 100644 --- a/dbms/src/Parsers/formatAST.cpp +++ b/dbms/src/Parsers/formatAST.cpp @@ -565,33 +565,30 @@ void formatAST(const ASTFunction & ast, std::ostream & s, size_t indent, bool } } - if (!written && ast.arguments->children.size() >= 1) + if (!written && ast.arguments->children.size() >= 1 && 0 == strcmp(ast.name.c_str(), "array")) { - if (!written && 0 == strcmp(ast.name.c_str(), "array")) + s << (hilite ? hilite_operator : "") << '[' << (hilite ? hilite_none : ""); + for (size_t i = 0; i < ast.arguments->children.size(); ++i) { - s << (hilite ? hilite_operator : "") << '[' << (hilite ? hilite_none : ""); - for (size_t i = 0; i < ast.arguments->children.size(); ++i) - { - if (i != 0) - s << ", "; - formatAST(*ast.arguments->children[i], s, indent, hilite, one_line, false); - } - s << (hilite ? hilite_operator : "") << ']' << (hilite ? hilite_none : ""); - written = true; + if (i != 0) + s << ", "; + formatAST(*ast.arguments->children[i], s, indent, hilite, one_line, false); } + s << (hilite ? hilite_operator : "") << ']' << (hilite ? hilite_none : ""); + written = true; + } - if (!written && 0 == strcmp(ast.name.c_str(), "tuple") && ast.arguments->children.size() >= 2) + if (!written && ast.arguments->children.size() >= 2 && 0 == strcmp(ast.name.c_str(), "tuple")) + { + s << (hilite ? hilite_operator : "") << '(' << (hilite ? hilite_none : ""); + for (size_t i = 0; i < ast.arguments->children.size(); ++i) { - s << (hilite ? hilite_operator : "") << '(' << (hilite ? hilite_none : ""); - for (size_t i = 0; i < ast.arguments->children.size(); ++i) - { - if (i != 0) - s << ", "; - formatAST(*ast.arguments->children[i], s, indent, hilite, one_line, false); - } - s << (hilite ? hilite_operator : "") << ')' << (hilite ? hilite_none : ""); - written = true; + if (i != 0) + s << ", "; + formatAST(*ast.arguments->children[i], s, indent, hilite, one_line, false); } + s << (hilite ? hilite_operator : "") << ')' << (hilite ? hilite_none : ""); + written = true; } }