feat: additional grammar tests for expressions

Safe-DS · Apr 12, 2023 · f55f9eb · f55f9eb
1 parent 079d670
commit f55f9eb
Show file tree

Hide file tree

Showing 32 changed files with 136 additions and 12 deletions.
diff --git a/DSL-langium/language-configuration.json b/DSL-langium/language-configuration.json
@@ -7,14 +7,12 @@
         ["{", "}"],
         ["[", "]"],
         ["(", ")"],
-        ["<", ">"],
         ["»", "«"]
     ],
     "autoClosingPairs": [
         ["{", "}"],
         ["[", "]"],
         ["(", ")"],
-        ["<", ">"],
         ["»", "«"],
         ["\"", "\""],
         ["`", "`"]

diff --git a/...r/expressions/comparison operator/bad-greater than or equal without left operator.sdstest b/...r/expressions/comparison operator/bad-greater than or equal without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    >= 2;
+}
diff --git a/.../expressions/comparison operator/bad-greater than or equal without right operator.sdstest b/.../expressions/comparison operator/bad-greater than or equal without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 >=;
+}
diff --git a/...es/grammar/expressions/comparison operator/bad-greater than without left operator.sdstest b/...es/grammar/expressions/comparison operator/bad-greater than without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    > 2;
+}
diff --git a/...s/grammar/expressions/comparison operator/bad-greater than without right operator.sdstest b/...s/grammar/expressions/comparison operator/bad-greater than without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 >;
+}
diff --git a/...mmar/expressions/comparison operator/bad-less than or equal without left operator.sdstest b/...mmar/expressions/comparison operator/bad-less than or equal without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    <= 2;
+}
diff --git a/...mar/expressions/comparison operator/bad-less than or equal without right operator.sdstest b/...mar/expressions/comparison operator/bad-less than or equal without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 <=;
+}
diff --git a/...urces/grammar/expressions/comparison operator/bad-less than without left operator.sdstest b/...urces/grammar/expressions/comparison operator/bad-less than without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    < 2;
+}
diff --git a/...rces/grammar/expressions/comparison operator/bad-less than without right operator.sdstest b/...rces/grammar/expressions/comparison operator/bad-less than without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 <;
+}
diff --git a/...ests/resources/grammar/expressions/comparison operator/good-greater than or equal.sdstest b/...ests/resources/grammar/expressions/comparison operator/good-greater than or equal.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 >= 2;
+}
diff --git a/...langium/tests/resources/grammar/expressions/comparison operator/good-greater than.sdstest b/...langium/tests/resources/grammar/expressions/comparison operator/good-greater than.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 > 2;
+}
diff --git a/...m/tests/resources/grammar/expressions/comparison operator/good-less than or equal.sdstest b/...m/tests/resources/grammar/expressions/comparison operator/good-less than or equal.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 <= 2;
+}
diff --git a/...ar/expressions/comparisonOperator.sdstest → ...less than vs. type parameter list.sdstest b/...ar/expressions/comparisonOperator.sdstest → ...less than vs. type parameter list.sdstest
@@ -1,15 +1,6 @@
 // $TEST$ no_syntax_error
 
 pipeline myPipeline {
-    1 < 2;
-    1 <= 2;
-    1 == 2;
-    1 === 2;
-    1 != 2;
-    1 !== 2;
-    1 >= 2;
-    1 > 2;
-
     // The start of a type argument list of a call could be confused with the less than operator
     1 < a<Int>();
 }
diff --git a/DSL-langium/tests/resources/grammar/expressions/comparison operator/good-less than.sdstest b/DSL-langium/tests/resources/grammar/expressions/comparison operator/good-less than.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 < 2;
+}
diff --git a/...s/resources/grammar/expressions/equality operator/bad-equal without left operator.sdstest b/...s/resources/grammar/expressions/equality operator/bad-equal without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    == 2;
+}
diff --git a/.../resources/grammar/expressions/equality operator/bad-equal without right operator.sdstest b/.../resources/grammar/expressions/equality operator/bad-equal without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 ==;
+}
diff --git a/...sources/grammar/expressions/equality operator/bad-identical without left operator.sdstest b/...sources/grammar/expressions/equality operator/bad-identical without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    === 2;
+}
diff --git a/...ources/grammar/expressions/equality operator/bad-identical without right operator.sdstest b/...ources/grammar/expressions/equality operator/bad-identical without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 ===;
+}
diff --git a/...sources/grammar/expressions/equality operator/bad-not equal without left operator.sdstest b/...sources/grammar/expressions/equality operator/bad-not equal without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    != 2;
+}
diff --git a/...ources/grammar/expressions/equality operator/bad-not equal without right operator.sdstest b/...ources/grammar/expressions/equality operator/bad-not equal without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 !=;
+}
diff --git a/...ces/grammar/expressions/equality operator/bad-not identical without left operator.sdstest b/...ces/grammar/expressions/equality operator/bad-not identical without left operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 !==;
+}
diff --git a/...es/grammar/expressions/equality operator/bad-not identical without right operator.sdstest b/...es/grammar/expressions/equality operator/bad-not identical without right operator.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    1 !==;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/equality operator/good-equal.sdstest b/DSL-langium/tests/resources/grammar/expressions/equality operator/good-equal.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 == 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/equality operator/good-identical.sdstest b/DSL-langium/tests/resources/grammar/expressions/equality operator/good-identical.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 === 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/equality operator/good-not equal.sdstest b/DSL-langium/tests/resources/grammar/expressions/equality operator/good-not equal.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 != 2;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/equality operator/good-not identical.sdstest b/DSL-langium/tests/resources/grammar/expressions/equality operator/good-not identical.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    1 !== 2;
+}
diff --git a/...ces/grammar/expressions/reference.sdstest → ...rammar/expressions/good-reference.sdstest b/...ces/grammar/expressions/reference.sdstest → ...rammar/expressions/good-reference.sdstest
diff --git a/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-no receiver.sdstest b/DSL-langium/tests/resources/grammar/expressions/indexed access/bad-no receiver.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline test {
+    [1];
+}
diff --git a/...um/tests/resources/grammar/expressions/indexed access/bad-unclosed square bracket.sdstest b/...um/tests/resources/grammar/expressions/indexed access/bad-unclosed square bracket.sdstest
@@ -1,5 +1,5 @@
 // $TEST$ syntax_error
 
 pipeline test {
-    a[;
+    a[1;
 }
diff --git a/...s/resources/grammar/expressions/parenthesized expression/bad-unclosed parenthesis.sdstest b/...s/resources/grammar/expressions/parenthesized expression/bad-unclosed parenthesis.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ syntax_error
+
+pipeline myPipeline {
+    (1;
+}
diff --git a/DSL-langium/tests/resources/grammar/expressions/parenthesized expression/good-nested.sdstest b/DSL-langium/tests/resources/grammar/expressions/parenthesized expression/good-nested.sdstest
@@ -0,0 +1,5 @@
+// $TEST$ no_syntax_error
+
+pipeline myPipeline {
+    ((1 + 2));
+}
diff --git a/...pressions/parenthesizedExpression.sdstest → ...hesized expression/good-one level.sdstest b/...pressions/parenthesizedExpression.sdstest → ...hesized expression/good-one level.sdstest