From f7693b3d897b90fd3bc2533be002dc0bdcd9f6c2 Mon Sep 17 00:00:00 2001
From: xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>
Date: Sat, 6 Oct 2012 15:46:47 +0000
Subject: 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
---
 backend/CMlexer.mll | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'backend/CMlexer.mll')

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 }
-- 
cgit v1.2.3