Style fixes

Signed-off-by: Aditya Agrawal <[email protected]>

format_schema.py

@@ -6,23 +6,19 @@
 for line in lines:
     # Remove .sdf extension
     snake_case = line.strip().split('.')[0]
-
     # Convert from snake_case to CamelCase
     camel_case = ''.join([word.capitalize() for word in snake_case.split('_')])
 
-    addHeader = """
-    /// \\brief Get the schema file name accessor
-    public: static inline std::string_view SchemaFile();
-    """
+    addHeader = """\n    /// \\brief Get the schema file name accessor
+    public: static inline std::string_view SchemaFile();\n"""
 
     addImpl = f"""
 /////////////////////////////////////////////////
-inline std::string_view {camel_case}::SchemaFile() 
+inline std::string_view {camel_case}::SchemaFile()
 {{
     static const char kSchemaFile[] = "{line}";
     return kSchemaFile;
 }}\n\n"""
-
     # Debug print statements
     # print(addHeader)
     # print(addImpl)
@@ -31,31 +27,31 @@
 
     print(line)
 
-    # # Edit './include/sdf/{camel_case}.hh'
-    # # Find the line with 'class SDFFORMAT_VISIBLE {camel_case}`
-    # try:
-    #     f = open('./include/sdf/' + camel_case + '.hh', 'r')
-    #     read_lines = f.readlines()
-    #     f.close()
-    #     line_number = 0
-    #     for i, line_raw in enumerate(read_lines):
-    #         if line_raw == "  class SDFORMAT_VISIBLE " + camel_case + '\n':
-    #             line_number = i+3 # After the class line there is `\n{\n` and then the constructor
-    #             break
-    #     if line_number == 0:
-    #         print("Error: Could not find class declaration in " + camel_case + ".hh")
-    #         exit(1)
-    #     try:
-    #         with open('./include/sdf/' + camel_case + '.hh', 'w') as file:
-    #             for i, line_raw in enumerate(read_lines):
-    #                 file.write(line_raw)
-    #                 if i == line_number:
-    #                     file.write(addHeader)
-    #     except:
-    #         print("Unexpected error while writing to: " + camel_case + ".hh.")
-    # except:
-    #     print("Error while writing to: " + camel_case + ".hh." + " Check if file exists.")
-    
+    # Edit './include/sdf/{camel_case}.hh'
+    # Find the line with 'class SDFFORMAT_VISIBLE {camel_case}`
+    try:
+        f = open('./include/sdf/' + camel_case + '.hh', 'r')
+        read_lines = f.readlines()
+        f.close()
+        line_number = 0
+        for i, line_raw in enumerate(read_lines):
+            if line_raw == "  class SDFORMAT_VISIBLE " + camel_case + '\n':
+                line_number = i+3 # After the class line there is `\n{\n` and then the constructor
+                break
+        if line_number == 0:
+            print("Error: Could not find class declaration in " + camel_case + ".hh")
+            exit(1)
+        try:
+            with open('./include/sdf/' + camel_case + '.hh', 'w') as file:
+                for i, line_raw in enumerate(read_lines):
+                    file.write(line_raw)
+                    if i == line_number:
+                        file.write(addHeader)
+        except:
+            print("Unexpected error while writing to: " + camel_case + ".hh.")
+    except:
+        print("Error while writing to: " + camel_case + ".hh." + " Check if file exists.")
+
     # Replace all instances of `line` with `std::string(this->SchemaFile())`
     if (os.path.exists('./src/' + camel_case + '.cc')):
         try:
@@ -72,12 +68,12 @@
         except:
             print("Unexpected error while reading from: " + camel_case + ".cc.")
 
-    # # Edit './src/{camel_case}.cc' if it exists
-    # # Add implementation to end of document
-    # if os.path.exists('./src/' + camel_case + '.cc'):
-    #     with open('./src/' + camel_case + '.cc', 'a') as file:
-    #         file.write(addImpl)
-    # else:
-    #     print("Error: Could not find " + camel_case + ".cc")
+    # Edit './src/{camel_case}.cc' if it exists
+    # Add implementation to end of document
+    if os.path.exists('./src/' + camel_case + '.cc'):
+        with open('./src/' + camel_case + '.cc', 'a') as file:
+            file.write(addImpl)
+    else:
+        print("Error: Could not find " + camel_case + ".cc")
 
     print("Changes written to source successfully")

include/sdf/Actor.hh

@@ -195,7 +195,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the actor based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/AirPressure.hh

