Use unique_ptr in CFXA_FM expressions

xfa/fxfa/fm2js/xfa_expression.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/fm2js/xfa_expression.h"
 
 #include <utility>
 
@@ skipping 85 matching lines @@
     javascript << RUNTIMEFUNCTIONRETURNVALUE;
   }
   javascript << FX_WSTRC(L";\n}\n");
   if (m_isGlobal) {
     javascript << FX_WSTRC(L").call(this);\n");
   }
 }
 
 void CXFA_FMFunctionDefinition::ToImpliedReturnJS(CFX_WideTextBuf&) {}
 
-CXFA_FMVarExpression::CXFA_FMVarExpression(uint32_t line,
-                                           const CFX_WideStringC& wsName,
-                                           CXFA_FMExpression* pInit)
+CXFA_FMVarExpression::CXFA_FMVarExpression(
+    uint32_t line,
+    const CFX_WideStringC& wsName,
+    std::unique_ptr<CXFA_FMExpression> pInit)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_VAR),
       m_wsName(wsName),
-      m_pInit(pInit) {}
+      m_pInit(std::move(pInit)) {}
 
 CXFA_FMVarExpression::~CXFA_FMVarExpression() {}
 
 void CXFA_FMVarExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"var ");
   CFX_WideString tempName(m_wsName);
   if (m_wsName.GetAt(0) == L'!') {
     tempName = EXCLAMATION_IN_IDENTIFIER + m_wsName.Mid(1);
   }
   javascript << tempName;
@@ skipping 29 matching lines @@
     javascript << FX_WSTRC(L");\n");
   } else {
     javascript << FX_WSTRC(L"\"\";\n");
   }
   javascript << RUNTIMEFUNCTIONRETURNVALUE;
   javascript << FX_WSTRC(L" = ");
   javascript << tempName;
   javascript << FX_WSTRC(L";\n");
 }
 
-CXFA_FMExpExpression::CXFA_FMExpExpression(uint32_t line,
-                                           CXFA_FMSimpleExpression* pExpression)
-    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_EXP), m_pExpression(pExpression) {}
+CXFA_FMExpExpression::CXFA_FMExpExpression(
+    uint32_t line,
+    std::unique_ptr<CXFA_FMSimpleExpression> pExpression)
+    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_EXP),
+      m_pExpression(std::move(pExpression)) {}
 
 CXFA_FMExpExpression::~CXFA_FMExpExpression() {}
 
 void CXFA_FMExpExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   if (m_pExpression->GetOperatorToken() == TOKassign) {
     m_pExpression->ToJavaScript(javascript);
   } else {
     m_pExpression->ToJavaScript(javascript);
     javascript << FX_WSTRC(L";\n");
   }
@@ skipping 42 matching lines @@
   javascript << FX_WSTRC(L"{\n");
   for (const auto& expr : m_ExpressionList) {
     if (expr == m_ExpressionList.back())
       expr->ToImpliedReturnJS(javascript);
     else
       expr->ToJavaScript(javascript);
   }
   javascript << FX_WSTRC(L"}\n");
 }
 
-CXFA_FMDoExpression::CXFA_FMDoExpression(uint32_t line,
-                                         CXFA_FMExpression* pList)
-    : CXFA_FMExpression(line), m_pList(pList) {}
+CXFA_FMDoExpression::CXFA_FMDoExpression(
+    uint32_t line,
+    std::unique_ptr<CXFA_FMExpression> pList)
+    : CXFA_FMExpression(line), m_pList(std::move(pList)) {}
 
 CXFA_FMDoExpression::~CXFA_FMDoExpression() {}
 
 void CXFA_FMDoExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   m_pList->ToJavaScript(javascript);
 }
 
 void CXFA_FMDoExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   m_pList->ToImpliedReturnJS(javascript);
 }
 
-CXFA_FMIfExpression::CXFA_FMIfExpression(uint32_t line,
-                                         CXFA_FMSimpleExpression* pExpression,
-                                         CXFA_FMExpression* pIfExpression,
-                                         CXFA_FMExpression* pElseExpression)
+CXFA_FMIfExpression::CXFA_FMIfExpression(
+    uint32_t line,
+    std::unique_ptr<CXFA_FMSimpleExpression> pExpression,
+    std::unique_ptr<CXFA_FMExpression> pIfExpression,
+    std::unique_ptr<CXFA_FMExpression> pElseExpression)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_IF),
-      m_pExpression(pExpression),
-      m_pIfExpression(pIfExpression),
-      m_pElseExpression(pElseExpression) {}
+      m_pExpression(std::move(pExpression)),
+      m_pIfExpression(std::move(pIfExpression)),
+      m_pElseExpression(std::move(pElseExpression)) {}
 
 CXFA_FMIfExpression::~CXFA_FMIfExpression() {}
 
 void CXFA_FMIfExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"if (");
   if (m_pExpression) {
     javascript << XFA_FM_EXPTypeToString(GETFMVALUE);
     javascript << FX_WSTRC(L"(");
     m_pExpression->ToJavaScript(javascript);
     javascript << FX_WSTRC(L")");
@@ skipping 43 matching lines @@
 }
 
 CXFA_FMLoopExpression::~CXFA_FMLoopExpression() {}
 
 void CXFA_FMLoopExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 
 void CXFA_FMLoopExpression::ToImpliedReturnJS(CFX_WideTextBuf&) {}
 
 CXFA_FMWhileExpression::CXFA_FMWhileExpression(
     uint32_t line,
-    CXFA_FMSimpleExpression* pCondition,
-    CXFA_FMExpression* pExpression)
+    std::unique_ptr<CXFA_FMSimpleExpression> pCondition,
+    std::unique_ptr<CXFA_FMExpression> pExpression)
     : CXFA_FMLoopExpression(line),
