mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vweb: remove no longer needed special case & fix tmpl

Browse Source
This commit is contained in:
joe-conigliaro
2019-11-26 17:23:11 +11:00
committed by Alexander Medvednikov
parent 6349bd33d3
commit 3107618732
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/compiler/parser.v
View File

@ -68,7 +68,6 @@ mut:
is_const_literal bool // `1`, `2.0` etc, so that `u64_var == 0` works
in_dispatch bool // dispatching generic instance?
is_vgen bool
is_vweb bool
is_sql bool
is_js bool
sql_i int // $1 $2 $3
@ -1172,7 +1171,7 @@ fn (p mut Parser) gen(s string) {
// Generate V header from V source
fn (p mut Parser) statement(add_semi bool) string {
p.expected_type = ''
if p.returns && !p.is_vweb {
if p.returns {
p.error('unreachable code')
}
// if !p.in_dispatch {
@ -2833,7 +2832,7 @@ fn (p mut Parser) return_st() {
}
else {
// Don't allow `return val` in functions that don't return anything
if !p.is_vweb && (p.tok == .name || p.tok == .number || p.tok == .str) {
if p.tok == .name || p.tok == .number || p.tok == .str {
p.error_with_token_index('function `$p.cur_fn.name` should not return a value', p.cur_fn.fn_name_token_idx)
}