Skip to content

Commit

Permalink
Mostly mindless s/Construct/Mixed replacement is done.
Browse files Browse the repository at this point in the history
Need to fix the remaining compile errors individually.
  • Loading branch information
LadyCailin committed Nov 15, 2018
1 parent 370cda3 commit 224b8d2
Show file tree
Hide file tree
Showing 54 changed files with 1,104 additions and 1,098 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import com.laytonsmith.core.constructs.CClosure; import com.laytonsmith.core.constructs.CClosure;
import com.laytonsmith.core.constructs.CString; import com.laytonsmith.core.constructs.CString;
import com.laytonsmith.core.constructs.CVoid; import com.laytonsmith.core.constructs.CVoid;
import com.laytonsmith.core.constructs.Construct;
import com.laytonsmith.core.constructs.IVariable; import com.laytonsmith.core.constructs.IVariable;
import com.laytonsmith.core.constructs.IVariableList; import com.laytonsmith.core.constructs.IVariableList;
import com.laytonsmith.core.constructs.Target; import com.laytonsmith.core.constructs.Target;
import com.laytonsmith.core.environments.Environment; import com.laytonsmith.core.environments.Environment;
import com.laytonsmith.core.exceptions.ConfigCompileException; import com.laytonsmith.core.exceptions.ConfigCompileException;
import com.laytonsmith.core.exceptions.ConfigRuntimeException; import com.laytonsmith.core.exceptions.ConfigRuntimeException;
import com.laytonsmith.core.natives.interfaces.Mixed;
import com.laytonsmith.core.snapins.PackagePermission; import com.laytonsmith.core.snapins.PackagePermission;
import com.laytonsmith.tools.docgen.DocGenTemplates; import com.laytonsmith.tools.docgen.DocGenTemplates;
import com.laytonsmith.tools.docgen.DocGenTemplates.Generator.GenerateException; import com.laytonsmith.tools.docgen.DocGenTemplates.Generator.GenerateException;
Expand Down Expand Up @@ -51,7 +51,7 @@ protected AbstractFunction() {
* @return * @return
*/ */
@Override @Override
public Construct execs(Target t, Environment env, Script parent, ParseTree... nodes) { public Mixed execs(Target t, Environment env, Script parent, ParseTree... nodes) {
return CVoid.VOID; return CVoid.VOID;
} }


Expand Down Expand Up @@ -83,7 +83,7 @@ public final boolean appearInDocumentation() {
* @param args * @param args
* @return * @return
*/ */
public Construct optimize(Target t, Construct... args) throws ConfigCompileException { public Mixed optimize(Target t, Mixed... args) throws ConfigCompileException {
return null; return null;
} }


Expand Down Expand Up @@ -134,18 +134,18 @@ public LogLevel profileAt() {
} }


@Override @Override
public String profileMessage(Construct... args) { public String profileMessage(Mixed... args) {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
boolean first = true; boolean first = true;
for(Construct ccc : args) { for(Mixed ccc : args) {
if(!first) { if(!first) {
b.append(", "); b.append(", ");
} }
first = false; first = false;
if(ccc instanceof CArray) { if(ccc instanceof CArray) {
//Arrays take too long to toString, so we don't want to actually toString them here if //Arrays take too long to toString, so we don't want to actually toString them here if
//we don't need to. //we don't need to.
b.append("<arrayNotShown size:" + ((CArray) ccc).size() + ">"); b.append("<arrayNotShown size:").append(((CArray) ccc).size()).append(">");
} else if(ccc instanceof CClosure) { } else if(ccc instanceof CClosure) {
//The toString of a closure is too long, so let's not output them either. //The toString of a closure is too long, so let's not output them either.
b.append("<closureNotShown>"); b.append("<closureNotShown>");
Expand Down
Loading

0 comments on commit 224b8d2

Please sign in to comment.