COMP/CMSDIST/root_5.14_reflex_gccxml070_update.patch

diff -Naur root.orig/reflex/python/genreflex/gendict06.py root/reflex/python/genreflex/gendict06.py
--- root.orig/reflex/python/genreflex/gendict06.py      1970-01-01 01:00:00.000000000 +0100
+++ root/reflex/python/genreflex/gendict06.py   2007-11-04 05:24:03.000000000 +0100
@@ -0,0 +1,1744 @@
+# Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose is hereby granted without fee, provided that this copyright and
+# permissions notice appear in all copies and derivatives.
+#
+# This software is provided "as is" without express or implied warranty.
+
+import xml.parsers.expat
+import os, sys, string, time
+import gccdemangler
+
+class genDictionary(object) :
+#----------------------------------------------------------------------------------
+  def __init__(self, hfile, opts):
+    self.classes    = []
+    self.namespaces = []
+    self.typeids    = []
+    self.fktypeids  = []
+    self.files      = {}
+    self.typedefs   = []
+    self.basictypes = []
+    self.methods    = []
+    self.functions  = []
+    self.enums      = []
+    self.variables  = []
+    self.vtables    = {}
+    self.hfile      = os.path.normpath(hfile).replace(os.sep,'/')
+    self.pool       = opts.get('pool',False)
+    self.interpreter= opts.get('interpreter',False)
+    self.quiet      = opts.get('quiet',False)
+    self.resolvettd = opts.get('resolvettd',True)
+    self.xref       = {}
+    self.xrefinv    = {}
+    self.cppClassSelect    = {}
+    self.cppVariableSelect = {}
+    self.cppEnumSelect     = {}
+    self.cppFunctionSelect = {}
+    self.last_id    = ''
+    self.transtable = string.maketrans('<>&*,: ().$-', '__rp__s___dm')
+    self.ignoremeth = ('rbegin', 'rend', '_Eq','_Lt', 'value_comp')
+    self.x_id       = iter(xrange(sys.maxint))
+    self.errors     = 0
+    self.warnings   = 0
+    self.comments           = opts.get('comments', False)
+    self.iocomments     = opts.get('iocomments', False)
+    self.no_membertypedefs  = opts.get('no_membertypedefs', False)
+    self.generated_shadow_classes = []
+    self.selectionname      = 'ROOT::Reflex::Selection'
+    self.unnamedNamespaces = []
+    self.globalNamespaceID = ''
+    # The next is to avoid a known problem with gccxml that it generates a
+    # references to id equal '_0' which is not defined anywhere
+    self.xref['_0'] = {'elem':'Unknown', 'attrs':{'id':'_0','name':''}, 'subelems':[]}
+#----------------------------------------------------------------------------------
+  def start_element(self, name, attrs):
+    if 'id' in attrs :
+      self.xref[attrs['id']] = {'elem':name, 'attrs':attrs, 'subelems':[]}
+      self.last_id = attrs['id']
+    if name in ('EnumValue','Argument') :
+      self.xref[self.last_id]['subelems'].append(attrs)
+    elif name in ('Base',) :
+      if not 'bases' in self.xref[self.last_id] : self.xref[self.last_id]['bases'] = []
+      self.xref[self.last_id]['bases'].append(attrs)       
+    elif name in ('Class','Struct') :
+      self.classes.append(attrs)
+    elif name in ('Function',) :
+      self.functions.append(attrs)
+    elif name in ('Enumeration',) :
+      self.enums.append(attrs)
+    elif name in ('Variable',) :
+      self.variables.append(attrs)
+    elif name in ('OperatorFunction',) :
+      attrs['operator'] = 'true'
+      self.functions.append(attrs)
+    elif name in ('Constructor','Method','OperatorMethod') :
+      if 'name' in attrs and attrs['name'][0:3] != '_ZT' :
+        self.methods.append(attrs)
+    elif name == 'Namespace' :
+      self.namespaces.append(attrs)
+    elif name == 'File' :
+      self.files[attrs['id']] = {'name':attrs['name']}
+    elif name == 'Typedef' :
+      self.typedefs.append(attrs)
+    elif name == 'Variable' :
+      if 'name' in attrs and attrs['name'][0:4] == '_ZTV':
+        if 'context' in attrs : self.vtables[attrs['context']] = attrs
+    elif name == 'FundamentalType' :
+      self.basictypes.append(normalizeFragment(attrs['name']))
+#----------------------------------------------------------------------------------
+  def findSpecialNamespace(self):
+    for ns in self.namespaces:
+      if ns['name'].find('.') != -1:
+        self.unnamedNamespaces.append(ns['id'])
+      elif ns['name'] == '::' :
+        self.globalNamespaceID = ns['id']
+#----------------------------------------------------------------------------------
+# This function is not used anymore, because it had a problem with templated types
+# showing up as members of a scope in the gccxml generated output. If gccxml puts
+# templated types as members this function should be resurrected for performance
+# reasons. It shall be called from self.parse instead of 'for col in [self.class...'
+  def collectCppSelections(self, ns) :
+    for m in ns.get('members').split():
+      xm = self.xref[m]
+      xelem = xm['elem']
+      if xelem in ('Namespace',) :
+        self.collectCppSelections(xm['attrs'])
+      cname = self.genTypeName(m)
+      if xelem in ('Class','Struct'):
+        #self.xrefinv[cname] = m
+        self.cppClassSelect[cname[len(self.selectionname)+2:]] = m
+      if xelem in ('Variable',):
+        self.cppVariableSelect[cname[len(self.selectionname)+2:]] = m
+      if xelem in ('Enumeration',):
+        self.cppEnumSelect[cname[len(self.selectionname)+2:]] = m
+      if xelem in ('Function',):
+        self.cppFunctionSelect[cname[len(self.selectionname)+2:]] = m
+#----------------------------------------------------------------------------------
+  def inScope(self, item, ctxt):
+    ictxt = item.get('context')
+    if ictxt :
+      if ictxt == ctxt : return 1
+      else             : return self.inScope(self.xref[ictxt]['attrs'], ctxt)
+    return 0
+#----------------------------------------------------------------------------------
+  def addCppClassSelect(self, key, value ) : self.cppClassSelect[key] = value
+  def addCppStructSelect(self, key, value ) : self.cppClassSelect[key] = value
+  def addCppFunctionSelect(self, key, value ) : self.cppFunctionSelect[key] = value
+  def addCppVariableSelect(self, key, value ) : self.cppVariableSelect[key] = value
+  def addCppEnumerationSelect(self, key, value ) : self.cppEnumSelect[key] = value  
+#----------------------------------------------------------------------------------
+  def parse(self, file) :
+    p = xml.parsers.expat.ParserCreate()
+    p.StartElementHandler = self.start_element
+    f = open(file)
+    p.ParseFile(f)
+    f.close()
+    cppselid = '';
+    cppsellen = len(self.selectionname)+2
+    # get the id of the selection namespace
+    for n in self.namespaces: 
+      if self.genTypeName(n['id']) == self.selectionname :
+        cppselid = n.get('id')
+        break
+    # for all classes, variables etc. check if they are in the seleciton ns and add them if
+    for col in [self.classes, self.variables, self.enums, self.functions ]:
+      for it in col:
+        if self.inScope(it, cppselid) :
+          cid = it['id']
+          funname = 'addCpp'+self.xref[cid]['elem']+'Select'
+          if funname in dir(self):
+            self.__class__.__dict__[funname](self, self.genTypeName(cid)[cppsellen:], cid)
+    self.tryCppSelections()
+    self.findSpecialNamespace()
+#----------------------------------------------------------------------------------
+  def tryCppSelections(self):
+    for c in self.classes:
+      id = self.cppClassSelect.get(self.genTypeName(c['id'],alltempl=True))
+      if (id != None) :
+        selection = {'id' : id}
+        self.add_template_defaults (c, selection)
+        self.notice_transient (c, selection)
+        self.notice_autoselect (c, selection)
+    for v in self.variables:
+      id = self.cppVariableSelect.get(self.genTypeName(v['id']))
+      if (id != None):
+        if v.has_key('extra') : v['extra']['autoselect'] = 'true'
+        else                  : v['extra'] = {'autoselect':'true'}
+    for e in self.enums:
+      id = self.cppEnumSelect.get(self.genTypeName(e['id']))
+      if (id != None):
+        if e.has_key('extra') : e['extra']['autoselect'] = 'true'
+        else                  : e['extra'] = {'autoselect':'true'}
+    for f in self.functions:
+      id = self.cppFunctionSelect.get(self.genTypeName(f['id']))
+      #fixme: check if signature (incl. return type?) is the same
+      if (id != None):
+        if f.has_key('extra') : f['extra']['autoselect'] = 'true'
+        else                  : f['extra'] = {'autoselect':'true'}
+    return
+#----------------------------------------------------------------------------------
+  def notice_transient (self, c, selection):
+    transient_fields = []
+    for f in self.get_fields (selection):
+      tid = f['type']
+      tname = self.genTypeName (tid)
+      if tname.startswith (self.selectionname+"::TRANSIENT"):
+       transient_fields.append (f['name'])
+
+    if transient_fields:
+      for f in self.get_fields (c):
+        fname = f['name']
+        if fname in transient_fields:
+         if f.has_key('extra') : f['extra']['transient'] = 'true'
+         else                  : f['extra'] = {'transient':'true'}
+          transient_fields.remove (fname)
+
+    if transient_fields:
+      print "--->> genreflex: WARNING: Transient fields declared in selection " +\
+            "not present in class:", \
+            self.xref[selection['id']]['attrs']['name'], transient_fields
+      self.warnings += 1
+    return
+#----------------------------------------------------------------------------------
+  def notice_autoselect (self, c, selection):
+    self_autoselect = 1
+    for f in self.get_fields (selection):
+      tid = f['type']
+      tname = self.genTypeName (tid)
+      if tname.startswith( self.selectionname+'::NO_SELF_AUTOSELECT'): self_autoselect = 0
+      if tname.startswith (self.selectionname+'::AUTOSELECT'):
+        if 'members' in c:
+          for mnum in c['members'].split():
+            m = self.xref[mnum]
+            if 'name' in m['attrs'] and m['attrs']['name'] == f['name']:
+              if m['elem'] == 'Field':
+                fattrs = self.xref[m['attrs']['type']]['attrs']
+                if fattrs.has_key('extra') : fattrs['extra']['autoselect'] = 'true'
+                else                       : fattrs['extra'] = {'autoselect':'true'}
+              else :
+                print '--->> genreflex: WARNING: AUTOSELECT selection functionality for %s not implemented yet' % m['elem']
+                self.warnings += 1
+    if self_autoselect :
+      attrs = self.xref[c['id']]['attrs']
+      if attrs.has_key('extra') : attrs['extra']['autoselect'] = 'true'
+      else                      : attrs['extra'] = {'autoselect':'true'}
+    return
+#----------------------------------------------------------------------------------
+  def get_fields (self, c):
+    xref = self.xref
+    cid = c['id']
+    attrs = xref[cid]['attrs']
+    return [xref[m]['attrs']
+            for m in attrs.get('members', '').split()
+            if xref[m]['elem'] == 'Field']
+#----------------------------------------------------------------------------------
+  def get_member (self, c, name):
+    xref = self.xref
+    cid = c['id']
+    attrs = self.xref[cid]['attrs']
+    for m in attrs.get('members', '').split():
+      if xref[m]['attrs']['name'] == name:
+        return m
+    return None
+#----------------------------------------------------------------------------------  
+  def has_typedef (self, c, name):
+    cid = c['id']
+    attrs = self.xref[cid]['attrs']
+    for m in attrs.get('members', '').split():
+      if (self.xref[m]['elem'] == 'Typedef' and
+          self.xref[m]['attrs']['name'] == name):
+        return self.xref[m]['attrs']['type']
+    return None
+#----------------------------------------------------------------------------------
+  def resolveTypedefName( self, name ) :
+    notname = ['*','<','>',',',':',' ']
+    for td in self.typedefs :
+      tdname = self.genTypeName(td['id'])
+      f = name.find(tdname)
+      if f != -1 :
+        g = f + len(tdname)
+        if (f == 0 or name[f-1] in notname) and (g == len(tdname) or name[g] in notname) :
+          defname = self.genTypeName(td['type'])
+          if defname[len(defname)-1] == '>' : defname += ' '
+          name = self.resolveTypedefName(name.replace(tdname, defname, 1))
+    return name
+#----------------------------------------------------------------------------------
+  def genFakeTypedef( self, cid, name ) :
+    nid = cid+'f'
+    while nid in self.fktypeids : nid += 'f'
+    catt = self.xref[cid]['attrs']
+    attrs = {'name':name,'id':nid,'type':catt['id'],'context':self.globalNamespaceID}
+    for i in ['location','file','line'] : attrs[i] = catt[i]
+    self.typedefs.append(attrs)
+    self.xref[attrs['id']] = {'elem':'Typedef', 'attrs':attrs, 'subelems':[]}
+    self.fktypeids.append(nid)
+#----------------------------------------------------------------------------------
+  def resolveSelectorTypedefs( self, sltor ):
+    newselector = []
+    for sel in sltor :
+      if not sel.has_key('used'):
+        attrs = sel['attrs']
+        for n in ['name', 'pattern']:
+          if attrs.has_key(n) and attrs[n].find('<') != -1 :
+            newname = self.resolveTypedefName(attrs[n])
+            if newname != attrs[n]:
+              sel['attrs']['o_'+n] = attrs[n]
+              sel['attrs'][n] = newname
+              newselector.append(sel)
+    return newselector
+#----------------------------------------------------------------------------------
+  def selclasses(self, sel, deep) :
+    selec = []
+    if sel :
+      self.selector = sel  # remember the selector
+      for c in self.classes :
+        if 'incomplete' in c : continue
+        # this check fixes a bug in gccxml 0.6.0_patch3 which sometimes generates incomplete definitions 
+        # of classes (without members). Every version after 0.6.0_patch3 is tested and fixes this bug
+        if not c.has_key('members') : continue
+
+        # Filter any non-public data members for minimal interpreter dict
+        if self.interpreter:
+          cxref = self.xref[c['id']]
+          # assumes that the default is "public"
+          if cxref.has_key('attrs') and 'access' in cxref['attrs'] :
+            continue
+
+        match = self.selector.matchclass( self.genTypeName(c['id']), self.files[c['file']]['name'])
+        if match[0] and not match[1] :
+          c['extra'] = match[0]
+          selec.append(c)
+      for t in self.typedefs:
+        match = self.selector.matchclass( self.genTypeName(t['id']), self.files[t['file']]['name'])
+        if match[0] and not match[1] :
+          c = self.xref[t['type']]
+          while c['elem'] == 'Typedef': c = self.xref[c['attrs']['type']]
+          if c['elem'] in ('Class','Struct'):
+            self.genTypeID(t['id'])
+            catt = c['attrs']
+            catt['extra'] = match[0]
+            if catt not in selec :
+              print '--->> genreflex: INFO: Using typedef %s to select class %s' % (self.genTypeName(t['id']), self.genTypeName(catt['id']))
+              selec.append(catt)
+      if self.resolvettd :
+        newselector = self.resolveSelectorTypedefs( self.selector.sel_classes )
+        if newselector:
+          for c in self.classes:
+            match = self.selector.matchclassTD( self.genTypeName(c['id']), self.files[c['file']]['name'], newselector )
+            if match[0] and not match[1] :
+              n = 'name'
+              if 'pattern' in match[0] : n = 'pattern'
+              if not self.quiet:
+                print '--->> genreflex: INFO: Replacing selection %s "%s" with "%s"' % ( n, match[0]['o_'+n], match[0][n] )
+              c['extra'] = match[0]
+              if c not in selec : selec.append(c)
+              if n == 'name' : self.genFakeTypedef(c['id'], match[0]['o_name'])
+      return self.autosel (selec)
+    else : self.selector = None
+    local = filter(self.filefilter, self.classes)
+    typed = self.typedefclasses()
+    templ = self.tmplclasses(local)
+    if deep :
+      types = [] 
+      for c in local : self.getdependent(c['id'], types)
+      for c in typed : self.getdependent(c['id'], types)
+      for c in templ : self.getdependent(c['id'], types)
+      classes =  map( lambda t : self.xref[t]['attrs'], types)
+    else :
+      classes =  clean( local + typed + templ )
+    # Filter STL implementation specific classes
+    classes =  filter( lambda c: self.genTypeName(c['id'])[:6] != 'std::_' ,classes)
+    classes =  filter( lambda c: c['name'][:2] != '._' ,classes)  # unamed structs and unions
+    return self.autosel( classes )
+ #----------------------------------------------------------------------------------
+  def autosel(self, classes):
+    types = []
+    for c in self.classes:
+      self.getdependent(c['id'], types)
+    for t in types:
+      c = self.xref[t]['attrs']
+      if 'extra' in c and c['extra'].get('autoselect') and c not in classes:
+        classes.append (c)
+    return classes  
+#----------------------------------------------------------------------------------
+  def selfunctions(self, sel) :
+    selec = []
+    self.selector = sel  # remember the selector
+    if self.selector :
+      for f in self.functions :
+        funcname = self.genTypeName(f['id'])
+        if self.selector.selfunction( funcname ) and not self.selector.excfunction( funcname ) :
+          selec.append(f)
+        elif 'extra' in f and f['extra'].get('autoselect') and f not in selec:
+          selec.append(f)
+    return selec
+#----------------------------------------------------------------------------------
+  def selenums(self, sel) :
+    selec = []
+    self.selector = sel  # remember the selector
+    if self.selector :
+      for e in self.enums :
+        # Filter any non-public data members for minimal interpreter dict
+        if self.interpreter:
+          exref = self.xref[e['id']]
+          # assumes that the default is "public"
+          if exref.has_key('attrs') and 'access' in exref['attrs'] :
+            continue
+
+        ename = self.genTypeName(e['id'])
+        if self.selector.selenum( ename ) and not self.selector.excenum( ename ) :
+          selec.append(e)
+        elif 'extra' in e and e['extra'].get('autoselect') and e not in selec:
+          selec.append(e)
+    return selec
+#---------------------------------------------------------------------------------
+  def selvariables(self, sel) :
+    selec = []
+    self.selector = sel  # remember the selector
+    if self.selector :
+      for v in self.variables :
+        varname = self.genTypeName(v['id'])
+        if self.selector.selvariable( varname ) and not self.selector.excvariable( varname ) :
+          selec.append(v)
+        elif 'extra' in v and v['extra'].get('autoselect') and v not in selec:
+          selec.append(v)
+    return selec
+#----------------------------------------------------------------------------------
+  def getdependent(self, cid, types ) :
+    elem  = self.xref[cid]['elem']
+    attrs = self.xref[cid]['attrs']
+    if elem in ('Typedef', 'ArrayType', 'PointerType','ReferenceType' ): 
+      self.getdependent(attrs['type'], types)
+    elif elem in ('Class','Struct') :
+      if 'incomplete' in attrs : return
+      if attrs['id'] not in types : 
+        types.append(attrs['id'])
+        if 'members' in attrs :
+          for m in attrs['members'].split() :
+            if self.xref[m]['elem'] == 'Field' :
+              type = self.xref[m]['attrs']['type']
+              self.getdependent(type, types)
+        if 'bases' in attrs :
+          for b in attrs['bases'].split() :
+            if b[:10] == 'protected:' : b = b[10:]
+            if b[:8]  == 'private:'   : b = b[8:]
+            self.getdependent(b, types)
+#----------------------------------------------------------------------------------
+  def sortselclasses(self, l):
+    nolit = [' ', ':', '<', '>']
+    l2 = []
+    for x in l:
+      ap = 1
+      for i in range(len(l2)):
+        l2ifn = l2[i]['fullname']
+        xfn = x['fullname']
+        bpos = l2ifn.find(xfn)
+        epos = bpos + len(xfn)
+        if bpos != -1 and ( bpos == 0 or l2ifn[bpos-1] in nolit  ) and ( epos == len(l2ifn) or l2ifn[epos] in nolit ) :
+          l2.insert(i,x)
+          ap = 0
+          break
+      if ap : l2.append(x)
+    return l2
+#----------------------------------------------------------------------------------
+  def generate(self, file, selclasses, selfunctions, selenums, selvariables, cppinfo) :
+    for c in selclasses :  c['fullname'] = self.genTypeName(c['id'])
+    selclasses = self.sortselclasses(selclasses)
+    names = []
+    f = open(file,'w') 
+    f.write(self.genHeaders(cppinfo))
+    f_buffer = ''
+    f_shadow =  '\n// Shadow classes to obtain the data member offsets \n'
+    f_shadow += 'namespace __shadow__ {\n'
+    for c in selclasses :
+      if 'incomplete' not in c :
+        if not self.quiet : print  'class '+ c['fullname']
+        names.append(c['fullname'])
+        self.completeClass( c )
+        self.enhanceClass( c )
+        scons, stubs   = self.genClassDict( c )
+        f_buffer += stubs
+        f_buffer += scons
+        f_shadow += self.genClassShadow(c)
+    f_shadow += '}\n\n'
+    f_buffer += self.genFunctionsStubs( selfunctions )
+    f_buffer += self.genInstantiateDict(selclasses, selfunctions, selenums, selvariables)
+    f.write('namespace {\n')
+    f.write(self.genNamespaces(selclasses + selfunctions + selenums + selvariables))
+    f.write(self.genAllTypes())
+    f.write('} // unnamed namespace\n')
+    f.write(f_shadow)
+    f.write('namespace {\n')
+    f.write(f_buffer)
+    f.write('} // unnamed namespace\n')
+    f.close()
+    return names, self.warnings, self.errors
+#----------------------------------------------------------------------------------
+  def add_template_defaults (self, c, selection):
+    tlist = []
+    for f in self.get_fields (selection):
+        tid = f['type']
+        tname = self.genTypeName (tid)
+        if tname.startswith (self.selectionname+"::TEMPLATE_DEFAULTS"):
+          tid = {'id': tid}
+          nodefault_tid = self.has_typedef (tid, 'nodefault')
+          i = 1
+          while 1:
+            arg = self.has_typedef (tid, 't%d' % i)
+            if not arg:
+              break
+            if arg == nodefault_tid:
+              tlist.append ('=')
+            else:
+              tlist.append (self.genTypeName (arg))
+            i += 1
+    if tlist:
+      name = self.xref[c['id']]['attrs']['name']
+      i = name.find ('<')
+      if i>=0 : name = name[:i]
+      stldeftab[name] = tuple (tlist)
+    return
+#----------------------------------------------------------------------------------
+  def isUnnamedType(self, name) :
+    if name and (name.find('.') != -1 or name.find('$') != -1): return 1
+    else                                            : return 0
+#----------------------------------------------------------------------------------
+  def filefilter(self, attrs):
+    if self.genTypeName(attrs['id'])[:len(self.selectionname)] == self.selectionname : return 0
+    fileid = attrs['file']
+    if self.files[fileid]['name'] == self.hfile : return 1
+    else : return 0
+#----------------------------------------------------------------------------------
+  def memberfilter( self, id ) :
+    elem  = self.xref[id]['elem']
+    attrs = self.xref[id]['attrs']
+    args  = self.xref[id]['subelems']
+    if 'name' in attrs :
+       if attrs['name'] in self.ignoremeth : return 0
+    #----Filter any method and operator for minimal POOL dict -----
+    if self.pool :
+      if elem in ('OperatorMethod','Converter') : return 0
+      elif elem in ('Method',) :
+        if attrs['name'] not in ('at','size','clear','resize') : return 0
+      elif elem in ('Constructor',) :
+        if len(args) > 1 : return 0
+        elif len(args) == 1 :
+          if self.genTypeName(args[0]['type']) != 'const '+self.genTypeName(attrs['context'])+'&' : return 0
+    #----Filter any non-public data members for minimal interpreter dict -----
+    if self.interpreter and elem in ('Field') and 'access' in attrs : # assumes that the default is "public"
+      return 0
+    #----Filter any non public method
+    if 'access' in attrs :  # assumes that the default is "public"
+      if elem in ('Constructor','Destructor','Method','OperatorMethod','Converter') : return 0
+    #----Filter any copy constructor with a private copy constructor in any base
+    if elem == 'Constructor' and len(args) == 1 and 'name' in args[0] and args[0]['name'] == '_ctor_arg' :
+      if self.isConstructorPrivate(attrs['context']) : return 0
+    #----Filter any constructor for pure abstract classes
+    if 'context' in attrs :
+      if 'abstract' in self.xref[attrs['context']]['attrs'] : 
+        if elem in ('Constructor',) : return 0
+    #----Filter using the exclusion list in the selection file
+    if self.selector and 'name' in attrs and  elem in ('Constructor','Destructor','Method','OperatorMethod','Converter') :
+      if self.selector.excmethod(self.genTypeName(attrs['context']), attrs['name'] ) : return 0
+    return 1
+#----------------------------------------------------------------------------------
+  def tmplclasses(self, local):
+    result = []
+    for c in self.classes :
+      name = c['name']
+      if name.find('<') == -1 : continue
+      temp = name[name.find('<')+1:name.rfind('>')]
+      for lc in local :
+        if temp.find(lc['name']) != -1 : result.append(c)
+    return result
+#----------------------------------------------------------------------------------
+  def typedefclasses(self):
+    result = []
+    for t in self.typedefs :
+      fileid = t['location']
+      fileid = fileid[:fileid.index(':')]
+      if self.xref[fileid]['attrs']['name'] == self.hfile : 
+        if self.xref[t['type']]['elem'] in ('Class','Struct') :
+          result.append(self.xref[t['type']]['attrs'])
+    return result
+#----------------------------------------------------------------------------------
+  def isConstructorPrivate(self, id ) :
+    attrs = self.xref[id]['attrs']
+    if 'members' in attrs : 
+       for m in attrs['members'].split() :
+         elem = self.xref[m]['elem']
+         attr = self.xref[m]['attrs']
+         args = self.xref[m]['subelems']
+         if elem == 'Constructor' and len(args) == 1 :
+           if self.genTypeName(args[0]['type']) == 'const '+self.genTypeName(attr['context'])+'&' :
+             if 'access' in attr and attr['access'] == 'private' : return True
+    if 'bases' in attrs :
+       for b in attrs['bases'].split() :
+         if b[:10] == 'protected:' : b = b[10:]
+         if b[:8]  == 'private:'   : b = b[8:]
+         if self.isConstructorPrivate(b) : return True
+    return False
+#----------------------------------------------------------------------------------
+  def isDestructorNonPublic(self, id ) :
+    attrs = self.xref[id]['attrs']
+    if 'members' in attrs : 
+       for m in attrs['members'].split() :
+         elem = self.xref[m]['elem']
+         attr = self.xref[m]['attrs']
+         if elem == 'Destructor' :
+           if attr.get('access') in ('private','protected') : return True
+           else : return False
+    if 'bases' in attrs :
+       for b in attrs['bases'].split() :
+         if b[:10] == 'protected:' : b = b[10:]
+         if b[:8]  == 'private:'   : b = b[8:]
+         if self.isDestructorNonPublic(b) : return True
+    return False
+#----------------------------------------------------------------------------------
+  def isClassVirtual(self, attrs ) :
+    if 'members' in attrs : 
+       for m in attrs['members'].split() :
+         elem = self.xref[m]['elem']
+         attr = self.xref[m]['attrs']
+         if elem in ('Destructor','Method') :
+             if 'virtual' in attr : return True
+    if 'bases' in attrs :
+       for b in attrs['bases'].split() :
+         if b[:10] == 'protected:' : b = b[10:]
+         if b[:8]  == 'private:'   : b = b[8:]
+         if self.isClassVirtual(self.xref[b]['attrs']) : return True
+    return False
+#----------------------------------------------------------------------------------
+  def isClassPublic(self, id ) :
+    attrs = self.xref[id]['attrs']
+    if 'access' in attrs : return False
+    elif attrs['name'][-1] == '>' :
+      args = getTemplateArgs(attrs['name'])
+      for a in args :
+        while a[-1] in ('*','&') : a = a[:-1]
+        a = a.replace(', ',',')
+        if a in self.xrefinv :
+          if not self.isClassPublic(self.xrefinv[a]) : return False
+        else :
+          print '#%s#'% a, ' is not found in the table' 
+    return True
+#----------------------------------------------------------------------------------
+  def genHeaders(self, gccxmlinfo):
+    c =  '// Generated at %s. Do not modify it\n\n' % time.ctime(time.time())
+    if (gccxmlinfo) : c += '/*\n%s*/\n\n' % gccxmlinfo
+    c += '#ifdef _WIN32\n'
+    c += '#pragma warning ( disable : 4786 )\n'
+    c += '#endif\n'
+    c += '#include "%s"\n' % self.hfile
+    c += '#include "Reflex/Builder/ReflexBuilder.h"\n'
+    c += '#include <typeinfo>\n'
+    c += 'using namespace ROOT::Reflex;\n\n'
+    return c
+#----------------------------------------------------------------------------------
+  def genInstantiateDict( self, selclasses, selfunctions, selenums, selvariables) :
+    c = 'namespace {\n  struct Dictionaries {\n    Dictionaries() {\n'
+    for attrs in selclasses :
+      if 'incomplete' not in attrs : 
+        clf = '::'+ attrs['fullname']
+        clt = string.translate(str(clf), self.transtable)
+        c += '      %s_dict(); \n' % (clt)
+    c += self.genFunctions(selfunctions)
+    c += self.genEnums(selenums)
+    c += self.genVariables(selvariables)
+    c += '    }\n    ~Dictionaries() {\n'
+    for attrs in selclasses :
+      if 'incomplete' not in attrs : 
+        c += '      %s.Unload(); // class %s \n' % (self.genTypeID(attrs['id']), attrs['fullname'])
+    c += '    }\n  };\n'
+    c += '  static Dictionaries instance;\n}\n'
+    return c
+#---------------------------------------------------------------------------------
+
+  def translate_typedef (self, id):
+    while self.xref[id]['elem'] in ['CvQualifiedType', 'Typedef']:
+      id = self.xref[id]['attrs']['type']
+    return self.genTypeName(id,enum=True, const=True)
+
+  def genClassDict(self, attrs):
+    members, bases = [], []
+    cl  = attrs['name']
+    clf = '::' + attrs['fullname']
+    cls = attrs['fullname']
+    clt = string.translate(str(clf), self.transtable)
+    bases = self.getBases( attrs['id'] )
+    if 'members' in attrs : members = string.split(attrs['members'])
+    mod = self.genModifier(attrs,None)
+    typ = self.xref[attrs['id']]['elem'].upper()
+    if attrs.has_key('abstract') : mod += ' | ABSTRACT'
+    if self.vtables :
+      if attrs['id'] in self.vtables : mod += ' | VIRTUAL'
+    else :  # new in version 0.6.0
+      if self.isClassVirtual(attrs) :  mod += ' | VIRTUAL'
+    members = filter(self.memberfilter, members)  # Eliminate problematic members
+    # Fill the different streams sc: constructor, ss: stub functions
+    sc = '//------Dictionary for class %s -------------------------------\n' % cl
+    sc += 'void %s_dict() {\n' % (clt,)
+    if 'extra' in attrs and 'contid' in attrs['extra'] : 
+      cid = attrs['extra']['contid'].upper()
+    else :
+      cid = getContainerId(clf)[0]
+    notAccessibleType = self.checkAccessibleType(self.xref[attrs['id']])
+    if self.isUnnamedType(clf) : 
+      sc += '  ClassBuilder("%s", typeid(Unnamed%s), sizeof(%s), %s, %s)' % ( cls, self.xref[attrs['id']]['elem'], '__shadow__::'+ string.translate(str(clf),self.transtable), mod, typ )
+    elif notAccessibleType :
+      sc += '  ClassBuilder("%s", typeid(%s%s), sizeof(%s), %s, %s)' % ( cls, self.xref[notAccessibleType]['attrs']['access'].title(), self.xref[attrs['id']]['elem'], '__shadow__::'+ string.translate(str(clf),self.transtable), mod, typ )
+    else :
+      sc += '  ClassBuilder("%s", typeid(%s), sizeof(%s), %s, %s)' % (cls, cls, cls, mod, typ)
+    if 'extra' in attrs :
+      for pname, pval in attrs['extra'].items() :
+        if pname not in ('name','pattern','n_name','file_name','file_pattern') :
+          if pname == 'id' : pname = 'ClassID'
+          sc += '\n  .AddProperty("%s", "%s")' % (pname, pval)
+    for b in bases :
+      sc += '\n' + self.genBaseClassBuild( clf, b )
+    for m in members :
+      funcname = 'gen'+self.xref[m]['elem']+'Build'
+      if funcname in dir(self) :
+        line = self.__class__.__dict__[funcname](self, self.xref[m]['attrs'], self.xref[m]['subelems'])
+        if line : sc += '\n' + line 
+    sc += ';\n}\n\n'
+    ss = ''
+    if not self.isUnnamedType(clf) and not notAccessibleType:
+      ss = '//------Stub functions for class %s -------------------------------\n' % cl
+      for m in members :
+        funcname = 'gen'+self.xref[m]['elem']+'Def'
+        if funcname in dir(self) :
+          ss += self.__class__.__dict__[funcname](self, self.xref[m]['attrs'], self.xref[m]['subelems']) + '\n'
+    return sc, ss
+#----------------------------------------------------------------------------------
+  def checkAccessibleType( self, type ):
+    while type['elem'] in ('PointerType','Typedef','ArrayType') :
+      type = self.xref[type['attrs']['type']]
+    attrs = type['attrs']
+    if 'access' in attrs and attrs['access'] in ('private','protected') : return attrs['id']
+    if 'context' in attrs and self.checkAccessibleType(self.xref[attrs['context']]) : return attrs['id']
+    return 0
+#----------------------------------------------------------------------------------
+  def funPtrPos(self, name) :
+    if name.find(')(') != -1 :
+      opp = 0
+      clp = 0
+      pos = -2
+      for str in name.split(')('):
+        opp += str.count('<')
+        clp += str.count('>')
+        pos += len(str) + 2
+        if ( opp == clp ) : return pos
+    return 0
+#----------------------------------------------------------------------------------
+  def genClassShadow(self, attrs, inner = 0 ) :
+    inner_shadows = {}
+    bases = self.getBases( attrs['id'] )
+    cls = self.genTypeName(attrs['id'],const=True,colon=True)
+    clt = string.translate(str(cls), self.transtable)
+    if self.isUnnamedType(cls) and inner : clt = ''
+    xtyp = self.xref[attrs['id']]
+    typ = xtyp['elem'].lower()
+    indent = inner * 2 * ' '
+    if typ == 'enumeration' :
+      c = indent + 'enum %s {};\n' % clt
+    else:
+      if not bases : 
+        c = indent + '%s %s {\n%s  public:\n' % (typ, clt, indent)
+      else :
+        c = indent + '%s %s : ' % (typ, clt)
+        for b in bases :
+          if b.get('virtual','') == '1' : acc = 'virtual ' + b['access']
+          else                          : acc = b['access']
+         bname = self.genTypeName(b['type'],colon=True)
+         if self.xref[b['type']]['attrs'].get('access') in ('private','protected'):
+            bname = string.translate(str(bname),self.transtable)
+          c += indent + '%s %s' % ( acc , bname )
+          if b is not bases[-1] : c += ', ' 
+        c += indent + ' {\n' + indent +'  public:\n'
+      if clt: # and not self.checkAccessibleType(xtyp):
+        c += indent + '  %s();\n' % (clt)
+        if self.isClassVirtual( attrs ) :
+          c += indent + '  virtual ~%s() throw();\n' % ( clt )
+      members = attrs.get('members','')
+      memList = members.split()
+      for m in memList :
+        member = self.xref[m]
+        if member['elem'] in ('Class','Struct','Union','Enumeration') \
+           and member['attrs'].get('access') in ('private','protected') \
+           and not self.isUnnamedType(member['attrs'].get('name')):
+          cmem = self.genTypeName(member['attrs']['id'],const=True,colon=True)
+          if cmem != cls and cmem not in inner_shadows :
+            inner_shadows[cmem] = string.translate(str(cmem), self.transtable)
+            c += self.genClassShadow(member['attrs'], inner + 1)
+      for m in memList :
+        member = self.xref[m]
+        if member['elem'] in ('Field',) :
+          a = member['attrs']
+          axref = self.xref[a['type']]
+          t = self.genTypeName(a['type'],colon=True,const=True)
+          arraytype = ""
+          if t[-1] == ']' : arraytype = t[t.find('['):]
+
+          fundtype = axref
+          while fundtype['elem'] in ('ArrayType', 'Typedef'):
+            fundtype = self.xref[fundtype['attrs']['type']]
+          mTypeElem = fundtype['elem']
+
+          #---- Check if pointer of reference - exact type irrelevant
+          if mTypeElem == 'PointerType' :
+            c += indent + '  void* %s;\n' % (a['name'] + arraytype)
+            continue
+          elif mTypeElem ==  'ReferenceType' :
+            c += indent + '  int& %s;\n' % (a['name'] + arraytype)
+            continue
+
+          #---- Check if a type and a member with the same name exist in the same scope
+          if mTypeElem in ('Class','Struct'):
+            mTypeName = fundtype['attrs']['name']
+            mTypeId = fundtype['attrs']['id']
+            for el in self.xref[fundtype['attrs']['context']]['attrs'].get('members').split():
+              if self.xref[el]['attrs'].get('name') == mTypeName and mTypeId != el :
+                t = mTypeElem.lower() + ' ' + t[2:]
+                break
+          #---- Check for non public types------------------------
+          noPublicType = self.checkAccessibleType(axref)
+          if ( noPublicType and not self.isUnnamedType(axref['attrs'].get('name'))):
+            noPubTypeAttrs = self.xref[noPublicType]['attrs']
+            cmem = self.genTypeName(noPubTypeAttrs['id'],const=True,colon=True)
+            if cmem != cls and cmem not in inner_shadows :
+              inner_shadows[cmem] = string.translate(str(cmem), self.transtable)
+              c += self.genClassShadow(noPubTypeAttrs, inner + 1)
+          #---- translate the type with the inner shadow type-----  
+          ikeys = inner_shadows.keys()
+          ikeys.sort(lambda x,y : len(y) - len(x))
+          for ikey in ikeys :      
+            if   t.find(ikey) == 0      : t = t.replace(ikey, inner_shadows[ikey])     # change current class by shadow name 
+            elif t.find(ikey[2:]) != -1 : t = t.replace(ikey[2:], inner_shadows[ikey]) # idem without leading ::
+          mType = axref
+          if mType and self.isUnnamedType(mType['attrs'].get('name')) :
+            t = self.genClassShadow(mType['attrs'], inner+1)[:-2]
+          fPPos = self.funPtrPos(t)
+          if t[-1] == ']'         : c += indent + '  %s %s;\n' % ( t[:t.find('[')], a['name'] + arraytype )
+          elif fPPos              : c += indent + '  %s;\n'    % ( t[:fPPos] + a['name'] + t[fPPos:] )
+          else                    : c += indent + '  %s %s;\n' % ( t, a['name'] )
+      c += indent + '};\n'
+    return c    
+#----------------------------------------------------------------------------------
+  def genTypedefBuild(self, attrs, childs) :
+    if self.no_membertypedefs : return ''
+    # access selection doesn't work with gccxml0.6 - typedefs don't have it
+    if self.interpreter and 'access' in attrs : return ''
+    s = ''
+    s += '  .AddTypedef(%s, "%s::%s")' % ( self.genTypeID(attrs['type']), self.genTypeName(attrs['context']), attrs['name']) 
+    return s  
+#----------------------------------------------------------------------------------
+  def genEnumerationBuild(self, attrs, childs):
+    s = ''
+    name = self.genTypeName(attrs['id']) 
+    values = ''
+    for child in childs : values += child['name'] + '=' + child['init'] +';'
+    values = values[:-1]
+    mod = self.genModifier(attrs, None)
+    if self.isUnnamedType(name) :
+      s += '  .AddEnum("%s", "%s", &typeid(ROOT::Reflex::UnnamedEnum), %s)' % (name[name.rfind('::')+3:], values, mod) 
+    else :
+      if attrs.get('access') in ('protected','private'):
+        if not self.interpreter:
+          s += '  .AddEnum("%s", "%s", &typeid(ROOT::Reflex::UnknownType), %s)' % (name, values, mod)        
+      else:
+        s += '  .AddEnum("%s", "%s", &typeid(%s), %s)' % (name, values, name, mod)
+    return s 
+#----------------------------------------------------------------------------------
+  def genScopeName(self, attrs, enum=False, const=False, colon=False) :
+    s = ''
+    if 'context' in attrs :
+      ctxt = attrs['context']
+      while ctxt in self.unnamedNamespaces: ctxt = self.xref[ctxt]['attrs']['context']
+      ns = self.genTypeName(ctxt, enum, const, colon)
+      if ns : s = ns + '::'
+      elif colon  : s = '::'
+    return s
+#----------------------------------------------------------------------------------
+  def genTypeName(self, id, enum=False, const=False, colon=False, alltempl=False) :
+    if id[-1] in ['c','v'] :
+      nid = id[:-1]
+      cvdict = {'c':'const','v':'volatile'}
+      prdict = {'PointerType':'*', 'ReferenceType':'&'}
+      nidelem = self.xref[nid]['elem']
+      if nidelem in ('PointerType','ReferenceType') :
+        if const : return self.genTypeName(nid, enum, False, colon)
+        else :     return self.genTypeName(nid, enum, False, colon) + ' ' + cvdict[id[-1]]
+      else :
+        if const : return self.genTypeName(nid, enum, False, colon)
+        else     : return cvdict[id[-1]] + ' ' + self.genTypeName(nid, enum, False, colon)
+    # "const" vetoeing must not recurse
+    const = False
+    elem  = self.xref[id]['elem']
+    attrs = self.xref[id]['attrs']
+    s = self.genScopeName(attrs, enum, const, colon)
+    if elem == 'Namespace' :
+      if attrs['name'] != '::' : s += attrs['name']
+    elif elem == 'PointerType' :
+      t = self.genTypeName(attrs['type'],enum, const, colon)
+      if   t[-1] == ')' or t[-7:] == ') const' or t[-10:] == ') volatile' : s += t.replace('::*)','::**)').replace('::)','::*)').replace('(*)', '(**)').replace('()','(*)')
+      elif t[-1] == ']' or t[-7:] == ') const' or t[-10:] == ') volatile' : s += t[:t.find('[')] + '(*)' + t[t.find('['):]
+      else              : s += t + '*'   
+    elif elem == 'ReferenceType' :
+      s += self.genTypeName(attrs['type'],enum, const, colon)+'&'
+    elif elem in ('FunctionType','MethodType') :
+      s = self.genTypeName(attrs['returns'], enum, const, colon)
+      if elem == 'MethodType' : 
+        s += '('+ self.genTypeName(attrs['basetype'], enum, const, colon) + '::)('
+      else :
+        s += '()('
+      args = self.xref[id]['subelems']
+      if args :
+        for a in range(len(args)) :
+          s += self.genTypeName(args[a]['type'])
+          if a < len(args)-1 : s += ', '
+        s += ')'
+      else :
+        s += 'void)'
+      if (attrs.get('const') == '1') : s += ' const'
+      if (attrs.get('volatile') == '1') : s += ' volatile'
+    elif elem == 'ArrayType' :
+      arr = '[%s]' % str(int(attrs['max'])+1)
+      typ = self.genTypeName(attrs['type'], enum, const, colon)
+      if typ[-1] == ']' :
+        pos = typ.find('[')
+        s += typ[:pos] + arr + typ[pos:]
+      else:
+        s += typ + arr
+    elif elem == 'Unimplemented' :
+      s += attrs['tree_code_name']
+    elif elem == 'Enumeration' :
+      if enum : s = 'int'           # Replace "enum type" by "int"
+      else :    s += attrs['name']  # FIXME: Not always true  
+    elif elem == 'Typedef' :
+      s = self.genScopeName(attrs, enum, const, colon)
+      s += attrs['name']
+    elif elem in ('Function', 'OperatorFunction') :
+      if 'name' in attrs : s += attrs['name']
+      else : pass
+    elif elem == 'OffsetType' :
+      s += self.genTypeName(attrs['type'], enum, const, colon) + ' '
+      s += self.genTypeName(attrs['basetype'], enum, const, colon) + '::'  
+    else :
+      if 'name' in attrs : s += attrs['name']
+      s = normalizeClass(s,alltempl)                   # Normalize STL class names, primitives, etc.
+    return s
+#----------------------------------------------------------------------------------
+  def genTypeID(self, id ) :
+    if id[-1] in ('c','v') :
+      self.genTypeID(id[:-1])
+    else : 
+      elem  = self.xref[id]['elem']
+      attrs = self.xref[id]['attrs']
+      if elem in ('PointerType', 'ReferenceType', 'ArrayType', 'Typedef') :
+        self.genTypeID(attrs['type'])
+      elif elem in ('FunctionType', 'MethodType') :
+        if 'returns' in attrs : self.genTypeID(attrs['returns'])
+        args = self.xref[id]['subelems']
+        for a in args : self.genTypeID(a['type'])
+      elif elem in ('OperatorMethod', 'Method', 'Constructor', 'Converter', 'Destructor', 
+                    'Function', 'OperatorFunction' ) :
+        if 'returns' in attrs : c = 'FunctionTypeBuilder(' + self.genTypeID(attrs['returns'])
+        else                  : c = 'FunctionTypeBuilder(type_void'
+        args = self.xref[id]['subelems']
+        for a in args : c += ', '+ self.genTypeID(a['type'])
+        c += ')'
+        return c
+      elif elem in ('Variable',) :
+        self.genTypeID(attrs['type'])
+      else :
+        pass
+    # Add this type in the list of types...
+    if id not in self.typeids : self.typeids.append(id)
+    return 'type'+id
+#----------------------------------------------------------------------------------
+  def genAllTypes(self) :
+    self.typeids += self.fktypeids
+    c = '  Type type_void = TypeBuilder("void");\n'
+    for id in self.typeids :      
+      c += '  Type type%s = ' % id
+      if id[-1] == 'c':
+        c += 'ConstBuilder(type'+id[:-1]+');\n'
+      elif id[-1] == 'v':
+        c += 'VolatileBuilder(type'+id[:-1]+');\n'
+      else : 
+        elem  = self.xref[id]['elem']
+        attrs = self.xref[id]['attrs']
+        if elem == 'PointerType' :
+          c += 'PointerBuilder(type'+attrs['type']+');\n'
+        elif elem == 'ReferenceType' :
+          c += 'ReferenceBuilder(type'+attrs['type']+');\n'
+        elif elem == 'ArrayType' :
+          mx = attrs['max']
+          # check if array is bound (max='fff...' for unbound arrays)
+          if mx.isdigit() : len = str(int(mx)+1)
+          else            : len = '0' 
+          c += 'ArrayBuilder(type'+attrs['type']+', '+ len +');\n'
+        elif elem == 'Typedef' :
+          sc = self.genTypeName(attrs['context'])
+          if sc : sc += '::'
+          c += 'TypedefTypeBuilder("'+sc+attrs['name']+'", type'+ attrs['type']+');\n'
+        elif elem == 'OffsetType' :
+          c += 'TypeBuilder("%s");\n' % self.genTypeName(attrs['id'])
+        elif elem == 'FunctionType' :
+          if 'returns' in attrs : c += 'FunctionTypeBuilder(type'+attrs['returns']
+          else                  : c += 'FunctionTypeBuilder(type_void'
+          args = self.xref[id]['subelems']
+          for a in args : c += ', type'+ a['type']
+          c += ');\n'
+        elif elem == 'MethodType' :
+          c += 'TypeBuilder("%s");\n' % self.genTypeName(attrs['id'])
+        elif elem in ('OperatorMethod', 'Method', 'Constructor', 'Converter', 'Destructor',
+                      'Function', 'OperatorFunction') :
+          pass
+        elif elem == 'Enumeration' :
+          sc = self.genTypeName(attrs['context'])
+          if sc : sc += '::'
+          # items = self.xref[id]['subelems']
+          # values = string.join([ item['name'] + '=' + item['init'] for item in items],';"\n  "')          
+          #c += 'EnumTypeBuilder("' + sc + attrs['name'] + '", "' + values + '");\n'
+          c += 'EnumTypeBuilder("' + sc + attrs['name'] + '");\n'
+        else :
+         name = ''
+         if 'context' in attrs :
+           ns = self.genTypeName(attrs['context'])
+           if ns : name += ns + '::'
+         if 'name' in attrs :
+           name += attrs['name']
+         name = normalizeClass(name,False)
+         c += 'TypeBuilder("'+name+'");\n'
+    return c 
+#----------------------------------------------------------------------------------
+  def genNamespaces(self, selected ) :
+    used_context = []
+    s = ''
+    for c in selected :
+      if 'incomplete' not in c : used_context.append(c['context'])
+    idx = 0
+    for ns in self.namespaces :
+      if ns['id'] in used_context and ns['name'] != '::' :
+        s += '  NamespaceBuilder nsb%d( "%s" );\n' % (idx, self.genTypeName(ns['id']))
+        idx += 1
+    return s
+#----------------------------------------------------------------------------------
+  def genFunctionsStubs(self, selfunctions) :
+    s = ''
+    for f in selfunctions :
+      id   = f['id']
+      name = self.genTypeName(id)
+      if 'operator' in f : name = 'operator '+name
+      self.genTypeID(id)
+      args = self.xref[id]['subelems']
+      returns  = self.genTypeName(f['returns'], enum=True, const=True)
+      if not self.quiet : print  'function '+ name
+      s += 'static void* '
+      if len(args) :
+        s +=  'function%s( void*, const std::vector<void*>& arg, void*)\n{\n' % id 
+      else :
+        s +=  'function%s( void*, const std::vector<void*>&, void*)\n{\n' % id
+      ndarg = self.getDefaultArgs(args)
+      narg  = len(args)
+      if ndarg : iden = '  '
+      else     : iden = ''
+      if returns != 'void' and (returns in self.basictypes or
+                                self.translate_typedef (f['returns']) in
+                                self.basictypes):
+        s += '  static %s ret;\n' % returns
+      for n in range(narg-ndarg, narg+1) :
+        if ndarg :
+          if n == narg-ndarg :  s += '  if ( arg.size() == %d ) {\n' % n
+          else               :  s += '  else if ( arg.size() == %d ) { \n' % n
+        if returns == 'void' :
+          first = iden + '  %s(' % ( name, )
+          s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+          s += iden + '  return 0;\n'
+        else :
+          if returns[-1] in ('*',')' ):
+            first = iden + '  return (void*)%s(' % ( name, )
+            s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+          elif returns[-1] == '&' :
+            first = iden + '  return (void*)&%s(' % ( name, )
+            s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+          elif (returns in self.basictypes or
+                self.translate_typedef (f['returns']) in self.basictypes):
+            first = iden + '  ret = %s(' % ( name, )
+            s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+            s += iden + '  return &ret;\n'        
+          else :
+            first = iden + '  return new %s(%s(' % ( returns, name )
+            s += first + self.genMCOArgs(args, n, len(first)) + '));\n'
+        if ndarg : 
+          if n != narg : s += '  }\n'
+          else :
+            if returns == 'void' : s += '  }\n  return 0;\n'
+            else :                 s += '  }\n  return 0;\n'
+      s += '}\n'
+    return s  
+#----------------------------------------------------------------------------------
+  def genFunctions(self, selfunctions) :
+    s = ''
+    i = 0;
+    for f in selfunctions :
+      id   = f['id']
+      name = self.genTypeName(id)
+      if ( self.xref[id]['attrs'].has_key('mangled') ):
+        mm = self.xref[id]['attrs']['mangled'][2:]
+        dname = gccdemangler.demangle_name(mm)
+      else :
+        dname = name
+      name += getTemplateArgString(dname[1])
+      args = self.xref[id]['subelems']      
+      if args : params  = '"'+ string.join( map(self.genParameter, args),';')+'"'
+      else    : params  = '0'
+      mod = self.genModifier(f, None)
+      s += '      Type t%s = %s;' % (i, self.genTypeID(id))
+      s += '      FunctionBuilder(t%s, "%s", function%s, 0, %s, %s);\n' % (i, name, id, params, mod)
+      i += 1;
+    return s
+#----------------------------------------------------------------------------------
+  def genEnums(self, selenums) :
+    s = ''
+    i = 0;
+    for e in selenums :
+      id   = e['id']
+      cname = self.genTypeName(id, colon=True)
+      name  = self.genTypeName(id)
+      mod = self.genModifier(self.xref[id]['attrs'], None)
+      if not self.quiet : print 'enum ' + name
+      s += '      EnumBuilder("%s",typeid(%s), %s)' % (name, cname, mod)
+      items = self.xref[id]['subelems']
+      for item in items :
+        s += '\n        .AddItem("%s",%s)' % (item['name'], item['init'])
+      s += ';\n'
+    return s
+#----------------------------------------------------------------------------------
+  def genVariables(self, selvars) :
+    s = ''
+    i = 0;
+    for v in selvars :
+      id   = v['id']
+      cname = self.genTypeName(id, colon=True)
+      name  = self.genTypeName(id)
+      mod   = self.genModifier(v, None)
+      if not self.quiet : print 'variable ' + name 
+      s += '      VariableBuilder("%s", %s, (size_t)&%s, %s );\n' % (name, self.genTypeID(v['type']),self.genTypeName(id), mod)
+    return s
+ #----------------------------------------------------------------------------------
+  def countColonsForOffset(self, name) :
+    prn = 0
+    cnt = 0
+    for c in name :
+      if c == ',' and not prn : cnt += 1
+      elif c == '('           : prn += 1
+      elif c == ')'           : prn -= 1
+      else                    : pass
+    return cnt
+#----------------------------------------------------------------------------------
+  def genFieldBuild(self, attrs, childs):
+    type   = self.genTypeName(attrs['type'], enum=False, const=False)
+    cl     = self.genTypeName(attrs['context'],colon=True)
+    cls    = self.genTypeName(attrs['context'])
+    name = attrs['name']
+    if not name :
+      ftype = self.xref[attrs['type']]
+      # if the member type is an unnamed union we try to take the first member of the union as name
+      if ftype['elem'] == 'Union':
+        firstMember = ftype['attrs']['members'].split()[0]
+        if firstMember : name = self.xref[firstMember]['attrs']['name']
+        else           : return ''       # then this must be an unnamed union without members
+    if type[-1] == '&' :
+      print '--->> genreflex: WARNING: References are not supported as data members (%s %s::%s)' % ( type, cls, name )
+      self.warnings += 1
+      return ''
+    if 'bits' in attrs:
+      print '--->> genreflex: WARNING: Bit-fields are not supported as data members (%s %s::%s:%s)' % ( type, cls, name, attrs['bits'] )
+      self.warnings += 1
+      return ''
+    if self.selector : xattrs = self.selector.selfield( cls,name)
+    else             : xattrs = None
+    mod = self.genModifier(attrs,xattrs)
+    if attrs['type'][-1] == 'c' :
+      if mod : mod += ' | CONST'
+      else   : mod =  'CONST'
+    if attrs['type'][-1] == 'v' :
+      if mod : mod += ' | VOLATILE'
+      else   : mod = 'VOLATILE'
+    shadow = '__shadow__::' + string.translate( str(cl), self.transtable)
+    c = '  .AddDataMember(%s, "%s", OffsetOf(%s, %s), %s)' % (self.genTypeID(attrs['type']), name, shadow, name, mod)
+    c += self.genCommentProperty(attrs)
+    # Other properties
+    if xattrs : 
+      for pname, pval in xattrs.items() : 
+        if pname not in ('name', 'transient', 'pattern') :
+          c += '\n  .AddProperty("%s","%s")' % (pname, pval)     
+    return c
+#----------------------------------------------------------------------------------    
+  def genCommentProperty(self, attrs):
+    if not (self.comments or self.iocomments) \
+       or 'file' not in attrs \
+       or ('artificial' in attrs and attrs['artificial'] == '1') : return '' 
+    fd = self.files[attrs['file']]
+    # open and read the header file if not yet done
+    if 'filelines' not in fd :
+      try :
+        f = file(fd['name'])
+        fd['filelines'] = f.readlines()
+        f.close()
+      except :
+        return ''
+    line = fd['filelines'][int(attrs['line'])-1]
+    poscomment = line.find('//')
+    if poscomment == -1 : return ''
+    if not self.comments and self.iocomments:
+      if line[poscomment+2] != '!' \
+         and line[poscomment+2] != '[' \
+         and line[poscomment+2:poscomment+4] != '->' \
+         and line[poscomment+2:poscomment+4] != '||': return ''
+    return '\n  .AddProperty("comment","%s")' %  (line[poscomment+2:-1]).replace('"','\\"')
+#----------------------------------------------------------------------------------
+  def genArgument(self, attrs):
+    c = self.genTypeName(attrs['type'], enum=True, const=False)
+    return c
+#----------------------------------------------------------------------------------
+  def genParameter(self, attrs):
+    c = ''
+    if 'name' in attrs :
+      c += attrs['name']
+      if 'default' in attrs :
+        c += '='+ attrs['default'].replace('"','\\"')
+    return c
+#----------------------------------------------------------------------------------
+  def genModifier(self, attrs, xattrs ):
+    if 'access' not in attrs            : mod = 'PUBLIC'
+    elif attrs['access'] == 'private'   : mod = 'PRIVATE'
+    elif attrs['access'] == 'protected' : mod = 'PROTECTED'
+    else                                : mod = 'NONE'
+    if 'virtual' in attrs : mod += ' | VIRTUAL'
+    if 'static'  in attrs : mod += ' | STATIC'
+    # Extra modifiers
+    xtrans = ''
+    etrans = ''
+    if xattrs :
+      xtrans = xattrs.get('transient')
+      if xtrans : xtrans = xtrans.lower()
+    if 'extra' in attrs:
+      etrans = attrs['extra'].get('transient')
+      if etrans : etrans = etrans.lower()
+    if xtrans == 'true' or etrans == 'true' : mod += ' | TRANSIENT'
+    if 'artificial' in attrs : mod += ' | ARTIFICIAL' 
+    return mod
+#----------------------------------------------------------------------------------
+  def genMCODecl( self, type, name, attrs, args ) :
+    return 'static void* %s%s(void*, const std::vector<void*>&, void*);' % (type, attrs['id'])
+#----------------------------------------------------------------------------------
+  def genMCOBuild(self, type, name, attrs, args):
+    id       = attrs['id']
+    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('name')) or \
+       self.checkAccessibleType(self.xref[attrs['context']]) : return ''
+    if type == 'constructor' : returns  = 'void'
+    else                     : returns  = self.genTypeName(attrs['returns'])
+    mod = self.genModifier(attrs, None)
+    if   type == 'constructor' : mod += ' | CONSTRUCTOR'
+    elif type == 'operator' :    mod += ' | OPERATOR'
+    elif type == 'converter' :   mod += ' | CONVERTER'
+    if attrs.get('const')=='1' : mod += ' | CONST'
+    if args : params  = '"'+ string.join( map(self.genParameter, args),';')+'"'
+    else    : params  = '0'
+    s = '  .AddFunctionMember(%s, "%s", %s%s, 0, %s, %s)' % (self.genTypeID(id), name, type, id, params, mod)
+    s += self.genCommentProperty(attrs)
+    return s
+#----------------------------------------------------------------------------------
+  def genMCODef(self, type, name, attrs, args):
+    id       = attrs['id']
+    cl       = self.genTypeName(attrs['context'],colon=True)
+    clt      = string.translate(str(cl), self.transtable)
+    returns  = self.genTypeName(attrs['returns'],enum=True, const=True)
+    s = 'static void* '
+    if len(args) :
+      s +=  '%s%s( void* o, const std::vector<void*>& arg, void*)\n{\n' %( type, id )
+    else :
+      s +=  '%s%s( void* o, const std::vector<void*>&, void*)\n{\n' %( type, id )
+    # If we construct a conversion operator to pointer to function member the name
+    # will contain TDF_<attrs['id']>
+    tdfname = 'TDF%s'%attrs['id']
+    if name.find(tdfname) != -1 :
+      s += '  typedef %s;\n'%name
+      name = 'operator ' + tdfname
+      returns = tdfname
+    ndarg = self.getDefaultArgs(args)
+    narg  = len(args)
+    if ndarg : iden = '  '
+    else     : iden = ''
+    if returns != 'void' :
+      if (returns in self.basictypes or
+          self.translate_typedef (attrs['returns']) in self.basictypes or
+          name == 'operator %s'%tdfname):
+        s += '  static %s ret;\n' % returns
+      elif returns.find('::*)') != -1 :
+        s += '  static %s;\n' % returns.replace('::*','::* ret')
+      elif returns.find('::*') != -1 :
+        s += '  static %s ret;\n' % returns  
+    if 'const' in attrs : cl = 'const '+ cl
+    for n in range(narg-ndarg, narg+1) :
+      if ndarg :
+        if n == narg-ndarg :  s += '  if ( arg.size() == %d ) {\n' % n
+        else               :  s += '  else if ( arg.size() == %d ) { \n' % n
+      if returns == 'void' :
+        first = iden + '  ((%s*)o)->%s(' % ( cl, name )
+        s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+        s += iden + '  return 0;\n'
+      else :
+        if returns[-1] in ('*',')') and returns.find('::*') == -1 :
+          first = iden + '  return (void*)((%s*)o)->%s(' % ( cl, name )
+          s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+        elif returns[-1] == '&' :
+          first = iden + '  return (void*)&((%s*)o)->%s(' % ( cl, name )
+          s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+        elif (returns in self.basictypes or
+              self.translate_typedef (attrs['returns']) in self.basictypes or
+              returns.find('::*') != -1 or
+              name == 'operator '+tdfname):
+          first = iden + '  ret = ((%s*)o)->%s(' % ( cl, name )
+          s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+          s += iden + '  return &ret;\n'        
+        else :
+          first = iden + '  return new %s(((%s*)o)->%s(' % ( returns, cl, name )
+          s += first + self.genMCOArgs(args, n, len(first)) + '));\n'
+      if ndarg : 
+        if n != narg : s += '  }\n'
+        else :
+          if returns == 'void' : s += '  }\n  return 0;\n'
+          else :                 s += '  }\n  return 0;\n'
+    s += '}\n'
+    return s
+#----------------------------------------------------------------------------------
+  def getDefaultArgs(self, args):
+    n = 0
+    for a in args :
+      if 'default' in a : n += 1
+    return n
+#----------------------------------------------------------------------------------
+  def genMCOArgs(self, args, narg, pad):
+    s = ''
+    for i in range(narg) :
+      a = args[i]
+      #arg = self.genArgument(a, 0);
+      arg = self.genTypeName(a['type'],colon=True)
+      if arg[-1] == '*' or len(arg) > 7 and arg[-7:] == '* const':
+        if arg[-2:] == ':*' or arg[-8:] == ':* const' : # Pointer to data member
+          s += '*(%s*)arg[%d]' % (arg, i )
+        else :
+          s += '(%s)arg[%d]' % (arg, i )
+      elif arg[-1] == ']' :
+        s += '(%s)arg[%d]' % (arg, i)
+      elif arg[-1] == ')' or (len(arg) > 7 and arg[-7:] == ') const'): # FIXME, the second check is a hack
+        if arg.find('::*') != -1 :  # Pointer to function member
+          s += '*(%s)arg[%d]' %(arg.replace('::*','::**'), i)
+        elif (len(arg) > 7  and arg[-7:] == ') const') :
+          s += '(%s)arg[%d]' % (arg[:-6].replace('(*)','(* const)'), i) # 2nd part of the hack
+        else :
+          s += '(%s)arg[%d]' % (arg, i )
+      elif arg[-1] == '&' :
+        s += '*(%s*)arg[%d]' % (arg[:-1], i )
+      else :
+        s += '*(%s*)arg[%d]' % (arg, i )
+      if i != narg - 1 : s += ',\n' + pad*' '
+    return s
+#----------------------------------------------------------------------------------
+  def genMethodDecl(self, attrs, args):
+    return self.genMCODecl( 'method', '', attrs, args )
+#----------------------------------------------------------------------------------
+  def genMethodBuild(self, attrs, args):
+    return self.genMCOBuild( 'method', attrs['name'], attrs, args )
+#----------------------------------------------------------------------------------
+  def genMethodDef(self, attrs, args):
+    return self.genMCODef( 'method', attrs['name'], attrs, args )
+#----------------------------------------------------------------------------------
+  def genConstructorDecl(self, attrs, args):
+    return self.genMCODecl( 'constructor', '', attrs, args )
+#----------------------------------------------------------------------------------
+  def genConstructorBuild(self, attrs, args):
+    return self.genMCOBuild( 'constructor', attrs['name'], attrs, args )
+#----------------------------------------------------------------------------------
+  def genConstructorDef(self, attrs, args):
+    cl  = self.genTypeName(attrs['context'], colon=True)
+    clt = string.translate(str(cl), self.transtable)
+    id  = attrs['id']
+    if len(args) :
+      s = 'static void* constructor%s( void* mem, const std::vector<void*>& arg, void*) {\n' %( id, )
+    else :
+      s = 'static void* constructor%s( void* mem, const std::vector<void*>&, void*) {\n' %( id, )
+    if 'pseudo' in attrs :
+      s += '  return ::new(mem) %s( *(__void__*)0 );\n' % ( cl )
+    else :
+      ndarg = self.getDefaultArgs(args)
+      narg  = len(args)
+      for n in range(narg-ndarg, narg+1) :
+        if ndarg :
+          if n == narg-ndarg :  s += '  if ( arg.size() == %d ) {\n  ' % n
+          else               :  s += '  else if ( arg.size() == %d ) { \n  ' % n
+        first = '  return ::new(mem) %s(' % ( cl )
+        s += first + self.genMCOArgs(args, n, len(first)) + ');\n'
+        if ndarg : 
+          if n != narg : s += '  }\n'
+          else :         s += '  }\n  return 0;\n'
+    s += '}\n'
+    return s
+#----------------------------------------------------------------------------------
+  def genDestructorDef(self, attrs, childs):
+    cl = self.genTypeName(attrs['context'])
+    return 'static void* destructor%s(void * o, const std::vector<void*>&, void *) {\n  ((::%s*)o)->~%s(); return 0;\n}' % ( attrs['id'], cl, attrs['name'] )
+#----------------------------------------------------------------------------------
+  def genDestructorBuild(self, attrs, childs):
+    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('name')) or \
+       self.checkAccessibleType(self.xref[attrs['context']]) : return ''
+    mod = self.genModifier(attrs,None)
+    id       = attrs['id']
+    s = '  .AddFunctionMember(%s, "~%s", destructor%s, 0, 0, %s | DESTRUCTOR )' % (self.genTypeID(id), attrs['name'], attrs['id'], mod)
+    s += self.genCommentProperty(attrs)
+    return s
+#----------------------------------------------------------------------------------
+  def genOperatorMethodDecl( self, attrs, args ) :
+    if attrs['name'][0].isalpha() : name = 'operator '+ attrs['name']
+    else                          : name = 'operator' + attrs['name'] 
+    return self.genMCODecl( 'operator', name, attrs, args )    
+#----------------------------------------------------------------------------------
+  def genOperatorMethodBuild( self, attrs, args ) :
+    if attrs['name'][0].isalpha() : name = 'operator '+ attrs['name']
+    else                          : name = 'operator' + attrs['name'] 
+    return self.genMCOBuild( 'operator', name, attrs, args )    
+#----------------------------------------------------------------------------------
+  def genOperatorMethodDef( self, attrs, args ) :
+    if attrs['name'][0].isalpha() : name = 'operator '+ attrs['name']
+    else                          : name = 'operator' + attrs['name']
+    if name[-1] == '>' and name.find('<') != -1 : name = name[:name.find('<')]
+    return self.genMCODef( 'operator', name, attrs, args )    
+#----------------------------------------------------------------------------------
+  def genConverterDecl( self, attrs, args ) :
+    return self.genMCODecl( 'converter', 'operator '+attrs['name'], attrs, args )    
+#----------------------------------------------------------------------------------
+  def genConverterBuild( self, attrs, args ) :
+    return self.genMCOBuild( 'converter', 'operator '+self.genTypeName(attrs['returns'],enum=True,const=False), attrs, args )    
+#----------------------------------------------------------------------------------
+  def genConverterDef( self, attrs, args ) :
+    # If this is a conversion operator to pointer to function member we will need
+    # to create a typedef for the typename which is needed in the stub function
+    tdf = 'operator '+self.genTypeName(attrs['returns'])
+    t1 = self.xref[attrs['returns']]
+    if t1['elem'] == 'PointerType':
+      t2 = self.xref[t1['attrs']['type']]
+      if t2['elem'] == 'MethodType':
+        tdf = self.genTypeName(attrs['returns']).replace('*)(','* TDF%s)('%attrs['id'])
+    return self.genMCODef( 'converter', tdf, attrs, args )    
+#----------------------------------------------------------------------------------
+  def genEnumValue(self, attrs):
+    return '%s = %s' % (attrs['name'], attrs['init'])
+#----------------------------------------------------------------------------------
+  def genBaseClassBuild(self, clf, b ):
+    mod = b['access'].upper()
+    if 'virtual' in b and b['virtual'] == '1' : mod = 'VIRTUAL | ' + mod
+    return '  .AddBase(%s, BaseOffset< %s, %s >::Get(), %s)' %  (self.genTypeID(b['type']), clf, self.genTypeName(b['type'],colon=True), mod)
+#----------------------------------------------------------------------------------
+  def enhanceClass(self, attrs):
+    if self.isUnnamedType(attrs['name']) or self.checkAccessibleType(self.xref[attrs['id']]) : return
+    # Default constructor
+    if 'members' in attrs : members = attrs['members'].split()
+    else                  : members = []
+    for m in members :
+      if self.xref[m]['elem'] == 'Constructor' :
+        args  = self.xref[m]['subelems']
+        if len(args) > 0 and 'default' in args[0] :
+          id = u'_x%d' % self.x_id.next()
+          new_attrs = self.xref[m]['attrs'].copy()
+          new_attrs['id'] = id
+          new_attrs['artificial'] = 'true'
+          self.xref[id] = {'elem':'Constructor', 'attrs':new_attrs,'subelems':[] }
+          attrs['members'] += u' ' + id
+        elif len(args) == 1 and self.genTypeName(args[0]['type']) == '__void__&' :
+          id = u'_x%d' % self.x_id.next()
+          new_attrs = self.xref[m]['attrs'].copy()
+          new_attrs['id'] = id
+          new_attrs['pseudo'] = True
+          new_attrs['artificial'] = 'true'
+          self.xref[id] = {'elem':'Constructor', 'attrs':new_attrs,'subelems':[] }
+          attrs['members'] += u' ' + id
+        if (len(args) == 0  or 'default' in args[0] ) \
+               and 'abstract' not in attrs \
+               and 'access' not in self.xref[m]['attrs'] \
+               and not self.isDestructorNonPublic(attrs['id']):
+          # NewDel functions extra function
+          id = u'_x%d' % self.x_id.next()
+          new_attrs = { 'id':id, 'context':attrs['id'], 'artificial':'true' }
+          self.xref[id] = {'elem':'GetNewDelFunctions', 'attrs':new_attrs,'subelems':[] }
+          attrs['members'] += u' ' + id    
+    # Bases extra function
+    if 'bases' in attrs and attrs['bases'] != '':
+      id = u'_x%d' % self.x_id.next()
+      new_attrs = { 'id':id, 'context':attrs['id'], 'artificial':'true' }
+      self.xref[id] = {'elem':'GetBasesTable', 'attrs':new_attrs,'subelems':[] }
+      if 'members' in attrs : attrs['members'] += u' ' + id
+      else                  : attrs['members'] = u' '+ id   
+    # Container extra functions
+    type = getContainerId( self.genTypeName(attrs['id']) )[1]
+    if 'extra' in attrs and 'type' in attrs['extra'] : type = attrs['extra']['type']
+    if type :
+      #--The new stuff from CollectionProxy--------
+      id = u'_x%d' % self.x_id.next()
+      new_attrs = { 'id':id, 'context':attrs['id'], 'artificial':'true' }
+      self.xref[id] = {'elem':'CreateCollFuncTable', 'attrs':new_attrs,'subelems':[] }
+      if 'members' in attrs : attrs['members'] += u' ' + id
+      else                  : attrs['members'] = u' ' + id
+#----CollectionProxy stuff--------------------------------------------------------
+  def genCreateCollFuncTableDecl( self, attrs, args ) :
+    return 'static void* method%s( void*, const std::vector<void*>&, void* ); ' % (attrs['id'])
+  def genCreateCollFuncTableBuild( self, attrs, args ) :
+    mod = self.genModifier(attrs, None)
+    return '  .AddFunctionMember<void*(void)>("createCollFuncTable", method%s, 0, 0, %s)' % ( attrs['id'], mod)
+  def genCreateCollFuncTableDef( self, attrs, args ) :
+    cl       = self.genTypeName(attrs['context'], colon=True)
+    clt      = string.translate(str(cl), self.transtable)
+    t        = getTemplateArgs(cl)[0]
+    s  = 'static void* method%s( void*, const std::vector<void*>&, void*)\n{\n' %( attrs['id'], )
+    s += '  return ROOT::Reflex::Proxy< %s >::Generate();\n' % (cl,)
+    s += '}\n'
+    return s
+#----BasesMap stuff--------------------------------------------------------
+  def genGetBasesTableDecl( self, attrs, args ) :
+    return 'static void* method%s( void*, const std::vector<void*>&, void* ); ' % (attrs['id'])
+  def genGetBasesTableBuild( self, attrs, args ) :
+    mod = self.genModifier(attrs, None)
+    return '  .AddFunctionMember<void*(void)>("__getBasesTable", method%s, 0, 0, %s)' % (attrs['id'], mod)
+  def genGetBasesTableDef( self, attrs, args ) :
+    cid      = attrs['context']
+    cl       = self.genTypeName(cid, colon=True)
+    clt      = string.translate(str(cl), self.transtable)
+    s  = 'static void* method%s( void*, const std::vector<void*>&, void*)\n{\n' %( attrs['id'], )
+    s += '  static std::vector<std::pair<ROOT::Reflex::Base, int> > s_bases;\n'
+    s += '  if ( !s_bases.size() ) {\n'
+    bases = []
+    self.getAllBases( cid, bases ) 
+    for b in bases :
+      bname = self.genTypeName(b[0],colon=True)
+      bname2 = self.genTypeName(b[0])
+      s += '    s_bases.push_back(std::make_pair(ROOT::Reflex::Base( ROOT::Reflex::TypeBuilder("%s"), ROOT::Reflex::BaseOffset< %s,%s >::Get(),%s), %d));\n' % (bname2, cl, bname, b[1], b[2])
+    s += '  }\n  return &s_bases;\n' 
+    s += '}\n'
+    return s
+#----Constructor/Destructor stuff--------------------------------------------------------
+  def checkOperators(self,cid):
+    opnewc = 0
+    plopnewc = 0
+    opnewa = 0
+    plopnewa = 0
+    attrs = self.xref[cid]['attrs']
+    for m in attrs.get('members').split():
+      mm = self.xref[m]
+      if mm['elem'] == 'OperatorMethod':
+        opname = mm['attrs'].get('name')
+        # we assume that 'subelems' only contains Arguments
+        sems = mm['subelems']
+        if opname == 'new':
+          if len(sems) == 1 and self.genTypeName(sems[0]['type']) in ('size_t',): opnewc = 1
+          if len(sems) == 2 and self.genTypeName(sems[0]['type']) in ('size_t',) and self.genTypeName(sems[1]['type']) in ('void*',): plopnewc = 1
+        if opname == 'new []':
+          if len(sems) == 1 and self.genTypeName(sems[0]['type']) in ('size_t',): opnewa = 1
+          if len(sems) == 2 and self.genTypeName(sems[0]['type']) in ('size_t',) and self.genTypeName(sems[1]['type']) in ('void*',): plopnewa = 1
+    newc = ''
+    newa = ''
+    if opnewc and not plopnewc: newc = '_np'
+    elif not opnewc and plopnewc : newc = '_p'
+    if opnewa and not plopnewa: newa = '_np'
+    elif not opnewa and plopnewa : newa = '_p'
+    return (newc, newa)
+#----Constructor/Destructor stuff--------------------------------------------------------
+  def genGetNewDelFunctionsDecl( self, attrs, args ) :
+    return 'static void* method%s( void*, const std::vector<void*>&, void* ); ' % (attrs['id'])
+  def genGetNewDelFunctionsBuild( self, attrs, args ) :
+    mod = self.genModifier(attrs, None)  
+    return '  .AddFunctionMember<void*(void)>("__getNewDelFunctions", method%s, 0, 0, %s)' % (attrs['id'], mod)
+  def genGetNewDelFunctionsDef( self, attrs, args ) :
+    cid      = attrs['context']
+    cl       = self.genTypeName(cid, colon=True)
+    clt      = string.translate(str(cl), self.transtable)
+    (newc, newa) = self.checkOperators(cid)
+    s  = 'static void* method%s( void*, const std::vector<void*>&, void*)\n{\n' %( attrs['id'] )
+    s += '  static NewDelFunctions s_funcs;\n'
+    s += '  s_funcs.fNew         = NewDelFunctionsT< %s >::new%s_T;\n' % (cl, newc)
+    s += '  s_funcs.fNewArray    = NewDelFunctionsT< %s >::newArray%s_T;\n' % (cl, newa)
+    s += '  s_funcs.fDelete      = NewDelFunctionsT< %s >::delete_T;\n' % cl
+    s += '  s_funcs.fDeleteArray = NewDelFunctionsT< %s >::deleteArray_T;\n' % cl
+    s += '  s_funcs.fDestructor  = NewDelFunctionsT< %s >::destruct_T;\n' % cl
+    s += '  return &s_funcs;\n'
+    s += '}\n'
+    return s
+#----------------------------------------------------------------------------------
+  def getBases( self, cid ) :
+    if 'bases' in self.xref[cid] :
+      return self.xref[cid]['bases']
+    elif 'bases' in self.xref[cid]['attrs'] :
+      bases = []
+      for b in self.xref[cid]['attrs']['bases'].split() :
+        access = 'public'
+        if b[:10] == 'protected:' : b = b[10:]; access = 'protected'
+        if b[:8]  == 'private:'   : b = b[8:]; access = 'private'
+        bases.append( {'type': b, 'access': access, 'virtual': '-1' } )
+      return bases
+    else :
+      return []
+#----------------------------------------------------------------------------------
+  def getAllBases( self, cid, bases, level = 0, access = 'public', virtual = False ) :
+    for b in self.getBases( cid ) :
+      id = b['type']
+      if id not in [ bid[0] for bid in bases] :
+        if access == 'public' : access = b['access']
+        if not virtual : virtual = ( b['virtual'] == '1' )
+        mod = access.upper()
+        if virtual : mod = 'VIRTUAL |' + mod
+        bases.append( [id,  mod, level] )
+        self.getAllBases( id, bases, level+1, access, virtual )
+#----------------------------------------------------------------------------------
+  def completeClass(self, attrs):
+    # Complete class with "instantiated" templated methods or constructors
+    if 'members' in attrs : members = attrs['members'].split()
+    else                  : members = []
+    cid = attrs['id']
+    for c in self.classes :
+      if c['context'] == cid and c['id'] not in members :
+        attrs['members'] += u' ' + c['id']
+    for m in self.methods :
+      if m['context'] == cid and m['id'] not in members :
+        # replace the mame by the complete templated name. Use the demangle module for that
+        if 'mangled' in m and m['name'].isalpha() :
+          mm = m['mangled'][2:]
+          dname = gccdemangler.demangle_name(mm)
+          dret  = gccdemangler.demangle_type(mm[dname[0]:])
+          if dname[3] : mret  = mm[dname[0]:dname[0]+dret[0]]
+          else        : mret  = ''
+          if [mret.find(t)!= -1 for t in ['T_']+['T%d_'%i for i in range(10)]].count(True) :
+            fname =  dname[1][dname[1].rfind('::' + m['name'])+2:]
+            m['name'] = fname
+        attrs['members'] += u' ' + m['id']
+#---------------------------------------------------------------------------------------
+def getContainerId(c):
+  if   c[-8:] == 'iterator' : return ('NOCONTAINER','')
+  if   c[:10] == 'std::deque'   :            return ('DEQUE','list')
+  elif c[:9]  == 'std::list'    :            return ('LIST','list')
+  elif c[:8]  == 'std::map'     :            return ('MAP','map')
+  elif c[:13] == 'std::multimap':            return ('MULTIMAP','map')
+  elif c[:19] == '__gnu_cxx::hash_map':      return ('HASHMAP','map')
+  elif c[:24] == '__gnu_cxx::hash_multimap': return ('HASHMULTIMAP','map')
+  elif c[:16] == 'stdext::hash_map':         return ('HASHMAP','map')
+  elif c[:21] == 'stdext::hash_multimap':    return ('HASHMULTIMAP','map')    
+  elif c[:10] == 'std::queue'   :            return ('QUEUE','queue')
+  elif c[:8]  == 'std::set'     :            return ('SET','set')
+  elif c[:13] == 'std::multiset':            return ('MULTISET','set')
+  elif c[:19] == '__gnu_cxx::hash_set':      return ('HASHSET','set')
+  elif c[:24] == '__gnu_cxx::hash_multiset': return ('HASHMULTISET','set')
+  elif c[:16] == 'stdext::hash_set':         return ('HASHSET','set')
+  elif c[:21] == 'stdext::hash_multiset':    return ('HASHMULTISET','set')
+  elif c[:10] == 'std::stack'   :            return ('STACK','stack')
+  elif c[:11] == 'std::vector'  :            return ('VECTOR','vector')
+  else : return ('NOCONTAINER','')
+#---------------------------------------------------------------------------------------
+stldeftab = {}
+stldeftab['deque']        = '=','std::allocator'
+stldeftab['list']         = '=','std::allocator'
+stldeftab['map']          = '=','=','std::less','std::allocator'
+stldeftab['multimap']     = '=','=','std::less','std::allocator'
+stldeftab['queue']        = '=','std::deque'
+stldeftab['set']          = '=','std::less','std::allocator'
+stldeftab['multiset']     = '=','std::less','std::allocator'
+stldeftab['stack']        = '=','std::deque'
+stldeftab['vector']       = '=','std::allocator'
+stldeftab['basic_string'] = '=','std::char_traits','std::allocator'
+#stldeftab['basic_ostream']= '=','std::char_traits'
+#stldeftab['basic_istream']= '=','std::char_traits'
+#stldeftab['basic_streambuf']= '=','std::char_traits'
+if sys.platform == 'win32' :
+  stldeftab['hash_set']      = '=', 'stdext::hash_compare', 'std::allocator'
+  stldeftab['hash_multiset'] = '=', 'stdext::hash_compare', 'std::allocator'
+  stldeftab['hash_map']      = '=', '=', 'stdext::hash_compare', 'std::allocator'
+  stldeftab['hash_multimap'] = '=', '=', 'stdext::hash_compare', 'std::allocator'
+else :
+  stldeftab['hash_set']      = '=','__gnu_cxx::hash','std::equal_to','std::allocator'
+  stldeftab['hash_multiset'] = '=','__gnu_cxx::hash','std::equal_to','std::allocator'
+  stldeftab['hash_map']      = '=','=','__gnu_cxx::hash','std::equal_to','std::allocator'
+  stldeftab['hash_multimap'] = '=','=','__gnu_cxx::hash','std::equal_to','std::allocator'  
+#---------------------------------------------------------------------------------------
+def getTemplateArgs( cl ) :
+  if cl.find('<') == -1 : return []
+  args, cnt = [], 0
+  for s in string.split(cl[cl.find('<')+1:cl.rfind('>')],',') :
+    if   cnt == 0 : args.append(s)
+    else          : args[-1] += ','+ s
+    cnt += s.count('<')+s.count('(')-s.count('>')-s.count(')')
+  if args[-1][-1] == ' ' : args[-1] = args[-1][:-1]
+  return args
+#---------------------------------------------------------------------------------------
+def getTemplateArgString( cl ) :
+  bc = 0
+  if cl[-1] != '>' : return ''
+  for i in range( len(cl)-1, -1, -1) :
+    if   cl[i] == '>' : bc += 1
+    elif cl[i] == '<' : bc -= 1
+    if bc == 0 : return cl[i:]
+  return ''
+#---------------------------------------------------------------------------------------
+def normalizeClassAllTempl(name)   : return normalizeClass(name,True)
+def normalizeClassNoDefTempl(name) : return normalizeClass(name,False)
+def normalizeClass(name,alltempl) :
+  names, cnt = [], 0
+  for s in string.split(name,'::') :
+    if cnt == 0 : names.append(s)
+    else        : names[-1] += '::' + s
+    cnt += s.count('<')-s.count('>')
+  if alltempl : return string.join(map(normalizeFragmentAllTempl,names),'::')
+  else        : return string.join(map(normalizeFragmentNoDefTempl,names),'::')
+#--------------------------------------------------------------------------------------
+def normalizeFragmentAllTempl(name)   : return normalizeFragment(name,True)
+def normalizeFragmentNoDefTempl(name) : return normalizeFragment(name) 
+def normalizeFragment(name,alltempl=False) :
+  name = name.strip()
+  if name.find('<') == -1  : 
+    nor =  name
+    for e in [ ['long long unsigned int', 'unsigned long long'],
+             ['long long int',          'long long'],
+             ['unsigned short int',     'unsigned short'],
+             ['short unsigned int',     'unsigned short'],
+             ['short int',              'short'],
+             ['long unsigned int',      'unsigned long'],
+             ['unsigned long int',      'unsigned long'],
+             ['long int',               'long']] :
+      nor = nor.replace(e[0], e[1])
+    return nor
+  else                     : clname = name[:name.find('<')]
+  if name.rfind('>') == -1 : suffix = ''
+  else                     : suffix = name[name.rfind('>')+1:]
+  args = getTemplateArgs(name)
+  if alltempl :
+    nor = clname + '<' + string.join(map(normalizeClassAllTempl,args),',')
+  else :     
+    if clname in stldeftab :
+      # select only the template parameters different from default ones
+      sargs = []
+      for i in range(len(args)) :  
+        if args[i].find(stldeftab[clname][i]) == -1 : sargs.append(args[i])
+      nor = clname + '<' + string.join(map(normalizeClassNoDefTempl,sargs),',')
+    else :
+      nor = clname + '<' + string.join(map(normalizeClassNoDefTempl,args),',')
+  if nor[-1] == '>' : nor += ' >' + suffix
+  else              : nor += '>' + suffix
+  return nor
+#--------------------------------------------------------------------------------------
+def clean(a) :
+  r = []
+  for i in a :
+       if i not in r : r.append(i)
+  return r
diff -Naur root.orig/reflex/python/genreflex/gendict.py root/reflex/python/genreflex/gendict.py
--- root.orig/reflex/python/genreflex/gendict.py        2007-04-25 12:46:37.000000000 +0200
+++ root/reflex/python/genreflex/gendict.py     2007-11-04 05:23:23.000000000 +0100
@@ -27,6 +27,7 @@
     self.vtables    = {}
     self.hfile      = os.path.normpath(hfile).replace(os.sep,'/')
     self.pool       = opts.get('pool',False)
