Fix lint errors

I think they turned up due to a pylint tool update.

trlc-lrm-generator.py

@@ -202,6 +202,8 @@ def token(self):
         end_pos  = self.lexpos
         raw_text = self.fragment[start_pos:end_pos + 1]
 
+        # pylint: disable=possibly-used-before-assignment
+
         if kind == "TERMINAL":
             t_kind = ""
             t_name = None
@@ -796,6 +798,8 @@ def write_text_object(fd, mh, obj, context, bnf_parser):
     assert isinstance(mh, Message_Handler)
     assert isinstance(obj, ast.Record_Object)
 
+    # pylint: disable=possibly-used-before-assignment
+
     data = obj.to_python_dict()
 
     # Close merged grammar section

trlc/parser.py

@@ -113,6 +113,7 @@ def token(self):
                                    start_pos,
                                    self.lexpos)
 
+        # pylint: disable=possibly-used-before-assignment
         return Markup_Token(loc,
                             kind,
                             self.content[start_pos:self.lexpos + 1])
@@ -429,13 +430,13 @@ def parse_tuple_field(self,
 
         if optional_required or self.peek_kw("optional"):
             self.match_kw("optional")
-            t_optional = self.ct
-            if optional_allowed:
-                field_is_optional = True
-            else:
+            t_optional        = self.ct
+            field_is_optional = True
+            if not optional_allowed:
                 self.mh.error(self.ct.location, optional_reason)
         else:
             field_is_optional = False
+            t_optional        = None
 
         # lobster-trace: LRM.Tuple_Field_Types
         field_type = self.parse_qualified_name(self.default_scope,
@@ -541,12 +542,12 @@ def parse_record_component(self, n_record):
         assert isinstance(n_record, ast.Record_Type)
 
         c_name, c_descr, t_descr = self.parse_described_name()
+        t_optional = None
+        c_optional = False
         if self.peek_kw("optional"):
             self.match_kw("optional")
             t_optional = self.ct
             c_optional = True
-        else:
-            c_optional = False
         c_typ = self.parse_qualified_name(self.default_scope,
                                           ast.Type)
         c_typ.set_ast_link(self.ct)
@@ -561,12 +562,12 @@ def parse_record_component(self, n_record):
             self.match("RANGE")
             t_range = self.ct
             a_loc = self.ct.location
+            a_hi  = None
             if self.peek("INTEGER"):
                 self.match("INTEGER")
                 a_hi = self.ct.value
             elif self.peek("OPERATOR") and self.nt.value == "*":
                 self.match("OPERATOR")
-                a_hi = None
             else:
                 self.mh.error(self.nt.location,
                               "expected INTEGER or * for upper bound")
@@ -601,19 +602,18 @@ def parse_record_component(self, n_record):
         return c_comp
 
     def parse_record_declaration(self):
+        t_abstract  = None
+        t_final     = None
+        is_abstract = False
+        is_final    = False
         if self.peek_kw("abstract"):
             self.match_kw("abstract")
-            t_abstract = self.ct
+            t_abstract  = self.ct
             is_abstract = True
-            is_final    = False
         elif self.peek_kw("final"):
             self.match_kw("final")
-            t_final = self.ct
-            is_abstract = False
-            is_final    = True
-        else:
-            is_abstract = False
-            is_final    = False
+            t_final  = self.ct
+            is_final = True
 
         self.match_kw("type")
         t_type = self.ct
@@ -889,6 +889,7 @@ def parse_simple_expression(self, scope):
 
         n_lhs = self.parse_term(scope)
         if t_unary:
+            # pylint: disable=possibly-used-before-assignment
             if self.lint_mode and \
                isinstance(n_lhs, ast.Binary_Expression) and \
                not has_explicit_brackets:
@@ -1487,6 +1488,9 @@ def parse_check_block(self):
                                 t_message = t_msg,
                                 extrainfo = c_extrainfo)
 
+            # pylint: disable=possibly-used-before-assignment
+            # pylint: disable=used-before-assignment
+
             n_check.set_ast_link(t_first_comma)
             if t_severity:
                 n_check.set_ast_link(t_severity)

trlc/vcg.py

@@ -322,7 +322,6 @@ def analyze(self):
         except Unsupported as exc:  # pragma: no cover
             self.mh.warning(exc.location,
                             exc.message)
-            return
 
     def checks_on_composite_type(self, n_ctyp):
         assert isinstance(n_ctyp, Composite_Type)