Skip to content

add field language for FuncStubs::Import #102

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 1 commit into from
Jan 8, 2026
Merged

add field language for FuncStubs::Import #102

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
30 changes: 21 additions & 9 deletions handrolled_parser/parser.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ fn State::parse_top_func(
let name1 = self.expect_string()
if self.peek_token() is STRING(name2) {
self.skip()
DeclStubs(Import(module_name=name1, func_name=name2))
DeclStubs(Import(module_name=name1, func_name=name2, language=None))
} else {
DeclStubs(Embedded(language=None, code=CodeString(name1)))
}
Expand Down Expand Up @@ -1161,14 +1161,26 @@ fn State::parse_top(self : Self) -> @syntax.Impl {
)
} else {
let body = self.expect_string()
let loc = self.loc_start_with(spos)
TopFuncDef(
fun_decl~,
decl_body=DeclStubs(
Embedded(language=Some(language), code=CodeString(body)),
),
loc~,
)
if self.peek_token() is STRING(_) {
let fname = self.expect_string()
let loc = self.loc_start_with(spos)
TopFuncDef(
fun_decl~,
decl_body=DeclStubs(
Import(module_name=body, func_name=fname, language=Some(language)),
),
loc~,
)
} else {
let loc = self.loc_start_with(spos)
TopFuncDef(
fun_decl~,
decl_body=DeclStubs(
Embedded(language=Some(language), code=CodeString(body)),
),
loc~,
)
}
}
}
ASYNC =>
Expand Down
6 changes: 5 additions & 1 deletion syntax/ast.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,11 @@ pub(all) struct TypeDecl {

///|
pub(all) enum FuncStubs {
Import(module_name~ : StringLiteral, func_name~ : StringLiteral)
Import(
module_name~ : StringLiteral,
func_name~ : StringLiteral,
language~ : StringLiteral?
)
Embedded(language~ : StringLiteral?, code~ : EmbeddedCode)
}

Expand Down
2 changes: 2 additions & 0 deletions syntax/ast_test.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ test "func_stubs to_json" {
@syntax.Import(
module_name=dummy_string_literal,
func_name=dummy_string_literal,
language=None,
),
content={
"type": "FuncStubs::Import",
Expand Down Expand Up @@ -2120,6 +2121,7 @@ test "decl_body to_json" {
@syntax.Import(
module_name=dummy_string_literal,
func_name=dummy_string_literal,
language=None,
),
),
content={
Expand Down
4 changes: 3 additions & 1 deletion syntax/ast_to_json.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,12 +740,14 @@ pub impl ToJson for TypeDecl with to_json(self) {
///|
pub impl ToJson for FuncStubs with to_json(self) {
match self {
Import(module_name~, func_name~) =>
Import(module_name~, func_name~, language~) => {
ignore(language)
{
"type": "FuncStubs::Import",
"module_name": module_name,
"func_name": func_name,
}
}
Embedded(language~, code~) =>
{
"type": "FuncStubs::Embedded",
Expand Down
21 changes: 17 additions & 4 deletions syntax/iter_visitor.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ pub(open) trait IterVisitor {
Self,
module_name~ : StringLiteral,
func_name~ : StringLiteral,
language~ : StringLiteral?,
) -> Unit = _
visit_FuncStubs_Embedded(
Self,
Expand Down Expand Up @@ -2017,8 +2018,18 @@ impl IterVisitor with visit_FuncStubs(env, func_stubs) {
}

///|
impl IterVisitor with visit_FuncStubs_Import(env, module_name~, func_name~) {
IterVisitorBase::visit_FuncStubs_Import(env, module_name~, func_name~)
impl IterVisitor with visit_FuncStubs_Import(
env,
module_name~,
func_name~,
language~,
) {
IterVisitorBase::visit_FuncStubs_Import(
env,
module_name~,
func_name~,
language~,
)
}

///|
Expand Down Expand Up @@ -3478,8 +3489,8 @@ pub impl[T : IterVisitor] IterVisitor for IterVisitorBase[T] with visit_FuncStub
func_stubs,
) {
match func_stubs {
Import(module_name~, func_name~) =>
env.0.visit_FuncStubs_Import(module_name~, func_name~)
Import(module_name~, func_name~, language~) =>
env.0.visit_FuncStubs_Import(module_name~, func_name~, language~)
Embedded(language~, code~) =>
env.0.visit_FuncStubs_Embedded(language~, code~)
}
Expand All @@ -3490,9 +3501,11 @@ pub impl[T : IterVisitor] IterVisitor for IterVisitorBase[T] with visit_FuncStub
_,
module_name~,
func_name~,
language~,
) {
ignore(module_name)
ignore(func_name)
ignore(language)
}

///|
Expand Down
22 changes: 17 additions & 5 deletions syntax/map_visitor.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ pub(open) trait MapVisitor {
Self,
module_name~ : StringLiteral,
func_name~ : StringLiteral,
language~ : StringLiteral?,
) -> FuncStubs = _
visit_FuncStubs_Embedded(
Self,
Expand Down Expand Up @@ -2017,8 +2018,18 @@ impl MapVisitor with visit_FuncStubs(env, func_stubs) {
}

///|
impl MapVisitor with visit_FuncStubs_Import(env, module_name~, func_name~) {
MapVisitorBase::visit_FuncStubs_Import(env, module_name~, func_name~)
impl MapVisitor with visit_FuncStubs_Import(
env,
module_name~,
func_name~,
language~,
) {
MapVisitorBase::visit_FuncStubs_Import(
env,
module_name~,
func_name~,
language~,
)
}

///|
Expand Down Expand Up @@ -3566,8 +3577,8 @@ pub impl[T : MapVisitor] MapVisitor for MapVisitorBase[T] with visit_FuncStubs(
func_stubs,
) {
match func_stubs {
Import(module_name~, func_name~) =>
env.0.visit_FuncStubs_Import(module_name~, func_name~)
Import(module_name~, func_name~, language~) =>
env.0.visit_FuncStubs_Import(module_name~, func_name~, language~)
Embedded(language~, code~) =>
env.0.visit_FuncStubs_Embedded(language~, code~)
}
Expand All @@ -3578,8 +3589,9 @@ pub impl[T : MapVisitor] MapVisitor for MapVisitorBase[T] with visit_FuncStubs_I
_,
module_name~,
func_name~,
language~,
) {
Import(module_name~, func_name~)
Import(module_name~, func_name~, language~)
}

///|
Expand Down
6 changes: 3 additions & 3 deletions syntax/pkg.generated.mbti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ pub(all) struct Func {
pub impl ToJson for Func

pub(all) enum FuncStubs {
Import(module_name~ : String, func_name~ : String)
Import(module_name~ : String, func_name~ : String, language~ : String?)
Embedded(language~ : String?, code~ : EmbeddedCode)
}
pub impl ToJson for FuncStubs
Expand Down Expand Up @@ -821,7 +821,7 @@ pub(open) trait IterVisitor {
visit_DerivingDirective(Self, DerivingDirective) -> Unit = _
visit_TypeDecl(Self, TypeDecl) -> Unit = _
visit_FuncStubs(Self, FuncStubs) -> Unit = _
visit_FuncStubs_Import(Self, module_name~ : String, func_name~ : String) -> Unit = _
visit_FuncStubs_Import(Self, module_name~ : String, func_name~ : String, language~ : String?) -> Unit = _
visit_FuncStubs_Embedded(Self, language~ : String?, code~ : EmbeddedCode) -> Unit = _
visit_EmbeddedCode(Self, EmbeddedCode) -> Unit = _
visit_EmbeddedCode_CodeString(Self, String) -> Unit = _
Expand Down Expand Up @@ -1032,7 +1032,7 @@ pub(open) trait MapVisitor {
visit_DerivingDirective(Self, DerivingDirective) -> DerivingDirective = _
visit_TypeDecl(Self, TypeDecl) -> TypeDecl = _
visit_FuncStubs(Self, FuncStubs) -> FuncStubs = _
visit_FuncStubs_Import(Self, module_name~ : String, func_name~ : String) -> FuncStubs = _
visit_FuncStubs_Import(Self, module_name~ : String, func_name~ : String, language~ : String?) -> FuncStubs = _
visit_FuncStubs_Embedded(Self, language~ : String?, code~ : EmbeddedCode) -> FuncStubs = _
visit_EmbeddedCode(Self, EmbeddedCode) -> EmbeddedCode = _
visit_EmbeddedCode_CodeString(Self, String) -> EmbeddedCode = _
Expand Down
Loading