js,checker: fix some modules build for v -b js self, fix or block check in ast.CallExpr (#12231)

vlib/builtin/js/int.js.v

@@ -77,6 +77,13 @@ pub fn (x u64) hex() string {
 	return res
 }
 
+pub fn (x u64) hex_full() string {
+	res := ''
+	#res.str = x.val.toString(16)
+
+	return res
+}
+
 pub fn (x i64) hex() string {
 	res := ''
 	#res.str = x.val.toString(16)

vlib/encoding/base64/base64.c.v

@@ -0,0 +1,242 @@
+module base64
+
+// encode_in_buffer base64 encodes the `[]byte` passed in `data` into `buffer`.
+// encode_in_buffer returns the size of the encoded data in the buffer.
+// Please note: The buffer should be large enough (i.e. 4/3 of the data.len, or larger) to hold the encoded data.
+// Please note: The function does NOT allocate new memory, and is suitable for handling very large strings.
+pub fn encode_in_buffer(data []byte, buffer &byte) int {
+	return encode_from_buffer(buffer, data.data, data.len)
+}
+
+// encode_from_buffer will perform encoding from any type of src buffer
+// and write the bytes into `dest`.
+// Please note: The `dest` buffer should be large enough (i.e. 4/3 of the src_len, or larger) to hold the encoded data.
+// Please note: This function is for internal base64 encoding
+fn encode_from_buffer(dest &byte, src &byte, src_len int) int {
+	if src_len == 0 {
+		return 0
+	}
+	output_length := 4 * ((src_len + 2) / 3)
+
+	mut d := unsafe { src }
+	mut b := unsafe { dest }
+	etable := enc_table.str
+
+	mut di := 0
+	mut si := 0
+	n := (src_len / 3) * 3
+	for si < n {
+		// Convert 3x 8bit source bytes into 4 bytes
+		unsafe {
+			val := u32(d[si + 0]) << 16 | u32(d[si + 1]) << 8 | u32(d[si + 2])
+
+			b[di + 0] = etable[val >> 18 & 0x3F]
+			b[di + 1] = etable[val >> 12 & 0x3F]
+			b[di + 2] = etable[val >> 6 & 0x3F]
+			b[di + 3] = etable[val & 0x3F]
+		}
+		si += 3
+		di += 4
+	}
+
+	remain := src_len - si
+	if remain == 0 {
+		return output_length
+	}
+
+	// Add the remaining small block and padding
+	unsafe {
+		mut val := u32(d[si + 0]) << 16
+		if remain == 2 {
+			val |= u32(d[si + 1]) << 8
+		}
+
+		b[di + 0] = etable[val >> 18 & 0x3F]
+		b[di + 1] = etable[val >> 12 & 0x3F]
+
+		match remain {
+			2 {
+				b[di + 2] = etable[val >> 6 & 0x3F]
+				b[di + 3] = byte(`=`)
+			}
+			1 {
+				b[di + 2] = byte(`=`)
+				b[di + 3] = byte(`=`)
+			}
+			else {
+				panic('base64: This case should never occur.')
+			}
+		}
+	}
+	return output_length
+}
+
+// decode_in_buffer decodes the base64 encoded `string` reference passed in `data` into `buffer`.
+// decode_in_buffer returns the size of the decoded data in the buffer.
+// Please note: The `buffer` should be large enough (i.e. 3/4 of the data.len, or larger)
+// to hold the decoded data.
+// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
+pub fn decode_in_buffer(data &string, buffer &byte) int {
+	return decode_from_buffer(buffer, data.str, data.len)
+}
+
+// decode_from_buffer decodes the base64 encoded ASCII bytes from `data` into `buffer`.
+// decode_from_buffer returns the size of the decoded data in the buffer.
+// Please note: The `buffer` should be large enough (i.e. 3/4 of the data.len, or larger)
+// to hold the decoded data.
+// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
+pub fn decode_in_buffer_bytes(data []byte, buffer &byte) int {
+	return decode_from_buffer(buffer, data.data, data.len)
+}
+
+// decode_from_buffer decodes the base64 encoded ASCII bytes from `src` into `dest`.
+// decode_from_buffer returns the size of the decoded data in the buffer.
+// Please note: The `dest` buffer should be large enough (i.e. 3/4 of the `src_len`, or larger)
+// to hold the decoded data.
+// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
+// Please note: This function is for internal base64 decoding
+fn decode_from_buffer(dest &byte, src &byte, src_len int) int {
+	if src_len < 4 {
+		return 0
+	}
+
+	mut padding := 0
+	if unsafe { src[src_len - 1] == `=` } {
+		if unsafe { src[src_len - 2] == `=` } {
+			padding = 2
+		} else {
+			padding = 1
+		}
+	}
+
+	mut d := unsafe { src }
+	mut b := unsafe { dest }
+
+	unsafe {
+		mut n_decoded_bytes := 0 // padding bytes are also counted towards this.
+		mut si := 0
+
+		mut datablock_64 := B64_64_datablock{
+			data: 0
+		}
+		mut datablock_32 := B64_32_datablock{
+			data: 0
+		}
+
+		for src_len - si >= 8 {
+			// Converting 8 bytes of input into 6 bytes of output. Storing these in the upper bytes of an u64.
+			datablock_64.data = assemble64(byte(index[d[si + 0]]), byte(index[d[si + 1]]),
+				byte(index[d[si + 2]]), byte(index[d[si + 3]]), byte(index[d[si + 4]]),
+				byte(index[d[si + 5]]), byte(index[d[si + 6]]), byte(index[d[si + 7]]))
+
+			// Reading out the individual bytes from the u64. Watch out with endianess.
+			$if little_endian {
+				b[n_decoded_bytes + 0] = datablock_64.data_byte[7]
+				b[n_decoded_bytes + 1] = datablock_64.data_byte[6]
+				b[n_decoded_bytes + 2] = datablock_64.data_byte[5]
+				b[n_decoded_bytes + 3] = datablock_64.data_byte[4]
+				b[n_decoded_bytes + 4] = datablock_64.data_byte[3]
+				b[n_decoded_bytes + 5] = datablock_64.data_byte[2]
+			} $else {
+				b[n_decoded_bytes + 0] = datablock_64.data_byte[0]
+				b[n_decoded_bytes + 1] = datablock_64.data_byte[1]
+				b[n_decoded_bytes + 2] = datablock_64.data_byte[2]
+				b[n_decoded_bytes + 3] = datablock_64.data_byte[3]
+				b[n_decoded_bytes + 4] = datablock_64.data_byte[4]
+				b[n_decoded_bytes + 5] = datablock_64.data_byte[5]
+			}
+
+			n_decoded_bytes += 6
+			si += 8
+		}
+
+		for src_len - si >= 4 {
+			datablock_32.data = assemble32(byte(index[d[si + 0]]), byte(index[d[si + 1]]),
+				byte(index[d[si + 2]]), byte(index[d[si + 3]]))
+			$if little_endian {
+				b[n_decoded_bytes + 0] = datablock_32.data_byte[3]
+				b[n_decoded_bytes + 1] = datablock_32.data_byte[2]
+				b[n_decoded_bytes + 2] = datablock_32.data_byte[1]
+				b[n_decoded_bytes + 3] = datablock_32.data_byte[0]
+			} $else {
+				b[n_decoded_bytes + 0] = datablock_32.data_byte[0]
+				b[n_decoded_bytes + 1] = datablock_32.data_byte[1]
+				b[n_decoded_bytes + 2] = datablock_32.data_byte[2]
+				b[n_decoded_bytes + 3] = datablock_32.data_byte[3]
+			}
+
+			n_decoded_bytes += 3
+			si += 4
+		}
+
+		return n_decoded_bytes - padding
+	}
+}
+
+union B64_64_datablock {
+mut:
+	data      u64
+	data_byte [8]byte
+}
+
+union B64_32_datablock {
+mut:
+	data      u32
+	data_byte [4]byte
+}
+
+// decode decodes the base64 encoded `string` value passed in `data`.
+// Please note: If you need to decode many strings repeatedly, take a look at `decode_in_buffer`.
+// Example: assert base64.decode('ViBpbiBiYXNlIDY0') == 'V in base 64'
+pub fn decode(data string) []byte {
+	mut size := i64(data.len) * 3 / 4
+	if size <= 0 || data.len % 4 != 0 {
+		return []
+	}
+	size = (size + 3) & ~0x03 // round to the next multiple of 4 (the decoding loop writes multiples of 4 bytes)
+	unsafe {
+		buffer := malloc(int(size))
+		n := decode_in_buffer(data, buffer)
+		return buffer.vbytes(n)
+	}
+}
+
+// decode_str is the string variant of decode
+pub fn decode_str(data string) string {
+	size := data.len * 3 / 4
+	if size <= 0 || data.len % 4 != 0 {
+		return ''
+	}
+	unsafe {
+		buffer := malloc_noscan(size + 1)
+		buffer[size] = 0
+		return tos(buffer, decode_in_buffer(data, buffer))
+	}
+}
+
+// encode encodes the `[]byte` value passed in `data` to base64.
+// Please note: base64 encoding returns a `string` that is ~ 4/3 larger than the input.
+// Please note: If you need to encode many strings repeatedly, take a look at `encode_in_buffer`.
+// Example: assert base64.encode('V in base 64') == 'ViBpbiBiYXNlIDY0'
+pub fn encode(data []byte) string {
+	return alloc_and_encode(data.data, data.len)
+}
+
+// encode_str is the string variant of encode
+pub fn encode_str(data string) string {
+	return alloc_and_encode(data.str, data.len)
+}
+
+// alloc_and_encode is a private function that allocates and encodes data into a string
+// Used by encode and encode_str
+fn alloc_and_encode(src &byte, len int) string {
+	size := 4 * ((len + 2) / 3)
+	if size <= 0 {
+		return ''
+	}
+	unsafe {
+		buffer := malloc_noscan(size + 1)
+		buffer[size] = 0
+		return tos(buffer, encode_from_buffer(buffer, src, len))
+	}
+}

vlib/encoding/base64/base64.v

@@ -15,74 +15,6 @@ const (
 	enc_table    = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
 )
 
-union B64_64_datablock {
-mut:
-	data      u64
-	data_byte [8]byte
-}
-
-union B64_32_datablock {
-mut:
-	data      u32
-	data_byte [4]byte
-}
-
-// decode decodes the base64 encoded `string` value passed in `data`.
-// Please note: If you need to decode many strings repeatedly, take a look at `decode_in_buffer`.
-// Example: assert base64.decode('ViBpbiBiYXNlIDY0') == 'V in base 64'
-pub fn decode(data string) []byte {
-	mut size := i64(data.len) * 3 / 4
-	if size <= 0 || data.len % 4 != 0 {
-		return []
-	}
-	size = (size + 3) & ~0x03 // round to the next multiple of 4 (the decoding loop writes multiples of 4 bytes)
-	unsafe {
-		buffer := malloc(int(size))
-		n := decode_in_buffer(data, buffer)
-		return buffer.vbytes(n)
-	}
-}
-
-// decode_str is the string variant of decode
-pub fn decode_str(data string) string {
-	size := data.len * 3 / 4
-	if size <= 0 || data.len % 4 != 0 {
-		return ''
-	}
-	unsafe {
-		buffer := malloc_noscan(size + 1)
-		buffer[size] = 0
-		return tos(buffer, decode_in_buffer(data, buffer))
-	}
-}
-
-// encode encodes the `[]byte` value passed in `data` to base64.
-// Please note: base64 encoding returns a `string` that is ~ 4/3 larger than the input.
-// Please note: If you need to encode many strings repeatedly, take a look at `encode_in_buffer`.
-// Example: assert base64.encode('V in base 64') == 'ViBpbiBiYXNlIDY0'
-pub fn encode(data []byte) string {
-	return alloc_and_encode(data.data, data.len)
-}
-
-// encode_str is the string variant of encode
-pub fn encode_str(data string) string {
-	return alloc_and_encode(data.str, data.len)
-}
-
-// alloc_and_encode is a private function that allocates and encodes data into a string
-// Used by encode and encode_str
-fn alloc_and_encode(src &byte, len int) string {
-	size := 4 * ((len + 2) / 3)
-	if size <= 0 {
-		return ''
-	}
-	unsafe {
-		buffer := malloc_noscan(size + 1)
-		buffer[size] = 0
-		return tos(buffer, encode_from_buffer(buffer, src, len))
-	}
-}
-
 // url_decode returns a decoded URL `string` version of
 // the a base64 url encoded `string` passed in `data`.
 pub fn url_decode(data string) []byte {
@@ -132,177 +64,3 @@ fn assemble64(n1 byte, n2 byte, n3 byte, n4 byte, n5 byte, n6 byte, n7 byte, n8
 fn assemble32(n1 byte, n2 byte, n3 byte, n4 byte) u32 {
 	return u32(n1) << 26 | u32(n2) << 20 | u32(n3) << 14 | u32(n4) << 8
 }
-
-// decode_in_buffer decodes the base64 encoded `string` reference passed in `data` into `buffer`.
-// decode_in_buffer returns the size of the decoded data in the buffer.
-// Please note: The `buffer` should be large enough (i.e. 3/4 of the data.len, or larger)
-// to hold the decoded data.
-// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
-pub fn decode_in_buffer(data &string, buffer &byte) int {
-	return decode_from_buffer(buffer, data.str, data.len)
-}
-
-// decode_from_buffer decodes the base64 encoded ASCII bytes from `data` into `buffer`.
-// decode_from_buffer returns the size of the decoded data in the buffer.
-// Please note: The `buffer` should be large enough (i.e. 3/4 of the data.len, or larger)
-// to hold the decoded data.
-// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
-pub fn decode_in_buffer_bytes(data []byte, buffer &byte) int {
-	return decode_from_buffer(buffer, data.data, data.len)
-}
-
-// decode_from_buffer decodes the base64 encoded ASCII bytes from `src` into `dest`.
-// decode_from_buffer returns the size of the decoded data in the buffer.
-// Please note: The `dest` buffer should be large enough (i.e. 3/4 of the `src_len`, or larger)
-// to hold the decoded data.
-// Please note: This function does NOT allocate new memory, and is thus suitable for handling very large strings.
-// Please note: This function is for internal base64 decoding
-fn decode_from_buffer(dest &byte, src &byte, src_len int) int {
-	if src_len < 4 {
-		return 0
-	}
-
-	mut padding := 0
-	if unsafe { src[src_len - 1] == `=` } {
-		if unsafe { src[src_len - 2] == `=` } {
-			padding = 2
-		} else {
-			padding = 1
-		}
-	}
-
-	mut d := unsafe { src }
-	mut b := unsafe { dest }
-
-	unsafe {
-		mut n_decoded_bytes := 0 // padding bytes are also counted towards this.
-		mut si := 0
-
-		mut datablock_64 := B64_64_datablock{
-			data: 0
-		}
-		mut datablock_32 := B64_32_datablock{
-			data: 0
-		}
-
-		for src_len - si >= 8 {
-			// Converting 8 bytes of input into 6 bytes of output. Storing these in the upper bytes of an u64.
-			datablock_64.data = assemble64(byte(base64.index[d[si + 0]]), byte(base64.index[d[si + 1]]),
-				byte(base64.index[d[si + 2]]), byte(base64.index[d[si + 3]]), byte(base64.index[d[
-				si + 4]]), byte(base64.index[d[si + 5]]), byte(base64.index[d[si + 6]]),
-				byte(base64.index[d[si + 7]]))
-
-			// Reading out the individual bytes from the u64. Watch out with endianess.
-			$if little_endian {
-				b[n_decoded_bytes + 0] = datablock_64.data_byte[7]
-				b[n_decoded_bytes + 1] = datablock_64.data_byte[6]
-				b[n_decoded_bytes + 2] = datablock_64.data_byte[5]
-				b[n_decoded_bytes + 3] = datablock_64.data_byte[4]
-				b[n_decoded_bytes + 4] = datablock_64.data_byte[3]
-				b[n_decoded_bytes + 5] = datablock_64.data_byte[2]
-			} $else {
-				b[n_decoded_bytes + 0] = datablock_64.data_byte[0]
-				b[n_decoded_bytes + 1] = datablock_64.data_byte[1]
-				b[n_decoded_bytes + 2] = datablock_64.data_byte[2]
-				b[n_decoded_bytes + 3] = datablock_64.data_byte[3]
-				b[n_decoded_bytes + 4] = datablock_64.data_byte[4]
-				b[n_decoded_bytes + 5] = datablock_64.data_byte[5]
-			}
-
-			n_decoded_bytes += 6
-			si += 8
-		}
-
-		for src_len - si >= 4 {
-			datablock_32.data = assemble32(byte(base64.index[d[si + 0]]), byte(base64.index[d[si + 1]]),
-				byte(base64.index[d[si + 2]]), byte(base64.index[d[si + 3]]))
-			$if little_endian {
-				b[n_decoded_bytes + 0] = datablock_32.data_byte[3]
-				b[n_decoded_bytes + 1] = datablock_32.data_byte[2]
-				b[n_decoded_bytes + 2] = datablock_32.data_byte[1]
-				b[n_decoded_bytes + 3] = datablock_32.data_byte[0]
-			} $else {
-				b[n_decoded_bytes + 0] = datablock_32.data_byte[0]
-				b[n_decoded_bytes + 1] = datablock_32.data_byte[1]
-				b[n_decoded_bytes + 2] = datablock_32.data_byte[2]
-				b[n_decoded_bytes + 3] = datablock_32.data_byte[3]
-			}
-
-			n_decoded_bytes += 3
-			si += 4
-		}
-
-		return n_decoded_bytes - padding
-	}
-}
-
-// encode_in_buffer base64 encodes the `[]byte` passed in `data` into `buffer`.
-// encode_in_buffer returns the size of the encoded data in the buffer.
-// Please note: The buffer should be large enough (i.e. 4/3 of the data.len, or larger) to hold the encoded data.
-// Please note: The function does NOT allocate new memory, and is suitable for handling very large strings.
-pub fn encode_in_buffer(data []byte, buffer &byte) int {
-	return encode_from_buffer(buffer, data.data, data.len)
-}
-
-// encode_from_buffer will perform encoding from any type of src buffer
-// and write the bytes into `dest`.
-// Please note: The `dest` buffer should be large enough (i.e. 4/3 of the src_len, or larger) to hold the encoded data.
-// Please note: This function is for internal base64 encoding
-fn encode_from_buffer(dest &byte, src &byte, src_len int) int {
-	if src_len == 0 {
-		return 0
-	}
-	output_length := 4 * ((src_len + 2) / 3)
-
-	mut d := unsafe { src }
-	mut b := unsafe { dest }
-	etable := base64.enc_table.str
-
-	mut di := 0
-	mut si := 0
-	n := (src_len / 3) * 3
-	for si < n {
-		// Convert 3x 8bit source bytes into 4 bytes
-		unsafe {
-			val := u32(d[si + 0]) << 16 | u32(d[si + 1]) << 8 | u32(d[si + 2])
-
-			b[di + 0] = etable[val >> 18 & 0x3F]
-			b[di + 1] = etable[val >> 12 & 0x3F]
-			b[di + 2] = etable[val >> 6 & 0x3F]
-			b[di + 3] = etable[val & 0x3F]
-		}
-		si += 3
-		di += 4
-	}
-
-	remain := src_len - si
-	if remain == 0 {
-		return output_length
-	}
-
-	// Add the remaining small block and padding
-	unsafe {
-		mut val := u32(d[si + 0]) << 16
-		if remain == 2 {
-			val |= u32(d[si + 1]) << 8
-		}
-
-		b[di + 0] = etable[val >> 18 & 0x3F]
-		b[di + 1] = etable[val >> 12 & 0x3F]
-
-		match remain {
-			2 {
-				b[di + 2] = etable[val >> 6 & 0x3F]
-				b[di + 3] = byte(`=`)
-			}
-			1 {
-				b[di + 2] = byte(`=`)
-				b[di + 3] = byte(`=`)
-			}
-			else {
-				panic('base64: This case should never occur.')
-			}
-		}
-	}
-	return output_length
-}

vlib/hash/wyhash.js.v

@@ -1 +1,6 @@
 module hash
+
+pub fn sum64_string(s string, key u64) u64 {
+	panic('not yet implemented')
+	return 0
+}

vlib/os/os.js.v

@@ -128,3 +128,8 @@ pub fn is_atty(fd int) int {
 
 	return res
 }
+
+pub fn glob(patterns ...string) ?[]string {
+	panic('not yet implemented')
+	return none
+}

vlib/sync/channels.js.v

@@ -0,0 +1,27 @@
+module sync
+
+pub struct Channel {
+	arr array
+}
+
+pub fn new_channel<T>(n u32) &Channel {
+	return &Channel{arr, new_array()}
+}
+
+pub fn (mut ch Channel) close() {}
+
+pub fn (mut ch Channel) push(src voidptr) {
+	#array_push(ch.val.arr,src)
+}
+
+pub fn (ch Channel) len() int {
+	return ch.arr.len
+}
+
+pub fn (ch Channel) closed() bool {
+	return false
+}
+
+pub fn (mut ch Channel) pop(dest voidptr) {
+	#dest.val = array_pop(ch.val.arr)
+}

vlib/v/ast/types.v

@@ -63,6 +63,9 @@ pub fn pref_arch_to_table_language(pref_arch pref.Arch) Language {
 		.i386 {
 			Language.i386
 		}
+		.js_node, .js_browser, .js_freestanding {
+			Language.js
+		}
 		._auto, ._max {
 			Language.v
 		}

vlib/v/checker/checker.v

@@ -2054,7 +2054,15 @@ pub fn (mut c Checker) call_expr(mut node ast.CallExpr) ast.Type {
 	// Now call `method_call` or `fn_call` for specific checks.
 	old_inside_fn_arg := c.inside_fn_arg
 	c.inside_fn_arg = true
-	typ := if node.is_method { c.method_call(mut node) } else { c.fn_call(mut node) }
+	mut continue_check := true
+	typ := if node.is_method {
+		c.method_call(mut node)
+	} else {
+		c.fn_call(mut node, mut continue_check)
+	}
+	if !continue_check {
+		return ast.void_type
+	}
 	c.inside_fn_arg = old_inside_fn_arg
 	// autofree: mark args that have to be freed (after saving them in tmp exprs)
 	free_tmp_arg_vars := c.pref.autofree && !c.is_builtin_mod && node.args.len > 0
@@ -2757,7 +2765,7 @@ fn (mut c Checker) array_builtin_method_call(mut node ast.CallExpr, left_type as
 	return node.return_type
 }
 
-pub fn (mut c Checker) fn_call(mut node ast.CallExpr) ast.Type {
+pub fn (mut c Checker) fn_call(mut node ast.CallExpr, mut continue_check &bool) ast.Type {
 	fn_name := node.name
 	if fn_name == 'main' {
 		c.error('the `main` function cannot be called in the program', node.pos)
@@ -2943,9 +2951,11 @@ pub fn (mut c Checker) fn_call(mut node ast.CallExpr) ast.Type {
 		}
 	}
 	if !found {
+		continue_check = false
 		c.error('unknown function: $fn_name', node.pos)
 		return ast.void_type
 	}
+
 	node.is_noreturn = func.is_noreturn
 	if !found_in_args {
 		if node.scope.known_var(fn_name) {

vlib/v/pref/os.v

@@ -118,7 +118,6 @@ pub fn get_host_os() OS {
 	$if js_freestanding {
 		return .js_freestanding
 	}
-
 	$if js_browser {
 		return .js_browser
 	}
@@ -126,4 +125,5 @@ pub fn get_host_os() OS {
 		return .js_node
 	}
 	panic('unknown host OS')
+	return ._auto
 }

vlib/v/pref/pref.v

@@ -79,6 +79,9 @@ pub enum Arch {
 	rv64 // 64-bit risc-v
 	rv32 // 32-bit risc-v
 	i386
+	js_node
+	js_browser
+	js_freestanding
 	_max
 }
 
@@ -748,6 +751,15 @@ pub fn arch_from_string(arch_str string) ?Arch {
 
 			return Arch.i386
 		}
+		'js', 'js_node' {
+			return Arch.js_node
+		}
+		'js_browser' {
+			return Arch.js_browser
+		}
+		'js_freestanding' {
+			return Arch.js_freestanding
+		}
 		'' {
 			return ._auto
 		}