Browse Source

Updated shared with the new generated version, fixing a bunch of code generation imperfections.

Stan Hebben 6 years ago
parent
commit
6c57403b84

+ 0
- 1
Shared/src/main/java/listeners/DummyListenerHandle.java View File

1
 package listeners;
1
 package listeners;
2
 
2
 
3
-
4
 public final class DummyListenerHandle<T> implements ListenerHandle<T>, AutoCloseable {
3
 public final class DummyListenerHandle<T> implements ListenerHandle<T>, AutoCloseable {
5
     public final T listener;
4
     public final T listener;
6
     
5
     

+ 0
- 1
Shared/src/main/java/listeners/ListenerHandle.java View File

1
 package listeners;
1
 package listeners;
2
 
2
 
3
-
4
 public interface ListenerHandle<T> extends AutoCloseable {
3
 public interface ListenerHandle<T> extends AutoCloseable {
5
     @Override
4
     @Override
6
     public void close();
5
     public void close();

+ 0
- 1
Shared/src/main/java/listeners/ListenerList.java View File

1
 package listeners;
1
 package listeners;
2
 
2
 
3
-import listeners.ListenerList;
4
 import zsynthetic.FunctionTToVoid;
3
 import zsynthetic.FunctionTToVoid;
5
 
4
 
6
 public final class ListenerList<T> {
5
 public final class ListenerList<T> {

+ 0
- 1
Shared/src/main/java/live/ImmutableLiveBool.java View File

2
 
2
 
3
 import listeners.DummyListenerHandle;
3
 import listeners.DummyListenerHandle;
4
 import listeners.ListenerHandle;
4
 import listeners.ListenerHandle;
5
-import live.ImmutableLiveBool;
6
 import zsynthetic.FunctionBoolBoolToVoid;
5
 import zsynthetic.FunctionBoolBoolToVoid;
7
 
6
 
8
 public final class ImmutableLiveBool implements LiveBool {
7
 public final class ImmutableLiveBool implements LiveBool {

+ 0
- 1
Shared/src/main/java/live/MutableLiveList.java View File

1
 package live;
1
 package live;
2
 
2
 
3
-
4
 public interface MutableLiveList<T> extends AutoCloseable, LiveList<T> {
3
 public interface MutableLiveList<T> extends AutoCloseable, LiveList<T> {
5
     void add(T value);
4
     void add(T value);
6
     
5
     

+ 0
- 3
Shared/src/main/java/org/openzen/zencode/shared/CompileException.java View File

1
 package org.openzen.zencode.shared;
1
 package org.openzen.zencode.shared;
2
 
2
 
3
-import org.openzen.zencode.shared.CodePosition;
4
-import org.openzen.zencode.shared.CompileException;
5
-
6
 public final class CompileException extends RuntimeException {
3
 public final class CompileException extends RuntimeException {
7
     public static CompileException internalError(String message) {
4
     public static CompileException internalError(String message) {
8
         return new CompileException(CodePosition.BUILTIN, CompileExceptionCode.INTERNAL_ERROR, message);
5
         return new CompileException(CodePosition.BUILTIN, CompileExceptionCode.INTERNAL_ERROR, message);

+ 65
- 65
Shared/src/main/java/org/openzen/zencode/shared/CompileExceptionCode.java View File

1
 package org.openzen.zencode.shared;
1
 package org.openzen.zencode.shared;
2
 
2
 
3
 public enum CompileExceptionCode {
3
 public enum CompileExceptionCode {
4
-	UNEXPECTED_TOKEN(),
5
-	IMPORT_NOT_FOUND(),
6
-	NO_OUTER_BECAUSE_NOT_INNER(),
7
-	NO_OUTER_BECAUSE_STATIC(),
8
-	NO_OUTER_BECAUSE_OUTSIDE_TYPE(),
9
-	TYPE_ARGUMENTS_INVALID_NUMBER(),
10
-	TYPE_ARGUMENTS_NOT_INFERRABLE(),
11
-	USING_STATIC_ON_INSTANCE(),
12
-	CANNOT_ASSIGN(),
13
-	UNAVAILABLE_IN_CLOSURE(),
14
-	USING_PACKAGE_AS_EXPRESSION(),
15
-	USING_PACKAGE_AS_CALL_TARGET(),
16
-	USING_TYPE_AS_EXPRESSION(),
17
-	MEMBER_NO_SETTER(),
18
-	MEMBER_NO_GETTER(),
19
-	MEMBER_NOT_STATIC(),
20
-	MEMBER_IS_FINAL(),
21
-	MEMBER_DUPLICATE(),
22
-	CALL_AMBIGUOUS(),
23
-	CALL_NO_VALID_METHOD(),
24
-	ENUM_VALUE_DUPLICATE(),
25
-	INVALID_CAST(),
26
-	NO_SUCH_INNER_TYPE(),
27
-	NO_DOLLAR_HERE(),
28
-	UNSUPPORTED_XML_EXPRESSIONS(),
29
-	UNSUPPORTED_NAMED_ARGUMENTS(),
30
-	TYPE_CANNOT_UNITE(),
31
-	BRACKET_MULTIPLE_EXPRESSIONS(),
32
-	SUPER_CALL_NO_SUPERCLASS(),
33
-	LAMBDA_HEADER_INVALID(),
34
-	COALESCE_TARGET_NOT_OPTIONAL(),
35
-	MULTIPLE_MATCHING_HINTS(),
36
-	MISSING_MAP_KEY(),
37
-	NO_SUCH_MEMBER(),
38
-	USING_THIS_OUTSIDE_TYPE(),
39
-	USING_THIS_STATIC(),
40
-	UNDEFINED_VARIABLE(),
41
-	METHOD_BODY_REQUIRED(),
42
-	BREAK_OUTSIDE_LOOP(),
43
-	CONTINUE_OUTSIDE_LOOP(),
44
-	NO_SUCH_ITERATOR(),
45
-	NO_SUCH_TYPE(),
46
-	RETURN_VALUE_REQUIRED(),
47
-	RETURN_VALUE_VOID(),
48
-	INVALID_CONDITION(),
49
-	INTERNAL_ERROR(),
50
-	CANNOT_SET_FINAL_VARIABLE(),
51
-	MISSING_PARAMETER(),
52
-	STATEMENT_OUTSIDE_SWITCH_CASE(),
53
-	MISSING_VARIANT_CASEPARAMETERS(),
54
-	INVALID_SWITCH_CASE(),
55
-	TRY_CONVERT_OUTSIDE_FUNCTION(),
56
-	TRY_CONVERT_ILLEGAL_TARGET(),
57
-	TRY_RETHROW_NOT_A_RESULT(),
58
-	DIFFERENT_EXCEPTIONS(),
59
-	UNKNOWN_ANNOTATION(),
60
-	OVERRIDE_WITHOUT_BASE(),
61
-	OVERRIDE_AMBIGUOUS(),
62
-	OVERRIDE_CONSTRUCTOR(),
63
-	PRECOMPILE_FAILED(),
64
-	UNTYPED_EMPTY_ARRAY(),
65
-	UNTYPED_EMPTY_MAP(),
66
-	VAR_WITHOUT_TYPE_OR_INITIALIZER(),
67
-	NO_BRACKET_PARSER(),
68
-	INVALID_BRACKET_EXPRESSION(),
4
+	UNEXPECTED_TOKEN,
5
+	IMPORT_NOT_FOUND,
6
+	NO_OUTER_BECAUSE_NOT_INNER,
7
+	NO_OUTER_BECAUSE_STATIC,
8
+	NO_OUTER_BECAUSE_OUTSIDE_TYPE,
9
+	TYPE_ARGUMENTS_INVALID_NUMBER,
10
+	TYPE_ARGUMENTS_NOT_INFERRABLE,
11
+	USING_STATIC_ON_INSTANCE,
12
+	CANNOT_ASSIGN,
13
+	UNAVAILABLE_IN_CLOSURE,
14
+	USING_PACKAGE_AS_EXPRESSION,
15
+	USING_PACKAGE_AS_CALL_TARGET,
16
+	USING_TYPE_AS_EXPRESSION,
17
+	MEMBER_NO_SETTER,
18
+	MEMBER_NO_GETTER,
19
+	MEMBER_NOT_STATIC,
20
+	MEMBER_IS_FINAL,
21
+	MEMBER_DUPLICATE,
22
+	CALL_AMBIGUOUS,
23
+	CALL_NO_VALID_METHOD,
24
+	ENUM_VALUE_DUPLICATE,
25
+	INVALID_CAST,
26
+	NO_SUCH_INNER_TYPE,
27
+	NO_DOLLAR_HERE,
28
+	UNSUPPORTED_XML_EXPRESSIONS,
29
+	UNSUPPORTED_NAMED_ARGUMENTS,
30
+	TYPE_CANNOT_UNITE,
31
+	BRACKET_MULTIPLE_EXPRESSIONS,
32
+	SUPER_CALL_NO_SUPERCLASS,
33
+	LAMBDA_HEADER_INVALID,
34
+	COALESCE_TARGET_NOT_OPTIONAL,
35
+	MULTIPLE_MATCHING_HINTS,
36
+	MISSING_MAP_KEY,
37
+	NO_SUCH_MEMBER,
38
+	USING_THIS_OUTSIDE_TYPE,
39
+	USING_THIS_STATIC,
40
+	UNDEFINED_VARIABLE,
41
+	METHOD_BODY_REQUIRED,
42
+	BREAK_OUTSIDE_LOOP,
43
+	CONTINUE_OUTSIDE_LOOP,
44
+	NO_SUCH_ITERATOR,
45
+	NO_SUCH_TYPE,
46
+	RETURN_VALUE_REQUIRED,
47
+	RETURN_VALUE_VOID,
48
+	INVALID_CONDITION,
49
+	INTERNAL_ERROR,
50
+	CANNOT_SET_FINAL_VARIABLE,
51
+	MISSING_PARAMETER,
52
+	STATEMENT_OUTSIDE_SWITCH_CASE,
53
+	MISSING_VARIANT_CASEPARAMETERS,
54
+	INVALID_SWITCH_CASE,
55
+	TRY_CONVERT_OUTSIDE_FUNCTION,
56
+	TRY_CONVERT_ILLEGAL_TARGET,
57
+	TRY_RETHROW_NOT_A_RESULT,
58
+	DIFFERENT_EXCEPTIONS,
59
+	UNKNOWN_ANNOTATION,
60
+	OVERRIDE_WITHOUT_BASE,
61
+	OVERRIDE_AMBIGUOUS,
62
+	OVERRIDE_CONSTRUCTOR,
63
+	PRECOMPILE_FAILED,
64
+	UNTYPED_EMPTY_ARRAY,
65
+	UNTYPED_EMPTY_MAP,
66
+	VAR_WITHOUT_TYPE_OR_INITIALIZER,
67
+	NO_BRACKET_PARSER,
68
+	INVALID_BRACKET_EXPRESSION,
69
 	VARIANT_OPTION_NOT_AN_EXPRESSION,
69
 	VARIANT_OPTION_NOT_AN_EXPRESSION,
70
 	DUPLICATE_GLOBAL,
70
 	DUPLICATE_GLOBAL,
71
 	CANNOT_INFER_RETURN_TYPE
71
 	CANNOT_INFER_RETURN_TYPE

+ 0
- 1
Shared/src/main/java/org/openzen/zencode/shared/ConcatMap.java View File

1
 package org.openzen.zencode.shared;
1
 package org.openzen.zencode.shared;
2
 
2
 
3
-import org.openzen.zencode.shared.ConcatMap;
4
 import stdlib.EqualsComparable;
3
 import stdlib.EqualsComparable;
5
 
4
 
6
 public final class ConcatMap<K extends EqualsComparable<K>, V> {
5
 public final class ConcatMap<K extends EqualsComparable<K>, V> {

+ 0
- 4
Shared/src/main/java/org/openzen/zencode/shared/StringExpansion.java View File

2
 
2
 
3
 import java.util.HashMap;
3
 import java.util.HashMap;
4
 import java.util.Map;
4
 import java.util.Map;
5
-import org.openzen.zencode.shared.CharacterEntity;
6
-import org.openzen.zencode.shared.StringExpansion;
7
 import stdlib.Result;
5
 import stdlib.Result;
8
 import stdlib.Result.Error;
6
 import stdlib.Result.Error;
9
-import stdlib.Result.Error;
10
-import stdlib.Result.Ok;
11
 import stdlib.Result.Ok;
7
 import stdlib.Result.Ok;
12
 import stdlib.Strings;
8
 import stdlib.Strings;
13
 import zsynthetic.ArrayHelpers;
9
 import zsynthetic.ArrayHelpers;

+ 11
- 11
Shared/src/main/java/stdlib/Arrays.java View File

5
 import java.util.HashMap;
5
 import java.util.HashMap;
6
 import java.util.List;
6
 import java.util.List;
7
 import java.util.Map;
7
 import java.util.Map;
8
-import zsynthetic.FunctionIntTToBool;
9
-import zsynthetic.FunctionIntTToU;
10
-import zsynthetic.FunctionIntTToVoid;
11
 import zsynthetic.FunctionTToBool;
8
 import zsynthetic.FunctionTToBool;
12
 import zsynthetic.FunctionTToU;
9
 import zsynthetic.FunctionTToU;
13
 import zsynthetic.FunctionTToVoid;
10
 import zsynthetic.FunctionTToVoid;
11
+import zsynthetic.FunctionUSizeTToBool;
12
+import zsynthetic.FunctionUSizeTToU;
13
+import zsynthetic.FunctionUSizeTToVoid;
14
 
14
 
15
 public final class Arrays {
15
 public final class Arrays {
16
     private Arrays() {}
16
     private Arrays() {}
38
         return temp1;
38
         return temp1;
39
     }
39
     }
40
     
40
     
41
-    public static <U, T> U[] map(Class<T> typeOfT, T[] self, Class<U> typeOfU, FunctionIntTToU<U, T> projection) {
41
+    public static <U, T> U[] map(Class<T> typeOfT, T[] self, Class<U> typeOfU, FunctionUSizeTToU<U, T> projection) {
42
         U[] temp1 = (U[])(Array.newInstance(typeOfU, self.length));
42
         U[] temp1 = (U[])(Array.newInstance(typeOfU, self.length));
43
         for (int temp2 = 0; temp2 < temp1.length; temp2++)
43
         for (int temp2 = 0; temp2 < temp1.length; temp2++)
44
             temp1[temp2] = projection.invoke(temp2, self[temp2]);
44
             temp1[temp2] = projection.invoke(temp2, self[temp2]);
53
         return values.toArray((T[])(Array.newInstance(typeOfT, values.size())));
53
         return values.toArray((T[])(Array.newInstance(typeOfT, values.size())));
54
     }
54
     }
55
     
55
     
56
-    public static <T> T[] filter(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
56
+    public static <T> T[] filter(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
57
         List<T> values = new ArrayList<T>();
57
         List<T> values = new ArrayList<T>();
58
         for (int i = 0; i < self.length; i++) {
58
         for (int i = 0; i < self.length; i++) {
59
             T value = self[i];
59
             T value = self[i];
68
             consumer.invoke(value);
68
             consumer.invoke(value);
69
     }
69
     }
70
     
70
     
71
-    public static <T> void each(Class<T> typeOfT, T[] self, FunctionIntTToVoid<T> consumer) {
71
+    public static <T> void each(Class<T> typeOfT, T[] self, FunctionUSizeTToVoid<T> consumer) {
72
         for (int i = 0; i < self.length; i++) {
72
         for (int i = 0; i < self.length; i++) {
73
             T value = self[i];
73
             T value = self[i];
74
             consumer.invoke(i, value);
74
             consumer.invoke(i, value);
82
         return false;
82
         return false;
83
     }
83
     }
84
     
84
     
85
-    public static <T> boolean contains(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
85
+    public static <T> boolean contains(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
86
         for (int i = 0; i < self.length; i++) {
86
         for (int i = 0; i < self.length; i++) {
87
             T value = self[i];
87
             T value = self[i];
88
             if (predicate.invoke(i, value))
88
             if (predicate.invoke(i, value))
98
         return true;
98
         return true;
99
     }
99
     }
100
     
100
     
101
-    public static <T> boolean all(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
101
+    public static <T> boolean all(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
102
         for (int i = 0; i < self.length; i++) {
102
         for (int i = 0; i < self.length; i++) {
103
             T value = self[i];
103
             T value = self[i];
104
             if (!predicate.invoke(i, value))
104
             if (!predicate.invoke(i, value))
114
         return null;
114
         return null;
115
     }
115
     }
116
     
116
     
117
-    public static <T> T first(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
117
+    public static <T> T first(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
118
         for (int i = 0; i < self.length; i++) {
118
         for (int i = 0; i < self.length; i++) {
119
             T value = self[i];
119
             T value = self[i];
120
             if (predicate.invoke(i, value))
120
             if (predicate.invoke(i, value))
133
         return null;
133
         return null;
134
     }
134
     }
135
     
135
     
136
-    public static <T> T last(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
136
+    public static <T> T last(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
137
         int i = self.length;
137
         int i = self.length;
138
         while (i > 0) {
138
         while (i > 0) {
139
             i--;
139
             i--;
151
         return result;
151
         return result;
152
     }
152
     }
153
     
153
     
154
-    public static <T> int count(Class<T> typeOfT, T[] self, FunctionIntTToBool<T> predicate) {
154
+    public static <T> int count(Class<T> typeOfT, T[] self, FunctionUSizeTToBool<T> predicate) {
155
         int result = 0;
155
         int result = 0;
156
         for (int i = 0; i < self.length; i++) {
156
         for (int i = 0; i < self.length; i++) {
157
             T value = self[i];
157
             T value = self[i];

+ 3
- 3
Shared/src/main/java/stdlib/EnforcementLevel.java View File

1
 package stdlib;
1
 package stdlib;
2
 
2
 
3
 public enum EnforcementLevel {
3
 public enum EnforcementLevel {
4
-	INFO(),
5
-	ENFORCE(),
6
-	PROVE()
4
+	INFO,
5
+	ENFORCE,
6
+	PROVE
7
 }
7
 }

+ 2
- 5
Shared/src/main/java/stdlib/Result.java View File

1
 package stdlib;
1
 package stdlib;
2
 
2
 
3
-import stdlib.Result;
4
-import stdlib.Result.Error;
5
-import stdlib.Result.Ok;
6
 import zsynthetic.FunctionTToResultWithUV;
3
 import zsynthetic.FunctionTToResultWithUV;
7
 import zsynthetic.FunctionTToU;
4
 import zsynthetic.FunctionTToU;
8
 
5
 
16
                 break;
13
                 break;
17
             case Error:
14
             case Error:
18
                 E error = ((Result.Error<T, E>)this).value;
15
                 E error = ((Result.Error<T, E>)this).value;
19
-                temp1 = new Error(error);
16
+                temp1 = new Result.Error(error);
20
                 break;
17
                 break;
21
             default:
18
             default:
22
                 throw new AssertionError("Missing case");
19
                 throw new AssertionError("Missing case");
29
         switch (this.getDiscriminant()) {
26
         switch (this.getDiscriminant()) {
30
             case Ok:
27
             case Ok:
31
                 T result = ((Result.Ok<T, E>)this).value;
28
                 T result = ((Result.Ok<T, E>)this).value;
32
-                temp1 = new Ok(result);
29
+                temp1 = new Result.Ok(result);
33
                 break;
30
                 break;
34
             case Error:
31
             case Error:
35
                 E error = ((Result.Error<T, E>)this).value;
32
                 E error = ((Result.Error<T, E>)this).value;

+ 0
- 1
Shared/src/main/java/stdlib/StringBuildable.java View File

1
 package stdlib;
1
 package stdlib;
2
 
2
 
3
-
4
 public interface StringBuildable {
3
 public interface StringBuildable {
5
     void toString(StringBuilder output);
4
     void toString(StringBuilder output);
6
     
5
     

+ 0
- 1
Shared/src/main/java/stdlib/StringBuilder.java View File

1
 package stdlib;
1
 package stdlib;
2
 
2
 
3
-
4
 public final class StringBuilder {
3
 public final class StringBuilder {
5
     public static StringBuilder shl(StringBuilder self, StringBuildable value) {
4
     public static StringBuilder shl(StringBuilder self, StringBuildable value) {
6
         value.toString(self);
5
         value.toString(self);

+ 0
- 1
Shared/src/main/java/stdlib/Strings.java View File

2
 
2
 
3
 import java.util.ArrayList;
3
 import java.util.ArrayList;
4
 import java.util.List;
4
 import java.util.List;
5
-import stdlib.Chars;
6
 
5
 
7
 public final class Strings {
6
 public final class Strings {
8
     private Strings() {}
7
     private Strings() {}

+ 1
- 1
Shared/src/main/java/zsynthetic/FunctionTToVoid.java View File

2
 
2
 
3
 @FunctionalInterface
3
 @FunctionalInterface
4
 public interface FunctionTToVoid<T> {
4
 public interface FunctionTToVoid<T> {
5
-    void invoke(T value);
5
+    void invoke(T listener);
6
 }
6
 }

Loading…
Cancel
Save