Moved sizeof functions to a separate package
This commit is contained in:
parent
6d77a8a120
commit
315ad23e31
13 changed files with 83 additions and 40 deletions
|
@ -10,45 +10,45 @@ import (
|
|||
)
|
||||
|
||||
// Number tries to convert the token into a numeric value.
|
||||
func (f *Function) Number(t token.Token) (int, byte, error) {
|
||||
func (f *Function) Number(t token.Token) (int, error) {
|
||||
switch t.Kind {
|
||||
case token.Number:
|
||||
digits := t.Text(f.File.Bytes)
|
||||
|
||||
if strings.HasPrefix(digits, "0x") {
|
||||
number, err := strconv.ParseInt(digits[2:], 16, 64)
|
||||
return int(number), 8, err
|
||||
return int(number), err
|
||||
}
|
||||
|
||||
if strings.HasPrefix(digits, "0o") {
|
||||
number, err := strconv.ParseInt(digits[2:], 8, 64)
|
||||
return int(number), 8, err
|
||||
return int(number), err
|
||||
}
|
||||
|
||||
if strings.HasPrefix(digits, "0b") {
|
||||
number, err := strconv.ParseInt(digits[2:], 2, 64)
|
||||
return int(number), 8, err
|
||||
return int(number), err
|
||||
}
|
||||
|
||||
number, err := strconv.Atoi(digits)
|
||||
return number, 8, err
|
||||
return number, err
|
||||
|
||||
case token.Rune:
|
||||
r := t.Bytes(f.File.Bytes)
|
||||
r = r[1 : len(r)-1]
|
||||
|
||||
if len(r) == 0 {
|
||||
return 0, 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
|
||||
return 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
|
||||
}
|
||||
|
||||
number, size := utf8.DecodeRune(r)
|
||||
|
||||
if len(r) > size {
|
||||
return 0, 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
|
||||
return 0, errors.New(errors.InvalidRune, f.File, t.Position+1)
|
||||
}
|
||||
|
||||
return int(number), byte(size), nil
|
||||
return int(number), nil
|
||||
}
|
||||
|
||||
return 0, 0, errors.New(errors.InvalidNumber, f.File, t.Position)
|
||||
return 0, errors.New(errors.InvalidNumber, f.File, t.Position)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue