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

compiler: parser fixes for vweb

pull/2906/head
joe-conigliaro 2019-11-25 23:29:55 +11:00 committed by Alexander Medvednikov
parent 837af9b230
commit edd4706480
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/compiler/comptime.v
View File

@ -169,7 +169,9 @@ fn (p mut Parser) comp_time() {
} }
p.import_table.register_used_import('strings') p.import_table.register_used_import('strings')
p.genln('/////////////////// tmpl start') p.genln('/////////////////// tmpl start')
p.is_vweb = true
p.statements_from_text(v_code, false) p.statements_from_text(v_code, false)
p.is_vweb = false
p.genln('/////////////////// tmpl end') p.genln('/////////////////// tmpl end')
receiver := p.cur_fn.args[0] receiver := p.cur_fn.args[0]
dot := if receiver.is_mut { '->' } else { '.' } dot := if receiver.is_mut { '->' } else { '.' }

40
vlib/compiler/parser.v
View File

@ -90,13 +90,15 @@ const (
) )
struct ParserState { struct ParserState {
scanner_text string scanner_line_nr int
tokens []Token scanner_text string
token_idx int scanner_pos int
tok TokenKind tokens []Token
prev_tok TokenKind token_idx int
prev_tok2 TokenKind tok TokenKind
lit string prev_tok TokenKind
prev_tok2 TokenKind
lit string
} }
// new parser from string. unique id specified in `id`. // new parser from string. unique id specified in `id`.
@ -277,7 +279,9 @@ fn (p &Parser) log(s string) {
pub fn (p mut Parser) save_state() ParserState { pub fn (p mut Parser) save_state() ParserState {
return ParserState{ return ParserState{
scanner_line_nr: p.scanner.line_nr
scanner_text : p.scanner.text scanner_text : p.scanner.text
scanner_pos : p.scanner.pos
tokens : p.tokens tokens : p.tokens
token_idx : p.token_idx token_idx : p.token_idx
tok : p.tok tok : p.tok
@ -288,19 +292,24 @@ pub fn (p mut Parser) save_state() ParserState {
} }
pub fn (p mut Parser) restore_state(state ParserState) { pub fn (p mut Parser) restore_state(state ParserState) {
p.scanner.text = state.scanner_text p.scanner.line_nr = state.scanner_line_nr
p.tokens = state.tokens p.scanner.text = state.scanner_text
p.token_idx = state.token_idx p.scanner.pos = state.scanner_pos
p.tok = state.tok p.tokens = state.tokens
p.prev_tok = state.prev_tok p.token_idx = state.token_idx
p.prev_tok2 = state.prev_tok2 p.tok = state.tok
p.lit = state.lit p.prev_tok = state.prev_tok
p.prev_tok2 = state.prev_tok2
p.lit = state.lit
} }
fn (p mut Parser) clear_state() { fn (p mut Parser) clear_state() {
p.scanner.line_nr = 0
p.scanner.text = ''
p.scanner.pos = 0
p.tokens = [] p.tokens = []
p.token_idx = 0 p.token_idx = 0
p.scanner.text = '' p.lit = ''
} }
pub fn (p mut Parser) add_text(text string) { pub fn (p mut Parser) add_text(text string) {
@ -315,6 +324,7 @@ fn (p mut Parser) statements_from_text(text string, rcbr bool) {
saved_state := p.save_state() saved_state := p.save_state()
p.clear_state() p.clear_state()
p.add_text(text) p.add_text(text)
p.next()
if rcbr { if rcbr {
p.statements() p.statements()
} else { } else {