aontu 0.16.0 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +18 -2
  3. package/aontu.ts +2 -0
  4. package/dist/aontu.js +1 -0
  5. package/dist/aontu.js.map +1 -1
  6. package/dist/aontu.min.js +1 -1
  7. package/dist/lib/err.d.ts +1 -1
  8. package/dist/lib/err.js +2 -3
  9. package/dist/lib/err.js.map +1 -1
  10. package/dist/lib/lang.js +17 -15
  11. package/dist/lib/lang.js.map +1 -1
  12. package/dist/lib/op/disjunct.js +1 -1
  13. package/dist/lib/op/disjunct.js.map +1 -1
  14. package/dist/lib/op/unite.js +7 -11
  15. package/dist/lib/op/unite.js.map +1 -1
  16. package/dist/lib/type.d.ts +1 -0
  17. package/dist/lib/type.js.map +1 -1
  18. package/dist/lib/unify.js.map +1 -1
  19. package/dist/lib/utility.js.map +1 -1
  20. package/dist/lib/val/ConjunctVal.d.ts +1 -0
  21. package/dist/lib/val/ConjunctVal.js +3 -0
  22. package/dist/lib/val/ConjunctVal.js.map +1 -1
  23. package/dist/lib/val/DisjunctVal.d.ts +1 -0
  24. package/dist/lib/val/DisjunctVal.js +6 -0
  25. package/dist/lib/val/DisjunctVal.js.map +1 -1
  26. package/dist/lib/val/ListVal.d.ts +1 -0
  27. package/dist/lib/val/ListVal.js +5 -0
  28. package/dist/lib/val/ListVal.js.map +1 -1
  29. package/dist/lib/val/MapVal.d.ts +1 -0
  30. package/dist/lib/val/MapVal.js +5 -0
  31. package/dist/lib/val/MapVal.js.map +1 -1
  32. package/dist/lib/val/Nil.d.ts +1 -0
  33. package/dist/lib/val/Nil.js +1 -0
  34. package/dist/lib/val/Nil.js.map +1 -1
  35. package/dist/lib/val/PrefVal.d.ts +1 -0
  36. package/dist/lib/val/PrefVal.js +7 -0
  37. package/dist/lib/val/PrefVal.js.map +1 -1
  38. package/dist/lib/val/RefVal.d.ts +1 -0
  39. package/dist/lib/val/RefVal.js +3 -0
  40. package/dist/lib/val/RefVal.js.map +1 -1
  41. package/dist/lib/val/ValBase.js.map +1 -1
  42. package/dist/lib/val/VarVal.d.ts +1 -0
  43. package/dist/lib/val/VarVal.js +5 -0
  44. package/dist/lib/val/VarVal.js.map +1 -1
  45. package/dist/lib/val.d.ts +16 -10
  46. package/dist/lib/val.js +32 -21
  47. package/dist/lib/val.js.map +1 -1
  48. package/lib/err.ts +3 -3
  49. package/lib/lang.ts +19 -17
  50. package/lib/op/disjunct.ts +2 -2
  51. package/lib/op/unite.ts +8 -8
  52. package/lib/type.ts +6 -5
  53. package/lib/val/ConjunctVal.ts +3 -2
  54. package/lib/val/DisjunctVal.ts +7 -5
  55. package/lib/val/ListVal.ts +6 -4
  56. package/lib/val/MapVal.ts +6 -4
  57. package/lib/val/Nil.ts +2 -0
  58. package/lib/val/PrefVal.ts +8 -6
  59. package/lib/val/RefVal.ts +4 -2
  60. package/lib/val/VarVal.ts +5 -4
  61. package/lib/val.ts +53 -36
  62. package/package.json +14 -9
  63. package/lib/utility.ts~ +0 -80
package/dist/lib/val/PrefVal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PrefVal.js","sourceRoot":"","sources":["../../../lib/val/PrefVal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PrefVal.js","sourceRoot":"","sources":["../../../lib/val/PrefVal.ts"],"names":[],"mappings":"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"}
package/dist/lib/val/RefVal.d.ts CHANGED
@@ -3,6 +3,7 @@ import { Context } from '../unify';
3
3
  import { StringVal } from '../val';
4
4
  import { ValBase } from '../val/ValBase';