-      m_pCondition(pCondition),
-      m_pExpression(pExpression) {}
+      m_pCondition(std::move(pCondition)),
+      m_pExpression(std::move(pExpression)) {}
 
 CXFA_FMWhileExpression::~CXFA_FMWhileExpression() {}
 
 void CXFA_FMWhileExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"while (");
   m_pCondition->ToJavaScript(javascript);
   javascript << FX_WSTRC(L")\n");
   m_pExpression->ToJavaScript(javascript);
 }
 
@@ skipping 33 matching lines @@
   javascript << FX_WSTRC(L" = 0;\n");
   javascript << FX_WSTRC(L"continue;\n");
 }
 
 void CXFA_FMContinueExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << RUNTIMEFUNCTIONRETURNVALUE;
   javascript << FX_WSTRC(L" = 0;\n");
   javascript << FX_WSTRC(L"continue;\n");
 }
 
-CXFA_FMForExpression::CXFA_FMForExpression(uint32_t line,
-                                           const CFX_WideStringC& wsVariant,
-                                           CXFA_FMSimpleExpression* pAssignment,
-                                           CXFA_FMSimpleExpression* pAccessor,
-                                           int32_t iDirection,
-                                           CXFA_FMSimpleExpression* pStep,
-                                           CXFA_FMExpression* pList)
+CXFA_FMForExpression::CXFA_FMForExpression(
+    uint32_t line,
+    const CFX_WideStringC& wsVariant,
+    std::unique_ptr<CXFA_FMSimpleExpression> pAssignment,
+    std::unique_ptr<CXFA_FMSimpleExpression> pAccessor,
+    int32_t iDirection,
+    std::unique_ptr<CXFA_FMSimpleExpression> pStep,
+    std::unique_ptr<CXFA_FMExpression> pList)
     : CXFA_FMLoopExpression(line),
       m_wsVariant(wsVariant),
-      m_pAssignment(pAssignment),
-      m_pAccessor(pAccessor),
+      m_pAssignment(std::move(pAssignment)),
+      m_pAccessor(std::move(pAccessor)),
       m_iDirection(iDirection),
-      m_pStep(pStep),
-      m_pList(pList) {}
+      m_pStep(std::move(pStep)),
+      m_pList(std::move(pList)) {}
 
 CXFA_FMForExpression::~CXFA_FMForExpression() {}
 
 void CXFA_FMForExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"{\nvar ");
   CFX_WideString tempVariant;
   if (m_wsVariant.GetAt(0) == L'!') {
     tempVariant = EXCLAMATION_IN_IDENTIFIER + m_wsVariant.Mid(1);
     javascript << tempVariant;
   } else {
@@ skipping 87 matching lines @@
   }
   javascript << FX_WSTRC(L")\n");
   m_pList->ToImpliedReturnJS(javascript);
   javascript << FX_WSTRC(L"}\n");
 }
 
 CXFA_FMForeachExpression::CXFA_FMForeachExpression(
     uint32_t line,
     const CFX_WideStringC& wsIdentifier,
     std::vector<std::unique_ptr<CXFA_FMSimpleExpression>>&& pAccessors,
-    CXFA_FMExpression* pList)
+    std::unique_ptr<CXFA_FMExpression> pList)
     : CXFA_FMLoopExpression(line),
       m_wsIdentifier(wsIdentifier),
       m_pAccessors(std::move(pAccessors)),
-      m_pList(pList) {}
+      m_pList(std::move(pList)) {}
 
 CXFA_FMForeachExpression::~CXFA_FMForeachExpression() {}
 
 void CXFA_FMForeachExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"{\n");
   javascript << FX_WSTRC(L"var ");
   if (m_wsIdentifier.GetAt(0) == L'!') {
     CFX_WideString tempIdentifier =
         EXCLAMATION_IN_IDENTIFIER + m_wsIdentifier.Mid(1);
     javascript << tempIdentifier;
@@ skipping 79 matching lines @@
   }
   javascript << FX_WSTRC(L" = ");
   javascript << RUNTIMEBLOCKTEMPARRAY;
   javascript << FX_WSTRC(L"[");
   javascript << RUNTIMEBLOCKTEMPARRAYINDEX;
   javascript << FX_WSTRC(L"++];\n");
   m_pList->ToImpliedReturnJS(javascript);
   javascript << FX_WSTRC(L"}\n");
   javascript << FX_WSTRC(L"}\n");
 }