- Revert r11711 as it is plain wrong

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11712 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 11, 2012 · 50badcf · 50badcf
1 parent d080b84
commit 50badcf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Compiler/runtime/errorext.cpp b/Compiler/runtime/errorext.cpp
@@ -378,8 +378,7 @@ extern std::string ErrorImpl__printMessagesStr()
   // fprintf(stderr, "-> ErrorImpl__printMessagesStr error messages: %d queue size: %d\n", numErrorMessages, (int)errorMessageQueue.size()); fflush(NULL);
   std::string res("");
   while(!errorMessageQueue.empty()) {
-    if (errorMessageQueue.top()->getSeverity() == ErrorLevel_error)
-      res = errorMessageQueue.top()->getMessage()+string("\n")+res;
+    res = errorMessageQueue.top()->getMessage()+string("\n")+res;
     pop_message(false);
   }
   return res;

diff --git a/Parser/BaseModelica_Lexer.g b/Parser/BaseModelica_Lexer.g
@@ -308,7 +308,7 @@ STRING : '"' STRING_GUTS '"'
            }
            strs[0] = (const char*) buf;
            strs[1] = ModelicaParser_encoding;
-           c_add_source_message(2, ErrorType_syntax, ErrorLevel_warning, "The file was not encoded in \%s: \"\%s\".\n"
+           c_add_source_message(2, ErrorType_syntax, ErrorLevel_error, "The file was not encoded in \%s: \"\%s\".\n"
 "  To change encoding when loading a file: loadFile(encoding=\"ISO-XXXX-YY\").\n"
 "  To change it in a package: add a file package.encoding at the top-level.",
                 strs, 2, $line, $pos+1, $line, $pos+len+1,