Commit bc956056 authored by Jack Jansen's avatar Jack Jansen

Properties (like enums) are not in the global namespace but only valid

within a certain context. Give them an _Prop_ prefix, so they don't
accidentally obscure an element from another suite (as happened with
the Finder). Comparisons I'm not sure about, so I left them as global
names.

Also got rid of the lists if declarations, they serve no useful purpose.
parent 3279cb03
...@@ -973,10 +973,10 @@ class ObjectCompiler: ...@@ -973,10 +973,10 @@ class ObjectCompiler:
if pname == othername: if pname == othername:
return return
if self.fp: if self.fp:
self.fp.write("\n%s = %s\n"%(pname, othername)) self.fp.write("\n_Prop_%s = _Prop_%s\n"%(pname, othername))
else: else:
if self.fp: if self.fp:
self.fp.write("class %s(aetools.NProperty):\n" % pname) self.fp.write("class _Prop_%s(aetools.NProperty):\n" % pname)
self.fp.write('\t"""%s - %s """\n' % (ascii(name), ascii(what[1]))) self.fp.write('\t"""%s - %s """\n' % (ascii(name), ascii(what[1])))
self.fp.write("\twhich = %s\n" % `code`) self.fp.write("\twhich = %s\n" % `code`)
self.fp.write("\twant = %s\n" % `what[0]`) self.fp.write("\twant = %s\n" % `what[0]`)
...@@ -1041,7 +1041,7 @@ class ObjectCompiler: ...@@ -1041,7 +1041,7 @@ class ObjectCompiler:
if self.fp: if self.fp:
self.fp.write("%s._privpropdict = {\n"%cname) self.fp.write("%s._privpropdict = {\n"%cname)
for n in plist: for n in plist:
self.fp.write("\t'%s' : %s,\n"%(n, n)) self.fp.write("\t'%s' : _Prop_%s,\n"%(n, n))
self.fp.write("}\n") self.fp.write("}\n")
self.fp.write("%s._privelemdict = {\n"%cname) self.fp.write("%s._privelemdict = {\n"%cname)
for n, fulln in elist: for n, fulln in elist:
...@@ -1094,26 +1094,26 @@ class ObjectCompiler: ...@@ -1094,26 +1094,26 @@ class ObjectCompiler:
self.fp.write("\t%s : %s,\n" % (`k`, v)) self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n") self.fp.write("}\n")
self.fp.write("\n_propdeclarations = {\n") ## self.fp.write("\n_propdeclarations = {\n")
proplist = self.namemappers[0].getall('property') ## proplist = self.namemappers[0].getall('property')
proplist.sort() ## proplist.sort()
for k, v in proplist: ## for k, v in proplist:
self.fp.write("\t%s : %s,\n" % (`k`, v)) ## self.fp.write("\t%s : _Prop_%s,\n" % (`k`, v))
self.fp.write("}\n") ## self.fp.write("}\n")
##
self.fp.write("\n_compdeclarations = {\n") ## self.fp.write("\n_compdeclarations = {\n")
complist = self.namemappers[0].getall('comparison') ## complist = self.namemappers[0].getall('comparison')
complist.sort() ## complist.sort()
for k, v in complist: ## for k, v in complist:
self.fp.write("\t%s : %s,\n" % (`k`, v)) ## self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n") ## self.fp.write("}\n")
##
self.fp.write("\n_enumdeclarations = {\n") ## self.fp.write("\n_enumdeclarations = {\n")
enumlist = self.namemappers[0].getall('enum') ## enumlist = self.namemappers[0].getall('enum')
enumlist.sort() ## enumlist.sort()
for k, v in enumlist: ## for k, v in enumlist:
self.fp.write("\t%s : %s,\n" % (`k`, v)) ## self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n") ## self.fp.write("}\n")
def compiledata(data): def compiledata(data):
[type, description, flags] = data [type, description, flags] = data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment