Skip to content

Commit 4bc152b

Browse files
committed
Fix unit-test failures.
1 parent 005f078 commit 4bc152b

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

ServerCodeExciserTest/Problems/Common/DeclarationInFunctionRootScopeWithReturnValTest.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class UDeclarationInFunctionRootScopeWithReturnValTest
5050
{
5151
ensure(System::IsServer());
5252

53-
float64 ThisMustBeGuarded = 0.0f;
53+
float64 ThisMustBeGuarded = 0.0;
5454
ThisMustBeGuarded--;
5555

5656
return ThisMustBeGuarded;

UnrealAngelscriptServerCodeExcision/UnrealAngelscriptSimpleVisitor.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,21 @@ protected EReturnType GetDefaultReturnStatementForReturnType(UnrealAngelscriptPa
168168
// No, it was just a simple type, we'll use default values!
169169
switch (simpleTypeContext.GetText())
170170
{
171-
case "float": { defaultReturnStatement = "return 0.0f;"; break; }
172-
case "double": { defaultReturnStatement = "return 0.0;"; break; }
173-
case "bool": { defaultReturnStatement = "return false;"; break; }
174-
171+
case "bool":
172+
defaultReturnStatement = "return false;";
173+
break;
174+
case "float":
175+
case "float32":
176+
defaultReturnStatement = "return 0.0f;";
177+
break;
178+
case "double":
179+
case "float64":
180+
defaultReturnStatement = "return 0.0;";
181+
break;
175182
default:
176-
{
177183
// All kinds of different ints :)
178184
defaultReturnStatement = "return 0;";
179185
break;
180-
}
181186
}
182187
}
183188

UnrealAngelscriptServerCodeExcision/UnrealAngelscriptSymbolVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public override UnrealAngelscriptNode VisitPostfixExpression(UnrealAngelscriptPa
264264

265265
// We need to correct the start index to skip all the possible empty characters/new lines,
266266
// if not we can miss the detection of a manually placed #ifdef
267-
newData.StartIndex = ExcisionUtils.ShrinkServerScope(Script, newData.StartIndex, newData.StopIndex);
267+
//newData.StartIndex = ExcisionUtils.ShrinkServerScope(Script, newData.StartIndex, newData.StopIndex);
268268

269269
if (returnData.ReturnType != EReturnType.NoReturn)
270270
{

0 commit comments

Comments
 (0)