Merge pull request #670 from nevalang/runtime_raceless_queue

Race condition fix. Part 2 (Runtime)

.vscode/launch.json

@@ -17,7 +17,7 @@
       "mode": "auto",
       "program": "${workspaceFolder}/cmd/neva",
       "cwd": "${workspaceFolder}",
-      "args": ["run", "examples/swork"]
+      "args": ["run", "-debug", "e2e/99_bottles_verbose/main"]
     },
     {
       "name": "LSP",

cmd/lsp/server/get_file_view.go

@@ -80,20 +80,20 @@ func (s *Server) GetFileView(glspCtx *glsp.Context, req GetFileViewRequest) (Get
 func getExtraForFile(file src.File, scope src.Scope) (map[string]map[string]src.Interface, error) {
 	extra := map[string]map[string]src.Interface{}
 	for entityName, entity := range file.Entities {
-		if entity.Kind != src.FlowEntity {
+		if entity.Kind != src.ComponentEntity {
 			continue
 		}
 
 		nodesIfaces := map[string]src.Interface{}
-		for nodeName, node := range entity.Flow.Nodes {
+		for nodeName, node := range entity.Component.Nodes {
 			nodeEntity, _, err := scope.Entity(node.EntityRef)
 			if err != nil {
 				return nil, err
 			}
 
 			var iface src.Interface
-			if nodeEntity.Kind == src.FlowEntity {
-				iface = nodeEntity.Flow.Interface
+			if nodeEntity.Kind == src.ComponentEntity {
+				iface = nodeEntity.Component.Interface
 			} else if nodeEntity.Kind == src.InterfaceEntity {
 				iface = nodeEntity.Interface
 			}

e2e/99_bottles_verbose/main/main.neva

@@ -43,7 +43,7 @@ flow PrintFirstLine(n int) (n int) {
     match:else -> printf:args[0]
     $firstLine1 -> printf:tpl
 
-    [println:sig, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
 
     lock:data -> :n
 }
@@ -69,6 +69,6 @@ flow PrintSecondLine(n int) (n int) {
     match:else -> printf:args[0]
     $secondLine1 -> printf:tpl
 
-    [println:sig, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
     lock:data -> :n
 }

e2e/99_bottles_with_chain/main/main.neva

@@ -36,7 +36,7 @@ flow PrintFirstLine(n int) (n int) {
         ($firstLine1 -> printf:tpl)
     ]
 
-    [println:sig, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
     lock:data -> :n
 }
 
@@ -60,6 +60,6 @@ flow PrintSecondLine(n int) (n int) {
         ($secondLine1 -> printf:tpl)
     ]
 
-    [println:sig, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
     lock:data -> :n
 }

e2e/cli_new/neva.yml

@@ -1 +1 @@
-neva: 0.23.0
+neva: 0.25.0

e2e/compare_ints_lt_equal/main/main.neva

@@ -1,8 +1,8 @@
 flow Main(start) (stop) {
-    nodes { Println, Lt<int>}
+    nodes { Println, Lt<int> }
     :start -> [
         (20 -> lt:compared),
         (20 -> lt:actual)
-       ]
-       lt:res -> println -> :stop
+    ]
+    lt:res -> println -> :stop
 }

e2e/compare_strings/main/main.neva

@@ -1,11 +1,10 @@
 flow Main(start) (stop) {
-    nodes { Println, Gt<string>,If}
+    nodes { Println, Gt<string>, If }
     :start -> [
         ('A' -> gt:compared),
         ('Z' -> gt:actual)
-       ]
-       gt:res -> if
-
-       if:then -> ('Actual is greater' -> println -> :stop)
-       if:else -> ('Actual is lower' -> println -> :stop)
+    ]
+    gt:res -> if
+    if:then -> ('Actual is greater' -> println -> :stop)
+    if:else -> ('Actual is lower' -> println -> :stop)
 }

e2e/do_nothin_verbose/main/main.neva → e2e/do_nothing_verbose/main/main.neva

@@ -1,3 +1,3 @@
 flow Main(start) (stop) {
     :start -> :stop
-}
+}

e2e/for_with_range_and_if/main/main.neva

@@ -10,7 +10,6 @@ flow Main(start) (stop) {
 flow Printer(data bool) (sig any) {
 	nodes { If, Println }
 	:data -> if
-	if:then -> ('true' -> println)
-	if:else -> ('false' -> println)
+	[if:then, if:else] -> println
 	println -> :sig
 }

e2e/logic_gate_and/main/main.neva

@@ -1,8 +1,8 @@
 flow Main(start) (stop) {
 	nodes { Println, And }
 		:start -> [
-		    (true -> and:A),
-		    (true -> and:B)
+		    (true -> and:a),
+		    (true -> and:b)
 		]
 		and -> println -> :stop
 }

e2e/logic_gate_or/main/main.neva

@@ -1,8 +1,8 @@
 flow Main(start) (stop) {
 	nodes { Println, Or }
 		:start -> [
-		    (false -> or:A),
-		    (false -> or:B)
+		    (false -> or:a),
+		    (false -> or:b)
 		]
 		or -> println -> :stop
 }

e2e/simple_fan_out/e2e_test.go

@@ -0,0 +1,22 @@
+package test
+
+import (
+	"os/exec"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test(t *testing.T) {
+	cmd := exec.Command("neva", "run", "main")
+
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err)
+	require.Equal(
+		t,
+		"<empty>\n<empty>\n",
+		string(out),
+	)
+
+	require.Equal(t, 0, cmd.ProcessState.ExitCode())
+}

e2e/simple_fan_out/main/main.neva

@@ -0,0 +1,7 @@
+import { time }
+
+flow Main(start) (stop) {
+    nodes { p1 Println, p2 Println }
+    :start -> [p1, p2]
+    p1 -> (p2 -> :stop)
+}

e2e/simple_fan_out/neva.yml

@@ -0,0 +1 @@
+neva: 0.10.0

examples/99_bottles/main.neva

@@ -30,7 +30,7 @@ flow PrintFirstLine(n int) (n int) {
         ($firstLine1 -> printf:tpl)
     ]
 
-    [println, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
     lock -> :n
 }
 
@@ -55,6 +55,7 @@ flow PrintSecondLine(n int) (n int) {
         ($secondLine1 -> printf:tpl)
     ]
 
-    [println, printf:args[0]] -> lock:sig
+    [println:sig, printf:sig] -> lock:sig
+
     lock:data -> :n
 }

examples/add_numbers/main.neva

@@ -1,7 +1,7 @@
 flow Main(start) (stop) {
 	nodes {
-		add ReducePort<int> { Add<int> }
 		Println
+		add ReducePort<int> { Add<int> }
 	}
 	:start -> [
 		(1 -> add[0]),

examples/fizzbuzz/main.neva

@@ -1,24 +1,14 @@
 flow Main(start) (stop) {
-	nodes { Range, PrintLine, Match }
-
-    :start -> [
-        (1 -> range:from),
-        (101 -> range:to)
-    ]
-    range.data -> printLine -> match:data
-    100 -> match:case[0] -> :stop
+	nodes { Range, Map<int, string>{FizzBuzz}, For{Println} }
+    :start -> [(1 -> range:from), (101 -> range:to)]
+    range -> map -> for -> :stop
 }
 
-flow PrintLine(data int) (data int) {
-    nodes { mod CaseMod, Println, Lock<int> }
-
-    :data -> [mod:data, lock:data]
-
-    15 -> mod:case[0] -> ('FizzBuzz' -> println)
-    3 -> mod:case[1] -> ('Fizz'     -> println)
-    5 -> mod:case[2] -> ('Buzz'     -> println)
-    mod:else -> println
-
-    println -> lock:sig
-    lock:data -> :data
-}
+flow FizzBuzz(data int) (res any) {
+    nodes { CaseMod }
+    :data -> caseMod:data
+    15 -> caseMod:case[0] -> ('FizzBuzz' -> :res)
+    3 -> caseMod:case[1] -> ('Fizz' -> :res)
+    5 -> caseMod:case[2] -> ('Buzz' -> :res)
+    caseMod:else -> :res
+}

examples/get_args/main.neva

@@ -2,5 +2,5 @@ import { os, lists }
 
 flow Main(start) (stop) {
 	nodes { os.Args, lists.For{Println}}
-	:start -> (args -> for -> :stop)
+	:start -> args -> for -> :stop
 }

examples/hello_world/main.neva

@@ -1,4 +1,4 @@
 flow Main(start) (stop) {
 	nodes { Println }
 	:start -> ('Hello, World!' -> println -> :stop)
-}
+}

examples/stream_product/main.neva

@@ -1,9 +1,11 @@
 flow Main(start) (stop) {
   nodes {
-    r1 Range,
-    r2 Range,
-    Product<int, int>,
-    For<ProductRes<int, int>>{Println<ProductRes<int, int>>}
+    r1 Range
+    r2 Range
+    Product<int, int>
+    For<ProductResult<int, int>> {
+      Println<ProductResult<int, int>>
+    }
   }
   :start -> [
     (0 -> [r1:from, r2:from]),

internal/cli/cli.go

@@ -109,12 +109,8 @@ func NewApp(
 					if err != nil {
 						return err
 					}
-					intr := interpreter.New(bldr, goc, debug)
-					if err := intr.Interpret(
-						context.Background(),
-						workdir,
-						dirFromArg,
-					); err != nil {
+					intr := interpreter.New(bldr, goc)
+					if err := intr.Interpret(context.Background(), dirFromArg, debug); err != nil {
 						return err
 					}
 					return nil
@@ -148,25 +144,15 @@ func NewApp(
 					}
 					switch target {
 					case "go":
-						return goc.Compile(
-							workdir, dirFromArg, workdir,
-						)
+						return goc.Compile(dirFromArg, workdir, debug)
 					case "wasm":
-						return wasmc.Compile(
-							workdir, dirFromArg, workdir,
-						)
+						return wasmc.Compile(dirFromArg, workdir, debug)
 					case "json":
-						return jsonc.Compile(
-							workdir, dirFromArg, workdir,
-						)
+						return jsonc.Compile(dirFromArg, workdir, debug)
 					case "dot":
-						return dotc.Compile(
-							workdir, dirFromArg, workdir,
-						)
+						return dotc.Compile(dirFromArg, workdir, debug)
 					default:
-						return nativec.Compile(
-							workdir, dirFromArg, workdir,
-						)
+						return nativec.Compile(dirFromArg, workdir, debug)
 					}
 				},
 			},

internal/compiler/analyzer/analyzer.go

@@ -223,15 +223,15 @@ func (a Analyzer) analyzeEntity(entity src.Entity, scope src.Scope) (src.Entity,
 			}.Wrap(err)
 		}
 		resolvedEntity.Interface = resolvedInterface
-	case src.FlowEntity:
-		analyzedFlow, err := a.analyzeFlow(entity.Flow, scope)
+	case src.ComponentEntity:
+		analyzedComponent, err := a.analyzeComponent(entity.Component, scope)
 		if err != nil {
 			return src.Entity{}, compiler.Error{
 				Location: &scope.Location,
-				Meta:     &entity.Flow.Meta,
+				Meta:     &entity.Component.Meta,
 			}.Wrap(err)
 		}
-		resolvedEntity.Flow = analyzedFlow
+		resolvedEntity.Component = analyzedComponent
 	default:
 		return src.Entity{}, &compiler.Error{
 			Err:      fmt.Errorf("%w: %v", ErrUnknownEntityKind, entity.Kind),