Feature(compiler): Dont loss Value type/reference on variable declaration

ovr · ovr · commit 378ce778f6fc · 2018-12-23T01:39:04.000+09:00
diff --git a/src/backend/llvm/index.ts b/src/backend/llvm/index.ts
@@ -429,13 +429,9 @@ export function passVariableDeclaration(block: ts.VariableDeclaration, ctx: Cont
             ctx
         );
 
-        let value: llvm.Value;
-
         const defaultValue = buildFromExpression(block.initializer, ctx, builder, nativeTypeForDefaultValue);
-        if (defaultValue instanceof ObjectReference || defaultValue instanceof ArrayReference) {
-            value = defaultValue.getValue();
-        } else {
-            value = builder.createAlloca(
+        if (defaultValue instanceof Primitive) {
+            const value = builder.createAlloca(
                 defaultValue.getValue().type,
                 undefined,
                 <string>block.name.escapedText
@@ -446,9 +442,11 @@ export function passVariableDeclaration(block: ts.VariableDeclaration, ctx: Cont
                 value,
                 false
             );
-        }
 
-        ctx.scope.variables.set(<string>block.name.escapedText, new Primitive(value));
+            ctx.scope.variables.set(<string>block.name.escapedText, new Primitive(value, defaultValue.getType()));
+        } else {
+            ctx.scope.variables.set(<string>block.name.escapedText, defaultValue);
+        }
 
         return;
     }
diff --git a/src/backend/llvm/value.ts b/src/backend/llvm/value.ts
@@ -30,6 +30,7 @@ export function convertLLVMTypeToValueType(type: llvm.Type) {
 
 export interface Value {
     getValue(): llvm.Value;
+    getType(): ValueTypeEnum;
 
     toBoolean(ctx: Context, builder: llvm.IRBuilder, node: ts.Node): Value;
     isString(): boolean;
@@ -46,6 +47,10 @@ export class FunctionReference implements Value {
         return this.llvmValue;
     }
 
+    getType(): ValueTypeEnum {
+        throw new Error('It is not a Primitive, it is FunctionReference (=ↀωↀ=)');
+    }
+
     public toBoolean(ctx: Context, builder: llvm.IRBuilder, node: ts.Node): Value {
         throw new UnsupportedError(node, 'Cannot cast ClassReference to boolean');
     }
@@ -68,6 +73,10 @@ export class ArrayReference implements Value {
         return this.llvmValue;
     }
 
+    getType(): ValueTypeEnum {
+        throw new Error('It is not a Primitive, it is ArrayReference (=ↀωↀ=)');
+    }
+
     public toBoolean(ctx: Context, builder: llvm.IRBuilder, node: ts.Node): Value {
         throw new UnsupportedError(node, 'Cannot cast ClassReference to boolean');
     }
@@ -90,6 +99,10 @@ export class ObjectReference implements Value {
         return this.llvmValue;
     }
 
+    getType(): ValueTypeEnum {
+        throw new Error('It is not a Primitive, it is ObjectReference (=ↀωↀ=)');
+    }
+
     public toBoolean(ctx: Context, builder: llvm.IRBuilder, node: ts.Node): Value {
         throw new UnsupportedError(node, 'Cannot cast ClassReference to boolean');
     }
@@ -106,6 +119,10 @@ export class ClassReference implements Value {
         throw new Error('It is not a real value, it is ClassReference (=ↀωↀ=)');
     }
 
+    getType(): ValueTypeEnum {
+        throw new Error('It is not a Primitive, it is ClassReference (=ↀωↀ=)');
+    }
+
     constructor(structType: llvm.StructType) {
         this.structType = structType;
     }
@@ -127,6 +144,10 @@ export class Primitive implements Value {
         return this.llvmValue;
     }
 
+    getType(): ValueTypeEnum {
+        return this.type;
+    }
+
     constructor(llvmValue: llvm.Value, type?: ValueTypeEnum) {
         this.llvmValue = llvmValue;
         this.type = type || convertLLVMTypeToValueType(llvmValue.type);
