From 107cf10e35c519f2d567e7d71688a0f911cdfed2 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Fri, 19 Jul 2019 22:21:51 -0700 Subject: [PATCH] fix naming issue in ScriptEntry --- .../denizencore/scripts/ScriptEntry.java | 44 +++++++++---------- .../scripts/commands/CommandExecuter.java | 2 +- .../denizencore/tags/TagManager.java | 4 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java index fe1add0f..0de543b6 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java @@ -34,7 +34,7 @@ public static class ScriptEntryInternal { public List bracedSet = null; - public List args_ref = null; + public List args_ref = null; public ScriptTag script = null; @@ -52,23 +52,23 @@ public static class ScriptEntryInternal { public int[] processArgs = null; - public List preprocArgs = null; + public List preprocArgs = null; public Object specialProcessedData = null; public String originalLine = null; } - public static class Argument { + public static class InternalArgument { - public Argument prefix = null; + public InternalArgument prefix = null; public List value = null; - public com.denizenscript.denizencore.objects.Argument aHArg = null; + public Argument aHArg = null; - public Argument duplicate() { - Argument newArg = new Argument(); + public InternalArgument duplicate() { + InternalArgument newArg = new InternalArgument(); newArg.prefix = prefix == null ? null : prefix.duplicate(); newArg.value = new ArrayList<>(value); newArg.aHArg = aHArg == null ? null : aHArg.clone(); @@ -76,9 +76,9 @@ public Argument duplicate() { } } - public List args_cur = null; + public List args_cur = null; - public List aHArgs = null; + public List aHArgs = null; public List args = null; @@ -103,13 +103,13 @@ public void setBracedSet(List set) { public void regenerateArgsCur() { args_cur = new ArrayList<>(internal.args_ref); for (int i : internal.processArgs) { - Argument arg = args_cur.get(i).duplicate(); + InternalArgument arg = args_cur.get(i).duplicate(); args_cur.set(i, arg); arg.aHArg = aHArgs.get(i); } } - public final static com.denizenscript.denizencore.objects.Argument NULL_ARGUMENT = new com.denizenscript.denizencore.objects.Argument("null_trick", "null_trick"); + public final static Argument NULL_ARGUMENT = new Argument("null_trick", "null_trick"); public void generateAHArgs() { aHArgs = new ArrayList<>(internal.args_ref.size()); @@ -117,7 +117,7 @@ public void generateAHArgs() { aHArgs.add(internal.args_ref.get(i) == null ? NULL_ARGUMENT : internal.args_ref.get(i).aHArg); } for (int i : internal.processArgs) { - Argument arg = internal.args_ref.get(i); + InternalArgument arg = internal.args_ref.get(i); arg.aHArg.scriptEntry = this; aHArgs.set(i, arg.aHArg.needsFill || arg.aHArg.hasSpecialPrefix || (internal.hasOldDefs && arg.aHArg.raw_value.indexOf('%') != -1) ? arg.aHArg.clone() : arg.aHArg); } @@ -150,7 +150,7 @@ public ScriptEntry(String command, String[] arguments, ScriptContainer script) { this(command, arguments, script, null); } - public void crunchInto(Argument argVal, String arg, TagContext refContext) { + public void crunchInto(InternalArgument argVal, String arg, TagContext refContext) { if (arg.indexOf('%') != -1) { internal.hasOldDefs = true; argVal.value = new LinkedList<>(); @@ -177,7 +177,7 @@ public void crunchInto(Argument argVal, String arg, TagContext refContext) { } } } - argVal.aHArg = new com.denizenscript.denizencore.objects.Argument(argVal.prefix == null ? null : argVal.prefix.aHArg.raw_value, arg); + argVal.aHArg = new Argument(argVal.prefix == null ? null : argVal.prefix.aHArg.raw_value, arg); argVal.aHArg.needsFill = isTag; argVal.aHArg.hasSpecialPrefix = argVal.prefix != null; } @@ -241,7 +241,7 @@ else if (command.charAt(0) == '~') { parg = parg.substring(0, parg.length() - 1); Debug.echoError("Command '" + command + "' in script '" + (script == null ? "(None)" : script.getName()) + "' has typo: brace written without space... like 'arg{' when it should be 'arg {'."); } - com.denizenscript.denizencore.objects.Argument argObj = new com.denizenscript.denizencore.objects.Argument(arg); + Argument argObj = new Argument(arg); if (argObj.hasPrefix()) { if (argObj.matchesOnePrefix("unparsed")) { args.add(TagManager.escapeOutput(argObj.getValue())); @@ -273,15 +273,15 @@ else if (argObj.matchesOnePrefix("save") || DenizenCore.getImplementation().need for (int i = 0; i < args.size(); i++) { String arg = args.get(i); if (arg.equals("{")) { - Argument brace = new Argument(); - brace.aHArg = new com.denizenscript.denizencore.objects.Argument("", "{"); + InternalArgument brace = new InternalArgument(); + brace.aHArg = new Argument("", "{"); internal.args_ref.add(brace); nested_depth++; continue; } if (arg.equals("}")) { - Argument brace = new Argument(); - brace.aHArg = new com.denizenscript.denizencore.objects.Argument("", "}"); + InternalArgument brace = new InternalArgument(); + brace.aHArg = new Argument("", "}"); internal.args_ref.add(brace); nested_depth--; continue; @@ -291,11 +291,11 @@ else if (argObj.matchesOnePrefix("save") || DenizenCore.getImplementation().need continue; } tempProcessArgs.add(i); - Argument argVal = new Argument(); + InternalArgument argVal = new InternalArgument(); internal.args_ref.set(i, argVal); int colon = TagManager.findColonNotTagNorSpace(arg); if (colon > 0) { - argVal.prefix = new Argument(); + argVal.prefix = new InternalArgument(); crunchInto(argVal.prefix, arg.substring(0, colon), refContext); arg = arg.substring(colon + 1); } @@ -617,7 +617,7 @@ public String toString() { for (String str : getOriginalArguments()) { sb.append(" \"").append(str.replace("\"", "<&dq>")).append("\""); } - for (com.denizenscript.denizencore.objects.Argument arg : internal.preprocArgs) { + for (Argument arg : internal.preprocArgs) { sb.append(" \"").append(arg.toString().replace("\"", "<&dq>")).append("\""); } return internal.command + sb.toString(); diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandExecuter.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandExecuter.java index 52271365..44307b7a 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandExecuter.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/CommandExecuter.java @@ -78,7 +78,7 @@ public static boolean handleDefs(ScriptEntry scriptEntry, boolean genned) { aharg.needsFill = oldaharg.needsFill || oldaharg.hasSpecialPrefix; aharg.hasSpecialPrefix = false; scriptEntry.aHArgs.set(argId, aharg); - ScriptEntry.Argument argse = scriptEntry.args_cur.get(argId); + ScriptEntry.InternalArgument argse = scriptEntry.args_cur.get(argId); argse.value = TagManager.dupChain(TagManager.genChain(parsed, scriptEntry)); argse.prefix = null; } diff --git a/src/main/java/com/denizenscript/denizencore/tags/TagManager.java b/src/main/java/com/denizenscript/denizencore/tags/TagManager.java index 78336bed..a1f4fede 100644 --- a/src/main/java/com/denizenscript/denizencore/tags/TagManager.java +++ b/src/main/java/com/denizenscript/denizencore/tags/TagManager.java @@ -643,14 +643,14 @@ public static List fillArgumentsObjects(List args, TagContext return filledArgs; } - public static void fillArgumentsObjects(List args, List strArgs, List pieceHelp, List aHArgs, boolean repush, TagContext context, int[] targets) { + public static void fillArgumentsObjects(List args, List strArgs, List pieceHelp, List aHArgs, boolean repush, TagContext context, int[] targets) { if (Debug.verbose) { Debug.log("Fill argument objects: " + args + ", " + context.instant + ", " + targets.length + "..."); } for (int argId : targets) { Argument aharg = aHArgs.get(argId); if (aharg.needsFill || aharg.hasSpecialPrefix) { - ScriptEntry.Argument piece = pieceHelp.get(argId); + ScriptEntry.InternalArgument piece = pieceHelp.get(argId); if (piece.prefix != null) { if (piece.prefix.aHArg.needsFill) { aharg.prefix = parseChainObject(piece.prefix.value, context, repush).toString();