aontu 0.13.0 → 0.13.1

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 (43) hide show
  1. package/aontu.ts +4 -0
  2. package/dist/aontu.js +2 -0
  3. package/dist/aontu.js.map +1 -1
  4. package/dist/aontu.min.js +1 -1
  5. package/dist/lib/err.js +21 -14
  6. package/dist/lib/err.js.map +1 -1
  7. package/dist/lib/lang.js +22 -4
  8. package/dist/lib/lang.js.map +1 -1
  9. package/dist/lib/unify.js +16 -15
  10. package/dist/lib/unify.js.map +1 -1
  11. package/dist/lib/utility.d.ts +3 -0
  12. package/dist/lib/utility.js +17 -0
  13. package/dist/lib/utility.js.map +1 -0
  14. package/dist/lib/val/ConjunctVal.d.ts +1 -1
  15. package/dist/lib/val/ConjunctVal.js +17 -15
  16. package/dist/lib/val/ConjunctVal.js.map +1 -1
  17. package/dist/lib/val/MapVal.d.ts +1 -1
  18. package/dist/lib/val/MapVal.js +0 -3
  19. package/dist/lib/val/MapVal.js.map +1 -1
  20. package/dist/lib/val/Nil.d.ts +6 -2
  21. package/dist/lib/val/Nil.js +16 -5
  22. package/dist/lib/val/Nil.js.map +1 -1
  23. package/dist/lib/val/PrefVal.js +13 -3
  24. package/dist/lib/val/PrefVal.js.map +1 -1
  25. package/dist/lib/val/RefVal.js +14 -4
  26. package/dist/lib/val/RefVal.js.map +1 -1
  27. package/dist/lib/val/VarVal.js +13 -2
  28. package/dist/lib/val/VarVal.js.map +1 -1
  29. package/dist/lib/val.js +0 -1
  30. package/dist/lib/val.js.map +1 -1
  31. package/lib/err.ts +27 -17
  32. package/lib/lang.ts +27 -6
  33. package/lib/unify.ts +16 -60
  34. package/lib/utility.ts +23 -0
  35. package/lib/utility.ts~ +80 -0
  36. package/lib/val/ConjunctVal.ts +26 -19
  37. package/lib/val/MapVal.ts +1 -6
  38. package/lib/val/Nil.ts +31 -8
  39. package/lib/val/PrefVal.ts +18 -3
  40. package/lib/val/RefVal.ts +25 -12
  41. package/lib/val/VarVal.ts +24 -8
  42. package/lib/val.ts +0 -1
  43. package/package.json +4 -4
package/lib/val/VarVal.ts CHANGED
@@ -21,6 +21,10 @@ import {
21
21
  DONE,
22
22
  } from '../type'
23
23
 
24
+ import {
25
+ descErr
26
+ } from '../err'
27
+
24
28
  import {
25
29
  Context,
26
30
  } from '../unify'
@@ -118,16 +122,28 @@ class VarVal extends ValBase {
118
122
 
119
123
 
120
124
  gen(ctx?: Context) {
125
+ // Unresolved var cannot be generated, so always an error.
126
+ let nil = Nil.make(
127
+ ctx,
128
+ 'var',
129
+ this,
130
+ undefined
131
+ )
132
+
133
+ // TODO: refactor to use Site
134
+ nil.path = this.path
135
+ nil.url = this.url
136
+ nil.row = this.row
137
+ nil.col = this.col
138
+
139
+ descErr(nil)
140
+
121
141
  if (ctx) {
122
- ctx.err.push(Nil.make(
123
- ctx,
124
- 'var',
125
- this.peg,
126
- undefined,
127
- ))
142
+ ctx.err.push(nil)
143
+ }
144
+ else {
145
+ throw new Error(nil.msg)
128
146
  }
129
-
130
- throw new Error('REF-var ' + this.peg)
131
147
 
132
148
  return undefined
133
149
  }
package/lib/val.ts CHANGED
@@ -254,7 +254,6 @@ class IntegerVal extends ScalarVal<number> {
254
254
  return this
255
255
  }
256
256
  else {
257
- // console.log('IntegerVal Q', peer.canon)
258
257
  return super.unify(peer, ctx)
259
258
  }
260
259
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aontu",
3
- "version": "0.13.0",
3
+ "version": "0.13.1",
4
4
  "main": "dist/aontu.js",
5
5
  "type": "commonjs",
6
6
  "browser": "dist/aontu.min.js",
@@ -46,19 +46,19 @@
46
46
  "@jsonic/directive": "^0.11.0",
47
47
  "@jsonic/expr": "^0.8.0",
48
48
  "@jsonic/jsonic-next": "^2.10.0",
49
- "@jsonic/multisource": "^1.0.1",
49
+ "@jsonic/multisource": "^1.0.2",
50
50
  "@jsonic/path": "^0.6.0"
51
51
  },
52
52
  "devDependencies": {
53
53
  "@types/jest": "^29.5.2",
54
54
  "browserify": "^17.0.0",
55
- "esbuild": "^0.17.19",
55
+ "esbuild": "^0.18.8",
56
56
  "es-jest": "^2.1.0",
57
57
  "jest": "^29.5.0",
58
58
  "prettier": "^2.8.8",
59
59
  "serve": "^14.2.0",
60
60
  "tinyify": "^4.0.0",
61
61
  "typescript": "^5.1.3",
62
- "@types/node": "^20.2.5"
62
+ "@types/node": "^20.3.1"
63
63
  }
64
64
  }