Print out line numbers

But disable the printing by default since it messes up
the generated file. And fix a couple of typos

diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index 673d0a0ab5312fc2ca2835ce2c90ccf289fc0352..5237a98842b09a1cbe0236953e6c5f27f8b84345 100644 (file)
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -136,7 +136,11 @@ class DocBlock(object):
             for tag in tags:
                 lines.append(tag.to_gtk_doc_tag())
 
-        comment = '/**\n'
+        comment = ''
+        #comment += '# %d \"%s\"\n' % (
+        #    self.position.line,
+        #    self.position.filename)
+        comment += '/**\n'
         for line in lines:
             line = line.rstrip()
             if line:
@@ -323,7 +327,7 @@ class DocTag(object):
                                       n_params=1)
             else:
                 message.warn('invalid annotation option: %s' % (option, ),
-                             positions=self.position)
+                             self.position)
 
 
 class DocOptions(object):
@@ -540,7 +544,7 @@ class AnnotationParser(object):
                     tag_name = tag_name.lower()
                     tag = DocTag(block, tag_name)
                     tag.value = line[first_colonspace_index+2:]
-                    tag.filename = block.position.offset(lineno)
+                    tag.position = block.position.offset(lineno)
                     block.tags[tag_name] = tag
                 else:
                     comment_lines.append(line)