+    self.interpreter= opts.get('interpreter',False)
     self.quiet      = opts.get('quiet',False)
     self.resolvettd = opts.get('resolvettd',True)
     self.xref       = {}
@@ -42,6 +43,7 @@
     self.errors     = 0
     self.warnings   = 0
     self.comments           = opts.get('comments', False)
+    self.iocomments     = opts.get('iocomments', False)
     self.no_membertypedefs  = opts.get('no_membertypedefs', False)
     self.generated_shadow_classes = []
     self.selectionname      = 'ROOT::Reflex::Selection'
@@ -88,7 +90,7 @@
 #----------------------------------------------------------------------------------
   def findSpecialNamespace(self):
     for ns in self.namespaces:
-      if ns['name'].find('.') != -1:
+      if 'name' not in ns or ns['name'].find('.') != -1:
         self.unnamedNamespaces.append(ns['id'])
       elif ns['name'] == '::' :
         self.globalNamespaceID = ns['id']
@@ -296,6 +298,14 @@
         # this check fixes a bug in gccxml 0.6.0_patch3 which sometimes generates incomplete definitions 
         # of classes (without members). Every version after 0.6.0_patch3 is tested and fixes this bug
         if not c.has_key('members') : continue
+
+        # Filter any non-public data members for minimal interpreter dict
+        if self.interpreter:
+          cxref = self.xref[c['id']]
+          # assumes that the default is "public"
+          if cxref.has_key('attrs') and 'access' in cxref['attrs'] :
+            continue
+
         match = self.selector.matchclass( self.genTypeName(c['id']), self.files[c['file']]['name'])
         if match[0] and not match[1] :
           c['extra'] = match[0]
