aboutsummaryrefslogtreecommitdiff
path: root/parsing
diff options
context:
space:
mode:
authorfilliatr2000-05-02 20:49:25 +0000
committerfilliatr2000-05-02 20:49:25 +0000
commit5b0f516e7e1f6d2ea8ca0485ffe347a613b01a5c (patch)
treebf106a29e38172fcbd0ee48bc4531c07d46ff5aa /parsing
parent1555e5a4cf7c2662d31d7875f7cc217150b49f4c (diff)
portage Omega (mais toujours pas Zpower et Zlogarithm)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@400 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
-rw-r--r--parsing/lexer.mll14
1 files changed, 7 insertions, 7 deletions
diff --git a/parsing/lexer.mll b/parsing/lexer.mll
index 0f7b4938c9..847b9a8fae 100644
--- a/parsing/lexer.mll
+++ b/parsing/lexer.mll
@@ -120,7 +120,7 @@ let identchar =
['$' 'A'-'Z' 'a'-'z' '_' '\192'-'\214' '\216'-'\246' '\248'-'\255'
'\'' '0'-'9']
let symbolchar =
- ['!' '$' '%' '&' '*' '+' '-' '<' '>' '/' '\\' ':' ',' ';' '=' '?' '@' '^'
+ ['!' '$' '%' '&' '*' '+' '-' '<' '>' '/' '\\' ':' ',' '=' '?' '@' '^'
'|' '~' '#']
let decimal_literal = ['0'-'9']+
let hex_literal = '0' ['x' 'X'] ['0'-'9' 'A'-'F' 'a'-'f']+
@@ -135,15 +135,15 @@ rule token = parse
if is_keyword s then ("",s) else ("IDENT",s) }
| decimal_literal | hex_literal | oct_literal | bin_literal
{ ("INT", Lexing.lexeme lexbuf) }
- | "(" | ")" | "[" | "]" | "{" | "}" | "." | "_"
+ | "(" | ")" | "[" | "]" | "{" | "}" | "." | "_" | ";" | "`" | "->"
{ ("", Lexing.lexeme lexbuf) }
- | "->"
- { ("", "->") }
| symbolchar+
{ ("", Lexing.lexeme lexbuf) }
+ (***
| '`' [^'`']* '`'
{ let s = Lexing.lexeme lexbuf in
("QUOTED", String.sub s 1 (String.length s - 2)) }
+ ***)
| "\""
{ Buffer.reset string_buffer;
let string_start = Lexing.lexeme_start lexbuf in
@@ -261,12 +261,12 @@ let token_text = function
| (con, prm) -> con ^ " \"" ^ prm ^ "\""
let tparse (p_con, p_prm) =
- ifdef CAMLP4_300 then
- None
- else
+ None
+ (*i etait en ocaml 2.xx :
if p_prm = "" then
parser [< '(con, prm) when con = p_con >] -> prm
else
parser [< '(con, prm) when con = p_con && prm = p_prm >] -> prm
+ i*)
}