Skip to content
This repository has been archived by the owner on Jun 29, 2024. It is now read-only.

Commit

Permalink
Add missing positions in ast tree
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gashmob
Gashmob committed Aug 28, 2023
1 parent 8f0eb43 commit 70b6de4
Showing 1 changed file with 42 additions and 9 deletions.
51 changes: 42 additions & 9 deletions src/lib/grammar/FilParser.g4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,65 +90,81 @@ expression returns[filc::ast::AbstractExpression *tree]
| el1=expression STAR er1=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::STAR);
$tree = new filc::ast::BinaryCalcul($el1.tree, op, $er1.tree);
$tree->setPosition(new filc::utils::Position($el1.start));
}
| el2=expression DIV er2=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::DIV);
$tree = new filc::ast::BinaryCalcul($el2.tree, op, $er2.tree);
$tree->setPosition(new filc::utils::Position($el2.start));
}
| el3=expression MOD er3=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::MOD);
$tree = new filc::ast::BinaryCalcul($el3.tree, op, $er3.tree);
$tree->setPosition(new filc::utils::Position($el3.start));
}
| el4=expression PLUS er4=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::PLUS);
$tree = new filc::ast::BinaryCalcul($el4.tree, op, $er4.tree);
$tree->setPosition(new filc::utils::Position($el4.start));
}
| el5=expression MINUS er5=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::MINUS);
$tree = new filc::ast::BinaryCalcul($el5.tree, op, $er5.tree);
$tree->setPosition(new filc::utils::Position($el5.start));
}
| el6=expression FLEFT er6=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::FLEFT);
$tree = new filc::ast::BinaryCalcul($el6.tree, op, $er6.tree);
$tree->setPosition(new filc::utils::Position($el6.start));
}
| el7=expression FRIGHT er7=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::FRIGHT);
$tree = new filc::ast::BinaryCalcul($el7.tree, op, $er7.tree);
$tree->setPosition(new filc::utils::Position($el7.start));
}
| el8=expression LESS er8=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::LESS);
$tree = new filc::ast::BinaryCalcul($el8.tree, op, $er8.tree);
$tree->setPosition(new filc::utils::Position($el8.start));
}
| el9=expression GREATER er9=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::GREATER);
$tree = new filc::ast::BinaryCalcul($el9.tree, op, $er9.tree);
$tree->setPosition(new filc::utils::Position($el9.start));
}
| el10=expression EQEQ er10=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::EQEQ);
$tree = new filc::ast::BinaryCalcul($el10.tree, op, $er10.tree);
$tree->setPosition(new filc::utils::Position($el10.start));
}
| el11=expression LEQ er11=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::LEQ);
$tree = new filc::ast::BinaryCalcul($el11.tree, op, $er11.tree);
$tree->setPosition(new filc::utils::Position($el11.start));
}
| el12=expression GEQ er12=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::GEQ);
$tree = new filc::ast::BinaryCalcul($el12.tree, op, $er12.tree);
$tree->setPosition(new filc::utils::Position($el12.start));
}
| el13=expression NEQ er13=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::NEQ);
$tree = new filc::ast::BinaryCalcul($el13.tree, op, $er13.tree);
$tree->setPosition(new filc::utils::Position($el13.start));
}
| el14=expression AND er14=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::AND);
$tree = new filc::ast::BinaryCalcul($el14.tree, op, $er14.tree);
$tree->setPosition(new filc::utils::Position($el14.start));
}
| el15=expression OR er15=expression {
op = new filc::ast::ClassicOperator(filc::ast::ClassicOperator::OR);
$tree = new filc::ast::BinaryCalcul($el15.tree, op, $er15.tree);
$tree->setPosition(new filc::utils::Position($el15.start));
}
| el16=expression op16=assignation_operator er16=expression {
$tree = new filc::ast::BinaryCalcul($el16.tree, $op16.tree, $er16.tree);
$tree->setPosition(new filc::utils::Position($el16.start));
}
// ==== Binary calcul ====

Expand All @@ -166,6 +182,7 @@ expression returns[filc::ast::AbstractExpression *tree]
}
| i=IDENTIFIER {
$tree = new filc::ast::Identifier($i);
$tree->setPosition(new filc::utils::Position($i));
};

literal returns[filc::ast::AbstractExpression *tree]
Expand Down Expand Up @@ -260,9 +277,11 @@ type returns[filc::ast::AbstractType *tree]
unary_calcul returns[filc::ast::UnaryCalcul *tree]
: i=IDENTIFIER po=post_operator {
$tree = new filc::ast::PostUnaryCalcul(new filc::ast::Identifier($i), $po.tree);
$tree->setPosition(new filc::utils::Position($i));
}
| pr=pre_operator i=IDENTIFIER {
$tree = new filc::ast::PreUnaryCalcul(new filc::ast::Identifier($i), $pr.tree);
$tree->setPosition(new filc::utils::Position($pr.start));
};

post_operator returns[filc::ast::Operator *tree]
Expand Down Expand Up @@ -345,6 +364,7 @@ classic_binary_operator returns[filc::ast::Operator *tree]
function returns[filc::ast::Function *tree]
: fd=function_declaration fb=function_body {
$tree = new filc::ast::Function($fd.identifier, $fd.parameters, $fd.return_type, $fb.tree);
$tree->setPosition(new filc::utils::Position($fd.start));
};

