added resolve signature

This commit is contained in:
pca006132 2021-01-08 16:24:25 +08:00
parent 7c6349520c
commit ebe1027ffa
2 changed files with 141 additions and 13 deletions

View File

@ -130,7 +130,9 @@ impl<'a> TopLevelContext<'a> {
} }
pub fn get_type(&self, name: &str) -> Option<Type> { pub fn get_type(&self, name: &str) -> Option<Type> {
// TODO: handle parametric types // TODO: handle name visibility
// possibly by passing a function from outside to tell what names are allowed, and what are
// not...
self.sym_table.get(name).cloned() self.sym_table.get(name).cloned()
} }
} }

View File

@ -1,6 +1,9 @@
/// obtain class and function signature from AST /// obtain class and function signature from AST
use super::primitives::PRIMITIVES; use super::context::TopLevelContext;
use super::primitives::*;
use super::typedef::*;
use rustpython_parser::ast::{ExpressionType, Statement, StatementType, StringGroup}; use rustpython_parser::ast::{ExpressionType, Statement, StatementType, StringGroup};
use std::collections::HashMap;
fn typename_from_expr<'b: 'a, 'a>(typenames: &mut Vec<&'a str>, expr: &'b ExpressionType) { fn typename_from_expr<'b: 'a, 'a>(typenames: &mut Vec<&'a str>, expr: &'b ExpressionType) {
match expr { match expr {
@ -33,7 +36,61 @@ fn typename_from_fn<'b: 'a, 'a>(typenames: &mut Vec<&'a str>, fun: &'b Statement
} }
} }
pub fn resolve_classes<'b: 'a, 'a>(stmts: &'b [Statement]) -> (Vec<&'a str>, Vec<&'a str>) { fn name_from_expr<'b: 'a, 'a>(expr: &'b ExpressionType) -> &'a str {
match &expr {
ExpressionType::Identifier { name } => &name,
ExpressionType::String { value } => match value {
StringGroup::Constant { value } => &value,
_ => unimplemented!(),
},
_ => unimplemented!(),
}
}
fn type_from_expr<'b: 'a, 'a>(
ctx: &'a TopLevelContext,
expr: &'b ExpressionType,
) -> Result<Type, String> {
match expr {
ExpressionType::Identifier { name } => {
ctx.get_type(name).ok_or_else(|| "no such type".into())
}
ExpressionType::String { value } => match value {
StringGroup::Constant { value } => {
ctx.get_type(&value).ok_or_else(|| "no such type".into())
}
_ => unimplemented!(),
},
ExpressionType::Subscript { a, b } => {
if let ExpressionType::Identifier { name } = &a.node {
match name.as_str() {
"list" => {
let ty = type_from_expr(ctx, &b.node)?;
Ok(TypeEnum::ParametricType(LIST_TYPE, vec![ty]).into())
}
"tuple" => {
if let ExpressionType::Tuple { elements } = &b.node {
let ty_list: Result<Vec<_>, _> = elements
.iter()
.map(|v| type_from_expr(ctx, &v.node))
.collect();
Ok(TypeEnum::ParametricType(TUPLE_TYPE, ty_list?).into())
} else {
Err("unsupported format".into())
}
}
_ => Err("no such parameterized type".into()),
}
} else {
// we require a to be an identifier, for a[b]
Err("unsupported format".into())
}
}
_ => Err("unsupported format".into()),
}
}
pub fn get_typenames<'b: 'a, 'a>(stmts: &'b [Statement]) -> (Vec<&'a str>, Vec<&'a str>) {
let mut classes = Vec::new(); let mut classes = Vec::new();
let mut typenames = Vec::new(); let mut typenames = Vec::new();
for stmt in stmts.iter() { for stmt in stmts.iter() {
@ -45,15 +102,8 @@ pub fn resolve_classes<'b: 'a, 'a>(stmts: &'b [Statement]) -> (Vec<&'a str>, Vec
// and annotations // and annotations
classes.push(&name[..]); classes.push(&name[..]);
for base in bases.iter() { for base in bases.iter() {
let name = match &base.node { let name = name_from_expr(&base.node);
ExpressionType::Identifier { name } => name, typenames.push(name);
ExpressionType::String { value } => match value {
StringGroup::Constant { value } => value,
_ => unimplemented!(),
},
_ => unimplemented!(),
};
typenames.push(&name[..]);
} }
// may check if fields/functions are not duplicated // may check if fields/functions are not duplicated
for stmt in body.iter() { for stmt in body.iter() {
@ -84,6 +134,82 @@ pub fn resolve_classes<'b: 'a, 'a>(stmts: &'b [Statement]) -> (Vec<&'a str>, Vec
(classes, unknowns) (classes, unknowns)
} }
fn resolve_function<'b: 'a, 'a>(
ctx: &'a TopLevelContext,
fun: &'b StatementType,
) -> Result<FnDef, String> {
if let StatementType::FunctionDef { args, returns, .. } = &fun {
let args: Result<Vec<_>, _> = args
.args
.iter()
.map(|arg| type_from_expr(ctx, &arg.annotation.as_ref().unwrap().node))
.collect();
let args = args?;
let result = match returns {
Some(v) => Some(type_from_expr(ctx, &v.node)?),
None => None,
};
Ok(FnDef { args, result })
} else {
unreachable!()
}
}
pub fn resolve_signatures<'b: 'a, 'a>(ctx: &'a mut TopLevelContext<'a>, stmts: &'b [Statement]) {
for stmt in stmts.iter() {
match &stmt.node {
StatementType::ClassDef {
name, bases, body, ..
} => {
let mut parents = Vec::new();
for base in bases.iter() {
let name = name_from_expr(&base.node);
let c = ctx.get_type(name).unwrap();
let id = if let TypeEnum::ClassType(id) = c.as_ref() {
*id
} else {
unreachable!()
};
parents.push(id);
}
let mut fields = HashMap::new();
let mut functions = HashMap::new();
for stmt in body.iter() {
match &stmt.node {
StatementType::AnnAssign {
target, annotation, ..
} => {
let name = name_from_expr(&target.node);
let ty = type_from_expr(ctx, &annotation.node).unwrap();
fields.insert(name, ty);
}
StatementType::FunctionDef { name, .. } => {
functions.insert(&name[..], resolve_function(ctx, &stmt.node).unwrap());
}
_ => unimplemented!(),
}
}
let class = ctx.get_type(name).unwrap();
let class = if let TypeEnum::ClassType(id) = class.as_ref() {
ctx.get_class_def_mut(*id)
} else {
unreachable!()
};
class.parents.extend_from_slice(&parents);
class.base.fields.clone_from(&fields);
class.base.methods.clone_from(&functions);
}
StatementType::FunctionDef { name, .. } => {
ctx.add_fn(&name[..], resolve_function(ctx, &stmt.node).unwrap());
}
_ => unimplemented!(),
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -108,7 +234,7 @@ mod tests {
return b return b
" }) " })
.unwrap(); .unwrap();
let (mut classes, mut unknowns) = resolve_classes(&ast.statements); let (mut classes, mut unknowns) = get_typenames(&ast.statements);
let classes_count = classes.len(); let classes_count = classes.len();
let unknowns_count = unknowns.len(); let unknowns_count = unknowns.len();
classes.sort(); classes.sort();