matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #212 from Ristovski/master

Browse Source 
Fix python3 compatibility
This commit is contained in:
jacob1 2014-03-27 12:17:43 -04:00
commit c30dbf3138
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generator.py
View File

@ -38,7 +38,7 @@ def generateElements(elementFiles, outputCpp, outputH):
classDirectives = [] classDirectives = []
for d in directives: for d in directives:
if d[0] == "ElementClass": if d[0] == "ElementClass":
d[3] = string.atoi(d[3]) d[3] = int(d[3])
classDirectives.append(d) classDirectives.append(d)
elementIDs = sorted(classDirectives, key=lambda directive: directive[3]) elementIDs = sorted(classDirectives, key=lambda directive: directive[3])
@ -69,7 +69,7 @@ def generateElements(elementFiles, outputCpp, outputH):
baseClass = classBits[1] baseClass = classBits[1]
else: else:
newClass = tmpClass newClass = tmpClass
elementClasses[newClass].append(string.join(d[2:], " ")+";") elementClasses[newClass].append(" ".join(d[2:])+";")
#for className, classMembers in elementClasses.items(): #for className, classMembers in elementClasses.items():
for d in elementIDs: for d in elementIDs:
@ -94,7 +94,7 @@ public:
virtual ~{0}(); virtual ~{0}();
{2} {2}
}}; }};
""".format(className, elementBase, string.join(classMembers, "\n\t")) """.format(className, elementBase, str.join("\n\t", classMembers))
elementHeader += """ elementHeader += """
std::vector<Element> GetElements(); std::vector<Element> GetElements();
@ -172,14 +172,14 @@ def generateTools(toolFiles, outputCpp, outputH):
if d[0] == "ToolClass": if d[0] == "ToolClass":
toolClasses[d[1]] = [] toolClasses[d[1]] = []
toolHeader += "#define %s %s\n" % (d[2], d[3]) toolHeader += "#define %s %s\n" % (d[2], d[3])
d[3] = string.atoi(d[3]) d[3] = int(d[3])
classDirectives.append(d) classDirectives.append(d)
for d in directives: for d in directives:
if d[0] == "ToolHeader": if d[0] == "ToolHeader":
toolClasses[d[1]].append(string.join(d[2:], " ")+";") toolClasses[d[1]].append(" ".join(d[2:])+";")
for className, classMembers in toolClasses.items(): for className, classMembers in list(toolClasses.items()):
toolHeader += """ toolHeader += """
class {0}: public SimTool class {0}: public SimTool
{{ {{
@ -188,7 +188,7 @@ public:
virtual ~{0}(); virtual ~{0}();
virtual int Perform(Simulation * sim, Particle * cpart, int x, int y, float strength); virtual int Perform(Simulation * sim, Particle * cpart, int x, int y, float strength);
}}; }};
""".format(className, string.join(classMembers, "\n")) """.format(className, str.join("\n", classMembers))
toolHeader += """ toolHeader += """
std::vector<SimTool*> GetTools(); std::vector<SimTool*> GetTools();