getting swaps to pass the listener

Fault-lang · Mar 14, 2023 · 9aa7835 · 9aa7835
1 parent 19099a0
commit 9aa7835
Show file tree

Hide file tree

Showing 5 changed files with 366 additions and 358 deletions.
diff --git a/grammar/FaultParser.g4 b/grammar/FaultParser.g4
@@ -21,7 +21,7 @@ globalDecl
     ;
 
 swap
-    : operand '=' (functionLit | numeric | string_ | bool_ | operandName | prefix | solvable)
+    : paramCall '=' (functionLit | numeric | string_ | bool_ | operandName | prefix | solvable)
     ;
 
 componentDecl

diff --git a/listener/listener.go b/listener/listener.go
@@ -647,11 +647,15 @@ func (l *FaultListener) ExitRunBlock(c *parser.RunBlockContext) {
 	}
 	steps := c.AllRunStep()
 	for i := len(steps) - 1; i >= 0; i-- {
-		v := steps[i]
 		ex := l.pop()
+
+		if ex.TokenLiteral() == "SWAP" {
+			i++ //Swaps are the same step as the instance that initializes them
+		}
+
 		switch t := ex.(type) {
 		case *ast.Instance:
-			token2 := util.GenerateToken("FUNCTION", "FUNCTION", v.(*parser.RunInitContext).GetStart(), v.(*parser.RunInitContext).GetStop())
+			token2 := ex.GetToken()
 
 			s := &ast.ExpressionStatement{
 				Token:      token2,
@@ -661,7 +665,7 @@ func (l *FaultListener) ExitRunBlock(c *parser.RunBlockContext) {
 		case *ast.ParallelFunctions:
 			sl.Statements = append([]ast.Statement{t}, sl.Statements...)
 		case ast.Expression:
-			token2 := util.GenerateToken("FUNCTION", "FUNCTION", v.(*parser.RunInitContext).GetStart(), v.(*parser.RunInitContext).GetStop())
+			token2 := ex.GetToken()
 			n := l.packageCallsAsRunSteps(t)
 
 			s := &ast.ExpressionStatement{
@@ -722,6 +726,9 @@ func (l *FaultListener) ExitRunInit(c *parser.RunInitContext) {
 
 	token2 := util.GenerateToken("IDENT", "IDENT", c.GetStart(), c.GetStop())
 
+	// Check for swaps
+	swaps := l.getSwaps()
+
 	ident := &ast.Identifier{Token: token2}
 	switch len(txt) {
 	case 1:
@@ -756,6 +763,8 @@ func (l *FaultListener) ExitRunInit(c *parser.RunInitContext) {
 			Name:  right,
 			Order: order,
 		})
+
+	l.pushN(swaps)
 }
 
 func (l *FaultListener) ExitRunStepExpr(c *parser.RunStepExprContext) {

diff --git a/listener/listener_test.go b/listener/listener_test.go
@@ -378,7 +378,7 @@ func TestThis(t *testing.T) {
 func TestClock(t *testing.T) {
 	test := `spec test1;
 			 def foo = flow{
-				bar: func{1+clock;},
+				bar: func{1+now;},
 			 };
 			`
 	_, spec := prepTest(test, nil)
@@ -416,7 +416,7 @@ func TestClockRun(t *testing.T) {
 				bar: func{1+this;},
 			 };
 			 for 1 run {
-				 clock;
+				 now;
 			 }
 			`
 	_, spec := prepTest(test, nil)
@@ -1654,7 +1654,7 @@ func TestUnknown(t *testing.T) {
 
 }
 
-func TestSysSpec(t *testing.T) {
+func TestSwap(t *testing.T) {
 	test := `system test1;
 
 			import "foo.fspec";