Ticket #212: tokenizer-error-repeat.patch

Source/Parser.cobra

@@ -3 +3 @@
     var _token as IToken?
     var _fileName as String
     var _lineNum as int
+    var tokenizerError = false
 
     cue init(token as IToken, message as String)
         base.init(message)
@@ -23 +24 @@
     get hasSourceSite as bool is override
         return true
 
+    def consoleString as String is override
+        if .tokenizerError 
+            #Tokeniser errors already have source info embedded in msg so just use that
+            return .message
+        return base.consoleString
+            
     get fileName from var is override
 
     get lineNum from var is override
@@ -196 +203 @@
         err = _makeError(token, msg)
         _errorRecorder.recordError(err)
         return err
+    
+    def recordTokenError(token as IToken?, msg as String) as ParserException
+        """
+        Errors from Tokeniser need to be flagged to be treated slightly differently
+        since they already have the source info in their msg.
+        """
+        err = .recordError(token, msg)
+        err.tokenizerError = true
+        return err
         
     def throwError(msg as String)
         .throwError(.last, msg)

Source/CobraParser.cobra

@@ -204 +204 @@
         Sets up for parsing, but does not invoke `parseTokens`.
         Used by `parseSource` and various test sections.
         Returns true if successful, false if there were one or more errors.
-        Upon success, you can use token methods lik .grab.
+        Upon success, you can use token methods like .grab.
         Does not .throwError but may .recordError.
         """
         _fileName = fileName
@@ -233 +233 @@
                 else
                     _tokens.add(tokens[i])
         catch te as TokenizerError
-            .recordError(te.token, te.message)
+            .recordTokenError(te.token, te.message)
             return false
 
         # TODO: fold all occcurrences of this lookup to a helper
@@ -245 +245 @@
 
         if tokenizer.errors.count
             for error in tokenizer.errors
-                .recordError(error.token, error.message)
+                .recordTokenError(error.token, error.message)
             return false
 
         _nextTokenIndex = 0

Tests/820-errors/100-lexing-and-parsing/105-tokenizer-error-msg.cobra

@@ +1 @@
+# Test for Tokenizer error giving double print of line no. info: ticket:212
+# Error line below used to emit
+#  105-tokenizer-error-msg.cobra(8): error: 105-tokenizer-error-msg.cobra(8,1): error: Space-based indentation must be a multiple of 4.
+
+class TokenizerError
+    
+    # below is wrongly indented only 3 spaces
+   def t    #.error. 105-tokenizer-error-msg.cobra(8,1): error: Space-based indentation must be a multiple of 4
+        pass

Developer/IntermediateReleaseNotes.text

@@ -473 +473 @@
 * Fixed: Only the last `test` of a series of tests is included in the compiler's output.
 
 * Fixed: Dynamic binding cannot find `shared` methods.  ticket:208
+
+* Fixed: File, line number and 'error' repeated in compiler error message.  ticket:212