Skip to content

Commit 7007c0f

Browse files
committed
Merge branch 'ScriptMode'
2 parents f52e05d + b9b7498 commit 7007c0f

File tree

10 files changed

+894
-603
lines changed

10 files changed

+894
-603
lines changed

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<WarningLevel>4</WarningLevel>
4141
</PropertyGroup>
4242
<ItemGroup>
43+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
</Reference>
4346
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
4447
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
4548
</Reference>
@@ -107,6 +110,12 @@
107110
<ItemGroup>
108111
<None Include="Resources\Script0010.txt" />
109112
</ItemGroup>
113+
<ItemGroup>
114+
<None Include="Resources\Script0011.txt" />
115+
</ItemGroup>
116+
<ItemGroup>
117+
<None Include="Resources\Script0012.txt" />
118+
</ItemGroup>
110119
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
111120
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112121
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

Lines changed: 637 additions & 504 deletions
Large diffs are not rendered by default.

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

Lines changed: 52 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,10 @@
148148
<data name="Script0010" type="System.Resources.ResXFileRef, System.Windows.Forms">
149149
<value>resources\script0010.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
150150
</data>
151+
<data name="Script0011" type="System.Resources.ResXFileRef, System.Windows.Forms">
152+
<value>resources\script0011.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
153+
</data>
154+
<data name="Script0012" type="System.Resources.ResXFileRef, System.Windows.Forms">
155+
<value>resources\script0012.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
156+
</data>
151157
</root>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* Script0011 */
2+
list = List(5,5,5,5,5,5,5,5,5,5,5);
3+
4+
list[0] = 8;
5+
list[1] += 6;
6+
list[2] -= 2;
7+
list[3] *= 3;
8+
list[4] /= 2;
9+
list[5] %= 2;
10+
list[6] ^= 3;
11+
list[7] &= 3;
12+
list[8] |= 3;
13+
list[9] <<= 2;
14+
list[10] >>=2;
15+
16+
return list.Json;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* Script0012 */
2+
list = List(5,5,5,5,5,5);
3+
4+
list[0]++;
5+
list[1]--;
6+
list[2] += list[3]++;
7+
list[4] += list[5]--;
8+
9+
return list.Json;

CodingSeb.ExpressionEvaluator.Tests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
34
<package id="NUnit" version="3.10.1" targetFramework="net45" />
45
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net45" />
56
<package id="Should" version="1.1.20" targetFramework="net45" />

0 commit comments

Comments
 (0)