Adjustment for pull request #21

craigsapp · Nov 26, 2019 · 3b56ab4 · 3b56ab4
1 parent 27b2298
commit 3b56ab4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/include/humlib.h b/include/humlib.h
@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <[email protected]>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Mon Nov 25 20:49:29 CET 2019
+// Last Modified: Tue Nov 26 11:43:33 CET 2019
 // Filename:      humlib.h
 // URL:           https://github.com/craigsapp/humlib/blob/master/include/humlib.h
 // Syntax:        C++11

diff --git a/src/GridSlice.cpp b/src/GridSlice.cpp
@@ -190,7 +190,7 @@ HTp GridSlice::createRecipTokenFromDuration(HumNum duration) {
 	HumNum dotdur;
 	if (duration.getNumerator() == 0) {
 		// if the GridSlice is at the end of a measure, the
-      // time between the starttime/endtime of the GridSlice should
+		// time between the starttime/endtime of the GridSlice should
 		// be subtracted from the endtime of the current GridMeasure.
 		token = new HumdrumToken("g");
 		return token;
@@ -302,10 +302,8 @@ void GridSlice::transferTokens(HumdrumFile& outfile, bool recip) {
 		} else if (hasSpines()) {
 			token = new HumdrumToken("55");
 			empty = "!z";
-        } else if (!token) {
-            token = new HumdrumToken();
-        }
-		if (hasSpines()) {
+		}
+		if ((token != NULL) && hasSpines()) {
 			line->appendToken(token);
 		}
 	}

diff --git a/src/humlib.cpp b/src/humlib.cpp
@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <[email protected]>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Mon Nov 25 20:49:29 CET 2019
+// Last Modified: Tue Nov 26 11:43:33 CET 2019
 // Filename:      /include/humlib.cpp
 // URL:           https://github.com/craigsapp/humlib/blob/master/src/humlib.cpp
 // Syntax:        C++11
@@ -5653,7 +5653,7 @@ HTp GridSlice::createRecipTokenFromDuration(HumNum duration) {
 	HumNum dotdur;
 	if (duration.getNumerator() == 0) {
 		// if the GridSlice is at the end of a measure, the
-      // time between the starttime/endtime of the GridSlice should
+		// time between the starttime/endtime of the GridSlice should
 		// be subtracted from the endtime of the current GridMeasure.
 		token = new HumdrumToken("g");
 		return token;
@@ -5765,10 +5765,8 @@ void GridSlice::transferTokens(HumdrumFile& outfile, bool recip) {
 		} else if (hasSpines()) {
 			token = new HumdrumToken("55");
 			empty = "!z";
-        } else if (!token) {
-            token = new HumdrumToken();
-        }
-		if (hasSpines()) {
+		}
+		if ((token != NULL) && hasSpines()) {
 			line->appendToken(token);
 		}
 	}