Skip to content

Commit

Permalink
fix naming issue in ScriptEntry
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Jul 20, 2019
1 parent 74c5459 commit 107cf10
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
44 changes: 22 additions & 22 deletions src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static class ScriptEntryInternal {

public List<BracedCommand.BracedData> bracedSet = null;

public List<Argument> args_ref = null;
public List<InternalArgument> args_ref = null;

public ScriptTag script = null;

Expand All @@ -52,33 +52,33 @@ public static class ScriptEntryInternal {

public int[] processArgs = null;

public List<com.denizenscript.denizencore.objects.Argument> preprocArgs = null;
public List<Argument> 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<TagManager.ParseableTagPiece> 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();
return newArg;
}
}

public List<Argument> args_cur = null;
public List<InternalArgument> args_cur = null;

public List<com.denizenscript.denizencore.objects.Argument> aHArgs = null;
public List<Argument> aHArgs = null;

public List<String> args = null;

Expand All @@ -103,21 +103,21 @@ public void setBracedSet(List<BracedCommand.BracedData> 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());
for (int i = 0; i < internal.args_ref.size(); i++) {
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);
}
Expand Down Expand Up @@ -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<>();
Expand All @@ -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;
}
Expand Down Expand Up @@ -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()));
Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/denizenscript/denizencore/scripts/commands/CommandExecuter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/denizenscript/denizencore/tags/TagManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,14 +643,14 @@ public static List<ObjectTag> fillArgumentsObjects(List<String> args, TagContext
return filledArgs;
}

public static void fillArgumentsObjects(List<ObjectTag> args, List<String> strArgs, List<ScriptEntry.Argument> pieceHelp, List<Argument> aHArgs, boolean repush, TagContext context, int[] targets) {
public static void fillArgumentsObjects(List<ObjectTag> args, List<String> strArgs, List<ScriptEntry.InternalArgument> pieceHelp, List<Argument> 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();
Expand Down

0 comments on commit 107cf10

Please sign in to comment.