Skip to content

Commit

Permalink
Merge pull request #139 from erg-lang/fix-parser
Browse files Browse the repository at this point in the history 
Impl some unimplemented parsing methods
  • Loading branch information
@mtshiba
mtshiba authored Sep 10, 2022
2 parents f59b27a + b0a93b5 commit e9e6a27
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 37 deletions.
6 changes: 6 additions & 0 deletions compiler/erg_parser/ast.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2132,6 +2132,12 @@ impl NestedDisplay for ParamTuplePattern {
impl_display_from_nested!(ParamTuplePattern);
impl_locational!(ParamTuplePattern, elems);

impl ParamTuplePattern {
pub const fn new(elems: Params) -> Self {
Self { elems }
}
}

#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct ParamRecordPattern {
l_brace: Token,
Expand Down
33 changes: 27 additions & 6 deletions compiler/erg_parser/desugar.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ use erg_common::Str;
use erg_common::{enum_unwrap, get_hash, set};

use crate::ast::{
Accessor, Args, Array, BinOp, Block, Call, DataPack, Def, DefBody, DefId, Expr, Identifier,
KwArg, Lambda, LambdaSignature, Literal, Methods, Module, NormalArray, NormalRecord,
NormalTuple, ParamPattern, ParamSignature, Params, PosArg, Record, RecordAttrs,
ShortenedRecord, Signature, SubrSignature, Tuple, TypeAscription, TypeBoundSpecs, TypeSpec,
UnaryOp, VarName, VarPattern, VarRecordAttr, VarSignature,
Accessor, Args, Array, ArrayComprehension, ArrayWithLength, BinOp, Block, Call, DataPack, Def,
DefBody, DefId, Expr, Identifier, KwArg, Lambda, LambdaSignature, Literal, Methods, Module,
NormalArray, NormalRecord, NormalTuple, ParamPattern, ParamSignature, Params, PosArg, Record,
RecordAttrs, ShortenedRecord, Signature, SubrSignature, Tuple, TypeAscription, TypeBoundSpecs,
TypeSpec, UnaryOp, VarName, VarPattern, VarRecordAttr, VarSignature,
};
use crate::token::{Token, TokenKind};

Expand Down Expand Up @@ -383,7 +383,28 @@ impl Desugarer {
let arr = NormalArray::new(arr.l_sqbr, arr.r_sqbr, elems);
Expr::Array(Array::Normal(arr))
}
_ => todo!(),
Array::WithLength(arr) => {
let elem = PosArg::new(self.rec_desugar_shortened_record(arr.elem.expr));
let len = self.rec_desugar_shortened_record(*arr.len);
let arr = ArrayWithLength::new(arr.l_sqbr, arr.r_sqbr, elem, len);
Expr::Array(Array::WithLength(arr))
}
Array::Comprehension(arr) => {
let elem = self.rec_desugar_shortened_record(*arr.elem);
let generators = arr
.generators
.into_iter()
.map(|(ident, gen)| (ident, self.rec_desugar_shortened_record(gen)))
.collect();
let guards = arr
.guards
.into_iter()
.map(|guard| self.rec_desugar_shortened_record(guard))
.collect();
let arr =
ArrayComprehension::new(arr.l_sqbr, arr.r_sqbr, elem, generators, guards);
Expr::Array(Array::Comprehension(arr))
}
},
Expr::Tuple(tuple) => match tuple {
Tuple::Normal(tup) => {
Expand Down
101 changes: 70 additions & 31 deletions compiler/erg_parser/parse.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1702,9 +1702,9 @@ impl Parser {
}
}

fn convert_accessor_to_var_sig(&mut self, _accessor: Accessor) -> ParseResult<VarSignature> {
fn convert_accessor_to_var_sig(&mut self, accessor: Accessor) -> ParseResult<VarSignature> {
debug_call_info!(self);
match _accessor {
match accessor {
Accessor::Ident(ident) => {
let pat = VarPattern::Ident(ident);
self.level -= 1;
Expand All @@ -1719,9 +1719,33 @@ impl Parser {
}
}

fn convert_array_to_array_pat(&mut self, _array: Array) -> ParseResult<VarArrayPattern> {
fn convert_array_to_array_pat(&mut self, array: Array) -> ParseResult<VarArrayPattern> {
debug_call_info!(self);
todo!()
match array {
Array::Normal(arr) => {
let mut vars = Vars::empty();
for elem in arr.elems.into_iters().0 {
let pat = self
.convert_rhs_to_sig(elem.expr)
.map_err(|_| self.stack_dec())?;
match pat {
Signature::Var(v) => {
vars.push(v);
}
Signature::Subr(subr) => {
self.level -= 1;
let err = ParseError::simple_syntax_error(line!() as usize, subr.loc());
self.errs.push(err);
return Err(());
}
}
}
let pat = VarArrayPattern::new(arr.l_sqbr, vars, arr.r_sqbr);
self.level -= 1;
Ok(pat)
}
_ => todo!(),
}
}

fn convert_record_to_record_pat(&mut self, record: Record) -> ParseResult<VarRecordPattern> {
Expand Down Expand Up @@ -1998,12 +2022,20 @@ impl Parser {
Ok(param)
}

fn convert_array_to_param_array_pat(
&mut self,
_array: Array,
) -> ParseResult<ParamArrayPattern> {
fn convert_array_to_param_array_pat(&mut self, array: Array) -> ParseResult<ParamArrayPattern> {
debug_call_info!(self);
todo!()
match array {
Array::Normal(arr) => {
let mut params = vec![];
for arg in arr.elems.into_iters().0 {
params.push(self.convert_pos_arg_to_non_default_param(arg, false)?);
}
let params = Params::new(params, None, vec![], None);
self.level -= 1;
Ok(ParamArrayPattern::new(arr.l_sqbr, params, arr.r_sqbr))
}
_ => todo!(),
}
}

fn convert_record_to_param_record_pat(
Expand All @@ -2014,12 +2046,20 @@ impl Parser {
todo!()
}

fn convert_tuple_to_param_tuple_pat(
&mut self,
_tuple: Tuple,
) -> ParseResult<ParamTuplePattern> {
fn convert_tuple_to_param_tuple_pat(&mut self, tuple: Tuple) -> ParseResult<ParamTuplePattern> {
debug_call_info!(self);
todo!()
match tuple {
Tuple::Normal(tup) => {
let mut params = vec![];
let (elems, _, parens) = tup.elems.deconstruct();
for arg in elems.into_iter() {
params.push(self.convert_pos_arg_to_non_default_param(arg, false)?);
}
let params = Params::new(params, None, vec![], parens);
self.level -= 1;
Ok(ParamTuplePattern::new(params))
}
}
}

fn convert_type_asc_to_param_pattern(
Expand Down Expand Up @@ -2056,7 +2096,7 @@ impl Parser {
}
Expr::Array(array) => {
let arr = self
.convert_array_to_param_pat(array)
.convert_array_to_param_array_pat(array)
.map_err(|_| self.stack_dec())?;
let param = ParamSignature::new(ParamPattern::Array(arr), None, None);
let params = Params::new(vec![param], None, vec![], None);
Expand All @@ -2065,7 +2105,7 @@ impl Parser {
}
Expr::Record(record) => {
let rec = self
.convert_record_to_param_pat(record)
.convert_record_to_param_record_pat(record)
.map_err(|_| self.stack_dec())?;
let param = ParamSignature::new(ParamPattern::Record(rec), None, None);
let params = Params::new(vec![param], None, vec![], None);
Expand All @@ -2088,12 +2128,21 @@ impl Parser {
}
}

fn convert_accessor_to_param_sig(
&mut self,
_accessor: Accessor,
) -> ParseResult<ParamSignature> {
fn convert_accessor_to_param_sig(&mut self, accessor: Accessor) -> ParseResult<ParamSignature> {
debug_call_info!(self);
todo!()
match accessor {
Accessor::Ident(ident) => {
let pat = ParamPattern::VarName(ident.name);
self.level -= 1;
Ok(ParamSignature::new(pat, None, None))
}
other => {
self.level -= 1;
let err = ParseError::simple_syntax_error(line!() as usize, other.loc());
self.errs.push(err);
Err(())
}
}
}

fn convert_tuple_to_params(&mut self, tuple: Tuple) -> ParseResult<Params> {
Expand All @@ -2120,16 +2169,6 @@ impl Parser {
}
}

fn convert_array_to_param_pat(&mut self, _array: Array) -> ParseResult<ParamArrayPattern> {
debug_call_info!(self);
todo!()
}

fn convert_record_to_param_pat(&mut self, _record: Record) -> ParseResult<ParamRecordPattern> {
debug_call_info!(self);
todo!()
}

fn convert_type_asc_to_lambda_sig(
&mut self,
_tasc: TypeAscription,
Expand Down

0 comments on commit e9e6a27

Please sign in to comment.