diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-10-06 15:46:47 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-10-06 15:46:47 +0000 |
| commit | f7693b3d897b90fd3bc2533be002dc0bdcd9f6c2 (patch) | |
| tree | 93ea9491693324d2d690c4236a2c88c3b461e225 /backend/CMlexer.mll | |
| parent | 261ef24f7fd2ef443f73c468b9b1fa496371f3bf (diff) | |
Merge of branch seq-and-or. See Changelog for details.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2059 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/CMlexer.mll')
| -rw-r--r-- | backend/CMlexer.mll | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/backend/CMlexer.mll b/backend/CMlexer.mll index 780d812..fba85ff 100644 --- a/backend/CMlexer.mll +++ b/backend/CMlexer.mll @@ -35,13 +35,11 @@ rule token = parse | "/*" { comment lexbuf; token lexbuf } | "absf" { ABSF } | "&" { AMPERSAND } - | "&&" { AMPERSANDAMPERSAND } | "!" { BANG } | "!=" { BANGEQUAL } | "!=f" { BANGEQUALF } | "!=u" { BANGEQUALU } | "|" { BAR } - | "||" { BARBAR } | "^" { CARET } | "case" { CASE } | ":" { COLON } @@ -102,7 +100,6 @@ rule token = parse | "%u" { PERCENTU } | "+" { PLUS } | "+f" { PLUSF } - | "?" { QUESTION } | "}" { RBRACE } | "}}" { RBRACERBRACE } | "]" { RBRACKET } |