- Added some java source generation optimizations

- Regenerated shared

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

@@ -9,6 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -66,6 +67,18 @@ public class OperatorMember extends FunctionalMember {
 	public <C, R> R accept(C context, MemberVisitorWithContext<C, R> visitor) {
 		return visitor.visitOperator(context, this);
 	}
+	
+	@Override
+	public int getEffectiveModifiers() {
+		int result = super.getEffectiveModifiers();
+		if (overrides != null) {
+			if (overrides.getTarget().isPublic())
+				result |= Modifiers.PUBLIC;
+			if (overrides.getTarget().isProtected())
+				result |= Modifiers.PROTECTED;
+		}
+		return result;
+	}
 
 	@Override
 	public FunctionalMemberRef getOverrides() {

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/BaseMemberCompiler.java

@@ -74,7 +74,7 @@ public abstract class BaseMemberCompiler implements MemberVisitor<Void> {
 	}
 	
 	protected void modifiers(int modifiers) {
-		if (Modifiers.isPublic(modifiers))
+		if (Modifiers.isPublic(modifiers) && !definition.isInterface())
 			output.append("public ");
 		if (Modifiers.isProtected(modifiers))
 			output.append("protected ");

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaMemberCompiler.java

@@ -84,7 +84,6 @@ public class JavaMemberCompiler extends BaseMemberCompiler {
 		if (isInterface && method.name.equals("toString") && header.parameters.length == 0) {
 			hasBody = false;
 		}
-			
 		
 		begin(ElementType.METHOD);
 		override(member.getOverrides() != null);

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceExpressionFormatter.java

@@ -462,15 +462,22 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 	public ExpressionString visitGetter(GetterExpression expression) {
 		if (expression.getter.member.builtin != null)
 			return visitBuiltinGetter(expression, expression.getter.member.builtin);
+		
+		ExpressionString target = expression.target.accept(this);
 		if (expression.getter.member.hasTag(JavaField.class)) {
 			JavaField field = expression.getter.member.getTag(JavaField.class);
-			return expression.target.accept(this).unaryPostfix(JavaOperator.MEMBER, "." + field.name);
+			if (target.value.equals("this") && !scope.hasLocalVariable(field.name))
+				return new ExpressionString(field.name, JavaOperator.PRIMARY);
+			
+			return target.unaryPostfix(JavaOperator.MEMBER, "." + field.name);
 		}
 		
 		JavaMethod method = expression.getter.getTag(JavaMethod.class);
 		StringBuilder result = new StringBuilder();
-		result.append(expression.target.accept(this));
-		result.append(".");
+		if (!target.value.equals("this") || scope.hasLocalVariable(method.name)) {
+			result.append(target.value);
+			result.append(".");
+		}
 		result.append(method.name);
 		result.append("()");
 		return new ExpressionString(result.toString(), JavaOperator.MEMBER);

Shared/src/main/java/listeners/ListenerList.java

@@ -46,7 +46,7 @@ public final class ListenerList<T> {
     public void accept(Consumer<T> consumer) {
         ListenerList<T>.EventListenerNode current = first;
         while (current != null) {
-            consumer.accept(current.getListener());
+            consumer.accept(current.listener);
             current = current.next;
         }
     }

Shared/src/main/java/live/LiveArrayList.java

@@ -6,7 +6,7 @@ import java.util.List;
 import listeners.ListenerHandle;
 import listeners.ListenerList;
 
-final class LiveArrayList<T> implements MutableLiveList<T>, AutoCloseable {
+public final class LiveArrayList<T> implements MutableLiveList<T>, AutoCloseable {
     private final List<T> values = new ArrayList<T>();
     private final ListenerList<LiveList.Listener<T>> listeners = new ListenerList<LiveList.Listener<T>>();
     
@@ -50,7 +50,7 @@ final class LiveArrayList<T> implements MutableLiveList<T>, AutoCloseable {
     
     @Override
     public void clear() {
-        int i = this.getLength();
+        int i = getLength();
         while (i > 0) {
             i--;
             this.remove(i);

Shared/src/main/java/org/openzen/zencode/shared/CodePosition.java

@@ -4,8 +4,7 @@ public final class CodePosition {
     public static final CodePosition BUILTIN = new CodePosition(new VirtualSourceFile("builtin"), 0, 0, 0, 0);
     public static final CodePosition NATIVE = new CodePosition(new VirtualSourceFile("native"), 0, 0, 0, 0);
     public static final CodePosition META = new CodePosition(new VirtualSourceFile("meta"), 0, 0, 0, 0);
-	public static final CodePosition UNKNOWN = new CodePosition(new VirtualSourceFile("unknown"), 0, 0, 0, 0);
-
+    public static final CodePosition UNKNOWN = new CodePosition(new VirtualSourceFile("unknown"), 0, 0, 0, 0);
     public final SourceFile file;
     public final int fromLine;
     public final int fromLineOffset;

Shared/src/main/java/stdlib/Integers.java

@@ -1,5 +1,5 @@
 package stdlib;
 
-final class Integers {
+public final class Integers {
     private Integers() {}
 }

Shared/src/main/java/stdlib/USize.java

@@ -1,5 +1,5 @@
 package stdlib;
 
-final class USize {
+public final class USize {
     private USize() {}
 }