typescript: 4.7.4 → 5.5.4

Author: fabianhjr

NOTICE

@@ -57,6 +57,7 @@ under the licensing terms detailed in LICENSE:
 * Bach Le <[email protected]>
 * Xinquan Xu <[email protected]>
 * Matt Johnson-Pint <[email protected]>
+* Fabián Heredia Montiel <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

package-lock.json

@@ -36,7 +36,7 @@
     "esbuild": "^0.19.4",
     "eslint": "^8.33.0",
     "glob": "^10.3.0",
-    "typescript": "~4.7.4"
+    "typescript": "^5.5.4"
   },
   "type": "module",
   "exports": {

package.json

@@ -1623,7 +1623,7 @@ function builtin_max(ctx: BuiltinFunctionContext): ExpressionRef {
     } else {
       arg1 = compiler.compileExpression(operands[1], type, Constraints.ConvImplicit | Constraints.MustWrap);
     }
-    let op: BinaryOp = -1;
+    let op: BinaryOp | null = null;
     switch (type.kind) {
       case TypeKind.I8:
       case TypeKind.I16:
@@ -1639,14 +1639,14 @@ function builtin_max(ctx: BuiltinFunctionContext): ExpressionRef {
       case TypeKind.F32: return module.binary(BinaryOp.MaxF32, arg0, arg1);
       case TypeKind.F64: return module.binary(BinaryOp.MaxF64, arg0, arg1);
     }
-    if (op as i32 != -1) {
+    if (op) {
       let flow = compiler.currentFlow;
       let typeRef = type.toRef();
       let temp1 = flow.getTempLocal(type);
       flow.setLocalFlag(temp1.index, LocalFlags.Wrapped);
       let temp2 = flow.getTempLocal(type);
       flow.setLocalFlag(temp2.index, LocalFlags.Wrapped);
-      let ret = module.select(
+      return module.select(
         module.local_tee(temp1.index, arg0, false), // numeric
         module.local_tee(temp2.index, arg1, false), // numeric
         module.binary(op,
@@ -1655,7 +1655,6 @@ function builtin_max(ctx: BuiltinFunctionContext): ExpressionRef {
         ),
         typeRef
       );
-      return ret;
     }
   }
   compiler.error(
@@ -1691,7 +1690,7 @@ function builtin_min(ctx: BuiltinFunctionContext): ExpressionRef {
     } else {
       arg1 = compiler.compileExpression(operands[1], type, Constraints.ConvImplicit | Constraints.MustWrap);
     }
-    let op: BinaryOp = -1;
+    let op: BinaryOp | null = null;
     switch (type.kind) {
       case TypeKind.I8:
       case TypeKind.I16:
@@ -1707,14 +1706,14 @@ function builtin_min(ctx: BuiltinFunctionContext): ExpressionRef {
       case TypeKind.F32: return module.binary(BinaryOp.MinF32, arg0, arg1);
       case TypeKind.F64: return module.binary(BinaryOp.MinF64, arg0, arg1);
     }
-    if (op as i32 != -1) {
+    if (op) {
       let flow = compiler.currentFlow;
       let typeRef = type.toRef();
       let temp1 = flow.getTempLocal(type);
       flow.setLocalFlag(temp1.index, LocalFlags.Wrapped);
       let temp2 = flow.getTempLocal(type);
       flow.setLocalFlag(temp2.index, LocalFlags.Wrapped);
-      let ret = module.select(
+      return module.select(
         module.local_tee(temp1.index, arg0, false), // numeric
         module.local_tee(temp2.index, arg1, false), // numeric
         module.binary(op,
@@ -1723,7 +1722,6 @@ function builtin_min(ctx: BuiltinFunctionContext): ExpressionRef {
         ),
         typeRef
       );
-      return ret;
     }
   }
   compiler.error(

src/builtins.ts

@@ -463,10 +463,10 @@ export class Tokenizer extends DiagnosticEmitter {
   end: i32 = 0;
 
   pos: i32 = 0;
-  token: Token = -1;
+  token: Token | null = null;
   tokenPos: i32 = 0;
 
-  nextToken: Token = -1;
+  nextToken: Token | null = null;
   nextTokenPos: i32 = 0;
   nextTokenOnNewLine: OnNewLine = OnNewLine.Unknown;
 
@@ -969,21 +969,26 @@ export class Tokenizer extends DiagnosticEmitter {
     identifierHandling: IdentifierHandling = IdentifierHandling.Default,
     maxCompoundLength: i32 = i32.MAX_VALUE
   ): Token {
-    let nextToken = this.nextToken;
-    if (nextToken < 0) {
+    if (this.nextToken) {
+      return this.nextToken;
+    } else {
+      let nextToken: Token;
       let posBefore = this.pos;
       let tokenBefore = this.token;
       let tokenPosBefore = this.tokenPos;
-      do nextToken = this.unsafeNext(identifierHandling, maxCompoundLength);
+
+      do
+        nextToken = this.unsafeNext(identifierHandling, maxCompoundLength);
       while (nextToken == Token.Invalid);
+
       this.nextToken = nextToken;
       this.nextTokenPos = this.tokenPos;
       this.nextTokenOnNewLine = OnNewLine.Unknown;
       this.pos = posBefore;
       this.token = tokenBefore;
       this.tokenPos = tokenPosBefore;
+      return nextToken;
     }
-    return nextToken;
   }
 
   peekOnNewLine(): bool {
@@ -1032,13 +1037,15 @@ export class Tokenizer extends DiagnosticEmitter {
 
   mark(): State {
     let state = reusableState;
-    if (state) {
+    if (state && this.token) {
       reusableState = null;
       state.pos = this.pos;
       state.token = this.token;
       state.tokenPos = this.tokenPos;
-    } else {
+    } else if (this.token) {
       state = new State(this.pos, this.token, this.tokenPos);
+    } else {
+      state = new State(this.pos, Token.Invalid, this.tokenPos);
     }
     return state;
   }
@@ -1055,7 +1062,7 @@ export class Tokenizer extends DiagnosticEmitter {
   }
 
   clearNextToken(): void {
-    this.nextToken = -1;
+    this.nextToken = null;
     this.nextTokenPos = 0;
     this.nextTokenOnNewLine = OnNewLine.Unknown;
   }

src/tokenizer.ts

@@ -118,7 +118,7 @@ testUTF8Decode();
 function testUTF8DecodeNullTerminated(): void {
   var buf = String.UTF8.encode(str, true);
   assert(String.UTF8.decode(buf, true) == str);
-  var str2 = "123\0456";
+  var str2 = "123\x00456";
   assert(String.UTF8.byteLength(str2, true) == 4);
   var buf2 = String.UTF8.encode(str2, true);
   assert(buf2.byteLength == 4);

tests/compiler/std/string-encoding.ts

@@ -27,7 +27,7 @@ assert(String.fromCharCode(65600) == "@");
 assert(String.fromCharCode(54) == "6");
 assert(String.fromCharCode(0x10000 + 54) == "6");
 assert(String.fromCharCode(0xD800, 0xDF00) == "𐌀");
-assert(String.fromCharCodes([0, 54]) == "\06");
+assert(String.fromCharCodes([0, 54]) == "\x006");
 assert(String.fromCharCodes([65, 66, 67]) == "ABC");
 assert(String.fromCharCodes([0xD834, 0xDF06, 0x61, 0xD834, 0xDF07]) == "\uD834\uDF06a\uD834\uDF07");