feat: handle public kw

Author: pfitzseb

.github/workflows/jlpkgbutler-ci-master-workflow.yml

@@ -12,19 +12,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10']
-        julia-arch: [x64, x86]
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10', '1.11']
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        exclude:
-          - os: macOS-latest
-            julia-arch: x86
-
     steps:
-      - uses: actions/checkout@v3
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/install-juliaup@v1
         with:
-          version: ${{ matrix.julia-version }}
-          arch: ${{ matrix.julia-arch }}
+          julia-version: ${{ matrix.julia-version }}
       - uses: julia-actions/julia-buildpkg@v1
         env:
           PYTHON: ""
@@ -37,4 +31,3 @@ jobs:
           files: ./lcov.info
           flags: unittests
           token: ${{ secrets.CODECOV_TOKEN }}
-                    

.github/workflows/jlpkgbutler-ci-pr-workflow.yml

@@ -9,19 +9,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10']
-        julia-arch: [x64, x86]
+        julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10', '1.11']
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        exclude:
-          - os: macOS-latest
-            julia-arch: x86
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/install-juliaup@v1
         with:
-          version: ${{ matrix.julia-version }}
-          arch: ${{ matrix.julia-arch }}
+           julia-version: ${{matrix.julia-version}}
       - uses: julia-actions/julia-buildpkg@v1
         env:
           PYTHON: ""

src/components/internals.jl

@@ -366,6 +366,21 @@ function parse_nonstd_identifier(ps)
     end
 end
 
+function parse_public_item(ps::ParseState)
+    if kindof(ps.nt) === Tokens.AT_SIGN
+        parse_macroname(next(ps))
+    elseif kindof(ps.nt) === Tokens.EX_OR
+        parse_unary(ps, INSTANCE(next(ps)))
+    elseif isoperator(ps.nt)
+        next(ps)
+        EXPR(:OPERATOR, ps.nt.startbyte - ps.t.startbyte,  1 + ps.t.endbyte - ps.t.startbyte, val(ps.t, ps))
+    elseif is_nonstd_identifier(ps)
+        parse_nonstd_identifier(ps)
+    else
+        INSTANCE(next(ps))
+    end
+end
+
 function parse_importexport_item(ps, is_colon = false)
     if kindof(ps.nt) === Tokens.AT_SIGN
         parse_macroname(next(ps))

src/components/keywords.jl

@@ -72,6 +72,8 @@ function parse_kw(ps::ParseState)
         return @default ps parse_abstract(ps)
     elseif k === Tokens.PRIMITIVE
         return @default ps parse_primitive(ps)
+    elseif k === Tokens.PUBLIC
+        return @default ps parse_public(ps)
     elseif k === Tokens.TYPE
         return EXPR(:IDENTIFIER, ps)
     elseif k === Tokens.STRUCT
@@ -157,6 +159,23 @@ function parse_primitive(ps::ParseState)
     return ret
 end
 
+function parse_public(ps::ParseState)
+    args = EXPR[]
+    trivia = EXPR[EXPR(ps)]
+
+    push!(args, parse_importexport_item(ps))
+
+    prevpos = position(ps)
+    while iscomma(ps.nt)
+        push!(trivia, EXPR(next(ps)))
+        arg = parse_importexport_item(ps)
+        push!(args, arg)
+        prevpos = loop_check(ps, prevpos)
+    end
+
+    return EXPR(:public, args, trivia)
+end
+
 function parse_mutable(ps::ParseState)
     if kindof(ps.nt) === Tokens.STRUCT
         kw = EXPR(ps)

src/interface.jl

@@ -2,7 +2,7 @@
 isidentifier(x::EXPR) = headof(x) === :IDENTIFIER || headof(x) === :NONSTDIDENTIFIER
 isoperator(x::EXPR) = headof(x) === :OPERATOR
 isnonstdid(x::EXPR) = headof(x) === :NONSTDIDENTIFIER
-iskeyword(x::EXPR) = headof(x) in (:ABSTRACT, :BAREMODULE, :BEGIN, :BREAK, :CATCH, :CONST, :CONTINUE, :DO, :ELSE, :ELSEIF, :END, :EXPORT, :FINALLY, :FOR, :FUNCTION, :GLOBAL, :IF, :IMPORT, :importall, :LET, :LOCAL, :MACRO, :MODULE, :MUTABLE, :NEW, :OUTER, :PRIMITIVE, :QUOTE, :RETURN, :STRUCT, :TRY, :TYPE, :USING, :WHILE)
+iskeyword(x::EXPR) = headof(x) in (:ABSTRACT, :BAREMODULE, :BEGIN, :BREAK, :CATCH, :CONST, :CONTINUE, :DO, :ELSE, :ELSEIF, :END, :EXPORT, :FINALLY, :FOR, :FUNCTION, :GLOBAL, :IF, :IMPORT, :importall, :LET, :LOCAL, :MACRO, :MODULE, :MUTABLE, :NEW, :OUTER, :PRIMITIVE, :PUBLIC, :QUOTE, :RETURN, :STRUCT, :TRY, :TYPE, :USING, :WHILE)
 isliteral(x::EXPR) = isstringliteral(x) || iscmd(x) || ischar(x) || headof(x) in (:INTEGER, :BININT, :HEXINT, :OCTINT, :FLOAT,  :NOTHING, :TRUE, :FALSE)
 ispunctuation(x::EXPR) = is_comma(x) || is_lparen(x) || is_rparen(x) || is_lsquare(x) || is_rsquare(x) || is_lbrace(x) || is_rbrace(x) || headof(x) === :ATSIGN  || headof(x) === :DOT
 isstringliteral(x) = headof(x) === :STRING || headof(x) === :TRIPLESTRING

src/spec.jl

@@ -387,6 +387,8 @@ function tokenkindtoheadmap(k::Tokens.Kind)
         return :OUTER
     elseif k === Tokens.PRIMITIVE
         return :PRIMITIVE
+    elseif k === Tokens.PUBLIC
+        return :PUBLIC
     elseif k === Tokens.QUOTE
         return :QUOTE
     elseif k === Tokens.RETURN

test/parser/test_keyword_blocks.jl

@@ -189,3 +189,16 @@ end""" |> test_expr
 end""" |> test_expr
     @test "f() do x body end" |> test_expr
 end
+
+if VERSION > v"1.11-"
+    @testitem "public" begin
+        using CSTParser: remlineinfo!
+        include("../shared.jl")
+
+        @test """public foo""" |> test_expr
+        @test """public foo, bar""" |> test_expr
+        @test """public foo,
+        bar
+        """ |> test_expr
+    end
+end