Merge pull request #168 from tom-leys/master

ClassDB - Restore missing _ from class names.

Author: karroffel

bindings_generator/src/api.rs

@@ -1,14 +1,16 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use serde_json;
 
 pub struct Api {
     pub classes: Vec<GodotClass>,
+    pub api_underscore: HashSet<String>,
 }
 
 impl Api {
     pub fn new() -> Self {
         let mut api = Api {
             classes: serde_json::from_slice(get_api_json()).expect("Failed to parse the API description"),
+            api_underscore: Default::default(),
         };
 
         api.strip_leading_underscores();
@@ -42,6 +44,7 @@ impl Api {
         for class in &mut self.classes {
             if class.name.starts_with('_') {
                 class.name = class.name[1..].to_string();
+                self.api_underscore.insert(class.name.clone());
             }
             for method in &mut class.methods {
                 if method.return_type.starts_with('_') {

bindings_generator/src/lib.rs

@@ -167,7 +167,8 @@ fn generate_class_bindings(
 
     // methods and method table
     {
-        generate_method_table(output_method_table, class)?;
+        let has_underscore = api.api_underscore.contains(&class.name);
+        generate_method_table(output_method_table, class, has_underscore)?;
 
         for method in &class.methods {
             generate_method_impl(output_method_table, class, method)?;

bindings_generator/src/methods.rs

@@ -11,7 +11,7 @@ fn skip_method(name: &str) -> bool {
     name == "free" || name == "reference" || name == "unreference"
 }
 
-pub fn generate_method_table(output: &mut impl Write, class: &GodotClass) -> GeneratorResult {
+pub fn generate_method_table(output: &mut impl Write, class: &GodotClass, has_underscore:bool) -> GeneratorResult {
     writeln!(output, r#"
 #[doc(hidden)]
 #[allow(non_camel_case_types)]
@@ -46,6 +46,11 @@ impl {name}MethodTable {{
             method.get_name()
         )?;
     }
+    let lookup_name : String = if has_underscore {
+        format!("_{class}", class= class.name)
+    } else {
+        class.name.clone()
+    };
     writeln!(output, r#"
         }};
 
@@ -71,9 +76,10 @@ impl {name}MethodTable {{
     #[inline(never)]
     fn init(table: &mut Self, gd_api: &GodotApi) {{
         unsafe {{
-            let class_name = b"{name}\0".as_ptr() as *const c_char;
+            let class_name = b"{lookup_name}\0".as_ptr() as *const c_char;
             table.class_constructor = (gd_api.godot_get_class_constructor)(class_name);"#,
-            name = class.name
+            name = class.name,
+            lookup_name = lookup_name,
         )?;
     for method in &class.methods {
         let method_name = method.get_name();