Implement review comments from PR #66 (#109)

tests-system/rbt-endswith-semantics/foo.trlc

@@ -3,3 +3,7 @@ package Foo
 T Bar {
     b = "kitten"
 }
+
+T Baz {
+    b = "dog"
+}

tests-system/rbt-endswith-semantics/output

@@ -1 +1,3 @@
-Processed 1 model and 1 requirement file and found no issues
+b = "dog"
+    ^^^^^ rbt-endswith-semantics/foo.trlc:8: check warning: b should end with en
+Processed 1 model and 1 requirement file and found 1 warning

tests-system/rbt-endswith-semantics/output.brief

@@ -0,0 +1 @@
+rbt-endswith-semantics/foo.trlc:8:9: trlc check warning: b should end with en

tests-system/rbt-endswith-semantics/output.json

@@ -1,6 +1,11 @@
+b = "dog"
+    ^^^^^ rbt-endswith-semantics/foo.trlc:8: check warning: b should end with en
 {
   "Bar": {
     "b": "kitten"
+  },
+  "Baz": {
+    "b": "dog"
   }
 }
-Processed 1 model and 1 requirement file and found no issues
+Processed 1 model and 1 requirement file and found 1 warning

tests-system/rbt-endswith-semantics/output.smtlib

@@ -1 +1,3 @@
-Processed 1 model and 1 requirement file and found no issues
+b = "dog"
+    ^^^^^ rbt-endswith-semantics/foo.trlc:8: check warning: b should end with en
+Processed 1 model and 1 requirement file and found 1 warning

tests-system/rbt-len-semantics/foo.rsl

@@ -2,7 +2,6 @@ package Foo
 
 type T {
     a String
-    b Integer
     c Integer[1..*]
 }
 

tests-system/rbt-len-semantics/foo.trlc

@@ -2,6 +2,5 @@ package Foo
 
 T Bar {
     a = "potato"
-    b = 1
     c = [2,1]
 }

tests-system/rbt-len-semantics/output.json

