circuitscript 0.0.17 → 0.0.19

package/src/objects/ExecutionScope.ts

@@ -15,7 +15,7 @@ export class ExecutionScope {
 
     variables: Map<string, ValueType | ClassComponent> = new Map();
 
-    branchStack: Map<number, any> = new Map();
+    blockStack: Map<number, any> = new Map();
 
     wires: Wire[] = [];
     frames: Frame[] = [];
@@ -165,12 +165,20 @@ export class ExecutionScope {
 }
 
 export enum SequenceAction {
+    // Link current insertion point to component pin
     To = 'to',
+
+    // Move insertion point at component pin
     At = 'at',
+
+    // Link current insertion point with wire of given segments
     Wire = 'wire',
 
+    // Jump to wire with target ID. Pin 0 of wire is the start of the 
+    // wire, pin 1 is the other end of the wire.
     WireJump = 'wire-jump',
 
+    // Creates a new frame group
     Frame = 'frame',
 }
 
@@ -187,7 +195,7 @@ export enum ActiveObject {
 
 export type SequenceItem =
     [SequenceAction.To | SequenceAction.At, ClassComponent, number, LayoutDirection?, string?]
-    | [SequenceAction.Wire, number, WireSegment[]]
-    | [SequenceAction.WireJump, number]
+    | [SequenceAction.Wire, wireId: number, WireSegment[]]
+    | [SequenceAction.WireJump, wireId: number, pinId: number]
     | [SequenceAction.Frame, Frame, "enter" | "exit"]
     ;

package/src/visitor.ts

@@ -15,7 +15,7 @@ import {
     Atom_exprContext,
     BinaryOperatorExprContext,
     Blank_exprContext,
-    Branch_blocksContext,
+    Path_blocksContext,
     Component_select_exprContext,
     Create_component_exprContext,
     Create_graphic_exprContext,
@@ -59,10 +59,10 @@ import {
 import { PinDefinition, PinIdType } from './objects/PinDefinition.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ExecutionScope } from './objects/ExecutionScope.js';
-import { CFunction, CFunctionOptions, CallableParameter, ComplexType, ComponentPin, 
+import { CFunctionOptions, CallableParameter, ComplexType, ComponentPin, 
     ComponentPinNet, FunctionDefinedParameter, ReferenceType, UndeclaredReference, ValueType } from './objects/types.js';
 import { Logger } from './logger.js';
-import { ComponentTypes } from './globals.js';
+import { BlockTypes, ComponentTypes, NoNetText } from './globals.js';
 import { Net } from './objects/Net.js';
 import { SubExpressionCommand, SymbolDrawingCommands } from './draw_symbols.js';
 import { parseFileWithVisitor } from './parser.js';
@@ -303,36 +303,48 @@ export class MainVisitor extends ParseTreeVisitor<any> {
     }
 
     visitAt_component_expr(ctx: At_component_exprContext): ComponentPin {
-        const [component, pin] = this.visit(ctx.component_select_expr());
+        if (ctx.Point()) {
+            this.getExecutor().atPointBlock();
 
-        const currentPoint = this.getExecutor().atComponent(component, pin, {
-            addSequence: true,
-            cloneNetComponent: true
-        });
-        
-        if (ctx.ID()){
-            // If there is ID specified, then it can only be for the 
-            // component orientation.
-            this.setComponentOrientation(currentPoint[0], 
-                currentPoint[1], ctx.ID().getText())
+        } else {
+            const [component, pin] = this.visit(ctx.component_select_expr());
+
+            const currentPoint = this.getExecutor().atComponent(component, pin, {
+                addSequence: true,
+                cloneNetComponent: true
+            });
+
+            if (ctx.ID()) {
+                // If there is ID specified, then it can only be for the 
+                // component orientation.
+                this.setComponentOrientation(currentPoint[0],
+                    currentPoint[1], ctx.ID().getText())
+            }
         }
-        
-        return currentPoint;
+
+        return this.getExecutor().getCurrentPoint();
     }
 
-    visitTo_component_expr(ctx: To_component_exprContext): ComponentPin  {
+    visitTo_component_expr(ctx: To_component_exprContext): ComponentPin {
         let currentPoint: ComponentPin;
-        ctx.component_select_expr_list().forEach((item) => {
-            const [component, pin] = this.visit(item);
-            currentPoint = this.getExecutor().toComponent(component, pin, {
-                addSequence: true, cloneNetComponent: true});
-        });
 
-        if (ctx.ID()){
-            // If there is ID specified, then it can only be for the 
-            // component orientation.
-            this.setComponentOrientation(currentPoint[0], 
-                currentPoint[1], ctx.ID().getText())
+        if (ctx.Point()) {
+            this.getExecutor().toPointBlock();
+
+        } else {
+            ctx.component_select_expr_list().forEach((item) => {
+                const [component, pin] = this.visit(item);
+                currentPoint = this.getExecutor().toComponent(component, pin, {
+                    addSequence: true, cloneNetComponent: true
+                });
+            });
+
+            if (ctx.ID()) {
+                // If there is ID specified, then it can only be for the 
+                // component orientation.
+                this.setComponentOrientation(currentPoint[0],
+                    currentPoint[1], ctx.ID().getText())
+            }
         }
 
         return this.getExecutor().getCurrentPoint();
@@ -352,19 +364,34 @@ export class MainVisitor extends ParseTreeVisitor<any> {
         }
     }
 
-    visitBranch_blocks(ctx: Branch_blocksContext): ComponentPin {
-        this.getExecutor().enterBranches();
+    visitPath_blocks(ctx: Path_blocksContext): ComponentPin {
+        const blocks = ctx.path_block_inner_list();
+        let blockType = BlockTypes.Branch;
+
+        if (blocks.length > 0){
+            const firstBlock = blocks[0];
+            if (firstBlock.Branch()){
+                blockType = BlockTypes.Branch
+            } else if (firstBlock.Join()){
+                blockType = BlockTypes.Join;
+            } else if (firstBlock.Parallel()){
+                blockType = BlockTypes.Parallel;
+            } else if (firstBlock.Point()){
+                blockType = BlockTypes.Point;
+            }
+        }
+
+        this.getExecutor().enterBlocks(blockType);
 
-        const branches = ctx.branch_block_inner_list();
-        branches.forEach((branch, index) => {
-            this.getExecutor().enterBranch(index);
+        blocks.forEach((branch, index) => {
+            this.getExecutor().enterBlock(index);
 
             this.visit(branch);
 
-            this.getExecutor().exitBranch(index);
+            this.getExecutor().exitBlock(index);
         });
 
-        this.getExecutor().exitBranches();
+        this.getExecutor().exitBlocks();
         return this.getExecutor().getCurrentPoint();
     }
 
@@ -733,7 +760,7 @@ export class MainVisitor extends ParseTreeVisitor<any> {
 
             // Function execution is completed, get the last executor
             const lastExecution = executionStack.pop();
-            
+
             // Merge what ever was created in the scope with the outer scope
             const nextLastExecution = executionStack[executionStack.length - 1];
             nextLastExecution.mergeScope(
@@ -1396,8 +1423,8 @@ export class MainVisitor extends ParseTreeVisitor<any> {
         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);