Skip to content

Commit f650262

Browse files
authored
Merge branch 'main' into lh/using-as
2 parents 229a4e2 + 46723f0 commit f650262

40 files changed

+2550
-945
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
- '1.6'
2424
- '1.7'
2525
- '1.8'
26+
- '1.9'
2627
- '1'
28+
- 'pre'
2729
- 'nightly'
2830
os:
2931
- ubuntu-latest
@@ -37,6 +39,7 @@ jobs:
3739
# - 1.0
3840
# - 1.6
3941
# - 1
42+
# - pre
4043
# - nightly
4144
# but remove some configurations from the build matrix to reduce CI time.
4245
# See https://github.com/marketplace/actions/setup-julia-environment
@@ -47,6 +50,7 @@ jobs:
4750
- {os: 'macOS-latest', version: '1.5'}
4851
- {os: 'macOS-latest', version: '1.7'}
4952
- {os: 'macOS-latest', version: '1.8'}
53+
- {os: 'macOS-latest', version: '1.9'}
5054
# MacOS not available on x86
5155
- {os: 'macOS-latest', arch: 'x86'}
5256
- {os: 'windows-latest', version: '1.1'}
@@ -56,29 +60,21 @@ jobs:
5660
- {os: 'windows-latest', version: '1.5'}
5761
- {os: 'windows-latest', version: '1.7'}
5862
- {os: 'windows-latest', version: '1.8'}
63+
- {os: 'windows-latest', version: '1.9'}
5964
- {os: 'ubuntu-latest', version: '1.1', arch: 'x86'}
6065
- {os: 'ubuntu-latest', version: '1.2', arch: 'x86'}
6166
- {os: 'ubuntu-latest', version: '1.3', arch: 'x86'}
6267
- {os: 'ubuntu-latest', version: '1.4', arch: 'x86'}
6368
- {os: 'ubuntu-latest', version: '1.5', arch: 'x86'}
6469
- {os: 'ubuntu-latest', version: '1.7', arch: 'x86'}
6570
- {os: 'ubuntu-latest', version: '1.8', arch: 'x86'}
71+
- {os: 'ubuntu-latest', version: '1.9', arch: 'x86'}
6672
steps:
6773
- uses: actions/checkout@v2
68-
- uses: julia-actions/setup-julia@v1
74+
- uses: julia-actions/setup-julia@v2
6975
with:
7076
version: ${{ matrix.version }}
7177
arch: ${{ matrix.arch }}
72-
- uses: actions/cache@v1
73-
env:
74-
cache-name: cache-artifacts
75-
with:
76-
path: ~/.julia/artifacts
77-
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
78-
restore-keys: |
79-
${{ runner.os }}-test-${{ env.cache-name }}-
80-
${{ runner.os }}-test-
81-
${{ runner.os }}-
8278
- uses: julia-actions/julia-buildpkg@v1
8379
- uses: julia-actions/julia-runtest@v1
8480
- uses: julia-actions/julia-processcoverage@latest
@@ -92,7 +88,7 @@ jobs:
9288
fail-fast: false
9389
steps:
9490
- uses: actions/checkout@v2
95-
- uses: julia-actions/setup-julia@v1
91+
- uses: julia-actions/setup-julia@v2
9692
with:
9793
version: 1.6
9894
arch: x64
@@ -115,7 +111,7 @@ jobs:
115111
- uses: actions/checkout@v2
116112
- uses: julia-actions/setup-julia@latest
117113
with:
118-
version: '1.9'
114+
version: '1.10'
119115
- run: julia --project=docs -e '
120116
using Pkg;
121117
Pkg.develop(PackageSpec(; path=pwd()));

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/tools/logs.txt
55
/docs/build
66
*.cov
7+
/.vscode/settings.json

Project.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
name = "JuliaSyntax"
22
uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4"
33
authors = ["Claire Foster <[email protected]> and contributors"]
4-
version = "0.4.6"
4+
version = "1.0.2"
55

66
[compat]
7+
Serialization = "1.0"
78
julia = "1.0"
89

910
[deps]
1011

1112
[extras]
1213
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
14+
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
1315
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1416

