diff src/luan/modules/Parsers.luan @ 1419:59fd2e8b1b9d

stringify and json_string
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 25 Oct 2019 22:12:06 -0600
parents 27efb1fcbcb5
children 670b7d089699
line wrap: on
line diff
--- a/src/luan/modules/Parsers.luan	Fri Oct 18 22:29:46 2019 -0600
+++ b/src/luan/modules/Parsers.luan	Fri Oct 25 22:12:06 2019 -0600
@@ -2,6 +2,7 @@
 local BBCode = require "java:luan.modules.parsers.BBCode"
 local Csv = require "java:luan.modules.parsers.Csv"
 local Theme = require "java:luan.modules.parsers.Theme"
+local BasicLuan = require "java:luan.modules.BasicLuan"
 
 
 local Parsers = {}
@@ -9,6 +10,7 @@
 Parsers.bbcode_to_html = BBCode.toHtml
 Parsers.bbcode_to_text = BBCode.toText
 Parsers.csv_to_list = Csv.toList
+Parsers.json_string = BasicLuan.json_string
 Parsers.theme_to_luan = Theme.toLuan
 
 local Luan = require "luan:Luan.luan"
@@ -16,9 +18,7 @@
 local type = Luan.type or error()
 local Table = require "luan:Table.luan"
 local java_to_table_deep = Table.java_to_table_deep or error()
-local LuanJava = require "java:luan.Luan"
 local JsonParser = require "java:goodjava.json.JsonParser"
-local JsonToString = require "java:goodjava.json.JsonToString"
 
 -- converts json string to luan object
 function Parsers.json_parse(s)
@@ -26,13 +26,9 @@
 	return type(obj)=="java" and java_to_table_deep(obj) or obj
 end
 
--- converts luan object to json string
-function Parsers.json_string(obj)
-	return JsonToString.toString(LuanJava.toJava(obj))
-end
-
+-- tmp
 function Parsers.json_compressed_string(obj)
-	return JsonToString.toCompressedString(LuanJava.toJava(obj))
+	return Parsers.json_string(obj,{compressed=true})
 end
 
 return Parsers