From 32cc42dab380e7b4003fcd0c0a46fe4e11d6b954 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 24 Oct 2024 18:00:18 +0100 Subject: [PATCH] fix how regex inserts underscore in function names with '2d' and '3d' --- create_stub_pyray.py | 3 ++- pyray/__init__.py | 7 +++---- pyray/__init__.pyi | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/create_stub_pyray.py b/create_stub_pyray.py index 244270d..b49fe4f 100644 --- a/create_stub_pyray.py +++ b/create_stub_pyray.py @@ -14,6 +14,7 @@ from pathlib import Path from raylib import rl, ffi +from pyray import _underscore from inspect import ismethod, getmembers, isbuiltin import inflection, sys, json @@ -69,7 +70,7 @@ def ctype_to_python_type(t): reserved_words = ("in", "list", "tuple", "set", "dict", "from", "range", "min", "max", "any", "all", "len") for name, attr in getmembers(rl): - uname = inflection.underscore(name).replace('3_d', '_3d').replace('2_d', '_2d') + uname = _underscore(name) if isbuiltin(attr) or str(type(attr)) == "": json_object = known_functions.get(name, None) if json_object is None: diff --git a/pyray/__init__.py b/pyray/__init__.py index 4cb44ba..c85959f 100644 --- a/pyray/__init__.py +++ b/pyray/__init__.py @@ -29,9 +29,8 @@ def _underscore(word: str) -> str: - """ - from inflection - """ + word = re.sub('2D$', '_2d', word) + word = re.sub('3D$', '_3d', word) word = re.sub(r"([A-Z]+)([A-Z][a-z])", r'\1_\2', word) word = re.sub(r"([a-z\d])([A-Z])", r'\1_\2', word) word = word.replace("-", "_") @@ -136,7 +135,7 @@ def func(*args): for name, attr in getmembers(rl): # print(name, attr) - uname = _underscore(name).replace('3_d', '_3d').replace('2_d', '_2d') + uname = _underscore(name) if isbuiltin(attr) or str(type(attr)) == "" or str( type(attr)) == "": # print(attr.__call__) diff --git a/pyray/__init__.pyi b/pyray/__init__.pyi index 50541cf..af50b55 100644 --- a/pyray/__init__.pyi +++ b/pyray/__init__.pyi @@ -2120,16 +2120,16 @@ def vector2_clamp(v: Vector2,min_1: Vector2,max_2: Vector2,) -> Vector2: def vector2_clamp_value(v: Vector2,min_1: float,max_2: float,) -> Vector2: """""" ... -def vector_2distance(v1: Vector2,v2: Vector2,) -> float: +def vector2_distance(v1: Vector2,v2: Vector2,) -> float: """""" ... -def vector_2distance_sqr(v1: Vector2,v2: Vector2,) -> float: +def vector2_distance_sqr(v1: Vector2,v2: Vector2,) -> float: """""" ... -def vector_2divide(v1: Vector2,v2: Vector2,) -> Vector2: +def vector2_divide(v1: Vector2,v2: Vector2,) -> Vector2: """""" ... -def vector_2dot_product(v1: Vector2,v2: Vector2,) -> float: +def vector2_dot_product(v1: Vector2,v2: Vector2,) -> float: """""" ... def vector2_equals(p: Vector2,q: Vector2,) -> int: @@ -2219,16 +2219,16 @@ def vector3_cross_product(v1: Vector3,v2: Vector3,) -> Vector3: def vector3_cubic_hermite(v1: Vector3,tangent1: Vector3,v2: Vector3,tangent2: Vector3,amount: float,) -> Vector3: """""" ... -def vector_3distance(v1: Vector3,v2: Vector3,) -> float: +def vector3_distance(v1: Vector3,v2: Vector3,) -> float: """""" ... -def vector_3distance_sqr(v1: Vector3,v2: Vector3,) -> float: +def vector3_distance_sqr(v1: Vector3,v2: Vector3,) -> float: """""" ... -def vector_3divide(v1: Vector3,v2: Vector3,) -> Vector3: +def vector3_divide(v1: Vector3,v2: Vector3,) -> Vector3: """""" ... -def vector_3dot_product(v1: Vector3,v2: Vector3,) -> float: +def vector3_dot_product(v1: Vector3,v2: Vector3,) -> float: """""" ... def vector3_equals(p: Vector3,q: Vector3,) -> int: