Skip to content

Commit 7b2df3b

Browse files
committed
Finish getting rid of BasicTypeID.INVALID
1 parent 66f5c18 commit 7b2df3b

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/capture/LocalVariableExpression.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openzen.zenscript.codemodel.compilation.impl.capture;
22

33
import org.openzen.zencode.shared.CodePosition;
4+
import org.openzen.zencode.shared.CompileError;
45
import org.openzen.zenscript.codemodel.GenericName;
56
import org.openzen.zenscript.codemodel.compilation.*;
67
import org.openzen.zenscript.codemodel.compilation.expression.AbstractCompilingExpression;
@@ -14,6 +15,7 @@
1415
import org.openzen.zenscript.codemodel.expression.modifiable.ModifiableLocalVariableExpression;
1516
import org.openzen.zenscript.codemodel.ssa.*;
1617
import org.openzen.zenscript.codemodel.type.BasicTypeID;
18+
import org.openzen.zenscript.codemodel.type.InvalidTypeID;
1719

1820
import java.util.Optional;
1921

@@ -71,8 +73,10 @@ public CompilingExpression assign(CompilingExpression value) {
7173

7274
@Override
7375
public Optional<ModifiableExpression> asModifiable() {
74-
if (variable.getActualType() == null)
75-
return Optional.of(new ModifiableInvalidExpression(position, BasicTypeID.INVALID, CompileErrors.localVariableTypeUnknown(variable.name)));
76+
if (variable.getActualType() == null) {
77+
CompileError error = CompileErrors.localVariableTypeUnknown(variable.name);
78+
return Optional.of(new ModifiableInvalidExpression(position, new InvalidTypeID(position, error), error));
79+
}
7680

7781
return Optional.of(new ModifiableLocalVariableExpression(position, variable.eval()));
7882
}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/BasicTypeID.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ public boolean isEnum() {
171171
return false;
172172
}
173173

174-
@Override
175-
public boolean isInvalid() {
176-
return this == INVALID;
177-
}
178-
179174
@Override
180175
public String getName() {
181176
return name;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/builtin/BasicTypeMembers.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public static ResolvingType get(BasicTypeID type) {
2727
case VOID:
2828
case NULL:
2929
case UNDETERMINED:
30-
case INVALID:
31-
return MemberSet.create(type).build();
3230
default:
3331
MemberSet.Builder builder = MemberSet.create(type);
3432
setup(builder, type);

0 commit comments

Comments
 (0)