Skip to content
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

feat: impl string-like schema attribute parser and ast printer #849

Merged
merged 1 commit into from
Nov 7, 2023
Merged

feat: impl string-like schema attribute parser and ast printer #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions kclvm/ast/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,20 @@ impl Token {
self.run_on_ident(|id| id.name == kw)
}

/// Whether the token is a string literal token.
pub fn is_string_lit(&self) -> bool {
match self.kind {
TokenKind::Literal(lit) => {
if let LitKind::Str { .. } = lit.kind {
true
} else {
false
}
}
_ => false,
}
}

fn run_on_ident(&self, pred: impl FnOnce(Ident) -> bool) -> bool {
match self.ident() {
Some(id) => pred(id),
Expand Down
12 changes: 11 additions & 1 deletion kclvm/ast_pretty/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ impl<'p, 'ctx> MutSelfTypedResultWalker<'ctx> for Printer<'p> {
if !schema_attr.decorators.is_empty() {
self.write_newline();
}
self.write(&schema_attr.name.node);
self.write_attribute(&schema_attr.name);
if schema_attr.is_optional {
self.write("?");
}
Expand Down Expand Up @@ -878,6 +878,16 @@ impl<'p> Printer<'p> {
}
}
}

fn write_attribute(&mut self, attr: &ast::NodeRef<String>) {
let re = fancy_regex::Regex::new(IDENTIFIER_REGEX).unwrap();
let need_quote = !re.is_match(&attr.node).unwrap();
if need_quote {
self.write(&format!("{:?}", attr.node));
} else {
self.write(&attr.node);
};
}
}

