Merge pull request #521 from nevalang/nodes_comments_fix

fix(parser): add support for comments inside components

e2e/run_tests_test.go

@@ -118,6 +118,7 @@ func TestListWithNegInt(t *testing.T) {
 	}
 }
 
+// Check that compiler throws human-readable error when type arguments in Node are incompatible.
 func TestIncompatCompTypeArg(t *testing.T) {
 	err := os.Chdir("./tests/incompat_comp_type_arg")
 	require.NoError(t, err)
@@ -134,5 +135,25 @@ func TestIncompatCompTypeArg(t *testing.T) {
 		string(out),
 	)
 
+	require.Equal(t, 0, cmd.ProcessState.ExitCode())
+}
+
+// Check program with comments is parsed without errors.
+func TestComments(t *testing.T) {
+	err := os.Chdir("./tests/comments")
+	require.NoError(t, err)
+
+	defer os.Chdir(wd)
+
+	cmd := exec.Command("neva", "run", "main")
+
+	out, err := cmd.CombinedOutput()
+	require.NoError(t, err)
+	require.Equal(
+		t,
+		"<empty>\n",
+		string(out),
+	)
+
 	require.Equal(t, 0, cmd.ProcessState.ExitCode())
 }

e2e/tests/comments/main/main.neva

@@ -0,0 +1,19 @@
+// top-level comment 1
+component Main(start) (stop) {
+	// comment inside component 1
+	nodes {
+		// comment inside nodes 1
+		Printer<any>
+		// comment inside nodes 2
+	}
+	// comment inside component 2
+	net {
+		// comment inside network 1
+		:start -> printer:data
+		// comment inside network 2
+		printer:sig -> :stop
+		// comment inside network 
+	}
+	// comment inside component 3
+}
+// top-level comment 2

e2e/tests/comments/neva.yml

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

internal/cli/cli.go

@@ -42,7 +42,7 @@ func NewApp( //nolint:funlen
 			},
 			{
 				Name:  "new",
-				Usage: "Create new nevalang project",
+				Usage: "Create new Nevalang project",
 				Args:  true,
 				Action: func(cCtx *cli.Context) error {
 					if path := cCtx.Args().First(); path != "" {

internal/compiler/parser/neva.g4

@@ -116,11 +116,14 @@ groupCompStmt:
 	)* '}';
 compDef: interfaceDef compBody? NEWLINE*;
 compBody:
-	'{' NEWLINE* (compNodesDef NEWLINE*)? (compNetDef NEWLINE*)? '}';
+	'{' NEWLINE* (COMMENT NEWLINE*)* (compNodesDef NEWLINE*)? (
+		COMMENT NEWLINE*
+	)* (compNetDef NEWLINE*)? (COMMENT NEWLINE*)* '}';
 
 // nodes
 compNodesDef: 'nodes' NEWLINE* compNodesDefBody;
-compNodesDefBody: '{' NEWLINE* (compNodeDef NEWLINE*)* '}';
+compNodesDefBody:
+	'{' NEWLINE* ((compNodeDef | COMMENT) NEWLINE*)* '}';
 compNodeDef: compilerDirectives? IDENTIFIER? nodeInst;
 nodeInst: entityRef NEWLINE* typeArgs? NEWLINE* nodeDIArgs?;
 nodeDIArgs: compNodesDefBody;

pkg/version.go

@@ -1,4 +1,4 @@
 package pkg
 
 // Version is the current version of the language and stdlib
-var Version = "0.10.5" //nolint:gochecknoglobals
+var Version = "0.11.1" //nolint:gochecknoglobals