circuitscript 0.5.7 → 0.6.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 (48) hide show
  1. package/dist/cjs/BaseVisitor.js +1 -0
  2. package/dist/cjs/annotate/ComponentAnnotater.js +6 -12
  3. package/dist/cjs/annotate/RefdesAnnotationVisitor.js +1 -3
  4. package/dist/cjs/antlr/CircuitScriptParser.js +1105 -845
  5. package/dist/cjs/cache/serializer.js +1 -1
  6. package/dist/cjs/errors.js +6 -3
  7. package/dist/cjs/execute.js +16 -10
  8. package/dist/cjs/objects/BlockTypes.js +1 -0
  9. package/dist/cjs/objects/ClassComponent.js +3 -3
  10. package/dist/cjs/objects/Frame.js +4 -0
  11. package/dist/cjs/regenerate-tests.js +4 -1
  12. package/dist/cjs/render/draw_symbols.js +51 -12
  13. package/dist/cjs/render/geometry.js +2 -2
  14. package/dist/cjs/render/layout.js +26 -2
  15. package/dist/cjs/sizing.js +3 -2
  16. package/dist/cjs/visitor.js +126 -32
  17. package/dist/esm/BaseVisitor.js +1 -0
  18. package/dist/esm/annotate/ComponentAnnotater.js +6 -12
  19. package/dist/esm/annotate/RefdesAnnotationVisitor.js +1 -3
  20. package/dist/esm/antlr/CircuitScriptParser.js +1098 -840
  21. package/dist/esm/antlr/CircuitScriptParserVisitor.js +2 -0
  22. package/dist/esm/cache/serializer.js +1 -1
  23. package/dist/esm/errors.js +6 -3
  24. package/dist/esm/execute.js +16 -10
  25. package/dist/esm/objects/BlockTypes.js +1 -0
  26. package/dist/esm/objects/ClassComponent.js +3 -3
  27. package/dist/esm/objects/Frame.js +4 -0
  28. package/dist/esm/regenerate-tests.js +4 -1
  29. package/dist/esm/render/draw_symbols.js +51 -12
  30. package/dist/esm/render/geometry.js +2 -2
  31. package/dist/esm/render/layout.js +26 -2
  32. package/dist/esm/sizing.js +3 -2
  33. package/dist/esm/visitor.js +127 -33
  34. package/dist/libs/std.cst +518 -15
  35. package/dist/types/BaseVisitor.d.ts +2 -2
  36. package/dist/types/antlr/CircuitScriptParser.d.ts +86 -64
  37. package/dist/types/antlr/CircuitScriptParserVisitor.d.ts +4 -0
  38. package/dist/types/execute.d.ts +2 -1
  39. package/dist/types/objects/BlockTypes.d.ts +2 -1
  40. package/dist/types/objects/ClassComponent.d.ts +1 -1
  41. package/dist/types/objects/Frame.d.ts +4 -0
  42. package/dist/types/render/draw_symbols.d.ts +5 -3
  43. package/dist/types/render/geometry.d.ts +1 -0
  44. package/dist/types/render/layout.d.ts +6 -0
  45. package/dist/types/sizing.d.ts +1 -1
  46. package/dist/types/visitor.d.ts +2 -1
  47. package/libs/std.cst +518 -15
  48. package/package.json +1 -1
@@ -156,6 +156,7 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
156
156
  const rhsValue = (0, utils_js_1.unwrapValue)(rhsCtxResult);
157
157
  this.assignValueToReference(sequenceParts, leftSideReference, lhsCtx, rhsValue);
158
158
  if (sequenceParts.length > 0) {
159
+ this.log('add sequence action: assign');
159
160
  this.getScope().sequence.push([
160
161
  ExecutionScope_js_1.SequenceAction.Assign, ...sequenceParts
161
162
  ]);
@@ -26,21 +26,15 @@ class ComponentAnnotater {
26
26
  else {
27
27
  const type = instance.typeProp ?? 'conn';
28
28
  if (this.counter[type] === undefined && type.length <= 2) {
29
- for (const [, value] of Object.entries(visitor_js_1.ComponentRefDesPrefixes)) {
30
- if (value === type) {
31
- throw "Refdes prefix is already in use!";
32
- }
33
- }
34
- if (visitor_js_1.ComponentRefDesPrefixes[type] === undefined) {
35
- visitor_js_1.ComponentRefDesPrefixes[type] = type;
36
- this.counter[type] = 1;
37
- }
29
+ visitor_js_1.ComponentRefDesPrefixes[type] = type;
30
+ this.counter[type] = 1;
38
31
  }
32
+ let useType = type;
39
33
  if (visitor_js_1.ComponentRefDesPrefixes[type] === undefined) {
40
- return null;
34
+ useType = 'conn';
41
35
  }
42
- usePrefix = visitor_js_1.ComponentRefDesPrefixes[type];
43
- useCounterKey = type;
36
+ usePrefix = visitor_js_1.ComponentRefDesPrefixes[useType];
37
+ useCounterKey = useType;
44
38
  }
45
39
  let prefix = '';
46
40
  let resultRefdes = '';
@@ -32,9 +32,7 @@ class RefdesAnnotationVisitor extends BaseVisitor_js_1.BaseVisitor {
32
32
  };
33
33
  this.visitAt_block = (ctx) => {
34
34
  this.visit(ctx.at_block_header());
35
- ctx.at_block_expressions().forEach(expression => {
36
- this.visit(expression);
37
- });
35
+ this.visit(ctx.at_block_expressions());
38
36
  };
39
37
  this.visitTo_component_expr = (ctx) => {
40
38
  const allRefdes = [];