new(basic.gblib): REPORT AND RESET REPORT new keywords @othonlima
This commit is contained in:
parent
67bc886335
commit
078eb21a8c
2 changed files with 35 additions and 10 deletions
|
@ -631,6 +631,14 @@ export class GBVMService extends GBService {
|
|||
}
|
||||
};
|
||||
|
||||
// Line of Business logic.
|
||||
|
||||
let __reportMerge = {adds: 0, updates: 0, skipped: 0};
|
||||
let __report = () => {
|
||||
return 'Adds: ' + __reportMerge.adds + '. Updates: ' + __reportMerge.updates + '. Skipped: ' + __reportMerge.skipped + '.';
|
||||
};
|
||||
let REPORT = 'No report yet';
|
||||
|
||||
try{
|
||||
await ensureTokens(true);
|
||||
${ code }
|
||||
|
|
|
@ -249,7 +249,7 @@ export class KeywordsExpressions {
|
|||
|
||||
keywords[i++] = [/^\s*end function/gim, '}'];
|
||||
|
||||
keywords[i++] = [/^\s*function +(.*)\((.*)\)/gim, '$1 = ($2) => {\n'];
|
||||
keywords[i++] = [/^\s*function +(.*)\((.*)\)/gim, '$1 = async ($2) => {\n'];
|
||||
|
||||
keywords[i++] = [/^\s*for +(.*to.*)/gim, 'for ($1) {'];
|
||||
|
||||
|
@ -597,7 +597,7 @@ export class KeywordsExpressions {
|
|||
keywords[i++] = [
|
||||
/^\s*CALL\s*(.*)/gim,
|
||||
($0, $1) => {
|
||||
return `// await ${$1}`;
|
||||
return ` await ${$1}`;
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -1091,7 +1091,24 @@ export class KeywordsExpressions {
|
|||
keywords[i++] = [
|
||||
/^\s*MERGE\s*(.*)\s*WITH\s*(.*)BY\s*(.*)/gim,
|
||||
($0, $1, $2, $3) => {
|
||||
return `await sys.merge({pid: pid, file: ${$1}, data: ${$2}, key1: ${$3}})`;
|
||||
return `__reportMerge1 = await sys.merge({pid: pid, file: ${$1}, data: ${$2}, key1: ${$3}})
|
||||
__reportMerge.adds += __reportMerge1.adds;
|
||||
__reportMerge.updates += __reportMerge1.updates;
|
||||
__reportMerge.skipped += __reportMerge1.skipped;
|
||||
REPORT = __report();
|
||||
|
||||
`;
|
||||
}
|
||||
];
|
||||
|
||||
keywords[i++] = [
|
||||
/^\s*RESET REPORT\s*/gim,
|
||||
($0, $1, $2, $3) => {
|
||||
return `
|
||||
__reportMerge.adds = 0;
|
||||
__reportMerge.updates = 0;
|
||||
__reportMerge.skipped = 0;
|
||||
`;
|
||||
}
|
||||
];
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue