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

fix prod build

pull/3759/head
Alexander Medvednikov 2020-02-17 14:30:01 +01:00
parent 1dd6491a2f
commit 53f8ae6517
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/compiler/aparser.v
View File

@ -3208,7 +3208,6 @@ fn todo_remove() {
fn (p mut Parser) check_if_parser_is_stuck(parsing_cycle u64, parsing_start_ticks i64){ fn (p mut Parser) check_if_parser_is_stuck(parsing_cycle u64, parsing_start_ticks i64){
// QTODO // QTODO
/*
if p.prev_stuck_token_idx == p.token_idx { if p.prev_stuck_token_idx == p.token_idx {
// many many cycles have passed with no progress :-( ... // many many cycles have passed with no progress :-( ...
eprintln('Parsing is [probably] stuck. Cycle: ${parsing_cycle:12ld} .') eprintln('Parsing is [probably] stuck. Cycle: ${parsing_cycle:12ld} .')
@ -3225,5 +3224,4 @@ Please create a GitHub issue: https://github.com/vlang/v/issues/new/choose
} }
} }
p.prev_stuck_token_idx = p.token_idx p.prev_stuck_token_idx = p.token_idx
*/
} }

16
vlib/v/checker/checker.v
View File

@ -447,15 +447,13 @@ pub fn (c mut Checker) match_expr(node mut ast.MatchExpr) table.Type {
// If the last statement is an expression, return its type // If the last statement is an expression, return its type
if block.stmts.len > 0 { if block.stmts.len > 0 {
match block.stmts[block.stmts.len - 1] { match block.stmts[block.stmts.len - 1] {
ast.ExprStmt { ast.ExprStmt {}
a := 0 // TODO: ask alex about this
// TODO: ask alex about this // typ := c.expr(it.expr)
// typ := c.expr(it.expr) // type_sym := c.table.get_type_symbol(typ)
// type_sym := c.table.get_type_symbol(typ) // p.warn('match expr ret $type_sym.name')
// p.warn('match expr ret $type_sym.name') // node.typ = typ
// node.typ = typ // return typ
// return typ
}
else {} else {}
} }
} }

1
vlib/v/parser/parser.v
View File

@ -633,7 +633,6 @@ pub fn (p mut Parser) expr(precedence int) (ast.Expr,table.Type) {
} }
// Map `{"age": 20}` or `{ x | foo:bar, a:10 }` // Map `{"age": 20}` or `{ x | foo:bar, a:10 }`
.lcbr { .lcbr {
p.warn('kek')
p.next() p.next()
if p.tok.kind == .str { if p.tok.kind == .str {
for p.tok.kind != .rcbr && p.tok.kind != .eof { for p.tok.kind != .rcbr && p.tok.kind != .eof {