giscanner: improve state tracking

4 files changed, 10 insertions, 67 deletions

diff --git a/tests/scanner/annotationparser/gi/identifier_section.xml b/tests/scanner/annotationparser/gi/identifier_section.xml
index 35ffec65..b75e2dd2 100644
--- a/tests/scanner/annotationparser/gi/identifier_section.xml
+++ b/tests/scanner/annotationparser/gi/identifier_section.xml
@@ -111,27 +111,9 @@
       <description>The application class handles ...</description>
     </docblock>
     <messages>
-      <message>4: Warning: Test: '@short_description' parameter unexpected at this location:
+      <message>4: Warning: Test: "@short_description" parameter unexpected at this location:
  * @short_description: the application class
     ^</message>
-      <message>5: Warning: Test: '@title' parameter unexpected at this location:
- * @title: Meep application
-    ^</message>
-      <message>6: Warning: Test: '@section_id' parameter unexpected at this location:
- * @section_id:
-    ^</message>
-      <message>7: Warning: Test: '@see_also' parameter unexpected at this location:
- * @see_also: #MeepSettings
-    ^</message>
-      <message>8: Warning: Test: '@stability' parameter unexpected at this location:
- * @stability: Stable
-    ^</message>
-      <message>9: Warning: Test: '@include' parameter unexpected at this location:
- * @include: meep/app.h
-    ^</message>
-      <message>10: Warning: Test: '@image' parameter unexpected at this location:
- * @image: application.png
-    ^</message>
     </messages>
   </parser>
 </test>
@@ -189,27 +171,9 @@
       <description>The application class handles ...</description>
     </docblock>
     <messages>
-      <message>5: Warning: Test: '@short_description' parameter unexpected at this location:
+      <message>5: Warning: Test: "@short_description" parameter unexpected at this location:
  * @short_description: the application class
     ^</message>
-      <message>6: Warning: Test: '@title' parameter unexpected at this location:
- * @title: Meep application
-    ^</message>
-      <message>7: Warning: Test: '@section_id' parameter unexpected at this location:
- * @section_id:
-    ^</message>
-      <message>8: Warning: Test: '@see_also' parameter unexpected at this location:
- * @see_also: #MeepSettings
-    ^</message>
-      <message>9: Warning: Test: '@stability' parameter unexpected at this location:
- * @stability: Stable
-    ^</message>
-      <message>10: Warning: Test: '@include' parameter unexpected at this location:
- * @include: meep/app.h
-    ^</message>
-      <message>11: Warning: Test: '@image' parameter unexpected at this location:
- * @image: application.png
-    ^</message>
     </messages>
   </parser>
 </test>
@@ -268,27 +232,9 @@
       <description>The application class handles ...</description>
     </docblock>
     <messages>
-      <message>6: Warning: Test: '@short_description' parameter unexpected at this location:
+      <message>6: Warning: Test: "@short_description" parameter unexpected at this location:
  * @short_description: the application class
     ^</message>
-      <message>7: Warning: Test: '@title' parameter unexpected at this location:
- * @title: Meep application
-    ^</message>
-      <message>8: Warning: Test: '@section_id' parameter unexpected at this location:
- * @section_id:
-    ^</message>
-      <message>9: Warning: Test: '@see_also' parameter unexpected at this location:
- * @see_also: #MeepSettings
-    ^</message>
-      <message>10: Warning: Test: '@stability' parameter unexpected at this location:
- * @stability: Stable
-    ^</message>
-      <message>11: Warning: Test: '@include' parameter unexpected at this location:
- * @include: meep/app.h
-    ^</message>
-      <message>12: Warning: Test: '@image' parameter unexpected at this location:
- * @image: application.png
-    ^</message>
     </messages>
   </parser>
 </test>
diff --git a/tests/scanner/annotationparser/gi/parameter.xml b/tests/scanner/annotationparser/gi/parameter.xml
index 5e3a3a1e..d6c4ab37 100644
--- a/tests/scanner/annotationparser/gi/parameter.xml
+++ b/tests/scanner/annotationparser/gi/parameter.xml
@@ -31,9 +31,12 @@
       </tags>
     </docblock>
     <messages>
-      <message>6: Warning: Test: '@param1' parameter unexpected at this location:
+      <message>6: Warning: Test: "@param1" parameter unexpected at this location:
  * @param1: first parameter
     ^</message>
+      <message>7: Warning: Test: "Returns:" tag unexpected at this location:
+ * Returns: something
+   ^</message>
     </messages>
   </parser>
 </test>
diff --git a/tests/scanner/annotationparser/gi/syntax.xml b/tests/scanner/annotationparser/gi/syntax.xml
index b8c85b50..6f63dff1 100644
--- a/tests/scanner/annotationparser/gi/syntax.xml
+++ b/tests/scanner/annotationparser/gi/syntax.xml
@@ -220,7 +220,7 @@ something */ code goes here
       <description>The application class handles ...</description>
     </docblock>
     <messages>
-      <message>4: Warning: Test: '@short_description' parameter unexpected at this location:
+      <message>4: Warning: Test: "@short_description" parameter unexpected at this location:
  * @short_description: the application class
     ^</message>
     </messages>
diff --git a/tests/scanner/annotationparser/gi/tag_returns.xml b/tests/scanner/annotationparser/gi/tag_returns.xml
index 96ee8049..ec6e2c45 100644
--- a/tests/scanner/annotationparser/gi/tag_returns.xml
+++ b/tests/scanner/annotationparser/gi/tag_returns.xml
@@ -50,19 +50,13 @@
           <description>first parameter</description>
         </parameter>
       </parameters>
-      <description>Tags should go after the comment block description</description>
       <tags>
         <tag>
           <name>returns</name>
-          <description>something</description>
+          <description>something  Tags should go after the comment block description</description>
         </tag>
       </tags>
     </docblock>
-    <messages>
-      <message>4: Warning: Test: 'Returns:' tag unexpected at this location:
- * Returns: something
-   ^</message>
-    </messages>
   </parser>
 </test>
 
@@ -157,7 +151,7 @@ parameter is encountered.</description>
       </tags>
     </docblock>
     <messages>
-      <message>8: Warning: Test: '@returns' parameter unexpected at this location:
+      <message>8: Warning: Test: "@returns" parameter unexpected at this location:
  * @returns: something else
     ^</message>
       <message>8: Warning: Test: encountered multiple 'Returns' parameters or tags for 'test_multiple_returns_tag_and_parameter'.</message>