vweb: tmpl fixes

pull/1389/head
Alexander Medvednikov 2019-07-31 03:41:39 +02:00
parent 95d76993c9
commit 8a7ddd102e
2 changed files with 10 additions and 2 deletions

View File

@ -77,6 +77,9 @@ fn (p mut Parser) comp_time() {
// that returns an html string
else if p.tok == .name && p.lit == 'vweb' {
path := p.cur_fn.name + '.html'
if p.pref.is_debug {
println('compiling tmpl $path')
}
if !os.file_exists(path) {
p.error('vweb HTML template "$path" not found')
}
@ -86,13 +89,18 @@ fn (p mut Parser) comp_time() {
p.check(.lpar)
p.check(.rpar)
v_code := tmpl.compile_template(path)
if os.file_exists('.vwebtmpl.v') {
os.rm('.vwebtmpl.v')
}
os.write_file('.vwebtmpl.v', v_code.clone()) // TODO don't need clone, compiler bug
p.genln('')
// Parse the function and embed resulting C code in current function so that
// all variables are available.
pos := p.cgen.lines.len - 1
mut pp := p.v.new_parser('.vwebtmpl.v', Pass.main)
if !p.pref.is_debug {
os.rm('.vwebtmpl.v')
}
pp.is_vweb = true
pp.cur_fn = p.cur_fn // give access too all variables in current function
pp.parse()

View File

@ -25,7 +25,7 @@ pub fn compile_template(path string) string {
panic('html failed')
return ''
}
header = h
header = h//.replace('\'', '"')
}
lines := html.split_into_lines()
mut s := strings.new_builder(1000)