276 elif base_type["name"] in ["string", "wstring"]: |
276 elif base_type["name"] in ["string", "wstring"]: |
277 basetype_name = base_type["name"].upper() |
277 basetype_name = base_type["name"].upper() |
278 # Array derived directly from an elementary type |
278 # Array derived directly from an elementary type |
279 else: |
279 else: |
280 basetype_name = base_type["name"] |
280 basetype_name = base_type["name"] |
281 var_type = "ARRAY [%s] OF %s" % (",".join(map(lambda x : "%s..%s" % (dimension.getlower(), dimension.getupper()), vartype_content["value"].getdimension())), basetype_name) |
281 var_type = "ARRAY [%s] OF %s" % (",".join(map(lambda x : "%s..%s" % (x.getlower(), x.getupper()), vartype_content["value"].getdimension())), basetype_name) |
282 # Variable type is an elementary type |
282 # Variable type is an elementary type |
283 else: |
283 else: |
284 var_type = vartype_content["name"] |
284 var_type = vartype_content["name"] |
285 config += [(" ", ()), |
285 config += [(" ", ()), |
286 (var.getname(), (tagname, "variable", var_number, "name")), |
286 (var.getname(), (tagname, "variable", var_number, "name")), |
345 elif base_type["name"] in ["string", "wstring"]: |
345 elif base_type["name"] in ["string", "wstring"]: |
346 basetype_name = base_type["name"].upper() |
346 basetype_name = base_type["name"].upper() |
347 # Array derived directly from an elementary type |
347 # Array derived directly from an elementary type |
348 else: |
348 else: |
349 basetype_name = base_type["name"] |
349 basetype_name = base_type["name"] |
350 var_type = "ARRAY [%s] OF %s" % (",".join(map(lambda x : "%s..%s" % (dimension.getlower(), dimension.getupper()), vartype_content["value"].getdimension())), basetype_name) |
350 var_type = "ARRAY [%s] OF %s" % (",".join(map(lambda x : "%s..%s" % (x.getlower(), x.getupper()), vartype_content["value"].getdimension())), basetype_name) |
351 # Variable type is an elementary type |
351 # Variable type is an elementary type |
352 else: |
352 else: |
353 var_type = vartype_content["name"] |
353 var_type = vartype_content["name"] |
354 resrce += [(" ", ()), |
354 resrce += [(" ", ()), |
355 (var.getname(), (tagname, "variable", var_number, "name")), |
355 (var.getname(), (tagname, "variable", var_number, "name")), |
621 elif vartype_content["name"] == "array": |
621 elif vartype_content["name"] == "array": |
622 base_type = vartype_content["value"].baseType.getcontent() |
622 base_type = vartype_content["value"].baseType.getcontent() |
623 # Array derived directly from a user defined type |
623 # Array derived directly from a user defined type |
624 if base_type["name"] == "derived": |
624 if base_type["name"] == "derived": |
625 basetype_name = base_type["value"].getname() |
625 basetype_name = base_type["value"].getname() |
626 self.GenerateDataType(basetype_name) |
626 self.ParentGenerator.GenerateDataType(basetype_name) |
627 # Array derived directly from a string type |
627 # Array derived directly from a string type |
628 elif base_type["name"] in ["string", "wstring"]: |
628 elif base_type["name"] in ["string", "wstring"]: |
629 basetype_name = base_type["name"].upper() |
629 basetype_name = base_type["name"].upper() |
630 # Array derived directly from an elementary type |
630 # Array derived directly from an elementary type |
631 else: |
631 else: |