@@ -361,7 +371,7 @@
         funcname = self.genTypeName(f['id'])
         if self.selector.selfunction( funcname ) and not self.selector.excfunction( funcname ) :
           selec.append(f)
-        if 'extra' in f and f['extra'].get('autoselect') and f not in selec:
+        elif 'extra' in f and f['extra'].get('autoselect') and f not in selec:
           selec.append(f)
     return selec
 #----------------------------------------------------------------------------------
@@ -370,10 +380,17 @@
     self.selector = sel  # remember the selector
     if self.selector :
       for e in self.enums :
+        # Filter any non-public data members for minimal interpreter dict
+        if self.interpreter:
+          exref = self.xref[e['id']]
+          # assumes that the default is "public"
+          if exref.has_key('attrs') and 'access' in exref['attrs'] :
+            continue
+
         ename = self.genTypeName(e['id'])
         if self.selector.selenum( ename ) and not self.selector.excenum( ename ) :
           selec.append(e)
-        if 'extra' in e and e['extra'].get('autoselect') and e not in selec:
+        elif 'extra' in e and e['extra'].get('autoselect') and e not in selec:
           selec.append(e)
     return selec
 #---------------------------------------------------------------------------------
@@ -385,7 +402,7 @@
         varname = self.genTypeName(v['id'])
         if self.selector.selvariable( varname ) and not self.selector.excvariable( varname ) :
           selec.append(v)
