Skip to content

Commit

Permalink
API cleanups, walker fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@warriorstar-orion
warriorstar-orion committed Sep 29, 2024
1 parent 4f9b8db commit fadad0d
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 104 deletions.
10 changes: 7 additions & 3 deletions avulto.pyi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class Path:

"""The final part of the path."""
stem: str
"""The parent path."""
parent: Path

def __init__(self, value):
"""Returns a new path."""
Expand Down Expand Up @@ -122,8 +124,10 @@ class DME:
This is slower than the default but provides more reflection
information.
"""
def paths_prefixed(self, prefix: Path | str) -> list[str]:
"""Returns a list of paths with the given `prefix`."""
def typesof(self, prefix: Path | str) -> list[str]:
"""Returns a list of type paths with the given `prefix`."""
def subtypesof(self, prefix: Path | str) -> list[str]:
"""Returns a list of type paths with the given `prefix`, excluding `prefix` itself."""
def typedecl(self, path: Path | str) -> TypeDecl:
"""Return the type declaration of the given `path`."""

Expand Down Expand Up @@ -201,4 +205,4 @@ class DMI:
Iterates over all icon states.
"""
def data_rgba8(self, rect:Rect) -> bytes:
"""Return the byte data of the spritesheet in 8-bit RGBA."""
"""Return the byte data of the spritesheet in 8-bit RGBA."""
56 changes: 38 additions & 18 deletions src/dme.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
extern crate dreammaker;

