Skip to content

fix(compiler): fix lang server cell parsing #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rohanku merged 6 commits into from
Apr 30, 2026
Merged

fix(compiler): fix lang server cell parsing #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bb744d
fix(compiler): fix lang server cell parsing
rohanku Apr 26, 2026
c0e922d
fix precedence
rohanku Apr 26, 2026
a282006
revert precedence change
rohanku Apr 26, 2026
6de22dc
wip: fix precedence bug
rohanku Apr 30, 2026
fa17f20
cleanup and finish fixing parser
rohanku Apr 30, 2026
81af64b
fix clippy
rohanku Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions core/compiler/grammar/Argon.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ scopeAnnotation

unannotatedScope
: LBRACE statements RBRACE
| LBRACE statements nonBlockExpr RBRACE
| LBRACE statements expr RBRACE
;

statements
Expand All @@ -131,13 +131,6 @@ forLoop
: FOR ident IN expr scope
;

expr
: nonBlockExpr
| ifExpr
| matchExpr
| scope
;

ifExpr
: scopeAnnotation? IF expr scope ELSE scope
;
Expand All @@ -154,21 +147,23 @@ matchArm
: identPath FAT_ARROW expr COMMA
;

nonBlockExpr
: BANG nonBlockExpr
| MINUS nonBlockExpr
| nonBlockExpr DOT ident
| nonBlockExpr DOT intLiteral
| nonBlockExpr LBRACK expr RBRACK
| nonBlockExpr BANG
| nonBlockExpr AS tySpec
| nonBlockExpr (STAR | SLASH | PERCENT) nonBlockExpr
| nonBlockExpr (PLUS | MINUS) nonBlockExpr
| nonBlockExpr (EQEQ | NEQ | GEQ | GT | LEQ | LT) nonBlockExpr
expr
: unaryOp=(BANG|MINUS) expr
| fieldAccessBase=expr DOT ident
| indexFieldAccessBase=expr DOT intLiteral
| indexBase=expr LBRACK expr RBRACK
| emitValue=expr BANG
| castValue=expr AS tySpec
| expr binaryOp=(STAR | SLASH | PERCENT) expr
| expr binaryOp=(PLUS | MINUS) expr
| expr comparisonOp=(EQEQ | NEQ | GEQ | GT | LEQ | LT) expr
| nilLiteral
| seqNilLiteral
| tupleExpr
| LPAREN expr RPAREN
| ifExpr
| matchExpr
| scope
| callExpr
| identPath
| literal
Expand Down
200 changes: 74 additions & 126 deletions core/compiler/src/antlr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::cell::RefCell;
use std::path::PathBuf;
use std::rc::Rc;

