From kde-commits Wed Sep 30 20:44:36 2015 From: Jan Marker Date: Wed, 30 Sep 2015 20:44:36 +0000 To: kde-commits Subject: [qmlweb/development/qmlweb2] src/qmljsc: [Compiler] Fix coding-style Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=144364589121998 Git commit 3288170eb679f9a0dab8d7ca3d882a0d58ade6d8 by Jan Marker. Committed on 30/09/2015 at 20:41. Pushed by jangmarker into branch 'development/qmlweb2'. [Compiler] Fix coding-style M +17 -17 src/qmljsc/purejavascriptgenerator.cpp http://commits.kde.org/qmlweb/3288170eb679f9a0dab8d7ca3d882a0d58ade6d8 diff --git a/src/qmljsc/purejavascriptgenerator.cpp b/src/qmljsc/purejavasc= riptgenerator.cpp index 4872158..d0b8bd2 100644 --- a/src/qmljsc/purejavascriptgenerator.cpp +++ b/src/qmljsc/purejavascriptgenerator.cpp @@ -147,7 +147,7 @@ bool PureJavaScriptGenerator::visit(AST::NullExpression= *) { } = bool PureJavaScriptGenerator::visit(AST::NumericLiteral *numericLiteral) { - m_outputStack<< QString::number(numericLiteral->value); + m_outputStack << QString::number(numericLiteral->value); return true; } = @@ -197,8 +197,8 @@ void PureJavaScriptGenerator::endVisit(AST::ArgumentLis= t *argumentList) { } = void PureJavaScriptGenerator::endVisit(AST::ArrayLiteral *arrayLiteral) { - const QString elision =3D (arrayLiteral->elision)?m_outputStack.pop():= ""; - const QString elements =3D (arrayLiteral->elements)?m_outputStack.pop(= ):""; + const QString elision =3D (arrayLiteral->elision) ? m_outputStack.pop(= ) : ""; + const QString elements =3D (arrayLiteral->elements) ? m_outputStack.po= p() : ""; m_outputStack << '[' + elements + elision + ']'; } = @@ -222,7 +222,7 @@ void PureJavaScriptGenerator::endVisit(AST::Block *) { } = void PureJavaScriptGenerator::endVisit(AST::CallExpression *callExpression= ) { - const QString arguments =3D (callExpression->arguments)?m_outputStack.= pop():""; + const QString arguments =3D (callExpression->arguments) ? m_outputStac= k.pop() : ""; const QString function =3D m_outputStack.pop(); m_outputStack << function + '(' + arguments + ')'; } @@ -345,9 +345,9 @@ void PureJavaScriptGenerator::endVisit(AST::ForEachStat= ement *) { = void PureJavaScriptGenerator::endVisit(AST::ForStatement *forStatement) { const QString statement =3D m_outputStack.pop(); - const QString incrementExpression =3D (forStatement->expression)?m_out= putStack.pop():""; - const QString condition =3D (forStatement->condition)?m_outputStack.po= p():""; - const QString initialisation =3D (forStatement->initialiser)?m_outputS= tack.pop():""; + const QString incrementExpression =3D (forStatement->expression) ? m_o= utputStack.pop() : ""; + const QString condition =3D (forStatement->condition) ? m_outputStack.= pop() : ""; + const QString initialisation =3D (forStatement->initialiser) ? m_outpu= tStack.pop() : ""; m_outputStack << "for(" + initialisation + ';' + condition + ';' + inc= rementExpression + ')' + statement; } = @@ -364,8 +364,8 @@ void PureJavaScriptGenerator::endVisit(AST::FunctionDec= laration *functionDeclara } = void PureJavaScriptGenerator::endVisit(AST::FunctionExpression *functionEx= pression) { - const QString body =3D (functionExpression->body)?m_outputStack.pop():= "{}"; - const QString parameters =3D (functionExpression->formals)?m_outputSta= ck.pop():""; + const QString body =3D (functionExpression->body) ? m_outputStack.pop(= ) : "{}"; + const QString parameters =3D (functionExpression->formals) ? m_outputS= tack.pop() : ""; const QString name =3D functionExpression->name.toString(); m_outputStack << "function " + name + '(' + parameters + ')' + body; } @@ -399,9 +399,9 @@ void PureJavaScriptGenerator::endVisit(AST::LocalForEac= hStatement *) { = void PureJavaScriptGenerator::endVisit(AST::LocalForStatement *localForSta= tement) { const QString statement =3D m_outputStack.pop(); - const QString incrementExpression =3D (localForStatement->expression)?= m_outputStack.pop():""; - const QString condition =3D (localForStatement->condition)?m_outputSta= ck.pop():""; - const QString declaration =3D (localForStatement->declarations)?m_outp= utStack.pop():""; + const QString incrementExpression =3D (localForStatement->expression) = ? m_outputStack.pop() : ""; + const QString condition =3D (localForStatement->condition) ? m_outputS= tack.pop() : ""; + const QString declaration =3D (localForStatement->declarations) ? m_ou= tputStack.pop() : ""; m_outputStack << "for(" + declaration + ';' + condition + ';' + increm= entExpression + ')' + statement; } = @@ -411,7 +411,7 @@ void PureJavaScriptGenerator::endVisit(AST::NewExpressi= on *) { } = void PureJavaScriptGenerator::endVisit(AST::NewMemberExpression *newMember= Expression) { - const QString arguments =3D (newMemberExpression->arguments)?m_outputS= tack.pop():""; + const QString arguments =3D (newMemberExpression->arguments) ? m_outpu= tStack.pop() : ""; const QString constructor =3D m_outputStack.pop(); m_outputStack << "new " + constructor + '(' + arguments + ')'; } @@ -459,8 +459,8 @@ void PureJavaScriptGenerator::endVisit(AST::PropertyAss= ignmentList *assignmentLi } = void PureJavaScriptGenerator::endVisit(AST::PropertyGetterSetter *getterSe= tter) { - const QString functionBody =3D (getterSetter->functionBody)?m_outputSt= ack.pop():"{}"; - const QString parameters =3D (getterSetter->formals)?m_outputStack.pop= ():""; + const QString functionBody =3D (getterSetter->functionBody) ? m_output= Stack.pop() : "{}"; + const QString parameters =3D (getterSetter->formals) ? m_outputStack.p= op() : ""; const QString propertyName =3D m_outputStack.pop(); if (getterSetter->type =3D=3D AST::PropertyGetterSetter::Getter) { m_outputStack << "get " + propertyName + "()" + functionBody; @@ -508,8 +508,8 @@ void PureJavaScriptGenerator::endVisit(AST::TildeExpres= sion *) { } = void PureJavaScriptGenerator::endVisit(AST::TryStatement *tryStatement) { - const QString finallyExpression =3D (tryStatement->finallyExpression)?= m_outputStack.pop():""; - const QString catchExpression =3D (tryStatement->catchExpression)?m_ou= tputStack.pop():""; + const QString finallyExpression =3D (tryStatement->finallyExpression) = ? m_outputStack.pop() : ""; + const QString catchExpression =3D (tryStatement->catchExpression) ? m_= outputStack.pop() : ""; const QString block =3D m_outputStack.pop(); m_outputStack << "try" + block + catchExpression + finallyExpression; }