1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

eval: ignore ast.Module (fixes v interpret file.v regression after 07cf6d9)

This commit is contained in:
Delyan Angelov 2022-01-02 09:39:18 +02:00
parent 9278d4ec19
commit 1521d08e84
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 52 additions and 3 deletions

View File

@ -40,6 +40,13 @@ fn main() {
} }
} }
enum RunCommandKind {
system
execute
}
const expect_nothing = '<nothing>'
struct Command { struct Command {
mut: mut:
line string line string
@ -48,6 +55,9 @@ mut:
okmsg string okmsg string
errmsg string errmsg string
rmfile string rmfile string
runcmd RunCommandKind = .system
expect string = expect_nothing
output string
} }
fn get_all_commands() []Command { fn get_all_commands() []Command {
@ -63,6 +73,18 @@ fn get_all_commands() []Command {
rmfile: 'hhww.c' rmfile: 'hhww.c'
} }
$if linux || macos { $if linux || macos {
res << Command{
line: '$vexe run examples/hello_world.v'
okmsg: 'V can run hello world.'
runcmd: .execute
expect: 'Hello, World!\n'
}
res << Command{
line: '$vexe interpret examples/hello_world.v'
okmsg: 'V can interpret hello world.'
runcmd: .execute
expect: 'Hello, World!\n'
}
res << Command{ res << Command{
line: '$vexe -o - examples/hello_world.v | grep "#define V_COMMIT_HASH" > /dev/null' line: '$vexe -o - examples/hello_world.v | grep "#define V_COMMIT_HASH" > /dev/null'
okmsg: 'V prints the generated source code to stdout with `-o -` .' okmsg: 'V prints the generated source code to stdout with `-o -` .'
@ -198,10 +220,36 @@ fn (mut cmd Command) run() {
println(term.header_left(cmd.label, '*')) println(term.header_left(cmd.label, '*'))
} }
sw := time.new_stopwatch() sw := time.new_stopwatch()
if cmd.runcmd == .system {
cmd.ecode = os.system(cmd.line) cmd.ecode = os.system(cmd.line)
cmd.output = ''
}
if cmd.runcmd == .execute {
res := os.execute(cmd.line)
cmd.ecode = res.exit_code
cmd.output = res.output
}
spent := sw.elapsed().milliseconds() spent := sw.elapsed().milliseconds()
println('> Running: "$cmd.line" took: $spent ms ... ' + //
if cmd.ecode != 0 { term.failed('FAILED') } else { term_highlight('OK') }) mut is_failed := false
if cmd.ecode != 0 {
is_failed = true
}
if cmd.expect != expect_nothing {
if cmd.output != cmd.expect {
is_failed = true
}
}
//
run_label := if is_failed { term.failed('FAILED') } else { term_highlight('OK') }
println('> Running: "$cmd.line" took: $spent ms ... $run_label')
//
if is_failed && cmd.expect != expect_nothing {
if cmd.output != cmd.expect {
eprintln('> expected:\n$cmd.expect')
eprintln('> output:\n$cmd.output')
}
}
if vtest_nocleanup { if vtest_nocleanup {
return return
} }

View File

@ -140,6 +140,7 @@ pub fn (mut e Eval) register_symbol_stmts(stmts []ast.Stmt, mod string, file str
pub fn (mut e Eval) register_symbol(stmt ast.Stmt, mod string, file string) { pub fn (mut e Eval) register_symbol(stmt ast.Stmt, mod string, file string) {
match stmt { match stmt {
ast.Module {}
ast.FnDecl { ast.FnDecl {
// this mess because c error // this mess because c error
x := ast.Stmt(stmt) x := ast.Stmt(stmt)