Moved into src folder

.gitignore

@@ -0,0 +1 @@
+build/

build.gradle

@@ -0,0 +1,5 @@
+task zipItUp(type: Zip) {
+    from fileTree(dir: "${project.projectDir}/src/main/zencode")
+    archiveName "${project.name}.jar"
+}
+

src/main/zencode/live/src/LiveConcatList.zs

@@ -0,0 +1,88 @@
+import listeners.ListenerList;
+import listeners.ListenerHandle;
+
+/*public class LiveConcatList<T> {
+	val listeners = new ListenerList<LiveList<T>.Listener<T>>;
+	val a as LiveList<T>;
+	val b as LiveList<T>;
+	
+	val aListener as ListenerHandle<LiveList<T>.Listener<T>>`unique;
+	val bListener as ListenerHandle<LiveList<T>.Listener<T>>`unique;
+	
+	public this(a as LiveList<T>, b as LiveList<T>) {
+		this.a = a;
+		this.b = b;
+		
+		aListener = a.addListener(new FirstListListener());
+		bListener = b.addListener(new SecondListListener());
+	}
+	
+	public implements LiveList<T> {
+		indexOf(value) {
+			var result = a.indexOf(value);
+			if result != null
+				return result;
+			
+			result = b.indexOf(value);
+			return result == null ? null : result + a.length;
+		}
+		
+		iterate() => new ConcatIterator;
+		
+		get length => a.length + b.length;
+		
+		[](index) => index < a.length ? a[index] : b[index - a.length];
+		
+		addListener(listener) => listeners.add(listener);
+		
+		iterate() => new ConcatIterator();
+	}
+	
+	private class ConcatIterator {
+		var firstList = true;
+		var iterator as Iterator<T>;
+		
+		public this() {
+			iterator = a.iterate();
+			if !iterator.hasNext {
+				firstList = false;
+				iterator = b.iterate();
+			}
+		}
+		
+		public implements Iterator<T> {
+			get hasNext => iterator.hasNext;
+			
+			next() {
+				val result = iterator.next();
+				if firstList && !iterator.hasNext {
+					firstList = false;
+					iterator = b.iterator();
+				}
+				return result;
+			}
+		}
+	}
+	
+	private class FirstListListener {
+		public implements LiveList<T>.Listener<T> {
+			onInserted(index, value)
+				=> listeners.accept(listener => listener.onInserted(index, value));
+			onChanged(index, oldValue, newValue)
+				=> listeners.accept(listener => listener.onChanged(index, oldValue, newValue));
+			onRemoved(index, oldValue)
+				=> listeners.accept(listener => listener.onRemoved(index, oldValue));
+		}
+	}
+	
+	private class SecondListListener {
+		public implements LiveList<T>.Listener<T> {
+			onInserted(index, value)
+				=> listeners.accept(listener => listener.onInserted(a.length + index, value));
+			onChanged(index, oldValue, newValue)
+				=> listeners.accept(listener => listener.onChanged(a.length + index, oldValue, newValue));
+			onRemoved(index, oldValue)
+				=> listeners.accept(listener => listener.onRemoved(a.length + index, oldValue));
+		}
+	}
+}*/

src/main/zencode/live/src/LiveEmptyList.zs

