aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielGavin <danielgavin5@hotmail.com>2024-03-31 17:36:13 +0200
committerDanielGavin <danielgavin5@hotmail.com>2024-03-31 17:36:13 +0200
commitddd9692fe424e4dada55f1d77a764cff8a6fd6a0 (patch)
treeb267c4a32d86b2d8d3c80d89725dd5326d049f7e
parentc413b8cbaead9c4ac9a174d56b8a62b6445e9fd5 (diff)
Fix nightlyfix-ci
-rw-r--r--.github/workflows/nightly.yml4
-rw-r--r--src/server/collector.odin27
2 files changed, 16 insertions, 15 deletions
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 8d5a3bd..c659e0b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,8 +14,8 @@ jobs:
- uses: actions/checkout@v1
- name: Download LLVM and setup PATH
run: |
- brew install llvm@14
- echo "/usr/local/opt/llvm@14/bin" >> $GITHUB_PATH
+ brew install llvm@17
+ echo "/usr/local/opt/llvm@17/bin" >> $GITHUB_PATH
TMP_PATH=$(xcrun --show-sdk-path)/user/include
echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
- name: Download Odin
diff --git a/src/server/collector.odin b/src/server/collector.odin
index 65d11e9..33c4822 100644
--- a/src/server/collector.odin
+++ b/src/server/collector.odin
@@ -160,22 +160,23 @@ collect_struct_fields :: proc(
for field in struct_type.fields.list {
for n in field.names {
- ident := n.derived.(^ast.Ident)
- append(&names, get_index_unique_string(collection, ident.name))
+ if ident, ok := n.derived.(^ast.Ident); ok {
+ append(&names, get_index_unique_string(collection, ident.name))
- cloned := clone_type(
- field.type,
- collection.allocator,
- &collection.unique_strings,
- )
- replace_package_alias(cloned, package_map, collection)
- append(&types, cloned)
+ cloned := clone_type(
+ field.type,
+ collection.allocator,
+ &collection.unique_strings,
+ )
+ replace_package_alias(cloned, package_map, collection)
+ append(&types, cloned)
- if .Using in field.flags {
- usings[len(names) - 1] = true
- }
+ if .Using in field.flags {
+ usings[len(names) - 1] = true
+ }
- append(&ranges, common.get_token_range(n, file.src))
+ append(&ranges, common.get_token_range(n, file.src))
+ }
}
}