Skip to content

fix sync test #115

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

Merged
myfreess merged 16 commits into from
Mar 2, 2026
Merged

fix sync test #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5a8a7f7
update sync_test
myfreess Feb 11, 2026
4780189
add token NOBREAK
myfreess Feb 11, 2026
d7f6b20
promote
myfreess Feb 11, 2026
2c3e9c5
fix lexer
myfreess Feb 11, 2026
d24adc6
LexCase: add guard_ field
myfreess Feb 12, 2026
384e4e8
promote
myfreess Feb 12, 2026
8704399
support noraise for simple try expr
myfreess Feb 12, 2026
b10cefa
promote
myfreess Feb 12, 2026
58dc501
fix attribute
myfreess Feb 12, 2026
4582e66
support struct constructor
myfreess Feb 12, 2026
e69bc70
promote
myfreess Feb 24, 2026
6999a6d
mark unfixed testcase
myfreess Feb 24, 2026
838d6e3
promote
myfreess Feb 24, 2026
c127e13
exclude test directory
myfreess Feb 28, 2026
844c47b
update mbti parser
myfreess Mar 1, 2026
418e760
promote
myfreess Mar 1, 2026
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
4 changes: 2 additions & 2 deletions attribute/attribute.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ pub fn Attribute::new(
) -> Attribute {
//TODO: report better syntax error for attribute
let (id, dot_id, raw_payload) = content
let raw_payload = raw_payload.trim(char_set=" ").to_string()
let (raw, attr_id) = match dot_id {
None => ("#\{id}\{raw_payload}", { qual: None, name: id })
Some(dot_id) => ("#\{id}.\{dot_id}", { qual: Some(id), name: dot_id })
Some(dot_id) =>
("#\{id}.\{dot_id}\{raw_payload}", { qual: Some(id), name: dot_id })
}
let { errors, docstrings: _, tokens } = @lexer.tokens_from_string(
raw_payload,
Expand Down
8 changes: 4 additions & 4 deletions attribute/attribute_test.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test "attribute" {
inspect(
attr,
content=(
#|{loc: -0:1-0:1, raw: "#qual.name", parsed: Some(Apply(qual.name, @list.from_array([Expr(Ident(a)), Expr(Ident(b)), Expr(Ident(c))])))}
#|{loc: -0:1-0:1, raw: "#qual.name(a,b,c)", parsed: Some(Apply(qual.name, @list.from_array([Expr(Ident(a)), Expr(Ident(b)), Expr(Ident(c))])))}
),
)
let attr = Attribute::new(
Expand All @@ -20,7 +20,7 @@ test "attribute" {
inspect(
attr,
content=(
#|{loc: -0:1-0:1, raw: "#qual.name", parsed: Some(Apply(qual.name, @list.from_array([Labeled("label1", Ident(abc)), Labeled("label2", Ident(cde))])))}
#|{loc: -0:1-0:1, raw: "#qual.name(label1=abc, label2=cde)", parsed: Some(Apply(qual.name, @list.from_array([Labeled("label1", Ident(abc)), Labeled("label2", Ident(cde))])))}
),
)
let attr = Attribute::new(
Expand All @@ -30,7 +30,7 @@ test "attribute" {
inspect(
attr,
content=(
#|{loc: -0:1-0:1, raw: "#qual.name", parsed: Some(Apply(qual.name, @list.from_array([Expr(Apply(f, @list.from_array([Expr(Bool(false))]))), Expr(Apply(g, @list.from_array([Expr(Bool(true))])))])))}
#|{loc: -0:1-0:1, raw: "#qual.name(f(false), g(true))", parsed: Some(Apply(qual.name, @list.from_array([Expr(Apply(f, @list.from_array([Expr(Bool(false))]))), Expr(Apply(g, @list.from_array([Expr(Bool(true))])))])))}
),
)
let attr = Attribute::new(
Expand All @@ -40,7 +40,7 @@ test "attribute" {
inspect(
attr,
content=(
#|{loc: -0:1-0:1, raw: "#qual.name", parsed: Some(Apply(qual.name, @list.from_array([Expr(String("abcdef")), Expr(Apply(g, @list.from_array([Expr(Bool(true))])))])))}
#|{loc: -0:1-0:1, raw: "#qual.name(\"abcdef\", g(true))", parsed: Some(Apply(qual.name, @list.from_array([Expr(String("abcdef")), Expr(Apply(g, @list.from_array([Expr(Bool(true))])))])))}
),
)
let attr = Attribute::new(loc=dummy_loc, ("qual", Some("name"), ""))
Expand Down
36 changes: 21 additions & 15 deletions attribute/parser.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,13 @@ priv enum YYSymbol {
T_ENUMVIEW
T_DECLARE
T_NORAISE
T_NOBREAK
T_WHERE
T_TRY_QUESTION
T_TRY_EXCLAMATION
T_LEXMATCH
T_LEXMATCH_QUESTION
T_PACKAGE
NT_payloads
NT_property
NT_expr
Expand All @@ -214,7 +216,7 @@ fn init {
}

// file:///./parser.mbty
// 150| EOF { @list.empty() }
// 153| EOF { @list.empty() }

///|
fn yy_action_0(
Expand All @@ -230,7 +232,7 @@ fn yy_action_0(
}

// file:///./parser.mbty
// 151| properties { $1 }
// 154| properties { $1 }

///|
fn yy_action_1(
Expand All @@ -247,7 +249,7 @@ fn yy_action_1(
}

// file:///./parser.mbty
// 167| "(" ")" { @list.empty() }
// 170| "(" ")" { @list.empty() }

///|
fn yy_action_2(
Expand All @@ -263,7 +265,7 @@ fn yy_action_2(
}

// file:///./parser.mbty
// 168| "(" non_empty_properties ")" { $2 }
// 171| "(" non_empty_properties ")" { $2 }

///|
fn yy_action_3(
Expand All @@ -280,7 +282,7 @@ fn yy_action_3(
}

// file:///./parser.mbty
// 154| name=LIDENT "=" expr { Labeled(name, $3) }
// 157| name=LIDENT "=" expr { Labeled(name, $3) }

///|
fn yy_action_4(
Expand All @@ -298,7 +300,7 @@ fn yy_action_4(
}

// file:///./parser.mbty
// 161| qual=LIDENT name=DOT_LIDENT props=properties { Apply({qual: Some(qual), name}, props) }
// 164| qual=LIDENT name=DOT_LIDENT props=properties { Apply({qual: Some(qual), name}, props) }

///|
fn yy_action_5(
Expand All @@ -317,7 +319,7 @@ fn yy_action_5(
}

// file:///./parser.mbty
// 159| qual=LIDENT name=DOT_LIDENT { Ident({qual: Some(qual), name}) }
// 162| qual=LIDENT name=DOT_LIDENT { Ident({qual: Some(qual), name}) }

///|
fn yy_action_6(
Expand All @@ -335,7 +337,7 @@ fn yy_action_6(
}

// file:///./parser.mbty
// 160| name=LIDENT props=properties { Apply({qual: None, name}, props) }
// 163| name=LIDENT props=properties { Apply({qual: None, name}, props) }

///|
fn yy_action_7(
Expand All @@ -353,7 +355,7 @@ fn yy_action_7(
}

// file:///./parser.mbty
// 158| name=LIDENT { Ident({qual: None, name}) }
// 161| name=LIDENT { Ident({qual: None, name}) }

///|
fn yy_action_8(
Expand All @@ -370,7 +372,7 @@ fn yy_action_8(
}

// file:///./parser.mbty
// 155| expr { Expr($1) }
// 158| expr { Expr($1) }

///|
fn yy_action_9(
Expand All @@ -387,7 +389,7 @@ fn yy_action_9(
}

// file:///./parser.mbty
// 162| STRING { String($1) }
// 165| STRING { String($1) }

///|
fn yy_action_10(
Expand All @@ -404,7 +406,7 @@ fn yy_action_10(
}

// file:///./parser.mbty
// 163| TRUE { Bool(true) }
// 166| TRUE { Bool(true) }

///|
fn yy_action_11(
Expand All @@ -420,7 +422,7 @@ fn yy_action_11(
}

// file:///./parser.mbty
// 164| FALSE { Bool(false) }
// 167| FALSE { Bool(false) }

///|
fn yy_action_12(
Expand All @@ -436,7 +438,7 @@ fn yy_action_12(
}

// file:///./parser.mbty
// 172| x=property "," xs=non_empty_properties{ xs.add(x) }
// 175| x=property "," xs=non_empty_properties{ xs.add(x) }

///|
fn yy_action_13(
Expand All @@ -454,7 +456,7 @@ fn yy_action_13(
}

// file:///./parser.mbty
// 171| property { @list.from_array([$1]) }
// 174| property { @list.from_array([$1]) }

///|
fn yy_action_14(
Expand Down Expand Up @@ -585,11 +587,13 @@ fn yy_input(
ENUMVIEW => (T_ENUMVIEW, YYObj_Void)
DECLARE => (T_DECLARE, YYObj_Void)
NORAISE => (T_NORAISE, YYObj_Void)
NOBREAK => (T_NOBREAK, YYObj_Void)
WHERE => (T_WHERE, YYObj_Void)
TRY_QUESTION => (T_TRY_QUESTION, YYObj_Void)
TRY_EXCLAMATION => (T_TRY_EXCLAMATION, YYObj_Void)
LEXMATCH => (T_LEXMATCH, YYObj_Void)
LEXMATCH_QUESTION => (T_LEXMATCH_QUESTION, YYObj_Void)
PACKAGE => (T_PACKAGE, YYObj_Void)
}
}

Expand Down Expand Up @@ -1083,11 +1087,13 @@ fn error(
(T_ENUMVIEW, TK_ENUMVIEW),
(T_DECLARE, TK_DECLARE),
(T_NORAISE, TK_NORAISE),
(T_NOBREAK, TK_NOBREAK),
(T_WHERE, TK_WHERE),
(T_TRY_QUESTION, TK_TRY_QUESTION),
(T_TRY_EXCLAMATION, TK_TRY_EXCLAMATION),
(T_LEXMATCH, TK_LEXMATCH),
(T_LEXMATCH_QUESTION, TK_LEXMATCH_QUESTION),
(T_PACKAGE, TK_PACKAGE),
] : Array[(YYSymbol, TokenKind)]) {
try_add(term.0, term.1)
}
Expand Down
84 changes: 42 additions & 42 deletions attribute/parser.mbt.map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,128 +2,128 @@
"mappings": [
{
"source": "parser.mbty",
"original_offset": 3113,
"generated_offset": 2923,
"original_offset": 3180,
"generated_offset": 2947,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3146,
"generated_offset": 3167,
"original_offset": 3213,
"generated_offset": 3191,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3149,
"generated_offset": 3176,
"original_offset": 3216,
"generated_offset": 3200,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3871,
"generated_offset": 3386,
"original_offset": 3938,
"generated_offset": 3410,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3922,
"generated_offset": 3648,
"original_offset": 3989,
"generated_offset": 3672,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3925,
"generated_offset": 3657,
"original_offset": 3992,
"generated_offset": 3681,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3199,
"generated_offset": 3943,
"original_offset": 3266,
"generated_offset": 3967,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3216,
"generated_offset": 3966,
"original_offset": 3283,
"generated_offset": 3990,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3575,
"generated_offset": 4340,
"original_offset": 3642,
"generated_offset": 4364,
"length": 40
},
{
"source": "parser.mbty",
"original_offset": 3404,
"generated_offset": 4699,
"original_offset": 3471,
"generated_offset": 4723,
"length": 33
},
{
"source": "parser.mbty",
"original_offset": 3489,
"generated_offset": 5057,
"original_offset": 3556,
"generated_offset": 5081,
"length": 34
},
{
"source": "parser.mbty",
"original_offset": 3325,
"generated_offset": 5363,
"original_offset": 3392,
"generated_offset": 5387,
"length": 27
},
{
"source": "parser.mbty",
"original_offset": 3248,
"generated_offset": 5625,
"original_offset": 3315,
"generated_offset": 5649,
"length": 6
},
{
"source": "parser.mbty",
"original_offset": 3256,
"generated_offset": 5639,
"original_offset": 3323,
"generated_offset": 5663,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3667,
"generated_offset": 5910,
"original_offset": 3734,
"generated_offset": 5934,
"length": 8
},
{
"source": "parser.mbty",
"original_offset": 3677,
"generated_offset": 5926,
"original_offset": 3744,
"generated_offset": 5950,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3731,
"generated_offset": 6145,
"original_offset": 3798,
"generated_offset": 6169,
"length": 12
},
{
"source": "parser.mbty",
"original_offset": 3795,
"generated_offset": 6375,
"original_offset": 3862,
"generated_offset": 6399,
"length": 13
},
{
"source": "parser.mbty",
"original_offset": 4048,
"generated_offset": 6682,
"original_offset": 4115,
"generated_offset": 6706,
"length": 11
},
{
"source": "parser.mbty",
"original_offset": 3979,
"generated_offset": 6935,
"original_offset": 4046,
"generated_offset": 6959,
"length": 19
},
{
"source": "parser.mbty",
"original_offset": 4000,
"generated_offset": 6962,
"original_offset": 4067,
"generated_offset": 6986,
"length": 3
}
]
Expand Down
Loading