C++: Slightly more logical layout.

Author: geoffw0

cpp/ql/src/Security/CWE/CWE-611/Xerces.qll

@@ -56,49 +56,6 @@ class XercesDOMParserClass extends Class {
   XercesDOMParserClass() { this.hasName("XercesDOMParser") }
 }
 
-/**
- * The `DOMLSParser` class.
- */
-class DomLSParserClass extends Class {
-  DomLSParserClass() { this.hasName("DOMLSParser") }
-}
-
-/**
- * The `SAXParser` class.
- */
-class SaxParserClass extends Class {
-  SaxParserClass() { this.hasName("SAXParser") }
-}
-
-/**
- * The `SAX2XMLReader` class.
- */
-class Sax2XmlReader extends Class {
-  Sax2XmlReader() { this.hasName("SAX2XMLReader") }
-}
-
-/**
- * The `createLSParser` function that returns a newly created `DOMLSParser`
- * object.
- */
-class CreateLSParser extends Function {
-  CreateLSParser() {
-    this.hasName("createLSParser") and
-    this.getUnspecifiedType().(PointerType).getBaseType() instanceof DomLSParserClass // returns a `DOMLSParser *`.
-  }
-}
-
-/**
- * The `createXMLReader` function that returns a newly created `SAX2XMLReader`
- * object.
- */
-class CreateXmlReader extends Function {
-  CreateXmlReader() {
-    this.hasName("createXMLReader") and
-    this.getUnspecifiedType().(PointerType).getBaseType() instanceof Sax2XmlReader // returns a `SAX2XMLReader *`.
-  }
-}
-
 /**
  * The `XercesDOMParser` interface for the Xerces XML library.
  */
@@ -127,6 +84,24 @@ class XercesDomParserLibrary extends XmlLibrary {
   }
 }
 
+/**
+ * The `DOMLSParser` class.
+ */
+class DomLSParserClass extends Class {
+  DomLSParserClass() { this.hasName("DOMLSParser") }
+}
+
+/**
+ * The `createLSParser` function that returns a newly created `DOMLSParser`
+ * object.
+ */
+class CreateLSParser extends Function {
+  CreateLSParser() {
+    this.hasName("createLSParser") and
+    this.getUnspecifiedType().(PointerType).getBaseType() instanceof DomLSParserClass // returns a `DOMLSParser *`.
+  }
+}
+
 /**
  * The createLSParser interface for the Xerces XML library.
  */
@@ -153,6 +128,20 @@ class CreateLSParserLibrary extends XmlLibrary {
   }
 }
 
+/**
+ * The `SAXParser` class.
+ */
+class SaxParserClass extends Class {
+  SaxParserClass() { this.hasName("SAXParser") }
+}
+
+/**
+ * The `SAX2XMLReader` class.
+ */
+class Sax2XmlReader extends Class {
+  Sax2XmlReader() { this.hasName("SAX2XMLReader") }
+}
+
 /**
  * The SAXParser interface for the Xerces XML library.
  */
@@ -181,6 +170,17 @@ class SaxParserLibrary extends XmlLibrary {
   }
 }
 
+/**
+ * The `createXMLReader` function that returns a newly created `SAX2XMLReader`
+ * object.
+ */
+class CreateXmlReader extends Function {
+  CreateXmlReader() {
+    this.hasName("createXMLReader") and
+    this.getUnspecifiedType().(PointerType).getBaseType() instanceof Sax2XmlReader // returns a `SAX2XMLReader *`.
+  }
+}
+
 /**
  * The SAX2XMLReader interface for the Xerces XML library.
  */