Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Table remove by negative fix #132

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Table remove by negative fix #132

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9014d04
this check causes bug : this statement is always false for negative "…
Mar 11, 2016
fbc3aa8
Table module now throws exception when you try to pass something else…
Mar 11, 2016
7707b35
even closer to real behaviour : added case to table.remove(table, nil)
Mar 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions src/MoonSharp.Interpreter/CoreLib/TableModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,30 +170,41 @@ public static DynValue insert(ScriptExecutionContext executionContext, CallbackA
public static DynValue remove(ScriptExecutionContext executionContext, CallbackArguments args)
{
DynValue vlist = args.AsType(0, "table.remove", DataType.Table, false);
DynValue vpos = args.AsType(1, "table.remove", DataType.Number, true);
DynValue ret = DynValue.Nil;

if (args.Count > 2)
throw new ScriptRuntimeException("wrong number of arguments to 'remove'");
switch (args[1].Type)
{
case DataType.Nil:
return DynValue.NewString("");

int len = GetTableLength(executionContext, vlist);
Table list = vlist.Table;
default:
throw new ScriptRuntimeException(string.Format("bad argument #2 to 'remove' (number expected, got {0})", args[1].Type.ToLuaTypeString()));

int pos = vpos.IsNil() ? len : (int)vpos.Number;
case DataType.Number:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

> a = { 10, 15, 20, 25, 30 }

> table.remove(a,1)
10

> table.remove(a,"fifty")
stdin:1: bad argument #2 to 'remove' (number expected, got string)

> table.remove(a,"15")
stdin:1: bad argument #1 to 'remove' (position out of bounds)

> table.remove(a,"1")
15

DynValue vpos = args.AsType(1, "table.remove", DataType.Number, true);
DynValue ret = DynValue.Nil;

if (pos >= len + 1 || (pos < 1 && len > 0))
throw new ScriptRuntimeException("bad argument #1 to 'remove' (position out of bounds)");
if (args.Count > 2)
throw new ScriptRuntimeException("wrong number of arguments to 'remove'");

for (int i = pos; i <= len; i++)
{
if (i == pos)
ret = list.Get(i);
int len = GetTableLength(executionContext, vlist);
Table list = vlist.Table;

list.Set(i, list.Get(i + 1));
}
int pos = vpos.IsNil() ? len : (int)vpos.Number;

return ret;
}
if (pos >= len + 1 || (pos < 0) || (pos == 0 && len > 0 /*this odd behaviour also occur in pure lua - don't throw exception if we try to delete 0 index of empty table(!)*/))
throw new ScriptRuntimeException("bad argument #1 to 'remove' (position out of bounds)");

for (int i = pos; i <= len; i++)
{
if (i == pos)
ret = list.Get(i);

list.Set(i, list.Get(i + 1));
}

return ret;
}
}


//table.concat (list [, sep [, i [, j]]])
Expand Down