-
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding IncludePath metadata for complex include hierarchies (#268)
* Added support for flatc -I argument * Removing unnecessary using * Fixed typo * Added compiler tests for FBS include statement with/without IncludePath
- Loading branch information
yak-shaver
committed
Jan 22, 2022
1 parent
f60e37a
commit 327e990
Showing
4 changed files
with
320 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| /* | ||
| * Copyright 2021 James Courtney | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| namespace FlatSharpTests.Compiler; | ||
|
|
||
| public class IncludeTests | ||
| { | ||
| [Fact] | ||
| public void IncludeTest() | ||
| { | ||
| var schemaA = $@" | ||
| include ""B.fbs""; | ||
| namespace Foobar; | ||
| table A {{ TableB:B; }} | ||
| "; | ||
|
|
||
| var schemaB = $@" | ||
| namespace Foobar; | ||
| table B {{ Value:int32; }} | ||
| "; | ||
|
|
||
| var schemas = new[] | ||
| { | ||
| ("B.fbs", schemaB), | ||
| ("A.fbs", schemaA), | ||
| }; | ||
|
|
||
| var assemblies = FlatSharpCompiler.CompileAndLoadAssemblies(schemas, new()); | ||
|
|
||
| UsingAssemblies(assemblies, () => | ||
| { | ||
| Type aType = assemblies[1].GetType("Foobar.A"); | ||
| Type bType = assemblies[0].GetType("Foobar.B"); | ||
| PropertyInfo tableB = aType.GetProperty("TableB"); | ||
| Assert.Equal(bType, tableB.PropertyType); | ||
| var compiled = CompilerTestHelpers.CompilerTestSerializer.Compile(aType); | ||
| byte[] data = new byte[100]; | ||
| compiled.Write(data, Activator.CreateInstance(aType)); | ||
| compiled.Parse(data); | ||
| }); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void IncludeTest_IncludePaths() | ||
| { | ||
| var schemaA = $@" | ||
| include ""Foo\\B.fbs""; | ||
| namespace Foobar; | ||
| table A {{ TableB:B; }} | ||
| "; | ||
|
|
||
| var schemaB = $@" | ||
| include ""C.fbs""; | ||
| include ""D.fbs""; | ||
| namespace Foobar; | ||
| table B {{ TableC:C; TableD:D; }} | ||
| "; | ||
|
|
||
| var schemaC = $@" | ||
| namespace Foobar; | ||
| table C {{ Value:int32; }} | ||
| "; | ||
|
|
||
| var schemaD = $@" | ||
| namespace Foobar; | ||
| table D {{ Value:int32; }} | ||
| "; | ||
|
|
||
| var schemas = new[] | ||
| { | ||
| (@"Baz\D.fbs", schemaD), | ||
| (@"Bar\C.fbs", schemaC), | ||
| (@"Foo\B.fbs", schemaB), | ||
| (@"A.fbs", schemaA), | ||
| }; | ||
|
|
||
| var assemblies = FlatSharpCompiler.CompileAndLoadAssemblies(schemas, new() { IncludesDirectory = "Bar;Baz" }); | ||
|
|
||
| UsingAssemblies(assemblies, () => | ||
| { | ||
| Type aType = assemblies[3].GetType("Foobar.A"); | ||
| Type bType = assemblies[2].GetType("Foobar.B"); | ||
| Type cType = assemblies[1].GetType("Foobar.C"); | ||
| Type dType = assemblies[0].GetType("Foobar.D"); | ||
| PropertyInfo tableB = aType.GetProperty("TableB"); | ||
| PropertyInfo tableC = bType.GetProperty("TableC"); | ||
| PropertyInfo tableD = bType.GetProperty("TableD"); | ||
| Assert.Equal(bType, tableB.PropertyType); | ||
| Assert.Equal(cType, tableC.PropertyType); | ||
| Assert.Equal(dType, tableD.PropertyType); | ||
| var compiled = CompilerTestHelpers.CompilerTestSerializer.Compile(aType); | ||
| byte[] data = new byte[100]; | ||
| compiled.Write(data, Activator.CreateInstance(aType)); | ||
| compiled.Parse(data); | ||
| }); | ||
| } | ||
|
|
||
| private void UsingAssemblies(IEnumerable<Assembly> assemblies, Action action) | ||
| { | ||
| ResolveEventHandler handler = (s, e) => | ||
| assemblies.FirstOrDefault(asm => asm.GetName().Name == new AssemblyName(e.Name).Name); | ||
|
|
||
| try | ||
| { | ||
| AppDomain.CurrentDomain.AssemblyResolve += handler; | ||
| action.Invoke(); | ||
| } | ||
| finally | ||
| { | ||
| AppDomain.CurrentDomain.AssemblyResolve -= handler; | ||
| } | ||
| } | ||
| } |