297 meth_sig = _normalize(' ', meth_sig) |
297 meth_sig = _normalize(' ', meth_sig) |
298 meth_return = m.group("MethodReturn") |
298 meth_return = m.group("MethodReturn") |
299 meth_return = meth_return and meth_return.replace('\\\n', '') or '' |
299 meth_return = meth_return and meth_return.replace('\\\n', '') or '' |
300 meth_return = _commentsub('', meth_return) |
300 meth_return = _commentsub('', meth_return) |
301 meth_return = _normalize(' ', meth_return) |
301 meth_return = _normalize(' ', meth_return) |
302 lineno = lineno + src.count('\n', last_lineno_pos, start) |
302 lineno += src.count('\n', last_lineno_pos, start) |
303 last_lineno_pos = start |
303 last_lineno_pos = start |
304 # close all interfaces/modules indented at least as much |
304 # close all interfaces/modules indented at least as much |
305 while classstack and classstack[-1][1] >= thisindent: |
305 while classstack and classstack[-1][1] >= thisindent: |
306 del classstack[-1] |
306 del classstack[-1] |
307 if classstack: |
307 if classstack: |
331 |
331 |
332 elif m.start("Message") >= 0: |
332 elif m.start("Message") >= 0: |
333 # we found a message definition |
333 # we found a message definition |
334 thisindent = indent |
334 thisindent = indent |
335 indent += 1 |
335 indent += 1 |
336 lineno = lineno + src.count('\n', last_lineno_pos, start) |
336 lineno += src.count('\n', last_lineno_pos, start) |
337 last_lineno_pos = start |
337 last_lineno_pos = start |
338 message_name = m.group("MessageName") |
338 message_name = m.group("MessageName") |
339 # close all messages/services indented at least as much |
339 # close all messages/services indented at least as much |
340 while classstack and classstack[-1][1] >= thisindent: |
340 while classstack and classstack[-1][1] >= thisindent: |
341 del classstack[-1] |
341 del classstack[-1] |
355 thisindent = indent |
355 thisindent = indent |
356 indent += 1 |
356 indent += 1 |
357 # close all messages/services indented at least as much |
357 # close all messages/services indented at least as much |
358 while classstack and classstack[-1][1] >= thisindent: |
358 while classstack and classstack[-1][1] >= thisindent: |
359 del classstack[-1] |
359 del classstack[-1] |
360 lineno = lineno + src.count('\n', last_lineno_pos, start) |
360 lineno += src.count('\n', last_lineno_pos, start) |
361 last_lineno_pos = start |
361 last_lineno_pos = start |
362 enum_name = m.group("EnumName") |
362 enum_name = m.group("EnumName") |
363 # remember this Enum |
363 # remember this Enum |
364 cur_class = Enum(module, enum_name, file, lineno) |
364 cur_class = Enum(module, enum_name, file, lineno) |
365 endline = calculateEndline(lineno, srcLines) |
365 endline = calculateEndline(lineno, srcLines) |
376 thisindent = indent |
376 thisindent = indent |
377 indent += 1 |
377 indent += 1 |
378 # close all messages/services indented at least as much |
378 # close all messages/services indented at least as much |
379 while classstack and classstack[-1][1] >= thisindent: |
379 while classstack and classstack[-1][1] >= thisindent: |
380 del classstack[-1] |
380 del classstack[-1] |
381 lineno = lineno + src.count('\n', last_lineno_pos, start) |
381 lineno += src.count('\n', last_lineno_pos, start) |
382 last_lineno_pos = start |
382 last_lineno_pos = start |
383 service_name = m.group("ServiceName") |
383 service_name = m.group("ServiceName") |
384 # remember this Service |
384 # remember this Service |
385 cur_class = Service(module, service_name, file, lineno) |
385 cur_class = Service(module, service_name, file, lineno) |
386 endline = calculateEndline(lineno, srcLines) |
386 endline = calculateEndline(lineno, srcLines) |