@@ -0,0 +1,15 @@
+import listeners.DummyListenerHandle;
+
+public class LiveEmptyList<T> {
+	public implements LiveList<T> {
+		indexOf(value) => null;
+		
+		get length => 0;
+		
+		[](index) => panic "No elements in an empty list";
+		
+		iterate() => Iterator<T>.empty<T>();
+		
+		addListener(listener) => new DummyListenerHandle<Listener<T>>`unique(listener);
+	}
+}

src/main/zencode/live/src/LiveFloat.zs

@@ -0,0 +1,9 @@
+public interface LiveFloat {
+	get value as float;
+	set value as float;
+	
+	addListener(listener as Listener) as ListenerHandle`unique;
+	
+	alias Listener as function(oldValue as float, newValue as float) as void;
+	alias ListenerHandle as listeners.ListenerHandle<Listener>;
+}

live/src/MutableLiveBool.zs → src/main/zencode/live/src/MutableLiveBool.zs

@@ -1,3 +1,5 @@
 public interface MutableLiveBool : LiveBool {
 	set value as bool;
+	
+	final toggle() as void => value = !value;
 }

live/src/SimpleLiveBool.zs → src/main/zencode/live/src/SimpleLiveBool.zs

@@ -6,7 +6,7 @@ public class SimpleLiveBool {
 	var value as bool : get;
 	
 	public this(value as bool) {
-		this.value = value;
+		$value = value;
 	}
 	
 	public implements MutableLiveBool {

live/src/SimpleLiveInt.zs → src/main/zencode/live/src/SimpleLiveInt.zs

@@ -6,7 +6,7 @@ public class SimpleLiveInt {
 	var value as int : get;
 	
 	public this(value as int) {
-		this.value = value;
+		$value = value;
 	}
 	
 	public implements MutableLiveInt {

live/src/SimpleLiveString.zs → src/main/zencode/live/src/SimpleLiveString.zs

@@ -6,7 +6,7 @@ public class SimpleLiveString {
 	var value as string : get;
 	
 	public this(value as string) {
-		this.value = value;
+		$value = value;
 	}
 	
 	public implements MutableLiveString {

src/main/zencode/stdlib/java.map

@@ -0,0 +1,22 @@
+expansion:<T:Comparable<T>>T[]@java.lang.Arrays
+:method:sort()void=sort([Ljava/lang/Object;)[Ljava/lang/Object;
+:method:sorted()T[]=!ArraysSorted
+expansion:<T>T[]@java.lang.Arrays
+:method:sort(function(T,T)int)void=sort([Ljava/lang/Object;Ljava/lang/Comparator;)[Ljava/lang/Object;
+:method:sorted(function(T,T)T[]=!ArraysSortedWithComparator
+:method:copy()=!ArraysCopy
+:method:copy(usize)T[]=copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+:method:copyTo(T[],usize,usize,usize)void=!ArraysCopyTo
+expansion:string@java.lang.String
+:method:fromAsciiBytes(byte[])string=!StringFromAciiBytes
+:method:fromUTF8Bytes(byte[])string=!StringFromUTF8Bytes
+:operator:in(char)=!StringContains
+:method:indexOf(char)usize?=indexOf(I)I
+:method:indexOf(char,usize)usize?=indexOf(II)I
+:method:lastIndexOf(char)usize?=lastIndexOf(I)I
+:method:lastIndexOf(char,usize)usize?=lastIndexOf(II)I
+:method:trim()=trim()Ljava/lang/String;
+:method:startsWith(string)bool=startsWith(Ljava/lang/String;)Z
+:method:endsWith(string)bool=endsWith(Ljava/lang/String;)Z
+:method:toAsciiBytes()byte[]=!StringToAsciiBytes
+:method:toUTF8Bytes()byte[]=!StringToUTF8Bytes

stdlib/src/Arrays.zs → src/main/zencode/stdlib/src/Arrays.zs

@@ -48,15 +48,15 @@ public expand <T> T[] {
 	}*/
 	
 	[Native("mapValues")]
-	public map<U>(projection as function(value as T`borrow) as U) as U[]
+	public map<U>(projection as function(value as T) as U) as U[]
 		=> new U[]<T>(this, projection);
 	
 	[Native("mapKeyValues")]
-	public map<U>(projection as function(index as usize, value as T`borrow) as U) as U[]
+	public map<U>(projection as function(index as usize, value as T) as U) as U[]
 		=> new U[]<T>(this, projection);
 	
 	[Native("filterValues")]
-	public filter(predicate as function(value as T`borrow) as bool) as T[] {
+	public filter(predicate as function(value as T) as bool) as T[] {
 		var values = new List<T>();
 		for value in this
 			if predicate(value)

stdlib/src/Iterator.zs → src/main/zencode/stdlib/src/Iterator.zs

@@ -1,7 +1,10 @@
 [Native("stdlib::Iterator")]
 public interface Iterator<T> {
+	[Native("empty")]
+	static empty<T>() as Iterator<T>;
+	
 	[Native("hasNext")]
-	hasNext() as bool;
+	get hasNext as bool;
 	
 	[Native("next")]
 	next() as T;

stdlib/src/List.zs → src/main/zencode/stdlib/src/List.zs

@@ -28,7 +28,7 @@ public class List<T> {
 	public in(value as T) as bool;
 	
 	[Native("toArray")]
-	public as T[];
+	public implicit as T[];
 	
 	[Native("length")]
 	public get length as usize;

stdlib/src/StringBuildable.zs → src/main/zencode/stdlib/src/StringBuildable.zs

@@ -1,5 +1,5 @@
 public interface StringBuildable {
-	toString(output as StringBuilder`borrow) as void;
+	toString(output as StringBuilder) as void;
 	
 	as string
 		=> new StringBuilder() << this;

stdlib/src/StringBuilder.zs → src/main/zencode/stdlib/src/StringBuilder.zs

@@ -41,12 +41,12 @@ public class StringBuilder {
 	[Native("appendString")]
 	public extern <<(value as string) as StringBuilder;
 	
-	public <<(value as StringBuildable`borrow) as StringBuilder {
+	public <<(value as StringBuildable) as StringBuilder {
 		value.toString(this);
 		return this;
 	}
 	
-	public append<T : StringBuildable>(values as T[]`borrow, separator as string) as StringBuilder {
+	public append<T : StringBuildable>(values as T[], separator as string) as StringBuilder {
 		for i, value in values {
 			if i > 0
 				this << separator;
@@ -55,7 +55,7 @@ public class StringBuilder {
 		return this;
 	}
 	
-	public append<T>(values as T[]`borrow, stringer as function(value as T) as string, separator as string) as StringBuilder {
+	public append<T>(values as T[], stringer as function(value as T) as string, separator as string) as StringBuilder {
 		for i, value in values {
 			if i > 0
 				this << separator;

stdlib/src/Strings.zs → src/main/zencode/stdlib/src/Strings.zs

@@ -9,6 +9,10 @@ public expand string {
 	[Native("contains")]
 	public const in(c as char) as bool
 		=> indexOf(c) != null;
+		
+	[Native("containsString")]
+	public const in(s as string) as bool
+		=> indexOf(s) != null;
 	
 	[Native("indexOf")]
 	public const indexOf(c as char) as usize? {
@@ -30,6 +34,12 @@ public expand string {
 		return null;
 	}
 	
+	[Native("indexOfString")]
+	public const indexOf(s as string) as usize?;
+	
+	[Native("indexOfStringFrom")]
+	public const indexOf(s as string, from as usize) as usize?;
+	
 	[Native("lastIndexOf")]
 	public const lastIndexOf(c as char) as usize? {
 		var i = length;
@@ -54,6 +64,12 @@ public expand string {
 		return null;
 	}
 	
+	[Native("lastIndexOfString")]
+	public const lastIndexOf(s as string) as usize?;
+	
+	[Native("lastIndexOfStringFrom")]
+	public const lastIndexOf(s as string, until as usize?) as usize?;
+	
 	[Native("split")]
 	public const split(delimiter as char) as string[] {
 		val result = new List<string>();
@@ -80,6 +96,14 @@ public expand string {
 		return to < from ? "" : this[from .. to];
 	}
 	
+	[Native("startsWith")]
+	public const startsWith(head as string) as bool
+		=> length >= head.length && this[0 .. head.length] == head;
+	
+	[Native("endsWith")]
+	public const endsWith(tail as string) as bool
+		=> length >= tail.length && this[($ - tail.length) .. $] == tail;
+	
 	[Native("lpad")]
 	public const lpad(length as usize, c as char) as string
 		=> this.length >= length ? this : c.times(length - this.length) + this;
@@ -87,10 +111,10 @@ public expand string {
 	[Native("rpad")]
 	public const rpad(length as usize, c as char) as string
 		=> this.length >= length ? this : this + c.times(length - this.length);
-		
+	
 	[Native("toAsciiBytes")]
-	public const toAsciiBytes() as byte[]`unique;
+	public const toAsciiBytes() as byte[];
 	
 	[Native("toUTF8Bytes")]
-	public const toUTF8Bytes() as byte[]`unique;
+	public const toUTF8Bytes() as byte[];
 }

src/main/zencode/uuid/module.json

@@ -0,0 +1,6 @@
+{
+	"package": "live",
+	"javaPackage": "org.openzen.zencode.stdlib.uuid",
+	"host": "universal",
+	"dependencies": []
+}

src/main/zencode/uuid/src/uuid.zs

@@ -0,0 +1,9 @@
+[Native("uuid")]
+export class UUID {
+	[Native("random")]
+	static random() as UUID;
+	
+	[Native("toString")]
+	as string;
+}
+