5
5
  declare class RefVal extends ValBase {
6
+ isRefVal: boolean;
6
7
  absolute: boolean;
7
8
  prefix: boolean;
8
9
  constructor(spec: {
package/dist/lib/val/RefVal.js CHANGED
@@ -7,6 +7,8 @@ const err_1 = require("../err");
7
7
  const op_1 = require("../op/op");
8
8
  const val_1 = require("../val");
9
9
  const ConjunctVal_1 = require("../val/ConjunctVal");
10
+ // import { DisjunctVal } from '../val/DisjunctVal'
11
+ // import { ListVal } from '../val/ListVal'
10
12
  const MapVal_1 = require("../val/MapVal");
11
13
  const Nil_1 = require("../val/Nil");
12
14
  const VarVal_1 = require("../val/VarVal");
@@ -14,6 +16,7 @@ const ValBase_1 = require("../val/ValBase");
14
16
  class RefVal extends ValBase_1.ValBase {
15
17
  constructor(spec, ctx) {
16
18
  super(spec, ctx);
19
+ this.isRefVal = true;
17
20
  this.absolute = false;
18
21
  this.prefix = false;
19
22
  this.peg = [];
package/dist/lib/val/RefVal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RefVal.js","sourceRoot":"","sources":["../../../lib/val/RefVal.ts"],"names":[],"mappings":"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"}
package/dist/lib/val/ValBase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ValBase.js","sourceRoot":"","sources":["../../../lib/val/ValBase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAezD,kCAEgB;AAKhB,MAAM,OAAO;IAiBX,aAAa;IAGb,YAAY,IAAa,EAAE,GAAa;QAnBxC,UAAK,GAAG,IAAI,CAAA;QAGZ,SAAI,GAAW,CAAC,CAAA;QAChB,SAAI,GAAa,EAAE,CAAA;QACnB,QAAG,GAAW,CAAC,CAAC,CAAA;QAChB,QAAG,GAAW,CAAC,CAAC,CAAA;QAChB,QAAG,GAAW,EAAE,CAAA;QAEhB,QAAG,GAAY,KAAK,CAAA;QAEpB,uBAAuB;QACvB,QAAG,GAAQ,SAAS,CAAA;QAEpB,8CAA8C;QAC9C,QAAG,GAAU,EAAE,CAAA;QAKb,IAAI,CAAC,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,KAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACrD,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAA;IACnD,CAAC;IAGD,KAAK,CAAC,IAAc,EAAE,GAAa;QACjC,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxD,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAEd,IAAI,GAAG,GAAG,IAAK,IAAY;aACxB,WAAW,CAAC,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAA;QAEnD,IAAI,IAAI,IAAI,QAAQ,EAAE;YACpB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;SAC9B;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,IAAc,IAAS,OAAO,IAAI,CAAA,CAAC,CAAC;IACtD,IAAI,KAAK,KAAa,OAAO,EAAE,CAAA,CAAC,CAAC;IACjC,GAAG,CAAC,IAAc,IAAS,OAAO,IAAI,CAAA,CAAC,CAAC;CAEzC;AAGC,0BAAO"}
1
+ {"version":3,"file":"ValBase.js","sourceRoot":"","sources":["../../../lib/val/ValBase.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAezD,kCAEgB;AAKhB,MAAM,OAAO;IAiBX,aAAa;IAGb,YAAY,IAAa,EAAE,GAAa;QAnBxC,UAAK,GAAG,IAAI,CAAA;QAGZ,SAAI,GAAW,CAAC,CAAA;QAChB,SAAI,GAAa,EAAE,CAAA;QACnB,QAAG,GAAW,CAAC,CAAC,CAAA;QAChB,QAAG,GAAW,CAAC,CAAC,CAAA;QAChB,QAAG,GAAW,EAAE,CAAA;QAEhB,QAAG,GAAY,KAAK,CAAA;QAEpB,uBAAuB;QACvB,QAAG,GAAQ,SAAS,CAAA;QAEpB,8CAA8C;QAC9C,QAAG,GAAU,EAAE,CAAA;QAKb,IAAI,CAAC,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,KAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACrD,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAA;IACnD,CAAC;IAGD,KAAK,CAAC,IAAc,EAAE,GAAa;QACjC,IAAI,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxD,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAEd,IAAI,GAAG,GAAG,IAAK,IAAY;aACxB,WAAW,CAAC,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAA;QAEnD,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;YACrB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC/B,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,KAAU,EAAE,IAAc,IAAS,OAAO,IAAI,CAAA,CAAC,CAAC;IACtD,IAAI,KAAK,KAAa,OAAO,EAAE,CAAA,CAAC,CAAC;IACjC,GAAG,CAAC,IAAc,IAAS,OAAO,IAAI,CAAA,CAAC,CAAC;CAEzC;AAGC,0BAAO"}
package/dist/lib/val/VarVal.d.ts CHANGED
@@ -2,6 +2,7 @@ import type { Val, ValSpec } from '../type';
2
2
  import { Context } from '../unify';
3
3
  import { ValBase } from '../val/ValBase';
4
4
  declare class VarVal extends ValBase {
5
+ isVarVal: boolean;
5
6
  constructor(spec: {
6
7
  peg: string | Val;
7
8
  }, ctx?: Context);
package/dist/lib/val/VarVal.js CHANGED
@@ -5,6 +5,10 @@ exports.VarVal = void 0;
5
5
  const type_1 = require("../type");
6
6
  const err_1 = require("../err");
7
7
  const val_1 = require("../val");
8
+ // import { ConjunctVal } from '../val/ConjunctVal'
9
+ // import { DisjunctVal } from '../val/DisjunctVal'
10
+ // import { ListVal } from '../val/ListVal'
11
+ // import { MapVal } from '../val/MapVal'
8
12
  const Nil_1 = require("../val/Nil");
9
13
  const RefVal_1 = require("../val/RefVal");
10
14
  const ValBase_1 = require("../val/ValBase");
@@ -12,6 +16,7 @@ const ValBase_1 = require("../val/ValBase");
12
16
  class VarVal extends ValBase_1.ValBase {
13
17
  constructor(spec, ctx) {
14
18
  super(spec, ctx);
19
+ this.isVarVal = true;
15
20
  }
16
21
  unify(peer, ctx) {
17
22
  let out;
package/dist/lib/val/VarVal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../../lib/val/VarVal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../../lib/val/VarVal.ts"],"names":[],"mappings":"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"}
package/dist/lib/val.d.ts CHANGED
@@ -3,7 +3,7 @@ import { Context } from './unify';
3
3
  import { Site } from './lang';
4
4
  import { ValBase } from './val/ValBase';
5
5
  declare class TopVal extends ValBase {
6
- isVal: boolean;
6
+ isTop: boolean;
7
7
  id: number;
8
8
  top: boolean;
9
9
  peg: undefined;
@@ -13,7 +13,7 @@ declare class TopVal extends ValBase {
13
13
  col: number;
14
14
  url: string;
15
15
  constructor();
16
- unify(peer: Val, _ctx: Context): Val;
16
+ unify(peer: Val, _ctx?: Context): Val;
17
17
  get canon(): string;
18
18
  get site(): Site;
19
19
  same(peer: Val): boolean;
@@ -25,50 +25,56 @@ declare class Integer {
25
25
  }
26
26
  type ScalarConstructor = StringConstructor | NumberConstructor | BooleanConstructor | (typeof Integer.constructor);
27
27
  declare class ScalarTypeVal extends ValBase {
28
+ isScalarTypeVal: boolean;
28
29
  constructor(spec: {
29
30
  peg: ScalarConstructor;
30
31
  }, ctx?: Context);
31
- unify(peer: Val, ctx: Context): Val;
32
+ unify(peer: any, ctx?: Context): Val;
32
33
  get canon(): any;
33
- same(peer: Val): boolean;
34
+ same(peer: any): boolean;
34
35
  gen(_ctx?: Context): undefined;
35
36
  }
36
37
  declare class ScalarVal<T> extends ValBase {
37
38
  type: any;
39
+ isScalarVal: boolean;
38
40
  constructor(spec: {
39
41
  peg: T;
40
42
  type: ScalarConstructor;
41
43
  }, ctx?: Context);
42
44
  clone(spec?: ValSpec, ctx?: Context): Val;
43
- unify(peer: Val, ctx: Context): Val;
45
+ unify(peer: any, ctx?: Context): Val;
44
46
  get canon(): any;
45
- same(peer: Val): boolean;
47
+ same(peer: any): boolean;
46
48
  gen(_ctx?: Context): any;
47
49
  }
48
50
  declare class NumberVal extends ScalarVal<number> {
51
+ isNumberVal: boolean;
49
52
  constructor(spec: {
50
53
  peg: number;
51
54
  }, ctx?: Context);
52
- unify(peer: Val, ctx: Context): Val;
55
+ unify(peer: any, ctx?: Context): Val;
53
56
  }
54
57
  declare class IntegerVal extends ScalarVal<number> {
58
+ isIntegerVal: boolean;
55
59
  constructor(spec: {
56
60
  peg: number;
57
61
  }, ctx?: Context);
58
- unify(peer: Val, ctx: Context): Val;
62
+ unify(peer: any, ctx?: Context): Val;
59
63
  }
60
64
  declare class StringVal extends ScalarVal<string> {
65
+ isStringVal: boolean;
61
66
  constructor(spec: {
62
67
  peg: string;
63
68
  }, ctx?: Context);
64
- unify(peer: Val, ctx: Context): Val;
69
+ unify(peer: Val, ctx?: Context): Val;
65
70
  get canon(): string;
66
71
  }
67
72
  declare class BooleanVal extends ScalarVal<boolean> {
73
+ isBooleanVal: boolean;
68
74
  constructor(spec: {
69
75
  peg: boolean;
70
76
  }, ctx?: Context);
71
- unify(peer: Val, ctx: Context): Val;
77
+ unify(peer: Val, ctx?: Context): Val;
72
78
  static TRUE: BooleanVal;
73
79
  static FALSE: BooleanVal;
74
80
  }
package/dist/lib/val.js CHANGED
@@ -11,7 +11,7 @@ const ValBase_1 = require("./val/ValBase");
11
11
  class TopVal extends ValBase_1.ValBase {
12
12
  constructor() {
13
13
  super(null);
14
- this.isVal = true;
14
+ this.isTop = true;
15
15
  this.id = 0;
16
16
  this.top = true;
17
17
  this.peg = undefined;
@@ -47,10 +47,11 @@ exports.Integer = Integer;
47
47
  class ScalarTypeVal extends ValBase_1.ValBase {
48
48
  constructor(spec, ctx) {
49
49
  super(spec, ctx);
50
+ this.isScalarTypeVal = true;
50
51
  this.done = type_1.DONE;
51
52
  }
52
53
  unify(peer, ctx) {
53
- if (peer instanceof ScalarVal) {
54
+ if (peer === null || peer === void 0 ? void 0 : peer.isScalarVal) {
54
55
  if (peer.type === this.peg) {
55
56
  return peer;
56
57
  }
@@ -60,7 +61,7 @@ class ScalarTypeVal extends ValBase_1.ValBase {
60
61
  return Nil_1.Nil.make(ctx, 'no-scalar-unify', this, peer);
61
62
  }
62
63
  else {
63
- if (peer instanceof ScalarTypeVal) {
64
+ if (peer === null || peer === void 0 ? void 0 : peer.isScalarTypeVal) {
64
65
  if (Number === this.peg && Integer === peer.peg) {
65
66
  return peer;
66
67
  }
@@ -76,7 +77,8 @@ class ScalarTypeVal extends ValBase_1.ValBase {
76
77
  return ctor.name.toLowerCase();
77
78
  }
78
79
  same(peer) {
79
- return peer instanceof ScalarTypeVal ? this.peg === peer.peg : super.same(peer);
80
+ let out = (peer === null || peer === void 0 ? void 0 : peer.isScalarTypeVal) ? this.peg === (peer === null || peer === void 0 ? void 0 : peer.peg) : super.same(peer);
81
+ return out;
80
82
  }
81
83
  gen(_ctx) {
82
84
  return undefined;
@@ -86,6 +88,7 @@ exports.ScalarTypeVal = ScalarTypeVal;
86
88
  class ScalarVal extends ValBase_1.ValBase {
87
89
  constructor(spec, ctx) {
88
90
  super(spec, ctx);
91
+ this.isScalarVal = true;
89
92
  this.type = spec.type;
90
93
  this.done = type_1.DONE;
91
94
  }
@@ -99,7 +102,7 @@ class ScalarVal extends ValBase_1.ValBase {
99
102
  }
100
103
  unify(peer, ctx) {
101
104
  // Exactly equal scalars are handled in op/unite
102
- if (peer instanceof ScalarTypeVal) {
105
+ if (peer === null || peer === void 0 ? void 0 : peer.isScalarTypeVal) {
103
106
  return peer.unify(this, ctx);
104
107
  }
105
108
  else if (peer.top) {
@@ -111,7 +114,7 @@ class ScalarVal extends ValBase_1.ValBase {
111
114
  return this.peg.toString();
112
115
  }
113
116
  same(peer) {
114
- return peer instanceof ScalarVal ? peer.peg === this.peg : super.same(peer);
117
+ return (peer === null || peer === void 0 ? void 0 : peer.isScalarVal) ? peer.peg === this.peg : super.same(peer);
115
118
  }
116
119
  gen(_ctx) {
117
120
  return this.peg;
@@ -120,14 +123,19 @@ class ScalarVal extends ValBase_1.ValBase {
120
123
  class NumberVal extends ScalarVal {
121
124
  constructor(spec, ctx) {
122
125
  super({ peg: spec.peg, type: Number }, ctx);
126
+ this.isNumberVal = true;
123
127
  }
124
128
  unify(peer, ctx) {
125
- if (peer instanceof ScalarVal && peer.type === Integer) {
126
- return peer;
127
- }
128
- else {
129
- return super.unify(peer, ctx);
129
+ if (null != peer) {
130
+ if (peer.isScalarTypeVal && peer.type === Number) {
131
+ return this;
132
+ }
133
+ else if (peer.isScalarVal &&
134
+ peer.peg === this.peg) {
135
+ return peer.isIntegerVal ? peer : this;
136
+ }
130
137
  }
138
+ return super.unify(peer, ctx);
131
139
  }
132
140
  }
133
141
  exports.NumberVal = NumberVal;
@@ -138,25 +146,27 @@ class IntegerVal extends ScalarVal {
138
146
  throw new Error('not-integer');
139
147
  }
140
148
  super({ peg: spec.peg, type: Integer }, ctx);
149
+ this.isIntegerVal = true;
141
150
  }
142
151
  unify(peer, ctx) {
143
- if (peer instanceof ScalarTypeVal && peer.peg === Number) {
144
- return this;
145
- }
146
- else if (peer instanceof ScalarVal &&
147
- peer.type === Number &&
148
- this.peg === peer.peg) {
149
- return this;
150
- }
151
- else {
152
- return super.unify(peer, ctx);
152
+ if (null != peer) {
153
+ if (peer.isScalarTypeVal && (peer.peg === Number || peer.peg === Integer)) {
154
+ return this;
155
+ }
156
+ else if (peer.isScalarVal &&
157
+ // peer.type === Number &&
158
+ peer.peg === this.peg) {
159
+ return this;
160
+ }
153
161
  }
162
+ return super.unify(peer, ctx);
154
163
  }
155
164
  }
156
165
  exports.IntegerVal = IntegerVal;
157
166
  class StringVal extends ScalarVal {
158
167
  constructor(spec, ctx) {
159
168
  super({ peg: spec.peg, type: String }, ctx);
169
+ this.isStringVal = true;
160
170
  }
161
171
  unify(peer, ctx) {
162
172
  return super.unify(peer, ctx);
@@ -169,6 +179,7 @@ exports.StringVal = StringVal;
169
179
  class BooleanVal extends ScalarVal {
170
180
  constructor(spec, ctx) {
171
181
  super({ peg: spec.peg, type: Boolean }, ctx);
182
+ this.isBooleanVal = true;
172
183
  }
173
184
  unify(peer, ctx) {
174
185
  return super.unify(peer, ctx);
package/dist/lib/val.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"val.js","sourceRoot":"","sources":["../../lib/val.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"val.js","sourceRoot":"","sources":["../../lib/val.ts"],"names":[],"mappings":"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"}
package/lib/err.ts CHANGED
@@ -5,8 +5,8 @@ import { Nil } from './val/Nil'
5
5
 
6
6
 
7
7
  // TODO: move to utility?
8
- function descErr<NILS extends Nil | Nil[]>(err: NILS): any {
9
- if (err instanceof Nil) {
8
+ function descErr<NILS extends Nil | Nil[]>(err: NILS | any): any {
9
+ if (err?.isNil) {
10
10
  if (null == err.msg || '' === err.msg) {
11
11
  let v1: any = err.primary
12
12
  let v2: any = err.secondary
@@ -36,7 +36,7 @@ function descErr<NILS extends Nil | Nil[]>(err: NILS): any {
36
36
  return err
37
37
  }
38
38
  else {
39
- return err.map(n => descErr(n))
39
+ return err.map((n: any) => descErr(n))
40
40
  }
41
41
  }
42
42
 
package/lib/lang.ts CHANGED
@@ -167,6 +167,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
167
167
  let opmap: any = {
168
168
  'conjunct-infix': (r: Rule, _op: Op, terms: any) =>
169
169
  addpath(new ConjunctVal({ peg: terms }), r.k.path),
170
+
170
171
  'disjunct-infix': (r: Rule, _op: Op, terms: any) =>
171
172
  addpath(new DisjunctVal({ peg: terms }), r.k.path),
172
173
 
@@ -195,7 +196,8 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
195
196
  jsonic
196
197
  .use(Expr, {
197
198
  op: {
198
- // disjunct > conjunct: c & b|a -> c & (b|a)
199
+ // PPP
200
+ // disjunct > conjunct: c & b | a -> c & (b | a)
199
201
  'conjunct': {
200
202
  infix: true, src: '&', left: 14_000_000, right: 15_000_000
201
203
  },
@@ -234,6 +236,7 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
234
236
  })
235
237
 
236
238
 
239
+ // PPP
237
240
  let CJ = jsonic.token['#E&']
238
241
  let CL = jsonic.token.CL
239
242
 
@@ -241,7 +244,8 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
241
244
  jsonic.rule('val', (rs: RuleSpec) => {
242
245
 
243
246
  rs
244
- .open([{ s: [CJ, CL], p: 'map', b: 2, g: 'spread' }])
247
+ // PPP
248
+ .open([{ s: [CJ, CL], p: 'map', b: 2, n: { pk: 1 }, g: 'spread' }])
245
249
 
246
250
  .bc((r: Rule, ctx: Context) => {
247
251
 
@@ -280,12 +284,9 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
280
284
  })
281
285
 
282
286
 
283
-
284
287
  jsonic.rule('map', (rs: RuleSpec) => {
285
- // let orig_bc = rs.def.bc
286
- // rs.def.bc = function(rule: Rule, ctx: Context) {
287
- // let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
288
288
  rs
289
+ // PPP
289
290
  .open([{ s: [CJ, CL], p: 'pair', b: 2, g: 'spread' }])
290
291
 
291
292
  .bc((r: Rule) => {
@@ -307,7 +308,6 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
307
308
  r.node = addpath(new MapVal({ peg: mo }), r.k.path)
308
309
  }
309
310
 
310
- // return out
311
311
  return undefined
312
312
  })
313
313
 
@@ -316,14 +316,9 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
316
316
 
317
317
 
318
318
  jsonic.rule('list', (rs: RuleSpec) => {
319
- // let orig_bc = rs.def.bc
320
- // rs.def.bc = function(rule: Rule, ctx: Context) {
321
- // let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
322
-
323
319
  rs.bc((r: Rule) => {
324
320
  r.node = addpath(new ListVal({ peg: r.node }), r.k.path)
325
321
 
326
- // return out
327
322
  return undefined
328
323
  })
329
324
 
@@ -333,9 +328,9 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
333
328
 
334
329
  jsonic.rule('pair', (rs: RuleSpec) => {
335
330
  rs
331
+ // PPP
336
332
  .open([{
337
333
  s: [CJ, CL], p: 'val',
338
- // pair:true not set, so key ignored by normal pair close
339
334
  u: { spread: true },
340
335
  g: 'spread'
341
336
  }])
@@ -367,7 +362,8 @@ let AontuJsonic: Plugin = function aontu(jsonic: Jsonic) {
367
362
 
368
363
  jsonic.rule('elem', (rs: RuleSpec) => {
369
364
  rs
370
- .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
365
+ // PPP
366
+ .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, n: { pk: 1 }, g: 'spread' }])
371
367
 
372
368
  .bc((rule: Rule) => {
373
369
  // TRAVERSE PARENTS TO GET PATH
@@ -455,15 +451,21 @@ class Lang {
455
451
  options: Options = {
456
452
  src: '',
457
453
  print: -1,
454
+ debug: false,
458
455
  }
459
456
 
460
457
  constructor(options?: Partial<Options>) {
461
- this.options = Object.assign({}, this.options, options)
458
+ this.options = Object.assign({}, this.options, options) as Options
462
459
 
463
460
  const modelResolver = makeModelResolver(this.options)
464
461
 
465
462
  this.jsonic = Jsonic.make()
466
- // .use(Debug, { trace: true })
463
+
464
+ if (this.options.debug) {
465
+ this.jsonic.use(Debug, { trace: true })
466
+ }
467
+
468
+ this.jsonic
467
469
  .use(AontuJsonic)
468
470
  .use(MultiSource, {
469
471
  // resolver: options?.resolver || includeFileResolver
@@ -494,7 +496,7 @@ class Lang {
494
496
  val = this.jsonic(src, jm)
495
497
  }
496
498
  catch (e: any) {
497
- if (e instanceof JsonicError) {
499
+ if (e instanceof JsonicError || 'JsonicError' === e.constructor.name) {
498
500
  val = new Nil({
499
501
  why: 'parse',
500
502
  err: new Nil({
package/lib/op/disjunct.ts CHANGED
@@ -31,10 +31,10 @@ const disjunct: Operation = (ctx?: Context, a?: Val, b?: Val) => {
31
31
 
32
32
 
33
33
 
34
- function append(peers: Val[], v?: Val) {
34
+ function append(peers: Val[], v?: any) {
35
35
  // let origsite: Site = Site.NONE
36
36
 
37
- if (v instanceof DisjunctVal) {
37
+ if (v.isDisjunctVal) {
38
38
  peers.push(...v.peg)
39
39
  // origsite = v.site
40
40
  }
package/lib/op/unite.ts CHANGED
@@ -31,7 +31,7 @@ let uc = 0
31
31
 
32
32
  // Vals should only have to unify downwards (in .unify) over Vals they understand.
33
33
  // and for complex Vals, TOP, which means self unify if not yet done
34
- const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
34
+ const unite: Operation = (ctx: Context, a?: any, b?: any, whence?: string) => {
35
35
  let out = a
36
36
  let why = 'u'
37
37
  // console.log('AA OP unite IN', a?.canon, b?.canon,
@@ -53,25 +53,25 @@ const unite: Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => {
53
53
  }
54
54
 
55
55
  else if (a && b && TOP !== b) {
56
- if (a instanceof Nil) {
56
+ if (a.isNil) {
57
57
  out = update(a, b)
58
58
  why = 'an'
59
59
  }
60
- else if (b instanceof Nil) {
60
+ else if (b.isNil) {
61
61
  out = update(b, a)
62
62
  why = 'bn'
63
63
  }
64
- else if (a instanceof ConjunctVal) {
64
+ else if (a.isConjunctVal) {
65
65
  // console.log('Q', a.canon, b.canon)
66
66
  out = a.unify(b, ctx)
67
67
  unified = true
68
68
  why = 'acj'
69
69
  }
70
70
  else if (
71
- b instanceof ConjunctVal ||
72
- b instanceof DisjunctVal ||
73
- b instanceof RefVal ||
74
- b instanceof PrefVal
71
+ b.isConjunctVal ||
72
+ b.isDisjunctVal ||
73
+ b.isRefVal ||
74
+ b.isPrefVal
75
75
  ) {
76
76
 
77
77
  // console.log('U', a.canon, b.canon)
package/lib/type.ts CHANGED
@@ -14,11 +14,12 @@ import {
14
14
 
15
15
 
16
16
  type Options = {
17
- src: string, // Source text.
18
- print: number, // Print debug verbosity
19
- resolver?: Resolver, // Source resolver
20
- base?: string, // Base path for resolver
21
- path?: string, // Path of entry file
17
+ src: string // Source text.
18
+ print: number // Print debug verbosity
19
+ resolver?: Resolver // Source resolver
20
+ base?: string // Base path for resolver
21
+ path?: string // Path of entry file
22
+ debug?: boolean
22
23
  }
23
24
 
24
25
 
package/lib/val/ConjunctVal.ts CHANGED
@@ -26,17 +26,18 @@ import {
26
26
 
27
27
 
28
28
  import { TOP } from '../val'
29
- import { DisjunctVal } from '../val/DisjunctVal'
29
+ // import { DisjunctVal } from '../val/DisjunctVal'
30
30
  import { ListVal } from '../val/ListVal'
31
31
  import { MapVal } from '../val/MapVal'
32
32
  import { Nil } from '../val/Nil'
33
- import { PrefVal } from '../val/PrefVal'
33
+ // import { PrefVal } from '../val/PrefVal'
34
34
  import { RefVal } from '../val/RefVal'
35
35
  import { ValBase } from '../val/ValBase'
36
36
 
37
37
 
38
38
  // TODO: move main logic to op/conjunct
39
39
  class ConjunctVal extends ValBase {
40
+ isConjunctVal = true
40
41
 
41
42
  constructor(
42
43
  spec: {