-        if 'extra' in v and v['extra'].get('autoselect') and v not in selec:
+        elif 'extra' in v and v['extra'].get('autoselect') and v not in selec:
           selec.append(v)
     return selec
 #----------------------------------------------------------------------------------
@@ -500,7 +517,7 @@
     args  = self.xref[id]['subelems']
     if 'name' in attrs :
        if attrs['name'] in self.ignoremeth : return 0
-    #----Filter any method and operator for POOL -----
+    #----Filter any method and operator for minimal POOL dict -----
     if self.pool :
       if elem in ('OperatorMethod','Converter') : return 0
       elif elem in ('Method',) :
@@ -509,8 +526,11 @@
         if len(args) > 1 : return 0
         elif len(args) == 1 :
           if self.genTypeName(args[0]['type']) != 'const '+self.genTypeName(attrs['context'])+'&' : return 0
+    #----Filter any non-public data members for minimal interpreter dict -----
+    if self.interpreter and elem in ('Field') and 'access' in attrs : # assumes that the default is "public"
+      return 0
     #----Filter any non public method
-    if 'access' in attrs :  # assumes that the default is "public"
+    if attrs.get('access') in ('protected', 'private') : 
       if elem in ('Constructor','Destructor','Method','OperatorMethod','Converter') : return 0
     #----Filter any copy constructor with a private copy constructor in any base
     if elem == 'Constructor' and len(args) == 1 and 'name' in args[0] and args[0]['name'] == '_ctor_arg' :
