Deukhoofd
/
PorygonSharp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed NumericEvalValues always being evaluated as integers.

This commit is contained in:
Deukhoofd 2019-09-22 13:30:54 +02:00
parent 601fec8048
commit 415f03efc3
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PorygonSharp/EvalValues/EvalValue.cs
View File

@ -74,6 +74,9 @@ namespace PorygonSharp.EvalValues
case TypeClass.Nil: case TypeClass.Nil:
return null; return null;
case TypeClass.Number: case TypeClass.Number:
if (IsNumericValueFloat(Handle) == 1)
return EvaluateFloat();
else
return EvaluateInteger(); return EvaluateInteger();
case TypeClass.Bool: case TypeClass.Bool:
return EvaluateBool(); return EvaluateBool();
@ -98,6 +101,10 @@ namespace PorygonSharp.EvalValues
private static extern int GetTypeClass(IntPtr ptr); private static extern int GetTypeClass(IntPtr ptr);
[DllImport("PorygonLang", EntryPoint = "GetEvalValueType", CallingConvention = CallingConvention.Cdecl)] [DllImport("PorygonLang", EntryPoint = "GetEvalValueType", CallingConvention = CallingConvention.Cdecl)]
private static extern IntPtr GetScriptType(IntPtr ptr); private static extern IntPtr GetScriptType(IntPtr ptr);
[DllImport("PorygonLang", EntryPoint = "IsNumericValueFloat", CallingConvention = CallingConvention.Cdecl)]
private static extern byte IsNumericValueFloat(IntPtr ptr);
[DllImport("PorygonLang", EntryPoint = "EvaluateEvalValueInteger", CallingConvention = CallingConvention.Cdecl)] [DllImport("PorygonLang", EntryPoint = "EvaluateEvalValueInteger", CallingConvention = CallingConvention.Cdecl)]
private static extern long EvaluateInteger(IntPtr ptr); private static extern long EvaluateInteger(IntPtr ptr);
[DllImport("PorygonLang", EntryPoint = "EvaluateEvalValueFloat", CallingConvention = CallingConvention.Cdecl)] [DllImport("PorygonLang", EntryPoint = "EvaluateEvalValueFloat", CallingConvention = CallingConvention.Cdecl)]