mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
clean up switch tokens
This commit is contained in:
parent
8358528888
commit
1390a39053
@ -957,8 +957,7 @@ fn (p mut Parser) statements_no_rcbr() string {
|
||||
}
|
||||
mut i := 0
|
||||
mut last_st_typ := ''
|
||||
for p.tok != .rcbr && p.tok != .eof && p.tok != .key_case &&
|
||||
p.tok != .key_default {
|
||||
for p.tok != .rcbr && p.tok != .eof {
|
||||
// println('stm: '+p.tok.str()+', next: '+p.peek().str())
|
||||
last_st_typ = p.statement(true)
|
||||
// println('last st typ=$last_st_typ')
|
||||
@ -972,13 +971,8 @@ fn (p mut Parser) statements_no_rcbr() string {
|
||||
p.error('more than 50 000 statements in function `$p.cur_fn.name`')
|
||||
}
|
||||
}
|
||||
if p.tok != .key_case && p.tok != .key_default && p.peek() != .arrow {
|
||||
// p.next()
|
||||
p.check(.rcbr)
|
||||
}
|
||||
else {
|
||||
// p.check(.rcbr)
|
||||
}
|
||||
p.check(.rcbr)
|
||||
//p.fmt_dec()
|
||||
|
||||
p.close_scope()
|
||||
@ -2565,6 +2559,7 @@ fn (p mut Parser) factor() string {
|
||||
typ = p.name_expr()
|
||||
return typ
|
||||
}
|
||||
/*
|
||||
.key_default {
|
||||
p.next()
|
||||
p.next()
|
||||
@ -2576,6 +2571,7 @@ fn (p mut Parser) factor() string {
|
||||
p.next()
|
||||
return 'T'
|
||||
}
|
||||
*/
|
||||
.lpar {
|
||||
//p.gen('(/*lpar*/')
|
||||
p.gen('(')
|
||||
|
@ -83,10 +83,8 @@ enum TokenKind {
|
||||
key_assert
|
||||
key_atomic
|
||||
key_break
|
||||
key_case
|
||||
key_const
|
||||
key_continue
|
||||
key_default
|
||||
key_defer
|
||||
key_else
|
||||
key_embed
|
||||
@ -212,7 +210,6 @@ fn build_token_str() []string {
|
||||
s[TokenKind.key_type] = 'type'
|
||||
s[TokenKind.key_for] = 'for'
|
||||
s[TokenKind.key_switch] = 'switch'
|
||||
s[TokenKind.key_case] = 'case'
|
||||
s[TokenKind.key_fn] = 'fn'
|
||||
s[TokenKind.key_true] = 'true'
|
||||
s[TokenKind.key_false] = 'false'
|
||||
@ -222,7 +219,6 @@ fn build_token_str() []string {
|
||||
s[TokenKind.key_embed] = 'embed'
|
||||
s[TokenKind.key_unsafe] = 'unsafe'
|
||||
//Tokens[key_typeof] = 'typeof'
|
||||
s[TokenKind.key_default] = 'default'
|
||||
s[TokenKind.key_enum] = 'enum'
|
||||
s[TokenKind.key_interface] = 'interface'
|
||||
s[TokenKind.key_pub] = 'pub'
|
||||
|
@ -57,7 +57,7 @@ pub:
|
||||
mono bool
|
||||
}
|
||||
|
||||
struct Image {
|
||||
pub struct Image {
|
||||
mut:
|
||||
obj voidptr
|
||||
pub:
|
||||
|
@ -11,7 +11,7 @@ module stbi
|
||||
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include "stb_image.h"
|
||||
struct Image {
|
||||
pub struct Image {
|
||||
mut:
|
||||
width int
|
||||
height int
|
||||
|
Loading…
Reference in New Issue
Block a user