feat: Add comments to AST nodes
This commit introduces support for comments within the AST nodes. Comments are now parsed by the lexer and stored within the `Token` struct. These comments are then propagated through various compiler phases, including the `Node` struct, ensuring they are preserved in the Abstract Syntax Tree. This change enhances the AST's ability to retain source code information, which can be valuable for debugging and analysis.
This commit is contained in:
@@ -95,6 +95,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let p_names = self.extract_param_names(¶ms)?;
|
||||
self.registry.define(name.name, p_names, (*body).clone());
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Nop,
|
||||
ty: (),
|
||||
@@ -128,6 +129,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let expanded_args = self.expand_recursive((*args).clone())?;
|
||||
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Call {
|
||||
callee: Rc::new(expanded_callee),
|
||||
@@ -146,6 +148,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
self.registry.pop();
|
||||
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Block {
|
||||
exprs: expanded_exprs,
|
||||
@@ -161,6 +164,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
self.registry.pop();
|
||||
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Lambda {
|
||||
params: Rc::new(expanded_params),
|
||||
@@ -184,6 +188,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
None
|
||||
};
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::If {
|
||||
cond: Rc::new(cond),
|
||||
@@ -198,6 +203,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let pattern = self.expand_recursive((*pattern).clone())?;
|
||||
let value = self.expand_recursive((*value).clone())?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Def {
|
||||
pattern: Rc::new(pattern),
|
||||
@@ -212,6 +218,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let target = self.expand_recursive((*target).clone())?;
|
||||
let value = self.expand_recursive((*value).clone())?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Assign {
|
||||
target: Rc::new(target),
|
||||
@@ -228,6 +235,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
expanded_elements.push(Rc::new(self.expand_recursive((*e).clone())?));
|
||||
}
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Tuple {
|
||||
elements: expanded_elements,
|
||||
@@ -245,6 +253,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
));
|
||||
}
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Record {
|
||||
fields: expanded_fields,
|
||||
@@ -257,6 +266,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
SyntaxKind::Expansion { original_call, expanded } => {
|
||||
let expanded = self.expand_recursive((*expanded).clone())?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Expansion {
|
||||
original_call,
|
||||
@@ -269,6 +279,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
SyntaxKind::Again { args } => {
|
||||
let expanded_args = self.expand_recursive((*args).clone())?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Again {
|
||||
args: Rc::new(expanded_args),
|
||||
@@ -316,9 +327,11 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
};
|
||||
|
||||
let original_call = SyntaxNode {
|
||||
comments: std::rc::Rc::from([]),
|
||||
identity: identity.clone(),
|
||||
kind: SyntaxKind::Call {
|
||||
callee: Rc::new(SyntaxNode {
|
||||
comments: std::rc::Rc::from([]),
|
||||
identity: identity.clone(),
|
||||
kind: SyntaxKind::Identifier {
|
||||
symbol: Symbol::from(name),
|
||||
@@ -327,6 +340,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
ty: (),
|
||||
}),
|
||||
args: Rc::new(SyntaxNode {
|
||||
comments: std::rc::Rc::from([]),
|
||||
identity: identity.clone(),
|
||||
kind: SyntaxKind::Tuple {
|
||||
elements: bindings.into_values().map(Rc::new).collect(),
|
||||
@@ -338,6 +352,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
};
|
||||
|
||||
Ok(SyntaxNode {
|
||||
comments: std::rc::Rc::from([]),
|
||||
identity,
|
||||
kind: SyntaxKind::Expansion {
|
||||
original_call: Rc::new(original_call),
|
||||
@@ -371,6 +386,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
// Inside a template, all internal identifiers are colored.
|
||||
symbol.context = Some(state.expansion_id.clone());
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Identifier {
|
||||
symbol,
|
||||
@@ -406,6 +422,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let pattern = self.expand_template((*pattern).clone(), state)?;
|
||||
let val = self.expand_template((*value).clone(), state)?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Def {
|
||||
pattern: Rc::new(pattern),
|
||||
@@ -420,6 +437,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let target = self.expand_template((*target).clone(), state)?;
|
||||
let value = self.expand_template((*value).clone(), state)?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Assign {
|
||||
target: Rc::new(target),
|
||||
@@ -441,6 +459,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
}
|
||||
}
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Tuple {
|
||||
elements: new_elements,
|
||||
@@ -460,6 +479,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
}
|
||||
}
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Block { exprs: new_exprs },
|
||||
ty: (),
|
||||
@@ -475,6 +495,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
));
|
||||
}
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Record {
|
||||
fields: new_fields,
|
||||
@@ -488,6 +509,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let expanded_callee = self.expand_template((*callee).clone(), state)?;
|
||||
let expanded_args = self.expand_template((*args).clone(), state)?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Call {
|
||||
callee: Rc::new(expanded_callee),
|
||||
@@ -510,6 +532,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
None
|
||||
};
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::If {
|
||||
cond: Rc::new(cond),
|
||||
@@ -524,6 +547,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
let expanded_params = self.expand_template((*params).clone(), state)?;
|
||||
let body = self.expand_template((*body).clone(), state)?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Lambda {
|
||||
params: Rc::new(expanded_params),
|
||||
@@ -537,6 +561,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
SyntaxKind::Again { args } => {
|
||||
let expanded_args = self.expand_template((*args).clone(), state)?;
|
||||
Ok(SyntaxNode {
|
||||
comments: node.comments.clone(),
|
||||
identity: node.identity,
|
||||
kind: SyntaxKind::Again {
|
||||
args: Rc::new(expanded_args),
|
||||
@@ -582,6 +607,7 @@ impl<E: MacroEvaluator> MacroExpander<E> {
|
||||
match val {
|
||||
Value::Quote(rc) => rc.as_ref().clone(),
|
||||
_ => SyntaxNode {
|
||||
comments: std::rc::Rc::from([]),
|
||||
identity,
|
||||
kind: SyntaxKind::Constant(val),
|
||||
ty: (),
|
||||
|
||||
Reference in New Issue
Block a user