mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

remove old types and

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-06-25 22:19:17 +02:00
parent f26e65a943
commit f3f24b25bb
6 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/parser.v
View File

@@ -1925,10 +1925,6 @@ fn (p mut Parser) factor() string {
switch tok {
case INT:
typ = 'int'
// typ = 'number'
if p.lit.starts_with('u') {
typ = 'long'
}
if p.lit.contains('.') || p.lit.contains('e') {
typ = 'f32'
// typ = 'f64' // TODO
@@ -2087,14 +2083,13 @@ fn (p mut Parser) typ_to_fmt(typ string) string {
switch typ {
case 'string': return '%.*s'
case 'ustring': return '%.*s'
case 'long': return '%ld'
case 'byte': return '%d'
case 'int': return '%d'
case 'char': return '%d'
case 'byte': return '%d'
case 'bool': return '%d'
case 'u32': return '%d'
case 'double', 'f64', 'f32': return '%f'
case 'f64', 'f32': return '%f'
case 'i64': return '%lld'
case 'byte*': return '%s'
// case 'array_string': return '%s'

2
compiler/scanner.v
View File

@@ -85,7 +85,7 @@ fn (s mut Scanner) ident_number() string {
if c == `.` {
is_float = true
}
is_good_hex := is_hex && (c == `x` || c == `u` || (c >= `a` && c <= `f`))
is_good_hex := is_hex && (c == `x` || (c >= `a` && c <= `f`))
// 1e+3, 1e-3, 1e3
if !is_hex && c == `e` {
next := s.text[s.pos + 1]

8
compiler/table.v
View File

@@ -97,8 +97,8 @@ fn (f Fn) str() string {
// fn (types array_Type) print_to_file(f string) {
// }
const (
NUMBER_TYPES = ['number', 'int', 'i8', 'u8', 'i16', 'u16', 'i32', 'u32', 'byte', 'i64', 'u64', 'long', 'double', 'f32', 'f64']
FLOAT_TYPES = ['double', 'f32', 'f64']
NUMBER_TYPES = ['number', 'int', 'i8', 'u8', 'i16', 'u16', 'i32', 'u32', 'byte', 'i64', 'u64', 'f32', 'f64']
FLOAT_TYPES = ['f32', 'f64']
)
fn is_number_type(typ string) bool {
@@ -126,10 +126,8 @@ fn new_table(obfuscate bool) *Table {
// t.register_type_with_parent('i64', 'int')
t.register_type('i64')
t.register_type_with_parent('u64', 'int')
t.register_type('long')
t.register_type('byteptr')
t.register_type('intptr')
t.register_type('double')// TODO remove
t.register_type('f32')
t.register_type('f64')
t.register_type('rune')
@@ -433,7 +431,7 @@ fn (p mut Parser) _check_types(got, expected string, throw bool) bool {
return true
}
// Allow ints to be used as longs
if got.eq('int') && expected.eq('long') {
if got=='int' && expected=='i64' {
return true
}
if got == 'void*' && expected.starts_with('fn ') {