use antlr_rust::TidExt;
use antlr_rust::common_token_stream::CommonTokenStream;
use antlr_rust::error_listener::ErrorListener;
use antlr_rust::parser_rule_context::ParserRuleContext;
Expand Down Expand Up @@ -364,9 +363,7 @@ impl<'input> AstBuilder<'input> {
.statements()
.map(|stmts| self.build_statements(stmts.as_ref()))
.unwrap_or_default();
let mut tail = ctx
.nonBlockExpr()
.map(|expr| self.build_non_block_expr(expr.as_ref()));
let mut tail = ctx.expr().map(|expr| self.build_expr(expr.as_ref()));
if tail.is_none()
&& let Some(Statement::Expr {
value,
Expand Down Expand Up @@ -444,18 +441,6 @@ impl<'input> AstBuilder<'input> {
}
}

fn build_expr(&mut self, ctx: &ExprContext<'input>) -> Expr<&'input str, ParseMetadata> {
if let Some(if_expr) = ctx.ifExpr() {
Expr::If(Box::new(self.build_if_expr(if_expr.as_ref())))
} else if let Some(match_expr) = ctx.matchExpr() {
Expr::Match(Box::new(self.build_match_expr(match_expr.as_ref())))
} else if let Some(scope) = ctx.scope() {
Expr::Scope(Box::new(self.build_scope(scope.as_ref())))
} else {
self.build_non_block_expr(ctx.nonBlockExpr().unwrap().as_ref())
}
}

fn build_if_expr(&mut self, ctx: &IfExprContext<'input>) -> IfExpr<&'input str, ParseMetadata> {
IfExpr {
scope_annotation: ctx
Expand Down Expand Up @@ -502,84 +487,87 @@ impl<'input> AstBuilder<'input> {
}
}

fn build_non_block_expr(
&mut self,
ctx: &NonBlockExprContext<'input>,
) -> Expr<&'input str, ParseMetadata> {
if ctx.start().get_token_type() == BANG {
let operand = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
fn build_expr(&mut self, ctx: &ExprContext<'input>) -> Expr<&'input str, ParseMetadata> {
if let Some(op) = &ctx.unaryOp {
let op = match op.get_token_type() {
BANG => UnaryOp::Not,
MINUS => UnaryOp::Neg,
_ => unreachable!("invalid unary op"),
};
let operand = self.build_expr(ctx.expr(0).unwrap().as_ref());
Expr::UnaryOp(Box::new(UnaryOpExpr {
op: UnaryOp::Not,
op,
operand,
span: self.span_of(ctx),
metadata: (),
}))
} else if ctx.start().get_token_type() == MINUS {
let operand = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
Expr::UnaryOp(Box::new(UnaryOpExpr {
op: UnaryOp::Neg,
operand,
} else if let Some(base) = &ctx.fieldAccessBase {
Expr::FieldAccess(Box::new(FieldAccessExpr {
base: self.build_expr(base),
field: self.build_ident(ctx.ident().as_ref().unwrap()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(rhs) = ctx.nonBlockExpr(1) {
let left = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
let right = self.build_non_block_expr(rhs.as_ref());
let span = Span::new(left.span().start(), right.span().end());
if let Some(op) = self.single_comparison_op(ctx) {
Expr::Comparison(Box::new(ComparisonExpr {
op,
left,
right,
span,
metadata: (),
}))
} else {
Expr::BinOp(Box::new(BinOpExpr {
op: self.single_bin_op(ctx),
left,
right,
span,
metadata: (),
}))
}
} else if let Some(ty) = ctx.tySpec() {
let value = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
let ty = self.build_ty_spec(ty.as_ref());
let span = Span::new(value.span().start(), ty.span.end());
} else if let Some(base) = &ctx.indexFieldAccessBase {
Expr::IndexFieldAccess(Box::new(IndexFieldAccessExpr {
base: self.build_expr(base),
field: self.build_int_literal(ctx.intLiteral().as_ref().unwrap()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(base) = &ctx.indexBase {
Expr::Index(Box::new(IndexExpr {
base: self.build_expr(base),
index: self.build_expr(ctx.expr(1).unwrap().as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(value) = &ctx.emitValue {
Expr::Emit(Box::new(EmitExpr {
value: self.build_expr(value),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(value) = &ctx.castValue {
Expr::Cast(Box::new(CastExpr {
value,
ty,
span,
value: self.build_expr(value),
ty: self.build_ty_spec(ctx.tySpec().unwrap().as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(ident) = ctx.ident() {
let base = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
Expr::FieldAccess(Box::new(FieldAccessExpr {
base,
field: self.build_ident(ident.as_ref()),
} else if let Some(op) = &ctx.binaryOp {
let op = match op.get_token_type() {
STAR => BinOp::Mul,
SLASH => BinOp::Div,
PERCENT => BinOp::Rem,
PLUS => BinOp::Add,
MINUS => BinOp::Sub,
_ => unreachable!("invalid binary op"),
};
Expr::BinOp(Box::new(BinOpExpr {
op,
left: self.build_expr(ctx.expr(0).unwrap().as_ref()),
right: self.build_expr(ctx.expr(1).unwrap().as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(intlit) = ctx.intLiteral() {
let base = self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref());
Expr::IndexFieldAccess(Box::new(IndexFieldAccessExpr {
base,
field: self.build_int_literal(intlit.as_ref()),
} else if let Some(op) = &ctx.comparisonOp {
let op = match op.get_token_type() {
EQEQ => ComparisonOp::Eq,
NEQ => ComparisonOp::Ne,
GEQ => ComparisonOp::Geq,
GT => ComparisonOp::Gt,
LEQ => ComparisonOp::Leq,
LT => ComparisonOp::Lt,
_ => unreachable!("invalid comparison op"),
};
Expr::Comparison(Box::new(ComparisonExpr {
op,
left: self.build_expr(ctx.expr(0).unwrap().as_ref()),
right: self.build_expr(ctx.expr(1).unwrap().as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
} else if let Some(expr) = ctx.expr() {
if let Some(base) = ctx.nonBlockExpr(0) {
Expr::Index(Box::new(IndexExpr {
base: self.build_non_block_expr(base.as_ref()),
index: self.build_expr(expr.as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
} else {
self.build_expr(expr.as_ref())
}
} else if let Some(nil) = ctx.nilLiteral() {
Expr::Nil(NilLiteral {
span: self.span_of(nil.as_ref()),
Expand All @@ -590,18 +578,22 @@ impl<'input> AstBuilder<'input> {
})
} else if let Some(tuple) = ctx.tupleExpr() {
Expr::Tuple(self.build_tuple_expr(tuple.as_ref()))
} else if let Some(expr) = ctx.expr(0) {
self.build_expr(expr.as_ref())
} else if let Some(if_expr) = ctx.ifExpr() {
Expr::If(Box::new(self.build_if_expr(if_expr.as_ref())))
} else if let Some(match_expr) = ctx.matchExpr() {
Expr::Match(Box::new(self.build_match_expr(match_expr.as_ref())))
} else if let Some(scope) = ctx.scope() {
Expr::Scope(Box::new(self.build_scope(scope.as_ref())))
} else if let Some(call) = ctx.callExpr() {
Expr::Call(self.build_call_expr(call.as_ref()))
} else if let Some(path) = ctx.identPath() {
Expr::IdentPath(self.build_ident_path(path.as_ref()))
} else if let Some(literal) = ctx.literal() {
self.build_literal(literal.as_ref())
} else {
Expr::Emit(Box::new(EmitExpr {
value: self.build_non_block_expr(ctx.nonBlockExpr(0).unwrap().as_ref()),
span: self.span_of(ctx),
metadata: (),
}))
unreachable!("should cover all productions");
}
}

Expand Down Expand Up @@ -811,50 +803,6 @@ impl<'input> AstBuilder<'input> {
}
}

fn single_comparison_op(&self, ctx: &NonBlockExprContext<'input>) -> Option<ComparisonOp> {
self.terminal_types(ctx)
.into_iter()
.filter_map(|ttype| match ttype {
EQEQ => Some(ComparisonOp::Eq),
NEQ => Some(ComparisonOp::Ne),
GEQ => Some(ComparisonOp::Geq),
GT => Some(ComparisonOp::Gt),
LEQ => Some(ComparisonOp::Leq),
LT => Some(ComparisonOp::Lt),
_ => None,
})
.next()
}

fn single_bin_op(&self, ctx: &NonBlockExprContext<'input>) -> BinOp {
self.terminal_types(ctx)
.into_iter()
.find_map(|ttype| match ttype {
PLUS => Some(BinOp::Add),
MINUS => Some(BinOp::Sub),
STAR => Some(BinOp::Mul),
SLASH => Some(BinOp::Div),
PERCENT => Some(BinOp::Rem),
_ => None,
})
.unwrap_or_else(|| {
unreachable!("binary nonBlockExpr must contain an arithmetic operator")
})
}

fn terminal_types<T>(&self, ctx: &T) -> Vec<isize>
where
T: ParserRuleContext<'input, Ctx = ArgonParserContextType>,
{
let mut tokens = Vec::new();
for child in ctx.get_children() {
if let Ok(tok) = child.downcast_rc::<TerminalNode<'input, ArgonParserContextType>>() {
tokens.push(tok.symbol.get_token_type());
}
}
tokens
}

fn span_of<T>(&self, ctx: &T) -> Span
where
T: ParserRuleContext<'input, Ctx = ArgonParserContextType>,
Expand Down
49 changes: 0 additions & 49 deletions core/compiler/src/argon.l
View file
Open in desktop

This file was deleted.

Loading
Loading