Merge branch 'master' of https://github.com/DanielGavin/ols

DanielGavin · Nov 25, 2023 · eff0220 · eff0220
2 parents 31cda7e + e53da4d
commit eff0220
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
   macos:
     strategy:
       matrix:
-        os: [macos-11, macos-latest]
+        os: [macos-12, macos-latest]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Download LLVM
-      run: sudo apt-get install llvm-11 clang-11
+      run: sudo apt update && sudo apt purge -qq -y llvm-12 clang-12
     - name: Download Odin
       run: |
         git clone https://github.com/odin-lang/Odin

diff --git a/src/common/ast.odin b/src/common/ast.odin
@@ -198,10 +198,10 @@ collect_value_decl :: proc(
 	skip_private: bool,
 ) {
 	if value_decl, ok := stmt.derived.(^ast.Value_Decl); ok {
-		is_deprecated := false
+		is_deprecated   := false
 		is_private_file := false
-		is_package_file := false
-		is_builtin := false
+		is_private_pkg  := false
+		is_builtin      := false
 
 		for attribute in value_decl.attributes {
 			for elem in attribute.elems {
@@ -215,10 +215,10 @@ collect_value_decl :: proc(
 								case "\"file\"":
 									is_private_file = true
 								case "package":
-									is_package_file = true
+									is_private_pkg = true
 								}
 							} else {
-								is_package_file = true
+								is_private_pkg = true
 							}
 						}
 					}
@@ -229,7 +229,7 @@ collect_value_decl :: proc(
 					case "builtin":
 						is_builtin = true
 					case "private":
-						is_package_file = true
+						is_private_pkg = true
 					}
 				}
 			}
@@ -238,6 +238,25 @@ collect_value_decl :: proc(
 		if is_private_file && skip_private {
 			return
 		}
+
+		// If a private status is not explicitly set with an attribute above the declaration
+		// check the file comment.
+		if !is_private_file && !is_private_pkg && file.docs != nil {
+			for comment in file.docs.list {
+				txt := comment.text
+				if strings.has_prefix(txt, "//+private") {
+					txt = strings.trim_prefix(txt, "//+private")
+					is_private_pkg = true
+
+					if strings.has_prefix(txt, " ") {
+						txt = strings.trim_space(txt)
+						if txt == "file" {
+							is_private_file = true
+						}
+					}
+				}
+			}
+		}
 
 		for name, i in value_decl.names {
 			str := get_ast_node_string(name, file.src)
@@ -254,7 +273,7 @@ collect_value_decl :: proc(
 						attributes = value_decl.attributes[:],
 						deprecated = is_deprecated,
 						builtin = is_builtin,
-						package_private = is_package_file,
+						package_private = is_private_pkg,
 					},
 				)
 			} else {
@@ -270,7 +289,7 @@ collect_value_decl :: proc(
 							attributes = value_decl.attributes[:],
 							deprecated = is_deprecated,
 							builtin = is_builtin,
-							package_private = is_package_file,
+							package_private = is_private_pkg,
 						},
 					)
 				}