equal
deleted
inserted
replaced
99 "Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), |
99 "Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), |
100 "Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""), |
100 "Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""), |
101 "External": lambda x: {"Constant": "Constant"}.get(x, "") |
101 "External": lambda x: {"Constant": "Constant"}.get(x, "") |
102 } |
102 } |
103 |
103 |
104 LOCATION_MODEL = re.compile("((?:%[IQM](?:\*|(?:[XBWLD]?[0-9]+(?:\.[0-9]+)*)))?)$") |
104 LOCATION_MODEL = re.compile(r"((?:%[IQM](?:\*|(?:[XBWLD]?[0-9]+(?:\.[0-9]+)*)))?)$") |
105 LOCATION_MODEL_SET = re.compile("((?:%[IQM](?:[XBWLD]?[0-9]+(?:\.[0-9]+)*))?)$") |
105 LOCATION_MODEL_SET = re.compile(r"((?:%[IQM](?:[XBWLD]?[0-9]+(?:\.[0-9]+)*))?)$") |
106 |
106 |
107 |
107 |
108 # ------------------------------------------------------------------------------- |
108 # ------------------------------------------------------------------------------- |
109 # Variables Panel Table |
109 # Variables Panel Table |
110 # ------------------------------------------------------------------------------- |
110 # ------------------------------------------------------------------------------- |
604 self.TagName, old_name, old_name+'%d') |
604 self.TagName, old_name, old_name+'%d') |
605 |
605 |
606 # increment location address |
606 # increment location address |
607 if row_content.Location != "" and LOCATION_MODEL_SET.match(row_content.Location): |
607 if row_content.Location != "" and LOCATION_MODEL_SET.match(row_content.Location): |
608 old_location = row_content.Location |
608 old_location = row_content.Location |
609 model = re.compile("%[IQM][XBWLD]?(.*\.|)") |
609 model = re.compile(r"%[IQM][XBWLD]?(.*\.|)") |
610 prefix = model.match(old_location).group(0) |
610 prefix = model.match(old_location).group(0) |
611 addr = int(re.split(model, old_location)[-1]) + 1 |
611 addr = int(re.split(model, old_location)[-1]) + 1 |
612 row_content.Location = prefix + text(addr) |
612 row_content.Location = prefix + text(addr) |
613 |
613 |
614 if not row_content.Class: |
614 if not row_content.Class: |