artiq: reformat
This commit is contained in:
parent
2470ab7856
commit
459be94526
|
@ -304,7 +304,10 @@ impl InnerResolver {
|
||||||
self.helper.id_fn.call1(py, (self.helper.type_fn.call1(py, (pyty,))?,))?.extract(py)?;
|
self.helper.id_fn.call1(py, (self.helper.type_fn.call1(py, (pyty,))?,))?.extract(py)?;
|
||||||
let py_obj_id: u64 = self.helper.id_fn.call1(py, (pyty,))?.extract(py)?;
|
let py_obj_id: u64 = self.helper.id_fn.call1(py, (pyty,))?.extract(py)?;
|
||||||
let get_def_id = || {
|
let get_def_id = || {
|
||||||
self.pyid_to_def.read().get(&ty_id).copied()
|
self.pyid_to_def
|
||||||
|
.read()
|
||||||
|
.get(&ty_id)
|
||||||
|
.copied()
|
||||||
.or_else(|| self.pyid_to_def.read().get(&py_obj_id).copied())
|
.or_else(|| self.pyid_to_def.read().get(&py_obj_id).copied())
|
||||||
};
|
};
|
||||||
if ty_id == self.primitive_ids.int || ty_id == self.primitive_ids.int32 {
|
if ty_id == self.primitive_ids.int || ty_id == self.primitive_ids.int32 {
|
||||||
|
@ -607,11 +610,13 @@ impl InnerResolver {
|
||||||
let pyid_to_def = self.pyid_to_def.read();
|
let pyid_to_def = self.pyid_to_def.read();
|
||||||
let constructor_ty = pyid_to_def.get(&py_obj_id).and_then(|def_id| {
|
let constructor_ty = pyid_to_def.get(&py_obj_id).and_then(|def_id| {
|
||||||
defs.iter().find_map(|def| {
|
defs.iter().find_map(|def| {
|
||||||
if let Some(rear_guard) = def.try_read(){
|
if let Some(rear_guard) = def.try_read() {
|
||||||
if let TopLevelDef::Class {
|
if let TopLevelDef::Class { object_id, methods, constructor, .. } = &*rear_guard
|
||||||
object_id, methods, constructor, ..
|
{
|
||||||
} = &*rear_guard {
|
if object_id == def_id
|
||||||
if object_id == def_id && constructor.is_some() && methods.iter().any(|(s, _, _)| s == &"__init__".into()) {
|
&& constructor.is_some()
|
||||||
|
&& methods.iter().any(|(s, _, _)| s == &"__init__".into())
|
||||||
|
{
|
||||||
return *constructor;
|
return *constructor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1138,7 +1143,7 @@ impl InnerResolver {
|
||||||
let val: bool = obj.extract()?;
|
let val: bool = obj.extract()?;
|
||||||
Ok(SymbolValue::Bool(val))
|
Ok(SymbolValue::Bool(val))
|
||||||
} else if ty_id == self.primitive_ids.string {
|
} else if ty_id == self.primitive_ids.string {
|
||||||
let val:String = obj.extract()?;
|
let val: String = obj.extract()?;
|
||||||
Ok(SymbolValue::Str(val))
|
Ok(SymbolValue::Str(val))
|
||||||
} else if ty_id == self.primitive_ids.float || ty_id == self.primitive_ids.float64 {
|
} else if ty_id == self.primitive_ids.float || ty_id == self.primitive_ids.float64 {
|
||||||
let val: f64 = obj.extract()?;
|
let val: f64 = obj.extract()?;
|
||||||
|
|
Loading…
Reference in New Issue