feat: add managed types, source classes and scoped native calls
This commit is contained in:
@@ -51,6 +51,23 @@ peg::parser! {
|
||||
= function:function() {
|
||||
Decl { span: function.span, kind: DeclKind::Function(function) }
|
||||
}
|
||||
/ start:keyword("class") name:name() base:(colon() base:name() { base })?
|
||||
lbrace() members:class_member()* end:rbrace() {
|
||||
let mut fields = Vec::new();
|
||||
let mut methods = Vec::new();
|
||||
for member in members {
|
||||
match member {
|
||||
ClassMember::Field(field) => fields.push(field),
|
||||
ClassMember::Method(method) => methods.push(method),
|
||||
}
|
||||
}
|
||||
let span = start.through(end);
|
||||
Decl { span, kind: DeclKind::Class(Class { name, base, fields, methods, span }) }
|
||||
}
|
||||
|
||||
rule class_member() -> ClassMember
|
||||
= function:function() { ClassMember::Method(function) }
|
||||
/ field:parameter() { ClassMember::Field(field) }
|
||||
|
||||
pub rule interactive() -> InteractiveInput
|
||||
= statement:interactive_statement() {
|
||||
@@ -62,6 +79,7 @@ peg::parser! {
|
||||
Stmt { span: declaration.span, kind: StmtKind::Declaration(declaration) }
|
||||
}
|
||||
/ binding:binding() { binding_statement(binding) }
|
||||
/ assignment:member_assignment() { assignment }
|
||||
/ assignment:assignment() { assignment }
|
||||
/ expression:expression() {
|
||||
Stmt { span: expression.span, kind: StmtKind::Expression(expression) }
|
||||
@@ -79,15 +97,19 @@ peg::parser! {
|
||||
}
|
||||
|
||||
rule block() -> Block
|
||||
= start:lbrace() locals:local_statement()* returned:return_statement() end:rbrace() {
|
||||
= start:lbrace() locals:local_statement()* returned:return_statement()? end:rbrace() {
|
||||
let mut statements = locals;
|
||||
statements.push(returned);
|
||||
if let Some(returned) = returned { statements.push(returned); }
|
||||
Block { statements, span: start.through(end) }
|
||||
}
|
||||
|
||||
rule local_statement() -> Stmt
|
||||
= binding:binding() { binding_statement(binding) }
|
||||
/ assignment:member_assignment() { assignment }
|
||||
/ assignment:assignment() { assignment }
|
||||
/ !return_keyword() expression:expression() {
|
||||
Stmt { span: expression.span, kind: StmtKind::Expression(expression) }
|
||||
}
|
||||
|
||||
rule assignment() -> Stmt
|
||||
= name:name() equal() value:expression() {
|
||||
@@ -95,6 +117,17 @@ peg::parser! {
|
||||
Stmt { span, kind: StmtKind::Assignment(Assignment { name, value, span }) }
|
||||
}
|
||||
|
||||
rule member_assignment() -> Stmt
|
||||
= target:postfix_expression() equal() value:expression() {?
|
||||
let span = target.span.through(value.span);
|
||||
match target.kind {
|
||||
ExprKind::Member { object, name } => Ok(Stmt {
|
||||
span, kind: StmtKind::MemberAssignment(MemberAssignment { object: *object, name, value, span }),
|
||||
}),
|
||||
_ => Err("member assignment target"),
|
||||
}
|
||||
}
|
||||
|
||||
rule binding() -> Binding
|
||||
= start:let_keyword() name:name() equal() value:expression() {
|
||||
Binding { span: start.through(value.span), name, value }
|
||||
|
||||
Reference in New Issue
Block a user