mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
v2: add ability to store extra information with Type such as optional
This commit is contained in:
parent
8677a5981c
commit
8bb8b7d76e
|
@ -94,9 +94,20 @@ pub fn (p mut Parser) parse_type() table.Type {
|
||||||
p.next()
|
p.next()
|
||||||
p.check(.dot)
|
p.check(.dot)
|
||||||
}
|
}
|
||||||
if p.tok.kind == .question {
|
//if p.tok.kind == .question {
|
||||||
p.next()
|
// p.next()
|
||||||
|
//}
|
||||||
|
mut typ := p.parse_any_type(nr_muls)
|
||||||
|
if is_optional {
|
||||||
|
typ = table.type_to_optional(typ)
|
||||||
}
|
}
|
||||||
|
if nr_muls > 0 {
|
||||||
|
typ = table.type_set_nr_muls(typ, nr_muls)
|
||||||
|
}
|
||||||
|
return typ
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn (p mut Parser) parse_any_type(nr_muls int) table.Type {
|
||||||
mut name := p.tok.lit
|
mut name := p.tok.lit
|
||||||
// `module.Type`
|
// `module.Type`
|
||||||
if p.peek_tok.kind == .dot {
|
if p.peek_tok.kind == .dot {
|
||||||
|
@ -200,7 +211,7 @@ pub fn (p mut Parser) parse_type() table.Type {
|
||||||
// println('NOT FOUND: $name - adding placeholder - $idx')
|
// println('NOT FOUND: $name - adding placeholder - $idx')
|
||||||
return table.new_type_ptr(idx, nr_muls)
|
return table.new_type_ptr(idx, nr_muls)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,29 @@
|
||||||
module table
|
module table
|
||||||
|
|
||||||
pub type Type int
|
pub type Type int
|
||||||
|
|
||||||
|
pub enum TypeExtra {
|
||||||
|
unset
|
||||||
|
optional
|
||||||
|
}
|
||||||
|
|
||||||
// return underlying TypeSymbol idx
|
// return underlying TypeSymbol idx
|
||||||
[inline]
|
[inline]
|
||||||
pub fn type_idx(t Type) int {
|
pub fn type_idx(t Type) int {
|
||||||
return i16(int(t)>>16) & 0xffffffff
|
return u16(t) & 0xffff
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// return nr_muls
|
// return nr_muls
|
||||||
[inline]
|
[inline]
|
||||||
pub fn type_nr_muls(t Type) int {
|
pub fn type_nr_muls(t Type) int {
|
||||||
return i16(int(t) & 0xffffffff)
|
return (int(t) >> 16) & 0xff
|
||||||
|
}
|
||||||
|
|
||||||
|
// return extra
|
||||||
|
[inline]
|
||||||
|
pub fn type_extra(t Type) TypeExtra {
|
||||||
|
return ((int(t) >> 24) & 0xff)
|
||||||
}
|
}
|
||||||
|
|
||||||
// return true if pointer (nr_muls>0)
|
// return true if pointer (nr_muls>0)
|
||||||
|
@ -19,42 +32,64 @@ pub fn type_is_ptr(t Type) bool {
|
||||||
return type_nr_muls(t) > 0
|
return type_nr_muls(t) > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set nr_muls on Type and return it
|
||||||
|
[inline]
|
||||||
|
pub fn type_set_nr_muls(t Type, nr_muls int) Type {
|
||||||
|
if nr_muls < 0 || nr_muls > 255 {
|
||||||
|
panic('typ_set_nr_muls: nr_muls must be between 0 & 255')
|
||||||
|
}
|
||||||
|
return (int(type_extra(t)) << 24) | (nr_muls << 16) | u16(type_idx(t))
|
||||||
|
}
|
||||||
|
|
||||||
// increments nr_nuls on Type and return it
|
// increments nr_nuls on Type and return it
|
||||||
[inline]
|
[inline]
|
||||||
pub fn type_to_ptr(t Type) Type {
|
pub fn type_to_ptr(t Type) Type {
|
||||||
return type_idx(t)<<i16(16) | (type_nr_muls(t) + 1)
|
nr_muls := type_nr_muls(t)
|
||||||
|
if nr_muls == 255 {
|
||||||
|
panic('type_to_pre: nr_muls is already at max of 255')
|
||||||
|
}
|
||||||
|
return (int(type_extra(t)) << 24) | ((nr_muls+1) << 16) | u16(type_idx(t))
|
||||||
}
|
}
|
||||||
|
|
||||||
// decrement nr_muls on Type and return it
|
// decrement nr_muls on Type and return it
|
||||||
[inline]
|
[inline]
|
||||||
pub fn type_deref(t Type) Type {
|
pub fn type_deref(t Type) Type {
|
||||||
idx := type_idx(t)
|
|
||||||
nr_muls := type_nr_muls(t)
|
nr_muls := type_nr_muls(t)
|
||||||
if nr_muls == 0 {
|
if nr_muls == 0 {
|
||||||
panic('deref: $idx is not a pointer')
|
panic('deref: type `$t` is not a pointer')
|
||||||
}
|
}
|
||||||
return idx<<i16(16) | (nr_muls + -1)
|
return (int(type_extra(t)) << 24) | ((nr_muls-1) << 16) | u16(type_idx(t))
|
||||||
|
}
|
||||||
|
|
||||||
|
[inline]
|
||||||
|
pub fn type_is_optional(t Type) bool {
|
||||||
|
return type_extra(t) == .optional
|
||||||
|
}
|
||||||
|
|
||||||
|
[inline]
|
||||||
|
pub fn type_to_optional(t Type) Type {
|
||||||
|
return (int(TypeExtra.optional) << 24) | (type_nr_muls(t) << 16) | u16(type_idx(t))
|
||||||
}
|
}
|
||||||
|
|
||||||
// new type with idx of TypeSymbol, not pointer (nr_muls=0)
|
// new type with idx of TypeSymbol, not pointer (nr_muls=0)
|
||||||
[inline]
|
[inline]
|
||||||
pub fn new_type(idx int) Type {
|
pub fn new_type(idx int) Type {
|
||||||
if idx > 32767 || idx < -32767 {
|
if idx < 1 || idx > 65536 {
|
||||||
panic('new_type_id: idx must be between -32767 & 32767')
|
panic('new_type_id: idx must be between 1 & 65536')
|
||||||
}
|
}
|
||||||
return idx<<i16(16)
|
return u16(idx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// return Type idx of TypeSymbol & specify if ptr (nr_muls)
|
// return Type idx of TypeSymbol & specify if ptr (nr_muls)
|
||||||
[inline]
|
[inline]
|
||||||
pub fn new_type_ptr(idx, nr_muls int) Type {
|
pub fn new_type_ptr(idx int, nr_muls int) Type {
|
||||||
if idx > 32767 || idx < -32767 {
|
if idx < 1 || idx > 65536 {
|
||||||
panic('typ_ptr: idx must be between -32767 & 32767')
|
panic('typ_ptr: idx must be between 1 & 65536')
|
||||||
}
|
}
|
||||||
if nr_muls > 32767 || nr_muls < -0 {
|
if nr_muls < 0 || nr_muls > 255 {
|
||||||
panic('typ_ptr: nr_muls must be between 0 & 32767')
|
panic('typ_ptr: nr_muls must be between 0 & 255')
|
||||||
}
|
}
|
||||||
return idx<<i16(16) | nr_muls
|
return (nr_muls << 16) | u16(idx)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const (
|
pub const (
|
||||||
|
|
Loading…
Reference in New Issue
Block a user