update & fix tests

assets/failStr7a_test.hjson

@@ -0,0 +1,5 @@
+{
+  # invalid string containing a newline
+  foo : "
+  "
+}

assets/mltabs_test.json

@@ -0,0 +1,3 @@
+{
+  "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"
+}

assets/sorted/strings_result.hjson

@@ -57,6 +57,10 @@
     number: 5
     yes: true
   }
+  notml1: "\n"
+  notml2: "  \n"
+  notml3: "\n  \n  \n  \n"
+  notml4: "\t\n"
   special:
   {
     false: "false"

assets/sorted/strings_result.json

@@ -38,6 +38,10 @@
     "number": 5,
     "yes": true
   },
+  "notml1": "\n",
+  "notml2": "  \n",
+  "notml3": "\n  \n  \n  \n",
+  "notml4": "\t\n",
   "special": {
     "false": "false",
     "minus": "-3",

assets/strings_result.hjson

@@ -5,6 +5,10 @@
   text4a: " untrimmed "
   text4b: " untrimmed"
   text4c: "untrimmed "
+  notml1: "\n"
+  notml2: "  \n"
+  notml3: "\n  \n  \n  \n"
+  notml4: "\t\n"
   multiline1:
     '''
     first line

assets/strings_result.json

@@ -5,6 +5,10 @@
   "text4a": " untrimmed ",
   "text4b": " untrimmed",
   "text4c": "untrimmed ",
+  "notml1": "\n",
+  "notml2": "  \n",
+  "notml3": "\n  \n  \n  \n",
+  "notml4": "\t\n",
   "multiline1": "first line\n  indented line\nlast line",
   "multiline2": "first line\n  indented line\nlast line",
   "multiline3": "first line\n  indented line\nlast line\n",

assets/strings_test.hjson

@@ -10,6 +10,11 @@
   text4b: " untrimmed"
   text4c: "untrimmed "
 
+  notml1: "\n"
+  notml2: "  \n"
+  notml3: "\n  \n  \n  \n"
+  notml4: "\t\n"
+
   # multiline string
 
   multiline1:

assets/testlist.txt

@@ -61,16 +61,24 @@ failStr6a_test.hjson
 failStr6b_test.hjson
 failStr6c_test.hjson
 failStr6d_test.hjson
+failStr7a_test.hjson
 kan_test.hjson
 keys_test.hjson
+mltabs_test.json
 oa_test.hjson
 pass1_test.json
 pass2_test.json
 pass3_test.json
 pass4_test.json
-pass5_test.json
 passSingle_test.hjson
 root_test.hjson
 stringify1_test.hjson
 strings_test.hjson
-trail_test.hjson
+trail_test.hjson
+stringify/quotes_all_test.hjson
+stringify/quotes_always_test.hjson
+stringify/quotes_keys_test.hjson
+stringify/quotes_strings_ml_test.json
+stringify/quotes_strings_test.hjson
+extra/notabs_test.json
+extra/separator_test.json

decode.go

@@ -110,6 +110,8 @@ func (p *hjsonParser) readString() (string, error) {
 			} else {
 				return "", p.errAt("Bad escape \\" + string(p.ch))
 			}
+		} else if p.ch == '\n' || p.ch == '\r' {
+			return "", p.errAt("Bad string containing newline");
 		} else {
 			res.WriteByte(p.ch)
 		}

encode.go

@@ -57,9 +57,9 @@ func init() {
 	needsEscape = regexp.MustCompile(`[\\\"\x00-\x1f` + commonRange + `]`)
 	// needsQuotes tests if the string can be written as a quoteless string (includes needsEscape but without \\ and \")
 	needsQuotes = regexp.MustCompile(`^\s|^"|^'''|^#|^/\*|^//|^\{|^\}|^\[|^\]|^:|^,|\s$|[\x00-\x1f\x7f-\x9f\x{00ad}\x{0600}-\x{0604}\x{070f}\x{17b4}\x{17b5}\x{200c}-\x{200f}\x{2028}-\x{202f}\x{2060}-\x{206f}\x{feff}\x{fff0}-\x{ffff}]`)
-	// needsEscapeML tests if the string can be written as a multiline string (includes needsEscape but without \n, \r, \\ and \")
+	// needsEscapeML tests if the string can be written as a multiline string (like needsEscape but without \n, \r, \\, \", \t)
 	var x08Or9 = `\x08` // `\x09` for the old behavior
-	needsEscapeML = regexp.MustCompile(`'''|^[\\s]+$|[\x00-` + x08Or9 + `\x0b\x0c\x0e-\x1f` + commonRange + `]`)
+	needsEscapeML = regexp.MustCompile(`'''|^[\s]+$|[\x00-` + x08Or9 + `\x0b\x0c\x0e-\x1f` + commonRange + `]`)
 	// starts with a keyword and optionally is followed by a comment
 	startsWithKeyword = regexp.MustCompile(`^(true|false|null)\s*((,|\]|\}|#|//|/\*).*)?$`)
 	needsEscapeName = regexp.MustCompile(`[,\{\[\}\]\s:#"]|//|/\*|'''`)

hjson_test.go

@@ -92,6 +92,8 @@ func TestHjson(t *testing.T) {
 	files := strings.Split(string(getContent("assets/testlist.txt")), "\n")
 
 	for _, file := range files {
-		run(t, file)
+		if !strings.HasPrefix(file, "stringify/quotes") && !strings.HasPrefix(file, "extra/") {
+			run(t, file)
+		}
 	}
 }