ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Adam Chalmers
2025-04-28 21:22:38 -05:00
parent 3f3432cb73
commit 1c9a613fbc
2 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/kcl-lib/e2e/executor/inputs/cube.kcl
View File

@ -17,4 +17,4 @@ fn cube(length, center) {
|> extrude(length = length) |> extrude(length = length)
} }
myCube = cube(40, [0,0]) myCube = cube(length = 40, center = [0,0])

106
rust/kcl-lib/src/parsing/parser.rs
View File

@ -2399,9 +2399,17 @@ impl TryFrom<Token> for Node<TagDeclarator> {
token.value.as_str() token.value.as_str()
), ),
)), )),
// e.g. `line(%, $)`
TokenType::Brace => {
let r = token.as_source_range();
Err(CompilationError::fatal(
SourceRange::new(r.start() - 1, r.end() - 1, r.module_id()),
"Tag names must not be empty".to_string(),
))
}
// e.g. `line(%, $)` or `line(%, $ , 5)` // e.g. `line(%, $ , 5)`
TokenType::Brace | TokenType::Whitespace | TokenType::Comma => Err(CompilationError::fatal( TokenType::Whitespace | TokenType::Comma => Err(CompilationError::fatal(
token.as_source_range(), token.as_source_range(),
"Tag names must not be empty".to_string(), "Tag names must not be empty".to_string(),
)), )),
@ -3022,7 +3030,6 @@ fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> {
fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> { fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
let fn_name = name(i)?; let fn_name = name(i)?;
ignore_whitespace(i); ignore_whitespace(i);
eprintln!("Parsed fn name {:?}", fn_name.inner.name.inner.name);
let _ = open_paren.parse_next(i)?; let _ = open_paren.parse_next(i)?;
ignore_whitespace(i); ignore_whitespace(i);
@ -3042,17 +3049,18 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
non_code_meta: Default::default(), non_code_meta: Default::default(),
}, },
); );
return dbg!(Ok(result)); return Ok(result);
} }
// Special case: one arg (unlabeled) // Special case: one arg (unlabeled)
let early_close = peek((expression, close_paren)).parse_next(i); let early_close = peek((expression, opt(whitespace), close_paren)).parse_next(i);
if early_close.is_ok() { if early_close.is_ok() {
let (first_expression, early_close) = (expression, close_paren).parse_next(i)?; let first_expression = expression.parse_next(i)?;
eprintln!("Found first_expression, early_close"); ignore_whitespace(i);
let end = close_paren.parse_next(i)?.end;
let result = Node::new_node( let result = Node::new_node(
fn_name.start, fn_name.start,
early_close.end, end,
fn_name.module_id, fn_name.module_id,
CallExpressionKw { CallExpressionKw {
callee: fn_name, callee: fn_name,
@ -3062,7 +3070,7 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
non_code_meta: Default::default(), non_code_meta: Default::default(),
}, },
); );
return Ok(dbg!(result)); return Ok(result);
} }
let initial_unlabeled_arg = opt((expression, comma, opt(whitespace)).map(|(arg, _, _)| arg)).parse_next(i)?; let initial_unlabeled_arg = opt((expression, comma, opt(whitespace)).map(|(arg, _, _)| arg)).parse_next(i)?;
@ -3843,7 +3851,7 @@ mySk1 = startSketchOn(XY)
#[test] #[test]
fn pipes_on_pipes_minimal() { fn pipes_on_pipes_minimal() {
let test_program = r#"startSketchOn(XY) let test_program = r#"startSketchOn(XY)
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(endAbsolute = [0, -0]) // MoveRelative |> line(endAbsolute = [0, -0]) // MoveRelative
"#; "#;
@ -4114,7 +4122,7 @@ mySk1 = startSketchOn(XY)
fn test_parse_half_pipe_small() { fn test_parse_half_pipe_small() {
assert_err_contains( assert_err_contains(
"secondExtrude = startSketchOn('XY') "secondExtrude = startSketchOn('XY')
|> startProfileAt([0,0], %) |> startProfile(at = [0,0])
|", |",
"Unexpected token: |", "Unexpected token: |",
); );
@ -4178,7 +4186,7 @@ height = [obj["a"] -1, 0]"#;
#[test] #[test]
fn test_anon_fn() { fn test_anon_fn() {
crate::parsing::top_level_parse("foo(42, fn(x) { return x + 1 })").unwrap(); crate::parsing::top_level_parse("foo(42, closure = fn(x) { return x + 1 })").unwrap();
} }
#[test] #[test]
@ -4207,15 +4215,15 @@ height = [obj["a"] -1, 0]"#;
let code = "height = 10 let code = "height = 10
firstExtrude = startSketchOn('XY') firstExtrude = startSketchOn('XY')
|> startProfileAt([0,0], %) |> startProfile(at = [0,0])
|> line([0, 8], %) |> line(at = [0, 8])
|> line([20, 0], %) |> line(at = [20, 0])
|> line([0, -8], %) |> line(at = [0, -8])
|> close() |> close()
|> extrude(length=2) |> extrude(length=2)
secondExtrude = startSketchOn('XY') secondExtrude = startSketchOn('XY')
|> startProfileAt([0,0], %) |> startProfile(at = [0,0])
|"; |";
assert_err_contains(code, "Unexpected token: |"); assert_err_contains(code, "Unexpected token: |");
} }
@ -4486,7 +4494,7 @@ e
/// ///
/// ``` /// ```
/// exampleSketch = startSketchOn("XZ") /// exampleSketch = startSketchOn("XZ")
/// |> startProfileAt([0, 0], %) /// |> startProfile(at = [0, 0])
/// |> angledLine( /// |> angledLine(
/// angle = 30, /// angle = 30,
/// length = 3 / cos(toRadians(30)), /// length = 3 / cos(toRadians(30)),
@ -4526,7 +4534,7 @@ export fn cos(num: number(rad)): number(_) {}"#;
#[test] #[test]
fn error_underscore() { fn error_underscore() {
let (_, errs) = assert_no_fatal("_foo(_blah, _)"); let (_, errs) = assert_no_fatal("_foo(_blah, arg = _)");
assert_eq!(errs.len(), 3, "found: {errs:#?}"); assert_eq!(errs.len(), 3, "found: {errs:#?}");
} }
@ -4672,16 +4680,16 @@ thing(false)
fn test_member_expression_sketch() { fn test_member_expression_sketch() {
let some_program_string = r#"fn cube = (pos, scale) => { let some_program_string = r#"fn cube = (pos, scale) => {
sg = startSketchOn('XY') sg = startSketchOn('XY')
|> startProfileAt(pos, %) |> startProfile(at = pos)
|> line([0, scale], %) |> line([0, scale])
|> line([scale, 0], %) |> line([scale, 0])
|> line([0, -scale], %) |> line([0, -scale])
return sg return sg
} }
b1 = cube([0,0], 10) b1 = cube(pos = [0,0], scale = 10)
b2 = cube([3,3], 4) b2 = cube(pos = [3,3], scale = 4)
pt1 = b1[0] pt1 = b1[0]
pt2 = b2[0] pt2 = b2[0]
@ -4700,16 +4708,16 @@ let other_thing = 2 * cos(3)"#;
fn test_negative_arguments() { fn test_negative_arguments() {
let some_program_string = r#"fn box = (p, h, l, w) => { let some_program_string = r#"fn box = (p, h, l, w) => {
myBox = startSketchOn('XY') myBox = startSketchOn('XY')
|> startProfileAt(p, %) |> startProfile(at = p)
|> line([0, l], %) |> line([0, l])
|> line([w, 0], %) |> line([w, 0])
|> line([0, -l], %) |> line([0, -l])
|> close() |> close()
|> extrude(length=h) |> extrude(length=h)
return myBox return myBox
} }
let myBox = box([0,0], -3, -16, -10) let myBox = box(p=[0,0], h=-3, l=-16, w=-10)
"#; "#;
crate::parsing::top_level_parse(some_program_string).unwrap(); crate::parsing::top_level_parse(some_program_string).unwrap();
} }
@ -4726,28 +4734,28 @@ let myBox = box([0,0], -3, -16, -10)
#[test] #[test]
fn test_parse_tag_named_std_lib() { fn test_parse_tag_named_std_lib() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line([5, 5], %, $xLine) |> line(end = [5, 5], tag = $xLine)
"#; "#;
assert_err( assert_err(
some_program_string, some_program_string,
"Cannot assign a tag to a reserved keyword: xLine", "Cannot assign a tag to a reserved keyword: xLine",
[76, 82], [85, 91],
); );
} }
#[test] #[test]
fn test_parse_empty_tag_brace() { fn test_parse_empty_tag_brace() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $) |> line(end = [1, 1], tag = $)
"#; "#;
assert_err(some_program_string, "Tag names must not be empty", [69, 70]); assert_err(some_program_string, "Tag names must not be empty", [85, 86]);
} }
#[test] #[test]
fn test_parse_empty_tag_whitespace() { fn test_parse_empty_tag_whitespace() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $ ,01) |> line(%, $ ,01)
"#; "#;
assert_err(some_program_string, "Tag names must not be empty", [69, 70]); assert_err(some_program_string, "Tag names must not be empty", [69, 70]);
@ -4756,7 +4764,7 @@ let myBox = box([0,0], -3, -16, -10)
#[test] #[test]
fn test_parse_empty_tag_comma() { fn test_parse_empty_tag_comma() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $,) |> line(%, $,)
"#; "#;
assert_err(some_program_string, "Tag names must not be empty", [69, 70]); assert_err(some_program_string, "Tag names must not be empty", [69, 70]);
@ -4765,7 +4773,7 @@ let myBox = box([0,0], -3, -16, -10)
fn test_parse_tag_starting_with_digit() { fn test_parse_tag_starting_with_digit() {
let some_program_string = r#" let some_program_string = r#"
startSketchOn('XY') startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $01)"#; |> line(%, $01)"#;
assert_err( assert_err(
some_program_string, some_program_string,
@ -4777,14 +4785,14 @@ let myBox = box([0,0], -3, -16, -10)
fn test_parse_tag_including_digit() { fn test_parse_tag_including_digit() {
let some_program_string = r#" let some_program_string = r#"
startSketchOn('XY') startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $var01)"#; |> line(%, tag = $var01)"#;
assert_no_err(some_program_string); assert_no_err(some_program_string);
} }
#[test] #[test]
fn test_parse_tag_starting_with_bang() { fn test_parse_tag_starting_with_bang() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $!var,01) |> line(%, $!var,01)
"#; "#;
assert_err(some_program_string, "Tag names must not start with a bang", [69, 70]); assert_err(some_program_string, "Tag names must not start with a bang", [69, 70]);
@ -4792,7 +4800,7 @@ let myBox = box([0,0], -3, -16, -10)
#[test] #[test]
fn test_parse_tag_starting_with_dollar() { fn test_parse_tag_starting_with_dollar() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $$,01) |> line(%, $$,01)
"#; "#;
assert_err(some_program_string, "Tag names must not start with a dollar", [69, 70]); assert_err(some_program_string, "Tag names must not start with a dollar", [69, 70]);
@ -4800,7 +4808,7 @@ let myBox = box([0,0], -3, -16, -10)
#[test] #[test]
fn test_parse_tag_starting_with_fn() { fn test_parse_tag_starting_with_fn() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $fn,01) |> line(%, $fn,01)
"#; "#;
assert_err(some_program_string, "Tag names must not start with a keyword", [69, 71]); assert_err(some_program_string, "Tag names must not start with a keyword", [69, 71]);
@ -4808,7 +4816,7 @@ let myBox = box([0,0], -3, -16, -10)
#[test] #[test]
fn test_parse_tag_starting_with_a_comment() { fn test_parse_tag_starting_with_a_comment() {
let some_program_string = r#"startSketchOn('XY') let some_program_string = r#"startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line(%, $// |> line(%, $//
,01) ,01)
"#; "#;
@ -4823,8 +4831,8 @@ let myBox = box([0,0], -3, -16, -10)
fn test_parse_tag_with_reserved_in_middle_works() { fn test_parse_tag_with_reserved_in_middle_works() {
let some_program_string = r#" let some_program_string = r#"
startSketchOn('XY') startSketchOn('XY')
|> startProfileAt([0, 0], %) |> startProfile(at = [0, 0])
|> line([5, 5], %, $sketching) |> line(end = [5, 5], tag = $sketching)
"#; "#;
assert_no_err(some_program_string); assert_no_err(some_program_string);
} }
@ -4975,7 +4983,7 @@ bar = 1
}"# }"#
); );
let some_program_string = r#"myMap = map([0..5], (n) => { let some_program_string = r#"myMap = map([0..5], f = (n) => {
return n * 2 return n * 2
})"#; })"#;
let (_, errs) = assert_no_err(some_program_string); let (_, errs) = assert_no_err(some_program_string);
@ -4984,7 +4992,7 @@ bar = 1
let replaced = errs[1].apply_suggestion(&replaced).unwrap(); let replaced = errs[1].apply_suggestion(&replaced).unwrap();
assert_eq!( assert_eq!(
replaced, replaced,
r#"myMap = map([0..5], fn(n) { r#"myMap = map([0..5], f = fn(n) {
return n * 2 return n * 2
})"# })"#
); );