Performance Enhancements

Author: HammerMaximilian

fUML-CPP/fuml/src/fuml/semantics/activities/ControlToken.cpp

@@ -32,9 +32,9 @@ bool ControlToken::isControl()
 	return true;
 }
 
-ValuePtr ControlToken::getValue()
+const ValuePtr& ControlToken::getValue()
 {
 	// Control tokens do not have values.
-
-	return nullptr;
+	static const ValuePtr null = nullptr;
+	return null;
 }

fUML-CPP/fuml/src/fuml/semantics/activities/ControlToken.h

@@ -20,7 +20,7 @@ namespace fuml::semantics::activities
 			virtual bool equals(const TokenPtr&) override;
 			virtual TokenPtr copy() override;
 			virtual bool isControl() override;
-			virtual ValuePtr getValue() override;
+			virtual const ValuePtr& getValue() override;
 
 	};
 // ControlToken

fUML-CPP/fuml/src/fuml/semantics/activities/ForkedToken.cpp

@@ -61,7 +61,7 @@ bool ForkedToken::equals(const TokenPtr& otherToken)
 	return (this->thisForkedTokenPtr.lock() == otherToken);
 }
 
-ValuePtr ForkedToken::getValue()
+const ValuePtr& ForkedToken::getValue()
 {
 	// Return the value of the base token.
 

fUML-CPP/fuml/src/fuml/semantics/activities/ForkedToken.h

@@ -30,7 +30,7 @@ namespace fuml::semantics::activities
 			virtual void withdraw() override;
 			virtual TokenPtr copy() override;
 			virtual bool equals(const TokenPtr&) override;
-			virtual ValuePtr getValue() override;
+			virtual const ValuePtr& getValue() override;
 
 	};
 // ForkedToken

fUML-CPP/fuml/src/fuml/semantics/activities/ObjectToken.cpp

@@ -39,7 +39,7 @@ bool ObjectToken::isControl()
 	return false;
 } // isControl
 
-ValuePtr ObjectToken::getValue()
+const ValuePtr& ObjectToken::getValue()
 {
 	// Return the value of this object token.
 

fUML-CPP/fuml/src/fuml/semantics/activities/ObjectToken.h

@@ -27,7 +27,7 @@ namespace fuml::semantics::activities
 			virtual bool equals(const TokenPtr&) override;
 			virtual TokenPtr copy() override;
 			virtual bool isControl() override;
-			virtual ValuePtr getValue() override;
+			virtual const ValuePtr& getValue() override;
 	};
 // ObjectToken
 }

fUML-CPP/fuml/src/fuml/semantics/activities/Token.h

@@ -31,7 +31,7 @@ namespace fuml::semantics::activities
 			virtual TokenPtr copy() = 0;
 			bool isWithdrawn();
 			virtual bool isControl() = 0;
-			virtual ValuePtr getValue() = 0;
+			virtual const ValuePtr& getValue() = 0;
 	};
 // Token
 }