jeff/dust
1
0
Fork 0
Code

Continue fixing tests and implementing types

Browse Source
This commit is contained in:
Jeff 2023-12-01 23:47:15 -05:00
parent 07b1efd369
commit 9fd02a2118
7 changed files with 114 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/async.ds
View File

@ -1,11 +1,11 @@
create_random_numbers = <fn int> |count| {
numbers = [];
numbers = []
while (length numbers) < count {
numbers += (random_integer)
}
(output "Made " + count + " numbers.")
(output "Made " + (length numbers) + " numbers.")
}
(output "This will print first.")

8
src/abstract_tree/block.rs
View File

@ -4,7 +4,7 @@ use rayon::prelude::*;
use serde::{Deserialize, Serialize};
use tree_sitter::Node;
use crate::{AbstractTree, Error, Map, Result, Statement, TypeDefinition, Value};
use crate::{AbstractTree, Error, Map, Result, Statement, Type, TypeDefinition, Value};
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, PartialOrd, Ord)]
pub struct Block {
@ -83,6 +83,10 @@ impl AbstractTree for Block {
}
fn expected_type(&self, context: &Map) -> Result<TypeDefinition> {
self.statements.last().unwrap().expected_type(context)
if self.is_async {
Ok(TypeDefinition::new(Type::Any))
} else {
self.statements.last().unwrap().expected_type(context)
}
}
}

102
src/abstract_tree/type_defintion.rs
View File

@ -40,60 +40,62 @@ impl TypeDefinition {
}
pub fn runtime_check(&self, other: &TypeDefinition, context: &Map) -> Result<()> {
match (&self.r#type, &other.r#type) {
(Type::Any, _)
| (_, Type::Any)
| (Type::Boolean, Type::Boolean)
| (Type::Empty, Type::Empty)
| (Type::Float, Type::Float)
| (Type::Integer, Type::Integer)
| (Type::Map, Type::Map)
| (Type::Number, Type::Number)
| (Type::Number, Type::Integer)
| (Type::Number, Type::Float)
| (Type::Integer, Type::Number)
| (Type::Float, Type::Number)
| (Type::String, Type::String)
| (Type::Table, Type::Table) => Ok(()),
(Type::List(self_item_type), Type::List(other_item_type)) => {
let self_defintion = TypeDefinition::new(self_item_type.as_ref().clone());
let other_definition = &TypeDefinition::new(other_item_type.as_ref().clone());
// match (&self.r#type, &other.r#type) {
// (Type::Any, _)
// | (_, Type::Any)
// | (Type::Boolean, Type::Boolean)
// | (Type::Empty, Type::Empty)
// | (Type::Float, Type::Float)
// | (Type::Integer, Type::Integer)
// | (Type::Map, Type::Map)
// | (Type::Number, Type::Number)
// | (Type::Number, Type::Integer)
// | (Type::Number, Type::Float)
// | (Type::Integer, Type::Number)
// | (Type::Float, Type::Number)
// | (Type::String, Type::String)
// | (Type::Table, Type::Table) => Ok(()),
// (Type::List(self_item_type), Type::List(other_item_type)) => {
// let self_defintion = TypeDefinition::new(self_item_type.as_ref().clone());
// let other_definition = &TypeDefinition::new(other_item_type.as_ref().clone());
self_defintion.runtime_check(other_definition, context)
}
(
Type::Function {
parameter_types: self_parameter_types,
return_type: self_return_type,
},
Type::Function {
parameter_types: other_parameter_types,
return_type: other_return_type,
},
) => {
let parameter_type_pairs = self_parameter_types
.iter()
.zip(other_parameter_types.iter());
// self_defintion.runtime_check(other_definition, context)
// }
// (
// Type::Function {
// parameter_types: self_parameter_types,
// return_type: self_return_type,
// },
// Type::Function {
// parameter_types: other_parameter_types,
// return_type: other_return_type,
// },
// ) => {
// let parameter_type_pairs = self_parameter_types
// .iter()
// .zip(other_parameter_types.iter());
for (self_parameter_type, other_parameter_type) in parameter_type_pairs {
TypeDefinition::new(self_parameter_type.clone()).runtime_check(
&TypeDefinition::new(other_parameter_type.clone()),
context,
)?;
}
// for (self_parameter_type, other_parameter_type) in parameter_type_pairs {
// TypeDefinition::new(self_parameter_type.clone()).runtime_check(
// &TypeDefinition::new(other_parameter_type.clone()),
// context,
// )?;
// }
TypeDefinition::new(self_return_type.as_ref().clone()).runtime_check(
&TypeDefinition::new(other_return_type.as_ref().clone()),
context,
)?;
// TypeDefinition::new(self_return_type.as_ref().clone()).runtime_check(
// &TypeDefinition::new(other_return_type.as_ref().clone()),
// context,
// )?;
Ok(())
}
_ => Err(Error::RuntimeTypeCheck {
expected: self.clone(),
actual: other.clone(),
}),
}
// Ok(())
// }
// _ => Err(Error::RuntimeTypeCheck {
// expected: self.clone(),
// actual: other.clone(),
// }),
// }
Ok(())
}
}

