Feature(compiler): Support function overloading

ovr · ovr · commit 3ed4b6820b3f · 2018-11-13T01:31:06.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "commander": "^2.19.0"
   },
   "dependencies": {
-    "@static-script/runtime": "^0.2.0",
+    "@static-script/runtime": "^0.3.0",
     "llvm-node": "github:MichaReiser/llvm-node#master",
     "typescript": "^3.1.1"
   }
diff --git a/src/backend/llvm/cpp.mangler.ts b/src/backend/llvm/cpp.mangler.ts
@@ -10,7 +10,7 @@ export class CPPMangler {
                         case ts.SyntaxKind.NumberKeyword:
                             return 'd';
                         case ts.SyntaxKind.StringKeyword:
-                            return 'c';
+                            return 'PKc';
                         default:
                             throw new Error(
                                 `Unsupported mangling parameter type: ${parameter.type.kind}`
diff --git a/src/backend/llvm/index.ts b/src/backend/llvm/index.ts
@@ -10,6 +10,8 @@ import {RUNTIME_DEFINITION_FILE} from "@static-script/runtime";
 import {LANGUAGE_DEFINITION_FILE} from "../../constants";
 import {CMangler} from "./c.mangler";
 import {ManglerInterface} from "./mangler.interface";
+import {SignatureDeclaration} from "typescript";
+import {FunctionDeclaration} from "typescript";
 
 export function passReturnStatement(parent: ts.ReturnStatement, ctx: Context, builder: llvm.IRBuilder) {
     if (!parent.expression) {
@@ -144,14 +146,49 @@ function buildFromBinaryExpression(
     }
 }
 
+function buildCalleFromCallExpression(
+    expr: ts.CallExpression,
+    ctx: Context,
+    builder: llvm.IRBuilder
+) {
+    const calleSignature = ctx.typeChecker.getResolvedSignature(expr);
+    if (calleSignature) {
+        const symbolDeclaration = <ts.SignatureDeclaration>calleSignature.declaration;
+        if (symbolDeclaration.name) {
+            const sourceFile = symbolDeclaration.getSourceFile();
+
+            if (sourceFile.fileName === RUNTIME_DEFINITION_FILE) {
+                return declareFunctionFromDefinition(
+                    <ts.FunctionDeclaration>symbolDeclaration,
+                    ctx,
+                    builder,
+                    CPPMangler
+                );
+            }
+
+            if (sourceFile.fileName === LANGUAGE_DEFINITION_FILE) {
+                return declareFunctionFromDefinition(
+                    <ts.FunctionDeclaration>symbolDeclaration,
+                    ctx,
+                    builder,
+                    CMangler
+                );
+            }
+        }
+    }
+
+    return buildFromExpression(expr.expression, ctx, builder);
+}
+
 function buildFromCallExpression(
     expr: ts.CallExpression,
     ctx: Context,
     builder: llvm.IRBuilder
 ) {
-    const callle = buildFromExpression(expr.expression, ctx, builder);
+    const callle = buildCalleFromCallExpression(expr, ctx, builder);
     if (!callle) {
-        throw new Error(
+        throw new UnsupportedError(
+            expr,
             `We cannot prepare expression to call this function, ${expr.expression}`
         );
     }
@@ -206,38 +243,6 @@ function buildFromIdentifier(identifier: ts.Identifier, ctx: Context, builder: l
         return fn;
     }
 
-    const symbol = ctx.typeChecker.getSymbolAtLocation(identifier);
-    if (symbol && symbol.declarations.length > 0) {
-        if (symbol.declarations.length > 1) {
-            throw new Error(
-                `Multiple declarations are not supported`
-            );
-        }
-
-        const symbolDeclaration = <ts.FunctionDeclaration>symbol.declarations[0];
-        if (symbolDeclaration.name) {
-            const sourceFile = symbolDeclaration.getSourceFile();
-
-            if (sourceFile.fileName === RUNTIME_DEFINITION_FILE) {
-                return declareFunctionFromDefinition(
-                    symbolDeclaration,
-                    ctx,
-                    builder,
-                    CPPMangler
-                );
-            }
-
-            if (sourceFile.fileName === LANGUAGE_DEFINITION_FILE) {
-                return declareFunctionFromDefinition(
-                    symbolDeclaration,
-                    ctx,
-                    builder,
-                    CMangler
-                );
-            }
-        }
-    }
-
     throw new UnsupportedError(
         identifier,
         `Unknown Identifier: "${<string>identifier.escapedText}"`
diff --git a/src/cli.ts b/src/cli.ts
@@ -75,7 +75,7 @@ try {
         execFileSync('llc', [
             optimizationLevel,
             '-filetype=obj', path.join(outputPath, 'main.bc'),
-            '-o', path.join(outputPath, 'main.o')
+            '-o', path.join(outputPath, 'main.o'),
         ]);
         execFileSync("cc", [
             optimizationLevel,

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"commander": "^2.19.0"`
`24`	`24`	`},`
`25`	`25`	`"dependencies": {`
`26`		`- "@static-script/runtime": "^0.2.0",`
	`26`	`+ "@static-script/runtime": "^0.3.0",`
`27`	`27`	`"llvm-node": "github:MichaReiser/llvm-node#master",`
`28`	`28`	`"typescript": "^3.1.1"`
`29`	`29`	`}`