fixes remove of deprecated builtin function syntax (#99)

fixes #98

CHANGELOG.md

@@ -27,7 +27,8 @@ generated in the following situations:
 
 ### 2.0.1-dev
 
-
+* [TRLC] Fix an UnboundLocalError when missing a term
+  in an expression.
 
 ### 2.0.0
 

tests-system/rbt-builtin-functions-1/output

@@ -0,0 +1,7 @@
+len("foo") == 3, warning "len is broken"
+           ^^ rbt-builtin-functions-1/foo.rsl:6: issue: expression is always true [vcg-always-true]
+startswith("foo", "f"), warning "startswith is broken"
+^^^^^^^^^^ rbt-builtin-functions-1/foo.rsl:7: issue: expression is always true [vcg-always-true]
+endswith("foo", "o"), warning "endswith is broken"
+^^^^^^^^ rbt-builtin-functions-1/foo.rsl:8: issue: expression is always true [vcg-always-true]
+Processed 1 model and 1 requirement file and found 3 warnings

tests-system/rbt-builtin-functions-1/output.smtlib

@@ -0,0 +1,7 @@
+len("foo") == 3, warning "len is broken"
+           ^^ rbt-builtin-functions-1/foo.rsl:6: issue: expression is always true [vcg-always-true]
+startswith("foo", "f"), warning "startswith is broken"
+^^^^^^^^^^ rbt-builtin-functions-1/foo.rsl:7: issue: expression is always true [vcg-always-true]
+endswith("foo", "o"), warning "endswith is broken"
+^^^^^^^^ rbt-builtin-functions-1/foo.rsl:8: issue: expression is always true [vcg-always-true]
+Processed 1 model and 1 requirement file and found 3 warnings

tests-system/rbt-builtin-functions-2/foo.rsl

@@ -0,0 +1,11 @@
+package Foo
+
+type Requirement {
+    name String
+    description String
+
+}
+
+checks Requirement {
+    name != , warning "bar"
+}

tests-system/rbt-builtin-functions-2/output

@@ -0,0 +1,3 @@
+name != , warning "bar"
+        ^ rbt-builtin-functions-2/foo.rsl:10: error: expected identifier, encountered comma ',' instead
+Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-builtin-functions-2/output.brief

@@ -0,0 +1 @@
+rbt-builtin-functions-2/foo.rsl:10:13: trlc error: expected identifier, encountered comma ',' instead

tests-system/rbt-builtin-functions-2/output.json

@@ -0,0 +1,3 @@
+name != , warning "bar"
+        ^ rbt-builtin-functions-2/foo.rsl:10: error: expected identifier, encountered comma ',' instead
+Processed 1 model and 0 requirement files and found 1 error

tests-system/rbt-builtin-functions-2/output.smtlib

@@ -0,0 +1,3 @@
+name != , warning "bar"
+        ^ rbt-builtin-functions-2/foo.rsl:10: error: expected identifier, encountered comma ',' instead
+Processed 1 model and 0 requirement files and found 1 error

trlc/parser.py

@@ -1310,22 +1310,21 @@ def parse_name(self, scope):
         # components the true grammar for function calls is always
         # IDENTIFIER '('; so we can slightly special case this.
 
-        if self.peek("IDENTIFIER"):
-            # lobster-trace: LRM.Builtin_Functions
-            # lobster-trace: LRM.Builtin_Type_Conversion_Functions
-            self.match("IDENTIFIER")
-            if self.peek("BRA"):
-                # If we follow our name with brackets
-                # immediately, we have a builtin function call.
-                n_name = self.stab.lookup(self.mh,
-                                          self.ct)
-                if not isinstance(n_name, (ast.Builtin_Function,
-                                           ast.Builtin_Numeric_Type)):
-                    self.mh.error(self.ct.location,
-                                  "not a valid builtin function "
-                                  "or numeric type")
-            else:
-                n_name = self.parse_qualified_name(scope, match_ident=False)
+        # lobster-trace: LRM.Builtin_Functions
+        # lobster-trace: LRM.Builtin_Type_Conversion_Functions
+        self.match("IDENTIFIER")
+        if self.peek("BRA"):
+            # If we follow our name with brackets
+            # immediately, we have a builtin function call.
+            n_name = self.stab.lookup(self.mh,
+                                        self.ct)
+            if not isinstance(n_name, (ast.Builtin_Function,
+                                        ast.Builtin_Numeric_Type)):
+                self.mh.error(self.ct.location,
+                                "not a valid builtin function "
+                                "or numeric type")
+        else:
+            n_name = self.parse_qualified_name(scope, match_ident=False)
 
         # Enum literals are a bit different, so we deal with them
         # first.