git.delta.rocks / jrsonnet / refs/commits / 52a24f69aae7

--- a/crates/nixlike/src/lib.rs
+++ b/crates/nixlike/src/lib.rs
@@ -40,6 +40,10 @@
 	rule string_char() -> &'input str
 		= "\\\"" { "\"" }
 		/ "\\\\" { "\\" }
+		/ "\\n" { "\n" }
+		/ "\\t" { "\t" }
+		/ "\\r" { "\r" }
+		/ "''$" { "$" }
 		/ c:$([_]) { c }
 	rule string() -> String
 		= quiet! { "\"" v:(!"\"" c:string_char() {c})* "\"" { v.into_iter().collect() } } / expected!("<string>")
@@ -47,7 +51,10 @@
 		= quiet! { "true" {true}
 		/ "false" {false} } / expected!("<boolean>")
 	rule indent() -> String
-		= quiet! { s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '-']+) { s.to_owned() } } / expected!("<identifier>")
+		= quiet! {
+			s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '-']+) { s.to_owned() }
+			/ "\"" s:$(['a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '-' | '.']+) "\"" { s.to_owned() }
+		} / expected!("<identifier>")
 	rule object() -> LinkedHashMap<String, Value>
 		= "{" _
 			e:(k:indent()++(_ "." _) _ "=" _ v:value() _ ";" _ {(k, v)})*
@@ -111,20 +118,5 @@
 
 #[test]
 fn test() {
-	let v: serde_json::Value = parse_str(
-		r#"
-			{
-				b.c = 2;
-				b.d = "hello";
-				c = {
-					k = 123;
-					p = 231;
-					ll = [1 2 3 [] [[4 5 6]] ];
-				};
-			}
-		"#,
-	)
-	.unwrap();
-	let s: String = serialize(v).unwrap();
-	println!("{}", s);
+	assert_eq!(serialize("Hello\nworld").unwrap(), "\"Hello\\nworld\"");
 }

--- a/crates/nixlike/src/to_string.rs
+++ b/crates/nixlike/src/to_string.rs
@@ -5,7 +5,13 @@
 };
 
 fn write_nix_obj_key_buf(k: &str, v: &Value, out: &mut PrintItems) {
-	out.push_str(k);
+	if k.contains(".") {
+		out.push_str("\"");
+		out.push_str(k);
+		out.push_str("\"");
+	} else {
+		out.push_str(k);
+	}
 	match v {
 		Value::Object(o) if o.len() == 1 => {
 			let (k, v) = o.iter().next().unwrap();
@@ -26,7 +32,15 @@
 		Value::Null => out.push_str("null"),
 		Value::Boolean(v) => out.push_str(if *v { "true" } else { "false" }),
 		Value::Number(n) => out.push_str(&format!("{}", n)),
-		Value::String(s) => out.push_str(&format!("{:?}", s)),
+		Value::String(s) => out.push_str(&format!(
+			"\"{}\"",
+			s.replace('\\', "\\\\")
+				.replace('"', "\\\"")
+				.replace('\n', "\\n")
+				.replace('\t', "\\t")
+				.replace('\r', "\\r")
+				.replace("$", "''$")
+		)),
 		Value::Array(a) => {
 			if a.is_empty() {
 				out.push_str("[ ]");