Fixed #121, simplified quote handling logic (yay)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Papa-Parse",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "main": "papaparse.js",
   "homepage": "http://papaparse.com",
   "authors": [

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "papaparse",
-	"version": "4.0.6",
+	"version": "4.0.7",
 	"description": "Fast and powerful CSV parser for the browser that supports web workers and streaming large files. Converts CSV to JSON and JSON to CSV.",
 	"keywords": [
 		"csv",

papaparse.js

@@ -1,6 +1,6 @@
 /*
 	Papa Parse
-	v4.0.6
+	v4.0.7
 	https://github.com/mholt/PapaParse
 */
 (function(global)
@@ -1169,7 +1169,7 @@
 							return finish();
 						}
 
-						if (quoteSearch == inputLen-1 && hasCloseQuote(input.substring(cursor, quoteSearch+1)))
+						if (quoteSearch == inputLen-1)
 						{
 							// Closing quote at EOF
 							row.push(input.substring(cursor, quoteSearch).replace(/""/g, '"'));
@@ -1181,9 +1181,12 @@
 
 						// If this quote is escaped, it's part of the data; skip it
 						if (input[quoteSearch+1] == '"')
+						{
+							quoteSearch++;
 							continue;
+						}
 
-						if (input[quoteSearch+1] == delim && hasCloseQuote(input.substring(cursor, quoteSearch+1)))
+						if (input[quoteSearch+1] == delim)
 						{
 							// Closing quote followed by delimiter
 							row.push(input.substring(cursor, quoteSearch).replace(/""/g, '"'));
@@ -1193,7 +1196,7 @@
 							break;
 						}
 
-						if (input.substr(quoteSearch+1, newlineLen) == newline && hasCloseQuote(input.substring(cursor, quoteSearch+1)))
+						if (input.substr(quoteSearch+1, newlineLen) == newline)
 						{
 							// Closing quote followed by newline
 							row.push(input.substring(cursor, quoteSearch).replace(/""/g, '"'));
@@ -1321,27 +1324,6 @@
 		{
 			return cursor;
 		};
-
-		// hasCloseQuote determines if a field has a closing quote.
-		// field should be a string without the opening quote
-		// but with the closing quote (which might not actually be
-		// a closing quote).
-		function hasCloseQuote(field)
-		{
-			if (field.length == 0)
-				return false;
-
-			if (field[field.length-1] != '"')
-				return false;
-
-			if (field.length > 2)
-				return field[field.length-2] != '"' || field[field.length-3] == '"';
-
-			if (field.length > 1)
-				return field[field.length-2] != '"';
-
-			return true;
-		}
 	}
 
 

parse.jquery.json

@@ -1,6 +1,6 @@
 {
 	"name": "parse",
-	"version": "4.0.6",
+	"version": "4.0.7",
 	"title": "Papa Parse",
 	"description": "Powerful CSV parser that converts CSV to JSON and JSON to CSV. Supports web workers and streaming large files. Fastest CSV parser for JavaScript.",
 	"keywords": [

tests/test-cases.js

@@ -136,6 +136,15 @@ var CORE_PARSER_TESTS = [
 			errors: []
 		}
 	},
+	{
+		description: "Quoted field with 5 quotes in a row and a delimiter in there, too",
+		input: '"1","cnonce="""",nc=""""","2"',
+		notes: "Actual input reported in issue #121",
+		expected: {
+			data: [['1', 'cnonce="",nc=""', '2']],
+			errors: []
+		}
+	},
 	{
 		description: "Quoted field with whitespace around quotes",
 		input: 'A, "B" ,C',