Skip to content

Commit d4f8b9f

Browse files
LadyCailinLadyCailin
committed
Merge additional changes from genericsTake2 to reduce the diff.
1 parent 3eadef1 commit d4f8b9f

File tree

71 files changed

+418
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+418
-2
lines changed

‎src/main/java/com/laytonsmith/core/compiler/ProcedureDefinition.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.core.ParseTree;
55
import com.laytonsmith.core.constructs.CClassType;
6+
import com.laytonsmith.core.constructs.generics.GenericParameters;
67
import com.laytonsmith.core.constructs.Construct;
78
import com.laytonsmith.core.constructs.DocComment;
89
import com.laytonsmith.core.constructs.Target;
@@ -68,4 +69,8 @@ public ObjectType getObjectType() {
6869
return super.getObjectType();
6970
}
7071

72+
@Override
73+
public GenericParameters getGenericParameters() {
74+
return null;
75+
}
7176
}

‎src/main/java/com/laytonsmith/core/constructs/CBareString.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.annotations.typeof;
5+
import com.laytonsmith.core.constructs.generics.GenericParameters;
56

67
/**
78
*
@@ -44,4 +45,9 @@ public CClassType[] getInterfaces() {
4445
public CBareString duplicate() {
4546
return new CBareString(val(), getTarget());
4647
}
48+
49+
@Override
50+
public GenericParameters getGenericParameters() {
51+
return null;
52+
}
4753
}

‎src/main/java/com/laytonsmith/core/constructs/CBrace.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.core.ParseTree;
5+
import com.laytonsmith.core.constructs.generics.GenericParameters;
56
import com.laytonsmith.core.natives.interfaces.Mixed;
67

78
/**
@@ -46,4 +47,9 @@ public CClassType[] getInterfaces() {
4647
return new CClassType[]{};
4748
}
4849

50+
@Override
51+
public GenericParameters getGenericParameters() {
52+
return null;
53+
}
54+
4955
}

‎src/main/java/com/laytonsmith/core/constructs/CBracket.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.core.ParseTree;
5+
import com.laytonsmith.core.constructs.generics.GenericParameters;
56
import com.laytonsmith.core.natives.interfaces.Mixed;
67

78
/**
@@ -46,4 +47,9 @@ public CClassType[] getInterfaces() {
4647
return new CClassType[]{};
4748
}
4849

50+
@Override
51+
public GenericParameters getGenericParameters() {
52+
return null;
53+
}
54+
4955
}

‎src/main/java/com/laytonsmith/core/constructs/CDouble.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.annotations.typeof;
55
import com.laytonsmith.core.MSVersion;
6+
import com.laytonsmith.core.constructs.generics.GenericParameters;
67
import com.laytonsmith.core.exceptions.CRE.CREFormatException;
78

89
/**
@@ -77,4 +78,9 @@ public double getNumber() {
7778
return val;
7879
}
7980

81+
@Override
82+
public GenericParameters getGenericParameters() {
83+
return null;
84+
}
85+
8086
}

‎src/main/java/com/laytonsmith/core/constructs/CEntry.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.laytonsmith.core.constructs;
22

33
import com.laytonsmith.PureUtilities.Version;
4+
import com.laytonsmith.core.constructs.generics.GenericParameters;
45
import com.laytonsmith.core.natives.interfaces.Mixed;
56

67
/**
@@ -61,4 +62,9 @@ public CClassType[] getInterfaces() {
6162
return new CClassType[]{};
6263
}
6364

65+
@Override
66+
public GenericParameters getGenericParameters() {
67+
return null;
68+
}
69+
6470
}

‎src/main/java/com/laytonsmith/core/constructs/CFunction.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.laytonsmith.PureUtilities.Version;
99
import com.laytonsmith.core.ParseTree;
10+
import com.laytonsmith.core.constructs.generics.GenericParameters;
1011
import com.laytonsmith.core.environments.Environment;
1112
import com.laytonsmith.core.environments.Environment.EnvironmentImpl;
1213
import com.laytonsmith.core.exceptions.ConfigCompileException;
@@ -165,4 +166,9 @@ public CClassType[] getInterfaces() {
165166
return new CClassType[]{};
166167
}
167168

169+
@Override
170+
public GenericParameters getGenericParameters() {
171+
return null;
172+
}
173+
168174
}

‎src/main/java/com/laytonsmith/core/constructs/CInt.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.annotations.typeof;
55
import com.laytonsmith.core.MSVersion;
6+
import com.laytonsmith.core.constructs.generics.GenericParameters;
67
import com.laytonsmith.core.exceptions.CRE.CREFormatException;
78

89
/**
@@ -76,4 +77,9 @@ public double getNumber() {
7677
return (double) val;
7778
}
7879

80+
@Override
81+
public GenericParameters getGenericParameters() {
82+
return null;
83+
}
84+
7985
}

‎src/main/java/com/laytonsmith/core/constructs/CKeyword.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.laytonsmith.core.ParseTree;
55
import com.laytonsmith.core.compiler.Keyword;
66
import com.laytonsmith.core.compiler.KeywordList;
7+
import com.laytonsmith.core.constructs.generics.GenericParameters;
78
import com.laytonsmith.core.natives.interfaces.Mixed;
89

910
/**
@@ -58,4 +59,9 @@ public CClassType[] getInterfaces() {
5859
public CKeyword duplicate() {
5960
throw new UnsupportedOperationException("Should have been removed at compile time");
6061
}
62+
63+
@Override
64+
public GenericParameters getGenericParameters() {
65+
return null;
66+
}
6167
}

‎src/main/java/com/laytonsmith/core/constructs/CLabel.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.laytonsmith.PureUtilities.Version;
44
import com.laytonsmith.core.constructs.Construct.ConstructType;
5+
import com.laytonsmith.core.constructs.generics.GenericParameters;
56
import com.laytonsmith.core.natives.interfaces.Mixed;
67

78
/**
@@ -51,4 +52,9 @@ public CClassType[] getInterfaces() {
5152
return new CClassType[]{};
5253
}
5354

55+
@Override
56+
public GenericParameters getGenericParameters() {
57+
return null;
58+
}
59+
5460
}

0 commit comments

Comments
 (0)