OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added 'null' token to the ZScript parser which is needed for null pointers.

Browse source 
- removed function declaration parser from DECORATE because it is not needed anymore.
- fixed: comparison operators could not handle names.
This commit is contained in:
Christoph Oelckers 2016-10-19 00:35:34 +02:00
commit 665d752686
7 changed files with 23 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/scripting/codegeneration/codegen.cpp
View file

@ -1888,16 +1888,20 @@ bool FxBinary::ResolveLR(FCompileContext& ctx, bool castnumeric)
{
ValueType = TypeBool;
}
else if (left->ValueType == TypeName && right->ValueType == TypeName)
{
ValueType = TypeName;
}
else if (left->IsNumeric() && right->IsNumeric())
{
if (left->ValueType->GetRegType() == REGT_INT && right->ValueType->GetRegType() == REGT_INT)
{
ValueType = TypeSInt32;
}
if (left->ValueType->GetRegType() == REGT_INT && right->ValueType->GetRegType() == REGT_INT)
{
ValueType = TypeSInt32;
}
else
{
ValueType = TypeFloat64;
}
{
ValueType = TypeFloat64;
}
}
else if (left->ValueType->GetRegType() == REGT_POINTER && left->ValueType == right->ValueType)
{
@ -2395,7 +2399,7 @@ FxExpression *FxCompareEq::Resolve(FCompileContext& ctx)
return NULL;
}
if (!IsNumeric() && !IsPointer())
if (!IsNumeric() && !IsPointer() && ValueType != TypeName)
{
ScriptPosition.Message(MSG_ERROR, "Numeric type expected");
delete this;