Skip to content

Fix problems #113

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 8 commits into from
Feb 2, 2026
Merged

Fix problems #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
655d449
update deps
myfreess Jan 28, 2026
562c2d7
promote
myfreess Jan 29, 2026
6910e41
update tests
myfreess Jan 30, 2026
7925bf6
add is_declare for TraitDecl && TopLetDef
myfreess Jan 30, 2026
3159695
complete hand parser
myfreess Jan 30, 2026
83f6cc1
complete yacc parser
myfreess Jan 30, 2026
750477a
promote
myfreess Jan 30, 2026
414257c
update test
myfreess Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions README.mbt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ test {
},
"vis": { "kind": "Visibility::Default", "loc": null, "children": {} },
"is_constant": false,
"is_declare": false,
"attrs": {
"kind": "Impl::TopLetDef::AttrList",
"loc": null,
Expand Down Expand Up @@ -364,6 +365,7 @@ test {
"loc": null,
"children": {},
},
"is_declare": false,
"deriving": {
"kind": "TypeDecl::DerivingList",
"loc": null,
Expand Down Expand Up @@ -500,6 +502,7 @@ test {
"loc": null,
"children": {},
},
"is_declare": false,
"deriving": {
"kind": "TypeDecl::DerivingList",
"loc": null,
Expand Down
42 changes: 21 additions & 21 deletions attribute/parser.mbt.map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,127 +3,127 @@
{
"source": "parser.mbty",
"original_offset": 3113,
"generated_offset": 2669,
"generated_offset": 2923,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3146,
"generated_offset": 2913,
"generated_offset": 3167,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3149,
"generated_offset": 2922,
"generated_offset": 3176,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3871,
"generated_offset": 3132,
"generated_offset": 3386,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3922,
"generated_offset": 3394,
"generated_offset": 3648,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3925,
"generated_offset": 3403,
"generated_offset": 3657,
"length": 1
},
{
"source": "parser.mbty",
"original_offset": 3199,
"generated_offset": 3689,
"generated_offset": 3943,
"length": 15
},
{
"source": "parser.mbty",
"original_offset": 3216,
"generated_offset": 3712,
"generated_offset": 3966,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3575,
"generated_offset": 4086,
"generated_offset": 4340,
"length": 40
},
{
"source": "parser.mbty",
"original_offset": 3404,
"generated_offset": 4445,
"generated_offset": 4699,
"length": 33
},
{
"source": "parser.mbty",
"original_offset": 3489,
"generated_offset": 4803,
"generated_offset": 5057,
"length": 34
},
{
"source": "parser.mbty",
"original_offset": 3325,
"generated_offset": 5109,
"generated_offset": 5363,
"length": 27
},
{
"source": "parser.mbty",
"original_offset": 3248,
"generated_offset": 5371,
"generated_offset": 5625,
"length": 6
},
{
"source": "parser.mbty",
"original_offset": 3256,
"generated_offset": 5385,
"generated_offset": 5639,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3667,
"generated_offset": 5656,
"generated_offset": 5910,
"length": 8
},
{
"source": "parser.mbty",
"original_offset": 3677,
"generated_offset": 5672,
"generated_offset": 5926,
"length": 2
},
{
"source": "parser.mbty",
"original_offset": 3731,
"generated_offset": 5891,
"generated_offset": 6145,
"length": 12
},
{
"source": "parser.mbty",
"original_offset": 3795,
"generated_offset": 6121,
"generated_offset": 6375,
"length": 13
},
{
"source": "parser.mbty",
"original_offset": 4048,
"generated_offset": 6428,
"generated_offset": 6682,
"length": 11
},
{
"source": "parser.mbty",
"original_offset": 3979,
"generated_offset": 6681,
"generated_offset": 6935,
"length": 19
},
{
"source": "parser.mbty",
"original_offset": 4000,
"generated_offset": 6708,
"generated_offset": 6962,
"length": 3
}
]
Expand Down
6 changes: 5 additions & 1 deletion handrolled_parser/parser.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ fn State::parse_trait_decl(
self : Self,
vis~ : @syntax.Visibility,
attrs~ : List[@attribute.Attribute],
is_declare~ : Bool,
) -> @syntax.TraitDecl {
if self.mode is Panic(loc~, ..) {
return {
Expand All @@ -588,6 +589,7 @@ fn State::parse_trait_decl(
loc,
attrs,
doc: @syntax.DocString::empty(),
is_declare,
}
}
let spos = self.peek_spos()
Expand Down Expand Up @@ -625,6 +627,7 @@ fn State::parse_trait_decl(
loc,
attrs,
doc: @syntax.DocString::empty(),
is_declare,
}
}

Expand Down Expand Up @@ -1133,6 +1136,7 @@ fn State::parse_top(self : Self) -> @syntax.Impl {
loc~,
doc=DocString::empty(),
attrs~,
is_declare~,
)
}
EXTERN if self.peek_token(nth=1) is TYPE => {
Expand Down Expand Up @@ -1332,7 +1336,7 @@ fn State::parse_top(self : Self) -> @syntax.Impl {
)
}
TRAIT => {
let trait_decl = self.parse_trait_decl(attrs~, vis~)
let trait_decl = self.parse_trait_decl(attrs~, vis~, is_declare~)
let trait_decl = { ..trait_decl, vis, }
@syntax.TopTrait(trait_decl)
}
Expand Down
Loading