flamapy-fm 2.0.0.dev6__tar.gz → 2.0.0.dev8__tar.gz

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fm
-Version: 2.0.0.dev6
+Version: 2.0.0.dev8
 Summary: flamapy-fm is a plugin to Flamapy module
 Home-page: https://github.com/flamapy/fm_metamodel
 Author: Flamapy

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/clafer_writer.py

@@ -46,7 +46,7 @@ def fm_to_clafer(feature_model: FeatureModel) -> str:
     for ctc in feature_model.get_constraints():
         result += read_constraints(ctc)
     # Create an instance
-    result += f'\n\n{INSTANCE} : {feature_model.root.name}\n'
+    result += f'\n\n{INSTANCE} : {safename(feature_model.root.name)}\n'
     return result
 
 
@@ -60,7 +60,7 @@ def read_features(feature: Feature, tab_count: int) -> str:
         result += f'{group_type} '
 
     # Feature
-    result += feature.name
+    result += safename(feature.name)
     if feature.get_attributes():
         result += f' : {ATTRIBUTED_FEATURE}'
     if feature.is_optional():
@@ -89,7 +89,7 @@ def read_feature_attributes(feature: Feature, tab_count: int) -> str:
                 attribute_value = f"{str(attribute.default_value).lower()}"
             else:
                 attribute_value = f"{attribute.default_value}"
-        result += f'\n{tabs}[{attribute.get_name()} = {attribute_value}]'
+        result += f'\n{tabs}[{safename(attribute.get_name())} = {attribute_value}]'
     return result
 
 
@@ -149,3 +149,7 @@ def parse_type_value(value: Any) -> str:
     if isinstance(value, str):
         return ClaferAttributeType.STRING.value
     return ''
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/featureide_writer.py

@@ -70,7 +70,7 @@ def _get_attributes(feature: Feature) -> dict[str, str]:
         atributes['mandatory'] = 'true'
     if feature.is_abstract: 
         atributes['abstract'] = 'true'
-    atributes['name'] = feature.name
+    atributes['name'] = safename(feature.name)
     return atributes
 
 
@@ -119,7 +119,7 @@ def _get_ctc_info(ast_node: Node) -> dict[str, Any]:
     ctc_info: dict[str, Any] = {}
     if ast_node.is_term():
         ctc_info['type'] = FeatureIDEReader.TAG_VAR
-        ctc_info['operands'] = [ast_node.data]
+        ctc_info['operands'] = [safename(str(ast_node.data))]
     else:
         ctc_info['type'] = FeatureIDEWriter.CTC_TYPES[ast_node.data]
         operands = []
@@ -136,3 +136,7 @@ def prettify(xml: str) -> bytes:
     """Return a pretty-printed XML string for the Element."""
     reparsed = minidom.parseString(xml)
     return reparsed.toprettyxml(indent="\t", encoding='UTF-8')
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/glencoe_writer.py

@@ -36,8 +36,8 @@ class GlencoeWriter(ModelToText):
 
 def _to_json(feature_model: FeatureModel) -> dict[str, Any]:
     result: dict[str, Any] = {}
-    result["id"] = f"FM_{feature_model.root.name}"
-    result["name"] = f"FM_{feature_model.root.name}"
+    result["id"] = f"FM_{feature_model.root.name.replace(' ', '')}"
+    result["name"] = f"FM_{feature_model.root.name.replace(' ', '')}"
     result["features"] = _get_features_info(feature_model.get_features())
     result["tree"] = _get_tree_info(feature_model.root)
     result["constraints"] = _get_constraints_info(feature_model.get_constraints())
@@ -71,7 +71,7 @@ def _get_features_info(features: list[Feature]) -> dict[str, Any]:
 
 def _get_tree_info(feature: Feature) -> dict[str, Any]:
     feature_info: dict[str, Any] = {}
