j/Conlang
1
1
Fork 0
Code Issues 5 Pull Requests Packages Projects 2 Releases Wiki Activity

cl-ast: Remove Param, replace with flat Pattern

Browse Source
This commit is contained in:
John 2025-02-23 02:01:38 -06:00
parent e3d94d8949
commit cc6168b55e
10 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/cl-ast/src/ast.rs
View File

@ -145,17 +145,10 @@ pub enum ModuleKind {
pub struct Function {
pub name: Sym,
pub sign: TyFn,
pub bind: Vec<Param>,
pub bind: Vec<Pattern>,
pub body: Option<Expr>,
}
/// A single parameter for a [Function]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct Param {
pub mutability: Mutability,
pub bind: Pattern,
}
/// A user-defined product type
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct Struct {

7
compiler/cl-ast/src/ast_impl.rs
View File

@ -192,13 +192,6 @@ mod display {
}
}
impl Display for Param {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let Self { mutability, bind } = self;
write!(f, "{mutability}{bind}")
}
}
impl Display for Struct {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let Self { name, kind } = self;

6
compiler/cl-ast/src/ast_visitor/fold.rs
View File

@ -106,14 +106,10 @@ pub trait Fold {
Function {
name: self.fold_sym(name),
sign: self.fold_ty_fn(sign),
bind: bind.into_iter().map(|p| self.fold_param(p)).collect(),
bind: bind.into_iter().map(|p| self.fold_pattern(p)).collect(),
body: body.map(|b| self.fold_expr(b)),
}
}
fn fold_param(&mut self, p: Param) -> Param {
let Param { mutability, bind } = p;
Param { mutability: self.fold_mutability(mutability), bind: self.fold_pattern(bind) }
}
fn fold_struct(&mut self, s: Struct) -> Struct {
let Struct { name, kind } = s;
Struct { name: self.fold_sym(name), kind: self.fold_struct_kind(kind) }

7
compiler/cl-ast/src/ast_visitor/visit.rs
View File

@ -83,16 +83,11 @@ pub trait Visit<'a>: Sized {
let Function { name, sign, bind, body } = f;
self.visit_sym(name);
self.visit_ty_fn(sign);
bind.iter().for_each(|p| self.visit_param(p));
bind.iter().for_each(|p| self.visit_pattern(p));
if let Some(b) = body {
self.visit_expr(b)
}
}
fn visit_param(&mut self, p: &'a Param) {
let Param { mutability, bind } = p;
self.visit_mutability(mutability);
self.visit_pattern(bind);
}
fn visit_struct(&mut self, s: &'a Struct) {
let Struct { name, kind } = s;
self.visit_sym(name);

4
compiler/cl-interpret/src/function.rs
View File

@ -3,7 +3,7 @@
use collect_upvars::collect_upvars;
use super::{pattern, Callable, ConValue, Environment, Error, IResult, Interpret};
use cl_ast::{Function as FnDecl, Param, Sym};
use cl_ast::{Function as FnDecl, Sym};
use std::{
cell::{Ref, RefCell},
collections::HashMap,
@ -70,7 +70,7 @@ impl Callable for Function {
// TODO: completely refactor data storage
let mut frame = env.frame("fn args");
for (Param { mutability: _, bind }, value) in bind.iter().zip(args) {
for (bind, value) in bind.iter().zip(args) {
for (name, value) in pattern::substitution(bind, value.clone())? {
frame.insert(*name, Some(value));
}

6
compiler/cl-interpret/src/function/collect_upvars.rs
View File

@ -1,6 +1,6 @@
//! Collects the "Upvars" of a function at the point of its creation, allowing variable capture
use crate::{convalue::ConValue, env::Environment};
use cl_ast::{ast_visitor::visit::*, Function, Let, Param, Path, PathPart, Pattern, Sym};
use cl_ast::{ast_visitor::visit::*, Function, Let, Path, PathPart, Pattern, Sym};
use std::collections::{HashMap, HashSet};
pub fn collect_upvars(f: &Function, env: &Environment) -> super::Upvars {
@ -67,9 +67,7 @@ impl<'a> Visit<'a> for CollectUpvars<'_> {
fn visit_function(&mut self, f: &'a cl_ast::Function) {
let Function { name: _, sign: _, bind, body } = f;
// parameters can never be upvars
for Param { mutability: _, bind } in bind {
self.visit_pattern(bind);
}
bind.iter().for_each(|pat| self.visit_pattern(pat));
if let Some(body) = body {
self.visit_expr(body);
}

5
compiler/cl-interpret/src/interpret.rs
View File

@ -137,10 +137,7 @@ impl Interpret for Struct {
bind: args
.iter()
.enumerate()
.map(|(idx, _)| Param {
mutability: Mutability::Not,
bind: Pattern::Name(idx.to_string().into()),
})
.map(|(idx, _)| Pattern::Name(idx.to_string().into()))
.collect(),
body: None,
};

13
compiler/cl-parser/src/parser.rs
View File

@ -469,7 +469,7 @@ impl Parse<'_> for Function {
}
}
type FnSig = (Vec<Param>, Vec<TyKind>);
type FnSig = (Vec<Pattern>, Vec<TyKind>);
impl Parse<'_> for FnSig {
/// Parses the [parameters](Param) associated with a Function
@ -488,16 +488,17 @@ impl Parse<'_> for FnSig {
}
}
type TypedParam = (Param, TyKind);
type TypedParam = (Pattern, TyKind);
impl Parse<'_> for TypedParam {
/// Parses a single function [parameter](Param)
fn parse(p: &mut Parser) -> PResult<(Param, TyKind)> {
fn parse(p: &mut Parser) -> PResult<(Pattern, TyKind)> {
Ok((
Param { mutability: Mutability::parse(p)?, bind: Pattern::parse(p)? },
{
p.match_type(TokenKind::Colon, Parsing::Param)?;
Pattern::parse(p)?,
if p.match_type(TokenKind::Colon, Parsing::Param).is_ok() {
TyKind::parse(p)?
} else {
TyKind::Path(Path::from(Sym::from("_")))
},
))
}

6
compiler/cl-repl/examples/yaml.rs
View File

@ -641,12 +641,6 @@ pub mod yamlify {
y.value(self);
}
}
impl Yamlify for Param {
fn yaml(&self, y: &mut Yamler) {
let Self { mutability, bind } = self;
y.key("Param").yaml(mutability).pair("pat", bind);
}
}
impl Yamlify for Ty {
fn yaml(&self, y: &mut Yamler) {
let Self { extents: _, kind } = self;

2
compiler/cl-typeck/src/stage/populate.rs
View File

@ -106,7 +106,7 @@ impl<'a> Visit<'a> for Populator<'_, 'a> {
self.set_name(*name);
self.visit_ty_fn(sign);
bind.iter().for_each(|p| self.visit_param(p));
bind.iter().for_each(|p| self.visit_pattern(p));
if let Some(b) = body {
self.visit_expr(b)
}