FCL/sftools/depl/swconfigmdw: comparison configurationengine/source/cone/public/_plugin

equal deleted inserted replaced

-:87cfa131b535
+:e7e0ae78773e
 # Description:
 #
 import copy
 import logging
-import plugin, exceptions, api, utils
+from cone.public import exceptions, api, utils
+import plugin
 import cone.confml.model
 log = logging.getLogger('cone')
 # The XML namespace for common ImplML definitions
 class TempVariableDefinition(object):
 """
 Class representing a temporary variable definition in an implementation file.
 """
-def __init__(self, ref, type, value):
+def __init__(self, ref, type, value, lineno=None):
 self.ref = ref
 self.type = type
 self.value = value
+self.lineno = lineno
 def create_feature(self, config):
 """
 Add a feature based on this temp feature definition to the given configuration.
 """
 mapping = {'string' : cone.confml.model.ConfmlStringSetting,
 'int'    : cone.confml.model.ConfmlIntSetting,
 'real'   : cone.confml.model.ConfmlRealSetting,
 'boolean': cone.confml.model.ConfmlBooleanSetting}
-feature = mapping[self.type](ref)
+# Create temp variables always name being also the ref
+feature = mapping[self.type](ref, name=ref)
 setattr(feature, TEMP_FEATURE_MARKER_VARNAME, True)
 config.add_feature(feature, namespace)
 value = utils.expand_refs_by_default_view(self.value, config.get_default_view())
 config.add_data(api.Data(fqr=self.ref, value=value))
 class TempVariableSequenceDefinition(object):
 """
 Class representing a temporary variable sequence definition in an implementation file.
 """
-def __init__(self, ref, sub_items):
+def __init__(self, ref, sub_items, lineno=None):
 self.ref = ref
 self.sub_items = sub_items
+self.lineno = lineno
 def create_feature(self, config):
 if '.' in self.ref:
 pos = self.ref.rfind('.')
 ref = self.ref[pos + 1:]
 else:
 ref = self.ref
 namespace = ''
 # Creature the sequence feature
-seq_fea = api.FeatureSequence(ref)
+# Create temp variables always name being also the ref
+seq_fea = api.FeatureSequence(ref, name=ref)
 setattr(seq_fea, TEMP_FEATURE_MARKER_VARNAME, True)
 config.add_feature(seq_fea, namespace)
 # Create the sub-features
 mapping = {'string' : cone.confml.model.ConfmlStringSetting,
 'int'    : cone.confml.model.ConfmlIntSetting,
 'real'   : cone.confml.model.ConfmlRealSetting,
 'boolean': cone.confml.model.ConfmlBooleanSetting}
 sub_features = []
 for sub_item in self.sub_items:
-sub_feature = mapping[sub_item[1]](sub_item[0])
+sub_feature = mapping[sub_item[1]](sub_item[0], name=sub_item[0])
 seq_fea.add_feature(sub_feature)
 def __eq__(self, other):
 if type(self) is type(other):
 return self.ref == other.ref and self.sub_items == other.sub_items
 def extend(self, other):
 """
 Extend this object with the contents of another CommonImplmlData object.
 """
+if other is None:
+return
 if other.phase:
 self.phase = other.phase
 if other.tags:
 self.tags = other.tags
-self.tempvar_defs.extend(other.tempvar_defs)
 if other.setting_refs_override:
 self.setting_refs_override = other.setting_refs_override
 if other.output_root_dir:
 self.output_root_dir = other.output_root_dir
 if other.output_sub_dir:
 self.output_sub_dir = other.output_sub_dir
 def copy(self):
 result = CommonImplmlData()
 result.phase = self.phase
-if result.tags is not None:
+if self.tags is not None:
 result.tags = self.tags.copy()
 result.tempvar_defs = list(self.tempvar_defs)
 result.setting_refs_override = copy.deepcopy(self.setting_refs_override)
 result.output_root_dir = self.output_root_dir
 result.output_sub_dir = self.output_sub_dir
 @classmethod
 def read_data(cls, etree):
 """
 Read common ImplML data from the given XML element.
-@return: A CommonImplmlData instance or None if no common namespace
+@return: A CommonImplmlData instance.
-elements were found.
 """
 result = CommonImplmlData()
 reader_methods = {'phase'                   : cls._read_phase,
 'tag'                     : cls._read_tag,
 'tempVariableSequence'    : cls._read_tempvarseq,
 'settingRefsOverride'     : cls._read_setting_refs_override,
 'outputRootDir'           : cls._read_output_root_dir,
 'outputSubDir'            : cls._read_output_sub_dir}
-found = False
 for elem in etree:
 ns, tag = utils.xml.split_tag_namespace(elem.tag)
 if ns != COMMON_IMPLML_NAMESPACE:   continue
 if tag not in reader_methods:       continue
 reader_methods[tag](elem, result)
-found = True
+return result
-if found:   return result
-else:       return None
 @classmethod
 def _read_phase(cls, elem, result):
 phase = elem.get('name')
 if phase is None:
 @classmethod
 def _read_tempvar(cls, elem, result):
 ref = elem.get('ref')
 type = elem.get('type', 'string')
 value = elem.get('value', '')
+lineno = utils.etree.get_lineno(elem)
 if ref is None:
 cls._raise_missing_attr(elem, 'ref')
 if type not in cls.VALID_TYPES:
 cls._raise_invalid_type(ref, type)
-result.tempvar_defs.append(TempVariableDefinition(ref, type, value))
+result.tempvar_defs.append(TempVariableDefinition(ref, type, value, lineno))
 @classmethod
 def _read_tempvarseq(cls, elem, result):
 ref = elem.get('ref')
 if ref is None:
 sub_items.append((sub_ref, sub_type))
 if not sub_items:
 raise exceptions.ParseError("Temporary variable sequence '%s' does not have any sub-items" % ref)
-result.tempvar_defs.append(TempVariableSequenceDefinition(ref, sub_items))
+lineno = utils.etree.get_lineno(elem)
+result.tempvar_defs.append(TempVariableSequenceDefinition(ref, sub_items, lineno))
 @classmethod
 def _read_setting_refs_override(cls, elem, result):
 if elem.get('refsIrrelevant', 'false').lower() in ('1', 'true'):
 refs = None

changeset 3	e7e0ae78773e
parent 0	2e8eeb919028