src/rougail/annotator/value.py

@@ -62,17 +62,20 @@ class Annotator(Walk):  # pylint: disable=R0903
         variable: dict,
     ) -> None:
         multi = self.objectspace.multis.get(variable.path, False)
-
+        # variable's type inference from a default value with :term:`basic types`
-        types = {str: "string", int: "number", bool: "boolean", float: "float"}
+        basic_types = {str: "string", int: "number", bool: "boolean", float: "float"}
-
+        if variable.version == "1.0":
-        # variable's type inference with a default value with a basic type
+            # - version: 1.0, the default value is of type "string" by default
-        ## XXX hack: convert None to string
+            if variable.type is None:
+                variable.type = "string"
+        elif variable.version == "1.1":
+            # - version: 1.1, the default value has no type by default
+            if multi is False and variable.type is None:
+                if type(variable.default) in basic_types:
+                    variable.type = basic_types[type(variable.default)]
+            else:
+                # XXX FIXME strange. weird. not good
                 variable.type = "string"
-        ## XXX gérer le comportement suivant les versions
-        if multi is False and variable.type == "string" and type(variable.default) != str:
-            if type(variable.default) in types:
-                variable.type = types[type(variable.default)]
-
         # a boolean must have value, the default value is "True"
         if variable.type == "boolean" and multi is False and variable.default is None:
             variable.default = True

src/rougail/convert.py

@@ -679,6 +679,7 @@ class ParserVariable:
         if not isinstance(filename, list):
             filename = [filename]
         variable["xmlfiles"] = filename
+        variable["version"] = version
         variable_type = self.get_family_or_variable_type(variable)
         obj = {
             "symlink": SymLink,

src/rougail/object_model.py

@@ -439,6 +439,7 @@ class Variable(BaseModel):
     test: Optional[list] = None
     xmlfiles: List[str] = []
     path: str
+    version: str
     # type will be set dynamically in `annotator/value.py`, default is None
     type: str = None