diff options
| author | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2001-10-09 17:57:09 +0000 |
|---|---|---|
| committer | Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr> | 2001-10-09 17:57:09 +0000 |
| commit | e504e75fe024226f45bcf581c3b1d696e19440af (patch) | |
| tree | bcf606f8ab5b6fb0bad6b79812c3daa65ed8ae3f | |
| parent | 83a6451e4529758bb42eae9ec33eb5a180855288 (diff) | |
-
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3875 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | camlp4/CHANGES | 6 | ||||
| -rw-r--r-- | camlp4/lib/plexer.ml | 2 | ||||
| -rw-r--r-- | camlp4/ocaml_src/lib/plexer.ml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/camlp4/CHANGES b/camlp4/CHANGES index 9045a45a3..13a8d5ee4 100644 --- a/camlp4/CHANGES +++ b/camlp4/CHANGES @@ -1,12 +1,14 @@ Camlp4 Version 3.03 ------------------- +- [09 Oct 01] Fixed bug: the token !$ did not work. Fixed and completed + some syntaxes of labels patterns. Added missing case in exception + declaration (exception rebinding). - [05 Oct 01] Fixed bug in normal syntax: when defining a constructor named "True" of "False" (capitalized, i.e. not like the booleans), it did not work. - [04 Oct 01] Fixed some revised and quotation syntaxes in objects classes - and types (cleaner). Cleaned up also several parts of the parsers. Completed - missing cases. + and types (cleaner). Cleaned up also several parts of the parsers. - [02 Oct 01] In revised syntax, the warning for using old syntax for sequences is now by default. To remove it, the option -no-warn-seq of camlp4r has been added. Option -warn-seq has been removed. diff --git a/camlp4/lib/plexer.ml b/camlp4/lib/plexer.ml index f8d609cf4..4e783c54b 100644 --- a/camlp4/lib/plexer.ml +++ b/camlp4/lib/plexer.ml @@ -47,7 +47,7 @@ value rec ident len = and ident2 len = parser [ [: `('!' | '?' | '~' | '=' | '@' | '^' | '&' | '+' | '-' | '*' | '/' | - '%' | '.' | ':' | '<' | '>' | '|' as + '%' | '.' | ':' | '<' | '>' | '|' | '$' as c) ; s :] -> diff --git a/camlp4/ocaml_src/lib/plexer.ml b/camlp4/ocaml_src/lib/plexer.ml index 4298be5a5..27b98b768 100644 --- a/camlp4/ocaml_src/lib/plexer.ml +++ b/camlp4/ocaml_src/lib/plexer.ml @@ -45,7 +45,7 @@ and ident2 len (strm__ : _ Stream.t) = match Stream.peek strm__ with Some ('!' | '?' | '~' | '=' | '@' | '^' | '&' | '+' | '-' | '*' | '/' | '%' | - '.' | ':' | '<' | '>' | '|' as c) -> + '.' | ':' | '<' | '>' | '|' | '$' as c) -> Stream.junk strm__; ident2 (store len c) strm__ | _ -> len and ident3 len (strm__ : _ Stream.t) = |