@@ -527,6 +547,7 @@
   def tmplclasses(self, local):
     result = []
     for c in self.classes :
+      if not 'name' in c: continue
       name = c['name']
       if name.find('<') == -1 : continue
       temp = name[name.find('<')+1:name.rfind('>')]
@@ -643,7 +664,7 @@
 
   def genClassDict(self, attrs):
     members, bases = [], []
-    cl  = attrs['name']
+    cl  = attrs.get('name')
     clf = '::' + attrs['fullname']
     cls = attrs['fullname']
     clt = string.translate(str(clf), self.transtable)
@@ -694,7 +715,8 @@
     return sc, ss
 #----------------------------------------------------------------------------------
   def checkAccessibleType( self, type ):
-    while type['elem'] in ('PointerType','Typedef') : type = self.xref[type['attrs']['type']]
+    while type['elem'] in ('PointerType','Typedef','ArrayType') :
+      type = self.xref[type['attrs']['type']]
     attrs = type['attrs']
     if 'access' in attrs and attrs['access'] in ('private','protected') : return attrs['id']
     if 'context' in attrs and self.checkAccessibleType(self.xref[attrs['context']]) : return attrs['id']
@@ -713,11 +735,17 @@
     return 0
 #----------------------------------------------------------------------------------
   def genClassShadow(self, attrs, inner = 0 ) :
