X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Farit_notation.ml;h=780fed363d575f473f6056607970cdc39e127ccd;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=324501eb31055db58aab1d8f4f70a1dc4db440d2;hpb=d0593639fe811c06577b39dc62fb5c2734246fc8;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/arit_notation.ml b/helm/ocaml/cic_disambiguation/arit_notation.ml
index 324501eb3..780fed363 100644
--- a/helm/ocaml/cic_disambiguation/arit_notation.ml
+++ b/helm/ocaml/cic_disambiguation/arit_notation.ml
@@ -42,6 +42,12 @@ EXTEND
           return_term loc (CicAst.Appl [CicAst.Symbol ("divide", 0); t1; t2])
       ]
     ];
+  term: LEVEL "power"
+    [
+      [ t1 = term; SYMBOL "^"; t2 = term ->
+          return_term loc (CicAst.Appl [CicAst.Symbol ("power", 0); t1; t2])
+      ]
+    ];
   term: LEVEL "inv"
     [
       [ SYMBOL "-"; t = term ->
@@ -74,23 +80,63 @@ let _ =
   DisambiguateChoices.add_num_choice
     ("real number",
       (fun _ num _ -> HelmLibraryObjects.build_real (int_of_string num)));
+  DisambiguateChoices.add_num_choice
+    ("binary positive number",
+      (fun _ num _ ->
+        let num = int_of_string num in
+        if num = 0 then
+          raise DisambiguateChoices.Invalid_choice
+        else
+          HelmLibraryObjects.build_bin_pos num));
+  DisambiguateChoices.add_num_choice
+    ("binary integer number",
+      (fun _ num _ ->
+        let num = int_of_string num in
+        if num = 0 then
+          HelmLibraryObjects.BinInt.z0
+        else if num > 0 then
+          Cic.Appl [
+            HelmLibraryObjects.BinInt.zpos;
+            HelmLibraryObjects.build_bin_pos num ]
+        else
+          assert false));
 
   DisambiguateChoices.add_binary_op "plus" "natural plus"
     HelmLibraryObjects.Peano.plus;
   DisambiguateChoices.add_binary_op "plus" "real plus"
     HelmLibraryObjects.Reals.rplus;
+  DisambiguateChoices.add_binary_op "plus" "binary integer plus"
+    HelmLibraryObjects.BinInt.zplus;
+  DisambiguateChoices.add_binary_op "plus" "binary positive plus"
+    HelmLibraryObjects.BinPos.pplus;
   DisambiguateChoices.add_binary_op "minus" "natural minus"
     (const HelmLibraryObjects.Peano.minus_URI);
   DisambiguateChoices.add_binary_op "minus" "real minus"
     (const HelmLibraryObjects.Reals.rminus_URI);
+  DisambiguateChoices.add_binary_op "minus" "binary integer minus"
+    HelmLibraryObjects.BinInt.zminus;
+  DisambiguateChoices.add_binary_op "minus" "binary positive minus"
+    HelmLibraryObjects.BinPos.pminus;
   DisambiguateChoices.add_binary_op "times" "natural times"
     (const HelmLibraryObjects.Peano.mult_URI);
   DisambiguateChoices.add_binary_op "times" "real times"
     (const HelmLibraryObjects.Reals.rmult_URI);
+  DisambiguateChoices.add_binary_op "times" "binary positive times"
+    HelmLibraryObjects.BinPos.pmult;
+  DisambiguateChoices.add_binary_op "times" "binary integer times"
+    HelmLibraryObjects.BinInt.zmult;
+  DisambiguateChoices.add_binary_op "power" "real power"
+    (const HelmLibraryObjects.Reals.pow_URI);
+  DisambiguateChoices.add_binary_op "power" "integer power"
+    (const HelmLibraryObjects.BinInt.zpower_URI);
   DisambiguateChoices.add_binary_op "divide" "real divide"
     (const HelmLibraryObjects.Reals.rdiv_URI);
   DisambiguateChoices.add_unary_op "uminus" "real unary minus"
     (const HelmLibraryObjects.Reals.ropp_URI);
+  DisambiguateChoices.add_unary_op "uminus" "binary integer negative sign"
+    (HelmLibraryObjects.BinInt.zneg);
+  DisambiguateChoices.add_unary_op "uminus" "binary integer unary minus"
+    (HelmLibraryObjects.BinInt.zopp);
 
   DisambiguateChoices.add_binary_op "leq" "natural 'less or equal to'"
     (mutind HelmLibraryObjects.Peano.le_URI);
@@ -120,3 +166,5 @@ let _ =
           Cic.Appl [
             Cic.MutInd (HelmLibraryObjects.Logic.eq_URI, 0, []);
               Cic.Implicit (Some `Type); t1; t2 ] ]));
+
+(* vim:set encoding=utf8: *)