aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/cases/eval.zig8
-rw-r--r--test/cases/generics.zig16
-rw-r--r--test/cases/misc.zig4
-rw-r--r--test/cases/this.zig2
-rw-r--r--test/run_tests.cpp18
5 files changed, 24 insertions, 24 deletions
diff --git a/test/cases/eval.zig b/test/cases/eval.zig
index a414fe91ca..4b6a095726 100644
--- a/test/cases/eval.zig
+++ b/test/cases/eval.zig
@@ -25,17 +25,17 @@ fn testStaticAddOne() {
fn inlinedLoop() {
@setFnTest(this);
- inline var i = 0;
- inline var sum = 0;
+ comptime var i = 0;
+ comptime var sum = 0;
inline while (i <= 5; i += 1)
sum += i;
assert(sum == 15);
}
-fn gimme1or2(inline a: bool) -> i32 {
+fn gimme1or2(comptime a: bool) -> i32 {
const x: i32 = 1;
const y: i32 = 2;
- inline var z: i32 = if (a) x else y;
+ comptime var z: i32 = if (a) x else y;
return z;
}
fn inlineVariableGetsResultOfConstIf() {
diff --git a/test/cases/generics.zig b/test/cases/generics.zig
index 0d526266d6..76bb9fe5ef 100644
--- a/test/cases/generics.zig
+++ b/test/cases/generics.zig
@@ -8,11 +8,11 @@ fn simpleGenericFn() {
assert(add(2, 3) == 5);
}
-fn max(inline T: type, a: T, b: T) -> T {
+fn max(comptime T: type, a: T, b: T) -> T {
return if (a > b) a else b;
}
-fn add(inline a: i32, b: i32) -> i32 {
+fn add(comptime a: i32, b: i32) -> i32 {
return @staticEval(a) + b;
}
@@ -67,11 +67,11 @@ fn max_f64(a: f64, b: f64) -> f64 {
}
-pub fn List(inline T: type) -> type {
+pub fn List(comptime T: type) -> type {
SmallList(T, 8)
}
-pub fn SmallList(inline T: type, inline STATIC_SIZE: usize) -> type {
+pub fn SmallList(comptime T: type, comptime STATIC_SIZE: usize) -> type {
struct {
items: []T,
length: usize,
@@ -100,7 +100,7 @@ fn genericStruct() {
assert(a1.value == a1.getVal());
assert(b1.getVal());
}
-fn GenNode(inline T: type) -> type {
+fn GenNode(comptime T: type) -> type {
struct {
value: T,
next: ?&GenNode(T),
@@ -113,7 +113,7 @@ fn constDeclsInStruct() {
assert(GenericDataThing(3).count_plus_one == 4);
}
-fn GenericDataThing(inline count: isize) -> type {
+fn GenericDataThing(comptime count: isize) -> type {
struct {
const count_plus_one = count + 1;
}
@@ -125,7 +125,7 @@ fn useGenericParamInGenericParam() {
assert(aGenericFn(i32, 3, 4) == 7);
}
-fn aGenericFn(inline T: type, inline a: T, b: T) -> T {
+fn aGenericFn(comptime T: type, comptime a: T, b: T) -> T {
return a + b;
}
@@ -137,6 +137,6 @@ fn genericFnWithImplicitCast() {
assert(getFirstByte(u16, []u16 {0, 13}) == 0);
}
fn getByte(ptr: ?&u8) -> u8 {*??ptr}
-fn getFirstByte(inline T: type, mem: []T) -> u8 {
+fn getFirstByte(comptime T: type, mem: []T) -> u8 {
getByte((&u8)(&mem[0]))
}
diff --git a/test/cases/misc.zig b/test/cases/misc.zig
index e77862bc5c..6ae56a5b9a 100644
--- a/test/cases/misc.zig
+++ b/test/cases/misc.zig
@@ -292,10 +292,10 @@ fn genericMallocFree() {
memFree(u8, a);
}
const some_mem : [100]u8 = undefined;
-fn memAlloc(inline T: type, n: usize) -> %[]T {
+fn memAlloc(comptime T: type, n: usize) -> %[]T {
return (&T)(&some_mem[0])[0...n];
}
-fn memFree(inline T: type, mem: []T) { }
+fn memFree(comptime T: type, mem: []T) { }
fn castUndefined() {
diff --git a/test/cases/this.zig b/test/cases/this.zig
index f3c231de0a..f18215b66c 100644
--- a/test/cases/this.zig
+++ b/test/cases/this.zig
@@ -2,7 +2,7 @@ const assert = @import("std").debug.assert;
const module = this;
-fn Point(inline T: type) -> type {
+fn Point(comptime T: type) -> type {
struct {
const Self = this;
x: T,
diff --git a/test/run_tests.cpp b/test/run_tests.cpp
index e99fbac0a9..3450845d55 100644
--- a/test/run_tests.cpp
+++ b/test/run_tests.cpp
@@ -1195,7 +1195,7 @@ const invalid = foo > foo;
)SOURCE", 1, ".tmp_source.zig:3:21: error: operator not allowed for type 'fn()'");
add_compile_fail_case("generic function instance with non-constant expression", R"SOURCE(
-fn foo(inline x: i32, y: i32) -> i32 { return x + y; }
+fn foo(comptime x: i32, y: i32) -> i32 { return x + y; }
fn test1(a: i32, b: i32) -> i32 {
return foo(a, b);
}
@@ -1407,18 +1407,18 @@ fn f() {
}
)SOURCE", 1, ".tmp_source.zig:3:13: error: unable to evaluate constant expression");
- add_compile_fail_case("export function with inline parameter", R"SOURCE(
-export fn foo(inline x: i32, y: i32) -> i32{
+ add_compile_fail_case("export function with comptime parameter", R"SOURCE(
+export fn foo(comptime x: i32, y: i32) -> i32{
x + y
}
- )SOURCE", 1, ".tmp_source.zig:2:15: error: inline parameter not allowed in extern function");
+ )SOURCE", 1, ".tmp_source.zig:2:15: error: comptime parameter not allowed in extern function");
- add_compile_fail_case("extern function with inline parameter", R"SOURCE(
-extern fn foo(inline x: i32, y: i32) -> i32;
+ add_compile_fail_case("extern function with comptime parameter", R"SOURCE(
+extern fn foo(comptime x: i32, y: i32) -> i32;
fn f() -> i32 {
foo(1, 2)
}
- )SOURCE", 1, ".tmp_source.zig:2:15: error: inline parameter not allowed in extern function");
+ )SOURCE", 1, ".tmp_source.zig:2:15: error: comptime parameter not allowed in extern function");
add_compile_fail_case("convert fixed size array to slice with invalid size", R"SOURCE(
fn f() {
@@ -1429,12 +1429,12 @@ fn f() {
add_compile_fail_case("non-pure function returns type", R"SOURCE(
var a: u32 = 0;
-pub fn List(inline T: type) -> type {
+pub fn List(comptime T: type) -> type {
a += 1;
SmallList(T, 8)
}
-pub fn SmallList(inline T: type, inline STATIC_SIZE: usize) -> type {
+pub fn SmallList(comptime T: type, comptime STATIC_SIZE: usize) -> type {
struct {
items: []T,
length: usize,
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-27 20:33:29 +0000