use itertools::Itertools;
use pyo3::{
exceptions::PyRuntimeError,
pyclass, pymethods,
Expand All @@ -24,6 +23,19 @@ pub struct Dme {
filepath: Py<PyAny>,
}

impl Dme {
fn collect_child_paths(&self, needle: &Path, strict: bool, out: &mut Vec<Path>) {
for ty in self.objtree.iter_types() {
if needle.internal_parent_of_string(&ty.path, strict) {
out.push(Path(ty.path.clone()));
}
}

out.sort();
out.dedup();
}
}

#[pymethods]
impl Dme {
#[staticmethod]
Expand Down Expand Up @@ -93,28 +105,36 @@ impl Dme {
}
}

fn paths_prefixed(&self, prefix: &Bound<PyAny>, py: Python<'_>) -> PyResult<PyObject> {
fn typesof(&self, prefix: &Bound<PyAny>, py: Python<'_>) -> PyResult<PyObject> {
let mut out: Vec<Path> = Vec::new();

if let Ok(path) = prefix.extract::<path::Path>() {
for ty in self.objtree.iter_types() {
if ty.path.starts_with(&path.0) {
out.push(Path(ty.path.clone()));
}
}
let prefix_path = if let Ok(path) = prefix.extract::<path::Path>() {
path
} else if let Ok(pystr) = prefix.downcast::<PyString>() {
for ty in self.objtree.iter_types() {
if ty.path.starts_with(&pystr.to_string()) {
out.push(Path(ty.path.clone()));
}
}
}
Path(pystr.to_string())
} else {
return Err(PyRuntimeError::new_err(format!("invalid path {}", prefix)));
};
self.collect_child_paths(&prefix_path, false, &mut out);

let mut x = out.into_iter().unique().collect::<Vec<Path>>();
x.sort();
Ok(PyList::new_bound(py, x.into_iter().map(|m| m.into_py(py))).to_object(py))
Ok(PyList::new_bound(py, out.into_iter().map(|m| m.into_py(py))).to_object(py))
}

fn subtypesof(&self, prefix: &Bound<PyAny>, py: Python<'_>) -> PyResult<PyObject> {
let mut out: Vec<Path> = Vec::new();

let prefix_path = if let Ok(path) = prefix.extract::<path::Path>() {
path
} else if let Ok(pystr) = prefix.downcast::<PyString>() {
Path(pystr.to_string())
} else {
return Err(PyRuntimeError::new_err(format!("invalid path {}", prefix)));
};
self.collect_child_paths(&prefix_path, true, &mut out);

Ok(PyList::new_bound(py, out.into_iter().map(|m| m.into_py(py))).to_object(py))
}

fn walk_proc(
&self,
path: &Bound<PyAny>,
Expand All @@ -139,7 +159,7 @@ impl Dme {
"cannot coerce proc name to string".to_string(),
));
};

if let Some(ty) = objtree.find(&objpath) {
if let Some(p) = ty.get_proc(&procname) {
if let Some(ref code) = p.get().code {
Expand Down
18 changes: 9 additions & 9 deletions src/dme/walker.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ impl Dme {
dreammaker::ast::Term::Float(_) => {
visit_name = "visit_Constant";
}
dreammaker::ast::Term::Ident(_) => {
visit_name = "visit_Constant";
}
dreammaker::ast::Term::String(_) => {
visit_name = "visit_Constant";
}
Expand Down Expand Up @@ -180,6 +177,9 @@ impl Dme {
if let Some(in_list_expr) = &l.in_list {
self.walk_expr(in_list_expr, walker, py)?;
}
for stmt in l.block.iter() {
self.walk_stmt(&stmt.elem, walker, py)?;
}
}
}
dreammaker::ast::Statement::ForRange(f) => {
Expand Down Expand Up @@ -246,27 +246,27 @@ impl Dme {
cases,
default,
} => {
if walker.hasattr("walk_Switch").unwrap() {
walker.call_method1("walk_Switch", (from_statement_to_node(stmt, py)?,))?;
if walker.hasattr("visit_Switch").unwrap() {
walker.call_method1("visit_Switch", (from_statement_to_node(stmt, py)?,))?;
} else {
self.walk_expr(input, walker, py)?;
for (case_types, block) in cases.iter() {
if walker.hasattr("walk_Expr").unwrap() {
if walker.hasattr("visit_Expr").unwrap() {
for case_elem in &case_types.elem {
match case_elem {
dreammaker::ast::Case::Exact(e) => {
walker.call_method1(
"walk_Expr",
"visit_Expr",
(from_expression_to_node(e, py)?,),
)?;
}
dreammaker::ast::Case::Range(s, e) => {
walker.call_method1(
"walk_Expr",
"visit_Expr",
(from_expression_to_node(s, py)?,),
)?;
walker.call_method1(
"walk_Expr",
"visit_Expr",
(from_expression_to_node(e, py)?,),
)?;
}
Expand Down
132 changes: 60 additions & 72 deletions src/path.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
};

use pyo3::{
exceptions::{PyRuntimeError, PyValueError}, pyclass::CompareOp, pymethods, types::{PyAnyMethods, PyString}, Bound, PyAny, PyErr, PyResult
exceptions::{PyRuntimeError, PyValueError}, pyclass::CompareOp, pymethods, types::{PyAnyMethods, PyString, PyStringMethods}, Bound, PyAny, PyErr, PyResult
};
use pyo3::pyclass;

Expand All @@ -25,6 +25,50 @@ impl From<Path> for String {
}
}

impl Path {
pub fn internal_child_of_string(&self, rhs: &String, strict: bool) -> bool {
if self.0.eq(rhs) {
return !strict;
}
if rhs == "/" {
return true;
}
let parts: Vec<&str> = self.0.split('/').collect();
let oparts: Vec<&str> = rhs.split('/').collect();
if parts.len() < oparts.len() {
return false;
}
for (a, b) in parts.iter().zip(oparts) {
if !(*a).eq(b) {
return false;
}
}

return true;
}

pub fn internal_parent_of_string(&self, rhs: &String, strict: bool) -> bool {
if self.0.eq(rhs){
return !strict;
}
if self.0 == "/" {
return true;
}
let parts: Vec<&str> = self.0.split('/').collect();
let oparts: Vec<&str> = rhs.split('/').collect();
if parts.len() > oparts.len() {
return false;
}
for (a, b) in parts.iter().zip(oparts) {
if !(*a).eq(b) {
return false;
}
}

return true;
}
}

#[pymethods]
impl Path {
#[new]
Expand All @@ -38,44 +82,9 @@ impl Path {
#[pyo3(signature = (other, strict=false))]
fn child_of(&self, other: &Bound<PyAny>, strict: bool) -> PyResult<bool> {
if let Ok(rhs) = other.extract::<Self>() {
if self.0 == rhs.0 {
return Ok(!strict);
}
if rhs.0 == "/" {
return Ok(true);
}
let parts: Vec<&str> = self.0.split('/').collect();
let oparts: Vec<&str> = rhs.0.split('/').collect();
if parts.len() < oparts.len() {
return Ok(false);
}
for (a, b) in parts.iter().zip(oparts) {
if !(*a).eq(b) {
return Ok(false);
}
}

return Ok(true);
return Ok(self.internal_child_of_string(&rhs.0, strict));
} else if let Ok(rhs) = other.downcast::<PyString>() {
let rs = rhs.to_string();
if self.0 == rs {
return Ok(!strict);
}
if rs == "/" {
return Ok(true);
}
let sparts: Vec<&str> = self.0.split('/').collect();
let soparts: Vec<&str> = rs.split('/').collect();
if sparts.len() < soparts.len() {
return Ok(false);
}
for (a, b) in sparts.iter().zip(soparts) {
if *a != b {
return Ok(false);
}
}

return Ok(true);
return Ok(self.internal_child_of_string(&rhs.to_cow().unwrap().to_string(), strict));
}

Err(PyErr::new::<PyRuntimeError, &str>("not a valid path"))
Expand All @@ -84,46 +93,25 @@ impl Path {
#[pyo3(signature = (other, strict=false))]
fn parent_of(&self, other: &Bound<PyAny>, strict: bool) -> PyResult<bool> {
if let Ok(rhs) = other.extract::<Self>() {
if self.0 == rhs.0 {
return Ok(!strict);
}
if self.0 == "/" {
return Ok(true);
}
let parts: Vec<&str> = self.0.split('/').collect();
let oparts: Vec<&str> = rhs.0.split('/').collect();
if parts.len() > oparts.len() {
return Ok(false);
}
for (a, b) in parts.iter().zip(oparts) {
if !(*a).eq(b) {
return Ok(false);
}
}

return Ok(true);
return Ok(self.internal_parent_of_string(&rhs.0, strict));
} else if let Ok(rhs) = other.downcast::<PyString>() {
let rs = rhs.to_string();
if self.0 == rs {
return Ok(!strict);
}
let sparts: Vec<&str> = self.0.split('/').collect();
let soparts: Vec<&str> = rs.split('/').collect();
if sparts.len() > soparts.len() {
return Ok(false);
}
for (a, b) in sparts.iter().zip(soparts) {
if *a != b {
return Ok(false);
}
}

return Ok(true);
return Ok(self.internal_parent_of_string(&rhs.to_cow().unwrap().to_string(), strict));
}

Err(PyErr::new::<PyRuntimeError, &str>("not a valid path"))
}

#[getter]
fn get_parent(&self) -> PyResult<Self> {
if self.0 == "/" {
return Ok(self.clone());
}
let mut parts: Vec<&str> = self.0.split('/').collect();
let _ = parts.split_off(parts.len() - 1);
let parent = parts.join("/");
Ok(Path(parent))
}

#[getter]
fn get_stem(&self) -> PyResult<String> {
let parts: Vec<&str> = self.0.split('/').collect();
Expand Down
9 changes: 7 additions & 2 deletions tests/test_dme.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ def dme() -> DME:
return DME.from_file(get_fixture_path("testenv.dme"))


def test_dme_paths_prefixed(dme: DME):
assert dme.paths_prefixed("/obj/foo") == [
def test_dme_typesof(dme: DME):
assert dme.typesof("/obj/foo") == [
"/obj/foo",
"/obj/foo/bar",
"/obj/foo/baz",
]

assert dme.subtypesof("/obj/foo") == [
"/obj/foo/bar",
"/obj/foo/baz",
]


def test_missing_type(dme: DME):
with pytest.raises(RuntimeError) as ex:
Expand Down

0 comments on commit fadad0d

Please sign in to comment.