@harmoniclabs/pebble 0.1.0-dev6 → 0.1.0-dev8

package/dist/compiler/tir/statements/TirIfStmt.d.ts

@@ -6,7 +6,6 @@ export declare class TirIfStmt implements ITirStmt {
     thenBranch: TirStmt;
     elseBranch: TirStmt | undefined;
     readonly range: SourceRange;
-    private _creationStack?;
     constructor(condition: TirExpr, thenBranch: TirStmt, elseBranch: TirStmt | undefined, range: SourceRange);
     toString(): string;
     pretty(indent: number): string;

package/dist/compiler/tir/statements/TirIfStmt.js

@@ -4,13 +4,11 @@ export class TirIfStmt {
     thenBranch;
     elseBranch;
     range;
-    _creationStack;
     constructor(condition, thenBranch, elseBranch, range) {
         this.condition = condition;
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.range = range;
-        this._creationStack = new Error().stack;
     }
     toString() {
         return (`if( ${this.condition.toString()} ) ` +
@@ -29,7 +27,6 @@ export class TirIfStmt {
             (this.elseBranch ? ` else ${this.elseBranch.pretty(indent)}` : ""));
     }
     definitelyTerminates() {
-        console.log(this._creationStack);
         return (this.thenBranch.definitelyTerminates()
             && (this.elseBranch?.definitelyTerminates() ?? false));
     }

package/dist/parser/Parser.js

@@ -1139,7 +1139,9 @@ export class Parser extends DiagnosticEmitter {
         // precedence climbing
         // see: http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm#climbing
         let nextPrecedence;
-        while ((nextPrecedence = determinePrecedence(tn.peek())) >= precedence) {
+        let prevState;
+        outer_while: while ((nextPrecedence = determinePrecedence(tn.peek())) >= precedence) {
+            prevState = tn.mark();
             const token = tn.next();
             // DO NOT DIRECTLY RETURN FROM HERE
             // we need to loop to support right associative operators
@@ -1320,6 +1322,11 @@ export class Parser extends DiagnosticEmitter {
                         expr = makeBinaryExpr(token, expr, next, tn.range(startPos, tn.pos));
                         break;
                     }
+                // comma operator handled in caller (only valid in for statements)
+                case Token.Comma: {
+                    tn.reset(prevState);
+                    break outer_while;
+                }
                 default: {
                     return this.error(DiagnosticCode.Expression_expected, tn.range());
                 }
@@ -2016,6 +2023,12 @@ export class Parser extends DiagnosticEmitter {
             case Token.Question_Question_Equals: {
                 return this.error(DiagnosticCode.Not_implemented_0, tn.range(), "??=");
             }
+            case Token.Plus_Plus: {
+                return makeAssignmentStmt(varIdentifier, Token.Plus_Equals, new LitIntExpr(BigInt(1), tn.range()), tn.range(startPos, tn.pos));
+            }
+            case Token.Minus_Minus: {
+                return makeAssignmentStmt(varIdentifier, Token.Minus_Equals, new LitIntExpr(BigInt(1), tn.range()), tn.range(startPos, tn.pos));
+            }
             default: {
                 return this.error(DiagnosticCode._0_expected, tn.range(), "=");
             }
@@ -2180,8 +2193,11 @@ export class Parser extends DiagnosticEmitter {
                     return this.error(DiagnosticCode.Invalid_for_statement_update, update.range);
                 updates.push(update);
             } while (tn.skip(Token.Comma)); // comma expression (allowed only in for update part)
-            if (!tn.skip(Token.CloseParen))
+            if (!tn.skip(Token.CloseParen)) {
+                const next = tn.peek();
+                console.error('next token after for updates:', Token[next]);
                 return this.error(DiagnosticCode._0_expected, tn.range(), ")");
+            }
         }
         const body = this.parseStatement();
         if (!body)

package/dist/parser/Precedence.js

@@ -89,6 +89,7 @@ export function determinePrecedence(kind) {
         case Token.Plus_Plus:
         case Token.Minus_Minus: return Precedence.UnaryPostfix;
         case Token.Dot:
+        case Token.Exclamation_Dot:
         case Token.Question_Dot:
         case Token.OpenBracket:
         case Token.Exclamation: return Precedence.MemberAccess;

package/dist/utils/BitUtils/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * @static
  */
-export default class BitUtils {
+export declare class BitUtils {
     private constructor();
     /**
      * @deprecated not sure it has ever made sense to have it

package/dist/utils/BitUtils/index.js

@@ -1,7 +1,7 @@
 /**
  * @static
  */
-export default class BitUtils {
+export class BitUtils {
     constructor() { }
     /**
      * @deprecated not sure it has ever made sense to have it

package/dist/utils/IsSingleKey.d.ts

@@ -3,5 +3,5 @@ type SingleKeyObj<K extends string | number | symbol, V = any> = {
         [Q in keyof O]: O[Q];
     } : never;
 }[K];
-export default SingleKeyObj;
 export type IsSingleKey<Obj extends object> = Obj extends SingleKeyObj<keyof Obj> ? true : false;
+export {};

package/dist/utils/UPLCFlatUtils/index.d.ts

@@ -8,7 +8,7 @@ export interface BitStreamPadToByteOptions {
 /**
  * @static
  */
-export default class UPLCFlatUtils {
+export declare class UPLCFlatUtils {
     /**
      * @deprecated this is a @static class, it is not supposed to have instances
      */

package/dist/utils/UPLCFlatUtils/index.js

@@ -1,6 +1,6 @@
 import { BitStream } from "@harmoniclabs/bitstream";
-import BitUtils from "../BitUtils/index.js";
 import { assert } from "../assert.js";
+import { BitUtils } from "../BitUtils/index.js";
 export function isInByteOffset(offset) {
     return (offset === 0 ||
         offset === 1 ||
@@ -14,7 +14,7 @@ export function isInByteOffset(offset) {
 /**
  * @static
  */
-export default class UPLCFlatUtils {
+export class UPLCFlatUtils {
     /**
      * @deprecated this is a @static class, it is not supposed to have instances
      */

package/dist/utils/array/keepSortedArrInplace.js

@@ -21,6 +21,7 @@ export function keepSortedStrArrInplace(target, source) {
                 target.length = i + 1; // truncate target to current index
                 return target; // no more elements to keep
             }
+            continue; // element is in source, check next without removing this
         }
         // not equal, remove the element
         target.splice(i, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harmoniclabs/pebble",
-  "version": "0.1.0-dev6",
+  "version": "0.1.0-dev8",
   "description": "A simple, yet rock solid, functional language with an imperative bias, targeting UPLC",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,6 +20,7 @@
     "build-and-replace": "npm run build && cp -r ./dist ../pebble-cli/node_modules/@harmoniclabs/pebble",
     "genDiagnosticMessages": "node ./scripts/genDiagnosticMessages.js",
     "test": "jest",
+    "test-dbg": "node --nolazy --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --colors --verbose",
     "test:debug": "node --nolazy --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --colors --verbose",
     "clear-jest": "jest --clearCache",
     "test-watch": "jest --watchman",
@@ -51,14 +52,14 @@
   "dependencies": {
     "@harmoniclabs/bigint-utils": "^1.0.0",
     "@harmoniclabs/bytestring": "^1.0.0",
-    "@harmoniclabs/cbor": "^1.6.0",
-    "@harmoniclabs/crypto": "^0.2.5",
+    "@harmoniclabs/cbor": "^1.6.6",
+    "@harmoniclabs/crypto": "^0.3.0",
     "@harmoniclabs/obj-utils": "^1.0.0",
     "@harmoniclabs/pair": "^1.0.0",
-    "@harmoniclabs/plutus-data": "^1.2.4",
-    "@harmoniclabs/plutus-machine": "^2.1.0",
+    "@harmoniclabs/plutus-data": "^1.2.6",
+    "@harmoniclabs/plutus-machine": "^2.1.1",
     "@harmoniclabs/uint8array-utils": "^1.0.4",
-    "@harmoniclabs/uplc": "^1.4.0"
+    "@harmoniclabs/uplc": "^1.4.1"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.6",

package/dist/compiler/TirCompiler/internal/_compileHoistedDeps.d.ts

@@ -1,5 +0,0 @@
-import { TirHoistedExpr } from "../../tir/expressions/TirHoistedExpr.js";
-import { TirNativeFunc } from "../../tir/expressions/TirNativeFunc.js";
-import { TypedProgram } from "../../tir/program/TypedProgram.js";
-import { DepsNode } from "./deps/DepsNode.js";
-export declare function _compileHoistedDeps(program: TypedProgram, hoistedMap: Map<string, TirHoistedExpr | TirNativeFunc>, deps: string[], depsStack: DepsNode): void;

package/dist/compiler/TirCompiler/internal/_compileHoistedDeps.js

@@ -1,39 +0,0 @@
-import { TirHoistedExpr } from "../../tir/expressions/TirHoistedExpr.js";
-import { ExpressifyCtx } from "../expressify/ExpressifyCtx.js";
-import { expressifyVars } from "../expressify/expressifyVars.js";
-export function _compileHoistedDeps(program, hoistedMap, deps, depsStack) {
-    let depName;
-    if (deps.some(dep => depsStack.includes(dep)))
-        throw new Error("Circular dependency in hoisted expressions NOT YET IMPLEMENTED");
-    while (depName = deps.pop()) {
-        const funcDecl = program.functions.get(depName);
-        if (funcDecl) {
-            _compileHoistedDeps(program, hoistedMap, funcDecl.deps(), depsStack.getNext(depName));
-            /*
-            const funcExpr = funcDecl instanceof TirInlineClosedIR ? funcDecl : expressify(
-                funcDecl,
-                undefined, // loopReplacements
-                program,
-                new ExpressifyCtx(
-                    undefined,
-                    funcDecl.returnType,
-                    program,
-                    hoistedMap
-                )
-            );
-            //*/
-            const hoistedExpr = new TirHoistedExpr(depName, funcDecl);
-            hoistedMap.set(depName, hoistedExpr);
-            continue;
-        }
-        const constDecl = program.constants.get(depName);
-        if (constDecl) {
-            _compileHoistedDeps(program, hoistedMap, constDecl.deps(), depsStack.getNext(depName));
-            const expr = expressifyVars(new ExpressifyCtx(undefined, constDecl.type, program, hoistedMap), constDecl);
-            const hoistedExpr = new TirHoistedExpr(depName, expr);
-            hoistedMap.set(depName, hoistedExpr);
-            continue;
-        }
-        throw new Error(`Hoisted dependency "${depName}" not found in program`);
-    }
-}