Fix: Multiple Calls of TermReferences

If a TermReference is called multiple times and it contains the possibility of using variables it is getting stuck on the first variable that was passed down in the parameters.

Author: QuickWrite

src/main/java/net/quickwrite/fluent4j/ast/placeable/TermReference.java

@@ -41,7 +41,7 @@ protected boolean check(final String string) {
 
     @Override
     public CharSequence getResult(final AccessorBundle bundle) {
-        return this.getArgumentResult(bundle).getResult(new AccessorElementsBundle(bundle.getBundle(), arguments));
+        return this.getArgumentResult(bundle).getResult(new AccessorElementsBundle(bundle.getBundle(), this.getArguments(bundle)));
     }
 
     /**

src/main/java/net/quickwrite/fluent4j/ast/placeable/base/FluentFunction.java

@@ -38,10 +38,10 @@ public FluentFunction(final String functionName, final FluentArgs arguments) {
      * @return The sanitized arguments of the function
      */
     protected FluentArgs getArguments(final AccessorBundle bundle) {
-        if (this.arguments != null)
-            this.arguments.sanitize(bundle);
+        if (this.arguments == null)
+            return null;
 
-        return this.arguments;
+        return this.arguments.sanitize(bundle);
     }
 
     /**

src/main/java/net/quickwrite/fluent4j/util/args/FluentArgs.java

@@ -23,7 +23,7 @@ public interface FluentArgs {
      *  @param bundle The main bundle
      *
      */
-    void sanitize(final AccessorBundle bundle);
+    FluentArgs sanitize(final AccessorBundle bundle);
 
     /**
      * Adds a new named argument to the named arguments.

src/main/java/net/quickwrite/fluent4j/util/args/FluentArguments.java

@@ -13,7 +13,7 @@
  * positional arguments.
  */
 public class FluentArguments implements FluentArgs {
-    private final Map<String, FluentElement> namedArguments;
+    protected final Map<String, FluentElement> namedArguments;
 
     /**
      * Creates a new argument container with the given
@@ -34,14 +34,21 @@ public FluentArguments(final Map<String, FluentElement> namedArguments) {
     }
 
     @Override
-    public void sanitize(AccessorBundle bundle) {
+    public FluentArgs sanitize(final AccessorBundle bundle) {
+        final FluentArgs args = new FluentArguments();
+
         for (final String key : namedArguments.keySet()) {
             final FluentElement argument = namedArguments.get(key);
 
             if (argument instanceof FluentArgumentResult) {
-                namedArguments.put(key, ((FluentArgumentResult) argument).getArgumentResult(bundle));
+                args.setNamed(key, ((FluentArgumentResult) argument).getArgumentResult(bundle));
+                continue;
             }
+
+            args.setNamed(key, argument);
         }
+
+        return args;
     }
 
     @Override
@@ -64,9 +71,13 @@ public boolean isEmpty() {
         return this.namedArguments.isEmpty();
     }
 
+    public FluentArgs clone() throws CloneNotSupportedException {
+        return (FluentArgs) super.clone();
+    }
+
     @Override
     public String toString() {
-        return "ResourceNamedFluentArguments: {\n" +
+        return "FluentArguments: {\n" +
                 "\t\t\tnamedArguments: \"" + this.namedArguments + "\"\n" +
                 "\t\t}";
     }

src/main/java/net/quickwrite/fluent4j/util/args/FunctionFluentArguments.java

@@ -11,9 +11,8 @@
  * are used as the parameters when a message, term or a function
  * is getting accessed.
  */
-public class FunctionFluentArguments implements FunctionFluentArgs {
-    private final Map<String, FluentElement> namedArguments;
-    private final List<FluentElement> positionalArguments;
+public class FunctionFluentArguments extends FluentArguments implements FunctionFluentArgs {
+    protected final List<FluentElement> positionalArguments;
 
     /**
      * Creates a new empty argument
@@ -31,27 +30,34 @@ public FunctionFluentArguments() {
      * @param positionalArguments The positional arguments
      */
     public FunctionFluentArguments(final Map<String, FluentElement> namedArguments, final List<FluentElement> positionalArguments) {
-        this.namedArguments = namedArguments;
+        super(namedArguments);
         this.positionalArguments = positionalArguments;
     }
 
     @Override
-    public void sanitize(AccessorBundle bundle) {
+    public FluentArgs sanitize(final AccessorBundle bundle) {
+        final FunctionFluentArgs args = new FunctionFluentArguments();
+
         for (final String key : namedArguments.keySet()) {
             final FluentElement argument = namedArguments.get(key);
 
             if (argument instanceof FluentArgumentResult) {
-                namedArguments.put(key, ((FluentArgumentResult) argument).getArgumentResult(bundle));
+                args.setNamed(key, ((FluentArgumentResult) argument).getArgumentResult(bundle));
+                continue;
             }
-        }
 
-        for (int i = 0; i < positionalArguments.size(); i++) {
-            final FluentElement argument = positionalArguments.get(i);
+            args.setNamed(key, argument);
+        }
 
+        for (final FluentElement argument : positionalArguments) {
             if (argument instanceof FluentArgumentResult) {
-                positionalArguments.set(i, ((FluentArgumentResult) argument).getArgumentResult(bundle));
+                args.addPositional(((FluentArgumentResult) argument).getArgumentResult(bundle));
+                continue;
             }
+            args.addPositional(argument);
         }
+
+        return args;
     }
 
     @Override
@@ -68,21 +74,6 @@ public int getPositionalSize() {
         return this.positionalArguments.size();
     }
 
-    @Override
-    public void setNamed(final String key, final FluentElement argument) {
-        this.namedArguments.put(key, argument);
-    }
-
-    @Override
-    public FluentElement getNamed(final String key) {
-        return this.namedArguments.get(key);
-    }
-
-    @Override
-    public Set<String> getNamedKeys() {
-        return this.namedArguments.keySet();
-    }
-
     @Override
     public void addPositional(final FluentElement argument) {
         this.positionalArguments.add(argument);
@@ -95,7 +86,7 @@ public boolean isEmpty() {
 
     @Override
     public String toString() {
-        return "ResourceFluentArguments: {\n" +
+        return "FunctionFluentArguments: {\n" +
                 "\t\t\tnamedArguments: \"" + this.namedArguments + "\"\n" +
                 "\t\t\tpositionalArguments: \"" + this.positionalArguments + "\"\n" +
                 "\t\t}";