From 03e0141c3644db78855885c5e4af341518c064f2 Mon Sep 17 00:00:00 2001 From: Eric Myllyoja Date: Sat, 23 Oct 2021 20:28:43 -0400 Subject: [PATCH] Update for Haxe 4.2.3. --- lib/tjson/TJSON.hx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/tjson/TJSON.hx b/lib/tjson/TJSON.hx index 19a581c..c4f4067 100644 --- a/lib/tjson/TJSON.hx +++ b/lib/tjson/TJSON.hx @@ -377,7 +377,7 @@ class TJSONEncoder{ throw("Provided object is not an object."); } var st:EncodeStyle; - if(Std.is(style, EncodeStyle)){ + if(style is EncodeStyle){ st = style; } else if(style == 'fancy'){ @@ -385,10 +385,10 @@ class TJSONEncoder{ } else st = new SimpleStyle(); var buffer = new StringBuf(); - if(Std.is(obj,Array) || Std.is(obj,List)) { + if(obj is Array || obj is List) { buffer.add(encodeIterable( obj, st, 0)); - } else if(Std.is(obj, haxe.ds.StringMap)){ + } else if(obj is haxe.ds.StringMap){ buffer.add(encodeMap(obj, st, 0)); } else { cacheEncode(obj); @@ -491,26 +491,26 @@ class TJSONEncoder{ } private function encodeValue( value:Dynamic, style:EncodeStyle, depth:Int):String { - if(Std.is(value, Int) || Std.is(value,Float)){ + if(value is Int || value is Float){ return(value); } - else if(Std.is(value,Array) || Std.is(value,List)){ + else if(value is Array || value is List){ var v: Array = value; return encodeIterable(v,style,depth+1); } - else if(Std.is(value,List)){ + else if(value is List){ var v: List = value; return encodeIterable(v,style,depth+1); } - else if(Std.is(value,haxe.ds.StringMap)){ + else if(value is haxe.ds.StringMap){ return encodeMap(value,style,depth+1); } - else if(Std.is(value,String)){ + else if(value is String){ return('"'+Std.string(value).replace("\\","\\\\").replace("\n","\\n").replace("\r","\\r").replace('"','\\"')+'"'); } - else if(Std.is(value,Bool)){ + else if(value is Bool){ return(value); } else if(Reflect.isObject(value)){