95 |
self.list.append(element) |
self.list.append(element) |
96 |
self.list.extend(self.extras) |
self.list.extend(self.extras) |
97 |
|
|
98 |
def add_contained_element(self, super, element): |
def add_contained_element(self, super, elements): |
99 |
""" |
""" |
100 |
Add a subelement. |
Add a subelement. |
101 |
""" |
""" |
102 |
s = element[0] |
s = elements[0] |
103 |
(w,s) = match_remove("^\s*(\w+)\s*", s) |
(w,s) = match_remove("^\s*(\w+)\s*", s) |
104 |
key = w.group(1) |
key = w.group(1) |
105 |
element = self.factor.create_new(key, None, super.name + " " + s, element[1:]) |
|
106 |
|
# XXX this need clariying sometime, why every element don't have 'var'? |
107 |
|
if super.var != None: |
108 |
|
element = self.factor.create_new(key, None, super.var + " " + s, elements[1:]) |
109 |
|
else: |
110 |
|
element = self.factor.create_new(key, None, super.name + " " + s, elements[1:]) |
111 |
|
|
112 |
if isinstance(element, navidoc.link.Link): |
if isinstance(element, navidoc.link.Link): |
113 |
|
# mpclass may have different var and name, links should be base on name :/ |
114 |
|
if super.var != super.name: |
115 |
|
element = self.factor.create_new(key, None, super.name + " " + s, elements[1:]) |
116 |
super.link = element |
super.link = element |
117 |
self.extras.insert(0, element) |
self.extras.insert(0, element) |
118 |
else: self.extras.append(element) |
else: self.extras.append(element) |