Fix bug that TermAttributes cannot have parameters

Author: QuickWrite

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

@@ -53,14 +53,19 @@ public CharSequence getResult(final DirectFluentBundle bundle, final FluentArgs
             return getErrorString();
         }
 
-        return attribute.getResult(bundle, arguments);
+        return attribute.getResult(bundle, getArguments(arguments));
     }
 
     @Override
     public FluentElement getArgumentResult(final DirectFluentBundle bundle, final FluentArgs arguments) {
-        final FluentAttribute attribute = this.getMessage(bundle, reference.stringValue())
-                .getAttribute(this.attributeIdentifier);
-        if (attribute == null) {
+        final FluentMessage fluentMessage = this.getMessage(bundle, reference.stringValue());
+        if (fluentMessage == null) {
+            return this;
+        }
+
+        final FluentAttribute attribute = fluentMessage.getAttribute(this.attributeIdentifier);
+
+        if(attribute == null) {
             return this;
         }
 
@@ -71,7 +76,7 @@ public FluentElement getArgumentResult(final DirectFluentBundle bundle, final Fl
         }
 
         // No recursion (unfortunately :d)
-        return (FluentElement) elementList.get(0);
+        return elementList.get(0);
     }
 
     protected FluentMessage getMessage(final DirectFluentBundle bundle, final String key) {
@@ -82,6 +87,10 @@ protected String getErrorString() {
         return "{" + reference.stringValue() + "." + attributeIdentifier + "}";
     }
 
+    protected FluentArgs getArguments(final FluentArgs defaultArgs) {
+        return defaultArgs;
+    }
+
     @Override
     public String toString() {
         return "FluentAttributeReference: {\n" +
@@ -91,8 +100,12 @@ public String toString() {
     }
 
     public static class TermAttributeReference extends AttributeReference implements FluentSelectable {
-        public TermAttributeReference(FluentPlaceable reference, StringSlice content) {
+        private final FluentArgs arguments;
+
+        public TermAttributeReference(final FluentPlaceable reference, final StringSlice content, final FluentArgs arguments) {
             super(reference, content);
+
+            this.arguments = arguments;
         }
 
         @Override
@@ -104,5 +117,19 @@ protected FluentMessage getMessage(final DirectFluentBundle bundle, final String
         protected String getErrorString() {
             return "{-" + reference.stringValue() + "." + attributeIdentifier + "}";
         }
+
+        @Override
+        protected FluentArgs getArguments(final FluentArgs defaultArgs) {
+            return this.arguments;
+        }
+
+        @Override
+        public String toString() {
+            return "FluentTermAttributeReference: {\n" +
+                    "\t\t\tvalue: \"" + this.reference + "\"\n" +
+                    "\t\t\tattribute: \"" + this.attributeIdentifier + "\"\n" +
+                    "\t\t\targuments: \"" + this.arguments + "\"\n" +
+                    "\t\t}";
+        }
     }
 }

src/main/java/net/quickwrite/fluent4j/util/StringSliceUtil.java

@@ -206,7 +206,15 @@ private static FluentPlaceable expressionGetAttribute(final StringSlice slice, F
         final StringSlice identifier = StringSliceUtil.getIdentifier(slice);
 
         if (isTerm) {
-            expression = new AttributeReference.TermAttributeReference(expression, identifier);
+            skipWhitespaceAndNL(slice);
+            FluentArgs arguments = null;
+
+            if (slice.getChar() == '(') {
+                slice.increment();
+                arguments = parseArguments(slice);
+                slice.increment();
+            }
+            expression = new AttributeReference.TermAttributeReference(expression, identifier, arguments);
         } else {
             expression = new AttributeReference(expression, identifier);
         }