diff options
| author | herbelin | 2002-11-28 19:48:20 +0000 |
|---|---|---|
| committer | herbelin | 2002-11-28 19:48:20 +0000 |
| commit | 6aedc1b6c4047a206e2e02aea77cab23afa534a6 (patch) | |
| tree | 6f19ce87151f62f414ce1cdb9c0a81502480179c | |
| parent | 13ecb862956076e70e6d1514abf36e5ad98ba1e9 (diff) | |
Essai de suppression du caractere d'echappement des string
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3327 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | parsing/lexer.ml4 | 5 | ||||
| -rw-r--r-- | theories/Init/LogicSyntax.v | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/parsing/lexer.ml4 b/parsing/lexer.ml4 index a3ea85e022..8d23a9ce85 100644 --- a/parsing/lexer.ml4 +++ b/parsing/lexer.ml4 @@ -190,7 +190,10 @@ let escape len c = store len c let rec string bp len = parser | [< ''"' >] -> len - | [< ''\\'; 'c; s >] -> string bp (escape len c) s +(* 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 fda1cde030..fa5d8b958c 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) |