diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/expand/format_args.cpp | 2 | ||||
| -rw-r--r-- | vsproject/mrustc.sln | 3 | ||||
| -rw-r--r-- | vsproject/mrustc.vcxproj.filters | 180 |
4 files changed, 101 insertions, 85 deletions
@@ -45,3 +45,4 @@ /bnf/rust.tab.h /bnf/rust.output /bnf/test.bin +/vsproject/output diff --git a/src/expand/format_args.cpp b/src/expand/format_args.cpp index 92afcbb2..e4c02b8b 100644 --- a/src/expand/format_args.cpp +++ b/src/expand/format_args.cpp @@ -477,7 +477,7 @@ class CFormatArgsExpander: auto expr_tt = TokenTree(Token( InterpolatedFragment(InterpolatedFragment::EXPR, Parse_Expr0(lex).release()) )); - auto ins_rv = named_args_index.insert( ::std::make_pair(mv$(name), named_args.size()) ); + auto ins_rv = named_args_index.insert( ::std::make_pair(mv$(name), static_cast<unsigned>(named_args.size())) ); if( ins_rv.second == false ) { ERROR(sp, E0000, "Duplicate definition of named argument `" << ins_rv.first->first << "`"); } diff --git a/vsproject/mrustc.sln b/vsproject/mrustc.sln index 3aebce2e..abeaf785 100644 --- a/vsproject/mrustc.sln +++ b/vsproject/mrustc.sln @@ -8,6 +8,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tu_test", "tu_test\tu_test.vcxproj", "{F0A80ABB-A11A-492C-B5FC-E26C29A988D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minicargo", "minicargo\minicargo.vcxproj", "{15F3D38B-14FF-4872-805D-6D9C52920842}" + ProjectSection(ProjectDependencies) = postProject + {12AA9964-C1BD-406A-9545-43EE63230EBE} = {12AA9964-C1BD-406A-9545-43EE63230EBE} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/vsproject/mrustc.vcxproj.filters b/vsproject/mrustc.vcxproj.filters index e5afb22e..cfcdb9b9 100644 --- a/vsproject/mrustc.vcxproj.filters +++ b/vsproject/mrustc.vcxproj.filters @@ -57,6 +57,18 @@ <Filter Include="Header Files\mir"> <UniqueIdentifier>{1233e2f6-7b44-4379-9f43-d572b8944ba0}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\parse"> + <UniqueIdentifier>{3709226c-e95b-4da0-9735-42e2a5cad1a7}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\expand"> + <UniqueIdentifier>{c78c419b-2b25-4c6f-8f91-95a9d0142fff}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\trans"> + <UniqueIdentifier>{6bbfdfb3-9557-43a9-bddd-07a243569fa3}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\hir"> + <UniqueIdentifier>{e3219c19-8898-418e-b2ba-84254977a792}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\src\debug.cpp"> @@ -382,63 +394,21 @@ <ClInclude Include="..\src\coretypes.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\ast\crate.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\ast\pattern.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\expand\cfg.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\expand\macro_rules.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\hir\crate_ptr.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\expr.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\expr_ptr.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\from_ast.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\generic_params.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\hir.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\hir\path.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\hir\pattern.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\type.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\hir\visitor.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\hir_conv\main_bindings.hpp"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\src\hir_expand\main_bindings.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\hir_typeck\expr_visit.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\hir_typeck\main_bindings.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\hir_typeck\static.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\include\cpp_unpack.h"> <Filter>Header Files</Filter> </ClInclude> @@ -457,12 +427,6 @@ <ClInclude Include="..\src\include\rustic.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\include\serialise.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\include\serialiser_texttree.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\include\span.hpp"> <Filter>Header Files</Filter> </ClInclude> @@ -487,57 +451,21 @@ <ClInclude Include="..\src\macro_rules\pattern_checks.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\mir\from_hir.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\mir\main_bindings.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\parse\eTokenType.enum.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\parse\common.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\parse\interpolated_fragment.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\parse\lex.hpp"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\src\parse\parseerror.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\parse\token.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\parse\tokentree.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\resolve\main_bindings.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\parse\ttstream.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\parse\tokenstream.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\trans\codegen.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\trans\main_bindings.hpp"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\src\trans\mangling.hpp"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\src\trans\trans_list.hpp"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\src\mir\visit_crate_mir.hpp"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\src\ast\attrs.hpp"> <Filter>Header Files\ast</Filter> </ClInclude> @@ -583,6 +511,90 @@ <ClInclude Include="..\src\ast\types.hpp"> <Filter>Header Files\ast</Filter> </ClInclude> + <ClInclude Include="..\src\ast\crate.hpp"> + <Filter>Header Files\ast</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\common.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\crate_ptr.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\eTokenType.enum.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\expr_ptr.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\hir_typeck\expr_visit.hpp"> + <Filter>Header Files\hir_typeck</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\expr.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\mir\main_bindings.hpp"> + <Filter>Header Files\mir</Filter> + </ClInclude> + <ClInclude Include="..\src\include\serialise.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\include\serialiser_texttree.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\expand\cfg.hpp"> + <Filter>Header Files\expand</Filter> + </ClInclude> + <ClInclude Include="..\src\trans\codegen.hpp"> + <Filter>Header Files\trans</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\from_ast.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\hir.hpp"> + <Filter>Header Files\mir</Filter> + </ClInclude> + <ClInclude Include="..\src\mir\from_hir.hpp"> + <Filter>Header Files\mir</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\generic_params.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\interpolated_fragment.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\pattern.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\ast\pattern.hpp"> + <Filter>Header Files\ast</Filter> + </ClInclude> + <ClInclude Include="..\src\hir_typeck\static.hpp"> + <Filter>Header Files\hir_typeck</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\type.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\hir\visitor.hpp"> + <Filter>Header Files\hir</Filter> + </ClInclude> + <ClInclude Include="..\src\mir\visit_crate_mir.hpp"> + <Filter>Header Files\mir</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\token.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\tokenstream.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\trans\trans_list.hpp"> + <Filter>Header Files\trans</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\ttstream.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\src\parse\tokentree.hpp"> + <Filter>Header Files\parse</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="packages.config" /> |