Merge pull request #4203 from karl-zylinski/file-tags-without-comments

Make tags use #+ syntax instead of //+

base/intrinsics/intrinsics.odin

@@ -1,5 +1,5 @@
 // This is purely for documentation
-//+build ignore
+#+build ignore
 package intrinsics
 
 // Package-Related

base/runtime/core.odin

@@ -18,7 +18,7 @@
 // This could change at a later date if the all these data structures are
 // implemented within the compiler rather than in this "preload" file
 //
-//+no-instrumentation
+#+no-instrumentation
 package runtime
 
 import "base:intrinsics"

base/runtime/entry_unix.odin

@@ -1,6 +1,6 @@
-//+private
-//+build linux, darwin, freebsd, openbsd, netbsd, haiku
-//+no-instrumentation
+#+private
+#+build linux, darwin, freebsd, openbsd, netbsd, haiku
+#+no-instrumentation
 package runtime
 
 import "base:intrinsics"

base/runtime/entry_wasm.odin

@@ -1,6 +1,6 @@
-//+private
-//+build wasm32, wasm64p32
-//+no-instrumentation
+#+private
+#+build wasm32, wasm64p32
+#+no-instrumentation
 package runtime
 
 import "base:intrinsics"

base/runtime/entry_windows.odin

@@ -1,6 +1,6 @@
-//+private
-//+build windows
-//+no-instrumentation
+#+private
+#+build windows
+#+no-instrumentation
 package runtime
 
 import "base:intrinsics"

base/runtime/heap_allocator_orca.odin

