Skip to content

Commit

Permalink
Merge pull request #128 from AIexandrKotov/hotfix
Browse files Browse the repository at this point in the history
0.8.1
  • Loading branch information
AIexandrKotov authored Jun 22, 2024
2 parents ff0d575 + 065fec6 commit aea808f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
6 changes: 4 additions & 2 deletions SLThree/SLThree.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<RepositoryType>git</RepositoryType>
<PackageTags>language;scripts;script-lang</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>0.8.1</Version>
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/docs/versions/0.8.0"))</PackageReleaseNotes>
<Version>0.8.2</Version>
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/docs/versions/0.8.1"))</PackageReleaseNotes>
<PackageReadmeFile>nugetreadme.md</PackageReadmeFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
Expand Down Expand Up @@ -42,6 +42,7 @@
<None Remove="docs\specification" />
<None Remove="docs\versions\0.7.1" />
<None Remove="docs\versions\0.8.0" />
<None Remove="docs\versions\0.8.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pegasus" Version="4.1.0" />
Expand All @@ -63,6 +64,7 @@
<EmbeddedResource Include="docs\versions\0.7.0" />
<EmbeddedResource Include="docs\versions\0.7.1" />
<EmbeddedResource Include="docs\versions\0.8.0" />
<EmbeddedResource Include="docs\versions\0.8.1" />
</ItemGroup>
<ItemGroup>
<None Include="docs\nugetreadme.md">
Expand Down
3 changes: 3 additions & 0 deletions SLThree/docs/versions/0.8.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
------ 0.8.1 Patch ------ [22.06.24]
Bugfixes:
- Restored if without else statement (#127)
2 changes: 1 addition & 1 deletion SLThree/syntax.peg
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ condition_statement <ConditionExpression>
= expr:condition_expression _ ";" { expr }
/ "if" _ "(" _ cond:expression _ ")" _ t:statement _ "else" _ f:statement { new ConditionExpression(cond, GetListStatement(t), GetListStatement(f), state) }
/ condition_expression_1
/ "if" _ "(" _ cond:expression _ ")" _ t:block_statement { new ConditionExpression(cond, GetListStatement(t), new StatementList(new BaseStatement[0], state), state) }
/ "if" _ "(" _ cond:expression _ ")" _ t:statement { new ConditionExpression(cond, GetListStatement(t), new StatementList(new BaseStatement[0], state), state) }
/ "if" _ "(" _ ")" _ block_statement? { Panic<ConditionExpression>(new SyntaxError("Empty condition", state)) }

condition_expression <ConditionExpression>
Expand Down
1 change: 1 addition & 0 deletions test/executing/__bugs/#127.slt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
if (true) return 2;

0 comments on commit aea808f

Please sign in to comment.