Changeset e4efaec in OpenModelica


Ignore:
Timestamp:
2017-09-07T13:01:19+02:00 (7 years ago)
Author:
hudson <openmodelica@…>
Branches:
Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging
Children:
8a7ad824
Parents:
1a22a75
git-author:
Per Östlund <perost86@…> (09/07/17 13:01:19)
git-committer:
hudson <openmodelica@…> (09/07/17 13:01:19)
Message:

Updated nfinst test cases.

Location:
flattening/modelica/scodeinst
Files:
14 added
4 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • flattening/modelica/scodeinst/FuncBuiltinRem.mo

    r2b02a60 re4efaec  
    1515// Result:
    1616// class FuncBuiltinRem
    17 //   Real r1 = OpenModelica.Internal.intRem(5, 2);
     17//   Real r1 = /*Real*/(OpenModelica.Internal.intRem(5, 2));
    1818//   Real r2 = OpenModelica.Internal.realRem(5.0, 2.0);
    1919//   Real r3 = OpenModelica.Internal.realRem(8.0, 3.0);

  • flattening/modelica/scodeinst/Makefile

    rbf355bb re4efaec  
    3434const1.mo \
    3535const2.mo \
     36const7.mo \
     37const8.mo \
    3638const10.mo \
    3739const11.mo \
    … …  
    4244const17.mo \
    4345const3.mo \
     46DimCyclic1.mo \
     47DimCyclic2.mo \
     48DimCyclic3.mo \
     49DimCyclic4.mo \
     50DimSize1.mo \
     51DimSize2.mo \
     52DimSize3.mo \
    4453dim1.mo \
     54dim10.mo \
     55dim12.mo \
    4556dim13.mo \
     57dim17.mo \
    4658dim18.mo \
     59dim19.mo \
    4760dim3.mo \
     61dim7.mo \
    4862dim8.mo \
    4963DuplicateElements1.mo \
    … …  
    149163inst4.mo \
    150164inst5.mo \
     165inst7.mo \
    151166inst8.mo \
    152167lookup1.mo \
    … …  
    154169lookup3.mo \
    155170lookup4.mo \
     171loop1.mo \
    156172loop2.mo \
     173loop3.mo \
    157174mod1.mo \
    158175mod10.mo \
    … …  
    176193RangeInvalidStep3.mo \
    177194RangeTypeError1.mo \
    178 RangeTypeError1.mo \
    179 RangeTypeError2.mo \
    180195RangeTypeError2.mo \
    181196RangeTypeError3.mo \
    … …  
    193208redeclare9.mo \
    194209Size1.mo \
     210Size2.mo \
    195211SizeInvalidArgs1.mo \
    196212SizeInvalidArgs2.mo \
     213SizeInvalidIndex1.mo \
     214SizeInvalidIndex2.mo \
     215SizeInvalidIndex3.mo \
     216SizeInvalidIndex4.mo \
    197217SizeInvalidType1.mo \
    198218SizeInvalidType2.mo \
    199219Subscript1.mo \
    200220type2.mo \
     221TypeDim1.mo \
     222TypeDim2.mo \
    201223usertype1.mo \
    202224usertype2.mo \
    … …  
    240262const5.mo \
    241263const6.mo \
    242 const7.mo \
    243 const8.mo \
    244264ConstantConnector1.mo \
    245265ConstantConnector2.mo \
    246266ConstantConnector3.mo \
    247 dim10.mo \
    248 dim12.mo \
    249267dim14.mo \
    250268dim15.mo \
    251269dim16.mo \
    252 dim17.mo \
    253 dim19.mo \
    254270dim2.mo \
    255 dim4.mo \
    256 dim5.mo \
    257 dim6.mo \
    258 dim7.mo \
    259271enum6.mo \
    260272eq2.mo \
    … …  
    317329inst1.mo \
    318330inst6.mo \
    319 inst7.mo \
    320331InvalidComplexConnectorType1.mo \
    321332InvalidComplexConnectorType2.mo \
    … …  
    336347InvalidVariability1.mo \
    337348InvalidVariability2.mo \
    338 loop1.mo \
    339 loop3.mo \
    340349loop4.mo \
    341350MissingRedeclare1.mo \
    … …  
    356365RedeclaredFunction1.mo \
    357366type1.mo \
    358 type3.mo \
    359367type4.mo \
    360368type5.mo \

  • flattening/modelica/scodeinst/Range1.mo

    r5393bf1 re4efaec  
    88model Range1
    99  type E = enumeration(one, two, three);
    10   Real x[E] = E.one:E.three;
     10  E x[E] = E.one:E.three;
    1111end Range1;
    1212

  • flattening/modelica/scodeinst/RangeInvalidStep3.mo

    r5393bf1 re4efaec  
    1515// Result:
    1616// Error processing file: RangeInvalidStep3.mo
    17 // [flattening/modelica/scodeinst/RangeInvalidStep3.mo:12:3-12:31:writable] Error: Range of type enumeration() may not specify a step size.
     17// [flattening/modelica/scodeinst/RangeInvalidStep3.mo:12:3-12:31:writable] Error: Range of type enumeration(one, two, three) may not specify a step size.
    1818//
    1919// # Error encountered! Exiting...

  • flattening/modelica/scodeinst/RangeTypeError2.mo

    r5393bf1 re4efaec  
    1616//   Integer
    1717// is not type compatible with 'E.one' of type
    18 //   enumeration()
     18//   enumeration(one, two, three)
    1919//
    2020// # Error encountered! Exiting...

  • flattening/modelica/scodeinst/Size1.mo

    rbf355bb re4efaec  
    1717//   Real x[2];
    1818//   Real x[3];
    19 //   Integer y = size(x, 1);
     19//   Integer y = 3;
    2020// end Size1;
    2121// endResult

  • flattening/modelica/scodeinst/const10.mo

    r01d38b7b re4efaec  
    2121// class C
    2222//   constant Integer b.j = A.i;
    23 //   Real b.x = b.j;
     23//   Real b.x = /*Real*/(b.j);
    2424// end C;
    2525// endResult

  • flattening/modelica/scodeinst/const15.mo

    r01d38b7b re4efaec  
    1919// Result:
    2020// class C
    21 //   Real x = B.i;
     21//   Real x = /*Real*/(B.i);
    2222// end C;
    2323// endResult

  • flattening/modelica/scodeinst/const16.mo

    r01d38b7b re4efaec  
    2525// Result:
    2626// class M
    27 //   Real x = P.P.P.i;
     27//   Real x = /*Real*/(P.P.P.i);
    2828// end M;
    2929// endResult

  • flattening/modelica/scodeinst/const17.mo

    r01d38b7b re4efaec  
    2424// Result:
    2525// class M
    26 //   Real x = A.B.i;
     26//   Real x = /*Real*/(A.B.i);
    2727// end M;
    2828// endResult

  • flattening/modelica/scodeinst/dim12.mo

    r545b9125 re4efaec  
    1313
    1414// Result:
    15 // SCodeInst.instClass failed
    1615// Error processing file: dim12.mo
     16// [flattening/modelica/scodeinst/dim12.mo:11:3-11:12:writable] Error: Failed to deduce dimensions of x due to missing binding equation.
     17//
    1718// # Error encountered! Exiting...
    1819// # Please check the error message and the flags.

  • flattening/modelica/scodeinst/dim17.mo

    r545b9125 re4efaec  
    44// cflags:   -d=newInst
    55//
    6 // FAILREASON: All array dimensions of y are instantiated when infering the
    7 // dimensions of x, which is not strictly needed.
    86//
    97
    108model A
    11   Real x[3, :] = y * 4;
    12   Real y[:, 4] = x;
     9  Real x[2, :] = y;
     10  Real y[:, 3] = x;
    1311end A;
     12
     13// Result:
     14// class A
     15//   Real x[1,1] = y[1,1];
     16//   Real x[1,2] = y[1,2];
     17//   Real x[1,3] = y[1,3];
     18//   Real x[2,1] = y[2,1];
     19//   Real x[2,2] = y[2,2];
     20//   Real x[2,3] = y[2,3];
     21//   Real y[1,1] = x[1,1];
     22//   Real y[1,2] = x[1,2];
     23//   Real y[1,3] = x[1,3];
     24//   Real y[2,1] = x[2,1];
     25//   Real y[2,2] = x[2,2];
     26//   Real y[2,3] = x[2,3];
     27// end A;
     28// endResult

  • flattening/modelica/scodeinst/dim19.mo

    r545b9125 re4efaec  
    1212  Real x[m];
    1313end A;
     14
     15// Result:
     16// class A
     17//   parameter Integer n[1] = 1;
     18//   parameter Integer n[2] = 2;
     19//   parameter Integer n[3] = 3;
     20//   parameter Integer m = n[2];
     21//   Real x[1];
     22//   Real x[2];
     23// end A;
     24// endResult

  • flattening/modelica/scodeinst/inst7.mo

    r545b9125 re4efaec  
    11// name: inst7.mo
    22// keywords:
    3 // status: correct
     3// status: incorrect
    44// cflags:   -d=newInst
    55//
    6 // FAILREASON: Typing of x.start fails. Should this be allowed?
    76//
    87
    … …  
    1413
    1514// Result:
    16 // Failed to type cref x.start
    17 // SCodeInst.instClass failed
    18 // Error processing file: test2.mo
     15// Error processing file: inst7.mo
     16// [flattening/modelica/scodeinst/inst7.mo:11:3-11:19:writable] Error: Variable x.start not found in scope M.
     17//
    1918// # Error encountered! Exiting...
    2019// # Please check the error message and the flags.

  • flattening/modelica/scodeinst/loop1.mo

    r545b9125 re4efaec  
    11// name: loop1.mo
    22// keywords:
    3 // status: correct
    4 // cflags:   -d=newInst
     3// status: incorrect
     4// cflags: -d=newInst
    55//
    6 // FAILREASON: Not good enough error message.
    76//
    87
    … …  
    1716
    1817// Result:
    19 // Failed to type cref i
    20 // Failed to type cref j
    21 // Failed to type cref i
    22 // Failed to type cref a
    23 // SCodeInst.instClass failed
    2418// Error processing file: loop1.mo
    25 // Error: Internal error Found cyclic dependencies, but failed to show error.
     19// [flattening/modelica/scodeinst/loop1.mo:14:3-14:34:writable] Error: Dimension 1 of x, 'i', could not be evaluated due to a cyclic dependency.
    2620//
    2721// # Error encountered! Exiting...
Note: See TracChangeset for help on using the changeset viewer.