/[escript]/branches/clazy/escriptcore/src/DataLazy.cpp
ViewVC logotype

Diff of /branches/clazy/escriptcore/src/DataLazy.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6114 by jfenwick, Fri Apr 1 03:37:52 2016 UTC revision 6125 by jfenwick, Tue Apr 5 04:12:13 2016 UTC
# Line 160  string ES_opstrings[]={"UNKNOWN","IDENTI Line 160  string ES_opstrings[]={"UNKNOWN","IDENTI
160                          "transpose", "trace",                          "transpose", "trace",
161                          "swapaxes",                          "swapaxes",
162                          "minval", "maxval",                          "minval", "maxval",
163                          "condEval"};                          "condEval",
164  int ES_opcount=44;                          "hermitian","antihermitian"
165    };
166    int ES_opcount=46;
167  ES_opgroup opgroups[]={G_UNKNOWN,G_IDENTITY,G_BINARY,G_BINARY,G_BINARY,G_BINARY, G_BINARY,  ES_opgroup opgroups[]={G_UNKNOWN,G_IDENTITY,G_BINARY,G_BINARY,G_BINARY,G_BINARY, G_BINARY,
168                          G_UNARY,G_UNARY,G_UNARY, //10                          G_UNARY,G_UNARY,G_UNARY, //10
169                          G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,        // 17                          G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,G_UNARY,        // 17
# Line 173  ES_opgroup opgroups[]={G_UNKNOWN,G_IDENT Line 175  ES_opgroup opgroups[]={G_UNKNOWN,G_IDENT
175                          G_NP1OUT_P, G_NP1OUT_P,                          G_NP1OUT_P, G_NP1OUT_P,
176                          G_NP1OUT_2P,                          G_NP1OUT_2P,
177                          G_REDUCTION, G_REDUCTION,                          G_REDUCTION, G_REDUCTION,
178                          G_CONDEVAL};                          G_CONDEVAL,
179                            G_UNARY,G_UNARY
180    };
181  inline  inline
182  ES_opgroup  ES_opgroup
183  getOpgroup(ES_optype op)  getOpgroup(ES_optype op)
# Line 962  DataLazy::collapseToReady() const Line 966  DataLazy::collapseToReady() const
966      case MAXVAL:      case MAXVAL:
967          result=left.minval();          result=left.minval();
968          break;          break;
969        case HER:
970        result=left.hermitian();
971        break;
972      default:      default:
973          throw DataException("Programmer error - collapseToReady does not know how to resolve operator "+opToString(m_op)+".");          throw DataException("Programmer error - collapseToReady does not know how to resolve operator "+opToString(m_op)+".");
974    }    }

Legend:
Removed from v.6114  
changed lines
  Added in v.6125

  ViewVC Help
Powered by ViewVC 1.1.26