+    if not inner :
+      if attrs['id'] in self.generated_shadow_classes : return ''
+      else : self.generated_shadow_classes.append(attrs['id'])
     inner_shadows = {}
     bases = self.getBases( attrs['id'] )
-    cls = self.genTypeName(attrs['id'],const=True,colon=True)
-    clt = string.translate(str(cls), self.transtable)
-    if self.isUnnamedType(cls) and inner : clt = ''
+    if inner and attrs.has_key('demangled') and self.isUnnamedType(attrs['demangled']) :
+      cls = attrs['demangled']
+      clt = ''
+    else:
+      cls = self.genTypeName(attrs['id'],const=True,colon=True)
+      clt = string.translate(str(cls), self.transtable)
     xtyp = self.xref[attrs['id']]
     typ = xtyp['elem'].lower()
     indent = inner * 2 * ' '
@@ -734,6 +762,7 @@
          bname = self.genTypeName(b['type'],colon=True)
          if self.xref[b['type']]['attrs'].get('access') in ('private','protected'):
             bname = string.translate(str(bname),self.transtable)
+            if not inner: c = self.genClassShadow(self.xref[b['type']]['attrs']) + c
           c += indent + '%s %s' % ( acc , bname )
           if b is not bases[-1] : c += ', ' 
         c += indent + ' {\n' + indent +'  public:\n'
@@ -747,7 +776,7 @@
         member = self.xref[m]
         if member['elem'] in ('Class','Struct','Union','Enumeration') \
            and member['attrs'].get('access') in ('private','protected') \
-           and not self.isUnnamedType(member['attrs'].get('name')):
+           and not self.isUnnamedType(member['attrs'].get('demangled')):
           cmem = self.genTypeName(member['attrs']['id'],const=True,colon=True)
           if cmem != cls and cmem not in inner_shadows :
             inner_shadows[cmem] = string.translate(str(cmem), self.transtable)
@@ -756,19 +785,35 @@
         member = self.xref[m]
         if member['elem'] in ('Field',) :
           a = member['attrs']
+          axref = self.xref[a['type']]
           t = self.genTypeName(a['type'],colon=True,const=True)
+          arraytype = ""
+          if t[-1] == ']' : arraytype = t[t.find('['):]
+
+          fundtype = axref
+          while fundtype['elem'] in ('ArrayType', 'Typedef'):
+            fundtype = self.xref[fundtype['attrs']['type']]
+          mTypeElem = fundtype['elem']
+
+          #---- Check if pointer of reference - exact type irrelevant
+          if mTypeElem == 'PointerType' :
+            c += indent + '  void* %s;\n' % (a['name'] + arraytype)
+            continue
+          elif mTypeElem ==  'ReferenceType' :
+            c += indent + '  int& %s;\n' % (a['name'] + arraytype)
+            continue
+
           #---- Check if a type and a member with the same name exist in the same scope
-          mTypeElem = self.xref[a['type']]['elem']
           if mTypeElem in ('Class','Struct'):
-            mTypeName = self.xref[a['type']]['attrs']['name']
-            mTypeId = a['type']
-            for el in self.xref[self.xref[a['type']]['attrs']['context']]['attrs'].get('members').split():
+            mTypeName = fundtype['attrs'].get('name')
+            mTypeId = fundtype['attrs']['id']
+            for el in self.xref[fundtype['attrs']['context']]['attrs'].get('members').split():
               if self.xref[el]['attrs'].get('name') == mTypeName and mTypeId != el :
                 t = mTypeElem.lower() + ' ' + t[2:]
                 break
           #---- Check for non public types------------------------
-          noPublicType = self.checkAccessibleType(self.xref[a['type']])
-          if ( noPublicType and not self.isUnnamedType(self.xref[a['type']]['attrs'].get('name'))):
+          noPublicType = self.checkAccessibleType(axref)
+          if ( noPublicType and not self.isUnnamedType(axref['attrs'].get('demangled'))):
             noPubTypeAttrs = self.xref[noPublicType]['attrs']
             cmem = self.genTypeName(noPubTypeAttrs['id'],const=True,colon=True)
             if cmem != cls and cmem not in inner_shadows :
@@ -780,11 +825,11 @@
           for ikey in ikeys :      
             if   t.find(ikey) == 0      : t = t.replace(ikey, inner_shadows[ikey])     # change current class by shadow name 
             elif t.find(ikey[2:]) != -1 : t = t.replace(ikey[2:], inner_shadows[ikey]) # idem without leading ::
-          mType = self.xref[a.get('type')]
-          if mType and self.isUnnamedType(mType['attrs'].get('name')) :
+          mType = axref
+          if mType and self.isUnnamedType(mType['attrs'].get('demangled')) :
             t = self.genClassShadow(mType['attrs'], inner+1)[:-2]
           fPPos = self.funPtrPos(t)
-          if t[-1] == ']'         : c += indent + '  %s %s;\n' % ( t[:t.find('[')], a['name']+t[t.find('['):] )
+          if t[-1] == ']'         : c += indent + '  %s %s;\n' % ( t[:t.find('[')], a['name'] + arraytype )
           elif fPPos              : c += indent + '  %s;\n'    % ( t[:fPPos] + a['name'] + t[fPPos:] )
           else                    : c += indent + '  %s %s;\n' % ( t, a['name'] )
       c += indent + '};\n'
@@ -792,6 +837,8 @@
 #----------------------------------------------------------------------------------
   def genTypedefBuild(self, attrs, childs) :
     if self.no_membertypedefs : return ''
+    # access selection doesn't work with gccxml0.6 - typedefs don't have it
+    if self.interpreter and 'access' in attrs : return ''
     s = ''
     s += '  .AddTypedef(%s, "%s::%s")' % ( self.genTypeID(attrs['type']), self.genTypeName(attrs['context']), attrs['name']) 
     return s  
@@ -807,7 +854,8 @@
       s += '  .AddEnum("%s", "%s", &typeid(ROOT::Reflex::UnnamedEnum), %s)' % (name[name.rfind('::')+3:], values, mod) 
     else :
       if attrs.get('access') in ('protected','private'):
-        s += '  .AddEnum("%s", "%s", &typeid(ROOT::Reflex::UnknownType), %s)' % (name, values, mod)        
+        if not self.interpreter:
+          s += '  .AddEnum("%s", "%s", &typeid(ROOT::Reflex::UnknownType), %s)' % (name, values, mod)        
       else:
         s += '  .AddEnum("%s", "%s", &typeid(%s), %s)' % (name, values, name, mod)
     return s 
@@ -823,6 +871,11 @@
     return s
 #----------------------------------------------------------------------------------
   def genTypeName(self, id, enum=False, const=False, colon=False, alltempl=False) :
+    elem  = self.xref[id]['elem']
+    attrs = self.xref[id]['attrs']
+    if self.isUnnamedType(attrs.get('demangled')) :
+      if colon : return '__'+attrs['demangled']
+      else : return attrs['demangled']
     if id[-1] in ['c','v'] :
       nid = id[:-1]
       cvdict = {'c':'const','v':'volatile'}
@@ -836,11 +889,10 @@
         else     : return cvdict[id[-1]] + ' ' + self.genTypeName(nid, enum, False, colon)
     # "const" vetoeing must not recurse
     const = False
-    elem  = self.xref[id]['elem']
-    attrs = self.xref[id]['attrs']
     s = self.genScopeName(attrs, enum, const, colon)
     if elem == 'Namespace' :
-      if attrs['name'] != '::' : s += attrs['name']
+      if 'name' not in attrs : s += '@anonymous@namespace@'
+      elif attrs['name'] != '::' : s += attrs['name']
     elif elem == 'PointerType' :
       t = self.genTypeName(attrs['type'],enum, const, colon)
       if   t[-1] == ')' or t[-7:] == ') const' or t[-10:] == ') volatile' : s += t.replace('::*)','::**)').replace('::)','::*)').replace('(*)', '(**)').replace('()','(*)')
@@ -967,11 +1019,13 @@
           c += 'EnumTypeBuilder("' + sc + attrs['name'] + '");\n'
         else :
          name = ''
-         if 'context' in attrs :
-           ns = self.genTypeName(attrs['context'])
-           if ns : name += ns + '::'
-         if 'name' in attrs :
-           name += attrs['name']
+         if 'name' not in attrs and 'demangled' in attrs : name = attrs.get('demangled')
+         else:
+           if 'context' in attrs :
+             ns = self.genTypeName(attrs['context'])
+             if ns : name += ns + '::'
+           if 'name' in attrs :
+             name += attrs['name']
          name = normalizeClass(name,False)
          c += 'TypeBuilder("'+name+'");\n'
     return c 
@@ -1141,7 +1195,9 @@
     return c
 #----------------------------------------------------------------------------------    
   def genCommentProperty(self, attrs):
-    if not self.comments or 'file' not in attrs or ('artificial' in attrs and attrs['artificial'] == '1') : return '' 
+    if not (self.comments or self.iocomments) \
+       or 'file' not in attrs \
+       or ('artificial' in attrs and attrs['artificial'] == '1') : return '' 
     fd = self.files[attrs['file']]
     # open and read the header file if not yet done
     if 'filelines' not in fd :
@@ -1152,8 +1208,14 @@
       except :
         return ''
     line = fd['filelines'][int(attrs['line'])-1]
-    if line.find('//') == -1 : return ''
-    return '\n  .AddProperty("comment","%s")' %  (line[line.index('//')+2:-1]).replace('"','\\"')
+    poscomment = line.find('//')
+    if poscomment == -1 : return ''
+    if not self.comments and self.iocomments:
+      if line[poscomment+2] != '!' \
+         and line[poscomment+2] != '[' \
+         and line[poscomment+2:poscomment+4] != '->' \
+         and line[poscomment+2:poscomment+4] != '||': return ''
+    return '\n  .AddProperty("comment","%s")' %  (line[poscomment+2:-1]).replace('"','\\"')
 #----------------------------------------------------------------------------------
   def genArgument(self, attrs):
     c = self.genTypeName(attrs['type'], enum=True, const=False)
@@ -1168,11 +1230,12 @@
     return c
 #----------------------------------------------------------------------------------
   def genModifier(self, attrs, xattrs ):
-    if 'access' not in attrs            : mod = 'PUBLIC'
+    if   attrs.get('access') == 'public' or 'access' not in attrs : mod = 'PUBLIC'
     elif attrs['access'] == 'private'   : mod = 'PRIVATE'
     elif attrs['access'] == 'protected' : mod = 'PROTECTED'
     else                                : mod = 'NONE'
     if 'virtual' in attrs : mod += ' | VIRTUAL'
+    if 'pure_virtual' in attrs : mod += ' | ABSTRACT'
     if 'static'  in attrs : mod += ' | STATIC'
     # Extra modifiers
     xtrans = ''
@@ -1192,7 +1255,7 @@
 #----------------------------------------------------------------------------------
   def genMCOBuild(self, type, name, attrs, args):
     id       = attrs['id']
-    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('name')) or \
+    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('demangled')) or \
        self.checkAccessibleType(self.xref[attrs['context']]) : return ''
     if type == 'constructor' : returns  = 'void'
     else                     : returns  = self.genTypeName(attrs['returns'])
@@ -1317,7 +1380,9 @@
     return self.genMCODecl( 'constructor', '', attrs, args )
 #----------------------------------------------------------------------------------
   def genConstructorBuild(self, attrs, args):
-    return self.genMCOBuild( 'constructor', attrs['name'], attrs, args )
+    name = attrs.get('name')
+    if not name : name = self.xref[attrs['context']]['attrs']['demangled'].split('::')[-1]
+    return self.genMCOBuild( 'constructor', name, attrs, args )
 #----------------------------------------------------------------------------------
   def genConstructorDef(self, attrs, args):
     cl  = self.genTypeName(attrs['context'], colon=True)
@@ -1349,7 +1414,7 @@
     return 'static void* destructor%s(void * o, const std::vector<void*>&, void *) {\n  ((::%s*)o)->~%s(); return 0;\n}' % ( attrs['id'], cl, attrs['name'] )
 #----------------------------------------------------------------------------------
   def genDestructorBuild(self, attrs, childs):
-    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('name')) or \
+    if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('demangled')) or \
        self.checkAccessibleType(self.xref[attrs['context']]) : return ''
     mod = self.genModifier(attrs,None)
     id       = attrs['id']
@@ -1399,7 +1464,7 @@
     return '  .AddBase(%s, BaseOffset< %s, %s >::Get(), %s)' %  (self.genTypeID(b['type']), clf, self.genTypeName(b['type'],colon=True), mod)
 #----------------------------------------------------------------------------------
   def enhanceClass(self, attrs):
-    if self.isUnnamedType(attrs['name']) or self.checkAccessibleType(self.xref[attrs['id']]) : return
+    if self.isUnnamedType(attrs.get('demangled')) or self.checkAccessibleType(self.xref[attrs['id']]) : return
     # Default constructor
     if 'members' in attrs : members = attrs['members'].split()
     else                  : members = []
@@ -1421,8 +1486,10 @@
           new_attrs['artificial'] = 'true'
           self.xref[id] = {'elem':'Constructor', 'attrs':new_attrs,'subelems':[] }
           attrs['members'] += u' ' + id
