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

Move exprAsDecl to mlang ast.mc #893

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Move exprAsDecl to mlang ast.mc #893

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
34 changes: 1 addition & 33 deletions src/stdlib/mexpr/json-debug.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ lang AstToJson = Ast + DeclAst

sem infoToJson : Info -> JsonValue
sem infoToJson = | info -> JsonString (info2str info)

-- TODO(vipa, 2024-05-16): This is a temporary helper until
-- https://github.com/miking-lang/miking/issues/826 is implemented
sem exprAsDecl : Expr -> Option (Decl, Expr)
sem exprAsDecl =
| _ -> None ()
end

lang VarToJson = AstToJson + VarAst
Expand Down Expand Up @@ -74,33 +68,7 @@ lang LamToJson = AstToJson + LamAst
] )
end

lang DeclsToJson = AstToJson + LetAst + LetDeclAst + RecLetsAst + RecLetsDeclAst + TypeAst + TypeDeclAst + DataAst + DataDeclAst + UtestAst + UtestDeclAst + ExtAst + ExtDeclAst
sem exprAsDecl =
| TmLet x -> Some
( DeclLet {ident = x.ident, tyAnnot = x.tyAnnot, tyBody = x.tyBody, body = x.body, info = x.info}
, x.inexpr
)
| TmRecLets x -> Some
( DeclRecLets {info = x.info, bindings = x.bindings}
, x.inexpr
)
| TmType x -> Some
( DeclType {ident = x.ident, params = x.params, tyIdent = x.tyIdent, info = x.info}
, x.inexpr
)
| TmConDef x -> Some
( DeclConDef {ident = x.ident, tyIdent = x.tyIdent, info = x.info}
, x.inexpr
)
| TmUtest x -> Some
( DeclUtest {test = x.test, expected = x.expected, tusing = x.tusing, tonfail = x.tonfail, info = x.info}
, x.next
)
| TmExt x -> Some
( DeclExt {ident = x.ident, tyIdent = x.tyIdent, effect = x.effect, info = x.info}
, x.inexpr
)

lang DeclsToJson = AstToJson + MExprAsDecl
sem exprToJson =
| tm & (TmLet _ | TmRecLets _ | TmType _ | TmConDef _ | TmUtest _ | TmExt _) ->
recursive let work = lam acc. lam expr.
Expand Down
133 changes: 130 additions & 3 deletions src/stdlib/mlang/ast.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@ lang DeclAst = Ast
sem sfold_Decl_Type f acc = | d -> (smapAccumL_Decl_Type (lam acc. lam a. (f acc a, a)) acc d).0
end

-- TODO(vipa, 2024-11-26): This enables working more or less as though
-- https://github.com/miking-lang/miking/issues/826 were already
-- implemented.
lang ExprAsDecl = DeclAst
sem exprAsDecl : Expr -> Option (Decl, Expr)
sem exprAsDecl =
| _ -> None ()

sem declAsExpr : Expr -> Decl -> Expr
end

-- DeclLang --
lang LangDeclAst = DeclAst
syn Decl =
Expand Down Expand Up @@ -142,12 +153,12 @@ lang SynDeclAst = DeclAst
(acc, DeclSyn {x with defs = defs})
end

lang SynProdExtDeclAst = DeclAst
syn Decl =
lang SynProdExtDeclAst = DeclAst
syn Decl =
| SynDeclProdExt {ident : Name,
extIdent : Name,
params : [Name],
globalExt : Option Type,
globalExt : Option Type,
individualExts : [{ident : Name, tyIdent : Type}],
includes : [(String, String)],
info : Info}
Expand Down Expand Up @@ -233,6 +244,25 @@ lang LetDeclAst = DeclAst
(acc, DeclLet {x with tyAnnot = tyAnnot, tyBody = tyBody})
end

lang LetAsDecl = ExprAsDecl + LetAst + LetDeclAst
sem exprAsDecl =
| TmLet x -> Some
( DeclLet {ident = x.ident, tyAnnot = x.tyAnnot, tyBody = x.tyBody, body = x.body, info = x.info}
, x.inexpr
)

sem declAsExpr inexpr =
| DeclLet x -> TmLet
{ ident = x.ident
, tyAnnot = x.tyAnnot
, tyBody = x.tyBody
, body = x.body
, info = x.info
, inexpr = inexpr
, ty = tyTm inexpr
}
end

