6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2025-02-19 23:29:06 +00:00
Code Issues Projects Releases Wiki Activity

ecs: better with filter

Browse Source
This commit is contained in:
Steven Hugg 2022-02-03 08:51:28 -06:00
parent c299bcddae
commit a7f708a303
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/common/ecs/ecs.ts
View File

@ -212,14 +212,18 @@ export class Dialect_CA65 {
@__exit: @__exit:
`; `;
// TODO: lo/hi side of range? readonly ASM_FILTER_RANGE_LO_X = `
readonly ASM_FILTER_RANGE_X = `
cpx #{{%xofs}} cpx #{{%xofs}}
bcc @__skip bcc @__skipxlo
cpx #{{%xofs}}+{{%ecount}}
bcs @__skip
{{%code}} {{%code}}
@__skip: @__skipxlo:
`
readonly ASM_FILTER_RANGE_HI_X = `
cpx #{{%xofs}}+{{%ecount}}
bcs @__skipxhi
{{%code}}
@__skipxhi:
` `
// TODO // TODO
@ -531,7 +535,7 @@ class ActionEval {
// TODO: what if we filter 0 entities? // TODO: what if we filter 0 entities?
if (int.entities.length == 0) throw new ECSError('queries do not intersect', this.action); if (int.entities.length == 0) throw new ECSError('queries do not intersect', this.action);
let indofs = int.entities[0].id - state.x.entities[0].id; let indofs = int.entities[0].id - state.x.entities[0].id;
state.xofs += indofs; state.xofs += indofs; // TODO: should merge with filter
state.x = int; state.x = int;
} else { } else {
if (this.qr.entities.length != 1) if (this.qr.entities.length != 1)
@ -570,25 +574,26 @@ class ActionEval {
props['%joinfield'] = this.dialect.fieldsymbol(joinfield.c, joinfield.f, 0); //TODO? props['%joinfield'] = this.dialect.fieldsymbol(joinfield.c, joinfield.f, 0); //TODO?
this.qr = this.jr; // TODO? this.qr = this.jr; // TODO?
} }
// select subset of entities
let entities = this.qr.entities; let entities = this.qr.entities;
props['%efullcount'] = entities.length.toString(); let fullEntityCount = entities.length.toString();
if (action.limit) { if (action.limit) {
entities = entities.slice(0, action.limit); entities = entities.slice(0, action.limit);
} }
if (entities.length == 0) if (entities.length == 0)
throw new ECSError(`query doesn't match any entities`, action.query); // TODO throw new ECSError(`query doesn't match any entities`, action.query); // TODO
this.qr.entities = entities;
// filter entities from loop? // filter entities from loop?
if (action.select == 'with' && entities.length > 1) { if (action.select == 'with' && entities.length > 1) {
// TODO: what if not needed
code = this.wrapCodeInFilter(code); code = this.wrapCodeInFilter(code);
} }
// define properties // define properties
props['%elo'] = entities[0].id.toString(); props['%elo'] = entities[0].id.toString();
props['%ehi'] = entities[entities.length - 1].id.toString(); props['%ehi'] = entities[entities.length - 1].id.toString();
props['%ecount'] = entities.length.toString(); props['%ecount'] = entities.length.toString();
props['%efullcount'] = fullEntityCount;
props['%xofs'] = this.scope.state.xofs.toString(); props['%xofs'] = this.scope.state.xofs.toString();
props['%yofs'] = this.scope.state.yofs.toString(); props['%yofs'] = this.scope.state.yofs.toString();
this.qr.entities = entities;
} }
// replace @labels // replace @labels
code = code.replace(label_re, (s: string, a: string) => `${label}__${a}`); code = code.replace(label_re, (s: string, a: string) => `${label}__${a}`);
@ -642,10 +647,20 @@ class ActionEval {
return s; return s;
} }
wrapCodeInFilter(code: string) { wrapCodeInFilter(code: string) {
// TODO: what if not needed? // TODO: :-p
let s = this.dialect.ASM_FILTER_RANGE_X; let ents = this.qr.entities;
s = s.replace('{{%code}}', code); let ents2 = this.oldState.x?.entities;
return s; if (ents && ents2) {
let lo = ents[0].id;
let hi = ents[ents.length-1].id;
let lo2 = ents2[0].id;
let hi2 = ents2[ents2.length-1].id;
if (lo != lo2)
code = this.dialect.ASM_FILTER_RANGE_LO_X.replace('{{%code}}', code);
if (hi != hi2)
code = this.dialect.ASM_FILTER_RANGE_HI_X.replace('{{%code}}', code);
}
return code;
} }
generateCodeForField(sys: System, action: Action, qr: QueryResult, generateCodeForField(sys: System, action: Action, qr: QueryResult,
fieldName: string, bitofs: number): string { fieldName: string, bitofs: number): string {