Format code and factor out method

SeasideSt · Sep 12, 2022 · fa91963 · fa91963
1 parent c547682
commit fa91963
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...e-JSON-Core.package/WAJsonParser.class/instance/createCodePointFromSurrogatesHigh.low..st b/...e-JSON-Core.package/WAJsonParser.class/instance/createCodePointFromSurrogatesHigh.low..st
@@ -0,0 +1,3 @@
+parsing-internal
+createCodePointFromSurrogatesHigh: aHighInteger low: aLowInteger
+	^ 16r10000 + ((aHighInteger - 16rD800 bitShift: 10) bitOr: (aLowInteger - 16rDC00))
diff --git a/repository/Seaside-JSON-Core.package/WAJsonParser.class/instance/parseCharacterHex.st b/repository/Seaside-JSON-Core.package/WAJsonParser.class/instance/parseCharacterHex.st
@@ -2,13 +2,16 @@ parsing-internal
 parseCharacterHex
 	| value |
 	value := self parseCharacterHexRaw.
-	(self isHighSurrogate: value) ifTrue: [
-		| lowSurrogate |
-		self expectChar: $\.
-		self expectChar: $u.
-		lowSurrogate := self parseCharacterHexRaw.
-		(self isLowSurrogate: lowSurrogate) ifFalse: [
-			^ self error: 'low surrogate expected' ].
-		value := 16r10000 + ((value - 16rD800 bitShift: 10) bitOr: (lowSurrogate - 16rDC00)) ].
-	(self isLowSurrogate: value) ifTrue:[ self error: 'high surrogate expected' ].
+	(self isHighSurrogate: value)
+		ifTrue: [
+			| lowSurrogate |
+			self expectChar: $\.
+			self expectChar: $u.
+			lowSurrogate := self parseCharacterHexRaw.
+			(self isLowSurrogate: lowSurrogate) ifFalse: [
+				^ self error: 'low surrogate expected' ].
+			value := self createCodePointFromSurrogatesHigh: value low: lowSurrogate ]
+		ifFalse: [
+			(self isLowSurrogate: value)
+				ifTrue: [ self error: 'unexpected low surrogate' ] ].
 	^ Character codePoint: value