Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add type check for builtin filesystem function #1052

Merged
merged 4 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
10 changes: 5 additions & 5 deletions kclvm/runtime/src/file/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{fs, path::PathBuf};
use std::fs;

use crate::*;
use glob::glob;
Expand All @@ -14,8 +14,8 @@ pub extern "C" fn kclvm_file_read(
let ctx = mut_ptr_as_ref(ctx);

if let Some(x) = args.arg_i_str(0, None) {
let contents =
fs::read_to_string(&x).expect(&format!("failed to access the file in {}", x));
let contents = fs::read_to_string(&x)
.unwrap_or_else(|e| panic!("failed to access the file '{}':{}", x, e.to_string()));

Peefy marked this conversation as resolved.
Show resolved Hide resolved
let s = ValueRef::str(contents.as_ref());
return s.into_raw(ctx);
Expand All @@ -39,10 +39,10 @@ pub extern "C" fn kclvm_file_glob(
.expect("glob() takes exactly one argument (0 given)");

let mut matched_paths = vec![];
for entry in glob(&pattern).expect("Failed to read glob pattern") {
for entry in glob(&pattern).unwrap_or_else(|_| panic!("Failed to read glob pattern")) {
match entry {
Ok(path) => matched_paths.push(path.display().to_string()),
Err(e) => panic!("failed to access the file in {}:{}", pattern, e),
Err(_) => panic!("failed to access the file matching '{}'", pattern),
}
}

Expand Down
4 changes: 4 additions & 0 deletions kclvm/sema/src/builtin/system_module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1684,6 +1684,10 @@ pub fn get_system_member_function_ty(name: &str, func: &str) -> TypeRef {
let types = COLLECTION_FUNCTION_TYPES;
types.get(func).cloned()
}
FILE => {
let types = FILE_FUNCTION_TYPES;
types.get(func).cloned()
}
_ => None,
};
optional_ty
Expand Down
2 changes: 2 additions & 0 deletions kclvm/sema/src/resolver/test_data/test_builtin/glob.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import file
b = file.glob()
2 changes: 2 additions & 0 deletions kclvm/sema/src/resolver/test_data/test_builtin/read.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import file
a = file.read()
25 changes: 25 additions & 0 deletions kclvm/sema/src/resolver/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -849,3 +849,28 @@ fn test_pkg_asname() {
assert_eq!(diags[0].messages[0].message, "name 'pkg' is not defined");
assert_eq!(diags[2].messages[0].message, "name 'subpkg' is not defined");
}

#[test]
fn test_builtin_file_invalid() {
let test_cases = [
(
"./src/resolver/test_data/test_builtin/read.k",
"expected 1 positional argument, found 0",
),
(
"./src/resolver/test_data/test_builtin/glob.k",
"expected 1 positional argument, found 0",
),
];

for (file, expected_message) in &test_cases {
let sess = Arc::new(ParseSession::default());
let mut program = load_program(sess.clone(), &[file], None, None)
.unwrap()
.program;
let scope = resolve_program(&mut program);
let diags = scope.handler.diagnostics;
assert_eq!(diags.len(), 1);
assert_eq!(diags[0].messages[0].message, *expected_message);
}
}
3 changes: 3 additions & 0 deletions test/grammar/builtins/file/load_file_invalid/main.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import file

a = file.read("not_exist.txt")
17 changes: 17 additions & 0 deletions test/grammar/builtins/file/load_file_invalid/stderr.golden.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import sys
import os

import kclvm.kcl.error as kcl_error

cwd = os.path.dirname(os.path.realpath(__file__))

kcl_error.print_kcl_error_message(kcl_error.get_exception(err_type=kcl_error.ErrType.EvaluationError_TYPE,
file_msgs=[
kcl_error.ErrFileMsg(
filename=cwd + "/main.k",
line_no=3
column_no=1,
)],
arg_msg="failed to access the file 'not_exist.txt':No such file or directory (os error 2)"
),
file=sys.stdout)
Loading