Skip to content

Commit 6666118

Browse files
codefraucodefrau
committed
Forgot to update vmVersion
1 parent 249db52 commit 6666118

File tree

3 files changed

+84
-84
lines changed

3 files changed

+84
-84
lines changed

‎dist/squeak_bundle.js‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
Object.extend(Squeak,
117117
"version", {
118118
// system attributes
119-
vmVersion: "SqueakJS 1.2.0",
120-
vmDate: "2024-03-25", // Maybe replace at build time?
119+
vmVersion: "SqueakJS 1.2.1",
120+
vmDate: "2024-05-27", // Maybe replace at build time?
121121
vmBuild: "unknown", // or replace at runtime by last-modified?
122122
vmPath: "unknown", // Replace at runtime
123123
vmFile: "vm.js",
@@ -3076,37 +3076,37 @@
30763076

30773077
// Arithmetic Ops... + - < > <= >= = ~= * / @ lshift: lxor: land: lor:
30783078
case 0xB0: this.success = true; this.resultIsFloat = false;
3079-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) + this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // PLUS +
3079+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) + this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // PLUS +
30803080
case 0xB1: this.success = true; this.resultIsFloat = false;
3081-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) - this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // MINUS -
3081+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) - this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // MINUS -
30823082
case 0xB2: this.success = true;
3083-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) < this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LESS <
3083+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) < this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LESS <
30843084
case 0xB3: this.success = true;
3085-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) > this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GRTR >
3085+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) > this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GRTR >
30863086
case 0xB4: this.success = true;
3087-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) <= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LEQ <=
3087+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) <= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LEQ <=
30883088
case 0xB5: this.success = true;
3089-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) >= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GEQ >=
3089+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) >= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GEQ >=
30903090
case 0xB6: this.success = true;
3091-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) === this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // EQU =
3091+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) === this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // EQU =
30923092
case 0xB7: this.success = true;
3093-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) !== this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // NEQ ~=
3093+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) !== this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // NEQ ~=
30943094
case 0xB8: this.success = true; this.resultIsFloat = false;
3095-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) * this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // TIMES *
3095+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) * this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // TIMES *
30963096
case 0xB9: this.success = true;
3097-
if(!this.pop2AndPushIntResult(this.quickDivide(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide /
3097+
if (!this.pop2AndPushIntResult(this.quickDivide(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide /
30983098
case 0xBA: this.success = true;
3099-
if(!this.pop2AndPushIntResult(this.mod(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // MOD \
3099+
if (!this.pop2AndPushIntResult(this.mod(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // MOD \
31003100
case 0xBB: this.success = true;
3101-
if(!this.primHandler.primitiveMakePoint(1, true)) this.sendSpecial(b&0xF); return; // MakePt int@int
3101+
if (!this.primHandler.primitiveMakePoint(1, true)) this.sendSpecial(b&0xF); return; // MakePt int@int
31023102
case 0xBC: this.success = true;
3103-
if(!this.pop2AndPushIntResult(this.safeShift(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // bitShift:
3103+
if (!this.pop2AndPushIntResult(this.safeShift(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // bitShift:
31043104
case 0xBD: this.success = true;
3105-
if(!this.pop2AndPushIntResult(this.div(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide //
3105+
if (!this.pop2AndPushIntResult(this.div(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide //
31063106
case 0xBE: this.success = true;
3107-
if(!this.pop2AndPushIntResult(this.stackInteger(1) & this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitAnd:
3107+
if (!this.pop2AndPushIntResult(this.stackInteger(1) & this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitAnd:
31083108
case 0xBF: this.success = true;
3109-
if(!this.pop2AndPushIntResult(this.stackInteger(1) | this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitOr:
3109+
if (!this.pop2AndPushIntResult(this.stackInteger(1) | this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitOr:
31103110

31113111
// at:, at:put:, size, next, nextPut:, ...
31123112
case 0xC0: case 0xC1: case 0xC2: case 0xC3: case 0xC4: case 0xC5: case 0xC6: case 0xC7:
@@ -3190,37 +3190,37 @@
31903190

31913191
// Arithmetic Ops... + - < > <= >= = ~= * / @ lshift: lxor: land: lor:
31923192
case 0x60: this.success = true; this.resultIsFloat = false;
3193-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) + this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // PLUS +
3193+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) + this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // PLUS +
31943194
case 0x61: this.success = true; this.resultIsFloat = false;
3195-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) - this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // MINUS -
3195+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) - this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // MINUS -
31963196
case 0x62: this.success = true;
3197-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) < this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LESS <
3197+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) < this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LESS <
31983198
case 0x63: this.success = true;
3199-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) > this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GRTR >
3199+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) > this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GRTR >
32003200
case 0x64: this.success = true;
3201-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) <= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LEQ <=
3201+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) <= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // LEQ <=
32023202
case 0x65: this.success = true;
3203-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) >= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GEQ >=
3203+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) >= this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // GEQ >=
32043204
case 0x66: this.success = true;
3205-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) === this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // EQU =
3205+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) === this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // EQU =
32063206
case 0x67: this.success = true;
3207-
if(!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) !== this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // NEQ ~=
3207+
if (!this.pop2AndPushBoolResult(this.stackIntOrFloat(1) !== this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // NEQ ~=
32083208
case 0x68: this.success = true; this.resultIsFloat = false;
3209-
if(!this.pop2AndPushNumResult(this.stackIntOrFloat(1) * this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // TIMES *
3209+
if (!this.pop2AndPushNumResult(this.stackIntOrFloat(1) * this.stackIntOrFloat(0))) this.sendSpecial(b&0xF); return; // TIMES *
32103210
case 0x69: this.success = true;
3211-
if(!this.pop2AndPushIntResult(this.quickDivide(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide /
3211+
if (!this.pop2AndPushIntResult(this.quickDivide(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide /
32123212
case 0x6A: this.success = true;
3213-
if(!this.pop2AndPushIntResult(this.mod(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // MOD \
3213+
if (!this.pop2AndPushIntResult(this.mod(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // MOD \
32143214
case 0x6B: this.success = true;
3215-
if(!this.primHandler.primitiveMakePoint(1, true)) this.sendSpecial(b&0xF); return; // MakePt int@int
3215+
if (!this.primHandler.primitiveMakePoint(1, true)) this.sendSpecial(b&0xF); return; // MakePt int@int
32163216
case 0x6C: this.success = true;
3217-
if(!this.pop2AndPushIntResult(this.safeShift(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // bitShift:
3217+
if (!this.pop2AndPushIntResult(this.safeShift(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // bitShift:
32183218
case 0x6D: this.success = true;
3219-
if(!this.pop2AndPushIntResult(this.div(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide //
3219+
if (!this.pop2AndPushIntResult(this.div(this.stackInteger(1),this.stackInteger(0)))) this.sendSpecial(b&0xF); return; // Divide //
32203220
case 0x6E: this.success = true;
3221-
if(!this.pop2AndPushIntResult(this.stackInteger(1) & this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitAnd:
3221+
if (!this.pop2AndPushIntResult(this.stackInteger(1) & this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitAnd:
32223222
case 0x6F: this.success = true;
3223-
if(!this.pop2AndPushIntResult(this.stackInteger(1) | this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitOr:
3223+
if (!this.pop2AndPushIntResult(this.stackInteger(1) | this.stackInteger(0))) this.sendSpecial(b&0xF); return; // bitOr:
32243224

32253225
// at:, at:put:, size, next, nextPut:, ...
32263226
case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77:
@@ -3443,7 +3443,7 @@
34433443
var sema = this.specialObjects[Squeak.splOb_TheLowSpaceSemaphore];
34443444
if (!sema.isNil) this.primHandler.synchronousSignal(sema);
34453445
}
3446-
// if(now >= nextPollTick) {
3446+
// if (now >= nextPollTick) {
34473447
// ioProcessEvents(); //sets interruptPending if interrupt key pressed
34483448
// nextPollTick= now + 500; } //msecs to wait before next call to ioProcessEvents"
34493449
if (this.interruptPending) {
@@ -7025,8 +7025,8 @@
70257025
var rcvr = this.vm.stackValue(1);
70267026
var sqArgCount = this.stackInteger(0);
70277027
var homeCtxt = rcvr;
7028-
if(!this.vm.isContext(homeCtxt)) this.success = false;
7029-
if(!this.success) return rcvr;
7028+
if (!this.vm.isContext(homeCtxt)) this.success = false;
7029+
if (!this.success) return rcvr;
70307030
if (typeof homeCtxt.pointers[Squeak.Context_method] === "number")
70317031
// ctxt is itself a block; get the context for its enclosing method
70327032
homeCtxt = homeCtxt.pointers[Squeak.BlockContext_home];
@@ -7617,7 +7617,7 @@
76177617
this.vm.image.fullGC("snapshot"); // before cleanup so traversal works
76187618
var buffer = this.vm.image.writeToBuffer();
76197619
// Write snapshot if files are supported
7620-
if(Squeak.flushAllFiles) {
7620+
if (Squeak.flushAllFiles) {
76217621
Squeak.flushAllFiles(); // so there are no more writes pending
76227622
Squeak.filePut(this.vm.image.name, buffer);
76237623
}
@@ -7626,7 +7626,7 @@
76267626
},
76277627
primitiveQuit: function(argCount) {
76287628
// Flush any files if files are supported
7629-
if(Squeak.flushAllFiles)
7629+
if (Squeak.flushAllFiles)
76307630
Squeak.flushAllFiles();
76317631
this.display.quitFlag = true;
76327632
this.vm.breakNow("quit");
@@ -40289,7 +40289,7 @@
4028940289
if (this.status == plugin.Socket_Connected ||
4029040290
this.status == plugin.Socket_OtherEndClosed ||
4029140291
this.status == plugin.Socket_WaitingForConnection) {
40292-
if(this.webSocket) {
40292+
if (this.webSocket) {
4029340293
this.webSocket.close();
4029440294
this.webSocket = null;
4029540295
}

0 commit comments

Comments
 (0)