Changeset 15302

Timestamp:

2013-02-25T09:22:59+01:00 (11 years ago)

Author:

adrpo

Message:

• fix tests and a minor printout of the ClassInf.STATE

Location:

trunk

Files:

• Compiler/FrontEnd/ClassInf.mo (modified) (1 diff)
• testsuite/openmodelica/bootstrapping/DumpTest.mos (modified) (4 diffs)
• testsuite/openmodelica/bootstrapping/SimCodeTest.mo (modified) (1 diff)

trunk/Compiler/FrontEnd/ClassInf.mo

@@ -207 +207 @@
     case PACKAGE(path = p) then "package";
     case FUNCTION(path = p, isImpure = true) then "impure function";
-    case FUNCTION(path = p) then "impure function";
+    case FUNCTION(path = p) then "function";
     case TYPE_INTEGER(path = p) then "Integer";
     case TYPE_REAL(path = p) then "Real";

trunk/testsuite/openmodelica/bootstrapping/DumpTest.mos

@@ -8 +8 @@
 echo(false);
 body:=Absyn.PARTS({},{},{},NONE());
-restr:=Absyn.R_FUNCTION(Absyn.FR_NORMAL_FUNCTION());
+restr:=Absyn.R_FUNCTION(Absyn.FR_NORMAL_FUNCTION(Absyn.PURE()));
 prog:=Absyn.PROGRAM({Absyn.CLASS("dummyClass",true,true,true,restr,body,Absyn.dummyInfo)},Absyn.TOP(),Absyn.dummyTimeStamp);
 echo(true);
@@ -53 +53 @@
 // "DumpGraphviz.dump"
 // graph AST {
-// GVNOD0[label="ROOT"];GVNOD1[label="FUNCTION"];GVNOD1 -- GVNOD0;
+// GVNOD0[label="ROOT"];GVNOD1[label="PURE FUNCTION"];GVNOD1 -- GVNOD0;
 // }
 // 
@@ -59 +59 @@
 // "Dump.dump"
 // "Absyn.PROGRAM([
-// Absyn.CLASS(\"dummyClass\", true, true, true, Absyn.R_FUNCTION(Absyn.FR_NORMAL_FUNCTION), Absyn.PARTS([], NONE()), Absyn.INFO(\"\", false, 0, 0, 0, 0))
+// Absyn.CLASS(\"dummyClass\", true, true, true, Absyn.R_FUNCTION(Absyn.FR_NORMAL_FUNCTION(Absyn.PURE)), Absyn.PARTS([], NONE()), Absyn.INFO(\"\", false, 0, 0, 0, 0))
 // ],Absyn.TOP)
 // "
 // ""
 // "Dump.unparseStr"
-// "final encapsulated partial function dummyClass
+// "final encapsulated partial pure function dummyClass
 // end dummyClass;
 // 
@@ -71 +71 @@
 // "Dump.getAstAsCorbaString"
 // "record Absyn.PROGRAM
-// classes = {record Absyn.CLASS name = \"dummyClass\", partialPrefix = true, finalPrefix = true, encapsulatedPrefix = true, restriction = record Absyn.R_FUNCTION functionRestriction = record Absyn.FR_NORMAL_FUNCTION end Absyn.FR_NORMAL_FUNCTION;end Absyn.R_FUNCTION;, body = record Absyn.PARTS typeVars = {}, classParts = {}, comment = NONE() end Absyn.PARTS;, info = record Absyn.INFO fileName = \"\", isReadOnly = false, lineNumberStart = 0, columnNumberStart = 0, lineNumberEnd = 0, columnNumberEnd = 0, buildTimes = record Absyn.TIMESTAMP lastBuildTime = 0.0, lastEditTime = 0.0 end Absyn.TIMESTAMP; end Absyn.INFO; end Absyn.CLASS;},
+// classes = {record Absyn.CLASS name = \"dummyClass\", partialPrefix = true, finalPrefix = true, encapsulatedPrefix = true, restriction = record Absyn.R_FUNCTION functionRestriction = record Absyn.FR_NORMAL_FUNCTION purity = record Absyn.PURE end Absyn.PURE; end Absyn.FR_NORMAL_FUNCTION;end Absyn.R_FUNCTION;, body = record Absyn.PARTS typeVars = {}, classParts = {}, comment = NONE() end Absyn.PARTS;, info = record Absyn.INFO fileName = \"\", isReadOnly = false, lineNumberStart = 0, columnNumberStart = 0, lineNumberEnd = 0, columnNumberEnd = 0, buildTimes = record Absyn.TIMESTAMP lastBuildTime = 0.0, lastEditTime = 0.0 end Absyn.TIMESTAMP; end Absyn.INFO; end Absyn.CLASS;},
 // within_ = record Absyn.TOP end Absyn.TOP;,
 // globalBuildTimes = record Absyn.TIMESTAMP lastBuildTime = 0.0, lastEditTime = 0.0 end Absyn.TIMESTAMP;

trunk/testsuite/openmodelica/bootstrapping/SimCodeTest.mo

@@ -12 +12 @@
   Flags.new({"+g=Modelica"});
   path:=Absyn.QUALIFIED("SimCodeC",Absyn.IDENT("abc"));
-  func:=DAE.FUNCTION(path,{DAE.FUNCTION_DEF({})},DAE.T_FUNCTION({},DAE.T_NORETCALL_DEFAULT,DAE.FUNCTION_ATTRIBUTES_DEFAULT,{path}),false,DAE.NO_INLINE(),DAE.emptyElementSource,NONE());
+  func:=DAE.FUNCTION(path,{DAE.FUNCTION_DEF({})},DAE.T_FUNCTION({},DAE.T_NORETCALL_DEFAULT,DAE.FUNCTION_ATTRIBUTES_DEFAULT,{path}),false,false,DAE.NO_INLINE(),DAE.emptyElementSource,NONE());
   SimCodeMain.translateFunctions(Absyn.PROGRAM({},Absyn.TOP(),Absyn.dummyTimeStamp),"SimCodeC_abc", SOME(func), {}, {}, {});
 end test;