-        elif len(args) == 0 and 'abstract' not in attrs and \
-             'access' not in self.xref[m]['attrs'] and not self.isDestructorNonPublic(attrs['id']):
+        if (len(args) == 0  or 'default' in args[0] ) \
+               and 'abstract' not in attrs \
+               and self.xref[m]['attrs'].get('access') == 'public' \
+               and not self.isDestructorNonPublic(attrs['id']):
           # NewDel functions extra function
           id = u'_x%d' % self.x_id.next()
           new_attrs = { 'id':id, 'context':attrs['id'], 'artificial':'true' }
diff -Naur root.orig/reflex/python/genreflex/genreflex06.py root/reflex/python/genreflex/genreflex06.py
--- root.orig/reflex/python/genreflex/genreflex06.py    1970-01-01 01:00:00.000000000 +0100
+++ root/reflex/python/genreflex/genreflex06.py 2007-11-04 05:24:45.000000000 +0100
@@ -0,0 +1,349 @@
+# Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose is hereby granted without fee, provided that this copyright and
+# permissions notice appear in all copies and derivatives.
+#
+# This software is provided "as is" without express or implied warranty.
+
+import sys, os, gendict06, selclass, gencapa, genrootmap, string, getopt
+
+class genreflex:
+#----------------------------------------------------------------------------------
+  def __init__(self):
+    self.files           = []
+    self.output          = None
+    self.outputDir       = None
+    self.outputFile      = None
+    self.capabilities    = None
+    self.rootmap         = None
+    self.rootmaplib      = None
+    self.select          = None
+    self.cppopt          = ''
+    self.deep            = False
+    self.opts            = {}
+    self.gccxmlpath      = None
+    self.gccxmlopt       = ''
+    self.gccxmlvers      = '0.6.0_patch3'
+    self.selector        = None
+    self.gccxml          = ''
+    self.quiet           = False
+#----------------------------------------------------------------------------------
+  def usage(self, status = 1) :
+    print 'Usage:'
+    print '  genreflex headerfile1.h [headerfile2.h] [options] [preprocesor options]'
+    print 'Try "genreflex --help" for more information.'
+    sys.exit(status)
+#----------------------------------------------------------------------------------
+  def help(self) :
+    print """Generates the LCG dictionary file for each header file\n
+    Usage:
+      genreflex headerfile1.h [headerfile2.h] [options] [preprocesor options]\n    
+    Options:
+      -s <file>, --selection_file=<file>
+         Class selection file to specify for which classes the dictionary
+         will be generated
+         Format (XML):
+           <lcgdict>
+           [<selection>]
+             <class [name="classname"] [pattern="wildname"] 
+                    [file_name="filename"] [file_pattern="wildname"] 
+                    [id="xxxx"] [type="vector"]/>
+             <class name="classname" >
+               <field name="m_transient" transient="true"/>
+               <field name="m_anothertransient" transient="true"/>
+               <properties prop1="value1" [prop2="value2"]/>
+             </class>
+             <function [name="funcname"] [pattern="wildname"] />
+             <enum [name="enumname"] [patter="wildname"] />
+             <variable [name="varname"] [patter="wildname"] />
+           [</selection>]
+           <exclusion>
+             <class [name="classname"] [pattern="wildname"] />
+               <method name="unwanted" />
+             </class>
+           ...
+           </lcgdict>\n
+      -o <file>, --output <file>
+         Output file name. If an existing directory is specified instead of a file,
+         then a filename will be build using the name of the input file and will
+         be placed in the given directory. <headerfile>_rflx.cpp \n
+      --pool, --dataonly
+         Generate minimal dictionary required for POOL persistency\n
+      --interpreteronly
+         Generate minimal dictionary required for interpreter\n
+      --deep
+         Generate dictionary for all dependend classes\n
+      --split  (OBSOLETE)
+         Generate separate file for stub functions. Option sometimes needed on Windows.\n
+      --reflex  (OBSOLETE)
+         Generate Reflex dictionaries.\n
+      --comments
+         Add end-of-line comments in data and functions members as a property called "comment" \n
+      --iocomments
+         Add end-of-line comments in data and functions members as a property called "comment", but only for comments relevant for ROOT I/O \n
+      --no_membertypedefs
+         Disable the definition of class member typedefs \n
+      --no_templatetypedefs
+         Disable resolving of typedefs in template parameters for selection names. E.g. std::vector<MYINT>.\n
+      --fail_on_warnings
+         The genreflex command fails (retuns the value 1) if any warning message is issued \n
+      --gccxmlpath=<path>
+         Path path where the gccxml tool is installed.
+         If not defined the standard PATH environ variable is used\n
+      --gccxmlopt=<gccxmlopt>
+         Options to be passed directly to gccxml\n
+      -c <file>, --capabilities=<file>
+         Generate the capabilities file to be used by the SEAL Plugin Manager. This file
+         lists the names of all classes for which the reflection is formation is provided.\n
+      --rootmap=<file>
+         Generate the rootmap file to be used by ROOT/CINT. This file lists the names of 
+         all classes for which the reflection is formation is provided.\n
+      --rootmap-lib=<library>
+         Library name for the rootmap file.\n
+      --debug
+         Print extra debug information while processing. Keep intermediate files\n
+      --quiet
+         No not print informational messages\n
+      -h, --help
+         Print this help\n
+     """ 
+    sys.exit()
+#----------------------------------------------------------------------------------
+  def parse_args(self, argv = sys.argv) :
+    options = []
+    #----Ontain the list of files to process------------
+    for a in argv[1:] :
+      if a[0] != '-' :
+        self.files.append(a)
+      else :
+        options = argv[argv.index(a):]
+        break
+    #----Process options--------------------------------
+    try:
+      opts, args = getopt.getopt(options, 'ho:s:c:I:U:D:PC', \
+      ['help','debug=', 'output=','selection_file=','pool','dataonly','interpreteronly','deep','gccxmlpath=',
+       'capabilities=','rootmap=','rootmap-lib=','comments','iocomments','no_membertypedefs',
+       'fail_on_warnings', 'quiet', 'gccxmlopt=', 'reflex', 'split','no_templatetypedefs'])
+    except getopt.GetoptError, e:
+      print "--->> genreflex: ERROR:",e
+      self.usage(2)
+    self.output = '.'
+    self.select = None
+    self.gccxmlpath = None
+    self.cppopt = ''
+    self.pool   = 0
+    self.interpreter = 0
+    for o, a in opts:
+      if o in ('-h', '--help'):
+        self.help()
+      if o in ('--no_templatetypedefs',):
+        self.opts['resolvettd'] = 0
+      if o in ('--debug',):
+        self.opts['debug'] = a
+      if o in ('-o', '--output'):
+        self.output = a
+      if o in ('-s', '--selection_file'):
+        self.select = a
+      if o in ('--pool',):
+        self.opts['pool'] = True
+      if o in ('--dataonly',):
+        self.opts['pool'] = True
+      if o in ('--interpreteronly',):
+        self.opts['interpreter'] = True
+      if o in ('--deep',):
+        self.deep = True
+      if o in ('--split',):
+        print '--->> genreflex: WARNING: --split option is obsolete'
+      if o in ('--reflex',):
+        print '--->> genreflex: WARNING: --reflex option is obsolete'
+      if o in ('--comments',):
+        self.opts['comments'] = True
+      if o in ('--iocomments',):
+        self.opts['iocomments'] = True
+      if o in ('--no_membertypedefs',):
+        self.opts['no_membertypedefs'] = True
+      if o in ('--fail_on_warnings',):
+        self.opts['fail_on_warnings'] = True
+      if o in ('--quiet',):
+        self.opts['quiet'] = True
+        self.quiet = True
+      if o in ('--gccxmlpath',):
+        self.gccxmlpath = a
+      if o in ('--gccxmlopt',):
+        self.gccxmlopt += a +' '
+      if o in ('-c', '--capabilities'):
+        self.capabilities = a
+      if o in ('--rootmap',):
+        self.rootmap = a
+      if o in ('--rootmap-lib',):
+        self.rootmaplib = a
+      if o in ('-I', '-U', '-D', '-P', '-C') :
+        self.cppopt += '\'' + o + a + '\' '
+#----------------------------------------------------------------------------------
+  def check_files_dirs(self):
+    #---Check existance of input files--------------------
+    if self.files :
+      for f in self.files :
+        if not os.path.exists(f) : 
+          print '--->> genreflex: ERROR: C++ file "' + f + '" not found'
+          self.usage()
+    else :
+      print '--->> genreflex: ERROR: No input file specified'
+      self.usage()
+    #---Check existance of output directory----------------
+    if os.path.isdir(self.output) :
+      self.outputDir  = self.output
+      self.outputFile = None
+    else :
+      self.outputDir, self.outputFile = os.path.split(self.output)
+    if self.outputDir and not os.path.isdir(self.outputDir) :
+      print '--->> genreflex: ERROR: Output directory ', self.outputDir, ' not found'
+      self.usage()
+    #---Hande selection class file-------------------------
+    classes = []
+    if self.select :
+      if not os.path.exists(self.select) :
+        print '--->> genreflex: ERROR: Class selection file "' + self.select + '" not found'
+        self.usage()
+      for l in open(self.select).readlines() : classes.append(l[:-1])
+    #----------GCCXML command------------------------------
+    if not self.gccxmlpath:
+      try:
+        import gccxmlpath
+        self.gccxmlpath = gccxmlpath.gccxmlpath
+      except:
+        pass
+    if self.gccxmlpath :
+      if sys.platform == 'win32' :
+        self.gccxml = self.gccxmlpath + os.sep + 'gccxml.exe'
+      else :
+        self.gccxml = self.gccxmlpath + os.sep + 'gccxml'
+      if not os.path.isfile(self.gccxml) :
+        print '--->> genreflex: ERROR: Path to gccxml given, but no executable found at', self.gccxml
+    elif self.which('gccxml') :
+      self.gccxml = 'gccxml'
+      print '--->> genreflex: INFO: No explicit path to gccxml given. Found gccxml at', self.which('gccxml')
+    else :
+      if sys.platform == 'win32' :
+        self.gccxml = r'\\cern.ch\dfs\Experiments\sw\lcg\external\gccxml\0.6.0_patch3\win32_vc71\bin\gccxml'
+      else :
+        self.gccxml = '/afs/cern.ch/sw/lcg/external/gccxml/0.6.0_patch3/slc3_ia32_gcc323/bin/gccxml'
+      print '--->> genreflex: INFO: No gccxml executable found, using fallback location at', self.gccxml
+    #---------------Open selection file-------------------
+    try :
+      if self.select : self.selector = selclass.selClass(self.select,parse=1)
+      else           : self.selector = None
+    except :
+      sys.exit(1)
+
+#----------------------------------------------------------------------------------
+  def genGccxmlInfo(self):
+    s = ''
+    (inp,out,err) = os.popen3(self.gccxml + ' --print')
+    serr = err.read()
+    sout = out.read()
+    if serr :
+      print '--->> genreflex: WARNING: Could not invoke %s --print' % self.gccxml
+      print '--->> genreflex: WARNING: %s' % serr
+      return s
+    gccxmlv = sout.split('\n')[0].split()[-1]
+    # For 0.6.0 we can't do much because we have not put in a patch info into the version string 
+    if gccxmlv != '0.6.0' and gccxmlv != self.gccxmlvers :
+      print '--->> genreflex: WARNING: gccxml versions differ. Used version: %s. Recommended version: %s. ' % ( gccxmlv, self.gccxmlvers)
+      print '--->> genreflex: WARNING: gccxml binary used: %s' % ( self.gccxml )
+    s += sout    
+    compiler = ''
+    for l in sout.split('\n'):
+      ll = l.split('"')
+      if ll[0].find('GCCXML_COMPILER') != -1 :
+        compiler = ll[1]
+        break
+    bcomp = os.path.basename(compiler)
+    vopt = ''
+    if   bcomp in ('msvc7','msvc71')  : return s
+    elif bcomp in ('gcc','g++','c++') : vopt = '--version'
+    elif bcomp in ('cl.exe','cl')     : vopt = '' # there is no option to print only the version with cl
+    else :
+      print '--->> genreflex: WARNING: While trying to retrieve compiler version, found unknown compiler %s' % compiler
+      return s
+    (inp,out,err) = os.popen3('%s %s'%(compiler,vopt))
+    serr = err.read()
+    if serr :
+      print '--->> genreflex: WARNING: While trying to retrieve compiler information. Cannot invoke %s %s' % (compiler,vopt)
+      print '--->> genreflex: WARNING: %s' % serr
+      return s
+    s += '\nCompiler info:\n' + out.read()
+    return s
+#----------------------------------------------------------------------------------
+  def process_files(self):
+    total_warnings = 0
+    file_extension = '_rflx.cpp'
+    #----------Loop oover all the input files--------------
+    for source in self.files :
+      path, fullname = os.path.split(source)
+      name = fullname[:fullname.find('.')]
+      xmlfile = os.path.join(self.outputDir,name+'.xml')
+      if( self.outputFile ) :
+        dicfile = os.path.join(self.outputDir,self.outputFile)
+      else :
+        dicfile = os.path.join(self.outputDir,name+file_extension)
+      #---------------Parse the header file with GCC_XML
+      cmd  = '%s %s \'%s\' \'-fxml=%s\' %s -D__REFLEX__' %(self.gccxml, self.gccxmlopt, source, xmlfile, self.cppopt)
+      if not self.quiet : print '--->> genreflex: INFO: Parsing file %s with GCC_XML' % source,
+      status = os.system(cmd)
+      if status :
+        print '\n--->> genreflex: ERROR: processing file with gccxml. genreflex command failed.'
+        sys.exit(1)
+      else: 
+        if not self.quiet : print 'OK'
+      gccxmlinfo = self.genGccxmlInfo()
+     #---------------Generate the dictionary---------------
+      if not self.quiet : print '--->> genreflex: INFO: Generating Reflex Dictionary'
+      dg = gendict06.genDictionary(source, self.opts)
+      dg.parse(xmlfile)
+      classes   = dg.selclasses(self.selector, self.deep)
+      functions = dg.selfunctions(self.selector)
+      enums     = dg.selenums(self.selector)
+      variables = dg.selvariables(self.selector)
+      cnames, warnings, errors = dg.generate(dicfile, classes, functions, enums, variables, gccxmlinfo )
+      total_warnings += warnings
+    #------------Produce Seal Capabilities source file------
+      if self.capabilities :
+        if os.path.isdir(self.capabilities) :
+          capfile = os.path.join(self.capabilities, 'capabilities.cpp')
+        else :
+          capfile = os.path.join(self.outputDir, self.capabilities)
+        gencapa.genCapabilities(capfile, name,  cnames)
+    #------------Produce rootmap file-----------------------
+      if self.rootmap :
+        if os.path.isdir(self.rootmap) :
+          mapfile = os.path.join(self.rootmap, 'rootmap')
+        else :
+          mapfile = os.path.join(self.outputDir, self.rootmap)
+        if not self.rootmaplib :  self.rootmaplib = 'lib'+name+'.so'
+        genrootmap.genRootMap(mapfile, name,  self.rootmaplib, cnames, classes)
+    #------------Report unused class selections in selection
+    if self.selector : 
+      warnings += self.selector.reportUnusedClasses()
+    #------------Delete intermediate files------------------
+    if 'debug' not in self.opts :
+       os.remove(xmlfile)
+    #------------Exit with status if warnings --------------
+    if warnings and self.opts.get('fail_on_warnings',False) : 
+      print '--->> genreflex: ERROR: Exiting with error due to %d warnings ( --fail_on_warnings enabled )' % warnings
+      sys.exit(1)
+#---------------------------------------------------------------------
+  def which(self, name) :
+    if 'PATH' in os.environ :
+      if sys.platform == 'win32' : name += '.exe'
+      for p in os.environ['PATH'].split(os.pathsep) :
+        path = os.path.join(p,name)
+        if os.path.exists(path) : return path
+    return None
+#---------------------------------------------------------------------
+if __name__ == "__main__":
+  l = genreflex()
+  l.parse_args()
+  l.check_files_dirs()
+  l.process_files()
diff -Naur root.orig/reflex/python/genreflex/genreflex.py root/reflex/python/genreflex/genreflex.py
--- root.orig/reflex/python/genreflex/genreflex.py      2007-01-10 10:31:33.000000000 +0100
+++ root/reflex/python/genreflex/genreflex.py   2007-11-04 05:24:28.000000000 +0100
@@ -24,7 +24,7 @@
     self.opts            = {}
     self.gccxmlpath      = None
     self.gccxmlopt       = ''
-    self.gccxmlvers      = '0.6.0_patch3'
+    self.gccxmlvers      = '0.7.0_20070615'
     self.selector        = None
     self.gccxml          = ''
     self.quiet           = False
@@ -68,8 +68,10 @@
          Output file name. If an existing directory is specified instead of a file,
          then a filename will be build using the name of the input file and will
          be placed in the given directory. <headerfile>_rflx.cpp \n
-      --pool
+      --pool, --dataonly
          Generate minimal dictionary required for POOL persistency\n
+      --interpreteronly
+         Generate minimal dictionary required for interpreter\n
       --deep
          Generate dictionary for all dependend classes\n
       --split  (OBSOLETE)
@@ -78,6 +80,8 @@
          Generate Reflex dictionaries.\n
       --comments
          Add end-of-line comments in data and functions members as a property called "comment" \n
+      --iocomments
+         Add end-of-line comments in data and functions members as a property called "comment", but only for comments relevant for ROOT I/O \n
       --no_membertypedefs
          Disable the definition of class member typedefs \n
       --no_templatetypedefs
