raise error if there is extra content beyond top data

KenKundert · May 19, 2024 · 3fd8abb · 3fd8abb
1 parent cef03b6
commit 3fd8abb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/nestedtext/nestedtext.py b/nestedtext/nestedtext.py
@@ -911,9 +911,8 @@ def __init__(self, lines, top, source, on_dup, keymap, normalize_key, dialect):
                     self.values, self.keymap = None, None
                 else:
                     self.values, self.keymap = self._read_value(0, ())
-                return
 
-            if top in ["dict", dict]:
+            elif top in ["dict", dict]:
                 if next_is in ["dict item", "key item", "inline dict"]:
                     self.values, self.keymap = self._read_value(0, ())
                 elif next_is is None:
@@ -923,9 +922,8 @@ def __init__(self, lines, top, source, on_dup, keymap, normalize_key, dialect):
                         "content must start with key or brace ({{).",
                         lines.get_next()
                     )
-                return
 
-            if top in ["list", list]:
+            elif top in ["list", list]:
                 if next_is in ["list item", "inline list"]:
                     self.values, self.keymap = self._read_value(0, ())
                 elif next_is is None:
@@ -935,9 +933,8 @@ def __init__(self, lines, top, source, on_dup, keymap, normalize_key, dialect):
                         "content must start with dash (-) or bracket ([).",
                         lines.get_next(),
                     )
-                return
 
-            if top in ["str", str]:
+            elif top in ["str", str]:
                 if next_is == "string item":
                     self.values, self.keymap = self._read_value(0, ())
                 elif next_is is None:
@@ -947,9 +944,12 @@ def __init__(self, lines, top, source, on_dup, keymap, normalize_key, dialect):
                         "content must start with greater-than sign (>).",
                         lines.get_next(),
                     )
-                return
 
-            raise NotImplementedError(top)
+            else:
+                raise NotImplementedError(top)
+
+            if lines.type_of_next():
+                report('extra content', lines.get_next())
 
     # get_decoded() {{{3
     def get_decoded(self):

diff --git a/tests/official_tests b/tests/official_tests
+5 −0		test_cases/inline_dict_23/load_err.json
+2 −0		test_cases/inline_dict_23/load_in.nt