vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: fix ARR_LEN

pull/4166/head
Alexander Medvednikov 2020-03-31 17:16:12 +02:00
parent 9d630dff30
commit f98cc9c017
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/builtin/array_test.v
View File

@ -284,8 +284,8 @@ struct Foooj {
fn test_fixed() { fn test_fixed() {
mut nums := [4]int mut nums := [4]int
x := nums[1..3] //x := nums[1..3]
assert x.len == 2 //assert x.len == 2
assert nums[0] == 0 assert nums[0] == 0
assert nums[1] == 0 assert nums[1] == 0
assert nums[2] == 0 assert nums[2] == 0

4
vlib/v/gen/cgen.v
View File

@ -1575,9 +1575,9 @@ fn (g mut Gen) index_expr(node ast.IndexExpr) {
} }
else if sym.kind == .array_fixed { else if sym.kind == .array_fixed {
// Convert a fixed array to V array when doing `fixed_arr[start..end]` // Convert a fixed array to V array when doing `fixed_arr[start..end]`
g.write('array_slice(new_array_from_c_array(sizeof(') g.write('array_slice(new_array_from_c_array(_ARR_LEN(')
g.expr(node.left) g.expr(node.left)
g.write('), sizeof(') g.write('), _ARR_LEN(')
g.expr(node.left) g.expr(node.left)
g.write('), sizeof(') g.write('), sizeof(')
g.expr(node.left) g.expr(node.left)

2
vlib/v/gen/cheaders.v
View File

@ -191,7 +191,7 @@ void reload_so();
void _vinit(); void _vinit();
void _vcleanup(); void _vcleanup();
#define sigaction_size sizeof(sigaction); #define sigaction_size sizeof(sigaction);
#define _ARR_LEN(a) ( (sizeof(a)) / (sizeof((a)[0])) ); #define _ARR_LEN(a) ( (sizeof(a)) / (sizeof(a[0])) )
// ============== wyhash ============== // ============== wyhash ==============
// Author: Wang Yi // Author: Wang Yi