canfestival: comparison objdictgen/eds

equal deleted inserted replaced

-:bd6606630a3f
+:5d08887347a9
 # Dictionary for quickly translate boolean into integer value
 BOOL_TRANSLATE = {True : "1", False : "0"}
 # Dictionary for quickly translate eds access value into canfestival access value
-ACCESS_TRANSLATE = {"ro" : "ro", "wo" : "wo", "rw" : "rw", "rwr" : "rw", "rww" : "rw", "const" : "ro"}
+ACCESS_TRANSLATE = {"RO" : "ro", "WO" : "wo", "RW" : "rw", "RWR" : "rw", "RWW" : "rw", "CONST" : "ro"}
 # Function for verifying data values
 is_integer = lambda x: type(x) in (IntType, LongType)
 is_string = lambda x: type(x) in (StringType, UnicodeType)
 is_boolean = lambda x: x in (0, 1)
 # Define checking of value for each attribute
 ENTRY_ATTRIBUTES = {"SUBNUMBER" : is_integer, "PARAMETERNAME" : is_string,
 "OBJECTTYPE" : lambda x: x in (7, 8, 9), "DATATYPE" : is_integer,
 "LOWLIMIT" : is_integer, "HIGHLIMIT" : is_integer,
-"ACCESSTYPE" : lambda x: x in ["ro","wo", "rw", "rwr", "rww", "const"],
+"ACCESSTYPE" : lambda x: x.upper() in ACCESS_TRANSLATE.keys(),
 "DEFAULTVALUE" : lambda x: True, "PDOMAPPING" : is_boolean,
 "OBJFLAGS" : is_integer}
 # Define entry parameters by entry ObjectType number
 ENTRY_TYPES = {7 : {"name" : " VAR",
 # verify that there is no whitespace into keyname
 if keyname.isalnum():
 # value can be preceded and followed by whitespaces, so we escape them
 value = value.strip()
-# First case, value starts with "0x", then it's an hexadecimal value
+# First case, value starts with "0x" or "-0x", then it's an hexadecimal value
-if value.startswith("0x"):
+if value.startswith("0x") or value.startswith("-0x"):
 try:
 computed_value = int(value, 16)
 except:
 raise SyntaxError, "\"%s\" is not a valid value for attribute \"%s\" of section \"[%s]\""%(value, keyname, section_name)
-elif value.isdigit():
+elif value.isdigit() or value.startswith("-") and value[1:].isdigit():
-# Second case, value is a number and starts with "0", then it's an octal value
+# Second case, value is a number and starts with "0" or "-0", then it's an octal value
-if value.startswith("0"):
+if value.startswith("0") or value.startswith("-0"):
 computed_value = int(value, 8)
 # Third case, value is a number and don't start with "0", then it's a decimal value
 else:
 computed_value = int(value)
 # In any other case, we keep string value
 test = int(value.replace("$NODEID+", ""), 16)
 computed_value = "\"%s\""%value
 except:
 raise SyntaxError, "\"%s\" is not a valid formula for attribute \"%s\" of section \"[%s]\""%(value, keyname, section_name)
 # Second case, value starts with "0x", then it's an hexadecimal value
-elif value.startswith("0x"):
+elif value.startswith("0x") or value.startswith("-0x"):
 try:
 computed_value = int(value, 16)
 except:
 raise SyntaxError, "\"%s\" is not a valid value for attribute \"%s\" of section \"[%s]\""%(value, keyname, section_name)
-elif value.isdigit():
+elif value.isdigit() or value.startswith("-") and value[1:].isdigit():
 # Third case, value is a number and starts with "0", then it's an octal value
-if value.startswith("0"):
+if value.startswith("0") or value.startswith("-0"):
 computed_value = int(value, 8)
 # Forth case, value is a number and don't start with "0", then it's a decimal value
 else:
 computed_value = int(value)
 # In any other case, we keep string value
 # Add mapping for entry
 Node.AddMappingEntry(entry, name = values["PARAMETERNAME"], struct = 1)
 # Add mapping for first subindex
 Node.AddMappingEntry(entry, 0, values = {"name" : values["PARAMETERNAME"],
 "type" : values["DATATYPE"],
-"access" : ACCESS_TRANSLATE[values["ACCESSTYPE"]],
+"access" : ACCESS_TRANSLATE[values["ACCESSTYPE"].upper()],
 "pdo" : values.get("PDOMAPPING", 0) == 1})
-# Second case, entry is an ARRAY
+# Second case, entry is an ARRAY or RECORD
-elif values["OBJECTTYPE"] == 8:
+elif values["OBJECTTYPE"] in [8, 9]:
 # Extract maximum subindex number defined
 try:
 max_subindex = values["subindexes"][0]["DEFAULTVALUE"]
 except:
 raise SyntaxError, "Error on entry 0x%4.4X:\nSubindex 0 must be defined for an ARRAY entry"%entry
 for subindex in xrange(1, int(max_subindex) + 1):
 # if subindex is defined
 if subindex in values["subindexes"]:
 Node.AddMappingEntry(entry, subindex, values = {"name" : values["subindexes"][subindex]["PARAMETERNAME"],
 "type" : values["subindexes"][subindex]["DATATYPE"],
-"access" : ACCESS_TRANSLATE[values["subindexes"][subindex]["ACCESSTYPE"]],
+"access" : ACCESS_TRANSLATE[values["subindexes"][subindex]["ACCESSTYPE"].upper()],
 "pdo" : values["subindexes"][subindex].get("PDOMAPPING", 0) == 1})
 # if not, we add a mapping for compatibility
 else:
 Node.AddMappingEntry(entry, subindex, values = {"name" : "Compatibility Entry", "type" : 0x05, "access" : "rw", "pdo" : False})
-# Third case, entry is an RECORD
+##                    # Third case, entry is an RECORD
-elif values["OBJECTTYPE"] == 9:
+##                    elif values["OBJECTTYPE"] == 9:
-# Verify that the first subindex is defined
+##                        # Verify that the first subindex is defined
-if 0 not in values["subindexes"]:
+##                        if 0 not in values["subindexes"]:
-raise SyntaxError, "Error on entry 0x%4.4X:\nSubindex 0 must be defined for a RECORD entry"%entry
+##                            raise SyntaxError, "Error on entry 0x%4.4X:\nSubindex 0 must be defined for a RECORD entry"%entry
-# Add mapping for entry
+##                        # Add mapping for entry
-Node.AddMappingEntry(entry, name = values["PARAMETERNAME"], struct = 7)
+##                        Node.AddMappingEntry(entry, name = values["PARAMETERNAME"], struct = 7)
-# Add mapping for first subindex
+##                        # Add mapping for first subindex
-Node.AddMappingEntry(entry, 0, values = {"name" : "Number of Entries", "type" : 0x05, "access" : "ro", "pdo" : False})
+##                        Node.AddMappingEntry(entry, 0, values = {"name" : "Number of Entries", "type" : 0x05, "access" : "ro", "pdo" : False})
-# Verify that second subindex is defined
+##                        # Verify that second subindex is defined
-if 1 in values:
+##                        if 1 in values["subindexes"]:
-Node.AddMappingEntry(entry, 1, values = {"name" : values["PARAMETERNAME"] + " %d[(sub)]",
+##                            Node.AddMappingEntry(entry, 1, values = {"name" : values["PARAMETERNAME"] + " %d[(sub)]",
-"type" : values["subindexes"][1]["DATATYPE"],
+##                                                                     "type" : values["subindexes"][1]["DATATYPE"],
-"access" : ACCESS_TRANSLATE[values["subindexes"][1]["ACCESSTYPE"]],
+##                                                                     "access" : ACCESS_TRANSLATE[values["subindexes"][1]["ACCESSTYPE"].upper()],
-"pdo" : values["subindexes"][1].get("PDOMAPPING", 0) == 1})
+##                                                                     "pdo" : values["subindexes"][1].get("PDOMAPPING", 0) == 1,
-else:
+##                                                                     "nbmax" : 0xFE})
-raise SyntaxError, "Error on entry 0x%4.4X:\nA RECORD entry must have at least 2 subindexes"%entry
+##                        else:
+##                            raise SyntaxError, "Error on entry 0x%4.4X:\nA RECORD entry must have at least 2 subindexes"%entry
 # Define entry for the new node
 # First case, entry is a VAR
 if values["OBJECTTYPE"] == 7:
 Node.AddEntry(entry, 0, value)
 # Second case, entry is an ARRAY or a RECORD
 elif values["OBJECTTYPE"] in (8, 9):
 # Verify that "Subnumber" attribute is defined and has a valid value
 if "SUBNUMBER" in values and values["SUBNUMBER"] > 0:
+consecutive = False
 # Extract maximum subindex number defined
 try:
 max_subindex = values["subindexes"][0]["DEFAULTVALUE"]
 except:
-raise SyntaxError, "Error on entry 0x%4.4X:\nSubindex 0 must be defined for an ARRAY or a RECORD entry"%entry
+max_subindex = values["SUBNUMBER"] - 1
+consecutive = True
+#raise SyntaxError, "Error on entry 0x%4.4X:\nSubindex 0 must be defined for an ARRAY or a RECORD entry"%entry
 Node.AddEntry(entry, value = [])
 # Define value for all subindexes except the first
 for subindex in xrange(1, int(max_subindex) + 1):
 # Take default value if it is defined and entry is defined
 if subindex in values["subindexes"] and "DEFAULTVALUE" in values["subindexes"][subindex]:
 value = values["subindexes"][subindex]["DEFAULTVALUE"]
 # Find default value for value type of the subindex
+elif subindex in values["subindexes"] or not consecutive:
+value = GetDefaultValue(entry, subindex)
 else:
-value = GetDefaultValue(entry, subindex)
+raise SyntaxError, "Error on entry 0x%4.4X:\nCan't recompose implemented subindexes in this ARRAY or RECORD entry"%entry
 Node.AddEntry(entry, subindex, value)
 else:
 raise SyntaxError, "Array or Record entry 0x%4.4X must have a \"SubNumber\" attribute"%entry
 return Node
 except SyntaxError, message:

changeset 309	5d08887347a9
parent 305	db803c81f19f
child 323	4df7e6d2d1db