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

do not run cgen_test.v on windows

pull/3354/head
Alexander Medvednikov 2020-01-07 01:57:38 +01:00
parent 69f3c42b99
commit 8c5923297e
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/gen/cgen_test.v
View File

@ -13,6 +13,9 @@ const (
) )
fn test_c_files() { fn test_c_files() {
$if windows {
return
}
println('Running V => C tests') println('Running V => C tests')
vexe := os.getenv('VEXE') vexe := os.getenv('VEXE')
vroot := filepath.dir(vexe) vroot := filepath.dir(vexe)

32
vlib/v/parser/parser.v
View File

@ -20,17 +20,18 @@ type InfixParseFn fn(e ast.Expr)ast.Expr
type PostfixParseFn fn()ast.Expr type PostfixParseFn fn()ast.Expr
struct Parser { struct Parser {
scanner &scanner.Scanner scanner &scanner.Scanner
file_name string file_name string
mut: mut:
tok token.Token tok token.Token
peek_tok token.Token peek_tok token.Token
// vars []string // vars []string
table &table.Table table &table.Table
return_ti types.TypeIdent return_ti types.TypeIdent
is_c bool is_c bool
// //
prefix_parse_fns []PrefixParseFn // prefix_parse_fns []PrefixParseFn
inside_if bool
} }
pub fn parse_stmt(text string, table &table.Table) ast.Stmt { pub fn parse_stmt(text string, table &table.Table) ast.Stmt {
@ -81,9 +82,10 @@ pub fn parse_files(paths []string, table &table.Table) []ast.File {
return files return files
} }
pub fn (p mut Parser) init_parse_fns() { pub fn (p &Parser) init_parse_fns() {
p.prefix_parse_fns = make(100, 100, sizeof(PrefixParseFn)) // p.prefix_parse_fns = make(100, 100, sizeof(PrefixParseFn))
// p.prefix_parse_fns[token.Kind.name] = parse_name // p.prefix_parse_fns[token.Kind.name] = parse_name
println('')
} }
pub fn (p mut Parser) read_first_token() { pub fn (p mut Parser) read_first_token() {
@ -240,6 +242,7 @@ pub fn (p mut Parser) assign_stmt() ast.AssignStmt {
pub fn (p &Parser) error(s string) { pub fn (p &Parser) error(s string) {
print_backtrace()
println(term.bold(term.red('$p.file_name:$p.tok.line_nr: $s'))) println(term.bold(term.red('$p.file_name:$p.tok.line_nr: $s')))
exit(1) exit(1)
} }
@ -267,7 +270,7 @@ pub fn (p mut Parser) name_expr() (ast.Expr,types.TypeIdent) {
ti = ti2 ti = ti2
} }
// struct init // struct init
else if p.peek_tok.kind == .lcbr { else if p.peek_tok.kind == .lcbr && !p.inside_if {
ti = p.parse_ti() ti = p.parse_ti()
// println('sturct init ti=$ti.name') // println('sturct init ti=$ti.name')
p.check(.lcbr) p.check(.lcbr)
@ -320,6 +323,9 @@ pub fn (p mut Parser) expr(precedence int) (ast.Expr,types.TypeIdent) {
.minus { .minus {
node,ti = p.prefix_expr() node,ti = p.prefix_expr()
} }
.amp {
p.next()
}
.key_true, .key_false { .key_true, .key_false {
node = ast.BoolLiteral{ node = ast.BoolLiteral{
val: p.tok.kind == .key_true val: p.tok.kind == .key_true
@ -531,6 +537,9 @@ fn (p mut Parser) for_statement() ast.Stmt {
} }
fn (p mut Parser) if_expr() (ast.Expr,types.TypeIdent) { fn (p mut Parser) if_expr() (ast.Expr,types.TypeIdent) {
p.inside_if = true
// defer {
// }
mut node := ast.Expr{} mut node := ast.Expr{}
p.check(.key_if) p.check(.key_if)
cond,cond_ti := p.expr(0) cond,cond_ti := p.expr(0)
@ -564,6 +573,7 @@ fn (p mut Parser) if_expr() (ast.Expr,types.TypeIdent) {
// left: left // left: left
} }
p.inside_if = false
return node,ti return node,ti
} }