-- DeclType --
lang TypeDeclAst = DeclAst
syn Decl =
Expand All @@ -253,6 +283,24 @@ lang TypeDeclAst = DeclAst
(acc, DeclType {x with tyIdent = tyIdent})
end

lang TypeAsDecl = ExprAsDecl + TypeAst + TypeDeclAst
sem exprAsDecl =
| TmType x -> Some
( DeclType {ident = x.ident, params = x.params, tyIdent = x.tyIdent, info = x.info}
, x.inexpr
)

sem declAsExpr inexpr =
| DeclType x -> TmType
{ ident = x.ident
, params = x.params
, tyIdent = x.tyIdent
, info = x.info
, inexpr = inexpr
, ty = tyTm inexpr
}
end

-- DeclRecLets --
lang RecLetsDeclAst = DeclAst + RecLetsAst
syn Decl =
Expand Down Expand Up @@ -283,6 +331,22 @@ lang RecLetsDeclAst = DeclAst + RecLetsAst
(acc, DeclRecLets {x with bindings = bindings})
end

lang RecLetsAsDecl = ExprAsDecl + RecLetsAst + RecLetsDeclAst
sem exprAsDecl =
| TmRecLets x -> Some
( DeclRecLets {info = x.info, bindings = x.bindings}
, x.inexpr
)

sem declAsExpr inexpr =
| DeclRecLets x -> TmRecLets
{ bindings = x.bindings
, info = x.info
, inexpr = inexpr
, ty = tyTm inexpr
}
end

-- DeclConDef --
lang DataDeclAst = DeclAst
syn Decl =
Expand All @@ -302,6 +366,23 @@ lang DataDeclAst = DeclAst
(acc, DeclConDef {x with tyIdent = tyIdent})
end

lang DataAsDecl = ExprAsDecl + DataAst + DataDeclAst
sem exprAsDecl =
| TmConDef x -> Some
( DeclConDef {ident = x.ident, tyIdent = x.tyIdent, info = x.info}
, x.inexpr
)

sem declAsExpr inexpr =
| DeclConDef x -> TmConDef
{ ident = x.ident
, tyIdent = x.tyIdent
, info = x.info
, inexpr = inexpr
, ty = tyTm inexpr
}
end

-- DeclUtest --
lang UtestDeclAst = DeclAst
syn Decl =
Expand All @@ -325,6 +406,25 @@ lang UtestDeclAst = DeclAst
(acc, DeclUtest {x with test = test, expected = expected, tusing = tusing})
end

lang UtestAsDecl = ExprAsDecl + UtestAst + UtestDeclAst
sem exprAsDecl =
| TmUtest x -> Some
( DeclUtest {test = x.test, expected = x.expected, tusing = x.tusing, tonfail = x.tonfail, info = x.info}
, x.next
)

sem declAsExpr inexpr =
| DeclUtest x -> TmUtest
{ test = x.test
, expected = x.expected
, tusing = x.tusing
, tonfail = x.tonfail
, info = x.info
, next = inexpr
, ty = tyTm inexpr
}
end

-- DeclExt --
lang ExtDeclAst = DeclAst
syn Decl =
Expand All @@ -345,6 +445,24 @@ lang ExtDeclAst = DeclAst
(acc, DeclExt {x with tyIdent = tyIdent})
end

lang ExtAsDecl = ExprAsDecl + ExtAst + ExtDeclAst
sem exprAsDecl =
| TmExt x -> Some
( DeclExt {ident = x.ident, tyIdent = x.tyIdent, effect = x.effect, info = x.info}
, x.inexpr
)

sem declAsExpr inexpr =
| DeclExt x -> TmExt
{ ident = x.ident
, tyIdent = x.tyIdent
, effect = x.effect
, info = x.info
, inexpr = inexpr
, ty = tyTm inexpr
}
end

-- DeclInclude --
lang IncludeDeclAst = DeclAst
syn Decl =
Expand Down Expand Up @@ -381,3 +499,12 @@ lang MLangAst =
+ TyUseAst + SynProdExtDeclAst

end

lang MExprAsDecl
= LetAsDecl
+ TypeAsDecl
+ RecLetsAsDecl
+ DataAsDecl
+ UtestAsDecl
+ ExtAsDecl
end
Loading