1517
[targets]
16-
test = ["Test", "Logging"]
18+
test = ["Test", "Serialization", "Logging"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# JuliaSyntax
22

33
[![Build Status](https://github.com/c42f/JuliaSyntax.jl/workflows/CI/badge.svg)](https://github.com/c42f/JuliaSyntax.jl/actions)
4-
[![codecov.io](http://codecov.io/github/JuliaLang/JuliaSyntax.jl/coverage.svg?branch=main)](http://codecov.io/github/JuliaLang/JuliaSyntax.jl?branch=main)
4+
[![codecov.io](https://codecov.io/github/JuliaLang/JuliaSyntax.jl/coverage.svg?branch=main)](https://codecov.io/github/JuliaLang/JuliaSyntax.jl?branch=main)
55

66
A Julia compiler frontend, written in Julia.
77

docs/Manifest.toml

Lines changed: 148 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.9.0"
3+
julia_version = "1.10.0"
44
manifest_format = "2.0"
5-
project_hash = "e0c77beb18dc1f6cce661ebd60658c0c1a77390f"
5+
project_hash = "46b5b82f24e4b5d97afc2843032730b022086b31"
66

77
[[deps.ANSIColoredPrinters]]
88
git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c"
99
uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
1010
version = "0.0.1"
1111

12+
[[deps.AbstractTrees]]
13+
git-tree-sha1 = "faa260e4cb5aba097a73fab382dd4b5819d8ec8c"
14+
uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
15+
version = "0.4.4"
16+
17+
[[deps.ArgTools]]
18+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
19+
version = "1.1.1"
20+
21+
[[deps.Artifacts]]
22+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
23+
1224
[[deps.Base64]]
1325
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1426

@@ -23,10 +35,36 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
2335
version = "0.9.3"
2436

2537
[[deps.Documenter]]
26-
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
27-
git-tree-sha1 = "58fea7c536acd71f3eef6be3b21c0df5f3df88fd"
38+
deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"]
39+
git-tree-sha1 = "2613dbec8f4748273bbe30ba71fd5cb369966bac"
2840
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
29-
version = "0.27.24"
41+
version = "1.2.1"
42+
43+
[[deps.Downloads]]
44+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
45+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
46+
version = "1.6.0"
47+
48+
[[deps.Expat_jll]]
49+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
50+
git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c"
51+
uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
52+
version = "2.5.0+0"
53+
54+
[[deps.FileWatching]]
55+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
56+
57+
[[deps.Git]]
58+
deps = ["Git_jll"]
59+
git-tree-sha1 = "51764e6c2e84c37055e846c516e9015b4a291c7d"
60+
uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
61+
version = "1.3.0"
62+
63+
[[deps.Git_jll]]
64+
deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"]
65+
git-tree-sha1 = "bb8f7cc77ec1152414b2af6db533d9471cfbb2d1"
66+
uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb"
67+
version = "2.42.0+0"
3068

3169
[[deps.IOCapture]]
3270
deps = ["Logging", "Random"]
@@ -38,47 +76,118 @@ version = "0.2.3"
3876
deps = ["Markdown"]
3977
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
4078

79+
[[deps.JLLWrappers]]
80+
deps = ["Artifacts", "Preferences"]
81+
git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
82+
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
83+
version = "1.5.0"
84+
4185
[[deps.JSON]]
4286
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
4387
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
4488
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
4589
version = "0.21.4"
4690

91+
[[deps.LazilyInitializedFields]]
92+
git-tree-sha1 = "8f7f3cabab0fd1800699663533b6d5cb3fc0e612"
93+
uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf"
94+
version = "1.2.2"
95+
96+
[[deps.LibCURL]]
97+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
98+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
99+
version = "0.6.4"
100+
101+
[[deps.LibCURL_jll]]
102+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
103+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
104+
version = "8.4.0+0"
105+
47106
[[deps.LibGit2]]
48-
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
107+
deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
49108
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
50109

110+
[[deps.LibGit2_jll]]
111+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
112+
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
113+
version = "1.6.4+0"
114+
115+
[[deps.LibSSH2_jll]]
116+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
117+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
118+
version = "1.11.0+1"
119+
120+
[[deps.Libdl]]
121+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
122+
123+
[[deps.Libiconv_jll]]
124+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
125+
git-tree-sha1 = "f9557a255370125b405568f9767d6d195822a175"
126+
uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
127+
version = "1.17.0+0"
128+
51129
[[deps.Logging]]
52130
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
53131

54132
[[deps.Markdown]]
55133
deps = ["Base64"]
56134
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
57135

136+
[[deps.MarkdownAST]]
137+
deps = ["AbstractTrees", "Markdown"]
138+
git-tree-sha1 = "465a70f0fc7d443a00dcdc3267a497397b8a3899"
139+
uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391"
140+
version = "0.1.2"
141+
142+
[[deps.MbedTLS_jll]]
143+
deps = ["Artifacts", "Libdl"]
144+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
145+
version = "2.28.2+1"
146+
58147
[[deps.Mmap]]
59148
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
60149

150+
[[deps.MozillaCACerts_jll]]
151+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
152+
version = "2023.1.10"
153+
61154
[[deps.NetworkOptions]]
62155
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
63156
version = "1.2.0"
64157

158+
[[deps.OpenSSL_jll]]
159+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
160+
git-tree-sha1 = "cc6e1927ac521b659af340e0ca45828a3ffc748f"
161+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
162+
version = "3.0.12+0"
163+
164+
[[deps.PCRE2_jll]]
165+
deps = ["Artifacts", "Libdl"]
166+
uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
167+
version = "10.42.0+1"
168+
65169
[[deps.Parsers]]
66170
deps = ["Dates", "PrecompileTools", "UUIDs"]
67-
git-tree-sha1 = "a5aef8d4a6e8d81f171b2bd4be5265b01384c74c"
171+
git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
68172
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
69-
version = "2.5.10"
173+
version = "2.8.1"
174+
175+
[[deps.Pkg]]
176+
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
177+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
178+
version = "1.10.0"
70179

71180
[[deps.PrecompileTools]]
72181
deps = ["Preferences"]
73-
git-tree-sha1 = "259e206946c293698122f63e2b513a7c99a244e8"
182+
git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
74183
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
75-
version = "1.1.1"
184+
version = "1.2.0"
76185

77186
[[deps.Preferences]]
78187
deps = ["TOML"]
79-
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
188+
git-tree-sha1 = "00805cd429dcb4870060ff49ef443486c262e38e"
80189
uuid = "21216c6a-2e73-6563-6e65-726566657250"
81-
version = "1.4.0"
190+
version = "1.4.1"
82191

83192
[[deps.Printf]]
84193
deps = ["Unicode"]
@@ -89,9 +198,15 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
89198
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
90199

91200
[[deps.Random]]
92-
deps = ["SHA", "Serialization"]
201+
deps = ["SHA"]
93202
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
94203

204+
[[deps.RegistryInstances]]
205+
deps = ["LazilyInitializedFields", "Pkg", "TOML", "Tar"]
206+
git-tree-sha1 = "ffd19052caf598b8653b99404058fce14828be51"
207+
uuid = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
208+
version = "0.1.0"
209+
95210
[[deps.SHA]]
96211
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
97212
version = "0.7.0"
@@ -107,6 +222,11 @@ deps = ["Dates"]
107222
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
108223
version = "1.0.3"
109224

225+
[[deps.Tar]]
226+
deps = ["ArgTools", "SHA"]
227+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
228+
version = "1.10.0"
229+
110230
[[deps.Test]]
111231
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
112232
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -117,3 +237,18 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
117237

118238
[[deps.Unicode]]
119239
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
240+
241+
[[deps.Zlib_jll]]
242+
deps = ["Libdl"]
243+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
244+
version = "1.2.13+1"
245+
246+
[[deps.nghttp2_jll]]
247+
deps = ["Artifacts", "Libdl"]
248+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
249+
version = "1.52.0+1"
250+
251+
[[deps.p7zip_jll]]
252+
deps = ["Artifacts", "Libdl"]
253+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
254+
version = "17.4.0+2"

docs/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3+
4+
[compat]
5+
Documenter = "1"

docs/make.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ using Documenter, JuliaSyntax
22

33
makedocs(;
44
modules=[JuliaSyntax],
5-
format=Documenter.HTML(),
5+
format=Documenter.HTML(
6+
repolink="https://github.com/JuliaLang/JuliaSyntax.jl"
7+
),
68
pages=[
79
"Overview" => "index.md"
810
"How To" => "howto.md"
@@ -15,7 +17,7 @@ makedocs(;
1517
repo="https://github.com/JuliaLang/JuliaSyntax.jl/blob/{commit}{path}#L{line}",
1618
sitename="JuliaSyntax.jl",
1719
authors = "Claire Foster and contributors: https://github.com/JuliaLang/JuliaSyntax.jl/graphs/contributors",
18-
strict = Documenter.except(:missing_docs)
20+
warnonly = true
1921
)
2022

2123
deploydocs(;

0 commit comments

Comments
 (0)