Clean up ArduinoQueue

Author: ianfixes

CHANGELOG.md

@@ -10,12 +10,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * `release-new-version.sh` script
 
 ### Changed
+* Shortened `ArduinoQueue` push and pop operations
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
+* `ArduinoQueue` no longer leaks memory
 
 ### Security
 

cpp/arduino/ci/Queue.h

@@ -27,44 +27,26 @@ class ArduinoCIQueue {
     }
 
     inline unsigned long size() const { return mSize; }
-
     inline bool empty() const { return 0 == mSize; }
-
     T front() const { return empty() ? mNil : mFront->data; }
-
     T back() const { return empty() ? mNil : mBack->data; }
 
     bool push(const T& v)
     {
       Node *n = new Node;
       if (n == NULL) return false;
-
       n->data = v;
       n->next = NULL;
-
-      if (mFront == NULL)
-      {
-        mFront = mBack = n;
-      } else {
-        mBack->next = n;
-        mBack = n;
-      }
-
-      ++mSize;
-      return true;
+      mBack = (mFront == NULL ? mFront : mBack->next) = n;
+      return ++mSize;
     }
 
     void pop() {
       if (empty()) return;
-      if (mFront == mBack) {
-        mFront = mBack = NULL;
-      } else {
-        Node* n = mFront;
-        mFront = mFront->next;
-        delete n;
-      }
-
-      --mSize;
+      Node* n = mFront;
+      mFront = mFront->next;
+      delete n;
+      if (--mSize) mBack = NULL;
     }
 
     void clear() { while (!empty()) pop(); }