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

compiler & builtin: bitshifts CAO fix and C code removal in utf8 

utf8: removed bitshift cao in code

utf8: added pub on functions

utf8: byteptr to voidptr

utf8: converts voidptr to byteptr
pull/472/head
Henrixounez 2019-06-27 02:33:49 +02:00 committed by Alexander Medvednikov
parent 959cc2ea03
commit c83ebe2c66
2 changed files with 54 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
builtin/utf8.v
View File

@ -251,71 +251,64 @@ fn (s string) runes() []string {
// Convert utf32 to utf8 // Convert utf32 to utf8
// utf32 == Codepoint // utf32 == Codepoint
pub fn utf32_to_str(code u32) string { pub fn utf32_to_str(code u32) string {
// println('code = $code') icode := int(code) //Prevents doing casts everywhere
buffer := malloc(5) mut buffer := malloc(5)
# if (code <= 0x7F) { if icode <= 127 /* 0x7F */ {
// println('!!!!!!!1') buffer[0] = icode
# buffer[0] = code; return tos(buffer, 1)
# return tos(buffer, 1); }
# } if (icode <= 2047 /* 0x7FF */) {
# if (code <= 0x7FF) { buffer[0] = 192 /*0xC0*/ | (icode >> 6) /* 110xxxxx */
// println('!!!!!!!2') buffer[1] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xC0 | (code >> 6); /* 110xxxxx */ return tos(buffer, 2)
# buffer[1] = 0x80 | (code & 0x3F); /* 10xxxxxx */ }
# return tos(buffer, 2); if (icode <= 65535 /* 0xFFFF */) {
# } buffer[0] = 224 /*0xE0*/ | (icode >> 12) /* 1110xxxx */
# if (code <= 0xFFFF) { buffer[1] = 128 /*0x80*/ | ((icode >> 6) & 63 /*0x3F*/) /* 10xxxxxx */
// println('!!!!!!!3') buffer[2] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xE0 | (code >> 12); /* 1110xxxx */ return tos(buffer, 3)
# buffer[1] = 0x80 | ((code >> 6) & 0x3F); /* 10xxxxxx */ }
# buffer[2] = 0x80 | (code & 0x3F); /* 10xxxxxx */ if (icode <= 1114111 /* 0x10FFFF */) {
# return tos(buffer, 3); buffer[0] = 240 /*0xF0*/ | (icode >> 18) /* 11110xxx */
# } buffer[1] = 128 /*0x80*/ | ((icode >> 12) & 63 /*0x3F*/) /* 10xxxxxx */
# if (code <= 0x10FFFF) { buffer[2] = 128 /*0x80*/ | ((icode >> 6) & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xF0 | (code >> 18); /* 11110xxx */ buffer[3] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[1] = 0x80 | ((code >> 12) & 0x3F); /* 10xxxxxx */ return tos(buffer, 4)
# buffer[2] = 0x80 | ((code >> 6) & 0x3F); /* 10xxxxxx */ }
# buffer[3] = 0x80 | (code & 0x3F); /* 10xxxxxx */
# return tos(buffer, 4);
# }
return '' return ''
} }
// TODO copypasta // TODO copypasta
pub fn utf32_to_str_no_malloc(code u32, buf voidptr) string { pub fn utf32_to_str_no_malloc(code u32, buf voidptr) string {
// println('code = $code') icode := int(code) //Prevents doing casts everywhere
# char* buffer = buf; mut buffer := byteptr(buf)
# if (code <= 0x7F) { if icode <= 127 /* 0x7F */ {
// println('!!!!!!!1') buffer[0] = icode
# buffer[0] = code; return tos(buffer, 1)
# return tos(buffer, 1); }
# } if (icode <= 2047 /* 0x7FF */) {
# if (code <= 0x7FF) { buffer[0] = 192 /*0xC0*/ | (icode >> 6) /* 110xxxxx */
// println('!!!!!!!2') buffer[1] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xC0 | (code >> 6); /* 110xxxxx */ return tos(buffer, 2)
# buffer[1] = 0x80 | (code & 0x3F); /* 10xxxxxx */ }
# return tos(buffer, 2); if (icode <= 65535 /* 0xFFFF */) {
# } buffer[0] = 224 /*0xE0*/ | (icode >> 12) /* 1110xxxx */
# if (code <= 0xFFFF) { buffer[1] = 128 /*0x80*/ | ((icode >> 6) & 63 /*0x3F*/) /* 10xxxxxx */
// println('!!!!!!!3') buffer[2] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xE0 | (code >> 12); /* 1110xxxx */ return tos(buffer, 3)
# buffer[1] = 0x80 | ((code >> 6) & 0x3F); /* 10xxxxxx */ }
# buffer[2] = 0x80 | (code & 0x3F); /* 10xxxxxx */ if (icode <= 1114111 /* 0x10FFFF */) {
# return tos(buffer, 3); buffer[0] = 240 /*0xF0*/ | (icode >> 18) /* 11110xxx */
# } buffer[1] = 128 /*0x80*/ | ((icode >> 12) & 63 /*0x3F*/) /* 10xxxxxx */
# if (code <= 0x10FFFF) { buffer[2] = 128 /*0x80*/ | ((icode >> 6) & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[0] = 0xF0 | (code >> 18); /* 11110xxx */ buffer[3] = 128 /*0x80*/ | (icode & 63 /*0x3F*/) /* 10xxxxxx */
# buffer[1] = 0x80 | ((code >> 12) & 0x3F); /* 10xxxxxx */ return tos(buffer, 4)
# buffer[2] = 0x80 | ((code >> 6) & 0x3F); /* 10xxxxxx */ }
# buffer[3] = 0x80 | (code & 0x3F); /* 10xxxxxx */
# return tos(buffer, 4);
# }
return '' return ''
} }
// Convert utf8 to utf32 // Convert utf8 to utf32
pub fn (_rune string) utf32_code() int { pub fn (_rune string) utf32_code() int {
// println('utf 32 of $rune len=$rune.len')
if _rune.len == 0 { if _rune.len == 0 {
return 0 return 0
} }
@ -323,20 +316,18 @@ pub fn (_rune string) utf32_code() int {
if _rune.len == 1 { if _rune.len == 1 {
return int(_rune[0]) return int(_rune[0])
} }
b := byte(int(_rune[0])) mut b := byte(int(_rune[0]))
// TODO should be // TODO should be
// res := int( rune[0] << rune.len) // res := int( rune[0] << rune.len)
# b <<= _rune.len; b = b << _rune.len
res := int(b) mut res := int(b)
mut shift := 6 - _rune.len mut shift := 6 - _rune.len
for i := 1; i < _rune.len; i++ { for i := 1; i < _rune.len; i++ {
// println('c=$res')
c := int(_rune[i]) c := int(_rune[i])
# res <<= shift; res = res << shift
# res |= c & 0x3f; res |= c & 63 /* 0x3f */
shift = 6 shift = 6
} }
// println('!!!!!!!! utf32 $rune res = $res')
return res return res
} }

2
compiler/scanner.v
View File

@ -138,7 +138,7 @@ fn (s mut Scanner) get_var_name(pos int) string {
// CAO stands for Compound Assignment Operators (e.g '+=' ) // CAO stands for Compound Assignment Operators (e.g '+=' )
fn (s mut Scanner) cao_change(operator string) { fn (s mut Scanner) cao_change(operator string) {
s.text = s.text.substr(0, s.pos - 1) + ' = ' + s.get_var_name(s.pos - 1) + ' ' + operator + ' ' + s.text.substr(s.pos + 1, s.text.len) s.text = s.text.substr(0, s.pos - operator.len) + ' = ' + s.get_var_name(s.pos - operator.len) + ' ' + operator + ' ' + s.text.substr(s.pos + 1, s.text.len)
} }
fn (s mut Scanner) scan() ScanRes { fn (s mut Scanner) scan() ScanRes {