Skip to content

Cleanup of ast and tkinter modules #74

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
dbrattli merged 3 commits into from
Sep 22, 2022
Merged

Cleanup of ast and tkinter modules #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5522ee8
Fixes for interfaces in ast and tkinter
dbrattli Sep 21, 2022
ed74da3
Bump dep version
dbrattli Sep 21, 2022
8249ef6
Update fable
dbrattli Sep 22, 2022
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"fable": {
"version": "4.0.0-theta-006",
"version": "4.0.0-theta-008",
"commands": [
"fable"
]
Expand Down
18 changes: 18 additions & 0 deletions src/stdlib/Ast.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,34 @@ open Fable.Core
type _identifier = string


[<Import("AST", "ast")>]
type AST =
abstract foo: int

[<Import("mod", "ast")>]
type ``mod`` =
inherit AST

[<Import("expr", "ast")>]
type expr =
inherit AST

[<Import("Module", "ast")>]
type Module =
inherit ``mod``
abstract body: stmt array

[<Import("Expression", "ast")>]
type Expression =
inherit ``mod``
abstract body: expr

[<Import("Module", "ast")>]
type stmt =
inherit AST


[<Import("FunctionDef", "ast")>]
type FunctionDef =
inherit stmt

Expand All @@ -37,6 +44,7 @@ type FunctionDef =
abstract decorator_list: expr array
abstract returns: expr option

[<Import("ClassDef", "ast")>]
type ClassDef =
inherit stmt
abstract name: _identifier
Expand All @@ -45,35 +53,42 @@ type ClassDef =
abstract body: stmt array
abstract decorator_list: expr array

[<Import("Return", "ast")>]
type Return =
inherit stmt
abstract value: expr option

[<Import("Delete", "ast")>]
type Delete =
inherit stmt
abstract targets: expr array

[<Import("Assign", "ast")>]
type Assign =
inherit stmt
abstract targets: expr array
abstract value: expr

[<Import("Import", "ast")>]
type Import =
inherit stmt
abstract names: alias array

[<Import("ImportFrom", "ast")>]
type ImportFrom =
inherit stmt
abstract ``module``: _identifier option
abstract names: alias array
abstract level: int

[<Import("If", "ast")>]
type If =
inherit stmt
abstract test: expr
abstract body: stmt array
abstract orelse: stmt array

[<Import("arguments", "ast")>]
type arguments =
inherit AST

Expand All @@ -85,16 +100,19 @@ type arguments =
abstract kwarg: arg option
abstract defaults: expr array

[<Import("arg", "ast")>]
type arg =
inherit AST
abstract arg: _identifier
abstract annotation: expr option

[<Import("keyword", "ast")>]
type keyword =
inherit AST
abstract arg: _identifier option
abstract value: expr

[<Import("alias", "ast")>]
type alias =
inherit AST
abstract name: _identifier
Expand Down
4 changes: 4 additions & 0 deletions src/stdlib/TkInter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ module Fable.Python.TkInter

open Fable.Core

[<Import("Event", "tkinter")>]
type Event =
abstract member x : int
abstract member y : int

[<Import("Misc", "tkinter")>]
type Misc =
abstract member bind : sequence: string * func: (Event -> unit) -> string option

[<Import("Wm", "tkinter")>]

type Wm =
abstract member title : unit -> string
abstract member title : string: string -> unit
Expand Down