function_declaration returns[filc::ast::Identifier *identifier, std::vector<filc::ast::FunctionParameter *> parameters, filc::ast::AbstractType *return_type]
Expand All @@ -360,11 +380,13 @@ function_declaration returns[filc::ast::Identifier *identifier, std::vector<filc
};

function_identifier returns[filc::ast::Identifier *tree]
: OPERATOR fo=function_operator {
: o=OPERATOR fo=function_operator {
$tree = new filc::ast::Identifier("operator" + $fo.text);
$tree->setPosition(new filc::utils::Position($o));
}
| i=IDENTIFIER {
$tree = new filc::ast::Identifier($i);
$tree->setPosition(new filc::utils::Position($i));
};

function_operator
Expand Down Expand Up @@ -438,8 +460,9 @@ lambda returns[filc::ast::Lambda *tree]
}
@after {
$tree = new filc::ast::Lambda(parameters, $ft.tree, body);
$tree->setPosition(new filc::utils::Position($lp));
}
: LPAREN (fp=function_parameters {
: lp=LPAREN (fp=function_parameters {
parameters = $fp.tree;
})? RPAREN ft=function_type ARROW (e=expression {
body.push_back($e.tree);
Expand Down Expand Up @@ -477,12 +500,15 @@ condition returns[filc::ast::AbstractExpression *tree]
};

if_c returns[filc::ast::If *tree]
: IF ic=if_condition ib=if_body {
: i=IF ic=if_condition ib=if_body {
$tree = new filc::ast::If($ic.tree, $ib.tree);
$tree->setPosition(new filc::utils::Position($i));
} (ELSE (ic2=if_c {
$tree->setElse($ic2.tree);
} | ib2=if_body {
$tree->setElse(new filc::ast::If(new filc::ast::Identifier("true"), $ib2.tree));
auto *else_body = new filc::ast::If(new filc::ast::Identifier("true"), $ib2.tree);
$tree->setPosition(new filc::utils::Position($ib2.start));
$tree->setElse(else_body);
}))?;

if_condition returns[filc::ast::AbstractExpression *tree]
Expand All @@ -501,8 +527,9 @@ if_body returns[std::vector<filc::ast::AbstractExpression *> tree]
};

switch_c returns[filc::ast::Switch *tree]
: SWITCH ic=if_condition sb=switch_body {
: s=SWITCH ic=if_condition sb=switch_body {
$tree = new filc::ast::Switch($ic.tree, $sb.tree);
$tree->setPosition(new filc::utils::Position($s));
};

switch_body returns[std::vector<filc::ast::SwitchCase *> tree]
Expand All @@ -519,6 +546,7 @@ switch_case returns[filc::ast::SwitchCase *tree]
}
@after {
$tree = new filc::ast::SwitchCase($sp.tree, body);
$tree->setPosition(new filc::utils::Position($sp.start));
}
: sp=switch_pattern ARROW (e=expression {
body.push_back($e.tree);
Expand All @@ -529,8 +557,9 @@ switch_case returns[filc::ast::SwitchCase *tree]
});

switch_pattern returns[filc::ast::AbstractExpression *tree]
: DEFAULT {
: d=DEFAULT {
$tree = new filc::ast::Identifier("default");
$tree->setPosition(new filc::utils::Position($d));
} | l=literal {
$tree = $l.tree;
};
Expand All @@ -545,8 +574,9 @@ loop returns[filc::ast::AbstractExpression *tree]
};

for_i returns[filc::ast::ForI *tree]
: FOR fic=for_i_condition ib=if_body {
: f=FOR fic=for_i_condition ib=if_body {
$tree = new filc::ast::ForI($fic.declaration, $fic.limit, $fic.iteration, $ib.tree);
$tree->setPosition(new filc::utils::Position($f));
};

for_i_condition returns[filc::ast::VariableDeclaration *declaration, filc::ast::AbstractExpression *limit, filc::ast::AbstractExpression *iteration]
Expand All @@ -564,8 +594,9 @@ for_i_condition returns[filc::ast::VariableDeclaration *declaration, filc::ast::
})? RPAREN;

for_iter returns[filc::ast::ForIter *tree]
: FOR fic=for_iter_condition ib=if_body {
: f=FOR fic=for_iter_condition ib=if_body {
$tree = new filc::ast::ForIter($fic.constant, $fic.identifier, $fic.array, $ib.tree);
$tree->setPosition(new filc::utils::Position($f));
};

for_iter_condition returns[bool constant, filc::ast::Identifier *identifier, filc::ast::AbstractExpression *array]
Expand All @@ -576,13 +607,15 @@ for_iter_condition returns[bool constant, filc::ast::Identifier *identifier, fil
$constant = false;
}) i=IDENTIFIER {
$identifier = new filc::ast::Identifier($i);
$identifier->setPosition(new filc::utils::Position($i));
} COLON e=expression {
$array = $e.tree;
} RPAREN;

while_l returns[filc::ast::While *tree]
: WHILE ic=if_condition ib=if_body {
: w=WHILE ic=if_condition ib=if_body {
$tree = new filc::ast::While($ic.tree, $ib.tree);
$tree->setPosition(new filc::utils::Position($w));
};

function_call_params returns[std::vector<filc::ast::AbstractExpression *> tree]
Expand Down

0 comments on commit 70b6de4

Please sign in to comment.