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