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

fix(basic.gblib): Fix in BASIC regexp to catch only keywords outsite quotes.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-02-07 08:12:32 -03:00
parent 3ed733e4f8
commit 0681fe4d31
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -162,7 +162,6 @@ export class GBVMService extends GBService {
mobile = this.userMobile(step); mobile = this.userMobile(step);
from = mobile; from = mobile;
ubound = function(list){return list.length}; ubound = function(list){return list.length};
${code} ${code}
`; `;
@ -257,15 +256,15 @@ export class GBVMService extends GBService {
return `sys().createABotFarmUsing (${$3})`; return `sys().createABotFarmUsing (${$3})`;
}); });
code = code.replace(/(transfer)/gi, () => { code = code.replace(/(transfer)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
return `transfer (step)\n`; return `transfer (step)\n`;
}); });
code = code.replace(/(exit)/gi, () => { code = code.replace(/(exit)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
return `resolve();\n`; return `resolve();\n`;
}); });
code = code.replace(/(show menu)/gi, () => { code = code.replace(/(show menu)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
return `showMenu (step)\n`; return `showMenu (step)\n`;
}); });
@ -425,25 +424,25 @@ export class GBVMService extends GBService {
code = code.replace(/("[^"]*"|'[^']*')|\btalk\b/gi, ($0, $1) => { code = code.replace(/("[^"]*"|'[^']*')|\btalk\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.talk' : $1; return $1 === undefined ? 'this.talk' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bhear\b/gi, ($0, $1) => { code = code.replace(/\bhear\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.hear' : $1; return $1 === undefined ? 'this.hear' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bsendEmail\b/gi, ($0, $1) => { code = code.replace(/\bsendEmail\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendEmail' : $1; return $1 === undefined ? 'this.sendEmail' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\baskEmail\b/gi, ($0, $1) => { code = code.replace(/\baskEmail\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.askEmail' : $1; return $1 === undefined ? 'this.askEmail' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bsendFileTo\b/gi, ($0, $1) => { code = code.replace(/\bsendFileTo\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendFileTo' : $1; return $1 === undefined ? 'this.sendFileTo' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bsendFile\b/gi, ($0, $1) => { code = code.replace(/\bsendFile\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendFile' : $1; return $1 === undefined ? 'this.sendFile' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bsetLanguage\b/gi, ($0, $1) => { code = code.replace(/\bsetLanguage\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.setLanguage' : $1; return $1 === undefined ? 'this.setLanguage' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\btransfer\b/gi, ($0, $1) => { code = code.replace(/\btransfer\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
return $1 === undefined ? 'this.transfer' : $1; return $1 === undefined ? 'this.transfer' : $1;
}); });
code = code.replace(/("[^"]*"|'[^']*')|\bmenu\b/gi, ($0, $1) => { code = code.replace(/("[^"]*"|'[^']*')|\bmenu\b/gi, ($0, $1) => {