Changeset b8b118d3 in OpenModelica for OMCompiler/Compiler/Lexers/lexerModelicaDiff.l

Timestamp:

2021-04-06T15:58:57+02:00 (3 years ago)

Author:

Martin Sjölund <martin+github@…>

Branches:

maintenance/v1.17

Children:

4ee9f76, b36b0588, bcf875b0, dc4aaab

Parents:

2afcdfe1

git-author:

Martin Sjölund <martin@…> (03/16/21 08:57:25)

git-committer:

Martin Sjölund <martin+github@…> (04/06/21 15:58:57)

Message:

Handle UTF8 BOM in the diff API

File:

• OMCompiler/Compiler/Lexers/lexerModelicaDiff.l (modified) (3 diffs)

OMCompiler/Compiler/Lexers/lexerModelicaDiff.l

@@ -340 +340 @@
         then (false,e::rest,tmp);
       case (e as (_,TOKEN(id=TokenId.NEWLINE)))::rest then (true,rest,e::tmp);
-      case (Diff.Add,TOKEN(id=TokenId.WHITESPACE))::(e as (Diff.Add,t))::rest guard lastIsNewline
+      case (Diff.Add,TOKEN(id=TokenId.WHITESPACE))::(e as (Diff.Add,_))::rest guard lastIsNewline
         then (false,rest,e::
           (Diff.Add,TOKEN("WHITESPACE",TokenId.WHITESPACE,sum(" " for i in 1:depth),1,depth,0,0,0,0))
@@ -487 +487 @@
 protected
   Integer i=0;
+  String content;
 algorithm
   for t in tokens loop
@@ -493 +494 @@
       Error.addMessage(Error.SCANNER_ERROR_LIMIT, {});
     end if;
-    Error.addSourceMessage(Error.SCANNER_ERROR, {tokenContent(t)}, tokenSourceInfo(t));
+    content := tokenContent(t);
+    Error.addSourceMessage(Error.SCANNER_ERROR, {StringUtil.convertCharNonAsciiToHex(content)}, tokenSourceInfo(t));
   end for;
   if not listEmpty(tokens) then