[Toss-devel-svn] SF.net SVN: toss:[1425] trunk/Toss

[<luk...@us...>]

Revision: 1425
          http://toss.svn.sourceforge.net/toss/?rev=1425&view=rev
Author:   lukaszkaiser
Date:     2011-04-29 09:09:04 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
Player in GDL correction, thinking about fixed-point types.

Modified Paths:
--------------
    trunk/Toss/Formula/Formula.ml
    trunk/Toss/Formula/Formula.mli
    trunk/Toss/Server/ReqHandler.ml

Modified: trunk/Toss/Formula/Formula.ml
===================================================================
--- trunk/Toss/Formula/Formula.ml	2011-04-28 22:09:04 UTC (rev 1424)
+++ trunk/Toss/Formula/Formula.ml	2011-04-29 09:09:04 UTC (rev 1425)
@@ -103,10 +103,8 @@
   | Or of formula list
   | Ex of var list * formula
   | All of var list * formula
-  | MLfp of mso_var * fo_var * formula
-  | MGfp of mso_var * fo_var * formula
-  | Lfp of so_var * fo_var list * formula
-  | Gfp of so_var * fo_var list * formula
+  | Lfp of [ mso_var | so_var ] * fo_var array * formula
+  | Gfp of [ mso_var | so_var ] * fo_var array * formula
 
 and real_expr =    
   | RVar of string

Modified: trunk/Toss/Formula/Formula.mli
===================================================================
--- trunk/Toss/Formula/Formula.mli	2011-04-28 22:09:04 UTC (rev 1424)
+++ trunk/Toss/Formula/Formula.mli	2011-04-29 09:09:04 UTC (rev 1425)
@@ -55,10 +55,8 @@
   | Or of formula list
   | Ex of var list * formula
   | All of var list * formula
-  | MLfp of mso_var * fo_var * formula
-  | MGfp of mso_var * fo_var * formula
-  | Lfp of so_var * fo_var list * formula
-  | Gfp of so_var * fo_var list * formula
+  | Lfp of [mso_var | so_var] * fo_var array * formula
+  | Gfp of [mso_var | so_var] * fo_var array * formula
 
 (** Real-valued terms allow counting, characteristic functions, arithmetic. *)
 and real_expr =    

Modified: trunk/Toss/Server/ReqHandler.ml
===================================================================
--- trunk/Toss/Server/ReqHandler.ml	2011-04-28 22:09:04 UTC (rev 1424)
+++ trunk/Toss/Server/ReqHandler.ml	2011-04-29 09:09:04 UTC (rev 1425)
@@ -98,7 +98,7 @@
       else
 	let mov_msg =
           let time_used = time_started -. Unix.gettimeofday () in
-	  if GDL.our_turn gdl_transl state then (
+	  if GDL.our_turn gdl_transl new_state then (
 	    Play.set_timeout (float(playclock) -. time_used -. 0.07);
 	    let heur = match g_heur with
 	      | Some h -> h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.