pr 56
This commit is contained in:
@@ -86,6 +86,7 @@ pub struct ParamNode {
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||
pub struct FnDeclNode {
|
||||
pub span: Span,
|
||||
pub vis: String,
|
||||
pub name: String,
|
||||
pub params: Vec<ParamNode>,
|
||||
pub ret: Option<Box<Node>>,
|
||||
|
||||
@@ -40,12 +40,16 @@ impl SymbolCollector {
|
||||
}
|
||||
|
||||
fn collect_fn(&mut self, decl: &FnDeclNode) {
|
||||
// Top-level fn are always file-private in PBS v0
|
||||
let vis = match decl.vis.as_str() {
|
||||
"pub" => Visibility::Pub,
|
||||
"mod" => Visibility::Mod,
|
||||
_ => Visibility::FilePrivate,
|
||||
};
|
||||
let symbol = Symbol {
|
||||
name: decl.name.clone(),
|
||||
kind: SymbolKind::Function,
|
||||
namespace: Namespace::Value,
|
||||
visibility: Visibility::FilePrivate,
|
||||
visibility: vis,
|
||||
ty: None, // Will be resolved later
|
||||
is_host: false,
|
||||
span: decl.span,
|
||||
|
||||
@@ -131,7 +131,7 @@ impl Parser {
|
||||
|
||||
fn parse_top_level_decl(&mut self) -> Result<Node, DiagnosticBundle> {
|
||||
match self.peek().kind {
|
||||
TokenKind::Fn => self.parse_fn_decl(),
|
||||
TokenKind::Fn => self.parse_fn_decl("file".to_string()),
|
||||
TokenKind::Pub | TokenKind::Mod | TokenKind::Declare | TokenKind::Service => self.parse_decl(),
|
||||
TokenKind::Invalid(ref msg) => {
|
||||
let code = if msg.contains("Unterminated string") {
|
||||
@@ -160,7 +160,17 @@ impl Parser {
|
||||
match self.peek().kind {
|
||||
TokenKind::Service => self.parse_service_decl(vis.unwrap_or_else(|| "pub".to_string())),
|
||||
TokenKind::Declare => self.parse_type_decl(vis),
|
||||
_ => Err(self.error("Expected 'service' or 'declare'")),
|
||||
TokenKind::Fn => {
|
||||
let vis_str = vis.unwrap_or_else(|| "file".to_string());
|
||||
if vis_str == "pub" {
|
||||
return Err(self.error_with_code(
|
||||
"Functions cannot be public. They are always mod or file-private.",
|
||||
Some("E_RESOLVE_VISIBILITY"),
|
||||
));
|
||||
}
|
||||
self.parse_fn_decl(vis_str)
|
||||
}
|
||||
_ => Err(self.error("Expected 'service', 'declare', or 'fn'")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -329,7 +339,7 @@ impl Parser {
|
||||
}))
|
||||
}
|
||||
|
||||
fn parse_fn_decl(&mut self) -> Result<Node, DiagnosticBundle> {
|
||||
fn parse_fn_decl(&mut self, vis: String) -> Result<Node, DiagnosticBundle> {
|
||||
let start_span = self.consume(TokenKind::Fn)?.span;
|
||||
let name = self.expect_identifier()?;
|
||||
let params = self.parse_param_list()?;
|
||||
@@ -351,6 +361,7 @@ impl Parser {
|
||||
|
||||
Ok(Node::FnDecl(FnDeclNode {
|
||||
span: Span::new(self.file_id, start_span.start, body_span.end),
|
||||
vis,
|
||||
name,
|
||||
params,
|
||||
ret: _ret,
|
||||
@@ -1141,6 +1152,28 @@ fn good() {}
|
||||
assert!(result.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_mod_fn() {
|
||||
let source = "mod fn test() {}";
|
||||
let mut parser = Parser::new(source, 0);
|
||||
let result = parser.parse_file().expect("mod fn should be allowed");
|
||||
if let Node::FnDecl(fn_decl) = &result.decls[0] {
|
||||
assert_eq!(fn_decl.vis, "mod");
|
||||
} else {
|
||||
panic!("Expected FnDecl");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_pub_fn() {
|
||||
let source = "pub fn test() {}";
|
||||
let mut parser = Parser::new(source, 0);
|
||||
let result = parser.parse_file();
|
||||
assert!(result.is_err(), "pub fn should be disallowed");
|
||||
let err = result.unwrap_err();
|
||||
assert!(err.diagnostics[0].message.contains("Functions cannot be public"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_ast_json_snapshot() {
|
||||
let source = r#"
|
||||
|
||||
Reference in New Issue
Block a user