Fix for #29

Author: youming-lin

.travis.yml

@@ -22,14 +22,14 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a
+      env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-08-15-a
     - os: osx
       osx_image: xcode8.3
       sudo: required
     - os: osx
       osx_image: xcode9
       sudo: required
-      env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-06-29-a
+      env: SWIFT_SNAPSHOT=4.0-DEVELOPMENT-SNAPSHOT-2017-08-15-a
 
 before_install:
     - git clone https://github.com/IBM-Swift/Package-Builder.git

Sources/HTMLEntities/String+HTMLEntities.swift

@@ -171,11 +171,13 @@ public extension String {
                 else {
                     // false alarm, not a character reference
                     // move back to invalid state
-                    entityPrefix = ""
                     state = .Invalid
 
                     // move the consumed & and current unicode to result buffer
                     str += entityPrefix + unicodeAsString
+
+                    // clear entityPrefix buffer
+                    entityPrefix = ""
                 }
             case .Number:
                 // previously parsed &#

Tests/HTMLEntitiesTests/HTMLEntitiesTests.swift

@@ -283,6 +283,9 @@ class HTMLEntitiesTests: XCTestCase {
             XCTFail("Wrong error thrown")
         }
 
+        // unit test for fix to https://github.com/IBM-Swift/swift-html-entities/issues/29
+        XCTAssertEqual("&+&#4370ᅡ&#4523".htmlUnescape(), "&+한")
+
         // test various parse errors
         XCTAssertEqual(try "&∾̳".htmlUnescape(strict: true), "&∾̳")
         XCTAssertEqual("&#∾̳".htmlUnescape(), "&#∾̳")