fixed bug in resolution of defaults

CHANGELOG.md

@@ -1,6 +1,6 @@
 v 2018.4 (2018-12-xx)
 Changes in this release:
-- Various bugfixes and performance enhancements (#873, #772)
+- Various bugfixes and performance enhancements (#873, #772, #958, #959)
 - Dependency updates
 - Removal of snapshot and restore functionality from the server (#789)
 - Removed the non-version api (#526)

src/inmanta/ast/entity.py

@@ -46,16 +46,36 @@
 
 class EntityLike(NamedType):
 
+    parent_entities: "List[Entity]"
+
     @abstractmethod
     def get_defaults(self) -> "Dict[str, ExpressionStatement]":
+        """ get defaults defined on this entity"""
         pass
 
     def get_default(self, name: str) -> "ExpressionStatement":
-        defaults = self.get_defaults()
+        defaults = self.get_default_values()
         if name not in defaults:
             raise AttributeError(name)
         return defaults[name]
 
+    def get_default_values(self) -> "Dict[str,ExpressionStatement]":
+        """
+            Return the dictionary with default values
+        """
+        values = []  # type: List[Tuple[str,ExpressionStatement]]
+
+        # left most parent takes precedence
+        for parent in reversed(self.parent_entities):
+            values.extend(parent.get_default_values().items())
+
+        # self takes precedence
+        values.extend(self.get_defaults().items())
+        # make dict, remove doubles
+        dvalues = dict(values)
+        # remove erased defaults
+        return {k: v for k, v in dvalues.items() if v is not None}
+
     @abstractmethod
     def get_entity(self) -> "Entity":
         pass
@@ -127,25 +147,8 @@ def add_default_value(self, name: str, value: object) -> None:
         """
         self.__default_value[name] = value
 
-    def get_defaults(self) -> "Dict[str,ExpressionStatement]":
-        return self.get_default_values()
-
-    def get_default_values(self) -> "Dict[str,ExpressionStatement]":
-        """
-            Return the dictionary with default values
-        """
-        values = []  # type: List[Tuple[str,ExpressionStatement]]
-
-        # left most parent takes precedence
-        for parent in reversed(self.parent_entities):
-            values.extend(parent.get_default_values().items())
-
-        # self takes precedence
-        values.extend(self.__default_value.items())
-        # make dict, remove doubles
-        dvalues = dict(values)
-        # remove erased defaults
-        return {k: v for k, v in dvalues.items() if v is not None}
+    def get_defaults(self) -> "Dict[str, ExpressionStatement]":
+        return self.__default_value
 
     def get_namespace(self) -> Namespace:
         """
@@ -368,13 +371,13 @@ def __repr__(self) -> str:
         """
             The representation of this type
         """
-        return "Entity(%s::%s)" % (self.namespace, self.name)
+        return "Entity(%s)" % (self.get_full_name())
 
     def __str__(self) -> str:
         """
             The pretty string of this type
         """
-        return "%s::%s" % (self.namespace, self.name)
+        return self.get_full_name()
 
     @classmethod
     def cast(cls, value):
@@ -579,6 +582,7 @@ def get_defaults(self) -> "Dict[str, ExpressionStatement]":
 
     def set_entity(self, entity: EntityLike) -> None:
         self.entity = entity
+        self.parent_entities = [entity]
 
     def add_default(self, name: str, value: "ExpressionStatement") -> None:
         """
@@ -605,7 +609,16 @@ def get_entity(self) -> Entity:
         return self.entity.get_entity()
 
     def __repr__(self) -> str:
-        return "Default(%s)" % self.name
+        """
+            The representation of this type
+        """
+        return "Default(%s)" % (self.get_full_name())
+
+    def __str__(self) -> str:
+        """
+            The pretty string of this type
+        """
+        return "%s" % (self.get_full_name())
 
     def get_full_name(self) -> str:
         """

src/inmanta/ast/statements/generator.py

@@ -216,8 +216,7 @@ def normalize(self) -> None:
 
         inindex = set()
 
-        has_default = set(self.type.get_defaults().keys()) | \
-            set(self.type.get_entity().get_defaults().keys())
+        has_default = set(self.type.get_default_values().keys())
 
         all_attributes = set(self.attributes.keys()) | \
             has_default
@@ -246,9 +245,7 @@ def normalize(self) -> None:
 
     def requires(self) -> List[str]:
         out = [req for (k, v) in self.__attributes.items() for req in v.requires()]
-        out.extend([req for (k, v) in self.type.get_defaults().items() for req in v.requires()])
-        out.extend([req for (k, v) in self.type.get_entity().get_default_values().items() for req in v.requires()])
-
+        out.extend([req for (k, v) in self.type.get_default_values().items() for req in v.requires()])
         return out
 
     def requires_emit(self, resolver: Resolver, queue: QueueScheduler) -> Dict[object, ResultVariable]:
@@ -287,7 +284,7 @@ def execute(self, requires: Dict[object, object], resolver: Resolver, queue: Que
         # the attributes
         attributes = {k: v.execute(requires, resolver, queue) for (k, v) in self._direct_attributes.items()}
 
-        for (k, v) in self.type.get_defaults().items():
+        for (k, v) in self.type.get_default_values().items():
             if k in self._use_default:
                 attributes[k] = v.execute(requires, resolver, queue)
 

tests/compiler/test_defaults.py

@@ -183,3 +183,20 @@ def test_default_remove(snippetcompiler):
     )
     with pytest.raises(UnsetException):
         compiler.do_compile()
+
+
+def test_gradual_default(snippetcompiler):
+    snippetcompiler.setup_for_snippet(
+        """
+entity Server:
+    string a="a"
+    string b
+end
+
+typedef Server2 as Server(b="b")
+
+Server2()
+
+implement Server using std::none
+""")
+    compiler.do_compile()