add naive record construction support
This commit is contained in:
parent
5e9a34e642
commit
89db6cf917
@ -22,9 +22,14 @@ export type DenotableType =
|
|||||||
| 'real'
|
| 'real'
|
||||||
| 'bool'
|
| 'bool'
|
||||||
| 'string'
|
| 'string'
|
||||||
|
| 'record'
|
||||||
| 'bytearray'
|
| 'bytearray'
|
||||||
| 'function'
|
| 'function';
|
||||||
| 'reference';
|
|
||||||
|
export type DenotableRecord = {
|
||||||
|
length: number;
|
||||||
|
record: Array<Denotable>;
|
||||||
|
};
|
||||||
|
|
||||||
export type DenotableValue =
|
export type DenotableValue =
|
||||||
| null
|
| null
|
||||||
@ -32,6 +37,7 @@ export type DenotableValue =
|
|||||||
| string
|
| string
|
||||||
| Uint8Array
|
| Uint8Array
|
||||||
| DenotableFunction
|
| DenotableFunction
|
||||||
|
| DenotableRecord
|
||||||
| Identifier;
|
| Identifier;
|
||||||
|
|
||||||
export type Denotable = {
|
export type Denotable = {
|
||||||
|
@ -2,13 +2,17 @@ import {
|
|||||||
type ContinuationExpression,
|
type ContinuationExpression,
|
||||||
type PrimitiveOperationExpression,
|
type PrimitiveOperationExpression,
|
||||||
type ApplicationExpression,
|
type ApplicationExpression,
|
||||||
|
type RecordExpression,
|
||||||
type Program,
|
type Program,
|
||||||
type Value,
|
type Value,
|
||||||
|
type RecordExpressionTuple,
|
||||||
|
type SelectExpression,
|
||||||
} from '@/parser';
|
} from '@/parser';
|
||||||
import { Environment, type Denotable } from '.';
|
import { Environment, type Denotable, type DenotableRecord } from '.';
|
||||||
import {
|
import {
|
||||||
BadArgumentError,
|
BadArgumentError,
|
||||||
InvalidStateError,
|
InvalidStateError,
|
||||||
|
InvalidType,
|
||||||
NotImplementedError,
|
NotImplementedError,
|
||||||
type TracingLogger,
|
type TracingLogger,
|
||||||
} from '@/utils';
|
} from '@/utils';
|
||||||
@ -112,6 +116,89 @@ const evaluatePrimitiveOperation = (
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const evaluateRecordTuple = (
|
||||||
|
tuple: RecordExpressionTuple,
|
||||||
|
env: Environment,
|
||||||
|
logger: TracingLogger,
|
||||||
|
): Denotable => {
|
||||||
|
const { value, accessPath } = tuple;
|
||||||
|
const record = evaluateValue(value, env, logger.createChild('evaluateValue'));
|
||||||
|
if (record.type === 'record') {
|
||||||
|
// TODO: Implement nested records at accessPath
|
||||||
|
logger.debug(JSON.stringify(accessPath, null, 2));
|
||||||
|
throw new NotImplementedError('Nested records are not yet supported');
|
||||||
|
}
|
||||||
|
|
||||||
|
return record;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const evaluateRecordExpression = (
|
||||||
|
{ record }: RecordExpression,
|
||||||
|
env: Environment,
|
||||||
|
logger: TracingLogger,
|
||||||
|
): Denotable => {
|
||||||
|
const {
|
||||||
|
records,
|
||||||
|
address: { name: address },
|
||||||
|
body,
|
||||||
|
} = record;
|
||||||
|
|
||||||
|
const childEnv = env.createChild();
|
||||||
|
const recordTuple = records.map(record =>
|
||||||
|
evaluateRecordTuple(
|
||||||
|
record,
|
||||||
|
childEnv,
|
||||||
|
logger.createChild('evaluateRecordTuple'),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const length = recordTuple.length;
|
||||||
|
|
||||||
|
childEnv.set(address, {
|
||||||
|
type: 'record',
|
||||||
|
value: { length, record: recordTuple },
|
||||||
|
});
|
||||||
|
|
||||||
|
return evaluteContinuationExpression(
|
||||||
|
body,
|
||||||
|
childEnv,
|
||||||
|
logger.createChild('evaluteContinuationExpression'),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const evaluateSelectExpression = (
|
||||||
|
{ select }: SelectExpression,
|
||||||
|
env: Environment,
|
||||||
|
logger: TracingLogger,
|
||||||
|
): Denotable => {
|
||||||
|
const {
|
||||||
|
index: { int: index },
|
||||||
|
record,
|
||||||
|
bind,
|
||||||
|
continuation,
|
||||||
|
} = select;
|
||||||
|
const childEnv = env.createChild();
|
||||||
|
|
||||||
|
const recordValue = evaluateValue(
|
||||||
|
record,
|
||||||
|
env,
|
||||||
|
logger.createChild('evaluateValue'),
|
||||||
|
);
|
||||||
|
if (recordValue.type !== 'record') {
|
||||||
|
throw new InvalidType('Expected record type');
|
||||||
|
}
|
||||||
|
|
||||||
|
const { value } = recordValue as { value: DenotableRecord };
|
||||||
|
|
||||||
|
const selected = value.record[index];
|
||||||
|
childEnv.set(bind.name, selected);
|
||||||
|
|
||||||
|
return evaluteContinuationExpression(
|
||||||
|
continuation,
|
||||||
|
childEnv,
|
||||||
|
logger.createChild('evaluteContinuationExpression'),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const evaluteContinuationExpression = (
|
const evaluteContinuationExpression = (
|
||||||
expr: ContinuationExpression,
|
expr: ContinuationExpression,
|
||||||
env: Environment,
|
env: Environment,
|
||||||
@ -136,10 +223,20 @@ const evaluteContinuationExpression = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('record' in expr) {
|
if ('record' in expr) {
|
||||||
throw new NotImplementedError('Continuation records are not supported yet');
|
logger.debug('Evaluating record');
|
||||||
|
return evaluateRecordExpression(
|
||||||
|
expr,
|
||||||
|
env,
|
||||||
|
logger.createChild('evaluateRecordExpression'),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if ('select' in expr) {
|
if ('select' in expr) {
|
||||||
throw new NotImplementedError('Continuation select is not supported yet');
|
logger.debug('Evaluating select');
|
||||||
|
return evaluateSelectExpression(
|
||||||
|
expr,
|
||||||
|
env,
|
||||||
|
logger.createChild('evaluateSelectExpression'),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if ('offset' in expr) {
|
if ('offset' in expr) {
|
||||||
throw new NotImplementedError('Continuation offset is not supported yet');
|
throw new NotImplementedError('Continuation offset is not supported yet');
|
||||||
|
@ -17,11 +17,11 @@ SelectExpression
|
|||||||
_?
|
_?
|
||||||
LPAREN
|
LPAREN
|
||||||
_?
|
_?
|
||||||
record:Integer
|
index:Integer
|
||||||
_?
|
_?
|
||||||
COMMA
|
COMMA
|
||||||
_?
|
_?
|
||||||
val:Value
|
record:VarStatement
|
||||||
_?
|
_?
|
||||||
COMMA
|
COMMA
|
||||||
_?
|
_?
|
||||||
@ -31,7 +31,7 @@ SelectExpression
|
|||||||
_?
|
_?
|
||||||
continuation:ContinuationExpression
|
continuation:ContinuationExpression
|
||||||
_?
|
_?
|
||||||
RPAREN { return { select: { record, val, bind, continuation } }; }
|
RPAREN { return { select: { index, record, bind, continuation } }; }
|
||||||
|
|
||||||
OffsetExpression
|
OffsetExpression
|
||||||
= OFFSET
|
= OFFSET
|
||||||
@ -86,9 +86,17 @@ SwitchExpression
|
|||||||
RPAREN { return { switch: { switchIndex, continuations } }; }
|
RPAREN { return { switch: { switchIndex, continuations } }; }
|
||||||
|
|
||||||
ApplicationExpression
|
ApplicationExpression
|
||||||
= APP _? LPAREN _? fn:(LabelStatement / VarStatement) _? COMMA _? args:ValueList _? RPAREN {
|
= APP
|
||||||
return { application: { fn, args } };
|
_?
|
||||||
}
|
LPAREN
|
||||||
|
_?
|
||||||
|
fn:(LabelStatement / VarStatement)
|
||||||
|
_?
|
||||||
|
COMMA
|
||||||
|
_?
|
||||||
|
args:ValueList
|
||||||
|
_?
|
||||||
|
RPAREN { return { application: { fn, args } }; }
|
||||||
|
|
||||||
FixBinding
|
FixBinding
|
||||||
= LPAREN
|
= LPAREN
|
||||||
@ -169,16 +177,29 @@ PrimitiveOperationExpression
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
RecordExpressionTuple
|
AccessPath
|
||||||
= LPAREN
|
= OffsetPath
|
||||||
|
/ SelectPath
|
||||||
|
|
||||||
|
OffsetPath = OFFP _ offset:Integer { return { offset: offset.int }; }
|
||||||
|
|
||||||
|
SelectPath
|
||||||
|
= SELP
|
||||||
_?
|
_?
|
||||||
value:Value
|
LPAREN
|
||||||
|
_?
|
||||||
|
index:Integer
|
||||||
_?
|
_?
|
||||||
COMMA
|
COMMA
|
||||||
_?
|
_?
|
||||||
offset:OffsetStatement
|
accessPath:AccessPath
|
||||||
_?
|
_?
|
||||||
RPAREN { return { value, offset }; }
|
RPAREN { return { select: { index, accessPath } }; }
|
||||||
|
|
||||||
|
RecordExpressionTuple
|
||||||
|
= LPAREN _? value:Value _? COMMA _? accessPath:AccessPath _? RPAREN {
|
||||||
|
return { value, accessPath };
|
||||||
|
}
|
||||||
|
|
||||||
RecordExpressionTupleList
|
RecordExpressionTupleList
|
||||||
= LBRACKET
|
= LBRACKET
|
||||||
@ -238,14 +259,6 @@ BoolStatement = BOOL _ bool:Integer { return { bool: bool.int }; }
|
|||||||
|
|
||||||
StringStatement = STRING _ string:QuotedString { return string; }
|
StringStatement = STRING _ string:QuotedString { return string; }
|
||||||
|
|
||||||
AccessStatement
|
|
||||||
= OffsetStatement
|
|
||||||
/ SelectStatement
|
|
||||||
|
|
||||||
OffsetStatement = OFFP _ offset:Integer { return offset; }
|
|
||||||
|
|
||||||
SelectStatement = SELP _ offset:Integer { return offset; }
|
|
||||||
|
|
||||||
Identifier
|
Identifier
|
||||||
= name:([A-Za-z] (LETTER / DIGIT / SAFE_SYMBOL)*) {
|
= name:([A-Za-z] (LETTER / DIGIT / SAFE_SYMBOL)*) {
|
||||||
return { name: name[0] + name[1].join('') };
|
return { name: name[0] + name[1].join('') };
|
||||||
@ -291,7 +304,8 @@ ComparisonOperation
|
|||||||
/ "||"
|
/ "||"
|
||||||
/ "&&"
|
/ "&&"
|
||||||
|
|
||||||
Integer = digits:("-"? [0-9]+) !"." { return { int: parseInt(digits.join(''), 10) }; }
|
Integer
|
||||||
|
= digits:("-"? [0-9]+) !"." { return { int: parseInt(digits.join(''), 10) }; }
|
||||||
|
|
||||||
QuotedString
|
QuotedString
|
||||||
= "'" content:[^']* "'" { return content.join(''); }
|
= "'" content:[^']* "'" { return content.join(''); }
|
||||||
@ -299,9 +313,11 @@ QuotedString
|
|||||||
|
|
||||||
Real
|
Real
|
||||||
= value:("-"? [0-9]+ ("." [0-9]+)?) {
|
= value:("-"? [0-9]+ ("." [0-9]+)?) {
|
||||||
return { real: parseFloat(
|
return {
|
||||||
value.map(x => (Array.isArray(x) ? x.join('') : x)).join(''),
|
real: parseFloat(
|
||||||
) };
|
value.map(x => (Array.isArray(x) ? x.join('') : x)).join(''),
|
||||||
|
),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
Literal
|
Literal
|
||||||
|
10600
src/parser/parser.ts
10600
src/parser/parser.ts
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
RECORD([(INT 1, OFFp 0), (INT 2, OFFp 0)], record,
|
RECORD([(INT 1, OFFp 0), (INT 2, OFFp 0)], record,
|
||||||
SELECT(0, VAR one, record,
|
SELECT(0, VAR record, one,
|
||||||
SELECT(1, VAR two, record,
|
SELECT(1, VAR record, two,
|
||||||
PRIMOP(+, [VAR one, VAR two], [result], [])
|
PRIMOP(+, [VAR one, VAR two], [result], [])
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user