only parse public in toplevel scopse

Author: pfitzseb

src/components/keywords.jl

@@ -3,7 +3,7 @@
 
 Dispatch function for when the parser has reached a keyword.
 """
-function parse_kw(ps::ParseState)
+function parse_kw(ps::ParseState; is_toplevel = false)
     k = kindof(ps.t)
     if ps.closer.precedence == 20 && ps.lt.kind === Tokens.EX_OR && k !== Tokens.END
         return EXPR(:IDENTIFIER, ps)
@@ -73,7 +73,11 @@ function parse_kw(ps::ParseState)
     elseif k === Tokens.PRIMITIVE
         return @default ps parse_primitive(ps)
     elseif k === Tokens.PUBLIC
-        return @default ps parse_public(ps)
+        if is_toplevel
+            return @default ps parse_public(ps)
+        else
+            return EXPR(:IDENTIFIER, ps)
+        end
     elseif k === Tokens.TYPE
         return EXPR(:IDENTIFIER, ps)
     elseif k === Tokens.STRUCT

src/packagedef.jl

@@ -33,7 +33,7 @@ Acceptable starting tokens are:
 + An `@`.
 
 """
-function parse_expression(ps::ParseState, esc_on_error = false)
+function parse_expression(ps::ParseState, esc_on_error = false; is_toplevel = false)
     if kindof(ps.nt) === Tokens.ENDMARKER
         ret = mErrorToken(ps, UnexpectedToken)
     elseif (esc_on_error && ps.nt.kind == Tokens.ERROR)
@@ -47,7 +47,7 @@ function parse_expression(ps::ParseState, esc_on_error = false)
     else
         next(ps)
         if iskeyword(kindof(ps.t)) && kindof(ps.t) != Tokens.DO
-            ret = parse_kw(ps)
+            ret = parse_kw(ps; is_toplevel=is_toplevel)
         elseif kindof(ps.t) === Tokens.LPAREN
             ret = parse_paren(ps)
         elseif kindof(ps.t) === Tokens.LSQUARE
@@ -212,14 +212,14 @@ function parse_doc(ps::ParseState)
         elseif isbinaryop(ps.nt) && !closer(ps)
             ret = parse_compound_recur(ps, doc)
         else
-            ret = parse_expression(ps)
+            ret = parse_expression(ps; is_toplevel = true)
             ret = EXPR(:macrocall, EXPR[EXPR(:globalrefdoc, 0, 0), EXPR(:NOTHING, 0, 0), doc, ret], nothing)
         end
     else
-        ret = parse_expression(ps)
+        ret = parse_expression(ps; is_toplevel = true)
     end
     if _continue_doc_parse(ps, ret)
-        push!(ret, parse_expression(ps))
+        push!(ret, parse_expression(ps; is_toplevel = true))
     end
     return ret
 end

test/parser/test_keyword_blocks.jl

@@ -195,10 +195,17 @@ if VERSION > v"1.11-"
         using CSTParser: remlineinfo!
         include("../shared.jl")
 
-        @test """public foo""" |> test_expr
-        @test """public foo, bar""" |> test_expr
-        @test """public foo,
+        @test "public foo" |> test_expr
+        @test "public foo, bar" |> test_expr
+        @test """
+        public foo,
         bar
         """ |> test_expr
+        @test "f() = public" |> test_expr
+        @test """
+        let
+            public
+        end
+        """ |> test_expr
     end
 end