X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Flexicon%2FcicNotation.ml;h=ebc9463ee6b457ed8ae3395d419f13c3872c7440;hb=db7f6d6b32515c091e0f338dd4903624f35f27ac;hp=d514c0273947084238fea63880031135b480f8eb;hpb=c0bc1be19b2bb2c5e3dd7f68880b26990b932118;p=helm.git

diff --git a/helm/software/components/lexicon/cicNotation.ml b/helm/software/components/lexicon/cicNotation.ml
index d514c0273..ebc9463ee 100644
--- a/helm/software/components/lexicon/cicNotation.ml
+++ b/helm/software/components/lexicon/cicNotation.ml
@@ -32,31 +32,45 @@ type notation_id =
   | InterpretationId of TermAcicContent.interpretation_id
   | PrettyPrinterId of TermContentPres.pretty_printer_id
 
-let parser_ref_counter = RefCounter.create ()
-let rule_ids_to_items = Hashtbl.create 113
+let compare_notation_id x y = 
+  match x,y with
+  | RuleId i1, RuleId i2 -> CicNotationParser.compare_rule_id i1 i2
+  | RuleId _, _ -> ~-1
+  | _, RuleId _ -> 1
+  | x,y -> Pervasives.compare x y
+
+let initial_parser_ref_counter () = RefCounter.create ()
+let initial_rule_ids_to_items ()= Hashtbl.create 113
+
+let parser_ref_counter = ref (initial_parser_ref_counter ());;
+let rule_ids_to_items = ref (initial_rule_ids_to_items ());;
 
 let process_notation st =
   match st with
   | Notation (loc, dir, l1, associativity, precedence, l2) ->
+      let l1 = 
+        CicNotationParser.check_l1_pattern
+         l1 (dir = Some `RightToLeft) precedence associativity
+      in
       let item = (l1, precedence, associativity, l2) in
       let rule_id = ref [] in
       let _ =
         if dir <> Some `RightToLeft then
           let create_cb (l1, precedence, associativity, l2) =
             let id =
-              CicNotationParser.extend l1 ?precedence ?associativity
+              CicNotationParser.extend l1 
                 (fun env loc ->
                   CicNotationPt.AttributedTerm
                    (`Loc loc,TermContentPres.instantiate_level2 env l2)) in
             rule_id := [ RuleId id ];
-            Hashtbl.add rule_ids_to_items id item
+            Hashtbl.add !rule_ids_to_items id item
           in
-          RefCounter.incr ~create_cb parser_ref_counter item
+          RefCounter.incr ~create_cb !parser_ref_counter item
       in
       let pp_id =
         if dir <> Some `LeftToRight then
           [ PrettyPrinterId
-              (TermContentPres.add_pretty_printer ?precedence ?associativity
+              (TermContentPres.add_pretty_printer 
                 l2 l1) ]
         else
           []
@@ -71,10 +85,10 @@ let remove_notation = function
   | RuleId id ->
       let item =
         try
-          Hashtbl.find rule_ids_to_items id
+          Hashtbl.find !rule_ids_to_items id
         with Not_found -> assert false in
       RefCounter.decr ~delete_cb:(fun _ -> CicNotationParser.delete id)
-        parser_ref_counter item
+        !parser_ref_counter item
   | PrettyPrinterId id -> TermContentPres.remove_pretty_printer id
   | InterpretationId id -> TermAcicContent.remove_interpretation id
 
@@ -96,3 +110,25 @@ let set_active_notations ids =
   in
   TermAcicContent.set_active_interpretations interp_ids
 
+let history = ref [];;
+
+let push () =
+ history := (!parser_ref_counter,!rule_ids_to_items) :: !history;
+ parser_ref_counter := initial_parser_ref_counter ();
+ rule_ids_to_items := initial_rule_ids_to_items ();
+ TermContentPres.push ();
+ TermAcicContent.push ();
+ CicNotationParser.push ()
+;;
+
+let pop () =
+ TermContentPres.pop ();
+ TermAcicContent.pop ();
+ CicNotationParser.pop ();
+ match !history with
+ | [] -> assert false
+ | (prc,riti) :: tail ->
+     parser_ref_counter := prc;
+     rule_ids_to_items := riti;
+     history := tail;
+;;