refactor: according to review feedback

boblat · boblat · commit c8abc46f5e9b · 2024-11-01T10:34:07.000+08:00
- use weak map to store generic type info
- rename GenericTypeInfo interface to TypeInfo
- stop explicitly filling Uint8Array with 0 as it is the default
  behaviour
diff --git a/src/encoders.ts b/src/encoders.ts
@@ -4,12 +4,12 @@ import { AccountCls } from './impl/account'
 import { ApplicationCls } from './impl/application'
 import { AssetCls } from './impl/asset'
 
-export interface GenericTypeInfo {
+export interface TypeInfo {
   name: string
-  genericArgs?: GenericTypeInfo[] | Record<string, GenericTypeInfo>
+  genericArgs?: TypeInfo[] | Record<string, TypeInfo>
 }
 
-type fromBytes<T> = (val: Uint8Array, typeInfo: GenericTypeInfo) => T
+type fromBytes<T> = (val: Uint8Array, typeInfo: TypeInfo) => T
 
 const booleanFromBytes: fromBytes<boolean> = (val) => {
   return internal.encodingUtil.uint8ArrayToBigInt(val) > 0n
@@ -53,7 +53,7 @@ export const encoders = {
   // 'Tuple<*>': tupleFromBytes,
 }
 
-export const getEncoder = <T>(typeInfo: GenericTypeInfo): fromBytes<T> => {
+export const getEncoder = <T>(typeInfo: TypeInfo): fromBytes<T> => {
   const encoder = Object.entries(encoders).find(([k, _]) => new RegExp(`^${k}$`, 'i').test(typeInfo.name))?.[1]
   if (!encoder) {
     throw new Error(`No encoder found for type ${typeInfo.name}`)
diff --git a/src/impl/base.ts b/src/impl/base.ts
@@ -1,6 +1,6 @@
 import { Bytes, bytes, Uint64, uint64 } from '@algorandfoundation/algorand-typescript'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import type { GenericTypeInfo } from '../encoders'
+import type { TypeInfo } from '../encoders'
 
 export abstract class BytesBackedCls {
   #value: bytes
@@ -9,16 +9,12 @@ export abstract class BytesBackedCls {
   get bytes() {
     return this.#value
   }
-  constructor(value: bytes, _typeInfo?: GenericTypeInfo) {
+  constructor(value: bytes, _typeInfo?: TypeInfo) {
     this.#value = value
     // this.#typeInfo = typeInfo
   }
 
-  static fromBytes<T extends BytesBackedCls>(
-    this: { new (v: bytes, typeInfo?: GenericTypeInfo): T },
-    value: Uint8Array,
-    typeInfo?: GenericTypeInfo,
-  ) {
+  static fromBytes<T extends BytesBackedCls>(this: { new (v: bytes, typeInfo?: TypeInfo): T }, value: Uint8Array, typeInfo?: TypeInfo) {
     return new this(Bytes(value), typeInfo)
   }
 }
diff --git a/src/impl/box.ts b/src/impl/box.ts
@@ -14,7 +14,7 @@ export const Box: internal.opTypes.BoxType = {
     if (lazyContext.ledger.boxExists(app, name)) {
       return false
     }
-    lazyContext.ledger.setBox(app, name, new Uint8Array(Array(size).fill(0)))
+    lazyContext.ledger.setBox(app, name, new Uint8Array(size))
     return true
   },
   delete(a: internal.primitives.StubBytesCompat): boolean {
@@ -89,7 +89,7 @@ export const Box: internal.opTypes.BoxType = {
     const size = boxContent.length
     let updatedContent
     if (newSize > size) {
-      updatedContent = conactUint8Arrays(boxContent, new Uint8Array(Array(newSize - size).fill(0)))
+      updatedContent = conactUint8Arrays(boxContent, new Uint8Array(newSize - size))
     } else {
       updatedContent = boxContent.slice(0, newSize)
     }
@@ -120,7 +120,7 @@ export const Box: internal.opTypes.BoxType = {
     if (updatedContent.length > size) {
       updatedContent = updatedContent.slice(0, size)
     } else if (updatedContent.length < size) {
-      updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(Array(size - asNumber(updatedContent.length)).fill(0)))
+      updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(size - asNumber(updatedContent.length)))
     }
     lazyContext.ledger.setBox(app, name, updatedContent)
   },
diff --git a/src/impl/pure.ts b/src/impl/pure.ts
@@ -52,7 +52,7 @@ export const bzero = (a: internal.primitives.StubUint64Compat): bytes => {
   if (size > MAX_BYTES_SIZE) {
     internal.errors.avmError('bzero attempted to create a too large string')
   }
-  return Bytes(new Uint8Array(Array(Number(size)).fill(0x00)))
+  return Bytes(new Uint8Array(Number(size)))
 }
 
 export const concat = (a: internal.primitives.StubBytesCompat, b: internal.primitives.StubBytesCompat): bytes => {
diff --git a/src/impl/state.ts b/src/impl/state.ts
@@ -17,7 +17,7 @@ import {
 import { AccountMap } from '../collections/custom-key-map'
 import { MAX_BOX_SIZE } from '../constants'
 import { lazyContext } from '../context-helpers/internal-context'
-import { GenericTypeInfo, getEncoder } from '../encoders'
+import { getEncoder, TypeInfo } from '../encoders'
 import { getGenericTypeInfo } from '../runtime-helpers'
 import { asBytes, asBytesCls, asNumber, asUint8Array, conactUint8Arrays, toBytes } from '../util'
 
@@ -131,7 +131,7 @@ export class BoxCls<TValue> {
 
   private get fromBytes() {
     const typeInfo = getGenericTypeInfo(this)
-    const valueType = (typeInfo!.genericArgs! as GenericTypeInfo[])[0]
+    const valueType = (typeInfo!.genericArgs! as TypeInfo[])[0]
     return (val: Uint8Array) => getEncoder<TValue>(valueType)(val, valueType)
   }
 
@@ -199,7 +199,7 @@ export class BoxMapCls<TKey, TValue> {
 
   private get fromBytes() {
     const typeInfo = getGenericTypeInfo(this)
-    const valueType = (typeInfo!.genericArgs! as GenericTypeInfo[])[1]
+    const valueType = (typeInfo!.genericArgs! as TypeInfo[])[1]
     return (val: Uint8Array) => getEncoder<TValue>(valueType)(val, valueType)
   }
 
@@ -320,7 +320,7 @@ export class BoxRefCls {
     if (this.exists) {
       return false
     }
-    this.backingValue = new Uint8Array(Array(size).fill(0))
+    this.backingValue = new Uint8Array(size)
     return true
   }
 
@@ -354,7 +354,7 @@ export class BoxRefCls {
     if (updatedContent.length > content.length) {
       updatedContent = updatedContent.slice(0, content.length)
     } else if (updatedContent.length < content.length) {
-      updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(Array(content.length - updatedContent.length).fill(0)))
+      updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(content.length - updatedContent.length))
     }
     this.backingValue = updatedContent
   }
@@ -404,7 +404,7 @@ export class BoxRefCls {
     }
     let updatedContent
     if (newSizeNumber > content.length) {
-      updatedContent = conactUint8Arrays(content, new Uint8Array(Array(newSizeNumber - content.length).fill(0)))
+      updatedContent = conactUint8Arrays(content, new Uint8Array(newSizeNumber - content.length))
     } else {
       updatedContent = content.slice(0, newSize)
     }
diff --git a/src/runtime-helpers.ts b/src/runtime-helpers.ts
@@ -1,6 +1,6 @@
 import { internal } from '@algorandfoundation/algorand-typescript'
 import { MAX_UINT64 } from './constants'
-import type { GenericTypeInfo } from './encoders'
+import type { TypeInfo } from './encoders'
 import { DeliberateAny } from './typescript-helpers'
 import { nameOfType } from './util'
 
@@ -274,12 +274,12 @@ function defaultUnaryOp(_operand: DeliberateAny, op: UnaryOps): DeliberateAny {
   internal.errors.internalError(`Unsupported operator ${op}`)
 }
 
-const genericTypeMap = new Map<DeliberateAny, GenericTypeInfo>()
+const genericTypeMap = new WeakMap<DeliberateAny, TypeInfo>()
 export function captureGenericTypeInfo(target: DeliberateAny, t: string) {
   genericTypeMap.set(target, JSON.parse(t))
   return target
 }
 
-export function getGenericTypeInfo(target: DeliberateAny): GenericTypeInfo | undefined {
+export function getGenericTypeInfo(target: DeliberateAny): TypeInfo | undefined {
   return genericTypeMap.get(target)
 }
diff --git a/src/subcontexts/contract-context.ts b/src/subcontexts/contract-context.ts
@@ -2,7 +2,7 @@ import { Account, Application, Asset, BaseContract, Bytes, bytes, Contract, Loca
 import { getAbiMetadata } from '../abi-metadata'
 import { BytesMap } from '../collections/custom-key-map'
 import { lazyContext } from '../context-helpers/internal-context'
-import type { GenericTypeInfo } from '../encoders'
+import type { TypeInfo } from '../encoders'
 import { AccountCls } from '../impl/account'
 import { ApplicationCls } from '../impl/application'
 import { AssetCls } from '../impl/asset'
@@ -32,7 +32,7 @@ interface States {
   totals: StateTotals
 }
 
-const isUint64GenericType = (typeInfo: GenericTypeInfo | undefined) => {
+const isUint64GenericType = (typeInfo: TypeInfo | undefined) => {
   if (!Array.isArray(typeInfo?.genericArgs) || !typeInfo?.genericArgs?.length) return false
   return typeInfo.genericArgs.some((t) => t.name.toLocaleLowerCase() === 'uint64')
 }
diff --git a/src/test-transformer/visitors.ts b/src/test-transformer/visitors.ts
@@ -1,6 +1,6 @@
 import { anyPType, ContractClassPType, FunctionPType, PType, SourceLocation, typeRegistry, TypeResolver } from '@algorandfoundation/puya-ts'
 import ts from 'typescript'
-import type { GenericTypeInfo } from '../encoders'
+import type { TypeInfo } from '../encoders'
 import { DeliberateAny } from '../typescript-helpers'
 import { TransformerConfig } from './index'
 import { nodeFactory } from './node-factory'
@@ -187,8 +187,8 @@ class ClassVisitor {
   }
 }
 
-const getGenericTypeInfo = (type: PType): GenericTypeInfo => {
-  let genericArgs: GenericTypeInfo[] | Record<string, GenericTypeInfo> | undefined = typeRegistry.isGeneric(type)
+const getGenericTypeInfo = (type: PType): TypeInfo => {
+  let genericArgs: TypeInfo[] | Record<string, TypeInfo> | undefined = typeRegistry.isGeneric(type)
     ? type.getGenericArgs().map(getGenericTypeInfo)
     : undefined
 
@@ -204,7 +204,7 @@ const getGenericTypeInfo = (type: PType): GenericTypeInfo => {
     }
   }
 
-  const result: GenericTypeInfo = { name: type?.name ?? 'unknown' }
+  const result: TypeInfo = { name: type?.name ?? 'unknown' }
   if (genericArgs && (genericArgs.length || Object.keys(genericArgs).length)) {
     result.genericArgs = genericArgs
   }
diff --git a/tests/primitives/bytes.spec.ts b/tests/primitives/bytes.spec.ts
@@ -170,7 +170,7 @@ describe('Bytes', async () => {
 
   describe.each([MAX_BYTES_SIZE + 1, MAX_BYTES_SIZE * 2])('value overflows', (size) => {
     it(`${size} bytes`, () => {
-      const a = new Uint8Array(size).fill(0)
+      const a = new Uint8Array(size)
       expect(() => Bytes(a)).toThrow(/Bytes length \d+ exceeds maximum length/)
     })
   })
diff --git a/tests/references/asset.spec.ts b/tests/references/asset.spec.ts
@@ -56,7 +56,7 @@ describe('Asset', () => {
       unitName: asBytes('TEST'),
       name: asBytes('Test Asset'),
       url: asBytes('https://test.com'),
-      metadataHash: Bytes(new Uint8Array(Array(32).fill(0x00))),
+      metadataHash: Bytes(new Uint8Array(32)),
       manager: Account(),
       freeze: Account(),
       clawback: Account(),
diff --git a/tests/references/box-ref.spec.ts b/tests/references/box-ref.spec.ts
@@ -31,7 +31,7 @@ describe('BoxRef', () => {
 
       expect(box.length).toBe(size)
 
-      assertBoxValue(box, new Uint8Array(Array(size).fill(0)))
+      assertBoxValue(box, new Uint8Array(size))
     })
   })
 
@@ -196,7 +196,7 @@ describe('BoxRef', () => {
 
       box.put(value)
 
-      const content = box.get({ default: Bytes(new Uint8Array(Array(size).fill(0x00))) })
+      const content = box.get({ default: Bytes(new Uint8Array(size)) })
       expect(content).toEqual(value)
 
       const [opContent, opExists] = op.Box.get(box.key)
@@ -215,7 +215,7 @@ describe('BoxRef', () => {
       expect(box.exists).toBe(true)
       expect(box.length).toBe(10)
 
-      const content = box.get({ default: Bytes(new Uint8Array(Array(10).fill(0x00))) })
+      const content = box.get({ default: Bytes(new Uint8Array(10)) })
       expect(content).toEqual(Bytes(boxValue))
     })
   })
@@ -224,7 +224,7 @@ describe('BoxRef', () => {
     ctx.txn.createScope([ctx.any.txn.applicationCall()]).execute(() => {
       const box = BoxRef({ key: TEST_BOX_KEY })
 
-      const defaultValue = Bytes(new Uint8Array(Array(10).fill(0x00)))
+      const defaultValue = Bytes(new Uint8Array(10))
       const content = box.get({ default: defaultValue })
       expect(content).toEqual(defaultValue)
     })
@@ -252,7 +252,7 @@ describe('BoxRef', () => {
       const replacement = new Uint8Array(Array(2).fill(0x11))
       box.splice(1, 1, Bytes(replacement))
 
-      const content = box.get({ default: Bytes(new Uint8Array(Array(size).fill(0x00))) })
+      const content = box.get({ default: Bytes(new Uint8Array(size)) })
 
       const opBoxKey = asBytes('another_key')
       op.Box.create(opBoxKey, size)
@@ -280,7 +280,7 @@ describe('BoxRef', () => {
       const replacement = new Uint8Array(Array(2).fill(0x11))
       box.splice(1, 5, Bytes(replacement))
 
-      const content = box.get({ default: Bytes(new Uint8Array(Array(size).fill(0x00))) })
+      const content = box.get({ default: Bytes(new Uint8Array(size)) })
 
       const opBoxKey = asBytes('another_key')
       op.Box.create(opBoxKey, size)
diff --git a/tests/util.ts b/tests/util.ts
@@ -3,7 +3,7 @@ import { ABIValue } from 'algosdk'
 import { createHash } from 'crypto'
 
 export const padUint8Array = (arr: Uint8Array, padSize: number): Uint8Array => {
-  const paddedUint8Array = new Uint8Array(arr.length + padSize).fill(0)
+  const paddedUint8Array = new Uint8Array(arr.length + padSize)
   arr.forEach((v, i) => (paddedUint8Array[padSize + i] = v))
   return paddedUint8Array
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { Bytes, bytes, Uint64, uint64 } from '@algorandfoundation/algorand-typescript'`
`2`	`2`	`import { encodingUtil } from '@algorandfoundation/puya-ts'`
`3`		`-import type { GenericTypeInfo } from '../encoders'`
	`3`	`+import type { TypeInfo } from '../encoders'`
`4`	`4`
`5`	`5`	`export abstract class BytesBackedCls {`
`6`	`6`	`#value: bytes`
`@@ -9,16 +9,12 @@ export abstract class BytesBackedCls {`
`9`	`9`	`get bytes() {`
`10`	`10`	`return this.#value`
`11`	`11`	`}`
`12`		`- constructor(value: bytes, _typeInfo?: GenericTypeInfo) {`
	`12`	`+ constructor(value: bytes, _typeInfo?: TypeInfo) {`
`13`	`13`	`this.#value = value`
`14`	`14`	`// this.#typeInfo = typeInfo`
`15`	`15`	`}`
`16`	`16`
`17`		`- static fromBytes<T extends BytesBackedCls>(`
`18`		`- this: { new (v: bytes, typeInfo?: GenericTypeInfo): T },`
`19`		`- value: Uint8Array,`
`20`		`- typeInfo?: GenericTypeInfo,`
`21`		`- ) {`
	`17`	`+ static fromBytes<T extends BytesBackedCls>(this: { new (v: bytes, typeInfo?: TypeInfo): T }, value: Uint8Array, typeInfo?: TypeInfo) {`
`22`	`18`	`return new this(Bytes(value), typeInfo)`
`23`	`19`	`}`
`24`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export const bzero = (a: internal.primitives.StubUint64Compat): bytes => {`
`52`	`52`	`if (size > MAX_BYTES_SIZE) {`
`53`	`53`	`internal.errors.avmError('bzero attempted to create a too large string')`
`54`	`54`	`}`
`55`		`- return Bytes(new Uint8Array(Array(Number(size)).fill(0x00)))`
	`55`	`+ return Bytes(new Uint8Array(Number(size)))`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`export const concat = (a: internal.primitives.StubBytesCompat, b: internal.primitives.StubBytesCompat): bytes => {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import {`
`17`	`17`	`import { AccountMap } from '../collections/custom-key-map'`
`18`	`18`	`import { MAX_BOX_SIZE } from '../constants'`
`19`	`19`	`import { lazyContext } from '../context-helpers/internal-context'`
`20`		`-import { GenericTypeInfo, getEncoder } from '../encoders'`
	`20`	`+import { getEncoder, TypeInfo } from '../encoders'`
`21`	`21`	`import { getGenericTypeInfo } from '../runtime-helpers'`
`22`	`22`	`import { asBytes, asBytesCls, asNumber, asUint8Array, conactUint8Arrays, toBytes } from '../util'`
`23`	`23`
`@@ -131,7 +131,7 @@ export class BoxCls<TValue> {`
`131`	`131`
`132`	`132`	`private get fromBytes() {`
`133`	`133`	`const typeInfo = getGenericTypeInfo(this)`
`134`		`- const valueType = (typeInfo!.genericArgs! as GenericTypeInfo[])[0]`
	`134`	`+ const valueType = (typeInfo!.genericArgs! as TypeInfo[])[0]`
`135`	`135`	`return (val: Uint8Array) => getEncoder<TValue>(valueType)(val, valueType)`
`136`	`136`	`}`
`137`	`137`
`@@ -199,7 +199,7 @@ export class BoxMapCls<TKey, TValue> {`
`199`	`199`
`200`	`200`	`private get fromBytes() {`
`201`	`201`	`const typeInfo = getGenericTypeInfo(this)`
`202`		`- const valueType = (typeInfo!.genericArgs! as GenericTypeInfo[])[1]`
	`202`	`+ const valueType = (typeInfo!.genericArgs! as TypeInfo[])[1]`
`203`	`203`	`return (val: Uint8Array) => getEncoder<TValue>(valueType)(val, valueType)`
`204`	`204`	`}`
`205`	`205`
`@@ -320,7 +320,7 @@ export class BoxRefCls {`
`320`	`320`	`if (this.exists) {`
`321`	`321`	`return false`
`322`	`322`	`}`
`323`		`- this.backingValue = new Uint8Array(Array(size).fill(0))`
	`323`	`+ this.backingValue = new Uint8Array(size)`
`324`	`324`	`return true`
`325`	`325`	`}`
`326`	`326`
`@@ -354,7 +354,7 @@ export class BoxRefCls {`
`354`	`354`	`if (updatedContent.length > content.length) {`
`355`	`355`	`updatedContent = updatedContent.slice(0, content.length)`
`356`	`356`	`} else if (updatedContent.length < content.length) {`
`357`		`- updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(Array(content.length - updatedContent.length).fill(0)))`
	`357`	`+ updatedContent = conactUint8Arrays(updatedContent, new Uint8Array(content.length - updatedContent.length))`
`358`	`358`	`}`
`359`	`359`	`this.backingValue = updatedContent`
`360`	`360`	`}`
`@@ -404,7 +404,7 @@ export class BoxRefCls {`
`404`	`404`	`}`
`405`	`405`	`let updatedContent`
`406`	`406`	`if (newSizeNumber > content.length) {`
`407`		`- updatedContent = conactUint8Arrays(content, new Uint8Array(Array(newSizeNumber - content.length).fill(0)))`
	`407`	`+ updatedContent = conactUint8Arrays(content, new Uint8Array(newSizeNumber - content.length))`
`408`	`408`	`} else {`
`409`	`409`	`updatedContent = content.slice(0, newSize)`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { internal } from '@algorandfoundation/algorand-typescript'`
`2`	`2`	`import { MAX_UINT64 } from './constants'`
`3`		`-import type { GenericTypeInfo } from './encoders'`
	`3`	`+import type { TypeInfo } from './encoders'`
`4`	`4`	`import { DeliberateAny } from './typescript-helpers'`
`5`	`5`	`import { nameOfType } from './util'`
`6`	`6`
`@@ -274,12 +274,12 @@ function defaultUnaryOp(_operand: DeliberateAny, op: UnaryOps): DeliberateAny {`
`274`	`274`	internal.errors.internalError(`Unsupported operator ${op}`)
`275`	`275`	`}`
`276`	`276`
`277`		`-const genericTypeMap = new Map<DeliberateAny, GenericTypeInfo>()`
	`277`	`+const genericTypeMap = new WeakMap<DeliberateAny, TypeInfo>()`
`278`	`278`	`export function captureGenericTypeInfo(target: DeliberateAny, t: string) {`
`279`	`279`	`genericTypeMap.set(target, JSON.parse(t))`
`280`	`280`	`return target`
`281`	`281`	`}`
`282`	`282`
`283`		`-export function getGenericTypeInfo(target: DeliberateAny): GenericTypeInfo \| undefined {`
	`283`	`+export function getGenericTypeInfo(target: DeliberateAny): TypeInfo \| undefined {`
`284`	`284`	`return genericTypeMap.get(target)`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { anyPType, ContractClassPType, FunctionPType, PType, SourceLocation, typeRegistry, TypeResolver } from '@algorandfoundation/puya-ts'`
`2`	`2`	`import ts from 'typescript'`
`3`		`-import type { GenericTypeInfo } from '../encoders'`
	`3`	`+import type { TypeInfo } from '../encoders'`
`4`	`4`	`import { DeliberateAny } from '../typescript-helpers'`
`5`	`5`	`import { TransformerConfig } from './index'`
`6`	`6`	`import { nodeFactory } from './node-factory'`
`@@ -187,8 +187,8 @@ class ClassVisitor {`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`		`-const getGenericTypeInfo = (type: PType): GenericTypeInfo => {`
`191`		`- let genericArgs: GenericTypeInfo[] \| Record<string, GenericTypeInfo> \| undefined = typeRegistry.isGeneric(type)`
	`190`	`+const getGenericTypeInfo = (type: PType): TypeInfo => {`
	`191`	`+ let genericArgs: TypeInfo[] \| Record<string, TypeInfo> \| undefined = typeRegistry.isGeneric(type)`
`192`	`192`	`? type.getGenericArgs().map(getGenericTypeInfo)`
`193`	`193`	`: undefined`
`194`	`194`
`@@ -204,7 +204,7 @@ const getGenericTypeInfo = (type: PType): GenericTypeInfo => {`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`207`		`- const result: GenericTypeInfo = { name: type?.name ?? 'unknown' }`
	`207`	`+ const result: TypeInfo = { name: type?.name ?? 'unknown' }`
`208`	`208`	`if (genericArgs && (genericArgs.length \|\| Object.keys(genericArgs).length)) {`
`209`	`209`	`result.genericArgs = genericArgs`
`210`	`210`	`}`