Revert renaming class, enum and field names

This commit is contained in:
a2x
2024-03-29 01:51:20 +10:00
parent bf890592c2
commit 87fccce283
23 changed files with 285261 additions and 58 deletions

View File

@@ -87,7 +87,7 @@ fn read_class_binding(
s,
match env::consts::OS {
"linux" => "so",
"windows" => ".dll",
"windows" => "dll",
_ => panic!("unsupported os"),
}
)

View File

@@ -1,8 +1,6 @@
use std::env;
use std::fmt::Write;
use heck::{AsPascalCase, AsShoutySnakeCase, AsSnakeCase};
use super::{Button, CodeGen, Results};
use crate::error::Result;
@@ -18,8 +16,7 @@ impl CodeGen for Vec<Button> {
writeln!(
fmt,
"public const nint {} = {:#X};",
AsPascalCase(&button.name),
button.value
button.name, button.value
)?;
}
@@ -44,8 +41,7 @@ impl CodeGen for Vec<Button> {
writeln!(
fmt,
"constexpr std::ptrdiff_t {} = {:#X};",
AsSnakeCase(&button.name),
button.value
button.name, button.value
)?;
}
@@ -59,6 +55,8 @@ impl CodeGen for Vec<Button> {
fn to_rs(&self, results: &Results, indent_size: usize) -> Result<String> {
self.write_content(results, indent_size, |fmt| {
writeln!(fmt, "#![allow(non_upper_case_globals, unused)]\n")?;
fmt.block("pub mod cs2_dumper", |fmt| {
writeln!(fmt, "// Module: {}", get_module_name())?;
@@ -67,8 +65,7 @@ impl CodeGen for Vec<Button> {
writeln!(
fmt,
"pub const {}: usize = {:#X};",
AsShoutySnakeCase(&button.name),
button.value
button.name, button.value
)?;
}

View File

@@ -1,6 +1,6 @@
use std::fmt::Write;
use heck::{AsPascalCase, AsShoutySnakeCase, AsSnakeCase};
use heck::{AsPascalCase, AsSnakeCase};
use super::{format_module_name, CodeGen, InterfaceMap, Results};
@@ -23,8 +23,7 @@ impl CodeGen for InterfaceMap {
writeln!(
fmt,
"public const nint {} = {:#X};",
AsPascalCase(&iface.name),
iface.value
iface.name, iface.value
)?;
}
@@ -57,8 +56,7 @@ impl CodeGen for InterfaceMap {
writeln!(
fmt,
"constexpr std::ptrdiff_t {} = {:#X};",
AsSnakeCase(&iface.name),
iface.value
iface.name, iface.value
)?;
}
@@ -77,6 +75,8 @@ impl CodeGen for InterfaceMap {
fn to_rs(&self, results: &Results, indent_size: usize) -> Result<String> {
self.write_content(results, indent_size, |fmt| {
writeln!(fmt, "#![allow(non_upper_case_globals, unused)]\n")?;
fmt.block("pub mod cs2_dumper", |fmt| {
fmt.block("pub mod interfaces", |fmt| {
for (module_name, ifaces) in self {
@@ -89,8 +89,7 @@ impl CodeGen for InterfaceMap {
writeln!(
fmt,
"pub const {}: usize = {:#X};",
AsShoutySnakeCase(&iface.name),
iface.value
iface.name, iface.value
)?;
}

View File

@@ -220,3 +220,8 @@ pub fn format_module_name(module_name: &String) -> String {
module_name.strip_suffix(extension).unwrap().to_string()
}
#[inline]
pub fn sanitize_name(name: &str) -> String {
name.replace(|c: char| !c.is_alphanumeric(), "_")
}

View File

@@ -1,6 +1,6 @@
use std::fmt::Write;
use heck::{AsPascalCase, AsShoutySnakeCase, AsSnakeCase};
use heck::{AsPascalCase, AsSnakeCase};
use super::{format_module_name, CodeGen, OffsetMap, Results};
@@ -23,8 +23,7 @@ impl CodeGen for OffsetMap {
writeln!(
fmt,
"public const nint {} = {:#X};",
AsPascalCase(&offset.name),
offset.value
offset.name, offset.value
)?;
}
@@ -57,8 +56,7 @@ impl CodeGen for OffsetMap {
writeln!(
fmt,
"constexpr std::ptrdiff_t {} = {:#X};",
AsSnakeCase(&offset.name),
offset.value
offset.name, offset.value
)?;
}
@@ -77,6 +75,8 @@ impl CodeGen for OffsetMap {
fn to_rs(&self, results: &Results, indent_size: usize) -> Result<String> {
self.write_content(results, indent_size, |fmt| {
writeln!(fmt, "#![allow(non_upper_case_globals, unused)]\n")?;
fmt.block("pub mod cs2_dumper", |fmt| {
fmt.block("pub mod offsets", |fmt| {
for (module_name, offsets) in self {
@@ -89,8 +89,7 @@ impl CodeGen for OffsetMap {
writeln!(
fmt,
"pub const {}: usize = {:#X};",
AsShoutySnakeCase(&offset.name),
offset.value
offset.name, offset.value
)?;
}

View File

@@ -1,8 +1,8 @@
use std::fmt::{self, Write};
use heck::{AsPascalCase, AsShoutySnakeCase, AsSnakeCase};
use heck::{AsPascalCase, AsSnakeCase};
use super::{format_module_name, CodeGen, Formatter, Results, SchemaMap};
use super::{format_module_name, sanitize_name, CodeGen, Formatter, Results, SchemaMap};
use crate::analysis::ClassMetadata;
use crate::error::Result;
@@ -35,17 +35,13 @@ impl CodeGen for SchemaMap {
writeln!(fmt, "// Members count: {}", enum_.size)?;
fmt.block(
&format!("public enum {} : {}", AsPascalCase(&enum_.name), ty),
&format!("public enum {} : {}", sanitize_name(&enum_.name), ty),
|fmt| {
let members = enum_
.members
.iter()
.map(|member| {
format!(
"{} = {}",
AsPascalCase(&member.name),
member.value
)
format!("{} = {}", member.name, member.value)
})
.collect::<Vec<_>>()
.join(",\n");
@@ -59,7 +55,7 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| format!("{}", AsPascalCase(&parent.name)))
.map(|parent| format!("{}", sanitize_name(&parent.name)))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
@@ -68,15 +64,13 @@ impl CodeGen for SchemaMap {
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!("public static class {}", AsPascalCase(&class.name)),
&format!("public static class {}", sanitize_name(&class.name)),
|fmt| {
for field in &class.fields {
writeln!(
fmt,
"public const nint {} = {:#X}; // {}",
AsPascalCase(&field.name),
field.offset,
field.ty
field.name, field.offset, field.ty
)?;
}
@@ -127,7 +121,7 @@ impl CodeGen for SchemaMap {
fmt.block(
&format!(
"enum class {} : {}",
AsSnakeCase(&enum_.name),
sanitize_name(&enum_.name),
ty
),
|fmt| {
@@ -135,11 +129,7 @@ impl CodeGen for SchemaMap {
.members
.iter()
.map(|member| {
format!(
"{} = {}",
AsSnakeCase(&member.name),
member.value
)
format!("{} = {}", member.name, member.value)
})
.collect::<Vec<_>>()
.join(",\n");
@@ -153,7 +143,7 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| format!("{}", AsSnakeCase(&parent.name)))
.map(|parent| format!("{}", sanitize_name(&parent.name)))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
@@ -162,15 +152,13 @@ impl CodeGen for SchemaMap {
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!("namespace {}", AsSnakeCase(&class.name)),
&format!("namespace {}", sanitize_name(&class.name)),
|fmt| {
for field in &class.fields {
writeln!(
fmt,
"constexpr std::ptrdiff_t {} = {:#X}; // {}",
AsSnakeCase(&field.name),
field.offset,
field.ty
field.name, field.offset, field.ty
)?;
}
@@ -194,6 +182,8 @@ impl CodeGen for SchemaMap {
fn to_rs(&self, results: &Results, indent_size: usize) -> Result<String> {
self.write_content(results, indent_size, |fmt| {
writeln!(fmt, "#![allow(non_upper_case_globals, unused)]\n")?;
fmt.block("pub mod cs2_dumper", |fmt| {
fmt.block("pub mod schemas", |fmt| {
for (module_name, (classes, enums)) in self {
@@ -220,7 +210,7 @@ impl CodeGen for SchemaMap {
&format!(
"#[repr({})]\npub enum {}",
ty,
AsPascalCase(&enum_.name),
sanitize_name(&enum_.name),
),
|fmt| {
// TODO: Handle the case where multiple members share
@@ -229,11 +219,7 @@ impl CodeGen for SchemaMap {
.members
.iter()
.map(|member| {
format!(
"{} = {}",
AsPascalCase(&member.name),
member.value
)
format!("{} = {}", member.name, member.value)
})
.collect::<Vec<_>>()
.join(",\n");
@@ -247,7 +233,7 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| format!("{}", AsSnakeCase(&parent.name)))
.map(|parent| format!("{}", sanitize_name(&parent.name)))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
@@ -256,15 +242,13 @@ impl CodeGen for SchemaMap {
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!("pub mod {}", AsSnakeCase(&class.name)),
&format!("pub mod {}", sanitize_name(&class.name)),
|fmt| {
for field in &class.fields {
writeln!(
fmt,
"pub const {}: usize = {:#X}; // {}",
AsShoutySnakeCase(&field.name),
field.offset,
field.ty
field.name, field.offset, field.ty
)?;
}