impl<'p> Printer<'p> {
Expand Down
2 changes: 2 additions & 0 deletions kclvm/ast_pretty/src/test_data/codelayout.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import math as alias_math
schema Person ( Base):
name:str
age:int
"attr": str
"attr-x": str
check :
age>0 if age , "age must > 0"
person = Person{
Expand Down
2 changes: 2 additions & 0 deletions kclvm/ast_pretty/src/test_data/codelayout.output
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import math as alias_math
schema Person(Base):
name: str
age: int
attr: str
"attr-x": str

check:
age > 0 if age, "age must > 0"
Expand Down
62 changes: 54 additions & 8 deletions kclvm/parser/src/parser/stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,16 @@ impl<'a> Parser<'a> {
fn parse_schema_body(&mut self) -> SchemaStmt {
self.bump_token(TokenKind::Indent);

// doc string
let body_doc = self.parse_doc();
// doc string when it is not a string-like attribute statement.
let body_doc = if let Some(peek) = self.cursor.peek() {
if matches!(peek.kind, TokenKind::Colon) {
None
} else {
self.parse_doc()
}
} else {
self.parse_doc()
};

// mixin
let body_mixins = if self.token.is_keyword(kw::Mixin) {
Expand Down Expand Up @@ -942,6 +950,20 @@ impl<'a> Parser<'a> {
body_body.push(self.parse_if_stmt());
continue;
}
// schema_attribute_stmt: string COLON type_annotation
else if self.token.is_string_lit() {
if let Some(peek) = self.cursor.peek() {
if let TokenKind::Colon = peek.kind {
let token = self.token;
let attr = self.parse_schema_attribute();
body_body.push(node_ref!(
Stmt::SchemaAttr(attr),
self.token_span_pos(token, self.prev_token)
));
continue;
}
}
}
// schema_attribute_stmt
else if let TokenKind::At = self.token.kind {
let token = self.token;
Expand Down Expand Up @@ -1133,7 +1155,7 @@ impl<'a> Parser<'a> {

/// Syntax:
/// schema_attribute_stmt: attribute_stmt NEWLINE
/// attribute_stmt: [decorators] identifier [QUESTION] COLON type [(ASSIGN|COMP_OR) test]
/// attribute_stmt: [decorators] (identifier | string) [QUESTION] COLON type [(ASSIGN|COMP_OR) test]
fn parse_schema_attribute(&mut self) -> SchemaAttr {
let doc = "".to_string();

Expand All @@ -1146,21 +1168,28 @@ impl<'a> Parser<'a> {
Vec::new()
};

let name_expr = self.parse_identifier();

let name_pos = name_expr.pos();
let name = name_expr.node;
let name = node_ref!(name.get_names().join("."), name_pos);
// Parse schema identifier-like or string-like attributes
let name = if let Some(name) = self.parse_string_attribute() {
name
} else {
let name_expr = self.parse_identifier();
let name_pos = name_expr.pos();
let name = name_expr.node;
node_ref!(name.get_names().join("."), name_pos)
};

// Parse attribute optional annotation `?`
let is_optional = if let TokenKind::Question = self.token.kind {
self.bump_token(TokenKind::Question);
true
} else {
false
};

// Bump the schema attribute annotation token `:`
self.bump_token(TokenKind::Colon);

// Parse the schema attribute type annotation.
let typ = self.parse_type_annotation();
let type_str = node_ref!(typ.node.to_string(), typ.pos());

Expand Down Expand Up @@ -1479,6 +1508,23 @@ impl<'a> Parser<'a> {
)
}

pub(crate) fn parse_string_attribute(&mut self) -> Option<NodeRef<String>> {
match self.token.kind {
TokenKind::Literal(lit) => {
if let LitKind::Str { .. } = lit.kind {
let str_expr = self.parse_str_expr(lit);
match &str_expr.node {
Expr::StringLit(str) => Some(node_ref!(str.value.clone(), str_expr.pos())),
_ => None,
}
} else {
None
}
}
_ => None,
}
}

pub(crate) fn parse_joined_string(
&mut self,
s: &StringLit,
Expand Down
13 changes: 13 additions & 0 deletions kclvm/parser/src/tests/error_recovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,19 @@ parse_module_snapshot! { schema_stmt_recovery_31, r#"
schema A:
[str]: str
[str]: int"#}
parse_module_snapshot! { schema_stmt_recovery_32, r#"
schema A:
"attr": str"#}
parse_module_snapshot! { schema_stmt_recovery_33, r#"
schema A:
"""Schema Doc"""
"attr": str"#}
parse_module_snapshot! { schema_stmt_recovery_34, r#"
schema A:
"attr: str"#}
parse_module_snapshot! { schema_stmt_recovery_35, r#"
schema A:
"attr":"#}
parse_module_snapshot! { rule_stmt_recovery_0, r#"rule"#}
parse_module_snapshot! { rule_stmt_recovery_1, r#"rule A"#}
parse_module_snapshot! { rule_stmt_recovery_2, r#"rule A["#}
Expand Down
88 changes: 88 additions & 0 deletions ...ser/src/tests/snapshots/kclvm_parser__tests__error_recovery__schema_stmt_recovery_32.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
source: parser/src/tests/error_recovery.rs
assertion_line: 277
expression: "crate::tests::parsing_module_string(r#\"\nschema A:\n \"attr\": str\"#)"
---
Module {
filename: "",
pkg: "",
doc: None,
name: "",
body: [
Node {
node: Schema(
SchemaStmt {
doc: None,
name: Node {
node: "A",
filename: "",
line: 2,
column: 7,
end_line: 2,
end_column: 8,
},
parent_name: None,
for_host_name: None,
is_mixin: false,
is_protocol: false,
args: None,
mixins: [],
body: [
Node {
node: SchemaAttr(
SchemaAttr {
doc: "",
name: Node {
node: "attr",
filename: "",
line: 3,
column: 4,
end_line: 3,
end_column: 10,
},
type_str: Node {
node: "str",
filename: "",
line: 3,
column: 12,
end_line: 3,
end_column: 15,
},
op: None,
value: None,
is_optional: false,
decorators: [],
ty: Node {
node: Basic(
Str,
),
filename: "",
line: 3,
column: 12,
end_line: 3,
end_column: 15,
},
},
),
filename: "",
line: 3,
column: 4,
end_line: 3,
end_column: 15,
},
],
decorators: [],
checks: [],
index_signature: None,
},
),
filename: "",
line: 2,
column: 0,
end_line: 3,
end_column: 15,
},
],
comments: [],
}

97 changes: 97 additions & 0 deletions ...ser/src/tests/snapshots/kclvm_parser__tests__error_recovery__schema_stmt_recovery_33.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
---
source: parser/src/tests/error_recovery.rs
assertion_line: 280
expression: "crate::tests::parsing_module_string(r#\"\nschema A:\n \"\"\"Schema Doc\"\"\"\n \"attr\": str\"#)"
---
Module {
filename: "",
pkg: "",
doc: None,
name: "",
body: [
Node {
node: Schema(
SchemaStmt {
doc: Some(
Node {
node: "\"\"\"Schema Doc\"\"\"",
filename: "",
line: 3,
column: 4,
end_line: 3,
end_column: 20,
},
),
name: Node {
node: "A",
filename: "",
line: 2,
column: 7,
end_line: 2,
end_column: 8,
},
parent_name: None,
for_host_name: None,
is_mixin: false,
is_protocol: false,
args: None,
mixins: [],
body: [
Node {
node: SchemaAttr(
SchemaAttr {
doc: "",
name: Node {
node: "attr",
filename: "",
line: 4,
column: 4,
end_line: 4,
end_column: 10,
},
type_str: Node {
node: "str",
filename: "",
line: 4,
column: 12,
end_line: 4,
end_column: 15,
},
op: None,
value: None,
is_optional: false,
decorators: [],
ty: Node {
node: Basic(
Str,
),
filename: "",
line: 4,
column: 12,
end_line: 4,
end_column: 15,
},
},
),
filename: "",
line: 4,
column: 4,
end_line: 4,
end_column: 15,
},
],
decorators: [],
checks: [],
index_signature: None,
},
),
filename: "",
line: 2,
column: 0,
end_line: 4,
end_column: 15,
},
],
comments: [],
}

Loading
Loading