From de330402b8a138a269516b7fd9caa09e3fa5681c Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <jolesen@mozilla.com>
Date: Wed, 31 Aug 2016 15:44:36 -0700
Subject: [PATCH] Add casual string representation of named settings and
 predicates.

Use 'group.setting' format for named predicates, only display the expression
for anonymous predicates.
---
 meta/cretonne/__init__.py   |  3 +++
 meta/cretonne/predicates.py | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/cretonne/__init__.py b/meta/cretonne/__init__.py
index 23ec938f61..82b0a02be6 100644
--- a/meta/cretonne/__init__.py
+++ b/meta/cretonne/__init__.py
@@ -35,6 +35,9 @@ class Setting(object):
         self.byte_offset = None
         self.group = SettingGroup.append(self)
 
+    def __str__(self):
+        return '{}.{}'.format(self.group.name, self.name)
+
     def predicate_context(self):
         """
         Return the context where this setting can be evaluated as a (leaf)
diff --git a/meta/cretonne/predicates.py b/meta/cretonne/predicates.py
index 6722c820e5..8a1b18807a 100644
--- a/meta/cretonne/predicates.py
+++ b/meta/cretonne/predicates.py
@@ -66,12 +66,12 @@ class Predicate(object):
         assert self.context, "Incompatible predicate parts"
 
     def __str__(self):
-        s = '{}({})'.format(
-                type(self).__name__,
-                ' ,'.join(map(str, self.parts)))
         if self.name:
-            s = '{}={}'.format(self.name, s)
-        return s
+            return '{}.{}'.format(self.context.name, self.name)
+        else:
+            return '{}({})'.format(
+                    type(self).__name__,
+                    ', '.join(map(str, self.parts)))
 
     def predicate_context(self):
         return self.context