Browse Source

Added a couple minor things

Stan Hebben 7 years ago
parent
commit
2e1c7964a6

+ 1
- 0
.gitignore View File

@@ -1 +1,2 @@
1 1
 outputJava/
2
+ide.json

+ 1
- 1
codemodel/src/CompareType.zs View File

@@ -8,7 +8,7 @@ export enum CompareType {
8 8
 	SAME("==="),
9 9
 	NOTSAME("!==");
10 10
 	
11
-	val str as string;
11
+	val str as string : get;
12 12
 	
13 13
 	this(str as string) {
14 14
 		this.str = str;

+ 3
- 9
codemodel/src/HighLevelDefinition.zs View File

@@ -14,9 +14,9 @@ public abstract class HighLevelDefinition : Taggable {
14 14
 	val name as string : get;
15 15
 	val modifiers as int : get;
16 16
 	val members as IDefinitionMember[] : get;
17
-	val typeParameters as TypeParameter[] : get = [];
17
+	val typeParameters as TypeParameter[] : get, set = [];
18 18
 	
19
-	val outerDefinition as HighLevelDefinition? : get;
19
+	val outerDefinition as HighLevelDefinition? : get, get;
20 20
 	val superType as ITypeID? : get, set;
21 21
 	
22 22
 	public this(
@@ -36,10 +36,7 @@ public abstract class HighLevelDefinition : Taggable {
36 36
 	}
37 37
 	
38 38
 	public get numerOfTypeParameters as int
39
-		=> genericParameters.length;
40
-	
41
-	public set outerDefinition as HighLevelDefinition
42
-		=> outerDefinition = $;
39
+		=> typeParameters.length;
43 40
 	
44 41
 	public get isInnerDefinition
45 42
 		=> outerDefinition != null;
@@ -49,9 +46,6 @@ public abstract class HighLevelDefinition : Taggable {
49 46
 			members.add(member);
50 47
 	}
51 48
 	
52
-	public set typeParameters as TypeParameter[]
53
-		=> typeParameters = $;
54
-	
55 49
 	public get fields as FieldMember[]
56 50
 		=> members.filter(member => member is FieldMember).map(member as FieldMember);
57 51
 	

+ 25
- 0
codemodel/src/Modifiers.zs View File

@@ -0,0 +1,25 @@
1
+public class Modifiers {
2
+	public const PUBLIC as int = 1;
3
+	public const EXPORT as int = 2;
4
+	public const PRIVATE as int = 4;
5
+	public const ABSTRACT as int = 8;
6
+	public const FINAL as int = 16;
7
+	public const CONST as int = 32;
8
+	public const CONST_OPTIONAL as int = 64;
9
+	public const STATIC as int = 128;
10
+	public const PROTECTED as int = 256;
11
+	public const IMPLICIT as int = 512;
12
+	public const VIRTUAL as int = 1024;
13
+	public const EXTERN as int = 2048;
14
+	public const OVERRIDE as int = 4096;
15
+	public const IMMUTABLE as int = 8192;
16
+	
17
+	public static isPublic(modifiers as int) as bool
18
+		=> (modifiers & PUBLIC) > 0;
19
+	
20
+	public static isExport(modifiers as int) as bool
21
+		=> (modifiers & EXPORT) > 0;
22
+	
23
+	public static isProtected(modifiers as int) as bool
24
+		=> (modifiers & PROTECTED) > 0;
25
+}

+ 2
- 1
codemodel/src/definition/EnumDefinition.zs View File

@@ -1,9 +1,10 @@
1 1
 import .HighLevelDefinition;
2 2
 import .member.EnumConstantMember;
3
+import collections.List;
3 4
 import shared.CodePosition;
4 5
 
5 6
 export class EnumDefinition : HighLevelDefinition {
6
-	val enumConstants as EnumConstantMember[] : get = [];
7
+	val enumConstants as List<EnumConstantMember> : get = new List<EnumConstantMember>();
7 8
 	
8 9
 	public this(
9 10
 		position as CodePosition,

+ 1
- 1
project.json View File

@@ -1,6 +1,6 @@
1 1
 {
2 2
 	"targets": [
3
-		{ "module": "shared", "type": "javaSource", "output": "shared/outputJava/src/main/java", "name": "SharedJavaSource" }
3
+		{ "module": "codemodel", "type": "javaSource", "output": "codemodel/outputJava/src/main/java", "name": "SharedJavaSource" }
4 4
 	],
5 5
 	"modules": [
6 6
 		"shared",

+ 1
- 1
shared/src/CodePosition.zs View File

@@ -1,5 +1,5 @@
1 1
 export struct CodePosition {
2
-	public const BUILTIN as CodePosition  = new CodePosition("builtin", 0, 0, 0, 0);
2
+	public const BUILTIN as CodePosition = new CodePosition("builtin", 0, 0, 0, 0);
3 3
 	public const NATIVE as CodePosition = new CodePosition("native", 0, 0, 0, 0);
4 4
 	
5 5
 	val filename as string : get;

+ 2
- 3
shared/src/CompileException.zs View File

@@ -1,7 +1,6 @@
1 1
 public class CompileException : Exception {
2
-	public static internalError(message as string) as CompileException {
3
-		return new CompileException(CodePosition.BUILTIN, INTERNAL_ERROR, message);
4
-	}
2
+	public static internalError(message as string) as CompileException
3
+		=> new CompileException(CodePosition.BUILTIN, INTERNAL_ERROR, message);
5 4
 	
6 5
 	val position as CodePosition : get;
7 6
 	val code as CompileExceptionCode : get;

Loading…
Cancel
Save