Escaped sequences error fixed

Author: iris2iris

src/iris/json/flow/FlowItem.kt

@@ -8,4 +8,5 @@ import iris.json.plain.IrisJsonItem
  */
 abstract class FlowItem(protected val tokener: Tokener) : IrisJsonItem() {
 	abstract fun parse()
+	fun contentSource(start: Int = 0 , end: Int = 0) = tokener.getSourceSequence(start, end)
 }

src/iris/json/flow/FlowObject.kt

@@ -3,6 +3,7 @@ package iris.json.flow
 import iris.json.JsonEntry
 import iris.json.JsonItem
 import iris.json.JsonObject
+import iris.json.Util
 import iris.json.plain.IrisJsonNull
 import java.util.*
 
@@ -54,7 +55,7 @@ class FlowObject(private val parser: JsonFlowParser) : FlowItem(parser.tokener),
 			char = tokener.nextChar()
 		}
 		if (!(char == '"' || char == '\'')) {
-			if (char in 'a'..'z' || char in 'A'..'Z') {
+			if (char != null && Util.isAlpha(char)) {
 				char = null
 				tokener.back()
 			} else

src/iris/json/flow/FlowString.kt

@@ -58,9 +58,9 @@ class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonStr
 					'r' -> '\r'
 					't' -> '\t'
 					'u' -> 'u'
-					else -> '-'
+					else -> ch
 				}
-				if (ch != '-') {
+				//if (ch != '-') {
 					res.append(data, fromIndex, i - 1)
 					if (repl == 'u') {
 						val d = data.subSequence(i + 1, i + 1 + 4).toString().toInt(16)
@@ -70,7 +70,7 @@ class FlowString(tokener: Tokener, val quote: Char) : FlowItem(tokener), JsonStr
 						res.append(repl)
 					}
 					fromIndex = i + 1
-				}
+				//}
 			} else {
 				if (ch == '\\')
 					isEscape = true

src/iris/json/flow/Tokener.kt

@@ -12,6 +12,8 @@ interface Tokener {
 
 	fun exception(s: String): IllegalArgumentException
 
+	fun getSourceSequence(start: Int = 0, end: Int = 0): CharSequence
+
 	fun readString(quote: Char): CharSequence
 
 	fun readFieldName(quote: Char?): CharSequence

src/iris/json/flow/TokenerBufferedReader.kt

@@ -70,4 +70,8 @@ class TokenerBufferedReader(private val reader: Reader, private val buffer: Char
 			buff.append(char)
 		}
 	}
+
+	override fun getSourceSequence(start: Int, end: Int): CharSequence {
+		return ""
+	}
 }

src/iris/json/flow/TokenerContentBuildReader.kt

@@ -57,4 +57,8 @@ class TokenerContentBuildReader(private val reader: Reader, private val buffer:
 	override fun back() {
 		pointer--
 	}
+
+	override fun getSourceSequence(start: Int, end: Int): CharSequence {
+		return ""
+	}
 }

src/iris/json/flow/TokenerSimpleReader.kt

@@ -49,6 +49,10 @@ class TokenerSimpleReader(private val reader: Reader): TokenerAbstractWithSequen
 		curCharInc()
 	}
 
+	override fun getSourceSequence(start: Int, end: Int): CharSequence {
+		return ""
+	}
+
 	override fun exception(s: String): IllegalArgumentException {
 		TODO(s)
 	}

src/iris/json/flow/TokenerString.kt

@@ -38,13 +38,17 @@ class TokenerString(source: String) : Tokener {
 		} while (pointer < len)
 	}
 
+	override fun getSourceSequence(start: Int, end: Int): CharSequence {
+		return IrisSequenceCharArray(source, start, if (end == 0) source.size else end)
+	}
+
 	override fun exception(s: String): IllegalArgumentException {
 		return IllegalArgumentException(s + "\nPosition $pointer: " + getPlace())
 	}
 
 	private fun getPlace(): String {
-		val start = max(0, pointer - 10)
-		val end = min(pointer + 10, source.size - 1)
+		val start = max(0, pointer - 20)
+		val end = min(pointer + 20, source.size - 1)
 		return '"' + String(source.copyOfRange(start, end)) + '"'
 	}
 
@@ -54,11 +58,11 @@ class TokenerString(source: String) : Tokener {
 		val start = this.pointer
 		do {
 			val char = source[pointer++]
-			if (char == '\\')
-				escaping = true
-			else if (escaping) {
+			if (escaping) {
 				escaping = false
-			} else if (char == quote) {
+			} else if (char == '\\')
+				escaping = true
+			else if (char == quote) {
 				break
 			}
 		} while (pointer < len)

src/iris/json/plain/IrisJsonString.kt

@@ -44,19 +44,19 @@ class IrisJsonString(private val data: IrisSequence) : IrisJsonItem(), JsonStrin
 					'r' -> '\r'
 					't' -> '\t'
 					'u' -> 'u'
-					else -> '-'
+					else -> ch
 				}
-				if (ch != '-') {
-					res.append(data, fromIndex, i - 1)
-					if (repl == 'u') {
-						val d = data.subSequence(i + 1, i + 1 + 4).toString().toInt(16)
-						res.appendCodePoint(d)
-						i += 4
-					} else {
-						res.append(repl)
-					}
-					fromIndex = i + 1
+				//if (ch != '-') {
+				res.append(data, fromIndex, i - 1)
+				if (repl == 'u') {
+					val d = data.subSequence(i + 1, i + 1 + 4).toString().toInt(16)
+					res.appendCodePoint(d)
+					i += 4
+				} else {
+					res.append(repl)
 				}
+				fromIndex = i + 1
+				//}
 			} else {
 				if (ch == '\\')
 					isEscape = true

src/iris/json/plain/JsonPlainParser.kt

@@ -259,11 +259,11 @@ class JsonPlainParser(source: String, private val configuration: Configuration =
 		var char: Char
 		do {
 			char = source[pointer++]
-			if (char == '\\')
-				escaping = true
-			else if (escaping) {
+			if (escaping) {
 				escaping = false
-			} else if (char == quote) {
+			} else if (char == '\\')
+				escaping = true
+			else if (char == quote) {
 				break
 			}
 		} while (pointer < len)