feat: add managed types, source classes and scoped native calls

This commit is contained in:
2026-10-21 01:47:08 +08:00
parent 7c842789c0
commit a970fd7707
48 changed files with 2069 additions and 134 deletions
+4
View File
@@ -12,17 +12,21 @@ module Endor {
Program = (Decl* declarations, span span)
Decl = (DeclKind kind, span span)
DeclKind = Function(Function definition)
| Class(Class definition)
Class = (Name name, Name? base, Parameter* fields, Function* methods, span span)
Function = (Name name, Parameter* parameters, Name return_type, Block body, span span)
Parameter = (Name name, Name type_name, span span)
Block = (Stmt* statements, span span)
Stmt = (StmtKind kind, span span)
StmtKind = Binding(Binding binding)
| Assignment(Assignment assignment)
| MemberAssignment(MemberAssignment assignment)
| Return(ReturnStatement statement)
| Expression(Expr expression)
| Declaration(Decl declaration)
Binding = (Name name, Expr value, span span)
Assignment = (Name name, Expr value, span span)
MemberAssignment = (Expr object, Name name, Expr value, span span)
ReturnStatement = (Expr? value, span span)
InteractiveInput = (Stmt* statements, span span)
+98 -2
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "urn:endor:ast:sha256:8c89fde6c029357a0809751c41cb46d59972b987bbe1b25c0cced4bfcdbe2a7b",
"$id": "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0",
"$ref": "#/$defs/AstDocument",
"$defs": {
"Span": {
@@ -27,7 +27,7 @@
"type": "object",
"properties": {
"schema": {
"const": "urn:endor:ast:sha256:8c89fde6c029357a0809751c41cb46d59972b987bbe1b25c0cced4bfcdbe2a7b"
"const": "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0"
},
"root": {
"$ref": "#/$defs/AstRoot"
@@ -159,9 +159,65 @@
"data"
],
"additionalProperties": false
},
{
"type": "object",
"properties": {
"kind": {
"const": "Class"
},
"data": {
"$ref": "#/$defs/Class"
}
},
"required": [
"kind",
"data"
],
"additionalProperties": false
}
]
},
"Class": {
"type": "object",
"properties": {
"name": {
"$ref": "#/$defs/Name"
},
"base": {
"anyOf": [
{
"$ref": "#/$defs/Name"
},
{
"type": "null"
}
]
},
"fields": {
"type": "array",
"items": {
"$ref": "#/$defs/Parameter"
}
},
"methods": {
"type": "array",
"items": {
"$ref": "#/$defs/Function"
}
},
"span": {
"$ref": "#/$defs/Span"
}
},
"required": [
"name",
"fields",
"methods",
"span"
],
"additionalProperties": false
},
"Function": {
"type": "object",
"properties": {
@@ -282,6 +338,22 @@
],
"additionalProperties": false
},
{
"type": "object",
"properties": {
"kind": {
"const": "MemberAssignment"
},
"data": {
"$ref": "#/$defs/MemberAssignment"
}
},
"required": [
"kind",
"data"
],
"additionalProperties": false
},
{
"type": "object",
"properties": {
@@ -372,6 +444,30 @@
],
"additionalProperties": false
},
"MemberAssignment": {
"type": "object",
"properties": {
"object": {
"$ref": "#/$defs/Expr"
},
"name": {
"$ref": "#/$defs/Name"
},
"value": {
"$ref": "#/$defs/Expr"
},
"span": {
"$ref": "#/$defs/Span"
}
},
"required": [
"object",
"name",
"value",
"span"
],
"additionalProperties": false
},
"ReturnStatement": {
"type": "object",
"properties": {
+28 -3
View File
@@ -1,20 +1,22 @@
// Generated by scripts/generate_ast.py from Endor.asdl. Do not edit.
export const AST_SCHEMA_ID = "urn:endor:ast:sha256:8c89fde6c029357a0809751c41cb46d59972b987bbe1b25c0cced4bfcdbe2a7b" as const;
export const AST_SCHEMA_ID = "urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0" as const;
export interface Span { start: number; end: number; }
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 Name = { text: string; span: Span; };
export type Program = { declarations: Array<Decl>; span: Span; };
export type Decl = { kind: DeclKind; span: Span; };
export type DeclKind = { kind: "Function"; data: Function; };
export type DeclKind = { kind: "Function"; data: Function; } | { kind: "Class"; data: Class; };
export type Class = { name: Name; base?: Name | null; fields: Array<Parameter>; methods: Array<Function>; span: Span; };
export type Function = { name: Name; parameters: Array<Parameter>; return_type: Name; body: Block; span: Span; };
export type Parameter = { name: Name; type_name: Name; span: Span; };
export type Block = { statements: Array<Stmt>; span: Span; };
export type Stmt = { kind: StmtKind; span: Span; };
export type StmtKind = { kind: "Binding"; data: Binding; } | { kind: "Assignment"; data: Assignment; } | { kind: "Return"; data: ReturnStatement; } | { kind: "Expression"; data: Expr; } | { kind: "Declaration"; data: Decl; };
export type StmtKind = { kind: "Binding"; data: Binding; } | { kind: "Assignment"; data: Assignment; } | { kind: "MemberAssignment"; data: MemberAssignment; } | { kind: "Return"; data: ReturnStatement; } | { kind: "Expression"; data: Expr; } | { kind: "Declaration"; data: Decl; };
export type Binding = { name: Name; value: Expr; span: Span; };
export type Assignment = { name: Name; value: Expr; span: Span; };
export type MemberAssignment = { object: Expr; name: Name; value: Expr; span: Span; };
export type ReturnStatement = { value?: Expr | null; span: Span; };
export type InteractiveInput = { statements: Array<Stmt>; span: Span; };
export type Expr = { kind: ExprKind; span: Span; };
@@ -29,6 +31,7 @@ visitName?(node: Name): boolean | void;
visitProgram?(node: Program): boolean | void;
visitDecl?(node: Decl): boolean | void;
visitDeclKind?(node: DeclKind): boolean | void;
visitClass?(node: Class): boolean | void;
visitFunction?(node: Function): boolean | void;
visitParameter?(node: Parameter): boolean | void;
visitBlock?(node: Block): boolean | void;
@@ -36,6 +39,7 @@ visitStmt?(node: Stmt): boolean | void;
visitStmtKind?(node: StmtKind): boolean | void;
visitBinding?(node: Binding): boolean | void;
visitAssignment?(node: Assignment): boolean | void;
visitMemberAssignment?(node: MemberAssignment): boolean | void;
visitReturnStatement?(node: ReturnStatement): boolean | void;
visitInteractiveInput?(node: InteractiveInput): boolean | void;
visitExpr?(node: Expr): boolean | void;
@@ -82,8 +86,19 @@ switch (node.kind) {
case "Function":
walkFunction(node.data, visitor);
break;
case "Class":
walkClass(node.data, visitor);
break;
}
}
export function walkClass(node: Class, visitor: Visitor): void {
if (visitor.visitClass?.(node) === false) return;
walkName(node.name, visitor);
if (node.base != null) walkName(node.base, visitor);
for (const value of node.fields) walkParameter(value, visitor);
for (const value of node.methods) walkFunction(value, visitor);
walkSpan(node.span, visitor);
}
export function walkFunction(node: Function, visitor: Visitor): void {
if (visitor.visitFunction?.(node) === false) return;
walkName(node.name, visitor);
@@ -117,6 +132,9 @@ break;
case "Assignment":
walkAssignment(node.data, visitor);
break;
case "MemberAssignment":
walkMemberAssignment(node.data, visitor);
break;
case "Return":
walkReturnStatement(node.data, visitor);
break;
@@ -140,6 +158,13 @@ walkName(node.name, visitor);
walkExpr(node.value, visitor);
walkSpan(node.span, visitor);
}
export function walkMemberAssignment(node: MemberAssignment, visitor: Visitor): void {
if (visitor.visitMemberAssignment?.(node) === false) return;
walkExpr(node.object, visitor);
walkName(node.name, visitor);
walkExpr(node.value, visitor);
walkSpan(node.span, visitor);
}
export function walkReturnStatement(node: ReturnStatement, visitor: Visitor): void {
if (visitor.visitReturnStatement?.(node) === false) return;
if (node.value != null) walkExpr(node.value, visitor);
+2
View File
@@ -14,4 +14,6 @@
| [parser.rs](parser.rs) | 统一根/ParseMode 与具体解析 API、错误映射、AST 辅助函数,以及独立语法文件的编译期引入 |
| [grammar.peg](grammar.peg) | token 输入的 PEG 规则、运算符优先级与 AST 构造动作;保留 peg::parser! 外层声明 |
函数体允许独立方法调用等表达式语句;末尾 return 可省略,已有编译器隐式返回 Nil。
改节点先编辑 ../Endor.asdl,再用 scripts/generate_ast.py 更新 Rust/编辑器产物,契约见 [AST 模型](../../../docs/runtime/ast.md)。改输入适配时同步 [阅读器契约](../../../docs/runtime/reader.md) 与读取错误检查;改词法从 lexer.peg 进入,并同步 token、诊断和错误检查;改语法从 grammar.peg 进入,并同步 AST、[测试](../tests/README.md)、样例与 [前端契约](../../../docs/runtime/frontend.md)。词法与语法两份 PEG 动作均不做 VM 分配、I/O 或修改外部状态,避免回溯造成副作用。返回 [frontend](../README.md)。
+6 -4
View File
@@ -26,9 +26,11 @@ pub trait Spanned {
impl Program {
/// Iterate the currently supported top-level function declarations.
pub fn functions(&self) -> impl Iterator<Item = &Function> {
self.declarations.iter().map(|declaration| {
let DeclKind::Function(function) = &declaration.kind;
function
})
self.declarations
.iter()
.filter_map(|declaration| match &declaration.kind {
DeclKind::Function(function) => Some(function),
DeclKind::Class(_) => None,
})
}
}
+32 -1
View File
@@ -3,7 +3,7 @@
use super::Spanned;
use crate::Span;
pub const AST_SCHEMA_ID: &str =
"urn:endor:ast:sha256:8c89fde6c029357a0809751c41cb46d59972b987bbe1b25c0cced4bfcdbe2a7b";
"urn:endor:ast:sha256:ad2ac52943dd26e08395c0d2698861da98bb89c360241c4712c769de86709fd0";
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
pub struct AstDocument {
@@ -63,16 +63,32 @@ impl Spanned for Decl {
#[serde(tag = "kind", content = "data", deny_unknown_fields)]
pub enum DeclKind {
Function(Function),
Class(Class),
}
impl Spanned for DeclKind {
fn span(&self) -> Span {
match self {
Self::Function(node) => node.span(),
Self::Class(node) => node.span(),
}
}
}
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Class {
pub name: Name,
pub base: Option<Name>,
pub fields: Vec<Parameter>,
pub methods: Vec<Function>,
pub span: Span,
}
impl Spanned for Class {
fn span(&self) -> Span {
self.span
}
}
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Function {
pub name: Name,
pub parameters: Vec<Parameter>,
@@ -124,6 +140,7 @@ impl Spanned for Stmt {
pub enum StmtKind {
Binding(Binding),
Assignment(Assignment),
MemberAssignment(MemberAssignment),
Return(ReturnStatement),
Expression(Expr),
Declaration(Decl),
@@ -133,6 +150,7 @@ impl Spanned for StmtKind {
match self {
Self::Binding(node) => node.span(),
Self::Assignment(node) => node.span(),
Self::MemberAssignment(node) => node.span(),
Self::Return(node) => node.span(),
Self::Expression(node) => node.span(),
Self::Declaration(node) => node.span(),
@@ -165,6 +183,19 @@ impl Spanned for Assignment {
}
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
pub struct MemberAssignment {
pub object: Expr,
pub name: Name,
pub value: Expr,
pub span: Span,
}
impl Spanned for MemberAssignment {
fn span(&self) -> Span {
self.span
}
}
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
#[serde(deny_unknown_fields)]
pub struct ReturnStatement {
pub value: Option<Expr>,
pub span: Span,
+45 -3
View File
@@ -1,9 +1,9 @@
// Generated by scripts/generate_ast.py from Endor.asdl. Do not edit.
use super::{
Assignment, AstDocument, AstRoot, BinaryOp, Binding, Block, Decl, DeclKind, Expr, ExprKind,
Function, InteractiveInput, Name, Parameter, Program, ReturnStatement, Spanned, Stmt, StmtKind,
UnaryOp,
Assignment, AstDocument, AstRoot, BinaryOp, Binding, Block, Class, Decl, DeclKind, Expr,
ExprKind, Function, InteractiveInput, MemberAssignment, Name, Parameter, Program,
ReturnStatement, Spanned, Stmt, StmtKind, UnaryOp,
};
use crate::Span;
pub trait Visitor {
@@ -48,6 +48,12 @@ pub trait Visitor {
self.leave_node();
result
}
fn visit_class(&mut self, node: &Class) -> Result<(), Self::Error> {
self.enter_node(node.span())?;
let result = walk_class(self, node);
self.leave_node();
result
}
fn visit_function(&mut self, node: &Function) -> Result<(), Self::Error> {
self.enter_node(node.span())?;
let result = walk_function(self, node);
@@ -90,6 +96,12 @@ pub trait Visitor {
self.leave_node();
result
}
fn visit_member_assignment(&mut self, node: &MemberAssignment) -> Result<(), Self::Error> {
self.enter_node(node.span())?;
let result = walk_member_assignment(self, node);
self.leave_node();
result
}
fn visit_return_statement(&mut self, node: &ReturnStatement) -> Result<(), Self::Error> {
self.enter_node(node.span())?;
let result = walk_return_statement(self, node);
@@ -163,9 +175,26 @@ pub fn walk_decl_kind<V: Visitor + ?Sized>(
DeclKind::Function(value) => {
visitor.visit_function(value)?;
}
DeclKind::Class(value) => {
visitor.visit_class(value)?;
}
}
Ok(())
}
pub fn walk_class<V: Visitor + ?Sized>(visitor: &mut V, node: &Class) -> Result<(), V::Error> {
visitor.visit_name(&node.name)?;
if let Some(value) = &node.base {
visitor.visit_name(value)?;
}
for value in &node.fields {
visitor.visit_parameter(value)?;
}
for value in &node.methods {
visitor.visit_function(value)?;
}
visitor.visit_span(&node.span)?;
Ok(())
}
pub fn walk_function<V: Visitor + ?Sized>(
visitor: &mut V,
node: &Function,
@@ -211,6 +240,9 @@ pub fn walk_stmt_kind<V: Visitor + ?Sized>(
StmtKind::Assignment(value) => {
visitor.visit_assignment(value)?;
}
StmtKind::MemberAssignment(value) => {
visitor.visit_member_assignment(value)?;
}
StmtKind::Return(value) => {
visitor.visit_return_statement(value)?;
}
@@ -238,6 +270,16 @@ pub fn walk_assignment<V: Visitor + ?Sized>(
visitor.visit_span(&node.span)?;
Ok(())
}
pub fn walk_member_assignment<V: Visitor + ?Sized>(
visitor: &mut V,
node: &MemberAssignment,
) -> Result<(), V::Error> {
visitor.visit_expr(&node.object)?;
visitor.visit_name(&node.name)?;
visitor.visit_expr(&node.value)?;
visitor.visit_span(&node.span)?;
Ok(())
}
pub fn walk_return_statement<V: Visitor + ?Sized>(
visitor: &mut V,
node: &ReturnStatement,
+35 -2
View File
@@ -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 }
+9 -3
View File
@@ -1,6 +1,7 @@
use crate::ast::{
Assignment, AstRoot, BinaryOp, Binding, Block, Decl, DeclKind, Expr, ExprKind, Function,
InteractiveInput, Name, Parameter, Program, ReturnStatement, Stmt, StmtKind, UnaryOp,
Assignment, AstRoot, BinaryOp, Binding, Block, Class, Decl, DeclKind, Expr, ExprKind, Function,
InteractiveInput, MemberAssignment, Name, Parameter, Program, ReturnStatement, Stmt, StmtKind,
UnaryOp,
};
use crate::lexer::decode_string;
use crate::{Diagnostic, DiagnosticKind, Span, Token, TokenKind, lex};
@@ -44,7 +45,7 @@ pub fn parse_source_expression(
parse_expression(source.text()).map_err(|error| source.annotate(error))
}
/// Parse one or more basic typed function declarations. This is a syntax
/// Parse one or more typed function or class declarations. This is a syntax
/// operation: type names and name references are retained without resolution.
pub fn parse(source: &str) -> Result<Program, Diagnostic> {
let tokens = lex(source)?;
@@ -93,6 +94,11 @@ enum Suffix {
Call(Vec<Expr>, Span),
}
enum ClassMember {
Field(Parameter),
Method(Function),
}
fn postfix(expression: Expr, suffix: Suffix) -> Expr {
match suffix {
Suffix::Member(name) => Expr {
+1 -1
View File
@@ -2,7 +2,7 @@
[syntax.rs](syntax.rs) 覆盖 UTF-8 token 范围、中文/日文名称、数字原文、负号、字符串转义与错误、算术优先级和结合性、成员/调用链、函数与绑定、上下文名称、完整输入、非法/未支持语法以及 CRLF 和 EOF 诊断位置。
[ast.rs](ast.rs) 覆盖根模式、声明/语句结构、生成 Visitor 与错误退出、Spanned 位置、带 schema 的 JSON 往返及错误输入;同时核对编辑器产物标识,并验证裸名称赋值的独立节点、Unicode 范围、JSON 往返和不支持的赋值目标。
[ast.rs](ast.rs) 覆盖根模式、声明/语句结构、生成 Visitor 与错误退出、Spanned 位置、带 schema 的 JSON 往返及错误输入;同时核对编辑器产物标识,并验证裸名称赋值的独立节点、Unicode 范围、JSON 往返和属性赋值目标和不支持的调用结果赋值目标。
[lexical.rs](lexical.rs) 专门覆盖字符 PEG 迁移后的原文位置换算、首个错误及详细诊断、Unicode 非法转义、未闭合字符串、注释/除法/成员/数字/字符串边界和空输入/尾随注释。
+38 -1
View File
@@ -4,6 +4,35 @@ use frontend::ast::{
};
use frontend::{EndorReader, ParseMode, Span, parse_ast, parse_source_ast};
#[test]
fn function_bodies_accept_method_statements_and_optional_trailing_return() {
let root = parse_ast(
"function click(): Unit { title.setText(\"changed\") card.setColor(\"#FFEEDD\") }",
ParseMode::Module,
)
.unwrap();
let AstRoot::Module(program) = root else {
panic!("expected module")
};
let function = program.functions().next().unwrap();
assert_eq!(function.body.statements.len(), 2);
assert!(
function
.body
.statements
.iter()
.all(|s| matches!(s.kind, StmtKind::Expression(_)))
);
assert!(parse_ast("function empty(): Unit {}", ParseMode::Module).is_ok());
assert!(
parse_ast(
"function invalid(): Unit { return value other() }",
ParseMode::Module
)
.is_err()
);
}
#[test]
fn parse_modes_produce_distinct_roots_and_preserve_source_diagnostics() {
let source = "function echo(value: String): String { let copy = value return copy }";
@@ -198,5 +227,13 @@ fn bare_assignment_has_its_own_ast_and_unicode_source_ranges() {
let json = document.to_json().unwrap();
assert_eq!(AstDocument::from_json(&json).unwrap(), document);
assert!(parse_ast("value = 1 = 2", ParseMode::Interactive).is_err());
assert!(parse_ast("object.field = 1", ParseMode::Interactive).is_err());
let member = parse_ast("object.field = 1", ParseMode::Interactive).unwrap();
let AstRoot::Interactive(member) = member else {
panic!("interactive")
};
assert!(matches!(
&member.statements[0].kind,
StmtKind::MemberAssignment(_)
));
assert!(parse_ast("object() = 1", ParseMode::Interactive).is_err());
}
+3 -4
View File
@@ -4,7 +4,9 @@ use frontend::ast::{
use frontend::{DiagnosticKind, Span, TokenKind, lex, parse, parse_expression};
fn function(program: &Program, index: usize) -> &Function {
let DeclKind::Function(function) = &program.declarations[index].kind;
let DeclKind::Function(function) = &program.declarations[index].kind else {
panic!("expected function")
};
function
}
@@ -258,14 +260,11 @@ fn parser_requires_complete_input_and_rejects_unimplemented_or_malformed_syntax(
"// empty",
"let x = 1",
"use atelier:shop.data",
"class Product {}",
"agent Worker {}",
"function f() { return 1 }",
"function f(x): Number { return x }",
"function f(x: Number,): Number { return x }",
"function f(): Number {}",
"function f(): Number { return 1 let x = 2 }",
"function f(): Number { let x = 1 }",
"function f(): Number { return 1 } extra",
"function f(): Number { function g(): Number { return 1 } return 2 }",
] {