circuitscript 0.0.16 → 0.0.18

package/build/src/draw_symbols.js

@@ -53,10 +53,13 @@ export class SymbolGraphic {
     }
     pinPosition(id) {
         const pin = this.drawing.getPinPosition(id);
+        const [x, y] = pin.start;
+        const useX = Math.round(x * 10000) / 10000;
+        const useY = Math.round(y * 10000 / 10000);
         if (pin) {
             return {
-                x: pin.start[0],
-                y: pin.start[1],
+                x: useX,
+                y: useY,
                 angle: pin.angle,
             };
         }
@@ -102,9 +105,11 @@ export class SymbolGraphic {
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
+            let useDominantBaseline = vanchor;
             const isRotation180 = Math.abs(this.angle) === 180;
             if (isRotation180) {
                 useAnchor = this.flipTextAnchor(anchor);
+                useDominantBaseline = this.flipDominantBaseline(vanchor);
             }
             switch (useAnchor) {
                 case HorizontalAlign.Left:
@@ -117,7 +122,7 @@ export class SymbolGraphic {
                     anchorStyle = 'end';
                     break;
             }
-            switch (vanchor) {
+            switch (useDominantBaseline) {
                 case VerticalAlign.Top:
                     dominantBaseline = 'hanging';
                     break;
@@ -144,7 +149,7 @@ export class SymbolGraphic {
             let useRotateAngle = 0;
             if (isRotation180) {
                 translateX = -position[0];
-                translateY = position[1];
+                translateY = -position[1];
                 useRotateAngle = 0;
             }
             else {
@@ -168,6 +173,17 @@ export class SymbolGraphic {
             return HorizontalAlign.Middle;
         }
     }
+    flipDominantBaseline(value) {
+        if (value === VerticalAlign.Top) {
+            return VerticalAlign.Bottom;
+        }
+        else if (value === VerticalAlign.Bottom) {
+            return VerticalAlign.Top;
+        }
+        else {
+            return VerticalAlign.Middle;
+        }
+    }
     setLabelValue(labelId, labelValue) {
         this.labelTexts.set(labelId, labelValue);
     }

package/build/src/execute.js

@@ -1,4 +1,4 @@
-import { ComponentTypes, GlobalNames, ParamKeys, ReferenceTypes } from './globals.js';
+import { BranchType, ComponentTypes, GlobalNames, NoNetText, ParamKeys, ReferenceTypes } from './globals.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './objects/ExecutionScope.js';
 import { Net } from './objects/Net.js';
@@ -11,6 +11,7 @@ export class ExecutionContext {
     netNamespace;
     executionLevel;
     scope;
+    joinPointId = 0;
     resolveNet = null;
     stopFurtherExpressions = false;
     returnValue = null;
@@ -180,11 +181,17 @@ export class ExecutionContext {
         this.print('add symbol', instanceName, '[' + pinsOutput.join(', ') + ']');
         return component;
     }
-    printPoint() {
-        this.print('point: ' +
+    printPoint(extra = '') {
+        let netName = NoNetText;
+        if (this.scope.hasNet(this.scope.currentComponent, this.scope.currentPin)) {
+            netName = this.scope
+                .getNet(this.scope.currentComponent, this.scope.currentPin)
+                .toString();
+        }
+        this.print((extra !== '' ? (extra + ' ') : '') + 'point: ' +
             this.scope.currentComponent.instanceName +
             ' ' +
-            this.scope.currentPin);
+            this.scope.currentPin + ' ' + netName);
     }
     addComponentExisting(component, pin) {
         const startPin = pin;
@@ -298,78 +305,86 @@ export class ExecutionContext {
         this.print('created clone of net component:', cloneInstanceName);
         return clonedComponent;
     }
-    enterBranches() {
+    enterBranches(branchType) {
         this.scope.branchStack.set(this.scope.indentLevel, {
-            entered_at: [this.scope.currentComponent, this.scope.currentPin, this.scope.currentWireId],
+            entered_at: [
+                this.scope.currentComponent,
+                this.scope.currentPin,
+                this.scope.currentWireId
+            ],
             inner_branches: new Map(),
             current_index: null,
+            type: branchType,
         });
         this.print('enter branches');
     }
     exitBranches() {
-        false && this.joinBranches();
-        this.print('exit branches');
-    }
-    joinBranches() {
-        const innerBranches = this.scope.branchStack.get(this.scope.indentLevel)['inner_branches'];
-        const lastNets = [];
-        for (const [key, value] of innerBranches) {
-            if (value['ignore_last_net'] === false) {
-                const [component, pin] = value['last_net'];
-                let netPriority = 0;
-                if (this.scope.hasNet(component, pin)) {
-                    netPriority = this.scope.getNet(component, pin).priority;
-                }
-                lastNets.push([netPriority, value['last_net']]);
+        const stackRef = this.scope.branchStack.get(this.scope.indentLevel);
+        const { type: branchType } = stackRef;
+        if (branchType === BranchType.Join) {
+            const { join_final_point: finalPoint } = stackRef;
+            const [component, pin, wireId] = finalPoint;
+            this.scope.currentComponent = component;
+            this.scope.currentPin = pin;
+            this.scope.currentWireId = wireId;
+            if (wireId !== -1) {
+                this.scope.sequence.push([
+                    SequenceAction.WireJump, wireId, 1
+                ]);
             }
         }
-        if (lastNets.length > 0) {
-            const sortedNets = lastNets.sort((a, b) => {
-                if (a[0] > b[0]) {
-                    return -1;
-                }
-                else if (a[0] < b[0]) {
-                    return 1;
-                }
-                else {
-                    return 0;
-                }
-            });
-            const [comp1, pin1] = sortedNets[0][1];
-            const tmpList = sortedNets.slice(1);
-            tmpList.forEach((item) => {
-                const [, [comp2, pin2]] = item;
-                this.atComponent(comp1, pin1, { addSequence: true });
-                this.toComponent(comp2, pin2, { addSequence: true });
-            });
-            this.scope.currentComponent = comp1;
-            this.scope.currentPin = pin1;
-        }
+        this.print('exit branches');
     }
     enterBranch(branchIndex) {
-        this.print('enter inner branch >>>');
         const stackRef = this.scope.branchStack.get(this.scope.indentLevel);
         stackRef['branch_index'] = branchIndex;
+        const { type: branchType } = stackRef;
         stackRef['inner_branches'].set(branchIndex, {
             last_net: null,
             ignore_last_net: false,
         });
+        if (branchType === BranchType.Join) {
+            this.scope.currentComponent = null;
+            this.scope.currentPin = null;
+            this.scope.currentWireId = -1;
+        }
+        this.print(`enter inner branch of type (${branchType}) >>>`);
         this.scope.indentLevel += 1;
     }
     exitBranch(branchIndex) {
         const stackRef = this.scope.branchStack.get(this.scope.indentLevel - 1);
+        const { type: branchType } = stackRef;
         const branchIndexRef = stackRef['inner_branches'].get(branchIndex);
         branchIndexRef['last_net'] = [
             this.scope.currentComponent,
             this.scope.currentPin,
+            this.scope.currentWireId
         ];
         stackRef['branch_index'] = null;
         const [preBranchComponent, preBranchPin, preBranchWireId] = stackRef['entered_at'];
         this.scope.indentLevel -= 1;
         this.print('exit inner branch <<<');
-        this.atComponent(preBranchComponent, preBranchPin, { addSequence: true });
-        if (preBranchWireId !== -1) {
-            this.scope.sequence.push([SequenceAction.WireJump, preBranchWireId]);
+        if (branchType === BranchType.Branch) {
+            this.atComponent(preBranchComponent, preBranchPin, { addSequence: true });
+            if (preBranchWireId !== -1) {
+                this.scope.sequence.push([SequenceAction.WireJump, preBranchWireId, 1]);
+            }
+        }
+        else if (branchType === BranchType.Join) {
+            if (branchIndex === 0) {
+                this.addPoint(`_join.${this.name}.${this.joinPointId}`, false);
+                this.joinPointId += 1;
+                stackRef['join_final_point'] = [
+                    this.scope.currentComponent,
+                    this.scope.currentPin,
+                    this.scope.currentWireId
+                ];
+            }
+            else {
+                const { join_final_point: finalPoint } = stackRef;
+                const [joinComponent, joinPin, joinWireId] = finalPoint;
+                this.toComponent(joinComponent, joinPin, { addSequence: true });
+            }
         }
     }
     breakBranch() {
@@ -508,7 +523,7 @@ export class ExecutionContext {
             }
             else if (action === SequenceAction.WireJump) {
                 const jumpWireId = wireIdOffset + sequenceAction[1];
-                this.scope.sequence.push([SequenceAction.WireJump, jumpWireId]);
+                this.scope.sequence.push([SequenceAction.WireJump, jumpWireId, 1]);
             }
             else if (action === SequenceAction.At || action === SequenceAction.To) {
                 const tmpComponent = sequenceAction[1];
@@ -536,8 +551,17 @@ export class ExecutionContext {
                 this.scope.sequence.push(sequenceAction);
             }
         });
-        this.scope.currentComponent = currentComponent;
-        this.scope.currentPin = currentPin;
+        if (childScope.currentComponent === childScope.componentRoot) {
+            this.scope.currentComponent = currentComponent;
+            this.scope.currentPin = currentPin;
+            this.scope.currentWireId = currentWireId;
+        }
+        else {
+            this.scope.currentComponent = childScope.currentComponent;
+            this.scope.currentPin = childScope.currentPin;
+            this.scope.currentWireId = childScope.currentWireId + wireIdOffset;
+        }
+        this.printPoint('resume at');
         this.print('-- nets --');
         const currentNets = this.scope.getNets();
         currentNets.reduce((accum, [, , net]) => {
@@ -568,11 +592,12 @@ export class ExecutionContext {
         this.scope.sequence.push([SequenceAction.Wire, wireId, tmp]);
         this.scope.currentComponent.pinWires.set(this.scope.currentPin, tmp);
     }
-    addPoint(pointId) {
+    addPoint(pointId, userDefined = true) {
         if (this.scope.instances.has(pointId)) {
             this.print('Warning: ' + pointId + ' is being redefined');
         }
-        const componentPoint = ClassComponent.simple("point." + pointId, 1, "point");
+        const useName = userDefined ? 'point.' + pointId : pointId;
+        const componentPoint = ClassComponent.simple(useName, 1, "point");
         componentPoint.displayProp = "point";
         componentPoint.typeProp = ComponentTypes.point;
         this.scope.instances.set(pointId, componentPoint);

package/build/src/export.js

@@ -1,4 +1,4 @@
-import { ComponentTypes } from "./globals.js";
+import { ComponentTypes, NoNetText } from "./globals.js";
 import { NumericValue } from "./objects/ParamDefinition.js";
 export function generateKiCADNetList(netlist) {
     const componentsList = [];
@@ -28,7 +28,7 @@ export function generateKiCADNetList(netlist) {
             for (const key in pins) {
                 const netInfo = pins[key];
                 const netName = netInfo.netName;
-                if (netName === 'NO_NET') {
+                if (netName === NoNetText) {
                     continue;
                 }
                 if (nets[netName] === undefined) {

package/build/src/globals.js

@@ -7,6 +7,7 @@ export var GlobalNames;
     GlobalNames["DefaultInductor"] = "ind";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (GlobalNames = {}));
+export const NoNetText = 'NO_NET';
 export var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["__is_net"] = "__is_net";
@@ -47,3 +48,8 @@ export var ReferenceTypes;
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
 })(ReferenceTypes || (ReferenceTypes = {}));
+export var BranchType;
+(function (BranchType) {
+    BranchType[BranchType["Branch"] = 1] = "Branch";
+    BranchType[BranchType["Join"] = 2] = "Join";
+})(BranchType || (BranchType = {}));

package/build/src/layout.js

@@ -79,6 +79,17 @@ export class LayoutEngine {
             }
             wireGroups.get(netName).push(wire);
         });
+        const { junctions, mergedWires } = this.findJunctions(wireGroups);
+        return {
+            components: placedComponents,
+            wires: placedWires,
+            mergedWires,
+            junctions,
+            frameObjects,
+            textObjects,
+        };
+    }
+    findJunctions(wireGroups) {
         const junctions = [];
         const mergedWires = [];
         for (const [key, wires] of wireGroups) {
@@ -101,12 +112,8 @@ export class LayoutEngine {
             });
         }
         return {
-            components: placedComponents,
-            wires: placedWires,
-            mergedWires,
             junctions,
-            frameObjects,
-            textObjects,
+            mergedWires
         };
     }
     placeFrames(graph, subgraphInfo, frameObjects) {
@@ -402,7 +409,7 @@ export class LayoutEngine {
                     currentFrame && currentFrame.innerItems.push(tmpComponent);
                 }
                 if (action === SequenceAction.To) {
-                    graph.setEdge(previousNode, tmpInstanceName, makeEdgeValue(previousNode, previousPin, tmpInstanceName, pin, i));
+                    this.setGraphEdge(graph, previousNode, tmpInstanceName, makeEdgeValue(previousNode, previousPin, tmpInstanceName, pin, i));
                 }
                 previousNode = tmpInstanceName;
                 previousPin = pin;
@@ -427,7 +434,7 @@ export class LayoutEngine {
                 wire.netName = useNetName;
                 const wireName = getWireName(wire.id);
                 graph.setNode(wireName, [RenderItemType.Wire, wire, i]);
-                graph.setEdge(previousNode, wireName, makeEdgeValue(previousNode, previousPin, wireName, 0, i));
+                this.setGraphEdge(graph, previousNode, wireName, makeEdgeValue(previousNode, previousPin, wireName, 0, i));
                 previousNode = wireName;
                 previousPin = 1;
                 const wireSegmentsInfo = wireSegments.map(item => {
@@ -447,9 +454,14 @@ export class LayoutEngine {
             }
             else if (action === SequenceAction.WireJump) {
                 this.print(...sequence[i]);
-                const [, wireId] = sequence[i];
-                previousNode = getWireName(wireId);
-                previousPin = 1;
+                const wireId = sequence[i][1];
+                const wireName = getWireName(wireId);
+                let wirePin = 1;
+                if (sequence[i].length === 3) {
+                    wirePin = sequence[i][2];
+                }
+                previousNode = wireName;
+                previousPin = wirePin;
             }
             else if (action === SequenceAction.Frame) {
                 const [, frameObject, frameAction] = sequence[i];
@@ -482,6 +494,9 @@ export class LayoutEngine {
             containerFrames,
         };
     }
+    setGraphEdge(graph, node1, node2, edgeValue) {
+        graph.setEdge(node1, node2, edgeValue);
+    }
     sizeSubGraphs(graph) {
         const subGraphs = graphlib.alg.components(graph);
         const subGraphsStarts = [];
@@ -613,9 +628,8 @@ export class LayoutEngine {
                     if (x1 !== x2 && y1 !== y2) {
                         if (node1 instanceof RenderWire &&
                             node2 instanceof RenderComponent) {
-                            this.layoutWarnings.push('component ' +
-                                node2.component.instanceName +
-                                ' may not be placed correctly');
+                            const refdes = node2.component.assignedRefDes;
+                            this.layoutWarnings.push(`component ${refdes} may not be placed correctly`);
                         }
                     }
                 }

package/build/src/visitor.js

@@ -8,7 +8,7 @@ import { PinDefinition, PinIdType } from './objects/PinDefinition.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { UndeclaredReference } from './objects/types.js';
 import { Logger } from './logger.js';
-import { ComponentTypes } from './globals.js';
+import { BranchType, ComponentTypes, NoNetText } from './globals.js';
 import { SymbolDrawingCommands } from './draw_symbols.js';
 import { parseFileWithVisitor } from './parser.js';
 export class MainVisitor extends ParseTreeVisitor {
@@ -223,8 +223,18 @@ export class MainVisitor extends ParseTreeVisitor {
         }
     }
     visitBranch_blocks(ctx) {
-        this.getExecutor().enterBranches();
         const branches = ctx.branch_block_inner_list();
+        let branchType = BranchType.Branch;
+        if (branches.length > 0) {
+            const firstBranch = branches[0];
+            if (firstBranch.Branch()) {
+                branchType = BranchType.Branch;
+            }
+            else if (firstBranch.Join()) {
+                branchType = BranchType.Join;
+            }
+        }
+        this.getExecutor().enterBranches(branchType);
         branches.forEach((branch, index) => {
             this.getExecutor().enterBranch(index);
             this.visit(branch);
@@ -945,8 +955,8 @@ export class MainVisitor extends ParseTreeVisitor {
     resolveNets(scope, instance) {
         const result = [];
         for (const [pinId, pin] of instance.pins) {
-            let netName = 'NO_NET';
-            let netBaseName = 'NO_NET';
+            let netName = NoNetText;
+            let netBaseName = NoNetText;
             if (scope.hasNet(instance, pinId)) {
                 const netObject = scope.getNet(instance, pinId);
                 netName = netObject.namespace + netObject.name;

package/examples/lib.cst

@@ -173,7 +173,7 @@ def marker_point():
         display: create graphic:
             hline: -5, 0, 10
             vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0
+            pin: 1, 0, 0, 0, 0, display_pin_id=0
         type: "net"
 
 def arrow_point():

package/libs/lib.cst

@@ -173,7 +173,7 @@ def marker_point():
         display: create graphic:
             hline: -5, 0, 10
             vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0
+            pin: 1, 0, 0, 0, 0, display_pin_id=0
         type: "net"
 
 def arrow_point():

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.0.16",
+    "version": "0.0.18",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {

package/src/antlr/CircuitScript.g4

@@ -21,6 +21,7 @@ Point:      'point';
 Return:     'return';
 Define:     'def';
 Import:     'import';
+Join:       'join';
 
 If:         'if';
 Not:        '!';
@@ -57,7 +58,7 @@ expression: add_component_expr
 
 branch_blocks: branch_block_inner+;
 branch_block_inner:
-	Branch ':' NEWLINE INDENT (NEWLINE | expression)+ DEDENT;
+	(Branch|Join) ':' NEWLINE INDENT (NEWLINE | expression)+ DEDENT;
 
 property_set_expr2:
 	atom_expr ':' NEWLINE INDENT ( NEWLINE | assignment_expr2)+ DEDENT;