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

token: small optimizations

pull/4179/head
yuyi 2020-04-01 22:50:56 +08:00 committed by GitHub
parent 5a0bfa03b3
commit bd8d51fc95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vlib/v/token/token.v
View File

@ -134,7 +134,7 @@ const (
// Keywords['return'] == .key_return // Keywords['return'] == .key_return
fn build_keys() map[string]int { fn build_keys() map[string]int {
mut res := map[string]int mut res := map[string]int
for t := int(Kind.keyword_beg) + 1; t < int(Kind.keyword_end); t++ { for t in int(Kind.keyword_beg) + 1 .. int(Kind.keyword_end) {
key := token_str[t] key := token_str[t]
res[key] = t res[key] = t
} }
@ -144,8 +144,6 @@ fn build_keys() map[string]int {
// TODO remove once we have `enum Kind { name('name') if('if') ... }` // TODO remove once we have `enum Kind { name('name') if('if') ... }`
fn build_token_str() []string { fn build_token_str() []string {
mut s := [''].repeat(nr_tokens) mut s := [''].repeat(nr_tokens)
s[Kind.keyword_beg] = ''
s[Kind.keyword_end] = ''
s[Kind.eof] = 'eof' s[Kind.eof] = 'eof'
s[Kind.name] = 'name' s[Kind.name] = 'name'
s[Kind.number] = 'number' s[Kind.number] = 'number'
@ -282,21 +280,6 @@ fn (t []Kind) contains(val Kind) bool {
} }
pub fn (t Kind) str() string { pub fn (t Kind) str() string {
if t == .number {
return 'number'
}
if t == .chartoken {
return 'char' // '`lit`'
}
if t == .string {
return 'str' // "'lit'"
}
/*
if t < .plus {
return lit // string, number etc
}
*/
return token_str[int(t)] return token_str[int(t)]
} }
@ -312,7 +295,6 @@ pub const (
) )
*/ */
pub enum Precedence { pub enum Precedence {
lowest lowest
cond // OR or AND cond // OR or AND