-    feature_info["id"] = feature.name
+    feature_info["id"] = safename(feature.name)
     children = [
         _get_tree_info(child)
         for child in sorted(feature.get_children(), key=lambda f: f.name)
@@ -92,7 +92,7 @@ def _get_ctc_info(ast_node: Node) -> dict[str, Any]:
     ctc_info: dict[str, Any] = {}
     if ast_node.is_term():
         ctc_info["type"] = "FeatureTerm"
-        ctc_info["operands"] = [ast_node.data]
+        ctc_info["operands"] = [safename(str(ast_node.data))]
     else:
         ctc_info["type"] = GlencoeWriter.CTC_TYPES[ast_node.data]
         operands = []
@@ -103,3 +103,7 @@ def _get_ctc_info(ast_node: Node) -> dict[str, Any]:
             operands.append(right)
         ctc_info["operands"] = operands
     return ctc_info
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/json_writer.py

@@ -49,7 +49,7 @@ def to_json(feature_model: FeatureModel) -> Dict[str, Any]:
 
 def get_tree_info(feature: Feature) -> Dict[str, Any]:
     feature_info: Dict[str, Any] = {}
-    feature_info['name'] = feature.name
+    feature_info['name'] = safename(feature.name)
     feature_info['abstract'] = str(feature.is_abstract)
 
     relations: List[Dict[str, Any]] = []
@@ -90,7 +90,7 @@ def get_attributes_info(attributes: List[Attribute]) -> List[Dict[str, Any]]:
     attributes_info: List[Dict[str, Any]] = []
     for attribute in attributes:
         attr_info: Dict[str, Any] = {}
-        attr_info['name'] = attribute.name
+        attr_info['name'] = safename(attribute.name)
         if attribute.default_value is not None:
             attr_info['value'] = attribute.default_value
         attributes_info.append(attr_info)
@@ -112,7 +112,7 @@ def get_ctc_info(ast_node: Node) -> Dict[str, Any]:
     ctc_info: Dict[str, Any] = {}
     if ast_node.is_term():
         ctc_info['type'] = JSONFeatureType.FEATURE.value
-        ctc_info['operands'] = [ast_node.data]
+        ctc_info['operands'] = [safename(str(ast_node.data))]
     else:
         ctc_info['type'] = ast_node.data.value
         operands: List[Dict[str, Any]] = []
@@ -123,3 +123,7 @@ def get_ctc_info(ast_node: Node) -> Dict[str, Any]:
             operands.append(right)
         ctc_info['operands'] = operands
     return ctc_info
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/splot_writer.py

@@ -29,9 +29,10 @@ class SPLOTWriter(ModelToText):
 def fm_to_splot(model: FeatureModel) -> str:
     lines = []
     lines.append('<?xml version="1.0" encoding="UTF-8" standalone="no"?>')
-    lines.append(f'<feature_model name="{model.root.name}">')
+    model_name = model.root.name.replace(' ', '')
+    lines.append(f'<feature_model name="{model_name}">')
     lines.append('<feature_tree>')
-    lines.append(f':r {model.root.name} ({model.root.name})')
+    lines.append(f':r {safename(model.root.name)} ({safename(model.root.name)})')
     lines.extend(add_features(model.root, 1))
     lines.append('</feature_tree>')
     lines.append('<constraints>')
@@ -47,16 +48,18 @@ def add_features(feature: Feature, n_tabs: int) -> list[str]:
     for relation in feature.get_relations():
         if relation.is_optional():
             child = relation.children[0]
-            lines.append(indentation + f':o {child.name} ({child.name})')
+            lines.append(indentation + f':o {safename(child.name)} ({safename(child.name)})')
             lines.extend(add_features(child, n_tabs + 1))
         elif relation.is_mandatory():
             child = relation.children[0]
-            lines.append(indentation + f':m {child.name} ({child.name})')
+            lines.append(indentation + f':m {safename(child.name)} ({safename(child.name)})')
             lines.extend(add_features(child, n_tabs + 1))
         elif relation.is_alternative() or relation.is_or():
             lines.append(indentation + f':g [{relation.card_min},{relation.card_max}]')
             for child in relation.children:
-                lines.append(indentation + TAB + f': {child.name} ({child.name})')
+                lines.append(
+                    indentation + TAB + f': {safename(child.name)} ({safename(child.name)})'
+                )
                 lines.extend(add_features(child, n_tabs + 2))
     return lines
 
@@ -68,8 +71,16 @@ def add_constraints(constraints: list[Constraint]) -> list[str]:
     for ctc in constraints:
         cnf_clauses = ctc.ast.get_clauses()
         for clause in cnf_clauses:
-            clause_list_str = ['~' + t[1:] if t.startswith('-') else t for t in clause]
+            clause_list_str = [
+                '~' + safename(t[1:]) if t.startswith('-') 
+                else safename(t) 
+                for t in clause
+            ]
             clause_str = ' or '.join(clause_list_str)
             lines.append(indentation + f'C{index}: {clause_str}')
             index += 1
     return lines
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/uvl_reader.py

@@ -200,7 +200,7 @@ class UVLReader(TextToModel):
     ) -> list[Feature]:
         list_features = []
         for feature_context in group_spec_node.feature():
