Commits

camlspotter committed 4f342b6

removed custom patches independent of ocamlspot

  • Participants
  • Parent commits 701cc41
  • Branches ocamlspot

Comments (0)

Files changed (2)

camlp4/Camlp4/Struct/Lexer.mll

         | Some x ->
             Stream.junk s;
             buff.[n] <- x;
-            self (succ n) s
+            succ n
         | _ -> n
     in
     self 0 s

camlp4/Camlp4Parsers/Camlp4OCamlParser.ml

     labeled_ipatt:
       [ [ i = a_LABEL; p = patt LEVEL "simple" ->
             <:patt< ~ $i$ : $p$ >>
-        | "~"; i = a_LIDENT -> <:patt< ~ $i$ : $lid:i$ >>
+        | "~"; i = a_LIDENT -> <:patt< ~ $i$ >>
         | "~"; "("; i = a_LIDENT; ")" ->
-            <:patt< ~ $i$ : $lid:i$ >>
+            <:patt< ~ $i$ >>
         | "~"; "("; i = a_LIDENT; ":"; t = ctyp; ")" ->
             <:patt< ~ $i$ : ($lid:i$ : $t$) >>
         | i = a_OPTLABEL; j = a_LIDENT -> (* ?a:b <> ?a : b *)
         | i = a_OPTLABEL; "("; p = patt; ":"; t = ctyp; "=";
           e = expr; ")" ->
             <:patt< ? $i$ : ( $p$ : $t$ = $e$ ) >>
-        | "?"; i = a_LIDENT -> <:patt< ? $i$ : ($lid:i$) >>
+        | "?"; i = a_LIDENT -> <:patt< ? $i$ >>
         | "?"; "("; i = a_LIDENT; "="; e = expr; ")" ->
             <:patt< ? ( $lid:i$ = $e$ ) >>
         | "?"; "("; i = a_LIDENT; ":"; t = ctyp; "="; e = expr; ")" ->
             <:patt< ? ( $lid:i$ : $t$ = $e$ ) >>
         | "?"; "("; i = a_LIDENT; ")" ->
-            <:patt< ? $i$ : ($lid:i$) >>
+            <:patt< ? $i$ >>
         | "?"; "("; i = a_LIDENT; ":"; t = ctyp; ")" ->
             <:patt< ? ( $lid:i$ : $t$ ) >>
         | p = patt LEVEL "simple" -> p