GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): Allow MERGE keyword in storage #380. @othonlima

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-12-12 13:47:07 -03:00
parent dee0c8cca7
commit 6d022b4023
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/basic.gblib/services/GBVMService.ts
View file

@ -549,7 +549,18 @@ export class GBVMService extends GBService {
// Defines local utility BASIC functions.
const ubound = (gbarray) => {return gbarray ? gbarray.length - 1: 0};
const ubound = (gbarray) => {
if (gbarray){
let length = gbarray.length;
if (length > 0){
if(gbarray[0].gbarray){
return length - 1;
}
}
}
return length;
}
const isarray = (gbarray) => {return Array.isArray(gbarray) };
// Proxies remote functions as BASIC functions.
@ -782,7 +793,7 @@ export class GBVMService extends GBService {
let line = lines[i - 1];
// Remove lines before statments.
// Remove lines before statements.
line = line.replace(/^\s*\d+\s*/gi, '');

3
src/app.ts
View file

@ -112,7 +112,8 @@ export class GBServer {
process.on('uncaughtException', (err, p) => {
if (err !== null) {
err = err['e'] ? err['e'] : err;
GBLog.error(`UNCAUGHT_EXCEPTION: ${err.toString()} ${err['stack'] ? '\n' + err['stack'] : ''}`);
const msg = `${err['code']?err['code']:''} ${err.message?err.message:''} ${err['description']?err['description']:''}`
GBLog.error(`UNCAUGHT_EXCEPTION: ${err.toString()} ${err['stack'] ? '\n' + err['stack'] : ''} ${msg}`);
} else {
GBLog.error('UNCAUGHT_EXCEPTION: Unknown error (err is null)');
}