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

ci: fix msvc _name_table [0]{} generation

pull/7220/head^2
Delyan Angelov 2020-12-09 20:08:51 +02:00
parent b565df25c3
commit c7bea03ce3
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -395,7 +395,7 @@ jobs:
run: | run: |
echo %VFLAGS% echo %VFLAGS%
echo $VFLAGS echo $VFLAGS
.\make.bat .\make.bat -msvc
.\v.exe -cflags /WX self .\v.exe -cflags /WX self
- name: Install dependencies - name: Install dependencies
run: | run: |

17
vlib/v/gen/cgen.v
View File

@ -5627,13 +5627,18 @@ fn (mut g Gen) interface_table() string {
// as well as case functions from the struct to the interface // as well as case functions from the struct to the interface
mut methods_struct := strings.new_builder(100) mut methods_struct := strings.new_builder(100)
mut staticprefix := 'static' mut staticprefix := 'static'
iname_table_length := inter_info.types.len
if g.pref.ccompiler == 'msvc' { if g.pref.ccompiler == 'msvc' {
// msvc can not process `static struct x[0] = {};`
// for now just skip adding `static`.
// TODO: generate a non empty _name_table in this case, a dummy element...
staticprefix = '' staticprefix = ''
if iname_table_length == 0 {
// msvc can not process `static struct x[0] = {};`
methods_struct.writeln('$staticprefix $methods_struct_name ${interface_name}_name_table[1];')
}else{
methods_struct.writeln('$staticprefix $methods_struct_name ${interface_name}_name_table[$iname_table_length] = {')
}
} else {
methods_struct.writeln('$staticprefix $methods_struct_name ${interface_name}_name_table[$iname_table_length] = {')
} }
methods_struct.writeln('$staticprefix $methods_struct_name ${interface_name}_name_table[$inter_info.types.len] = {')
mut cast_functions := strings.new_builder(100) mut cast_functions := strings.new_builder(100)
cast_functions.write('// Casting functions for interface "$interface_name"') cast_functions.write('// Casting functions for interface "$interface_name"')
mut methods_wrapper := strings.new_builder(100) mut methods_wrapper := strings.new_builder(100)
@ -5719,7 +5724,11 @@ _Interface* I_${cctype}_to_Interface_${interface_name}_ptr($cctype* x) {
sb.writeln('int $interface_index_name = $iin_idx;') sb.writeln('int $interface_index_name = $iin_idx;')
} }
sb.writeln('// ^^^ number of types for interface $interface_name: ${current_iinidx - iinidx_minimum_base}') sb.writeln('// ^^^ number of types for interface $interface_name: ${current_iinidx - iinidx_minimum_base}')
if g.pref.ccompiler == 'msvc' && iname_table_length == 0 {
methods_struct.writeln('')
}else {
methods_struct.writeln('};') methods_struct.writeln('};')
}
// add line return after interface index declarations // add line return after interface index declarations
sb.writeln('') sb.writeln('')
sb.writeln(methods_wrapper.str()) sb.writeln(methods_wrapper.str())