diff options
| author | oy <Tom_Adams@web.de> | 2011-04-13 20:37:12 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-04-13 20:37:12 +0200 |
| commit | 06115dd49dca2f8eb5f14606437e8fd20037cc4d (patch) | |
| tree | 5ec4bca6158319b3f5285d7689c5f94ae8da8c93 /datasrc/datatypes.py | |
| parent | 63e059b8fff6498e42b765a1dca000e53005ea77 (diff) | |
| download | zcatch-06115dd49dca2f8eb5f14606437e8fd20037cc4d.tar.gz zcatch-06115dd49dca2f8eb5f14606437e8fd20037cc4d.zip | |
added "Whitespace and line Endings cleanup" by GreYFoX
Diffstat (limited to 'datasrc/datatypes.py')
| -rw-r--r-- | datasrc/datatypes.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/datasrc/datatypes.py b/datasrc/datatypes.py index ddb3c9e3..73719f59 100644 --- a/datasrc/datatypes.py +++ b/datasrc/datatypes.py @@ -21,7 +21,7 @@ def FixCasing(Str): else: NewStr += c.lower() return NewStr - + def FormatName(type, name): if "*" in type: return "m_p" + FixCasing(name) @@ -34,12 +34,12 @@ class BaseType: self._type_name = type_name self._target_name = "INVALID" self._id = GetID() # this is used to remember what order the members have in structures etc - + def Identifyer(self): return "x"+str(self._id) def TargetName(self): return self._target_name def TypeName(self): return self._type_name def ID(self): return self._id; - + def EmitDeclaration(self, name): return ["%s %s;"%(self.TypeName(), FormatName(self.TypeName(), name))] def EmitPreDefinition(self, target_name): @@ -52,7 +52,7 @@ class MemberType: def __init__(self, name, var): self.name = name self.var = var - + class Struct(BaseType): def __init__(self, type_name): BaseType.__init__(self, type_name) @@ -71,7 +71,7 @@ class Struct(BaseType): print(v.name, v.var) sys.exit(-1) return m - + def EmitTypeDeclaration(self, name): lines = [] lines += ["struct " + self.TypeName()] @@ -93,7 +93,7 @@ class Struct(BaseType): lines += ["\t" + " ".join(member.var.EmitDefinition("")) + ","] lines += ["}"] return lines - + class Array(BaseType): def __init__(self, type): BaseType.__init__(self, type.TypeName()) @@ -114,7 +114,7 @@ class Array(BaseType): for item in self.items: lines += item.EmitPreDefinition("%s[%d]"%(self.Identifyer(), i)) i += 1 - + if len(self.items): lines += ["static %s %s[] = {"%(self.TypeName(), self.Identifyer())] for item in self.items: @@ -123,7 +123,7 @@ class Array(BaseType): lines += ["};"] else: lines += ["static %s *%s = 0;"%(self.TypeName(), self.Identifyer())] - + return lines def EmitDefinition(self, name): return [str(len(self.items))+","+self.Identifyer()] @@ -139,7 +139,7 @@ class Int(BaseType): def EmitDefinition(self, name): return ["%d"%self.value] #return ["%d /* %s */"%(self.value, self._target_name)] - + class Float(BaseType): def __init__(self, value): BaseType.__init__(self, "float") @@ -149,7 +149,7 @@ class Float(BaseType): def EmitDefinition(self, name): return ["%f"%self.value] #return ["%d /* %s */"%(self.value, self._target_name)] - + class String(BaseType): def __init__(self, value): BaseType.__init__(self, "const char*") @@ -158,7 +158,7 @@ class String(BaseType): self.value = value def EmitDefinition(self, name): return ['"'+self.value+'"'] - + class Pointer(BaseType): def __init__(self, type, target): BaseType.__init__(self, "%s*"%type().TypeName()) @@ -227,7 +227,7 @@ class NetObject: lines += ["\treturn 0;"] lines += ["}"] return lines - + class NetEvent(NetObject): def __init__(self, name, variables): @@ -265,12 +265,12 @@ class NetMessage(NetObject): extra += ["\t\t"+line for line in v.emit_pack()] extra += ["\t\treturn pPacker->Error() != 0;"] extra += ["\t}"] - - + + lines = NetObject.emit_declaration(self) lines = lines[:-1] + extra + lines[-1:] return lines - + class NetVariable: def __init__(self, name): |