@@ -1,7 +1,6 @@
 {
   "Bar": {
     "a": "potato",
-    "b": 1,
     "c": [
       2,
       1

tests-system/rbt-matches-semantics/foo.rsl

@@ -3,9 +3,13 @@ package Foo
 type T {
     a String
     b String
-    c Integer
+    c String
+    d String
 }
 
 checks T {
-    matches(a, "potato"), warning "a should match with potato", a
+    matches(a, "^[a-zA-Z0-9]{6,12}$"), warning "a should match with 6 to 12 letters or digits", a
+    matches(b, "\w+"), warning "b should match only letters, digits, or underscores.", b
+    matches(c, "potato"), warning "b should start with 'potato'.", c
+    matches(d, "^D.*"), warning "d should start with D", d
 }

tests-system/rbt-matches-semantics/foo.trlc

@@ -1,7 +1,15 @@
 package Foo
 
-T Bar {
-    a = "potato"
-    b = "kitten"
-    c = 1
+T No_Regex_Matches {
+    a = "123456789 abcdefghijklmn"
+    b = "??...kitten_...??"
+    c = "not potato"
+    d = "not Diego"
+}
+
+T All_Regex_Matches {
+    a = "123abc"
+    b = "3_kitten_"
+    c = "potato and tomato sauce"
+    d = "Diego"
 }

tests-system/rbt-matches-semantics/output

@@ -1 +1,9 @@
-Processed 1 model and 1 requirement file and found no issues
+a = "123456789 abcdefghijklmn"
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:4: check warning: a should match with 6 to 12 letters or digits
+b = "??...kitten_...??"
+    ^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:5: check warning: b should match only letters, digits, or underscores.
+c = "not potato"
+    ^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:6: check warning: b should start with 'potato'.
+d = "not Diego"
+    ^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:7: check warning: d should start with D
+Processed 1 model and 1 requirement file and found 4 warnings

tests-system/rbt-matches-semantics/output.brief

@@ -0,0 +1,4 @@
+rbt-matches-semantics/foo.trlc:4:9: trlc check warning: a should match with 6 to 12 letters or digits
+rbt-matches-semantics/foo.trlc:5:9: trlc check warning: b should match only letters, digits, or underscores.
+rbt-matches-semantics/foo.trlc:6:9: trlc check warning: b should start with 'potato'.
+rbt-matches-semantics/foo.trlc:7:9: trlc check warning: d should start with D

tests-system/rbt-matches-semantics/output.json

@@ -1,8 +1,23 @@
+a = "123456789 abcdefghijklmn"
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:4: check warning: a should match with 6 to 12 letters or digits
+b = "??...kitten_...??"
+    ^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:5: check warning: b should match only letters, digits, or underscores.
+c = "not potato"
+    ^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:6: check warning: b should start with 'potato'.
+d = "not Diego"
+    ^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:7: check warning: d should start with D
 {
-  "Bar": {
-    "a": "potato",
-    "b": "kitten",
-    "c": 1
+  "All_Regex_Matches": {
+    "a": "123abc",
+    "b": "3_kitten_",
+    "c": "potato and tomato sauce",
+    "d": "Diego"
+  },
+  "No_Regex_Matches": {
+    "a": "123456789 abcdefghijklmn",
+    "b": "??...kitten_...??",
+    "c": "not potato",
+    "d": "not Diego"
   }
 }
-Processed 1 model and 1 requirement file and found no issues
+Processed 1 model and 1 requirement file and found 4 warnings

tests-system/rbt-matches-semantics/output.smtlib

@@ -1 +1,9 @@
-Processed 1 model and 1 requirement file and found no issues
+a = "123456789 abcdefghijklmn"
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:4: check warning: a should match with 6 to 12 letters or digits
+b = "??...kitten_...??"
+    ^^^^^^^^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:5: check warning: b should match only letters, digits, or underscores.
+c = "not potato"
+    ^^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:6: check warning: b should start with 'potato'.
+d = "not Diego"
+    ^^^^^^^^^^^ rbt-matches-semantics/foo.trlc:7: check warning: d should start with D
+Processed 1 model and 1 requirement file and found 4 warnings

tests-system/rbt-signature-len-1/foo.rsl

@@ -3,7 +3,6 @@ package Foo
 type T {
     a String
     b Integer
-    c Integer[1..*]
 }
 
 checks T {

tests-system/rbt-signature-len-1/output

@@ -1,3 +1,3 @@
 len(b) > 7, "b must be longer than 7"
-    ^ rbt-signature-len-1/foo.rsl:11: error: expected expression of type Array_Type, got Builtin_Integer instead
+    ^ rbt-signature-len-1/foo.rsl:10: error: expected expression of type Array_Type, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-len-1/output.brief

@@ -1 +1 @@
-rbt-signature-len-1/foo.rsl:11:9: trlc error: expected expression of type Array_Type, got Builtin_Integer instead
+rbt-signature-len-1/foo.rsl:10:9: trlc error: expected expression of type Array_Type, got Builtin_Integer instead

tests-system/rbt-signature-len-1/output.json

@@ -1,3 +1,3 @@
 len(b) > 7, "b must be longer than 7"
-    ^ rbt-signature-len-1/foo.rsl:11: error: expected expression of type Array_Type, got Builtin_Integer instead
+    ^ rbt-signature-len-1/foo.rsl:10: error: expected expression of type Array_Type, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-len-1/output.smtlib

@@ -1,3 +1,3 @@
 len(b) > 7, "b must be longer than 7"
-    ^ rbt-signature-len-1/foo.rsl:11: error: expected expression of type Array_Type, got Builtin_Integer instead
+    ^ rbt-signature-len-1/foo.rsl:10: error: expected expression of type Array_Type, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-len-2/foo.rsl

@@ -2,7 +2,6 @@ package Foo
 
 type T {
     a String
-    b Integer
     c Integer[1..*]
 }
 

tests-system/rbt-signature-len-2/foo.trlc

@@ -2,6 +2,5 @@ package Foo
 
 T Bar {
     a = "potato"
-    b = 1
     c = [2,1]
 }

tests-system/rbt-signature-len-2/output

@@ -1,3 +1,3 @@
 len(a, c) > 7, "a and c must be longer than 7"
-^^^ rbt-signature-len-2/foo.rsl:12: error: function requires 1 parameters
+^^^ rbt-signature-len-2/foo.rsl:11: error: function requires 1 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-len-2/output.brief

@@ -1 +1 @@
-rbt-signature-len-2/foo.rsl:12:5: trlc error: function requires 1 parameters
+rbt-signature-len-2/foo.rsl:11:5: trlc error: function requires 1 parameters

tests-system/rbt-signature-len-2/output.json

@@ -1,3 +1,3 @@
 len(a, c) > 7, "a and c must be longer than 7"
-^^^ rbt-signature-len-2/foo.rsl:12: error: function requires 1 parameters
+^^^ rbt-signature-len-2/foo.rsl:11: error: function requires 1 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-len-2/output.smtlib

@@ -1,3 +1,3 @@
 len(a, c) > 7, "a and c must be longer than 7"
-^^^ rbt-signature-len-2/foo.rsl:12: error: function requires 1 parameters
+^^^ rbt-signature-len-2/foo.rsl:11: error: function requires 1 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-1/foo.rsl

@@ -1,8 +1,6 @@
 package Foo
 
 type T {
-    a String
-    b String
     c Integer
 }
 

tests-system/rbt-signature-matches-1/output

@@ -1,3 +1,3 @@
 matches(c, "potato"), warning "a should match with potato", a
-        ^ rbt-signature-matches-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
+        ^ rbt-signature-matches-1/foo.rsl:8: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-matches-1/output.brief

@@ -1 +1 @@
-rbt-signature-matches-1/foo.rsl:10:13: trlc error: expected expression of type Builtin_String, got Builtin_Integer instead
+rbt-signature-matches-1/foo.rsl:8:13: trlc error: expected expression of type Builtin_String, got Builtin_Integer instead

tests-system/rbt-signature-matches-1/output.json

@@ -1,3 +1,3 @@
 matches(c, "potato"), warning "a should match with potato", a
-        ^ rbt-signature-matches-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
+        ^ rbt-signature-matches-1/foo.rsl:8: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-matches-1/output.smtlib

@@ -1,3 +1,3 @@
 matches(c, "potato"), warning "a should match with potato", a
-        ^ rbt-signature-matches-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
+        ^ rbt-signature-matches-1/foo.rsl:8: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-matches-2/foo.rsl

@@ -3,7 +3,6 @@ package Foo
 type T {
     a String
     b String
-    c Integer
 }
 
 checks T {

tests-system/rbt-signature-matches-2/foo.trlc

@@ -3,5 +3,4 @@ package Foo
 T Bar {
     a = "potato"
     b = "kitten"
-    c = 1
 }

tests-system/rbt-signature-matches-2/output

@@ -1,3 +1,3 @@
 matches(a, b, "potato"), warning "a should match with potato", a
-^^^^^^^ rbt-signature-matches-2/foo.rsl:10: error: function requires 2 parameters
+^^^^^^^ rbt-signature-matches-2/foo.rsl:9: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-2/output.brief

@@ -1 +1 @@
-rbt-signature-matches-2/foo.rsl:10:5: trlc error: function requires 2 parameters
+rbt-signature-matches-2/foo.rsl:9:5: trlc error: function requires 2 parameters

tests-system/rbt-signature-matches-2/output.json

@@ -1,3 +1,3 @@
 matches(a, b, "potato"), warning "a should match with potato", a
-^^^^^^^ rbt-signature-matches-2/foo.rsl:10: error: function requires 2 parameters
+^^^^^^^ rbt-signature-matches-2/foo.rsl:9: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-2/output.smtlib

@@ -1,3 +1,3 @@
 matches(a, b, "potato"), warning "a should match with potato", a
-^^^^^^^ rbt-signature-matches-2/foo.rsl:10: error: function requires 2 parameters
+^^^^^^^ rbt-signature-matches-2/foo.rsl:9: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-3/foo.rsl

@@ -7,5 +7,5 @@ type T {
 }
 
 checks T {
-    matches(a, "(abc(def)"), warning "a should match with potato", a
+    matches(a, "(abc(def)"), warning "a should match with the regex (abc(def))", a
 }

tests-system/rbt-signature-matches-3/output

@@ -1,3 +1,3 @@
-matches(a, "(abc(def)"), warning "a should match with potato", a
+matches(a, "(abc(def)"), warning "a should match with the regex (abc(def))", a
            ^^^^^^^^^^^ rbt-signature-matches-3/foo.rsl:10: error: missing ), unterminated subpattern at position 0
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-3/output.json

@@ -1,3 +1,3 @@
-matches(a, "(abc(def)"), warning "a should match with potato", a
+matches(a, "(abc(def)"), warning "a should match with the regex (abc(def))", a
            ^^^^^^^^^^^ rbt-signature-matches-3/foo.rsl:10: error: missing ), unterminated subpattern at position 0
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-matches-3/output.smtlib

@@ -1,3 +1,3 @@
-matches(a, "(abc(def)"), warning "a should match with potato", a
+matches(a, "(abc(def)"), warning "a should match with the regex (abc(def))", a
            ^^^^^^^^^^^ rbt-signature-matches-3/foo.rsl:10: error: missing ), unterminated subpattern at position 0
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-string-end-functions-1/foo.rsl

@@ -2,13 +2,10 @@ package Foo
 
 type T {
     a String
-    b String
     c Integer
 }
 
 checks T {
     startswith(a, "po"), warning "a should start with po", a
-    startswith(b, "po"), warning "b should start with po", b
-    endswith(c, "en"), warning "a should end with en", c
-    endswith(b, "en"), warning "b should end with en", b
+    startswith(c, "po"), warning "b should start with po", b
 }

tests-system/rbt-signature-string-end-functions-1/output

@@ -1,3 +1,3 @@
-endswith(c, "en"), warning "a should end with en", c
-         ^ rbt-signature-string-end-functions-1/foo.rsl:12: error: expected expression of type Builtin_String, got Builtin_Integer instead
+startswith(c, "po"), warning "b should start with po", b
+           ^ rbt-signature-string-end-functions-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-string-end-functions-1/output.brief

@@ -1 +1 @@
-rbt-signature-string-end-functions-1/foo.rsl:12:14: trlc error: expected expression of type Builtin_String, got Builtin_Integer instead
+rbt-signature-string-end-functions-1/foo.rsl:10:16: trlc error: expected expression of type Builtin_String, got Builtin_Integer instead

tests-system/rbt-signature-string-end-functions-1/output.json

@@ -1,3 +1,3 @@
-endswith(c, "en"), warning "a should end with en", c
-         ^ rbt-signature-string-end-functions-1/foo.rsl:12: error: expected expression of type Builtin_String, got Builtin_Integer instead
+startswith(c, "po"), warning "b should start with po", b
+           ^ rbt-signature-string-end-functions-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-string-end-functions-1/output.smtlib

@@ -1,3 +1,3 @@
-endswith(c, "en"), warning "a should end with en", c
-         ^ rbt-signature-string-end-functions-1/foo.rsl:12: error: expected expression of type Builtin_String, got Builtin_Integer instead
+startswith(c, "po"), warning "b should start with po", b
+           ^ rbt-signature-string-end-functions-1/foo.rsl:10: error: expected expression of type Builtin_String, got Builtin_Integer instead
 Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-string-end-functions-2/foo.rsl

@@ -3,7 +3,6 @@ package Foo
 type T {
     a String
     b String
-    c Integer
 }
 
 checks T {

tests-system/rbt-signature-string-end-functions-2/foo.trlc

@@ -3,5 +3,4 @@ package Foo
 T Bar {
     a = "potato"
     b = "kitten"
-    c = 1
 }

tests-system/rbt-signature-string-end-functions-2/output

@@ -1,3 +1,3 @@
 endswith(a, b, "en"), warning "b should end with en", b
-^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:13: error: function requires 2 parameters
+^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:12: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-string-end-functions-2/output.brief

@@ -1 +1 @@
-rbt-signature-string-end-functions-2/foo.rsl:13:5: trlc error: function requires 2 parameters
+rbt-signature-string-end-functions-2/foo.rsl:12:5: trlc error: function requires 2 parameters

tests-system/rbt-signature-string-end-functions-2/output.json

@@ -1,3 +1,3 @@
 endswith(a, b, "en"), warning "b should end with en", b
-^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:13: error: function requires 2 parameters
+^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:12: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-string-end-functions-2/output.smtlib

@@ -1,3 +1,3 @@
 endswith(a, b, "en"), warning "b should end with en", b
-^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:13: error: function requires 2 parameters
+^^^^^^^^ rbt-signature-string-end-functions-2/foo.rsl:12: error: function requires 2 parameters
 Processed 1 model and 1 requirement file and found 1 error

tests-system/rbt-signature-string-end-functions-3/foo.rsl

@@ -0,0 +1,11 @@
+package Foo
+
+type T {
+    b String
+    c Integer
+}
+
+checks T {
+    endswith(c, "en"), warning "a should end with en", c
+    endswith(b, "en"), warning "b should end with en", b
+}

tests-system/rbt-signature-string-end-functions-3/output

@@ -0,0 +1,3 @@
+endswith(c, "en"), warning "a should end with en", c
+         ^ rbt-signature-string-end-functions-3/foo.rsl:9: error: expected expression of type Builtin_String, got Builtin_Integer instead
+Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-string-end-functions-3/output.brief

@@ -0,0 +1 @@
+rbt-signature-string-end-functions-3/foo.rsl:9:14: trlc error: expected expression of type Builtin_String, got Builtin_Integer instead

tests-system/rbt-signature-string-end-functions-3/output.json

@@ -0,0 +1,3 @@
+endswith(c, "en"), warning "a should end with en", c
+         ^ rbt-signature-string-end-functions-3/foo.rsl:9: error: expected expression of type Builtin_String, got Builtin_Integer instead
+Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-signature-string-end-functions-3/output.smtlib

@@ -0,0 +1,3 @@
+endswith(c, "en"), warning "a should end with en", c
+         ^ rbt-signature-string-end-functions-3/foo.rsl:9: error: expected expression of type Builtin_String, got Builtin_Integer instead
+Processed 1 model and 0 requirement files and found 1 error