icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup undef

Browse Source
This commit is contained in:
gnembon committed 2019-11-22 00:23:50 -04:00
1 parent 24c1ee8d3d
commit 6413c17657
5 files changed
+63 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/Expression.java
+32 -10
View File
@@ -2864,26 +2864,48 @@ public class Expression implements Cloneable
addLazyFunction("undef", 1, (c, t, lv) ->
{
String varname = lv.get(0).evalValue(c).getString();
if (varname.startsWith("_"))
throw new InternalExpressionException("Cannot replace local built-in variables, i.e. those that start with '_'");
if (varname.endsWith("*"))
Value remove = lv.get(0).evalValue(c);
if (remove instanceof FunctionValue)
{
c.host.delFunction(remove.getString());
return (cc, tt) -> Value.NULL;
}
String varname = remove.getString();
boolean isPrefix = varname.endsWith("*");
if (isPrefix)
varname = varname.replaceAll("\\*+$", "");
if (isPrefix)
{
for (String key: c.host.globalFunctions.keySet())
{
if (key.startsWith(varname)) c.host.globalFunctions.remove(key);
if (key.startsWith(varname)) c.host.delFunction(key);
}
for (String key: c.host.globalVariables.keySet())
if (varname.startsWith("global_"))
{
if (key.startsWith(varname)) c.host.globalVariables.remove(key);
for (String key : c.host.globalVariables.keySet())
{
if (key.startsWith(varname)) c.host.delGlobalVariable(key);
}
}
if (!varname.startsWith("_"))
{
for (String key : c.variables.keySet())
{
if (key.startsWith(varname)) c.delVariable(key);
}
}
c.clearAll(varname);
}
else
{
c.host.globalFunctions.remove(varname);
c.delVariable(varname);
c.host.delFunction(varname);
if (varname.startsWith("global_"))
{
c.host.delGlobalVariable(varname);
}
if (!varname.startsWith("_"))
{
c.delVariable(varname);
}
}
return (cc, tt) -> Value.NULL;
});