178,181c178,180
< all_flags = {}
< trace_flags = []
< def TraceFlag(name, desc=''):
< if name in all_flags:
---
> trace_flags = {}
> def TraceFlag(name, desc=None):
> if name in trace_flags:
183,185c182
< flag = (name, (), desc)
< trace_flags.append(flag)
< all_flags[name] = ()
---
> trace_flags[name] = (name, (), desc)
187,188c184,185
< def CompoundFlag(name, flags, desc=''):
< if name in all_flags:
---
> def CompoundFlag(name, flags, desc=None):
> if name in trace_flags:
193c190
< if flag not in all_flags:
---
> if flag not in trace_flags:
195c192
< if all_flags[flag]:
---
> if trace_flags[flag][1]:
199,201c196
< flag = (name, compound, desc)
< trace_flags.append(flag)
< all_flags[name] = compound
---
> trace_flags[name] = (name, compound, desc)
669c664,666
< print >>f, 'baseFlags = ['
---
> allFlags.sort()
>
> print >>f, 'basic = ['
676c673
< print >>f, 'compoundFlags = ['
---
> print >>f, 'compound = ['
684c681
< print >>f, "allFlags = frozenset(baseFlags + compoundFlags)"
---
> print >>f, "all = frozenset(basic + compound)"
687c684
< print >>f, 'compoundFlagMap = {'
---
> print >>f, 'compoundMap = {'
696c693
< print >>f, 'flagDescriptions = {'
---
> print >>f, 'descriptions = {'
850c847
< flags = [ Value(f) for f in trace_flags ]
---
> flags = [ Value(f) for f in trace_flags.values() ]