Skip to content

Update for Haxe 4.2.3. #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EliteMasterEric wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update for Haxe 4.2.3. #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/tjson/TJSON.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,18 +377,18 @@ 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'){
st = new FancyStyle();
}
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);
Expand Down Expand Up @@ -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<Dynamic> = value;
return encodeIterable(v,style,depth+1);
}
else if(Std.is(value,List)){
else if(value is List){
var v: List<Dynamic> = 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)){
Expand Down