From d334dc409fc11847ed0abcb8fd3ac13043f73431 Mon Sep 17 00:00:00 2001
From: glondu
Date: Sat, 14 Jan 2012 11:45:38 +0000
Subject: coq_micromega.ml: fix order of recursive calls to rconstant

Some tests were failing on architectures without native code because
the evaluation order of arguments in a function call is not the same
on bytecode, leading to different behaviours for the psatzl tactic.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14904 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 plugins/micromega/coq_micromega.ml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/micromega/coq_micromega.ml b/plugins/micromega/coq_micromega.ml
index be49aa3512..8b7ee55bd4 100644
--- a/plugins/micromega/coq_micromega.ml
+++ b/plugins/micromega/coq_micromega.ml
@@ -993,8 +993,12 @@ struct
         else raise ParseError
     | App(op,args) -> 
 	begin
-	  try 
-	    (assoc_const   op rconst_assoc) (rconstant args.(0)) (rconstant args.(1))
+	  try
+            (* the evaluation order is important in the following *)
+            let f = assoc_const op rconst_assoc in
+            let a = rconstant args.(0) in
+            let b = rconstant args.(1) in
+            f a b
 	  with
 	      ParseError -> 
 		match op with
-- 
cgit v1.2.3