diff --git a/src/ast.rs b/src/ast.rs index f5a6375..b91f5ac 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -1,65 +1,65 @@ -pub enum Script { +pub struct Script { + pub items: Vec, +} + +pub enum Stmt { + Let(Let), + Assign(Assign), Expr(Expr), - Fn(Fn), + Fn(FnDef), +} + +pub struct Let { + pub name: Ident, + pub ty: Option, + pub value: Expr, +} + +pub struct Assign { + pub name: Ident, + pub value: Expr, +} + +pub struct FnDef { + pub name: Ident, + pub params: Vec, + pub body: Vec, +} + +pub struct FnParam { + pub name: Ident, + pub ty: Type, +} + +pub enum Expr { + Literal(Literal), + Variable(Ident), FnCall(FnCall), } -pub struct Expr { - pub ident: ExprIdent, - pub value: ExprValue, +pub enum Literal { + Number(LitNumber), + String(LitString), } -pub struct ExprIdent(pub Ident); - -pub enum ExprValue { - Number(ExprNumber), - String(ExprString), -} - -pub struct ExprNumber { - pub raw: String, +pub struct LitNumber { pub value: f64, } -pub struct ExprString { +pub struct LitString { pub value: String, } -pub struct Fn { - pub ident: FnIdent, - pub params: Vec, - pub elements: Vec, -} - -pub struct FnIdent(pub Ident); - -pub struct FnParam { - pub ident: FnParamIdent, - pub ty: FnParamType, -} - -pub struct FnParamIdent(pub Ident); - -pub enum FnParamType { - Number, - String, -} - -pub enum FnElement { - Expr(Expr), -} - pub struct FnCall { - pub ident: FnIdent, - pub args: Vec, -} - -pub enum FnCallArg { - Expr(ExprIdent), - Number(ExprNumber), - String(ExprString), + pub name: Ident, + pub args: Vec, } pub struct Ident { pub name: String, } + +pub enum Type { + Number, + String, +}