- removed templateError() imported function (from my previous commit) ... to be replaced by the new approach:

- introduced new magic builtin function
  sourceInfo() 
  that returns contextual Absyn.Info structure based on the position in template files. 
  The sourceInfo() can only be used as a direct parameter into a template/imported function,... no let binding of its value is possible for now (to be possible when full semantics of the let will be implemented)
- added two Tpl functions  Tpl.addSourceTemplateError()  and   Tpl.addTemplateError()
  to SimCodeTV.mo which can be used to implement user defined templates for reporting template errors,
- see error() and errorMsg() example templates in SimCodeC.tpl and one usage of error() in literalExpConstBoxedVal() template
- Susan compiler now fully captures source info for every expression, so the proper semantic errors are on the way "to be really soon ..."

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8264 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: pavolpr

Compiler/BackEnd/SimCode.mo

@@ -818,35 +818,6 @@ algorithm
 end appendLists;
 
 
-//TODO: ?? should this function be in Tpl.mo ?
-public function templateError 
- "Reports a template error via the Error module."
-  input String inErrMsg;
-  output String outErrMsg;
-
-algorithm
-  outErrMsg := matchcontinue (inErrMsg)
-    local 
-      String errmsg;   
-    case (inErrMsg)
-      equation
-        errmsg = "TemplateError '" +& inErrMsg +& "'";
-        //TODO: create a special category for this error ... Error.TEMPLATE_ERROR
-        Error.addMessage(Error.INTERNAL_ERROR, {errmsg});
-        errmsg = "###>>> " +& errmsg +& " <<<###"; //to be output in the generated code
-      then
-        errmsg;
-    
-    case (_)
-      equation
-        Debug.fprint("failtrace", "-!!!Tpl.textFile failed - a system error ?\n");
-      then 
-        fail();
-        
-  end matchcontinue;
-end templateError;
-
-
 /** end of TypeView published functions **/
 
 

Compiler/Template/Tpl.mo

@@ -8,6 +8,7 @@ protected import Util;
 protected import Print;
 protected import CevalScript;
 protected import Error;
+public import Absyn;
 
 
 // indentation will be implemented through spaces
@@ -91,21 +92,6 @@ uniontype IterOptions
   end ITER_OPTIONS;
 end IterOptions;
 
-
-uniontype SourceInfo "
- The _sourceinfo_ type ... source location information.
- It is copied from Absyn.Info (for now) to prevent direct dependency from Absyn to Tpl and TplAbsyn,
- perhaps, it will be changed to Absyn.Info in the future (easy to do then)."
-  record SOURCE_INFO
-    String fileName;
-    //Boolean isReadOnly "isReadOnly : (true|false). Should be true for libraries" ;
-    Integer lineNumberStart;
-    Integer columnNumberStart;
-    Integer lineNumberEnd;
-    Integer columnNumberEnd ;
-    //TimeStamp buildTimes "Build and edit times";   
-  end SOURCE_INFO;
-end SourceInfo;
 
 //by default, we will parse new lines in every non-token string
 public function writeStr
@@ -1681,6 +1667,36 @@ algorithm
     //    fail();
   end matchcontinue;
 end textFile;
+  
+ 
+public function sourceInfo
+"Magic sourceInfo() function implementation"
+  input String  inFileName;
+  input Integer inLineNum;
+  input Integer inColumnNum;
+  
+  output Absyn.Info outSourceInfo;
+algorithm
+  outSourceInfo  := Absyn.INFO(inFileName, false, inLineNum, inColumnNum, inLineNum, inColumnNum, Absyn.dummyTimeStamp);  
+end sourceInfo;
 
 
+//we do not import Error.addSourceMessage() directly
+//because of list creation in Susan is not possible (yet by design)
+public function addSourceTemplateError
+ "Wraps call to Error.addSourceMessage() funtion with Error.TEMPLATE_ERROR and one MessageToken."
+  input String inErrMsg;
+  input Absyn.Info inInfo;  
+algorithm
+  Error.addSourceMessage(Error.TEMPLATE_ERROR, {inErrMsg}, inInfo);
+end addSourceTemplateError;
+
+//for completeness
+public function addTemplateError
+ "Wraps call to Error.addMessage() funtion with Error.TEMPLATE_ERROR and one MessageToken."
+  input String inErrMsg;  
+algorithm
+  Error.addMessage(Error.TEMPLATE_ERROR, {inErrMsg});
+end addTemplateError;
+
 end Tpl;