CDPP / AMDA_Integration

Commit bc8ee588743e7b954bd5de2c046b6f9312617850

Authored by Benjamin Renard
1 parent 9dbbc3b0
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Fix expression parsing when some brackets are added for operators priority (this… 

… commit replace the previous one)
Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMExpressionParserClass.php
  Diff comments   View file @bc8ee58
... ... @@ -477,14 +477,15 @@ class IHMExpressionParserClass
477 477 $elements = $els;
478 478  
479 479 //add brackets for operators priority
  480 + //Obsolete cf. https://projects.irap.omp.eu/issues/5239
480 481  
481   - $els = array();
  482 + /*$els = array();
482 483 $i = 0;
483 484 for ($i; $i < count($elements)-2; ++$i)
484 485 {
485 486 if ($elements[$i+1] == "*" || $elements[$i+1] == "/" || $elements[$i+1] == "^" || $elements[$i+1] == "<" || $elements[$i+1] == ">")
486 487 {
487   - if ($elements[$i] != ")" && ($this->isDecimal($elements[$i+1]) || $this->isInteger($elements[$i+1])))
  488 + if ($elements[$i] != ")" && ($this->isDecimal($elements[$i+2]) || $this->isInteger($elements[$i+2])))
488 489 {
489 490 $els[] = "(";
490 491 $els[] = $elements[$i];
... ... @@ -500,7 +501,7 @@ class IHMExpressionParserClass
500 501 $els[] = $elements[$i];
501 502 }
502 503 for ($j = $i; $j < count($elements); ++$j)
503   - $els[] = $elements[$j];
  504 + $els[] = $elements[$j];*/
504 505  
505 506 //split parameters and components
506 507 $elements = $els;
... ...