@@ -118,8 +122,8 @@
     #----Process options--------------------------------
     try:
       opts, args = getopt.getopt(options, 'ho:s:c:I:U:D:PC', \
-      ['help','debug=', 'output=','selection_file=','pool','deep','gccxmlpath=',
-       'capabilities=','rootmap=','rootmap-lib=','comments','no_membertypedefs',
+      ['help','debug=', 'output=','selection_file=','pool','dataonly','interpreteronly','deep','gccxmlpath=',
+       'capabilities=','rootmap=','rootmap-lib=','comments','iocomments','no_membertypedefs',
        'fail_on_warnings', 'quiet', 'gccxmlopt=', 'reflex', 'split','no_templatetypedefs'])
     except getopt.GetoptError, e:
       print "--->> genreflex: ERROR:",e
@@ -129,6 +133,7 @@
     self.gccxmlpath = None
     self.cppopt = ''
     self.pool   = 0
+    self.interpreter = 0
     for o, a in opts:
       if o in ('-h', '--help'):
         self.help()
@@ -142,6 +147,10 @@
         self.select = a
       if o in ('--pool',):
         self.opts['pool'] = True
+      if o in ('--dataonly',):
+        self.opts['pool'] = True
+      if o in ('--interpreteronly',):
+        self.opts['interpreter'] = True
       if o in ('--deep',):
         self.deep = True
       if o in ('--split',):
@@ -150,6 +159,8 @@
         print '--->> genreflex: WARNING: --reflex option is obsolete'
       if o in ('--comments',):
         self.opts['comments'] = True
+      if o in ('--iocomments',):
+        self.opts['iocomments'] = True
       if o in ('--no_membertypedefs',):
         self.opts['no_membertypedefs'] = True
       if o in ('--fail_on_warnings',):
@@ -168,7 +179,7 @@
       if o in ('--rootmap-lib',):
         self.rootmaplib = a
       if o in ('-I', '-U', '-D', '-P', '-C') :
-        self.cppopt += o + a +' '
+        self.cppopt += '\'' + o + a + '\' '
 #----------------------------------------------------------------------------------
   def check_files_dirs(self):
     #---Check existance of input files--------------------
@@ -278,7 +289,7 @@
       else :
         dicfile = os.path.join(self.outputDir,name+file_extension)
       #---------------Parse the header file with GCC_XML
-      cmd  = '%s %s %s -fxml=%s %s -D__REFLEX__' %(self.gccxml, self.gccxmlopt, source, xmlfile, self.cppopt)
+      cmd  = '%s %s \'%s\' \'-fxml=%s\' %s -D__REFLEX__' %(self.gccxml, self.gccxmlopt, source, xmlfile, self.cppopt)
       if not self.quiet : print '--->> genreflex: INFO: Parsing file %s with GCC_XML' % source,
       status = os.system(cmd)
       if status :
@@ -311,7 +322,7 @@
         else :
           mapfile = os.path.join(self.outputDir, self.rootmap)
         if not self.rootmaplib :  self.rootmaplib = 'lib'+name+'.so'
-        genrootmap.genRootMap(mapfile, name,  self.rootmaplib, cnames)
+        genrootmap.genRootMap(mapfile, name,  self.rootmaplib, cnames, classes)
     #------------Report unused class selections in selection
     if self.selector : 
       warnings += self.selector.reportUnusedClasses()
Revision:	1.1
Committed:	Sun Nov 4 04:30:14 2007 UTC (17 years, 5 months ago) by elmer
Branch:	MAIN
CVS Tags:	forFrontend-3, webconddb173, condapp173, webconddb172, condapp172, webconddb171, condapp171, webconddb170, condapp170, condapp164b, webconddb164b, webconddb164, conapp164, zx20090506, forPHEDEX-web-services-20090423, forPHEDEX-web-services-20090406, forPHEDEX313a, zx20090224, zx20090219, forPHEDEX313, zx20090217, zx20090216, forPHEDEX-web-services-20090216, forPHEDEX312, sw_20090115, zx20090115, zx20090114, WEBTOOLS-APPS_20090113, DBS-APPS_20090109, DBS-APPS_20090108, sw_20090108, WEBTOOLS-APPS_20090108, DBS-APPS_20090106, DBS-APPS_20090105, FMWS_20090103, FMWS_20081224_1, FMWS_20081224, FMWS_20081222_3, FMWS_20081222_2, FMWS_20081222, DBS-APPS_20081218, FMWS_20081212_1, FMWS_20081212, FMWS_20081211, DBS-APPS_20081211, forPHEDEX311, DBS-APPS_20081210, forPHEDEX310, DBS-APPS_20081209, WEBTOOLS-APPS_20081208, forPHEDEX310pre2, DBS-APPS_20081205, forPHEDEX-web-services-20081205, DBS-APPS_20081204, DBS-APPS_200811204, forPHEDEX310pre1, DBS-APPS_20081126_1, DBS-APPS_20081126, DBS-APPS_20081125, ofctest, DBS-APPS_20081119, DBS-APPS_20081118, DBS-APPS_20081117, DBS-APPS_20081114_1, DBS-APPS_20081114, DBS-APPS_20081112, DBS-APPS_20081111_1, DBS-APPS_20081110_2, DBS-APPS_20081110_1, WEBTOOLS-APPS_20081110, DBS-APPS_20081110, WEBTOOLS-APPS_20081107_1, WEBTOOLS-APPS_20081107, DBS-APPS_20081107, DBS-APPS_20081105, DBS-APPS_20081104, WEBTOOLS-APPS_20081031_2, DBS-APPS_20081031_2, DBS-APPS_20081031_1, WEBTOOLS-APPS_20081031_1, WEBTOOLS-APPS_20081031, forPHEDEX307, DBS-APPS_20081024, WEBTOOLS-APPS_20081020_1, WEBTOOLS-APPS_20081020, forFrontend-2, WEBTOOLS-APPS_20081016_2, WEBTOOLS-APPS_20081016_1, WEBTOOLS-APPS_20081016, WEBTOOLS-APPS_20081015, WEBTOOLS-APPS_20081013_1, WEBTOOLS-APPS_20081013, WEBTOOLS-APPS_20081009, WEBTOOLS-APPS_20081008_1, WEBTOOLS-APPS_20081008, forPHEDEX-web-services-20081008, forPHEDEX-web-services-20081007, forPHEDEX-web302_test1, forPHEDEX306, forPHEDEX-datasvc120_test1, WEBTOOLS-APPS_20080922, forFrontend-1, WEBTOOLS-APPS_20080917, WEBTOOLS-APPS_20080916, WEBTOOLS-APPS_20080915, forPHEDEX305, DBS-APPS_20080910_1, WEBTOOLS-APPS_20080910_1, WEBTOOLS-APPS_20080910, DBS-APPS_20080910, WEBTOOLS-APPS_20080909, DBS-APPS_20080908, WEBTOOLS-APPS_20080903, WEBTOOLS-APPS_20080826, zx20080825, WEBTOOLS-APPS_20080822, WEBTOOLS-APPS_20080821, WEBTOOLS-APPS_20080818_1, WEBTOOLS-APPS_20080818, forPHEDEX-web301, WEBTOOLS-APPS_20080725, WEBTOOLS-APPS_20080724, re-deps-20080722, zx20080718, WEBTOOLS-APPS_20080717, WEBTOOLS-APPS_20080716, WEBTOOLS-APPS_20080715_2, WEBTOOLS-APPS_20080715_1, WEBTOOLS-APPS_20080715, zx20080715, WEBTOOLS-APPS_20080713, forPHEDEX304, zx20080707, forPHEDEX-datasvc110, forPHEDEX-web300, forPHEDEX-web110, re20080627, zx20080625, WEBTOOLS-APPS_20080624, WEBTOOLS-APPS_20080619_1, WEBTOOLS-APPS_20080619, WEBTOOLS-APPS_20080617, zx20080611, WEBTOOLS-APPS_20080611, zx20080610, WEBTOOLS-APPS_20080609_1, WEBTOOLS-APPS_20080609, zx20080609, sw_20080509, WEBTOOLS-APPS_20080527_2, WEBTOOLS-APPS_20080527, WEBTOOLS-APPS_20080523, WEBTOOLS-APPS_20080522, WEBTOOLS-APPS_20080521, WEBTOOLS-APPS_20080520, WEBTOOLS-APPS_20080519, zx20080519, WEBTOOLS-APPS_20080511, zx20080509b, WEBTOOLS-APPS_20080507_1, WEBTOOLS-APPS_20080507, WEBTOOLS-APPS_20080506, WEBTOOLS-APPS_20080501, zx20080430, CMSSW_2_0_0_ONLINE2, nrnr080424for200onl2, nr080326fwl200p7, WEBTOOLS-APPS_20080422, apFor210p3v1, apFor210p3v0, CMSSW_2_0_1, dl080418, CMSSW_2_1_0_pre2, WEBTOOLS-APPS_20080416, CMSSW_2_0_0_ONLINE1, apFor210p2v2, dl080415t2, dl080415, apFor210p2v1, apFor210p2v0, zx20080415-comp, webconddb_1_1_1, WEBTOOLS-APPS_20080414, nr080413, WEBTOOLS-APPS_20080412, WEBTOOLS-APPS_20080411_1, WEBTOOLS-APPS_20080411, CMSSW_2_0_0, WEBTOOLS-APPS_20080410, WEBTOOLS-APPS_20080409_1, WEBTOOLS-APPS_20080409, dl080408cand200t1, dl080408t1, WEBTOOLS-APPS_20080408_1, WEBTOOLS-APPS_20080408, nr080408for200p9, dl080407t3, dl080407t2, CMSSW_2_1_0_pre1, DBS-APPS_20080407, CMSSW_2_0_0_pre7_ONLINE1, WEBTOOLS-APPS_20080407, dl080407, apFor210p1, CMSSW_2_0_0_pre9, dl080405, CMSSW_1_8_4, pe20080405-for184, WEBTOOLS-APPS_20080404_2, WEBTOOLS-APPS_20080404_1, WEBTOOLS-APPS_20080404, WEBTOOLS-APPS_20080403_4, WEBTOOLS-APPS_20080403_3, WEBTOOLS-APPS_20080403_2, WEBTOOLS-APPS_20080403_1, WEBTOOLS-APPS_20080403, nr080331for200p7onl1, CMSSW_2_0_0_pre8, sm080328a, WEBTOOLS-APPS_20080328, WEBTOOLS-APPS_20080327_1, WEBTOOLS-APPS_20080327, CMSSW_1_8_3, CMSSW_2_0_0_pre7, WEBTOOLS-APPS_20080326_6, WEBTOOLS-APPS_20080326_5, WEBTOOLS-APPS_20080326_4, WEBTOOLS-APPS_20080326_3, WEBTOOLS-APPS_20080326_2, WEBTOOLS-APPS_20080326, DBSweb_260308_1, pe20080326-for183, DBSweb_260308, pe20080325-for183, CMSSW_1_8_2, pe20080324-for182, CMSSW_2_0_0_pre6, forPHEDEX262_cmsbuild3, sw_20080319, sw20080319, DBSweb_180308_2, DBSweb_180308_1, DBSweb_180308, DBSweb_170308_8, DBSweb_170308_7, DBSweb_170308_6, DBSweb_170308_5, DBSweb_170308_4, DBSweb_170308_3, DBSweb_170308_2, DBSweb_170308, SiteDB_170308, CMSSW_2_0_0_pre5, SiteDB_1_2_1-160308_2, SiteDB_1_2_1-160308, SM_150308_DBSDisc_9, SM_150308_DBSDisc_8, SM_150308_DBSDisc_7, SM_150308_DBSDisc_6, SM_150308_DBSDisc_5, SM_150308_DBSDisc_4, SM_150308_DBSDisc_3, SM_150308_DBSDisc_2, SM_150308_DBSDisc_1, SM_150308_DBSDisc, CMSSW_1_8_1, nr080314_181onl1, pe20080314-for181, SiteDB_140308, SiteDB_130308, CMSSW_2_0_0_pre4, dl080312, CMSSW_1_8_0_ONLINE1, nr080310_180onl1, dl080308, dl080307cmsswtoolconf2cms5, dl080307, dl080307cmsswtoolconf2cms4, nr080307onl180onl1, CMSSW_1_8_0, dl080304t4, dl080304t3, dl080304t2, dl080304, pe20080304a-for180, ge20080304-comp, pe20080303a-for18X, dl080229, CMSSW_1_8_0_pre10, pe20080229-ports, dl080228t2, dl080228, CMSSW_2_0_0_pre3, SiteDB_080227, dl080227, ge20080226, dl080226t2, dl080226, pe20080226-for180p10, dl080225intbld, ge20080225-nightlies, ge20080225-fixed-bootstrap, dl080224t3, dl080224t2, dl080224, dl080223, dl080222, dl080221, pe20080221a-ports-412, pe20080221a-ports, dl080220, pe20080220a-for18X, pe20080220a-ports-412, pe20080220a-ports, CMSSW_1_8_0_pre9, sm080219, ge20080219, dl080218, nr080215g491p01dbg, COMP_NIGHTLY_INIT_V1, SiteDB_SM_Nightly_150208, ge20080215, pe20080214a-ports-for190p9-412, pe20080214a-ports-for190p9, pe20080211a-ports-for190p9-412, pe20080211a-ports-for190p9, COMP_NIGHTLY_20080211, CMSSW_2_0_0_pre1, pe20080207c-ports-for190p8-412, pe20080207c-ports-for190p8, pe20080207b-ports-lcg54pre2-412, pe20080207b-ports-lcg54pre2, pe20080207a-ports-lcg54pre2-412, pe20080207a-ports-lcg54pre2, pe20080206b-ports-lcg54pre2-412, pe20080206b-ports-lcg54pre2, pe20080206a-ports-lcg54pre2-412, pe20080206a-ports-lcg54pre2, pe20080205c-ports-lcg54pre2-412, pe20080205c-ports-lcg54pre2, pe20080205b-ports-lcg54pre2-412, pe20080205b-ports-lcg54pre2, pe20080205a-ports-lcg54pre2-412, pe20080205a-ports-lcg54pre2, CMSSW_1_8_0_pre8, pe20080204a-ports-lcg54pre2-412, pe20080204a-ports-lcg54pre2, dl080202, pe20080127a-ports-lcg54pre2-412, pe20080127a-ports-lcg54pre2, pe20080126-for180p8, pe20080125a-ports-lcg54pre2-412, pe20080125a-ports-lcg54pre2, pe20080125a-ports-lcg54-412, pe20080125a-ports-lcg54, pe20080123a-ports-412, pe20080123a-ports, CMSSW_1_8_0_pre7, pe20080122a-for180p7, dl080120, pe20080120a-ports-412, pe20080120a-ports, pe20080120a-for180p7, pe20080119a-ports-412, pe20080119a-ports, pe20080118g-ports-412, pe20080118g-ports, pe20080118f-ports-412, pe20080118f-ports, nr_pe20080118e-ports-onl, pe20080118e-ports-412, pe20080118e-ports, pe20080118d-ports-412, pe20080118d-ports, pe20080118c-ports, pe20080118b-ports, pe20080118a-ports, pe20080117b-for180p7, pe20080117-for180p7, dl080115, pe20080111b-ports, CMSSW_1_8_0_pre6, pe20080111a-ports, pe20080110b-ports, pe20080110a-ports, pe20080109a-ports, NR080108_geant491-dbg-global, pe20080108c-ports, ge20080108-wt, pe20080108b-ports, pe20080108a-ports, pe20080105a-ports, pe20080104a-ports, pe20080103a-ports-gcc422, pe20080103a-ports, pe20070103a-ports, pe20080101a-ports, sm20080101a-newscram, pe20071128b-ports, pe20071128a-ports, pe20071127b-ports, pe20071127-ports, pe20071226c-for180p6, pe20071226b-for180p6, pe20071226a-for180p6, ge20071224, ge20071223, ge20071221, pe20071220b-for180p6, ge20071220, pe20071220-for180p6, ge20071217, CMSSW_1_8_0_pre5, pe20071216-for180p5, ge20071216, CMSSW_1_8_0_pre4-vg330, ge20071213, ge20071212-perfreport, ge20071212, ge20071211, ge20071210a, ge20071210, pe20071207-for180p4g491c3, NR071206_geant491cand3-global, ge20071207, pe20071206-for180test1, CMSSW_1_8_0_pre4-412, CMSSW_1_8_0_pre4, pe20071205b-for180p4-412, pe20071205b-for180p4, pe20071205-for180p4, ge20071205, CMSSW_1_8_0_pre3a-412, ge20071203, pe20071202-for180p3a-gcc412, CMSSW_1_8_0_pre3a, pe20071201b-for180p3a, pe20071201-for180p3a, V00-06-08, ge20071128, pe20071130-for180p3, pe20071129-for180p3, ge20071127a-leopard, ge20071127-leopard, pe20071127a-ports-412, ge20071126-new-bootstrap, CMSSW_1_8_0_pre2, CMSSW_1_8_0_pre0-amd64, CMSSW_1_8_0_pre0, pe20071123e-ports-412, pe20071123d-ports-412, pe20071123c-ports-422, pe20071123c-ports-412, pe20071123c-ports, pe20071123b-ports-422, pe20071123b-ports-412, pe20071123b-ports, pe20071123a-ports-422, pe20071123a-ports-412, pe20071123a-ports, ge20071122-new-bootstrap, pe20071121a-ports-422, pe20071121a-ports-412, pe20071121a-ports, pe20071112c-ports-422, pe20071112c-ports-412, pe20071112c-ports, pe20071112b-ports-412, pe20071112b-ports, pe20071112a-ports, pe20071105c-ports, pe20071105b-ports
Branch point for:	conddb-branch
Log Message:	Patch to backport genreflex.py and gendict.py from ROOT 5.17.04. This is necessary in order to use the more recent version of gccxml (e.g. 0.7.0_20070615), which itself is necessary for gcc4.x (x>0)