diff options
| author | Colin Walters <walters@verbum.org> | 2010-06-24 16:39:35 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-06-25 09:19:14 -0400 |
| commit | 0a674061eb4b7307f62c330bb3ebec5ad36ab1c6 (patch) | |
| tree | 6ff9e298011052ef2ecb08e55b6440b99566400d /tests/scanner/foo-1.0-expected.gir | |
| parent | 11cfe386c37ced44a8e3efb5556bde3a43a11171 (diff) | |
| download | gobject-introspection-0a674061eb4b7307f62c330bb3ebec5ad36ab1c6.tar.gz | |
Clean up annotation parsing, don't try to parse invalid annotations
The old parser tried to parse:
@foo: some text here (other text)
Reject this. We strictly require another colon at the end to parse
the text in between as (option) (other option).
Futher ensure we only attempt to do option parse if we find something
that matches the strict regexp ([A-Za-z]+). This could be tightened
further.
TODO: Have a warning for something that looks like an annotation,
but isn't.
https://bugzilla.gnome.org/show_bug.cgi?id=622659
Diffstat (limited to 'tests/scanner/foo-1.0-expected.gir')
| -rw-r--r-- | tests/scanner/foo-1.0-expected.gir | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 68896c11..f7ca794b 100644 --- a/tests/scanner/foo-1.0-expected.gir +++ b/tests/scanner/foo-1.0-expected.gir @@ -334,10 +334,10 @@ uses a C sugar return type."> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="offset" transfer-ownership="none"> + <parameter name="offset" transfer-ownership="none" doc="offset"> <type name="int" c:type="int"/> </parameter> - <parameter name="length" transfer-ownership="none"> + <parameter name="length" transfer-ownership="none" doc="length"> <type name="int" c:type="int"/> </parameter> </parameters> @@ -443,10 +443,10 @@ uses a C sugar return type."> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="offset" transfer-ownership="none"> + <parameter name="offset" transfer-ownership="none" doc="offset"> <type name="int" c:type="int"/> </parameter> - <parameter name="length" transfer-ownership="none"> + <parameter name="length" transfer-ownership="none" doc="length"> <type name="int" c:type="int"/> </parameter> </parameters> @@ -515,10 +515,10 @@ uses a C sugar return type."> <parameter name="object" transfer-ownership="none"> <type name="Object" c:type="FooObject*"/> </parameter> - <parameter name="offset" transfer-ownership="none"> + <parameter name="offset" transfer-ownership="none" doc="offset"> <type name="int" c:type="int"/> </parameter> - <parameter name="length" transfer-ownership="none"> + <parameter name="length" transfer-ownership="none" doc="length"> <type name="int" c:type="int"/> </parameter> </parameters> @@ -570,7 +570,9 @@ uses a C sugar return type."> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="r2" transfer-ownership="none"> + <parameter name="r2" + transfer-ownership="none" + doc="source rectangle"> <type name="Rectangle" c:type="FooRectangle*"/> </parameter> </parameters> @@ -826,7 +828,7 @@ exposed to language bindings." <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="fs" transfer-ownership="none"> + <parameter name="fs" transfer-ownership="none" doc="a #FooSkippable"> <type name="Skippable" c:type="FooSkippable"/> </parameter> </parameters> |