Tolk v0.11 wasm and stdlib

Author: tolk-vm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ton/tolk-js",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Tolk Language compiler (next-generation FunC)",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",

src/index.ts

@@ -85,18 +85,20 @@ export async function runTolkCompiler(compilerConfig: TolkCompilerConfig): Promi
   const callbackPtr = mod.addFunction(function (kind: number, dataPtr: any, destContents: any, destError: any) {
     switch (kind) { // enum ReadCallback::Kind in C++
       case 0:       // realpath
-        const relativeFilename = copyFromCString(mod, dataPtr)
+        let relativeFilename = copyFromCString(mod, dataPtr)
+        if (relativeFilename.startsWith('@stdlib/') && !relativeFilename.endsWith('.tolk')) {
+          relativeFilename += '.tolk'     // import "@stdlib/gas-payments"
+        }
         allocatedPointers.push(copyToCStringPtr(mod, realpath(relativeFilename), destContents))
         break
       case 1:       // read file
         try {
           const filename = copyFromCString(mod, dataPtr) // already normalized (as returned above)
           if (filename.startsWith('@stdlib/')) {
-            const stdlibKey = filename.endsWith('.tolk') ? filename : filename + '.tolk'
-            if (!(stdlibKey in stdlibContents)) {
-              allocatedPointers.push(copyToCStringPtr(mod, stdlibKey + " not found", destError))
+            if (filename in stdlibContents) {
+              allocatedPointers.push(copyToCStringPtr(mod, stdlibContents[filename], destContents))
             } else {
-              allocatedPointers.push(copyToCStringPtr(mod, stdlibContents[stdlibKey], destContents))
+              allocatedPointers.push(copyToCStringPtr(mod, filename + " not found", destError))
             }
           } else {
             const contents = compilerConfig.fsReadCallback(filename)

src/tolk-stdlib/common.tolk

@@ -1,7 +1,13 @@
 // Standard library for Tolk (LGPL licence).
 // It contains common functions that are available out of the box, the user doesn't have to import anything.
 // More specific functions are required to be imported explicitly, like "@stdlib/tvm-dicts".
-tolk 0.10
+tolk 0.11
+
+/// In Tolk v1.x there would be a type `map<K,V>`.
+/// Currently, working with dictionaries is still low-level, with raw cells.
+/// But just for clarity, we use "dict" instead of a "cell?" where a cell-dictionary is assumed.
+/// Every dictionary object can be null. TVM NULL is essentially "empty dictionary".
+type dict = cell?;
 
 /**
   Tuple manipulation primitives.
@@ -144,9 +150,9 @@ fun getMyOriginalBalance(): int
 
 /// Same as [getMyOriginalBalance], but returns a tuple:
 /// `int` — balance in nanotoncoins;
-/// `cell` — a dictionary with 32-bit keys representing the balance of "extra currencies".
+/// `dict` — a dictionary with 32-bit keys representing the balance of "extra currencies".
 @pure
-fun getMyOriginalBalanceWithExtraCurrencies(): [int, cell?]
+fun getMyOriginalBalanceWithExtraCurrencies(): [int, dict]
     asm "BALANCE";
 
 /// Returns the logical time of the current transaction.
@@ -476,12 +482,12 @@ fun getLastBits(self: slice, len: int): slice
 /// Loads a dictionary (TL HashMapE structure, represented as TVM cell) from a slice.
 /// Returns `null` if `nothing` constructor is used.
 @pure
-fun loadDict(mutate self: slice): cell?
+fun loadDict(mutate self: slice): dict
     asm( -> 1 0) "LDDICT";
 
 /// Preloads a dictionary (cell) from a slice.
 @pure
-fun preloadDict(self: slice): cell?
+fun preloadDict(self: slice): dict
     asm "PLDDICT";
 
 /// Loads a dictionary as [loadDict], but returns only the remainder of the slice.
@@ -556,7 +562,7 @@ fun storeBool(mutate self: builder, x: bool): self
 /// Stores dictionary (represented by TVM `cell` or `null`) into a builder.
 /// In other words, stores a `1`-bit and a reference to [c] if [c] is not `null` and `0`-bit otherwise.
 @pure
-fun storeDict(mutate self: builder, c: cell?): self
+fun storeDict(mutate self: builder, c: dict): self
     asm(c self) "STDICT";
 
 /// Stores (Maybe ^Cell) into a builder.
@@ -720,7 +726,7 @@ fun reserveToncoinsOnBalance(nanoTonCoins: int, reserveMode: int): void
 
 /// Similar to [reserveToncoinsOnBalance], but also accepts a dictionary extraAmount (represented by a cell or null)
 /// with extra currencies. In this way currencies other than Toncoin can be reserved.
-fun reserveExtraCurrenciesOnBalance(nanoTonCoins: int, extraAmount: cell?, reserveMode: int): void
+fun reserveExtraCurrenciesOnBalance(nanoTonCoins: int, extraAmount: dict, reserveMode: int): void
     asm "RAWRESERVEX";
 
 

src/tolk-stdlib/gas-payments.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 0.10
+tolk 0.11
 
 /**
   Gas and payment related primitives.

src/tolk-stdlib/lisp-lists.tolk

@@ -1,5 +1,5 @@
 // A part of standard library for Tolk
-tolk 0.10
+tolk 0.11
 
 /**
     Lisp-style lists are nested 2-elements tuples: `(1, (2, (3, null)))` represents list `[1, 2, 3]`.