Susan no longer depends on Absyn

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23139 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 2, 2014 · fc59b4b · fc59b4b
1 parent b6f399e
commit fc59b4b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/Compiler/Template/Tpl.mo b/Compiler/Template/Tpl.mo
@@ -8,7 +8,6 @@ encapsulated package Tpl
   $Id$
 "
 
-public import Absyn;
 protected import Config;
 protected import ClockIndexes;
 protected import Debug;

diff --git a/Compiler/Template/TplAbsyn.mo b/Compiler/Template/TplAbsyn.mo
@@ -43,7 +43,6 @@ protected import Flags;
 protected import List;
 protected import System;
 protected import Util;
-public import Absyn;
 
 public import Tpl;
 protected import TplCodegen;

diff --git a/Compiler/Template/TplParser.mo b/Compiler/Template/TplParser.mo
@@ -37,7 +37,6 @@ encapsulated package TplParser
   $Id$
 "
 
-public import Absyn;
 public import Tpl;
 public import TplAbsyn;
 

diff --git a/Compiler/Util/Error.mo b/Compiler/Util/Error.mo
@@ -127,8 +127,6 @@ type MessageTokens = list<String>   "\"Tokens\" to insert into message at
             - %s for string
             - %n for string number n" ;
 
-public import Absyn;
-
 public constant Message LOOKUP_ERROR = MESSAGE(3, TRANSLATION(), ERROR(),
   Util.gettext("Class %s not found in scope %s."));
 public constant Message LOOKUP_ERROR_COMPNAME = MESSAGE(4, TRANSLATION(), ERROR(),

diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -64,7 +64,6 @@ protected import List;
 protected import Print;
 protected import Settings;
 protected import System;
-public import Absyn;
 public import Util;
 
 public uniontype DebugFlag
@@ -1269,7 +1268,7 @@ algorithm
 
   outArgs := listAppend(listReverse(outArgs), rest_args);
   _ := List.map2(outArgs,System.iconv,"UTF-8","UTF-8");
-  Error.assertionOrAddSourceMessage(numError == Error.getNumErrorMessages(), Error.UTF8_COMMAND_LINE_ARGS, {}, Absyn.dummyInfo);
+  Error.assertionOrAddSourceMessage(numError == Error.getNumErrorMessages(), Error.UTF8_COMMAND_LINE_ARGS, {}, Util.dummyInfo);
   saveFlags(flags);
 end readArgs;
 

diff --git a/Compiler/Util/Util.mo b/Compiler/Util/Util.mo
@@ -85,7 +85,6 @@ public uniontype DateTime
   end DATETIME;
 end DateTime;
 
-public import Absyn;
 protected import Config;
 protected import Error;
 protected import Flags;
@@ -94,6 +93,7 @@ protected import List;
 protected import Print;
 protected import System;
 
+public constant SourceInfo dummyInfo = SOURCEINFO("",false,0,0,0,0,0.0);
 public constant String derivativeNamePrefix="$DER";
 public constant String pointStr = "$P";
 public constant String leftBraketStr = "$lB";

diff --git a/Compiler/boot/CompileFile.mos b/Compiler/boot/CompileFile.mos
@@ -9,7 +9,7 @@ if not checkInterfaceOfPackages(mainClass, {
   {"backendInterface", "absyn", "backend", "frontend", "util", "susan"},
   {"backend", "absyn", "frontend", "util", "susan", "backendInterface"},
   {"frontend", "absyn", "util", "susan", "backendInterface", ""},
-  {"susan", "util", "absyn", "", "", ""},
+  {"susan", "util", "", "", "", ""},
   {"util", "absyn", "", "", "", ""},
   {"absyn", "susan", "util", "", "", ""}// Its own module because Absyn-Dump-Util depend on each other...
 }) then