Merge pull request #252 from ehuss/dotted-keys

0.5: Support dotted keys.

4 files changed, 53 insertions, 1 deletions

diff --git a/test-suite/tests/invalid-misc.rs b/test-suite/tests/invalid-misc.rs
index 80421e3..5c7f779 100644
--- a/test-suite/tests/invalid-misc.rs
+++ b/test-suite/tests/invalid-misc.rs
@@ -17,4 +17,12 @@ fn bad() {
 
     bad("a = -0x1");
     bad("a = 0x-1");
+
+    // Dotted keys.
+    bad("a.b.c = 1
+         a.b = 2
+        ");
+    bad("a = 1
+         a.b = 2");
+    bad("a = {k1 = 1, k1.name = \"joe\"}")
 }
diff --git a/test-suite/tests/valid.rs b/test-suite/tests/valid.rs
index b186800..d032ba5 100644
--- a/test-suite/tests/valid.rs
+++ b/test-suite/tests/valid.rs
@@ -45,7 +45,7 @@ fn to_json(toml: toml::Value) -> Json {
 fn run_pretty(toml: Toml) {
     // Assert toml == json
     println!("### pretty round trip parse.");
-    
+
     // standard pretty
     let toml_raw = to_string_pretty(&toml).expect("to string");
     let toml2 = toml_raw.parse().expect("from string");
@@ -247,3 +247,6 @@ test!(key_quote_newline,
 test!(table_array_nest_no_keys,
       include_str!("valid/table-array-nest-no-keys.toml"),
       include_str!("valid/table-array-nest-no-keys.json"));
+test!(dotted_keys,
+      include_str!("valid/dotted-keys.toml"),
+      include_str!("valid/dotted-keys.json"));
diff --git a/test-suite/tests/valid/dotted-keys.json b/test-suite/tests/valid/dotted-keys.json
new file mode 100644
index 0000000..cf9dd04
--- /dev/null
+++ b/test-suite/tests/valid/dotted-keys.json
@@ -0,0 +1,34 @@
+{
+  "a": {
+    "b": {
+      "type": "integer",
+      "value": "123"
+    }
+  },
+  "table": {
+    "a": {
+      "b": {
+        "c": {
+          "type": "integer",
+          "value": "1"
+        },
+        "d": {
+          "type": "integer",
+          "value": "2"
+        }
+      }
+    },
+    "in": {
+      "type": {
+        "color": {
+          "type": "string",
+          "value": "blue"
+        },
+        "name": {
+          "type": "string",
+          "value": "cat"
+        }
+      }
+    }
+  }
+}
diff --git a/test-suite/tests/valid/dotted-keys.toml b/test-suite/tests/valid/dotted-keys.toml
new file mode 100644
index 0000000..234d64c
--- /dev/null
+++ b/test-suite/tests/valid/dotted-keys.toml
@@ -0,0 +1,7 @@
+a.b = 123
+
+[table]
+a.b.c = 1
+a  .  b  .  d = 2
+
+in = { type.name = "cat", type.color = "blue" }