lopper: correctly label compact (or sparse) nodes in --enhanced mode

Before this commit, the following device tree

        /dts-v1/;
        / {
            compact_label: compact_thing@0 { compatible = "baz"; };

            less_compact_label: compact_thing@1 {
        	    compatible = "baz"; };

            normal_label: compact_thing@2 {
        	    compatible = "baz";
            };

            sparse_label: compact_thing@3
            {
        	    compatible = "baz";
            };
        };

...resulted in mangled device-tree code (and hence a failing dtc
invocation). By matching the "{" inside the regular expression, we no
longer rely on whitespace as a marker for structure.

Signed-off-by: Graeme Smecher <[email protected]>

Author: gsmecher

lopper/base.py

@@ -904,11 +904,8 @@ def _label_translate(text):
         """private function used to match (and replace) labels in DTS files"""
         global lcount
         lcount = 0
-        pattern2 = re.compile(
-            r'^\s*?\w*?\s*?\:', re.DOTALL
-        )
         pattern = re.compile(
-            r'^\s*?(\w*?)\s*?\:(.*?)$', re.DOTALL | re.MULTILINE
+            r'^\s*?(\w*?)\s*?\:([^{]*?)\s*\{', re.DOTALL | re.MULTILINE
         )
         return re.sub(pattern, lopper_base._label_replacer, text)