Aadityavardhan
/
nac3_sca
forked from M-Labs/nac3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed symbol_resolver blanket implementation

This commit is contained in:
pca006132 2021-08-12 14:44:50 +08:00
parent 1f6c16e08b
commit 8c7ccb626b
1 changed files with 133 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
nac3core/src/symbol_resolver.rs
View File

@ -36,15 +36,14 @@ pub trait SymbolResolver {
// handle function call etc.
}
impl dyn SymbolResolver {
// convert type annotation into type
pub fn parse_type_annotation<T>(
&self,
// convert type annotation into type
pub fn parse_type_annotation<T>(
resolver: &dyn SymbolResolver,
top_level: &TopLevelContext,
unifier: &mut Unifier,
primitives: &PrimitiveStore,
expr: &Expr<T>,
) -> Result<Type, String> {
) -> Result<Type, String> {
use rustpython_parser::ast::ExprKind::*;
match &expr.node {
Name { id, .. } => match id.as_str() {
@ -54,7 +53,7 @@ impl dyn SymbolResolver {
"bool" => Ok(primitives.bool),
"None" => Ok(primitives.none),
x => {
let obj_id = self.get_identifier_def(x);
let obj_id = resolver.get_identifier_def(x);
if let Some(obj_id) = obj_id {
let defs = top_level.definitions.read();
let def = defs[obj_id.0].read();
@ -82,7 +81,7 @@ impl dyn SymbolResolver {
}
} else {
// it could be a type variable
let ty = self
let ty = resolver
.get_symbol_type(unifier, primitives, x)
.ok_or_else(|| "Cannot use function name as type".to_owned())?;
if let TypeEnum::TVar { .. } = &*unifier.get_ty(ty) {
@ -96,21 +95,18 @@ impl dyn SymbolResolver {
Subscript { value, slice, .. } => {
if let Name { id, .. } = &value.node {
if id == "virtual" {
let ty =
self.parse_type_annotation(top_level, unifier, primitives, slice)?;
let ty = parse_type_annotation(resolver, top_level, unifier, primitives, slice)?;
Ok(unifier.add_ty(TypeEnum::TVirtual { ty }))
} else {
let types = if let Tuple { elts, .. } = &slice.node {
elts.iter()
.map(|v| {
self.parse_type_annotation(top_level, unifier, primitives, v)
})
.map(|v| parse_type_annotation(resolver, top_level, unifier, primitives, v))
.collect::<Result<Vec<_>, _>>()?
} else {
vec![self.parse_type_annotation(top_level, unifier, primitives, slice)?]
vec![parse_type_annotation(resolver, top_level, unifier, primitives, slice)?]
};
let obj_id = self
let obj_id = resolver
.get_identifier_def(id)
.ok_or_else(|| format!("Unknown type annotation {}", id))?;
let defs = top_level.definitions.read();
@ -143,7 +139,11 @@ impl dyn SymbolResolver {
let ty = unifier.subst(*ty, &subst).unwrap_or(*ty);
(attr.clone(), ty)
}));
Ok(unifier.add_ty(TypeEnum::TObj { obj_id, fields: fields.into(), params: subst.into() }))
Ok(unifier.add_ty(TypeEnum::TObj {
obj_id,
fields: fields.into(),
params: subst.into(),
}))
} else {
Err("Cannot use function name as type".into())
}
@ -154,5 +154,28 @@ impl dyn SymbolResolver {
}
_ => Err("unsupported type expression".into()),
}
}
impl dyn SymbolResolver {
pub fn parse_type_annotation<T>(
&self,
top_level: &TopLevelContext,
unifier: &mut Unifier,
primitives: &PrimitiveStore,
expr: &Expr<T>,
) -> Result<Type, String> {
parse_type_annotation(self, top_level, unifier, primitives, expr)
}
}
impl dyn SymbolResolver + Send {
pub fn parse_type_annotation<T>(
&self,
top_level: &TopLevelContext,
unifier: &mut Unifier,
primitives: &PrimitiveStore,
expr: &Expr<T>,
) -> Result<Type, String> {
parse_type_annotation(self, top_level, unifier, primitives, expr)
}
}