- Fixed $ not working in setters

- Fixed erratic StringBuilder class
- Updated shared with new live classes

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/SetterMember.java

@@ -31,7 +31,7 @@ public class SetterMember extends PropertyMember {
 	public final String name;
 	private SetterMemberRef overrides;
 	public Statement body;
-	public final FunctionParameter parameter;
+	public FunctionParameter parameter;
 	
 	public SetterMember(
 			CodePosition position,
@@ -105,8 +105,10 @@ public class SetterMember extends PropertyMember {
 	public void setOverrides(SetterMemberRef overrides) {
 		this.overrides = overrides;
 		
-		if (type.type == BasicTypeID.UNDETERMINED)
+		if (type.type == BasicTypeID.UNDETERMINED) {
 			type = overrides.getType();
+			parameter = new FunctionParameter(overrides.getType(), "value");
+		}
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/FunctionScope.java

@@ -33,11 +33,17 @@ public class FunctionScope extends StatementScope {
 	private final FunctionHeader header;
 	private final GenericMapper typeParameterMap;
 	private final StoredType thisType;
+	private final DollarEvaluator dollar;
 	
 	public FunctionScope(BaseScope outer, FunctionHeader header) {
+		this(outer, header, null);
+	}
+	
+	public FunctionScope(BaseScope outer, FunctionHeader header, DollarEvaluator dollar) {
 		this.outer = outer;
 		this.header = header;
 		this.thisType = outer.getThisType() == null || header.storage == null ? outer.getThisType() : outer.getThisType().type.stored(header.storage);
+		this.dollar = dollar;
 		
 		if (outer.getLocalTypeParameters() == null)
 			throw new NullPointerException();
@@ -112,11 +118,12 @@ public class FunctionScope extends StatementScope {
 
 	@Override
 	public DollarEvaluator getDollar() {
-		for (FunctionParameter parameter : header.parameters)
+		return dollar;
+		/*for (FunctionParameter parameter : header.parameters)
 			if (parameter.name.equals("$"))
 				return position -> new GetFunctionParameterExpression(position, parameter);
 		
-		return null;
+		return null;*/
 	}
 	
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedSetter.java

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
+import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
@@ -95,7 +96,10 @@ public class ParsedSetter extends ParsedDefinitionMember {
 		inferHeaders(scope);
 		
 		FunctionHeader header = new FunctionHeader(compiled.type);
-		FunctionScope innerScope = new FunctionScope(scope, header);
+		FunctionScope innerScope = new FunctionScope(
+				scope,
+				header,
+				position -> new GetFunctionParameterExpression(position, compiled.parameter));
 		compiled.annotations = ParsedAnnotation.compileForMember(annotations, getCompiled(), scope);
 		compiled.setBody(body.compile(innerScope, header));
 	}

Shared/src/main/java/live/MutableLiveInt.java

@@ -0,0 +1,5 @@
+package live;
+
+public interface MutableLiveInt extends LiveInt {
+    void setValue(int value);
+}

Shared/src/main/java/live/MutableLiveString.java

@@ -0,0 +1,5 @@
+package live;
+
+public interface MutableLiveString extends LiveString {
+    void setValue(String value);
+}

Shared/src/main/java/live/SimpleLiveInt.java

@@ -0,0 +1,33 @@
+package live;
+
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+import zsynthetic.FunctionIntIntToVoid;
+
+public final class SimpleLiveInt implements MutableLiveInt {
+    private final ListenerList<FunctionIntIntToVoid> listeners = new ListenerList<FunctionIntIntToVoid>();
+    private int value;
+    
+    public SimpleLiveInt(int value) {
+        this.value = value;
+    }
+    
+    @Override
+    public ListenerHandle<FunctionIntIntToVoid> addListener(FunctionIntIntToVoid listener) {
+        return listeners.add(listener);
+    }
+    
+    @Override
+    public void setValue(int value) {
+        if (value == this.value)
+            return;
+        int oldValue = this.value;
+        this.value = value;
+        listeners.accept(listener -> 
+        listener.invoke(oldValue, this.value));
+    }
+    
+    public int getValue() {
+        return value;
+    }
+}

Shared/src/main/java/live/SimpleLiveString.java

@@ -0,0 +1,33 @@
+package live;
+
+import java.util.function.BiConsumer;
+import listeners.ListenerHandle;
+import listeners.ListenerList;
+
+public final class SimpleLiveString implements MutableLiveString {
+    private final ListenerList<BiConsumer<String, String>> listeners = new ListenerList<BiConsumer<String, String>>();
+    private String value;
+    
+    public SimpleLiveString(String value) {
+        this.value = value;
+    }
+    
+    @Override
+    public ListenerHandle<BiConsumer<String, String>> addListener(BiConsumer<String, String> listener) {
+        return listeners.add(listener);
+    }
+    
+    @Override
+    public void setValue(String value) {
+        if (value.equals(this.value))
+            return;
+        String oldValue = this.value;
+        this.value = value;
+        listeners.accept(listener -> 
+        listener.accept(oldValue, this.value));
+    }
+    
+    public String getValue() {
+        return value;
+    }
+}

Shared/src/main/java/stdlib/StringBuilder.java

@@ -1,8 +0,0 @@
-package stdlib;
-
-public final class StringBuilder {
-    public static StringBuilder shl(StringBuilder self, StringBuildable value) {
-        value.toString(self);
-        return self;
-    }
-}

Shared/src/main/java/stdlib/StringBuilderExpansion.java

@@ -0,0 +1,30 @@
+package stdlib;
+
+import java.util.function.Function;
+
+public final class StringBuilderExpansion {
+    public static StringBuilder shl(StringBuilder self, StringBuildable value) {
+        value.toString(self);
+        return self;
+    }
+    
+    public static <T extends StringBuildable> StringBuilder append(StringBuilder self, Class<T> typeOfT, T[] values, String separator) {
+        for (int i = 0; i < values.length; i++) {
+            T value = values[i];
+            if (i > 0)
+                self.append(separator);
+            value.toString(self);
+        }
+        return self;
+    }
+    
+    public static <T> StringBuilder append(StringBuilder self, Class<T> typeOfT, T[] values, Function<T, String> stringer, String separator) {
+        for (int i = 0; i < values.length; i++) {
+            T value = values[i];
+            if (i > 0)
+                self.append(separator);
+            self.append(stringer.apply(value));
+        }
+        return self;
+    }
+}