1 files changed, 24 insertions, 24 deletions
diff --git a/fuzzylite/src/rule/Expression.cpp b/fuzzylite/src/rule/Expression.cpp
index ea7873e..9b0ab81 100644
--- a/fuzzylite/src/rule/Expression.cpp
+++ b/fuzzylite/src/rule/Expression.cpp
@@ -1,25 +1,17 @@
 /*
- Author: Juan Rada-Vilela, Ph.D.
- Copyright (C) 2010-2014 FuzzyLite Limited
- All rights reserved
+ fuzzylite (R), a fuzzy logic control library in C++.
+ Copyright (C) 2010-2017 FuzzyLite Limited. All rights reserved.
+ Author: Juan Rada-Vilela, Ph.D. <jcrada@fuzzylite.com>
 
  This file is part of fuzzylite.
 
  fuzzylite is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
+ the terms of the FuzzyLite License included with the software.
 
- fuzzylite is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with fuzzylite.  If not, see <http://www.gnu.org/licenses/>.
-
- fuzzylite™ is a trademark of FuzzyLite Limited.
+ You should have received a copy of the FuzzyLite License along with
+ fuzzylite. If not, see <http://www.fuzzylite.com/license/>.
 
+ fuzzylite is a registered trademark of FuzzyLite Limited.
  */
 
 #include "fl/rule/Expression.h"
@@ -31,18 +23,22 @@
 
 namespace fl {
 
-    Expression::Expression() {
-    }
+    Expression::Expression() { }
 
-    Expression::~Expression() {
-    }
+    Expression::~Expression() { }
 
-    Proposition::Proposition()
-    : Expression(), variable(fl::null), term(fl::null) {
-    }
+    Proposition::Proposition() : Expression(),
+    variable(fl::null), term(fl::null) { }
 
     Proposition::~Proposition() {
+        for (std::size_t i = 0; i < hedges.size(); ++i) {
+            delete hedges.at(i);
+        }
+        hedges.clear();
+    }
 
+    Expression::Type Proposition::type() const {
+        return Expression::Proposition;
     }
 
     std::string Proposition::toString() const {
@@ -68,14 +64,18 @@ namespace fl {
         return ss.str();
     }
 
-    Operator::Operator() : Expression(), name(""), left(fl::null), right(fl::null) {
-    }
+    Operator::Operator() : Expression(),
+    name(""), left(fl::null), right(fl::null) { }
 
     Operator::~Operator() {
         if (left) delete left;
         if (right) delete right;
     }
 
+    Expression::Type Operator::type() const {
+        return Expression::Operator;
+    }
+
     std::string Operator::toString() const {
         return name;
     }