let hvbox = box Ast.HV
let hovbox = box Ast.HOV
let break = Ast.Layout Ast.Break
-let space = Ast.Literal (`Symbol " ")
-let builtin_symbol s = Ast.Literal (`Symbol s)
-let keyword k = add_keyword_attrs (Ast.Literal (`Keyword k))
+let space = Ast.Literal (`Symbol (" ", (None,None)))
+let builtin_symbol s = Ast.Literal (`Symbol (s,(None,None)))
+let keyword k = add_keyword_attrs (Ast.Literal (`Keyword (k,(None,None))))
let number s =
add_xml_attrs (* (RenderingAttrs.number_attributes `MathML) *) ()
- (Ast.Literal (`Number s))
+ (Ast.Literal (`Number (s,(None,None))))
let ident i =
add_xml_attrs (* (RenderingAttrs.ident_attributes `MathML) *) ()
status#set_content_pres_db
{ status#content_pres_db with compiled21 = Some f }
-let add_idrefs =
- List.fold_right (fun idref t -> Ast.AttributedTerm (`IdRef idref, t))
+(* let add_idrefs =
+ List.fold_right (fun idref t -> Ast.AttributedTerm (`IdRef idref, t)) *)
let instantiate21 idrefs env l1 =
let rec subst_singleton pos env =
[ value ]
| Ast.Magic m -> subst_magic pos env m
| Ast.Literal l as t ->
- let t = add_idrefs idrefs t in
- (match l with
- | `Keyword k -> [ add_keyword_attrs t ]
- | _ -> [ t ])
+ (match idrefs with
+ | [] -> [t]
+ | desc::_ ->
+ let desc = Some desc in
+ (match l with
+ | `Keyword (k,_) -> [ Ast.Literal (`Keyword (k,(None,desc))) ]
+ | `Symbol (s,_) -> [ Ast.Literal (`Symbol (s,(None,desc))) ]
+ | `Number (n,_) -> [ Ast.Literal (`Number (n,(None,desc))) ]))
| Ast.Layout l -> [ Ast.Layout (subst_layout pos env l) ]
| t -> [ NotationUtil.visit_ast (subst_singleton pos env) t ]
and subst_magic pos env = function
| NotationEnv.DisambiguationValue _ as v -> v
in
let ast_env_of_env env =
+ prerr_endline ("### pp_env: " ^ NotationPp.pp_env status env);
List.map (fun (var, (ty, value)) -> (var, (ty, pp_value value))) env
in
-(* prerr_endline ("pattern matching from 2 to 1 on term " ^ NotationPp.pp_term term); *)
+(* prerr_endline ("### pattern matching from 2 to 1 on term " ^
+ * NotationPp.pp_term status term); *)
+ let res =
match term with
| Ast.AttributedTerm (attrs, term') ->
Ast.AttributedTerm (attrs, pp_ast1 status term')
| _ ->
(match get_compiled21 status term with
- | None -> pp_ast0 status term (pp_ast1 status)
+ | None -> (* prerr_endline "### ramo 1"; *)
+ pp_ast0 status term (pp_ast1 status)
| Some (env, ctors, pid) ->
+ (* prerr_endline "### ramo 2";
+ prerr_endline ("### constructors:\n" ^
+ (String.concat "\n\n" (List.map (NotationPp.pp_term status) ctors)) ^
+ "\n\n### constructors end") *)
let idrefs =
List.flatten (List.map NotationUtil.get_idrefs ctors)
in
with Not_found -> assert false
in
instantiate21 idrefs (ast_env_of_env env) l1)
+ in
+ (* prerr_endline ("### pattern matching finished: " ^ NotationPp.pp_term
+ * status res);*)
+ res
let load_patterns21 status t =
set_compiled21 status (lazy (Content2presMatcher.Matcher21.compiler t))