IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38485


Ignore:
Timestamp:
Jun 17, 2015, 5:32:54 AM (11 years ago)
Author:
eugene
Message:

fix indentation

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150616/Ohana/src/opihi/lib.shell/stack_math.c

    r38441 r38485  
    3232
    3333  switch (op[0]) {
    34   case '?': SSS_FUNC(M1 ? M2: M3);
    35   default:
    36     snprintf (line, 512, "error: op %c not defined!", op[0]);
    37     push_error (line);
    38     return (FALSE);
    39 }
     34    case '?': SSS_FUNC(M1 ? M2: M3);
     35    default:
     36      snprintf (line, 512, "error: op %c not defined!", op[0]);
     37      push_error (line);
     38      return (FALSE);
     39  }
    4040# undef SSS_FUNC
    4141
    … …  
    447447
    448448  switch (op[0]) {
    449   case '+': SV_FUNC(ST_SCALAR_INT, M1 + *M2);
    450   case '-': SV_FUNC(ST_SCALAR_INT, M1 - *M2);
    451   case '*': SV_FUNC(ST_SCALAR_INT, M1 * *M2);
    452   case '/': SV_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) *M2);
    453   case '%': SV_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) *M2);
    454   case '^': SV_FUNC(ST_SCALAR_FLT, pow (M1, *M2));
    455   case '@': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
    456   case 'a': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
    457   case 'D': SV_FUNC(ST_SCALAR_INT, MIN (M1, *M2));
    458   case 'U': SV_FUNC(ST_SCALAR_INT, MAX (M1, *M2));
    459   case '<': SV_FUNC(ST_SCALAR_INT, (M1 < *M2) ? 1 : 0);
    460   case '>': SV_FUNC(ST_SCALAR_INT, (M1 > *M2) ? 1 : 0);
    461   case '&': SV_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)*M2));
    462   case '|': SV_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)*M2));
    463   case 'E': SV_FUNC(ST_SCALAR_INT, (M1 == *M2) ? 1 : 0);
    464   case 'N': SV_FUNC(ST_SCALAR_INT, (M1 != *M2) ? 1 : 0);
    465   case 'L': SV_FUNC(ST_SCALAR_INT, (M1 <= *M2) ? 1 : 0);
    466   case 'G': SV_FUNC(ST_SCALAR_INT, (M1 >= *M2) ? 1 : 0);
    467   case 'A': SV_FUNC(ST_SCALAR_INT, (M1 && *M2) ? 1 : 0);
    468   case 'O': SV_FUNC(ST_SCALAR_INT, (M1 || *M2) ? 1 : 0);
    469   default:
    470     snprintf (line, 512, "error: op %c not defined!", op[0]);
    471     push_error (line);
    472     return (FALSE);
    473 }
     449    case '+': SV_FUNC(ST_SCALAR_INT, M1 + *M2);
     450    case '-': SV_FUNC(ST_SCALAR_INT, M1 - *M2);
     451    case '*': SV_FUNC(ST_SCALAR_INT, M1 * *M2);
     452    case '/': SV_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) *M2);
     453    case '%': SV_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) *M2);
     454    case '^': SV_FUNC(ST_SCALAR_FLT, pow (M1, *M2));
     455    case '@': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
     456    case 'a': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
     457    case 'D': SV_FUNC(ST_SCALAR_INT, MIN (M1, *M2));
     458    case 'U': SV_FUNC(ST_SCALAR_INT, MAX (M1, *M2));
     459    case '<': SV_FUNC(ST_SCALAR_INT, (M1 < *M2) ? 1 : 0);
     460    case '>': SV_FUNC(ST_SCALAR_INT, (M1 > *M2) ? 1 : 0);
     461    case '&': SV_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)*M2));
     462    case '|': SV_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)*M2));
     463    case 'E': SV_FUNC(ST_SCALAR_INT, (M1 == *M2) ? 1 : 0);
     464    case 'N': SV_FUNC(ST_SCALAR_INT, (M1 != *M2) ? 1 : 0);
     465    case 'L': SV_FUNC(ST_SCALAR_INT, (M1 <= *M2) ? 1 : 0);
     466    case 'G': SV_FUNC(ST_SCALAR_INT, (M1 >= *M2) ? 1 : 0);
     467    case 'A': SV_FUNC(ST_SCALAR_INT, (M1 && *M2) ? 1 : 0);
     468    case 'O': SV_FUNC(ST_SCALAR_INT, (M1 || *M2) ? 1 : 0);
     469    default:
     470      snprintf (line, 512, "error: op %c not defined!", op[0]);
     471      push_error (line);
     472      return (FALSE);
     473  }
    474474# undef SV_FUNC
    475475
    476476  /** free up any temporary buffers: **/
    477477  if (V2[0].type == ST_VECTOR_TMP) {
    478   free (V2[0].vector[0].elements.Ptr);
    479   free (V2[0].vector);
    480 }
     478    free (V2[0].vector[0].elements.Ptr);
     479    free (V2[0].vector);
     480  }
    481481
    482482  clear_stack (V1);
    … …  
    554554
    555555  switch (op[0]) {
    556   case '+': VS_FUNC(ST_SCALAR_INT, *M1 + M2);
    557   case '-': VS_FUNC(ST_SCALAR_INT, *M1 - M2);
    558   case '*': VS_FUNC(ST_SCALAR_INT, *M1 * M2);
    559   case '/': VS_FUNC(ST_SCALAR_FLT, *M1 / (opihi_flt) M2);
    560   case '%': VS_FUNC(ST_SCALAR_INT, (long long) *M1 % (long long) M2);
    561   case '^': VS_FUNC(ST_SCALAR_FLT, pow (*M1, M2));
    562   case '@': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
    563   case 'a': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
    564   case 'D': VS_FUNC(ST_SCALAR_INT, MIN (*M1, M2));
    565   case 'U': VS_FUNC(ST_SCALAR_INT, MAX (*M1, M2));
    566   case '<': VS_FUNC(ST_SCALAR_INT, (*M1 < M2) ? 1 : 0);
    567   case '>': VS_FUNC(ST_SCALAR_INT, (*M1 > M2) ? 1 : 0);
    568   case '&': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 & (long long)M2));
    569   case '|': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 | (long long)M2));
    570   case 'E': VS_FUNC(ST_SCALAR_INT, (*M1 == M2) ? 1 : 0);
    571   case 'N': VS_FUNC(ST_SCALAR_INT, (*M1 != M2) ? 1 : 0);
    572   case 'L': VS_FUNC(ST_SCALAR_INT, (*M1 <= M2) ? 1 : 0);
    573   case 'G': VS_FUNC(ST_SCALAR_INT, (*M1 >= M2) ? 1 : 0);
    574   case 'A': VS_FUNC(ST_SCALAR_INT, (*M1 && M2) ? 1 : 0);
    575   case 'O': VS_FUNC(ST_SCALAR_INT, (*M1 || M2) ? 1 : 0);
    576   default:
    577     snprintf (line, 512, "error: op %c not defined!", op[0]);
    578     push_error (line);
    579     return (FALSE);
    580 }
     556    case '+': VS_FUNC(ST_SCALAR_INT, *M1 + M2);
     557    case '-': VS_FUNC(ST_SCALAR_INT, *M1 - M2);
     558    case '*': VS_FUNC(ST_SCALAR_INT, *M1 * M2);
     559    case '/': VS_FUNC(ST_SCALAR_FLT, *M1 / (opihi_flt) M2);
     560    case '%': VS_FUNC(ST_SCALAR_INT, (long long) *M1 % (long long) M2);
     561    case '^': VS_FUNC(ST_SCALAR_FLT, pow (*M1, M2));
     562    case '@': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
     563    case 'a': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
     564    case 'D': VS_FUNC(ST_SCALAR_INT, MIN (*M1, M2));
     565    case 'U': VS_FUNC(ST_SCALAR_INT, MAX (*M1, M2));
     566    case '<': VS_FUNC(ST_SCALAR_INT, (*M1 < M2) ? 1 : 0);
     567    case '>': VS_FUNC(ST_SCALAR_INT, (*M1 > M2) ? 1 : 0);
     568    case '&': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 & (long long)M2));
     569    case '|': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 | (long long)M2));
     570    case 'E': VS_FUNC(ST_SCALAR_INT, (*M1 == M2) ? 1 : 0);
     571    case 'N': VS_FUNC(ST_SCALAR_INT, (*M1 != M2) ? 1 : 0);
     572    case 'L': VS_FUNC(ST_SCALAR_INT, (*M1 <= M2) ? 1 : 0);
     573    case 'G': VS_FUNC(ST_SCALAR_INT, (*M1 >= M2) ? 1 : 0);
     574    case 'A': VS_FUNC(ST_SCALAR_INT, (*M1 && M2) ? 1 : 0);
     575    case 'O': VS_FUNC(ST_SCALAR_INT, (*M1 || M2) ? 1 : 0);
     576    default:
     577      snprintf (line, 512, "error: op %c not defined!", op[0]);
     578      push_error (line);
     579      return (FALSE);
     580  }
    581581# undef VS_FUNC
    582582
    … …  
    584584
    585585  if (V1[0].type == ST_VECTOR_TMP) {
    586   free (V1[0].vector[0].elements.Ptr);
    587   free (V1[0].vector);
    588 }
     586    free (V1[0].vector[0].elements.Ptr);
     587    free (V1[0].vector);
     588  }
    589589
    590590  clear_stack (V1);
    … …  
    10611061
    10621062  switch (op[0]) {
    1063   case '+': SS_FUNC(ST_SCALAR_INT, M1 + M2);
    1064   case '-': SS_FUNC(ST_SCALAR_INT, M1 - M2);
    1065   case '*': SS_FUNC(ST_SCALAR_INT, M1 * M2);
    1066   case '/': SS_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) M2);
    1067   case '%': SS_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) M2);
    1068   case '^': SS_FUNC(ST_SCALAR_FLT, pow (M1, M2));
    1069   case '@': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
    1070   case 'a': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
    1071   case 'D': SS_FUNC(ST_SCALAR_INT, MIN (M1, M2));
    1072   case 'U': SS_FUNC(ST_SCALAR_INT, MAX (M1, M2));
    1073   case '<': SS_FUNC(ST_SCALAR_INT, (M1 < M2) ? 1 : 0);
    1074   case '>': SS_FUNC(ST_SCALAR_INT, (M1 > M2) ? 1 : 0);
    1075   case '&': SS_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)M2));
    1076   case '|': SS_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)M2));
    1077   case 'E': SS_FUNC(ST_SCALAR_INT, (M1 == M2) ? 1 : 0);
    1078   case 'N': SS_FUNC(ST_SCALAR_INT, (M1 != M2) ? 1 : 0);
    1079   case 'L': SS_FUNC(ST_SCALAR_INT, (M1 <= M2) ? 1 : 0);
    1080   case 'G': SS_FUNC(ST_SCALAR_INT, (M1 >= M2) ? 1 : 0);
    1081   case 'A': SS_FUNC(ST_SCALAR_INT, (M1 && M2) ? 1 : 0);
    1082   case 'O': SS_FUNC(ST_SCALAR_INT, (M1 || M2) ? 1 : 0);
    1083   default:
    1084     snprintf (line, 512, "error: op %c not defined!", op[0]);
    1085     push_error (line);
    1086     return (FALSE);
    1087 }
     1063    case '+': SS_FUNC(ST_SCALAR_INT, M1 + M2);
     1064    case '-': SS_FUNC(ST_SCALAR_INT, M1 - M2);
     1065    case '*': SS_FUNC(ST_SCALAR_INT, M1 * M2);
     1066    case '/': SS_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) M2);
     1067    case '%': SS_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) M2);
     1068    case '^': SS_FUNC(ST_SCALAR_FLT, pow (M1, M2));
     1069    case '@': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
     1070    case 'a': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
     1071    case 'D': SS_FUNC(ST_SCALAR_INT, MIN (M1, M2));
     1072    case 'U': SS_FUNC(ST_SCALAR_INT, MAX (M1, M2));
     1073    case '<': SS_FUNC(ST_SCALAR_INT, (M1 < M2) ? 1 : 0);
     1074    case '>': SS_FUNC(ST_SCALAR_INT, (M1 > M2) ? 1 : 0);
     1075    case '&': SS_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)M2));
     1076    case '|': SS_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)M2));
     1077    case 'E': SS_FUNC(ST_SCALAR_INT, (M1 == M2) ? 1 : 0);
     1078    case 'N': SS_FUNC(ST_SCALAR_INT, (M1 != M2) ? 1 : 0);
     1079    case 'L': SS_FUNC(ST_SCALAR_INT, (M1 <= M2) ? 1 : 0);
     1080    case 'G': SS_FUNC(ST_SCALAR_INT, (M1 >= M2) ? 1 : 0);
     1081    case 'A': SS_FUNC(ST_SCALAR_INT, (M1 && M2) ? 1 : 0);
     1082    case 'O': SS_FUNC(ST_SCALAR_INT, (M1 || M2) ? 1 : 0);
     1083    default:
     1084      snprintf (line, 512, "error: op %c not defined!", op[0]);
     1085      push_error (line);
     1086      return (FALSE);
     1087  }
    10881088# undef SS_FUNC
    10891089
    … …  
    11331133    case 'E':
    11341134      value = strcmp (V1[0].name, V2[0].name) ? 0 : 1;
    1135     break;
     1135      break;
    11361136    case 'N':
    11371137      value = strcmp (V1[0].name, V2[0].name) ? 1 : 0;
    1138     break;
     1138      break;
    11391139    default:
    11401140      snprintf (line, 512, "error: op %c not defined for string operations!", op[0]);
Note: See TracChangeset for help on using the changeset viewer.