-            feature_name = feature_context.reference().getText()
+            feature_name = feature_context.reference().getText().replace('"', '')
             feature = Feature(feature_name, [])
             self.process_feature(feature, feature_context)
             list_features.append(feature)
@@ -253,7 +253,7 @@ class UVLReader(TextToModel):
     ) -> Node:
         """Process a literal constraint."""
         literal = literal_context.reference()
-        return Node(literal.getText())
+        return Node(literal.getText().replace('"', ''))
 
     def process_parenthesis_constraint(
         self, parenthesis_context: UVLPythonParser.ParenthesisConstraintContext
@@ -407,7 +407,7 @@ class UVLReader(TextToModel):
         # Find ParseTree node of root feature
         root_feature_ast = self.parse_tree.features().feature()
         # Get the root and process it
-        feature_text = root_feature_ast.reference().getText()
+        feature_text = root_feature_ast.reference().getText().replace('"', '')
         feature = Feature(feature_text, [])
         root = self.process_feature(feature, root_feature_ast)
 

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy/metamodels/fm_metamodel/transformations/uvl_writer.py

@@ -38,7 +38,7 @@ class UVLWriter(ModelToText):
             result
             + "\n"
             + tab_count * "\t"
-            + feature.name
+            + safename(feature.name)
             + " "
             + self.read_attributes(feature)
         )
@@ -56,7 +56,7 @@ class UVLWriter(ModelToText):
         if feature.is_abstract:
             attributes.append("abstract")
         for attribute in feature.get_attributes():
-            attribute_str = attribute.name
+            attribute_str = safename(attribute.name)
             if attribute.default_value is not None:
                 if isinstance(attribute.default_value, str):
                     attribute_str += f" '{attribute.default_value}'"
@@ -132,3 +132,7 @@ class UVLWriter(ModelToText):
                 ),
             )
         )
+
+
+def safename(name: str) -> str:
+    return f'"{name}"' if ' ' in name else name

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy_fm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fm
-Version: 2.0.0.dev6
+Version: 2.0.0.dev8
 Summary: flamapy-fm is a plugin to Flamapy module
 Home-page: https://github.com/flamapy/fm_metamodel
 Author: Flamapy

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/flamapy_fm.egg-info/requires.txt

@@ -1,4 +1,4 @@
-flamapy-fw==2.0.0.dev6
+flamapy-fw==2.0.0.dev7
 uvlparser==2.0.1
 afmparser==1.0.3
 

{flamapy-fm-2.0.0.dev6 → flamapy-fm-2.0.0.dev8}/setup.py

@@ -16,7 +16,7 @@ dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-fm",
-    version="2.0.0.dev6",
+    version="2.0.0.dev8",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="flamapy-fm is a plugin to Flamapy module",