@@ -38,7 +38,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the airPressure based on an element pointer.
     /// This is *not* the usual entry point. Typical usage of the SDF DOM is
     /// through the Root object.

include/sdf/AirSpeed.hh

@@ -38,7 +38,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the air speed based on an element pointer.
     /// This is *not* the usual entry point. Typical usage of the SDF DOM is
     /// through the Root object.

include/sdf/Altimeter.hh

@@ -37,7 +37,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the altimeter based on an element pointer. This is *not*
     /// the usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Atmosphere.hh

@@ -49,7 +49,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the atmosphere based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Camera.hh

@@ -64,7 +64,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Return true if both Camera objects contain the same values.
     /// \param[_in] _alt Camera value to compare.
     /// \returen True if 'this' == _alt.

include/sdf/Collision.hh

@@ -54,7 +54,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the collision based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Error.hh

@@ -183,6 +183,9 @@ namespace sdf
     /// \brief The joint axis mimic does not refer to a valid joint in the
     /// current scope.
     JOINT_AXIS_MIMIC_INVALID,
+
+    /// \brief Error at the XML level.
+    XML_ERROR,
   };
 
   class SDFORMAT_VISIBLE Error

include/sdf/ForceTorque.hh

@@ -66,7 +66,8 @@ namespace sdf
     /// \brief Default constructor
     public: ForceTorque();
 
-	public: static inline std::string_view SchemaFile();
+    /// \brief Get the schema file name accessor
+    public: static inline std::string_view SchemaFile();
 
     /// \brief Load the force torque sensor based on an element pointer. This is
     /// *not* the usual entry point. Typical usage of the SDF DOM is through the

include/sdf/Frame.hh

@@ -46,7 +46,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the frame based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Geometry.hh

@@ -96,7 +96,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the geometry based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Gui.hh

@@ -35,7 +35,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the gui based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Imu.hh

@@ -37,7 +37,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the IMU based on an element pointer. This is *not*
     /// the usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Joint.hh

@@ -89,7 +89,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the joint based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Lidar.hh

@@ -109,7 +109,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the lidar based on an element pointer. This is *not*
     /// the usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Light.hh

@@ -67,7 +67,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the light based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Link.hh

@@ -55,7 +55,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the link based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Magnetometer.hh

@@ -38,7 +38,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the magnetometer based on an element pointer. This is *not*
     /// the usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Material.hh

@@ -50,7 +50,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the material based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Model.hh

@@ -58,7 +58,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the model based on a element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/NavSat.hh

@@ -76,15 +76,16 @@ namespace sdf
   {
     /// \brief Default constructor
     public: NavSat();
+
+    /// \brief Get the schema file name accessor
+    public: static inline std::string_view SchemaFile();
+
     /// \brief Load the navsat based on an element pointer. This is *not*
     /// the usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.
     /// \param[in] _sdf The SDF Element pointer
     /// \return Errors, which is a vector of Error objects. Each Error includes
     /// an error code and message. An empty vector indicates no error.
-
-    public: static inline std::string_view SchemaFile();
-
     public: Errors Load(ElementPtr _sdf);
 
     /// \brief Get a pointer to the SDF element that was used during

include/sdf/Noise.hh

@@ -51,7 +51,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Return true if both Noise objects contain the same values.
     /// \param[_in] _noise Noise value to compare.
     /// \return True if 'this' == _noise.

include/sdf/ParticleEmitter.hh

@@ -64,7 +64,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the particle emitter based on an element pointer. This is
     /// *not* the usual entry point. Typical usage of the SDF DOM is through
     /// the Root object.

include/sdf/Physics.hh

@@ -40,7 +40,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the physics based on an element pointer. This is *not* the
     /// usual entry point. Typical usage of the SDF DOM is through the Root
     /// object.

include/sdf/Plugin.hh

@@ -49,7 +49,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Default destructor
     public: ~Plugin();
 

include/sdf/Projector.hh

@@ -47,7 +47,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Load the projector based on an element pointer. This is
     /// *not* the usual entry point. Typical usage of the SDF DOM is through
     /// the Root object.

include/sdf/Root.hh

@@ -61,7 +61,7 @@ namespace sdf
 
     /// \brief Get the schema file name accessor
     public: static inline std::string_view SchemaFile();
-    
+
     /// \brief Get the name of the world without loading the entire world
     /// Users shouldn't normally need to use this API.
     /// This doesn't load the world, it might return the world name even if the