[r2003-11-20 11:41:01 by szach] ported to new Validate arguments

Original author: szach
Date: 2003-11-20 11:41:01+00:00

compile/compile.ml

@@ -53,7 +53,7 @@ and compile_aux env tail = function
   | Typed.Transform (e,brs) -> Transform 
       (compile env false e, compile_branches env false brs)
   | Typed.Xtrans (e,brs) -> Xtrans (compile env false e, compile_branches env false brs)
-  | Typed.Validate (e,sch,t) -> Validate (compile env tail e, sch, t)
+  | Typed.Validate (e,k,sch,t) -> Validate (compile env tail e, k, sch, t)
   | Typed.RemoveField (e,l) -> RemoveField (compile env tail e,l)
   | Typed.Dot (e,l) -> Dot (compile env tail e, l)
   | Typed.Try (e,brs) -> Try (compile env false e, compile_branches env tail brs)

compile/lambda.ml

@@ -6,6 +6,9 @@ type var_loc =
   | Global of int
   | Dummy
 
+type schema_component_kind =
+  [ `Type | `Element | `Attribute | `Attribute_group | `Model_group ] option
+
 type expr = 
   | Var of var_loc
   | ExtVar of Types.CompUnit.t * int
@@ -23,7 +26,7 @@ type expr =
   | Transform of expr * branches
   | Xtrans of expr * branches
   | Try of expr * branches
-  | Validate of expr * string * string
+  | Validate of expr * schema_component_kind * string * string
   | RemoveField of expr * label
   | Dot of expr * label
   | UnaryOp of int * expr
@@ -128,7 +131,7 @@ module Put = struct
 	bits nbits s 12;
 	expr s e;
 	branches s brs
-    | Validate (e,sch,t) ->
+    | Validate (e,k,sch,t) ->
 	assert false (* TODO:Need to store a pointer to the schema ... *)
     | RemoveField (e,l) ->
 	bits nbits s 14;