Pick up backing classes of basic types in more locations (#686)

AssemblyScript · Jun 22, 2019 · 5a8eee0 · 5a8eee0
1 parent 726e45c
commit 5a8eee0
Show file tree

Hide file tree

Showing 6 changed files with 2,704 additions and 6 deletions.
diff --git a/NOTICE b/NOTICE
@@ -14,6 +14,7 @@ under the licensing terms detailed in LICENSE:
 * Nidin Vinayakan <01@01alchemist.com>
 * Aaron Turner <aaron@aaronthedev.com>
 * Willem Wyndham <willem@cs.umd.edu>
+* Bowen Wang <bowen@nearprotocol.com>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

diff --git a/src/resolver.ts b/src/resolver.ts
@@ -748,14 +748,22 @@ export class Resolver extends DiagnosticEmitter {
               return null;
             }
             let arrayType = indexedGet.signature.returnType;
+
           // }
-          if (!(target = arrayType.classReference)) {
-            this.error(
-              DiagnosticCode.Property_0_does_not_exist_on_type_1,
-              propertyAccess.property.range, propertyName, arrayType.toString()
-            );
-            return null;
+          let classReference = arrayType.classReference;
+          if (!classReference) {
+            let typeClasses = this.program.typeClasses;
+            if (!arrayType.is(TypeFlags.REFERENCE) && typeClasses.has(arrayType.kind)) {
+              classReference = typeClasses.get(arrayType.kind)!;
+            } else {
+              this.error(
+                DiagnosticCode.Property_0_does_not_exist_on_type_1,
+                propertyAccess.property.range, propertyName, arrayType.toString()
+              );
+              return null;
+            }
           }
+          target = classReference;
         }
         break;
       }
@@ -1333,6 +1341,7 @@ export class Resolver extends DiagnosticEmitter {
       contextualType,
       reportMode
     );
+
     if (!target) return null;
     if (target.kind == ElementKind.FUNCTION_PROTOTYPE) {
       // `unchecked(expr: *): *` is special
@@ -1365,6 +1374,11 @@ export class Resolver extends DiagnosticEmitter {
           // reuse resolvedThisExpression (might be property access)
           // reuse resolvedElementExpression (might be element access)
           return functionTarget;
+        } else {
+          let typeClasses = this.program.typeClasses;
+          if (!returnType.is(TypeFlags.REFERENCE) && typeClasses.has(returnType.kind)) {
+            return typeClasses.get(returnType.kind);
+          }
         }
       }
       if (reportMode == ReportMode.REPORT) {

diff --git a/tests/compiler/resolve-access.json b/tests/compiler/resolve-access.json
@@ -0,0 +1,5 @@
+{
+  "asc_flags": [
+    "--runtime none"
+  ]
+}