Revert OpenModelica#13620

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFCeval.mo

@@ -931,12 +931,11 @@ function evalBinaryOp_dispatch
   output Expression exp;
 algorithm
   exp := match op.op
-    case Op.ADD    then evalBinaryAdd(exp1, exp2);
-    case Op.SUB    then evalBinarySub(exp1, exp2);
-    case Op.MUL    then evalBinaryMul(exp1, exp2);
-    case Op.DIV    then evalBinaryDiv(exp1, exp2, target);
-    case Op.DIV_EW then evalBinaryDiv(exp1, exp2, target);
-    case Op.POW    then evalBinaryPow(exp1, exp2, target);
+    case Op.ADD then evalBinaryAdd(exp1, exp2);
+    case Op.SUB then evalBinarySub(exp1, exp2);
+    case Op.MUL then evalBinaryMul(exp1, exp2);
+    case Op.DIV then evalBinaryDiv(exp1, exp2, target);
+    case Op.POW then evalBinaryPow(exp1, exp2, target);
     case Op.ADD_SCALAR_ARRAY then evalBinaryScalarArray(exp1, exp2, evalBinaryAdd);
     case Op.ADD_ARRAY_SCALAR then evalBinaryArrayScalar(exp1, exp2, evalBinaryAdd);
     case Op.SUB_SCALAR_ARRAY then evalBinaryScalarArray(exp1, exp2, evalBinarySub);

OMCompiler/Compiler/NFFrontEnd/NFExpandExp.mo

@@ -582,7 +582,7 @@ public
       end if;
 
       if expanded then
-        outExp := expandBinaryElementWise2(exp1, Operator.stripEW(op), exp2, SimplifyExp.simplifyBinaryOp);
+        outExp := expandBinaryElementWise2(exp1, op, exp2, SimplifyExp.simplifyBinaryOp);
       else
         outExp := exp;
       end if;

OMCompiler/Compiler/NFFrontEnd/NFOperator.mo

@@ -308,7 +308,7 @@ public
       case Op.MUL_MATRIX_VECTOR then Absyn.Operator.MUL();
       case Op.SCALAR_PRODUCT    then Absyn.Operator.MUL();
       case Op.MATRIX_PRODUCT    then Absyn.Operator.MUL();
-      case Op.DIV_SCALAR_ARRAY  then Absyn.Operator.DIV_EW();
+      case Op.DIV_SCALAR_ARRAY  then Absyn.Operator.DIV();
       case Op.DIV_ARRAY_SCALAR  then Absyn.Operator.DIV();
       case Op.POW_SCALAR_ARRAY  then Absyn.Operator.POW();
       case Op.POW_ARRAY_SCALAR  then Absyn.Operator.POW();
@@ -357,7 +357,6 @@ public
       case Op.SCALAR_PRODUCT    then DAE.MUL_SCALAR_PRODUCT(ty);
       case Op.ADD_EW            then DAE.ADD_ARR(ty);
       case Op.SUB_EW            then DAE.SUB_ARR(ty);
-      case Op.DIV_EW            then DAE.DIV_ARR(ty);
       case Op.MATRIX_PRODUCT    then DAE.MUL_MATRIX_PRODUCT(ty);
       case Op.DIV_SCALAR_ARRAY  then DAE.DIV_SCALAR_ARRAY(ty);
       case Op.DIV_ARRAY_SCALAR  then DAE.DIV_ARRAY_SCALAR(ty);

OMCompiler/Compiler/NFFrontEnd/NFTypeCheck.mo

@@ -1129,14 +1129,14 @@ algorithm
         (_, _, mk) := matchArrayTypes(ty1, ty2, e1, ALLOW_UNKNOWN);
         valid := valid and isCompatibleMatch(mk);
       then
-        (ty1, if isElementWise then Operator.makeDivEW(ty1) else Operator.makeDiv(ty1));
+        (ty1, Operator.makeDiv(ty1));
 
     // Anything else is an error.
     else
       algorithm
         valid := false;
       then
-        (ty1, if isElementWise then Operator.makeDivEW(ty1) else Operator.makeDiv(ty1));
+        (ty1, Operator.makeDiv(ty1));
   end match;
 
   binaryExp := Expression.BINARY(e1, op, e2);

testsuite/flattening/modelica/scodeinst/Makefile

@@ -908,7 +908,6 @@ OperationAdd1.mo \
 OperationAddEW1.mo \
 OperationDiv1.mo \
 OperationDivEW1.mo \
-OperationDivEW2.mo \
 OperationLogicalBinary1.mo \
 OperationLogicalBinary2.mo \
 OperationLogicalUnary1.mo \