WIP

Author: sdottaka

Src/FilterEngine/FilterEngine.cpp

@@ -39,31 +39,18 @@ void FilterContext::DefaultDestructor(YYSTYPE& yystype)
 
 void FilterContext::Clear()
 {
-	delete now;
-	delete today;
-	delete rootNode;
-	now = nullptr;
-	today = nullptr;
-	rootNode = nullptr;
+	now.reset();
+	today.reset();
+	rootNode.reset();
 	errorCode = 0;
 }
 
 void FilterContext::UpdateTimestamp()
 {
-	if (now)
-	{
-		delete now;
-		now = nullptr;
-	}
-	if (today)
-	{
-		delete today;
-		today = nullptr;
-	}
-	now = new Poco::Timestamp();
+	now.reset(new Poco::Timestamp());
 	Poco::LocalDateTime ldt(*now);
 	Poco::LocalDateTime midnight(ldt.year(), ldt.month(), ldt.day(), 0, 0, 0);
-	today = new Poco::Timestamp(midnight.timestamp());
+	today.reset(new Poco::Timestamp(midnight.timestamp()));
 }
 
 bool FilterEngine::Parse(const std::wstring& expression, FilterContext& ctxt)

Src/FilterEngine/FilterEngine.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include <string>
+#include <memory>
 
 class CDiffContext;
 class DIFFITEM;
@@ -21,9 +22,9 @@ struct FilterContext
 	void UpdateTimestamp();
 	void DefaultDestructor(YYSTYPE& yystype);
 	const CDiffContext* ctxt;
-	Poco::Timestamp* now;
-	Poco::Timestamp* today;
-	ExprNode* rootNode;
+	std::unique_ptr<Poco::Timestamp> now;
+	std::unique_ptr<Poco::Timestamp> today;
+	std::unique_ptr<ExprNode> rootNode;
 	int errorCode;
 };
 

Src/FilterEngine/FilterParser.c

@@ -1063,7 +1063,7 @@ static YYACTIONTYPE yy_reduce(
         YYMINORTYPE yylhsminor;
       case 0: /* filter_expr ::= or_expr */
 #line 28 "E:\\dev\\winmerge\\Src\\FilterEngine\\FilterParser.y"
-{ pCtx->rootNode = yymsp[0].minor.yy0.node; }
+{ pCtx->rootNode.reset(yymsp[0].minor.yy0.node); }
 #line 1067 "E:\\dev\\winmerge\\Src\\FilterEngine\\FilterParser.c"
         break;
       case 1: /* or_expr ::= or_expr OR and_expr */

Src/FilterEngine/FilterParser.y

@@ -25,7 +25,7 @@
 %parse_failure { pCtx->errorCode = FilterEngine::ERROR_PARSE_FAILURE; }
 %default_destructor { pCtx->DefaultDestructor($$); }
 
-filter_expr ::= or_expr(A). { pCtx->rootNode = A.node; }
+filter_expr ::= or_expr(A). { pCtx->rootNode.reset(A.node); }
 
 or_expr(A) ::= or_expr(B) OR and_expr(C).  { A.node = new OrNode(B.node, C.node); }
 or_expr(A) ::= and_expr(A).