Skip to content

fix: sytax error for enum type #1537

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: sytax error for enum type #1537

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e0d948
fix: enum parse error
BipulLamsal Oct 8, 2025
70040c9
chore: prev initalizer restored
BipulLamsal Oct 8, 2025
2281f1c
fix: ast node expression conversion
BipulLamsal Oct 10, 2025
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
56 changes: 50 additions & 6 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use crate::{

use self::{
control_parser::parse_control_statement,
expressions_parser::{parse_expression, parse_expression_list},
expressions_parser::{parse_expression, parse_range_statement},
};

mod control_parser;
Expand Down Expand Up @@ -1159,12 +1159,10 @@ fn parse_enum_type_definition(
name: Option<String>,
) -> Option<(DataTypeDeclaration, Option<AstNode>)> {
let start = lexer.last_location();
let elements = parse_any_in_region(lexer, vec![KeywordParensClose], |lexer| {
// Parse Enum - we expect at least one element
let elements = parse_expression_list(lexer);
Some(elements)
})?;

let elements = parse_any_in_region(lexer, vec![KeywordParensClose], parse_enum_elements(lexer))?;
let initializer = lexer.try_consume(KeywordAssignment).then(|| parse_expression(lexer));

Some((
DataTypeDeclaration::Definition {
data_type: Box::new(DataType::EnumType { name, elements, numeric_type: DINT_TYPE.to_string() }),
Expand All @@ -1175,6 +1173,52 @@ fn parse_enum_type_definition(
))
}

/// Parse comma-separated enum elements (identifier or identifier := literal)
fn parse_enum_elements(lexer: &mut ParseSession) -> Option<AstNode> {
let start = lexer.location();
let mut elements = vec![];

loop {
let element = parse_enum_element(lexer)?;
elements.push(element);

// check for comma
if !lexer.try_consume(KeywordComma) {
break;
}

// check for trailing comma
if lexer.closes_open_region(&lexer.token) {
break;
}
}

if elements.len() == 1 {
return Some(elements.into_iter().next().unwrap());
}

Some(AstFactory::create_expression_list(elements, start.span(&lexer.last_location()), lexer.next_id()))
}

/// Parse a single enum element: identifier or identifier := literal
fn parse_enum_element(lexer: &mut ParseSession) -> Option<AstNode> {
let start = lexer.location();

let idfr = parse_identifier(lexer)?;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before enum identifier are checked prior it doesnot pass one of the test which validates for expression and here the check is actually expects identifier instead of literal.


let identifier_node = AstFactory::create_identifier(&idfr.0, start, lexer.next_id());

if lexer.try_consume(KeywordAssignment) {
let value = parse_range_statement(lexer);
let result = AstFactory::create_assignment(identifier_node, value, lexer.next_id());
return Some(result);
}

let ref_expr = AstFactory::create_member_reference(identifier_node, None, lexer.next_id());

Some(ref_expr)
}

fn parse_array_type_definition(
lexer: &mut ParseSession,
name: Option<String>,
Expand Down