Skip to content

Commit

Permalink
parser: start removing start_tmp()
Browse files Browse the repository at this point in the history
  • Loading branch information
medvednikov committed Nov 11, 2019
1 parent f30d0ce commit 00b3557
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Expand Up @@ -47,13 +47,15 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Install dependencies
run: sudo apt-get update; sudo apt-get install --quiet -y tcc libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev
run: sudo apt-get update; sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev
- name: Build v
run: make && ./v -o v v.v
- name: Test v->c with tcc
env:
VFLAGS: -cc tcc
run: |
echo "New TCC"
sudo ln -s /var/tmp/tcc/bin/tcc /usr/local/bin/tcc
tcc -version
./v -o v2 v.v # Make sure vtcc can build itself
./v test v
Expand Down
7 changes: 3 additions & 4 deletions vlib/compiler/comptime.v
Expand Up @@ -120,10 +120,9 @@ fn (p mut Parser) comp_time() {
p.check(.dollar)
p.check(.name)
p.check(.assign)
p.cgen.start_tmp()
p.bool_expression()
val := p.cgen.end_tmp()
println(val)
_, val := p.tmp_expr()
//p.bool_expression()
//val := p.cgen.end_tmp()
p.check(.rcbr)
// }
}
Expand Down
10 changes: 3 additions & 7 deletions vlib/compiler/parser.v
Expand Up @@ -2153,10 +2153,8 @@ fn (p mut Parser) string_expr() {
complex_inter = true
}
// Get bool expr inside a temp var
p.cgen.start_tmp()
typ := p.bool_expression()
mut val := p.cgen.end_tmp()
val = val.trim_space()
typ, val_ := p.tmp_expr()
val := val_.trim_space()
args += ', $val'
if typ == 'string' {
// args += '.str'
Expand Down Expand Up @@ -2264,8 +2262,7 @@ fn (p mut Parser) map_init() string {
keys_gen += 'tos3("$key"), '
p.check(.str)
p.check(.colon)
p.cgen.start_tmp()
t := p.bool_expression()
t, val_expr := p.tmp_expr()
if i == 0 {
val_type = t
}
Expand All @@ -2275,7 +2272,6 @@ fn (p mut Parser) map_init() string {
p.error('bad map element type `$val_type` instead of `$t`')
}
}
val_expr := p.cgen.end_tmp()
vals_gen += '$val_expr, '
if p.tok == .rcbr {
p.check(.rcbr)
Expand Down

0 comments on commit 00b3557

Please sign in to comment.