24
src/built_in_functions/collections.rs Normal file
View File

@ -0,0 +1,24 @@
use crate::{BuiltInFunction, Error, Map, Result, Type, TypeDefinition, Value};
pub struct Length;
impl BuiltInFunction for Length {
fn name(&self) -> &'static str {
"length"
}
fn run(&self, arguments: &[Value], _context: &Map) -> Result<Value> {
Error::expect_argument_amount(self, 1, arguments.len())?;
let length = arguments.first().unwrap().as_list()?.items().len();
Ok(Value::Integer(length as i64))
}
fn type_definition(&self) -> TypeDefinition {
TypeDefinition::new(Type::Function {
parameter_types: vec![Type::List(Box::new(Type::Any))],
return_type: Box::new(Type::Integer),
})
}
}

19
src/built_in_functions/fs.rs
View File

@ -4,7 +4,7 @@ use std::{
path::PathBuf,
};
use crate::{BuiltInFunction, List, Map, Result, Value};
use crate::{BuiltInFunction, List, Map, Result, Type, TypeDefinition, Value};
pub struct Read;
@ -47,8 +47,11 @@ impl BuiltInFunction for Read {
Ok(Value::String(file_content))
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
fn type_definition(&self) -> TypeDefinition {
TypeDefinition::new(Type::Function {
parameter_types: vec![Type::String],
return_type: Box::new(Type::String),
})
}
}
@ -69,7 +72,10 @@ impl BuiltInFunction for Write {
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
TypeDefinition::new(Type::Function {
parameter_types: vec![Type::String],
return_type: Box::new(Type::Empty),
})
}
}
@ -94,6 +100,9 @@ impl BuiltInFunction for Append {
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
TypeDefinition::new(Type::Function {
parameter_types: vec![Type::String, Type::String],
return_type: Box::new(Type::Empty),
})
}
}

4
src/built_in_functions/mod.rs
View File

@ -1,15 +1,17 @@
use crate::{Map, Result, TypeDefinition, Value};
mod assert;
mod collections;
mod data_formats;
mod fs;
mod output;
mod random;
mod r#type;
pub const BUILT_IN_FUNCTIONS: [&dyn BuiltInFunction; 13] = [
pub const BUILT_IN_FUNCTIONS: [&dyn BuiltInFunction; 14] = [
&assert::Assert,
&assert::AssertEqual,
&collections::Length,
&data_formats::FromJson,
&data_formats::ToJson,
&fs::Read,

17
src/built_in_functions/random.rs
View File

@ -10,7 +10,7 @@ impl BuiltInFunction for Random {
}
fn run(&self, arguments: &[Value], _context: &Map) -> Result<Value> {
Error::expect_argument_minimum(self, 1, arguments.len())?;
Error::expect_argument_amount(self, 1, arguments.len())?;
let list = arguments.first().unwrap().as_list()?;
let items = list.items();
@ -42,7 +42,10 @@ impl BuiltInFunction for RandomInteger {
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
TypeDefinition::new(Type::Function {
parameter_types: Vec::with_capacity(0),
return_type: Box::new(Type::Integer),
})
}
}
@ -60,7 +63,10 @@ impl BuiltInFunction for RandomFloat {
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
TypeDefinition::new(Type::Function {
parameter_types: Vec::with_capacity(0),
return_type: Box::new(Type::Float),
})
}
}
@ -78,6 +84,9 @@ impl BuiltInFunction for RandomBoolean {
}
fn type_definition(&self) -> crate::TypeDefinition {
todo!()
TypeDefinition::new(Type::Function {
parameter_types: Vec::with_capacity(0),
return_type: Box::new(Type::Boolean),
})
}
}