Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
cancel-in-progress: true

jobs:
build-ubuntu:
build-linux-amd64:
runs-on: ubuntu-latest
timeout-minutes: 45

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Run Wave end-to-end tests
run: python3 tools/run_tests.py

build-macos:
build-macos-arm64:
runs-on: macos-latest
timeout-minutes: 45

Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Run Wave end-to-end tests
run: python3 tools/run_tests.py

build-windows:
build-windows-amd64:
runs-on: windows-latest
timeout-minutes: 60

Expand All @@ -144,12 +144,19 @@ jobs:
install: >-
mingw-w64-x86_64-gcc
mingw-w64-x86_64-python
mingw-w64-x86_64-llvm-21
mingw-w64-x86_64-lld-21
mingw-w64-x86_64-libffi
mingw-w64-x86_64-zstd
mingw-w64-x86_64-zlib

- name: Install pinned LLVM 21 and LLD packages
shell: msys2 {0}
run: |
set -euo pipefail

pacman --noconfirm -U \
https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-21-21.1.8-5-any.pkg.tar.zst \
https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lld-21-21.1.8-5-any.pkg.tar.zst

- name: Install Rust GNU toolchain
shell: msys2 {0}
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ desktop.ini
*.old
*.orig
*.rej
/.tmp/
/tmp/
/temp/

Expand Down
2 changes: 1 addition & 1 deletion examples/tcp.wave
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fun syscall5(id: i64, a1: i64, a2: i64, a3: i64, p4: ptr<i8>, a5: i64) -> i64 {
fun htons(x: i16) -> i16 {
var a: i32 = x;
var y: i32 = ((a & 255) << 8) | ((a >> 8) & 255);
return y;
return y as i16;
}

fun _setsockopt_reuseaddr(sockfd: i64) {
Expand Down
8 changes: 7 additions & 1 deletion front/parser/src/import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ pub fn preprocess_target_attrs(source: &str, target: &TargetConditionContext) ->
pub struct ImportedUnit {
pub abs_path: PathBuf,
pub ast: Vec<ASTNode>,
pub source: String,
}

#[derive(Debug, Clone, Default)]
Expand Down Expand Up @@ -653,6 +654,7 @@ fn parse_wave_file(
return Ok(ImportedUnit {
abs_path,
ast: vec![],
source: String::new(),
});
}
already_imported.insert(abs_path_str);
Expand Down Expand Up @@ -719,5 +721,9 @@ fn parse_wave_file(
we
})?;

Ok(ImportedUnit { abs_path, ast })
Ok(ImportedUnit {
abs_path,
ast,
source: content,
})
}
Loading
Loading