more C functions and methods; check-md --backend flag (#336)

Author: serkonda7

CHANGELOG.md

@@ -8,19 +8,24 @@ All notable changes are documented in this file.
 ### Standard Library
 - builtin:
   - _[C]_ string methods: `split()`, `split_lines()`, `trim_space()`, `is_upper()`
+  - _[C]_ []string method: `join()`
 - os:
-  - _[C]_ functions: `read_lines()`
+  - _[C]_ functions: `read_lines()`, `getenv()`, `setenv()`, `tmp_dir()`
 
 ### C Backend
 - Increase test coverage
 - arrays
   - Implement comparison
   - Implement auto-string conversion
 
+### CLI and Tooling
+- check-md: add `--backend` option
+
 ### Testing
 - respect `.c.bt` and `.js.bt` file extensions for test files
 
 ### Other Changes
+- gen: do not generate main call in script mode
 - remove `test-all` tool
 
 

cli/tools/check-md.bt

@@ -1,7 +1,8 @@
-// SPDX-FileCopyrightText: Lukas Neubert <lukas.neubert@proton.me>
+// SPDX-FileCopyrightText: Lukas Neubert
 // SPDX-License-Identifier: MIT
 package main
 
+import cli.options
 import os
 
 struct CodeBlock {
@@ -11,35 +12,52 @@ struct CodeBlock {
 }
 
 fun main() {
-	if os.ARGS.length <= 2 {
-		eprintln('check-md error: please provide a file to be checked')
+	mut opt := options.new_option_parser(os.user_args())
+
+	backend := opt.string('backend', `b`, 'js')
+	if backend != 'js' and backend != 'c' {
+		eprintln('check-md: invalid backend')
+		exit(1)
+	}
+	args := opt.remaining()
+
+	if args.length == 0 {
+		eprintln('check-md: provide a file to be checked')
 		exit(1)
 	}
-	file := os.ARGS[2]
+
+	file := args[0]
 	if not file.ends_with('.md') {
 		eprintln('check-md error: file must be a markdown file')
 		exit(1)
 	}
+
 	println('Checking code blocks in ${file}...')
 	blocks := collect_code_blocks(file)
-	mut has_errors := false
+
+	mut nr_errors := 0
 	for block in blocks {
-		res := check_block_runs(block)
+		res := check_block_runs(block, backend)
 		if not res {
-			has_errors = true
+			nr_errors += 1
 		}
 	}
-	if has_errors {
+
+	println('ok: ${blocks.length - nr_errors}, failed: ${nr_errors}, total: ${blocks.length}')
+
+	if nr_errors > 0 {
 		exit(1)
 	}
 }
 
 fun collect_code_blocks(path string) []CodeBlock{
 	lines := os.read_lines(path)
+
 	mut blocks := []CodeBlock
 	mut inside_block := false
 	mut start := 0
 	mut text := ''
+
 	for i, line in lines {
 		if line.starts_with('```bait') {
 			inside_block = true
@@ -56,13 +74,17 @@ fun collect_code_blocks(path string) []CodeBlock{
 			text += line + '\n'
 		}
 	}
+
 	return blocks
 }
 
-fun check_block_runs(block CodeBlock) bool {
-	tmp_file := os.join_path(os.tmp_dir(), ['tmp.bt'])
+fun check_block_runs(block CodeBlock, backend string) bool {
+	tmp_name := 'check-md-${block.start_idx}.bt'
+	tmp_file := os.join_path(os.tmp_dir(), [tmp_name])
 	os.write_file(tmp_file, block.text)
-	res := os.exec('bun ${$BAITEXE} ${tmp_file} --script')
+
+	res := os.exec('bun ${$BAITEXE} "${tmp_file}" --script --backend ${backend}')
+
 	if res.code != 0 {
 		println('Error in block ${block.start_idx + 1}:${block.end_idx + 1}')
 		println(res.stderr)

lib/bait/gen/c/cgen.bt

@@ -95,7 +95,9 @@ fun (g Gen) headers() string {
 fun (mut g Gen) c_main() {
 	g.writeln('int main(int argc, char* argv[]) {')
 	g.writeln(g.main_inits_out)
-	g.writeln('\tbait_main();')
+	if not g.pref.is_script {
+		g.writeln('\tbait_main();')
+	}
 	g.writeln('\treturn 0;')
 	g.writeln('}')
 }

lib/bait/gen/js/jsgen.bt

@@ -85,7 +85,7 @@ pub fun gen(files []ast.File, table ast.Table, pref preference.Prefs) string {
 		g.out += "\n"
 	}
 
-	if not pref.is_library {
+	if not g.pref.is_library and not g.pref.is_script {
 		g.main_call()
 	}
 

lib/bait/preference/preference.bt

@@ -145,6 +145,7 @@ pub fun parse_args(args []string) Prefs {
 		p.should_run = true
 		p.keep_exe = true
 		p.is_test = true
+		p.is_script = false // `test` command implies compilation, so script mode is disabled
 	}
 
 	// Set default out name if empty

lib/builtin/array.c.bt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Lukas Neubert <lukas.neubert@proton.me>
+// SPDX-FileCopyrightText: Lukas Neubert
 // SPDX-License-Identifier: MIT
 package builtin
 
@@ -107,3 +107,9 @@ pub fun (a Array) slice(start i32, end i32) Array {
 		elem_size = a.elem_size
 	}
 }
+
+pub fun (a Array) copy() Array {
+	mut b := new_array(a.length, a.cap, a.elem_size)
+	#C.memcpy(b.data, a.data, a.length * a.elem_size)
+	return b
+}

lib/builtin/array.js.bt

@@ -86,6 +86,7 @@ pub fun (a Array) concat(b Array) Array {
 	}
 }
 
+// TODO rename to clone()
 pub fun (a Array) copy() Array {
 	return Array{
 		data = #JS.'[...a.data]' as #JS.Array

lib/builtin/string.c.bt

@@ -234,6 +234,43 @@ fun (a string) eq (b string) bool {
 	return true
 }
 
+pub fun (arr []string) join(sep string) string {
+	if arr.length == 0 {
+		return ''
+	}
+
+	if arr.length == 1 {
+		return arr[0]
+	}
+
+	mut new_len := 0
+	for s in arr {
+		new_len += s.length
+	}
+	new_len += sep.length * (arr.length - 1)
+
+	mut buf := #C.calloc(1, new_len + 1)
+	mut pos := 0
+
+	for i, s in arr {
+		if i > 0 and sep.length > 0 {
+			#C.memcpy(#C.'buf + pos' as &void, sep.str, sep.length)
+			pos += sep.length
+		}
+
+		if s.length > 0 {
+			#C.memcpy(#C.'buf + pos' as &void, s.str, s.length)
+			pos += s.length
+		}
+	}
+
+	buf[new_len] = 0 as u8
+	return string{
+		str = buf
+		length = new_len
+	}
+}
+
 pub fun from_c_string(cs &u8) string {
 	return string{
 		str = cs

lib/builtin/tests/array_test.bt

@@ -17,3 +17,11 @@ fun test_index_and_index_last() {
 	assert strings.index('c') == 2
 	assert strings.index_last('c') == 3
 }
+
+fun test_copy() {
+	mut a := [1, 2, 3]
+	b := a.copy()
+	a[0] = 9
+	assert a == [9, 2, 3]
+	assert b == [1, 2, 3]
+}

lib/builtin/tests/string_test.bt

@@ -40,8 +40,6 @@ fun test_split_lines() {
 	assert 'foo\r\nbar\r\n'.split_lines() == ['foo', 'bar']
 }
 
-
-
 fun test_trim_space() {
 	assert '  hello  '.trim_space() == 'hello'
 	assert '\t\nfoo\r\n'.trim_space() == 'foo'
@@ -66,3 +64,11 @@ fun test_is_upper() {
 	assert not '123'.is_upper()
 	assert 'ABC123'.is_upper()
 }
+
+fun test_join() {
+	assert ([]string).join(',') == ''
+	assert ['a'].join(',') == 'a'
+	assert ['a', 'b', 'c'].join(',') == 'a,b,c'
+	assert ['a', '', 'c'].join('-') == 'a--c'
+	assert ['a', 'b'].join(', ') == 'a, b'
+}