From ebbe84707d6a082b3eef6c9e40a9c1b7b24bc03b Mon Sep 17 00:00:00 2001
From: herbelin
Date: Fri, 29 Nov 2002 10:33:03 +0000
Subject: Re-échappement des \ et " dans les token string

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3339 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 parsing/lexer.ml4           | 2 --
 theories/Init/LogicSyntax.v | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/parsing/lexer.ml4 b/parsing/lexer.ml4
index 8d23a9ce85..d2a46fcf48 100644
--- a/parsing/lexer.ml4
+++ b/parsing/lexer.ml4
@@ -190,10 +190,8 @@ let escape len c = store len c
 
 let rec string bp len = parser
   | [< ''"' >] -> len
-(* Uncomment to allow '"' in strings
   | [< ''\\'; c = (parser [< ' ('"' | '\\' as c) >] -> c | [< >] -> '\\'); s >]
      -> string bp (escape len c) s
-*)
   | [< _ = Stream.empty >] ep -> err (bp, ep) Unterminated_string
   | [< 'c; s >] -> string bp (store len c) s 
 
diff --git a/theories/Init/LogicSyntax.v b/theories/Init/LogicSyntax.v
index fa5d8b958c..fda1cde030 100644
--- a/theories/Init/LogicSyntax.v
+++ b/theories/Init/LogicSyntax.v
@@ -17,8 +17,8 @@ Notation "< P , Q > { p , q }" := (conj P Q p q) (at level 1).
 Notation "~ x" := (not x) (at level 5, right associativity).
 Notation "x = y" := (eq ? x y) (at level 5, no associativity).
 
-Infix RIGHTA 6 "/\" and.
-Infix RIGHTA 7 "\/" or.
+Infix RIGHTA 6 "/\\" and.
+Infix RIGHTA 7 "\\/" or.
 Infix RIGHTA 8 "<->" iff.
 
 Notation "'IF' c1 'then' c2 'else' c3" := (IF c1 c2 c3)
-- 
cgit v1.2.3