summaryrefslogtreecommitdiff
path: root/giscanner/annotationmain.py
diff options
context:
space:
mode:
Diffstat (limited to 'giscanner/annotationmain.py')
-rw-r--r--giscanner/annotationmain.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py
index 4df6e831..618cf47f 100644
--- a/giscanner/annotationmain.py
+++ b/giscanner/annotationmain.py
@@ -21,11 +21,12 @@
import optparse
from giscanner import message
-from giscanner.annotationparser import AnnotationParser
+from giscanner.annotationparser import GtkDocCommentBlockParser, GtkDocCommentBlockWriter
from giscanner.scannermain import (get_preprocessor_option_group,
create_source_scanner,
process_packages)
+
def annotation_main(args):
parser = optparse.OptionParser('%prog [options] sources')
@@ -57,14 +58,15 @@ def annotation_main(args):
ss = create_source_scanner(options, args)
if options.extract:
- ap = AnnotationParser()
- blocks = ap.parse(ss.get_comments())
+ parser = GtkDocCommentBlockParser()
+ writer = GtkDocCommentBlockWriter(indent=False)
+ blocks = parser.parse_comment_blocks(ss.get_comments())
print '/' + ('*' * 60) + '/'
print '/* THIS FILE IS GENERATED DO NOT EDIT */'
print '/' + ('*' * 60) + '/'
print
for block in sorted(blocks.values()):
- print block.to_gtk_doc()
+ print writer.write(block)
print
print
print '/' + ('*' * 60) + '/'