greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Call needs to accept a general argument

Browse Source
This commit is contained in:
greg 2017-10-08 23:02:03 -07:00
parent ff0e14d9a9
commit 3b249045aa
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/schala_lang/parsing.rs
View File

@ -444,7 +444,7 @@ pub enum ExpressionType {
TupleLiteral(Vec<Expression>), TupleLiteral(Vec<Expression>),
Variable(Rc<String>), Variable(Rc<String>),
Call { Call {
name: Rc<String>, f: Box<Expression>,
arguments: Vec<Expression>, arguments: Vec<Expression>,
}, },
Index { Index {
@ -811,7 +811,9 @@ impl Parser {
Ok(match self.peek() { Ok(match self.peek() {
LParen => { LParen => {
let arguments = self.call_expr()?; let arguments = self.call_expr()?;
Expression(Call { name: identifier, arguments }, None) //TODO make this be more general
let f = Box::new(Expression(Variable(identifier), None));
Expression(Call { f, arguments }, None)
}, },
LSquareBracket => { LSquareBracket => {
let indexers = self.index_expr()?; let indexers = self.index_expr()?;
@ -1109,9 +1111,9 @@ mod parse_tests {
#[test] #[test]
fn parsing_functions() { fn parsing_functions() {
parse_test!("fn oi()", AST(vec![Declaration(FuncSig(Signature { name: rc!(oi), params: vec![], type_anno: None }))])); parse_test!("fn oi()", AST(vec![Declaration(FuncSig(Signature { name: rc!(oi), params: vec![], type_anno: None }))]));
parse_test!("oi()", AST(vec![exprstatement!(Call { name: rc!(oi), arguments: vec![] })])); parse_test!("oi()", AST(vec![exprstatement!(Call { f: Box::new(ex!(var!("oi"))), arguments: vec![] })]));
parse_test!("oi(a, 2 + 2)", AST(vec![exprstatement!(Call parse_test!("oi(a, 2 + 2)", AST(vec![exprstatement!(Call
{ name: rc!(oi), { f: Box::new(ex!(var!("oi"))),
arguments: vec![ex!(var!("a")), ex!(binexp!("+", IntLiteral(2), IntLiteral(2)))] arguments: vec![ex!(var!("a")), ex!(binexp!("+", IntLiteral(2), IntLiteral(2)))]
})])); })]));
parse_error!("a(b,,c)"); parse_error!("a(b,,c)");
@ -1124,7 +1126,7 @@ mod parse_tests {
parse_test!("fn a(x) { x() }", AST(vec![Declaration( parse_test!("fn a(x) { x() }", AST(vec![Declaration(
FuncDecl(Signature { name: rc!(a), params: vec![(rc!(x),None)], type_anno: None }, FuncDecl(Signature { name: rc!(a), params: vec![(rc!(x),None)], type_anno: None },
vec![exprstatement!(Call { name: rc!(x), arguments: vec![] })]))])); vec![exprstatement!(Call { f: Box::new(ex!(var!("x"))), arguments: vec![] })]))]));
} }
#[test] #[test]
@ -1164,8 +1166,8 @@ mod parse_tests {
#[test] #[test]
fn parsing_block_expressions() { fn parsing_block_expressions() {
parse_test!("if a() { b(); c() }", AST(vec![exprstatement!( parse_test!("if a() { b(); c() }", AST(vec![exprstatement!(
IfExpression(Box::new(ex!(Call { name: rc!(a), arguments: vec![]})), IfExpression(Box::new(ex!(Call { f: Box::new(ex!(var!("a"))), arguments: vec![]})),
vec![exprstatement!(Call { name: rc!(b), arguments: vec![]}), exprstatement!(Call { name: rc!(c), arguments: vec![] })], vec![exprstatement!(Call { f: Box::new(ex!(var!("b"))), arguments: vec![]}), exprstatement!(Call { f: Box::new(ex!(var!("c"))), arguments: vec![] })],
None) None)
)])); )]));
parse_test!(r#" parse_test!(r#"

6
src/schala_lang/type_check.rs
View File

@ -112,6 +112,12 @@ impl TypeContext {
Ok(match (&expr.0, &expr.1) { Ok(match (&expr.0, &expr.1) {
(&IntLiteral(_), _) => SchalaType::Integer, (&IntLiteral(_), _) => SchalaType::Integer,
(&BoolLiteral(_), _) => SchalaType::Boolean, (&BoolLiteral(_), _) => SchalaType::Boolean,
/*
(&Call { name, arguments }, _) => {
let f_type = self.infer
},
*/
_ => SchalaType::Unit, _ => SchalaType::Unit,
}) })
} }