Use unique pointers in CXFA_FMParse

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 17 matching lines @@
 
 void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 
 void CXFA_FMExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {}
 
 CXFA_FMFunctionDefinition::CXFA_FMFunctionDefinition(
     uint32_t line,
     bool isGlobal,
     const CFX_WideStringC& wsName,
     std::unique_ptr<CFX_WideStringCArray> pArguments,
-    CFX_ArrayTemplate<CXFA_FMExpression*>* pExpressions)
+    std::vector<std::unique_ptr<CXFA_FMExpression>>&& pExpressions)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_FUNC),
       m_wsName(wsName),
       m_pArguments(std::move(pArguments)),
-      m_pExpressions(pExpressions),
+      m_pExpressions(std::move(pExpressions)),
       m_isGlobal(isGlobal) {}
 
-CXFA_FMFunctionDefinition::~CXFA_FMFunctionDefinition() {
-  if (m_pExpressions) {
-    for (int i = 0; i < m_pExpressions->GetSize(); ++i)
-      delete m_pExpressions->GetAt(i);
-
-    delete m_pExpressions;
-  }
-}
+CXFA_FMFunctionDefinition::~CXFA_FMFunctionDefinition() {}
 
 void CXFA_FMFunctionDefinition::ToJavaScript(CFX_WideTextBuf& javascript) {
-  if (m_isGlobal && (!m_pExpressions || m_pExpressions->GetSize() == 0)) {
+  if (m_isGlobal && m_pExpressions.empty()) {
     javascript << FX_WSTRC(L"// comments only");
     return;
   }
   if (m_isGlobal) {
     javascript << FX_WSTRC(L"(\n");
   }
   javascript << FX_WSTRC(L"function ");
   if (m_wsName.GetAt(0) == L'!') {
     CFX_WideString tempName = EXCLAMATION_IN_IDENTIFIER + m_wsName.Mid(1);
     javascript << tempName;
@@ skipping 14 matching lines @@
       }
       if (i + 1 < m_pArguments->GetSize()) {
         javascript << FX_WSTRC(L", ");
       }
     }
   }
   javascript << FX_WSTRC(L")\n{\n");
   javascript << FX_WSTRC(L"var ");
   javascript << RUNTIMEFUNCTIONRETURNVALUE;
   javascript << FX_WSTRC(L" = null;\n");
-  if (m_pExpressions) {
-    for (int i = 0; i < m_pExpressions->GetSize(); ++i) {
-      CXFA_FMExpression* e = m_pExpressions->GetAt(i);
-      if (i + 1 < m_pExpressions->GetSize()) {
-        e->ToJavaScript(javascript);
-      } else {
-        e->ToImpliedReturnJS(javascript);
-      }
+  for (size_t i = 0; i < m_pExpressions.size(); ++i) {
+    CXFA_FMExpression* e = m_pExpressions.at(i).get();

[Tom Sepez, 2016/11/28 18:09:11]

nit: or just const auto& e = m_pExpressions[i]; since operator-> works on this
as if it were a real pointer.

[npm, 2016/11/28 20:04:39]

Done.

+    if (i + 1 < m_pExpressions.size()) {
+      e->ToJavaScript(javascript);
+    } else {
+      e->ToImpliedReturnJS(javascript);
     }
   }
   javascript << FX_WSTRC(L"return ");
   if (m_isGlobal) {
     javascript << XFA_FM_EXPTypeToString(GETFMVALUE);
     javascript << FX_WSTRC(L"(");
     javascript << RUNTIMEFUNCTIONRETURNVALUE;
     javascript << FX_WSTRC(L")");
   } else {
     javascript << RUNTIMEFUNCTIONRETURNVALUE;
@@ skipping 95 matching lines @@
       javascript << RUNTIMEFUNCTIONRETURNVALUE;
       javascript << FX_WSTRC(L" = ");
       m_pExpression->ToJavaScript(javascript);
       javascript << FX_WSTRC(L";\n");
     }
   }
 }
 
 CXFA_FMBlockExpression::CXFA_FMBlockExpression(
     uint32_t line,
-    CFX_ArrayTemplate<CXFA_FMExpression*>* pExpressionList)
+    std::vector<std::unique_ptr<CXFA_FMExpression>>&& pExpressionList)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BLOCK),
-      m_pExpressionList(pExpressionList) {}
+      m_ExpressionList(std::move(pExpressionList)) {}
 
-CXFA_FMBlockExpression::~CXFA_FMBlockExpression() {
-  if (m_pExpressionList) {
-    for (int i = 0; i < m_pExpressionList->GetSize(); ++i)
-      delete m_pExpressionList->GetAt(i);
-
-    delete m_pExpressionList;
-  }
-}
+CXFA_FMBlockExpression::~CXFA_FMBlockExpression() {}
 
 void CXFA_FMBlockExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"{\n");
-  if (m_pExpressionList) {
-    for (int i = 0; i < m_pExpressionList->GetSize(); ++i)
-      m_pExpressionList->GetAt(i)->ToJavaScript(javascript);
-  }
+  for (size_t i = 0; i < m_ExpressionList.size(); ++i)

[Tom Sepez, 2016/11/28 18:09:11]

nit: or just 

  for (const auto& expr : m_ExpressionList)
    expr->ToJavaScript(javascript);

you could do the same thing in the other loops, but your "last item" check would
become something like 

   if (expr == m_ExpressionList.back())

which may read a little clearer that the 1+1 == size().

[npm, 2016/11/28 20:04:39]

Done.

+    m_ExpressionList.at(i)->ToJavaScript(javascript);
   javascript << FX_WSTRC(L"}\n");
 }
 
 void CXFA_FMBlockExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"{\n");
-  if (m_pExpressionList) {
-    for (int i = 0; i < m_pExpressionList->GetSize(); ++i) {
-      CXFA_FMExpression* e = m_pExpressionList->GetAt(i);
-      if (i + 1 == m_pExpressionList->GetSize()) {
-        e->ToImpliedReturnJS(javascript);
-      } else {
-        e->ToJavaScript(javascript);
-      }
+  for (size_t i = 0; i < m_ExpressionList.size(); ++i) {
+    CXFA_FMExpression* e = m_ExpressionList.at(i).get();
+    if (i + 1 == m_ExpressionList.size()) {
+      e->ToImpliedReturnJS(javascript);
+    } else {
+      e->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() {}
@@ skipping 357 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");
 }