Fix issue when customizing integer, uinteger and number types

edubart · Oct 29, 2020 · cb17c7e · cb17c7e
1 parent 1ec5513
commit cb17c7e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/nelua/analyzer.lua b/nelua/analyzer.lua
@@ -44,7 +44,7 @@ function visitors.Number(context, node)
       end
     end
   else
-    local type = typedefs.number_literal_types[literal]
+    local type = primtypes[typedefs.number_literal_types[literal]]
     if not type then
       node:raisef("literal suffix '%s' is undefined for numbers", literal)
     end

diff --git a/nelua/typedefs.lua b/nelua/typedefs.lua
@@ -81,40 +81,40 @@ primtypes.varanys     = types.VaranysType('varanys')
 
 -- Map of literal suffixes for arithmetic types.
 typedefs.number_literal_types = {
-  _i          = primtypes.integer,  _integer    = primtypes.integer,
-  _u          = primtypes.uinteger, _uinteger   = primtypes.uinteger,
-  _n          = primtypes.number,   _number     = primtypes.number,
-  _b          = primtypes.byte,     _byte       = primtypes.byte,
-  _is         = primtypes.isize,    _isize      = primtypes.isize,
-  _i8         = primtypes.int8,     _int8       = primtypes.int8,
-  _i16        = primtypes.int16,    _int16      = primtypes.int16,
-  _i32        = primtypes.int32,    _int32      = primtypes.int32,
-  _i64        = primtypes.int64,    _int64      = primtypes.int64,
-  _i128       = primtypes.int128,   _int128     = primtypes.int128,
-  _us         = primtypes.usize,    _usize      = primtypes.usize,
-  _u8         = primtypes.uint8,    _uint8      = primtypes.uint8,
-  _u16        = primtypes.uint16,   _uint16     = primtypes.uint16,
-  _u32        = primtypes.uint32,   _uint32     = primtypes.uint32,
-  _u64        = primtypes.uint64,   _uint64     = primtypes.uint64,
-  _u128       = primtypes.uint128,  _uint128    = primtypes.uint128,
-  _f32        = primtypes.float32,  _float32    = primtypes.float32,
-  _f64        = primtypes.float64,  _float64    = primtypes.float64,
-  _f128       = primtypes.float128, _float128   = primtypes.float128,
+  _i          = 'integer',  _integer    = 'integer',
+  _u          = 'uinteger', _uinteger   = 'uinteger',
+  _n          = 'number',   _number     = 'number',
+  _b          = 'byte',     _byte       = 'byte',
+  _is         = 'isize',    _isize      = 'isize',
+  _i8         = 'int8',     _int8       = 'int8',
+  _i16        = 'int16',    _int16      = 'int16',
+  _i32        = 'int32',    _int32      = 'int32',
+  _i64        = 'int64',    _int64      = 'int64',
+  _i128       = 'int128',   _int128     = 'int128',
+  _us         = 'usize',    _usize      = 'usize',
+  _u8         = 'uint8',    _uint8      = 'uint8',
+  _u16        = 'uint16',   _uint16     = 'uint16',
+  _u32        = 'uint32',   _uint32     = 'uint32',
+  _u64        = 'uint64',   _uint64     = 'uint64',
+  _u128       = 'uint128',  _uint128    = 'uint128',
+  _f32        = 'float32',  _float32    = 'float32',
+  _f64        = 'float64',  _float64    = 'float64',
+  _f128       = 'float128', _float128   = 'float128',
 
-  _cchar       = primtypes.cchar,
-  _cschar      = primtypes.cschar,
-  _cshort      = primtypes.cshort,
-  _cint        = primtypes.cint,
-  _clong       = primtypes.clong,
-  _clonglong   = primtypes.clonglong,
-  _cptrdiff    = primtypes.cptrdiff,
-  _cuchar      = primtypes.cuchar,
-  _cushort     = primtypes.cushort,
-  _cuint       = primtypes.cuint,
-  _culong      = primtypes.culong,
-  _culonglong  = primtypes.culonglong,
-  _csize       = primtypes.csize,
-  _clongdouble = primtypes.clongdouble,
+  _cchar       = 'cchar',
+  _cschar      = 'cschar',
+  _cshort      = 'cshort',
+  _cint        = 'cint',
+  _clong       = 'clong',
+  _clonglong   = 'clonglong',
+  _cptrdiff    = 'cptrdiff',
+  _cuchar      = 'cuchar',
+  _cushort     = 'cushort',
+  _cuint       = 'cuint',
+  _culong      = 'culong',
+  _culonglong  = 'culonglong',
+  _csize       = 'csize',
+  _clongdouble = 'clongdouble',
 }
 
 -- Map of literal suffixes for strings.