Skip to content

Commit

Permalink
Moved YarnCompiler module to yarnflow.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pigpigyyy
pigpigyyy committed Feb 25, 2025
1 parent caddb24 commit eec3d98
Show file tree
Hide file tree
Showing 11 changed files with 305 additions and 282 deletions.
457 changes: 233 additions & 224 deletions Assets/Script/Lib/YarnRunner.lua
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Assets/Script/Lib/YarnRunner.yue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ class YarnRunner
storyFunc = @funcs[title]
unless storyFunc
yarnCode = @codes[title]
unless yarnCode
err = "node \"#{title}\" is not exist"
if @startTitle
return false, err
else
coroutine.yield "Error", err
return
luaCode, err = yarncompile yarnCode
unless luaCode
if @startTitle
Expand Down
2 changes: 1 addition & 1 deletion Projects/Android/Dora/app/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ add_library(main SHARED
src/main/cpp/Lua/ToLua/tolua_is.cpp
src/main/cpp/Lua/Xml/DoraTag.cpp
src/main/cpp/Lua/Xml/XmlResolver.cpp
src/main/cpp/Lua/Yarn/YarnCompiler.cpp
src/main/cpp/Test/Test.cpp
src/main/cpp/Test/HelloWorldCpp.cpp
src/main/cpp/3rdParty/yuescript/yue_compiler.cpp
Expand All @@ -188,6 +187,7 @@ add_library(main SHARED
src/main/cpp/3rdParty/yuescript/yue_parser.cpp
src/main/cpp/3rdParty/yuescript/yuescript.cpp
src/main/cpp/3rdParty/yuescript/parser.cpp
src/main/cpp/3rdParty/yarnflow/yarn_compiler.cpp
src/main/cpp/3rdParty/implot/implot.cpp
src/main/cpp/3rdParty/implot/implot_items.cpp
src/main/cpp/3rdParty/implot/implot_demo.cpp
Expand Down
2 changes: 1 addition & 1 deletion Projects/Linux/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ add_executable(dora-ssr
../../Source/Lua/ToLua/tolua_is.cpp
../../Source/Lua/Xml/DoraTag.cpp
../../Source/Lua/Xml/XmlResolver.cpp
../../Source/Lua/Yarn/YarnCompiler.cpp
../../Source/Test/Test.cpp
../../Source/Test/HelloWorldCpp.cpp
../../Source/3rdParty/yuescript/yue_compiler.cpp
Expand All @@ -183,6 +182,7 @@ add_executable(dora-ssr
../../Source/3rdParty/yuescript/yue_parser.cpp
../../Source/3rdParty/yuescript/yuescript.cpp
../../Source/3rdParty/yuescript/parser.cpp
../../Source/3rdParty/yarnflow/yarn_compiler.cpp
../../Source/3rdParty/implot/implot.cpp
../../Source/3rdParty/implot/implot_items.cpp
../../Source/3rdParty/implot/implot_demo.cpp
Expand Down
7 changes: 5 additions & 2 deletions Projects/Windows/Dora/Dora.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,10 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\Source\3rdParty\yarnflow\yarn_compiler.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\Source\3rdParty\yoga\algorithm\AbsoluteLayout.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
Expand Down Expand Up @@ -1776,7 +1780,6 @@
<ClCompile Include="..\..\..\Source\Lua\ToLua\tolua_to.cpp" />
<ClCompile Include="..\..\..\Source\Lua\Xml\DoraTag.cpp" />
<ClCompile Include="..\..\..\Source\Lua\Xml\XmlResolver.cpp" />
<ClCompile Include="..\..\..\Source\Lua\Yarn\YarnCompiler.cpp" />
<ClCompile Include="..\..\..\Source\ML\ML.cpp" />
<ClCompile Include="..\..\..\Source\Node\AlignNode.cpp" />
<ClCompile Include="..\..\..\Source\Node\ClipNode.cpp" />
Expand Down Expand Up @@ -2447,6 +2450,7 @@
<ClInclude Include="..\..\..\Source\3rdParty\wasm3\wasm3.h" />
<ClInclude Include="..\..\..\Source\3rdParty\wasm3\wasm3_cpp.h" />
<ClInclude Include="..\..\..\Source\3rdParty\wasm3\wasm3_defs.h" />
<ClInclude Include="..\..\..\Source\3rdParty\yarnflow\yarn_compiler.h" />
<ClInclude Include="..\..\..\Source\3rdParty\yoga\algorithm\AbsoluteLayout.h" />
<ClInclude Include="..\..\..\Source\3rdParty\yoga\algorithm\Align.h" />
<ClInclude Include="..\..\..\Source\3rdParty\yoga\algorithm\Baseline.h" />
Expand Down Expand Up @@ -2581,7 +2585,6 @@
<ClInclude Include="..\..\..\Source\Lua\Xml\DoraTag.h" />
<ClInclude Include="..\..\..\Source\Lua\Xml\DoraTagText.hpp" />
<ClInclude Include="..\..\..\Source\Lua\Xml\XmlResolver.h" />
<ClInclude Include="..\..\..\Source\Lua\Yarn\YarnCompiler.h" />
<ClInclude Include="..\..\..\Source\ML\ML.h" />
<ClInclude Include="..\..\..\Source\Node\AlignNode.h" />
<ClInclude Include="..\..\..\Source\Node\ClipNode.h" />
Expand Down
18 changes: 9 additions & 9 deletions Projects/Windows/Dora/Dora.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,6 @@
<Filter Include="Lua\Xml">
<UniqueIdentifier>{0103014a-643f-4f1c-83c2-7f0593043ea4}</UniqueIdentifier>
</Filter>
<Filter Include="Lua\Yarn">
<UniqueIdentifier>{6a97e199-f34a-4842-9583-d63dbc7d146d}</UniqueIdentifier>
</Filter>
<Filter Include="3rdParty\playrho">
<UniqueIdentifier>{56b26ce6-81c4-418e-bcad-05697cd94a25}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -331,6 +328,9 @@
<Filter Include="3rdParty\nfd">
<UniqueIdentifier>{eed2b039-f653-4258-8fe3-ab9a8c84399d}</UniqueIdentifier>
</Filter>
<Filter Include="3rdParty\yarnflow">
<UniqueIdentifier>{793abd5f-da71-4806-aa5e-b27b9e514e5b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Source\3rdParty\silly\Slice.cpp">
Expand Down Expand Up @@ -1134,9 +1134,6 @@
<ClCompile Include="..\..\..\Source\Lua\Xml\XmlResolver.cpp">
<Filter>Lua\Xml</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\Lua\Yarn\YarnCompiler.cpp">
<Filter>Lua\Yarn</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\3rdParty\yuescript\yue_ast.cpp">
<Filter>3rdParty\yuescript</Filter>
</ClCompile>
Expand Down Expand Up @@ -1950,6 +1947,9 @@
<ClCompile Include="..\..\..\Source\3rdParty\nfd\nfd_win.cpp">
<Filter>3rdParty\nfd</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\3rdParty\yarnflow\yarn_compiler.cpp">
<Filter>3rdParty\yarnflow</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Source\3rdParty\silly\Slice.h">
Expand Down Expand Up @@ -2825,9 +2825,6 @@
<ClInclude Include="..\..\..\Source\Lua\Xml\XmlResolver.h">
<Filter>Lua\Xml</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\Lua\Yarn\YarnCompiler.h">
<Filter>Lua\Yarn</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\3rdParty\playrho\d2\part\Compositor.hpp">
<Filter>3rdParty\playrho\d2\part</Filter>
</ClInclude>
Expand Down Expand Up @@ -4329,6 +4326,9 @@
<ClInclude Include="..\..\..\Source\3rdParty\nfd\nfd.hpp">
<Filter>3rdParty\nfd</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\3rdParty\yarnflow\yarn_compiler.h">
<Filter>3rdParty\yarnflow</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Resource.rc">
Expand Down
32 changes: 16 additions & 16 deletions Projects/iOS/Dora.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@
3C0FB71A2BF1970C0098E88D /* VertexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0FB6762BF1970C0098E88D /* VertexBuffer.cpp */; };
3C0FB71B2BF1970C0098E88D /* bgfxrenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0FB6792BF1970C0098E88D /* bgfxrenderer.cpp */; };
3C0FB71C2BF1970C0098E88D /* bgfxrenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0FB6792BF1970C0098E88D /* bgfxrenderer.cpp */; };
3C12442E2D6D9A3800FD1346 /* yarn_compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12442C2D6D9A3800FD1346 /* yarn_compiler.cpp */; };
3C12442F2D6D9A3800FD1346 /* yarn_compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12442C2D6D9A3800FD1346 /* yarn_compiler.cpp */; };
3C1F87C91DF7B4C5005F1B4D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C1F87C81DF7B4C5005F1B4D /* AVFoundation.framework */; };
3C361E532C1AFF400079B68B /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C361E392C1AFF400079B68B /* pugixml.cpp */; };
3C361E542C1AFF400079B68B /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C361E392C1AFF400079B68B /* pugixml.cpp */; };
Expand Down Expand Up @@ -732,7 +734,6 @@
3C59316D2CA4F67300CAF224 /* Bullet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930632CA4F67300CAF224 /* Bullet.cpp */; };
3C59316E2CA4F67300CAF224 /* MemoryPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FD92CA4F67300CAF224 /* MemoryPool.cpp */; };
3C59316F2CA4F67300CAF224 /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FBB2CA4F67300CAF224 /* Cache.cpp */; };
3C5931702CA4F67300CAF224 /* YarnCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C59301C2CA4F67300CAF224 /* YarnCompiler.cpp */; };
3C5931712CA4F67300CAF224 /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930EB2CA4F67300CAF224 /* Test.cpp */; };
3C5931722CA4F67300CAF224 /* EventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FF02CA4F67300CAF224 /* EventQueue.cpp */; };
3C5931732CA4F67300CAF224 /* Particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930432CA4F67300CAF224 /* Particle.cpp */; };
Expand Down Expand Up @@ -843,7 +844,6 @@
3C59324A2CA4F67300CAF224 /* Bullet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930632CA4F67300CAF224 /* Bullet.cpp */; };
3C59324B2CA4F67300CAF224 /* MemoryPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FD92CA4F67300CAF224 /* MemoryPool.cpp */; };
3C59324C2CA4F67300CAF224 /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FBB2CA4F67300CAF224 /* Cache.cpp */; };
3C59324D2CA4F67300CAF224 /* YarnCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C59301C2CA4F67300CAF224 /* YarnCompiler.cpp */; };
3C59324E2CA4F67300CAF224 /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930EB2CA4F67300CAF224 /* Test.cpp */; };
3C59324F2CA4F67300CAF224 /* EventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C592FF02CA4F67300CAF224 /* EventQueue.cpp */; };
3C5932502CA4F67300CAF224 /* Particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C5930432CA4F67300CAF224 /* Particle.cpp */; };
Expand Down Expand Up @@ -1405,6 +1405,8 @@
3C0FB67D2BF1970C0098E88D /* Effekseer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Effekseer.h; sourceTree = "<group>"; };
3C0FB67E2BF1970C0098E88D /* Effekseer.Modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Effekseer.Modules.h; sourceTree = "<group>"; };
3C0FB67F2BF1970C0098E88D /* Effekseer.SIMD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Effekseer.SIMD.h; sourceTree = "<group>"; };
3C12442B2D6D9A3800FD1346 /* yarn_compiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = yarn_compiler.h; sourceTree = "<group>"; };
3C12442C2D6D9A3800FD1346 /* yarn_compiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = yarn_compiler.cpp; sourceTree = "<group>"; };
3C1D41002703019800202534 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Dora/Assets.xcassets; sourceTree = "<group>"; };
3C1F87C81DF7B4C5005F1B4D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
3C329DDD2B39D8AC002BC023 /* Dora.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dora.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2133,8 +2135,6 @@
3C5930172CA4F67300CAF224 /* DoraTagText.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DoraTagText.hpp; sourceTree = "<group>"; };
3C5930182CA4F67300CAF224 /* XmlResolver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XmlResolver.h; sourceTree = "<group>"; };
3C5930192CA4F67300CAF224 /* XmlResolver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = XmlResolver.cpp; sourceTree = "<group>"; };
3C59301B2CA4F67300CAF224 /* YarnCompiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YarnCompiler.h; sourceTree = "<group>"; };
3C59301C2CA4F67300CAF224 /* YarnCompiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = YarnCompiler.cpp; sourceTree = "<group>"; };
3C59301E2CA4F67300CAF224 /* LuaBinding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LuaBinding.h; sourceTree = "<group>"; };
3C59301F2CA4F67300CAF224 /* LuaBinding.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LuaBinding.cpp; sourceTree = "<group>"; };
3C5930202CA4F67300CAF224 /* LuaCode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LuaCode.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3014,6 +3014,15 @@
path = Effekseer;
sourceTree = "<group>";
};
3C12442D2D6D9A3800FD1346 /* yarnflow */ = {
isa = PBXGroup;
children = (
3C12442B2D6D9A3800FD1346 /* yarn_compiler.h */,
3C12442C2D6D9A3800FD1346 /* yarn_compiler.cpp */,
);
path = yarnflow;
sourceTree = "<group>";
};
3C1676B42212C0FD00892CD4 /* playrho */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4157,22 +4166,12 @@
path = Xml;
sourceTree = "<group>";
};
3C59301D2CA4F67300CAF224 /* Yarn */ = {
isa = PBXGroup;
children = (
3C59301B2CA4F67300CAF224 /* YarnCompiler.h */,
3C59301C2CA4F67300CAF224 /* YarnCompiler.cpp */,
);
path = Yarn;
sourceTree = "<group>";
};
3C59302A2CA4F67300CAF224 /* Lua */ = {
isa = PBXGroup;
children = (
3C59300B2CA4F67300CAF224 /* Builtin */,
3C5930142CA4F67300CAF224 /* ToLua */,
3C59301A2CA4F67300CAF224 /* Xml */,
3C59301D2CA4F67300CAF224 /* Yarn */,
3C59301E2CA4F67300CAF224 /* LuaBinding.h */,
3C59301F2CA4F67300CAF224 /* LuaBinding.cpp */,
3C5930202CA4F67300CAF224 /* LuaCode.cpp */,
Expand Down Expand Up @@ -4700,6 +4699,7 @@
3CFEA12D285B8706002D106F /* wasm3 */,
3C41D60721490CCD003FDDFE /* nanovg */,
3C25B863257A7F71002DD8E1 /* yuescript */,
3C12442D2D6D9A3800FD1346 /* yarnflow */,
3CB410351E05B17F00A8804D /* Zip */,
3CB410231E05B0A200A8804D /* silly */,
);
Expand Down Expand Up @@ -5429,7 +5429,6 @@
3C59324A2CA4F67300CAF224 /* Bullet.cpp in Sources */,
3C59324B2CA4F67300CAF224 /* MemoryPool.cpp in Sources */,
3C59324C2CA4F67300CAF224 /* Cache.cpp in Sources */,
3C59324D2CA4F67300CAF224 /* YarnCompiler.cpp in Sources */,
3C59324E2CA4F67300CAF224 /* Test.cpp in Sources */,
3C59324F2CA4F67300CAF224 /* EventQueue.cpp in Sources */,
3C5932502CA4F67300CAF224 /* Particle.cpp in Sources */,
Expand Down Expand Up @@ -5481,6 +5480,7 @@
3C59327E2CA4F67300CAF224 /* Playable.cpp in Sources */,
3C59327F2CA4F67300CAF224 /* VGNode.cpp in Sources */,
3C5932802CA4F67300CAF224 /* Sound.cpp in Sources */,
3C12442E2D6D9A3800FD1346 /* yarn_compiler.cpp in Sources */,
3C5932812CA4F67300CAF224 /* tolua_map.cpp in Sources */,
3C5932822CA4F67300CAF224 /* Content.cpp in Sources */,
3C5932832CA4F67300CAF224 /* Content.mm in Sources */,
Expand Down Expand Up @@ -5978,7 +5978,6 @@
3C59316D2CA4F67300CAF224 /* Bullet.cpp in Sources */,
3C59316E2CA4F67300CAF224 /* MemoryPool.cpp in Sources */,
3C59316F2CA4F67300CAF224 /* Cache.cpp in Sources */,
3C5931702CA4F67300CAF224 /* YarnCompiler.cpp in Sources */,
3C5931712CA4F67300CAF224 /* Test.cpp in Sources */,
3C5931722CA4F67300CAF224 /* EventQueue.cpp in Sources */,
3C5931732CA4F67300CAF224 /* Particle.cpp in Sources */,
Expand Down Expand Up @@ -6030,6 +6029,7 @@
3C5931A12CA4F67300CAF224 /* Playable.cpp in Sources */,
3C5931A22CA4F67300CAF224 /* VGNode.cpp in Sources */,
3C5931A32CA4F67300CAF224 /* Sound.cpp in Sources */,
3C12442F2D6D9A3800FD1346 /* yarn_compiler.cpp in Sources */,
3C5931A42CA4F67300CAF224 /* tolua_map.cpp in Sources */,
3C5931A52CA4F67300CAF224 /* Content.cpp in Sources */,
3C5931A62CA4F67300CAF224 /* Content.mm in Sources */,
Expand Down
Loading

0 comments on commit eec3d98

Please sign in to comment.