Fix image constructor argument handling #1479
Conversation
There was a problem hiding this comment.
Playing around with argument skipping in /image's constructor won't work.
When named arguments are used, the VM places the named arguments in their positional order. Once you're in the constructor you have no way of knowing if positional arguments were used and you have to skip an arg, or if named arguments were used and skipping an arg will result in incorrect values.
image('icon.dmi', "state", FLOAT_LAYER, EAST)
gives you the args 0='icon.dmi' 1="state" 2=FLOAT_LAYER 3=EAST 4..6=null
image('icon.dmi', "state", layer=FLOAT_LAYER, dir=EAST)
gives you 0='icon.dmi' 1="state" 2=null 3=FLOAT_LAYER 4=EAST 5..6=null
Both of them have a string in the second spot. However, the first one skips an arg but the second does not.
This will probably have to be special-cased in the VM. That or extra type-guessing that I don't think BYOND does.
| argIndex = 2; | ||
| if (!loc.TryGetValueAsDreamObject(out _loc)) { // If it's not a DreamObject, it's actually icon_state and not loc | ||
| startIndex = 1; | ||
| if (!loc.IsNull) { |
There was a problem hiding this comment.
loc.IsNull will always be false here because TryGetValueAsDreamObject() will return true for a null object.
| if (loc.TryGetValueAsDreamObject(out _loc)) { // If it's not a DreamObject, it's actually icon_state and not loc | ||
| argIndex = 2; | ||
| if (!loc.TryGetValueAsDreamObject(out _loc)) { // If it's not a DreamObject, it's actually icon_state and not loc | ||
| startIndex = 1; |
There was a problem hiding this comment.
This ends up skipping the 3rd argument
|
Closing in favor of #1627 |
Before, it would always set
icon_stateto the corresponding argument even ificon_statewas set byloc. Now, it properly skips it.