@@ -1,5 +1,5 @@
-//+build orca
-//+private
+#+build orca
+#+private
 package runtime
 
 foreign {

base/runtime/heap_allocator_other.odin

@@ -1,5 +1,5 @@
-//+build js, wasi, freestanding, essence
-//+private
+#+build js, wasi, freestanding, essence
+#+private
 package runtime
 
 _heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr {

base/runtime/heap_allocator_unix.odin

@@ -1,5 +1,5 @@
-//+build linux, darwin, freebsd, openbsd, netbsd, haiku
-//+private
+#+build linux, darwin, freebsd, openbsd, netbsd, haiku
+#+private
 package runtime
 
 when ODIN_OS == .Darwin {

base/runtime/internal.odin

@@ -1,4 +1,4 @@
-//+vet !cast
+#+vet !cast
 package runtime
 
 import "base:intrinsics"

base/runtime/os_specific_bsd.odin

@@ -1,5 +1,5 @@
-//+build freebsd, openbsd, netbsd
-//+private
+#+build freebsd, openbsd, netbsd
+#+private
 package runtime
 
 foreign import libc "system:c"

base/runtime/os_specific_darwin.odin

@@ -1,5 +1,5 @@
-//+build darwin
-//+private
+#+build darwin
+#+private
 package runtime
 
 import "base:intrinsics"

base/runtime/os_specific_freestanding.odin

@@ -1,5 +1,5 @@
-//+build freestanding
-//+private
+#+build freestanding
+#+private
 package runtime
 
 // TODO(bill): reimplement `os.write`

base/runtime/os_specific_haiku.odin

@@ -1,5 +1,5 @@
-//+build haiku
-//+private
+#+build haiku
+#+private
 package runtime
 
 foreign import libc "system:c"

base/runtime/os_specific_js.odin

@@ -1,5 +1,5 @@
-//+build js
-//+private
+#+build js
+#+private
 package runtime
 
 foreign import "odin_env"

base/runtime/os_specific_linux.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package runtime
 
 import "base:intrinsics"

base/runtime/os_specific_orca.odin

@@ -1,5 +1,5 @@
-//+build orca
-//+private
+#+build orca
+#+private
 package runtime
 
 import "base:intrinsics"

base/runtime/os_specific_wasi.odin

@@ -1,5 +1,5 @@
-//+build wasi
-//+private
+#+build wasi
+#+private
 package runtime
 
 foreign import wasi "wasi_snapshot_preview1"

base/runtime/os_specific_windows.odin

@@ -1,5 +1,5 @@
-//+build windows
-//+private
+#+build windows
+#+private
 package runtime
 
 foreign import kernel32 "system:Kernel32.lib"

base/runtime/procs_darwin.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package runtime
 
 foreign import "system:Foundation.framework"

base/runtime/procs_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package runtime
 
 init_default_context_for_js: Context

base/runtime/procs_wasm.odin

@@ -1,4 +1,4 @@
-//+build wasm32, wasm64p32
+#+build wasm32, wasm64p32
 package runtime
 
 @(private="file")

base/runtime/procs_windows_amd64.odin

@@ -1,5 +1,5 @@
-//+private
-//+no-instrumentation
+#+private
+#+no-instrumentation
 package runtime
 
 foreign import kernel32 "system:Kernel32.lib"

base/runtime/procs_windows_i386.odin

@@ -1,5 +1,5 @@
-//+private
-//+no-instrumentation
+#+private
+#+no-instrumentation
 package runtime
 
 @require foreign import "system:int64.lib"

base/runtime/wasm_allocator.odin

@@ -1,4 +1,4 @@
-//+build wasm32, wasm64p32
+#+build wasm32, wasm64p32
 package runtime
 
 import "base:intrinsics"

core/compress/zlib/zlib.odin

@@ -1,4 +1,4 @@
-//+vet !using-param
+#+vet !using-param
 package compress_zlib
 
 /*

core/crypto/_aes/hw_intel/api.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package aes_hw_intel
 
 import "core:sys/info"

core/crypto/_aes/hw_intel/ghash.odin

@@ -20,7 +20,7 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//+build amd64
+#+build amd64
 package aes_hw_intel
 
 import "base:intrinsics"

core/crypto/_aes/hw_intel/hw_intel_keysched.odin

@@ -20,7 +20,7 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-//+build amd64
+#+build amd64
 package aes_hw_intel
 
 import "base:intrinsics"

core/crypto/_chacha20/simd256/chacha20_simd256.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package chacha20_simd256
 
 import "base:intrinsics"

core/crypto/_chacha20/simd256/chacha20_simd256_stub.odin

@@ -1,4 +1,4 @@
-//+build !amd64
+#+build !amd64
 package chacha20_simd256
 
 import "base:intrinsics"

core/crypto/aes/aes_ctr_hw_intel.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package aes
 
 import "base:intrinsics"

core/crypto/aes/aes_ecb_hw_intel.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package aes
 
 import "base:intrinsics"

core/crypto/aes/aes_gcm_hw_intel.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package aes
 
 import "base:intrinsics"

core/crypto/aes/aes_impl_hw_gen.odin

@@ -1,4 +1,4 @@
-//+build !amd64
+#+build !amd64
 package aes
 
 @(private = "file")

core/crypto/aes/aes_impl_hw_intel.odin

@@ -1,4 +1,4 @@
-//+build amd64
+#+build amd64
 package aes
 
 import "core:crypto/_aes/hw_intel"

core/crypto/rand_bsd.odin

@@ -1,4 +1,4 @@
-//+build freebsd, openbsd, netbsd
+#+build freebsd, openbsd, netbsd
 package crypto
 
 foreign import libc "system:c"

core/crypto/rand_generic.odin

@@ -1,10 +1,10 @@
-//+build !linux
-//+build !windows
-//+build !openbsd
-//+build !freebsd
-//+build !netbsd
-//+build !darwin
-//+build !js
+#+build !linux
+#+build !windows
+#+build !openbsd
+#+build !freebsd
+#+build !netbsd
+#+build !darwin
+#+build !js
 package crypto
 
 HAS_RAND_BYTES :: false

core/debug/trace/trace_cpp.odin

@@ -1,5 +1,5 @@
-//+private file
-//+build linux, darwin
+#+private file
+#+build linux, darwin
 package debug_trace
 
 import "base:intrinsics"

core/debug/trace/trace_nil.odin

@@ -1,6 +1,6 @@
-//+build !windows
-//+build !linux
-//+build !darwin
+#+build !windows
+#+build !linux
+#+build !darwin
 package debug_trace
 
 import "base:runtime"

core/debug/trace/trace_windows.odin

@@ -1,5 +1,5 @@
-//+private
-//+build windows
+#+private
+#+build windows
 package debug_trace
 
 import "base:intrinsics"

core/dynlib/lib_js.odin

@@ -1,5 +1,5 @@
-//+build js
-//+private
+#+build js
+#+private
 package dynlib
 
 _load_library :: proc(path: string, global_symbols := false) -> (Library, bool) {

core/dynlib/lib_unix.odin

@@ -1,5 +1,5 @@
-//+build linux, darwin, freebsd, openbsd, netbsd
-//+private
+#+build linux, darwin, freebsd, openbsd, netbsd
+#+private
 package dynlib
 
 import "core:os"

core/dynlib/lib_windows.odin

@@ -1,5 +1,5 @@
-//+build windows
-//+private
+#+build windows
+#+private
 package dynlib
 
 import win32 "core:sys/windows"

core/flags/errors_bsd.odin

@@ -1,4 +1,4 @@
-//+build netbsd, openbsd
+#+build netbsd, openbsd
 package flags
 
 import "base:runtime"

core/flags/errors_nonbsd.odin

@@ -1,5 +1,5 @@
-//+build !netbsd
-//+build !openbsd
+#+build !netbsd
+#+build !openbsd
 package flags
 
 import "base:runtime"

core/flags/internal_assignment.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package flags
 
 import "base:intrinsics"

core/flags/internal_parsing.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package flags
 
 import "core:container/bit_array"

core/flags/internal_rtti.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package flags
 
 import "base:intrinsics"

core/flags/internal_rtti_nonbsd.odin

@@ -1,6 +1,6 @@
-//+private
-//+build !netbsd
-//+build !openbsd
+#+private
+#+build !netbsd
+#+build !openbsd
 package flags
 
 import "core:net"

core/flags/internal_validation.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package flags
 
 @require import "base:runtime"

core/fmt/example.odin

@@ -1,4 +1,4 @@
-//+build ignore
+#+build ignore
 package custom_formatter_example
 import "core:fmt"
 import "core:io"

core/fmt/fmt_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package fmt
 
 import "core:bufio"

core/fmt/fmt_os.odin

@@ -1,6 +1,6 @@
-//+build !freestanding
-//+build !js
-//+build !orca
+#+build !freestanding
+#+build !js
+#+build !orca
 package fmt
 
 import "base:runtime"

core/image/bmp/bmp_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package core_image_bmp
 
 load :: proc{load_from_bytes, load_from_context}

core/image/bmp/bmp_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package core_image_bmp
 
 import "core:os"

core/image/general_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package image
 
 load :: proc{

core/image/general_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package image
 
 import "core:os"

core/image/netpbm/netpbm.odin

@@ -1,4 +1,4 @@
-//+vet !using-stmt
+#+vet !using-stmt
 package netpbm
 
 import "core:bytes"

core/image/netpbm/netpbm_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package netpbm
 
 load :: proc {

core/image/netpbm/netpbm_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package netpbm
 
 import "core:os"

core/image/png/png.odin

@@ -8,7 +8,7 @@
 */
 
 
-//+vet !using-stmt
+#+vet !using-stmt
 package png
 
 import "core:compress"

core/image/png/png_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package png
 
 load :: proc{load_from_bytes, load_from_context}

core/image/png/png_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package png
 
 import "core:os"

core/image/qoi/qoi_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package qoi
 
 save :: proc{save_to_buffer}

core/image/qoi/qoi_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package qoi
 
 import "core:os"

core/image/tga/tga_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package tga
 
 save :: proc{save_to_buffer}

core/image/tga/tga_os.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package tga
 
 import "core:os"

core/log/file_console_logger.odin

@@ -1,5 +1,5 @@
-//+build !freestanding
-//+build !orca
+#+build !freestanding
+#+build !orca
 package log
 
 import "core:encoding/ansi"

core/math/big/tune.odin

@@ -7,7 +7,7 @@
 	The code started out as an idiomatic source port of libTomMath, which is in the public domain, with thanks.
 */
 
-//+build ignore
+#+build ignore
 package math_big
 
 import "core:time"

core/math/math_basic.odin

@@ -1,4 +1,4 @@
-//+build !js
+#+build !js
 package math
 
 import "base:intrinsics"

core/math/math_basic_js.odin

@@ -1,4 +1,4 @@
-//+build js
+#+build js
 package math
 
 import "base:intrinsics"

core/math/noise/internal.odin

@@ -4,7 +4,7 @@
 	Ported from https://github.com/KdotJPG/OpenSimplex2.
 	Copyright 2022 Yuki2 (https://github.com/NoahR02)
 */
-//+private
+#+private
 package math_noise
 
 /*

core/mem/mutex_allocator.odin

@@ -1,4 +1,4 @@
-//+build !freestanding
+#+build !freestanding
 package mem
 
 import "core:sync"

core/mem/tracking_allocator.odin

@@ -1,4 +1,4 @@
-//+build !freestanding
+#+build !freestanding
 package mem
 
 import "base:runtime"

core/mem/virtual/virtual_linux.odin

@@ -1,5 +1,5 @@
-//+build linux
-//+private
+#+build linux
+#+private
 package mem_virtual
 
 import "core:sys/linux"

core/mem/virtual/virtual_other.odin

@@ -1,10 +1,10 @@
-//+private
-//+build !darwin
-//+build !freebsd
-//+build !openbsd
-//+build !netbsd
-//+build !linux
-//+build !windows
+#+private
+#+build !darwin
+#+build !freebsd
+#+build !openbsd
+#+build !netbsd
+#+build !linux
+#+build !windows
 package mem_virtual
 
 _reserve :: proc "contextless" (size: uint) -> (data: []byte, err: Allocator_Error) {

core/mem/virtual/virtual_platform.odin

@@ -1,4 +1,4 @@
-//+private
+#+private
 package mem_virtual
 
 Platform_Memory_Block :: struct {

core/mem/virtual/virtual_posix.odin

@@ -1,5 +1,5 @@
-//+build darwin, netbsd, freebsd, openbsd
-//+private
+#+build darwin, netbsd, freebsd, openbsd
+#+private
 package mem_virtual
 
 import "core:sys/posix"

core/mem/virtual/virtual_windows.odin

@@ -1,5 +1,5 @@
-//+build windows
-//+private
+#+build windows
+#+private
 package mem_virtual
 
 foreign import Kernel32 "system:Kernel32.lib"

core/net/addr.odin

@@ -1,4 +1,4 @@
-// +build windows, linux, darwin, freebsd
+#+build windows, linux, darwin, freebsd
 package net
 
 /*

core/net/common.odin

@@ -1,4 +1,4 @@
-// +build windows, linux, darwin, freebsd
+#+build windows, linux, darwin, freebsd
 package net
 
 /*

core/net/dns.odin

@@ -1,4 +1,4 @@
-// +build windows, linux, darwin, freebsd
+#+build windows, linux, darwin, freebsd
 package net
 
 /*

core/net/dns_unix.odin

@@ -1,4 +1,4 @@
-//+build linux, darwin, freebsd
+#+build linux, darwin, freebsd
 package net
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/dns_windows.odin

@@ -1,4 +1,4 @@
-//+build windows
+#+build windows
 package net
 
 /*

core/net/errors_darwin.odin

@@ -1,5 +1,5 @@
+#+build darwin
 package net
-// +build darwin
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/errors_freebsd.odin

@@ -1,4 +1,4 @@
-//+build freebsd
+#+build freebsd
 package net
 
 /*

core/net/errors_linux.odin

@@ -1,5 +1,5 @@
+#+build linux
 package net
-// +build linux
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/errors_windows.odin

@@ -1,5 +1,5 @@
+#+build windows
 package net
-// +build windows
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/interface.odin

@@ -1,4 +1,4 @@
-// +build windows, linux, darwin, freebsd
+#+build windows, linux, darwin, freebsd
 package net
 
 /*

core/net/interface_darwin.odin

@@ -1,5 +1,5 @@
+#+build darwin
 package net
-//+build darwin
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/interface_freebsd.odin

@@ -1,4 +1,4 @@
-//+build freebsd
+#+build freebsd
 package net
 
 /*

core/net/interface_linux.odin

@@ -1,5 +1,5 @@
+#+build linux
 package net
-//+build linux
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/interface_windows.odin

@@ -1,5 +1,5 @@
+#+build windows
 package net
-//+build windows
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/socket.odin

@@ -1,4 +1,4 @@
-// +build windows, linux, darwin, freebsd
+#+build windows, linux, darwin, freebsd
 package net
 
 /*

core/net/socket_darwin.odin

@@ -1,5 +1,5 @@
+#+build darwin
 package net
-// +build darwin
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/socket_freebsd.odin

@@ -1,4 +1,4 @@
-//+build freebsd
+#+build freebsd
 package net
 
 /*

core/net/socket_linux.odin

@@ -1,5 +1,5 @@
+#+build linux
 package net
-// +build linux
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/net/socket_windows.odin

@@ -1,5 +1,5 @@
+#+build windows
 package net
-// +build windows
 
 /*
 	Package net implements cross-platform Berkeley Sockets, DNS resolution and associated procedures.

core/odin/ast/ast.odin

@@ -69,6 +69,7 @@ File :: struct {
 	fullpath: string,
 	src:      string,
 
+	tags: [dynamic]tokenizer.Token,
 	docs: ^Comment_Group,
 
 	pkg_decl:  ^Package_Decl,

core/odin/parser/file_tags.odin

@@ -51,7 +51,7 @@ get_build_arch_from_string :: proc(str: string) -> runtime.Odin_Arch_Type {
 parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags: File_Tags) {
 	context.allocator = allocator
 
-	if file.docs == nil {
+	if file.docs == nil && file.tags == nil {
 		return
 	}
 
@@ -95,11 +95,9 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
 	build_project_names: [dynamic][]string
 	defer shrink(&build_project_names)
 
-	for comment in file.docs.list {
-		if len(comment.text) < 3 || comment.text[:2] != "//" {
-			continue
-		}
-		text := comment.text[2:]
+	parse_tag :: proc(text: string, tags: ^File_Tags, build_kinds: ^[dynamic]Build_Kind,
+	                  build_project_name_strings: ^[dynamic]string,
+	                  build_project_names: ^[dynamic][]string) {
 		i := 0
 
 		skip_whitespace(text, &i)
@@ -124,7 +122,7 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
 				groups_loop: for {
 					index_start := len(build_project_name_strings)
 
-					defer append(&build_project_names, build_project_name_strings[index_start:])
+					defer append(build_project_names, build_project_name_strings[index_start:])
 
 					for {
 						skip_whitespace(text, &i)
@@ -143,10 +141,10 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
 						}
 	
 						scan_value(text, &i)
-						append(&build_project_name_strings, text[name_start:i])
+						append(build_project_name_strings, text[name_start:i])
 					}
 
-					append(&build_project_names, build_project_name_strings[index_start:])
+					append(build_project_names, build_project_name_strings[index_start:])
 				}
 			case "build":
 				kinds_loop: for {
@@ -156,7 +154,7 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
 					arch_positive: runtime.Odin_Arch_Types
 					arch_negative: runtime.Odin_Arch_Types
 
-					defer append(&build_kinds, Build_Kind{
+					defer append(build_kinds, Build_Kind{
 						os   = (os_positive   == {} ? runtime.ALL_ODIN_OS_TYPES   : os_positive)  -os_negative,
 						arch = (arch_positive == {} ? runtime.ALL_ODIN_ARCH_TYPES : arch_positive)-arch_negative,
 					})
@@ -200,6 +198,27 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
 		}
 	}
 
+	if file.docs != nil {
+		for comment in file.docs.list {
+			if len(comment.text) < 3 || comment.text[:2] != "//" {
+				continue
+			}
+			text := comment.text[2:]
+
+			parse_tag(text, &tags, &build_kinds, &build_project_name_strings, &build_project_names)
+		}
+	}
+
+	for tag in file.tags {
+		if len(tag.text) < 3 || tag.text[:2] != "#+" {
+			continue
+		}
+		// Only skip # because parse_tag skips the plus
+		text := tag.text[1:]
+
+		parse_tag(text, &tags, &build_kinds, &build_project_name_strings, &build_project_names)
+	}
+
 	tags.build = build_kinds[:]
 	tags.build_project_name = build_project_names[:]