feat: compile Endor await expressions through the source pipeline
This commit is contained in:
@@ -332,7 +332,9 @@ impl Builder {
|
|||||||
binding,
|
binding,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
ExprKind::Unary { operand, .. } => self.expression(operand, globals)?,
|
ExprKind::Unary { operand, .. } | ExprKind::Await { operand } => {
|
||||||
|
self.expression(operand, globals)?
|
||||||
|
}
|
||||||
ExprKind::Binary { left, right, .. } => {
|
ExprKind::Binary { left, right, .. } => {
|
||||||
self.expression(left, globals)?;
|
self.expression(left, globals)?;
|
||||||
self.expression(right, globals)?;
|
self.expression(right, globals)?;
|
||||||
|
|||||||
@@ -300,6 +300,10 @@ impl<'a> Emitter<'a> {
|
|||||||
}
|
}
|
||||||
self.emit(Opcode::Call, arguments.len())?;
|
self.emit(Opcode::Call, arguments.len())?;
|
||||||
}
|
}
|
||||||
|
ExprKind::Await { operand } => {
|
||||||
|
self.expression(operand)?;
|
||||||
|
self.simple(Opcode::Await);
|
||||||
|
}
|
||||||
ExprKind::Member { object, name } => {
|
ExprKind::Member { object, name } => {
|
||||||
self.expression(object)?;
|
self.expression(object)?;
|
||||||
self.emit(Opcode::LoadAttr, self.name_index(&name.text))?;
|
self.emit(Opcode::LoadAttr, self.name_index(&name.text))?;
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ module Endor {
|
|||||||
| Number(string spelling)
|
| Number(string spelling)
|
||||||
| String(string value)
|
| String(string value)
|
||||||
| Symbol(Name name)
|
| Symbol(Name name)
|
||||||
|
| Await(Expr operand)
|
||||||
| Unary(UnaryOp operation, Expr operand)
|
| Unary(UnaryOp operation, Expr operand)
|
||||||
| Binary(BinaryOp operation, Expr left, Expr right)
|
| Binary(BinaryOp operation, Expr left, Expr right)
|
||||||
| Member(Expr object, Name name)
|
| Member(Expr object, Name name)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||||
"$id": "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0",
|
"$id": "urn:endor:ast:sha256:c7c10c6a61158810fa55044f1aa79f3558ac18ca3be59cbf7f2499b5add8df5b",
|
||||||
"$ref": "#/$defs/AstDocument",
|
"$ref": "#/$defs/AstDocument",
|
||||||
"$defs": {
|
"$defs": {
|
||||||
"Span": {
|
"Span": {
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"schema": {
|
"schema": {
|
||||||
"const": "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0"
|
"const": "urn:endor:ast:sha256:c7c10c6a61158810fa55044f1aa79f3558ac18ca3be59cbf7f2499b5add8df5b"
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"$ref": "#/$defs/AstRoot"
|
"$ref": "#/$defs/AstRoot"
|
||||||
@@ -591,6 +591,22 @@
|
|||||||
],
|
],
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"kind": {
|
||||||
|
"const": "Await"
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"$ref": "#/$defs/Expr"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"required": [
|
||||||
|
"kind",
|
||||||
|
"data"
|
||||||
|
],
|
||||||
|
"additionalProperties": false
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Generated by scripts/generate_ast.py from Endor.asdl. Do not edit.
|
// Generated by scripts/generate_ast.py from Endor.asdl. Do not edit.
|
||||||
|
|
||||||
export const AST_SCHEMA_ID = "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0" as const;
|
export const AST_SCHEMA_ID = "urn:endor:ast:sha256:c7c10c6a61158810fa55044f1aa79f3558ac18ca3be59cbf7f2499b5add8df5b" as const;
|
||||||
export interface Span { start: number; end: number; }
|
export interface Span { start: number; end: number; }
|
||||||
export type AstDocument = { schema: typeof AST_SCHEMA_ID; root: AstRoot; };
|
export type AstDocument = { schema: typeof AST_SCHEMA_ID; root: AstRoot; };
|
||||||
export type AstRoot = { kind: "Module"; data: Program; } | { kind: "Expression"; data: Expr; } | { kind: "Interactive"; data: InteractiveInput; };
|
export type AstRoot = { kind: "Module"; data: Program; } | { kind: "Expression"; data: Expr; } | { kind: "Interactive"; data: InteractiveInput; };
|
||||||
@@ -20,7 +20,7 @@ export type MemberAssignment = { object: Expr; name: Name; value: Expr; span: Sp
|
|||||||
export type ReturnStatement = { value?: Expr | null; span: Span; };
|
export type ReturnStatement = { value?: Expr | null; span: Span; };
|
||||||
export type InteractiveInput = { statements: Array<Stmt>; span: Span; };
|
export type InteractiveInput = { statements: Array<Stmt>; span: Span; };
|
||||||
export type Expr = { kind: ExprKind; span: Span; };
|
export type Expr = { kind: ExprKind; span: Span; };
|
||||||
export type ExprKind = { kind: "Name"; data: string; } | { kind: "Number"; data: string; } | { kind: "String"; data: string; } | { kind: "Symbol"; data: Name; } | { kind: "Unary"; data: { operation: UnaryOp; operand: Expr; }; } | { kind: "Binary"; data: { operation: BinaryOp; left: Expr; right: Expr; }; } | { kind: "Member"; data: { object: Expr; name: Name; }; } | { kind: "Call"; data: { callee: Expr; arguments: Array<Expr>; }; };
|
export type ExprKind = { kind: "Name"; data: string; } | { kind: "Number"; data: string; } | { kind: "String"; data: string; } | { kind: "Symbol"; data: Name; } | { kind: "Await"; data: Expr; } | { kind: "Unary"; data: { operation: UnaryOp; operand: Expr; }; } | { kind: "Binary"; data: { operation: BinaryOp; left: Expr; right: Expr; }; } | { kind: "Member"; data: { object: Expr; name: Name; }; } | { kind: "Call"; data: { callee: Expr; arguments: Array<Expr>; }; };
|
||||||
export type UnaryOp = "Negate";
|
export type UnaryOp = "Negate";
|
||||||
export type BinaryOp = "Add" | "Subtract" | "Multiply" | "Divide";
|
export type BinaryOp = "Add" | "Subtract" | "Multiply" | "Divide";
|
||||||
export interface Visitor {
|
export interface Visitor {
|
||||||
@@ -192,6 +192,9 @@ break;
|
|||||||
case "Symbol":
|
case "Symbol":
|
||||||
walkName(node.data, visitor);
|
walkName(node.data, visitor);
|
||||||
break;
|
break;
|
||||||
|
case "Await":
|
||||||
|
walkExpr(node.data, visitor);
|
||||||
|
break;
|
||||||
case "Unary":
|
case "Unary":
|
||||||
walkUnaryOp(node.data.operation, visitor);
|
walkUnaryOp(node.data.operation, visitor);
|
||||||
walkExpr(node.data.operand, visitor);
|
walkExpr(node.data.operand, visitor);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
use super::Spanned;
|
use super::Spanned;
|
||||||
use crate::Span;
|
use crate::Span;
|
||||||
pub const AST_SCHEMA_ID: &str =
|
pub const AST_SCHEMA_ID: &str =
|
||||||
"urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0";
|
"urn:endor:ast:sha256:c7c10c6a61158810fa55044f1aa79f3558ac18ca3be59cbf7f2499b5add8df5b";
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
pub struct AstDocument {
|
pub struct AstDocument {
|
||||||
@@ -234,6 +234,7 @@ pub enum ExprKind {
|
|||||||
Number(String),
|
Number(String),
|
||||||
String(String),
|
String(String),
|
||||||
Symbol(Name),
|
Symbol(Name),
|
||||||
|
Await(Box<Expr>),
|
||||||
Unary {
|
Unary {
|
||||||
operation: UnaryOp,
|
operation: UnaryOp,
|
||||||
operand: Box<Expr>,
|
operand: Box<Expr>,
|
||||||
|
|||||||
@@ -316,6 +316,9 @@ pub fn walk_expr_kind<V: Visitor + ?Sized>(
|
|||||||
ExprKind::Symbol(value) => {
|
ExprKind::Symbol(value) => {
|
||||||
visitor.visit_name(value)?;
|
visitor.visit_name(value)?;
|
||||||
}
|
}
|
||||||
|
ExprKind::Await(value) => {
|
||||||
|
visitor.visit_expr(value)?;
|
||||||
|
}
|
||||||
ExprKind::Unary {
|
ExprKind::Unary {
|
||||||
operation, operand, ..
|
operation, operand, ..
|
||||||
} => {
|
} => {
|
||||||
|
|||||||
@@ -146,6 +146,9 @@ peg::parser! {
|
|||||||
left:(@) star() right:@ { binary(left, BinaryOp::Multiply, right) }
|
left:(@) star() right:@ { binary(left, BinaryOp::Multiply, right) }
|
||||||
left:(@) slash() right:@ { binary(left, BinaryOp::Divide, right) }
|
left:(@) slash() right:@ { binary(left, BinaryOp::Divide, right) }
|
||||||
--
|
--
|
||||||
|
start:keyword("await") operand:@ {
|
||||||
|
Expr { span: start.through(operand.span), kind: ExprKind::Await { operand: Box::new(operand) } }
|
||||||
|
}
|
||||||
start:minus() operand:@ {
|
start:minus() operand:@ {
|
||||||
Expr { span: start.through(operand.span), kind: ExprKind::Unary { operation: UnaryOp::Negate, operand: Box::new(operand) } }
|
Expr { span: start.through(operand.span), kind: ExprKind::Unary { operation: UnaryOp::Negate, operand: Box::new(operand) } }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user