aboutsummaryrefslogtreecommitdiffstats
path: root/backend/CMlexer.mll
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2016-03-21 08:48:20 +0100
committerBernhard Schommer <bernhardschommer@gmail.com>2016-03-21 08:48:20 +0100
commit01e32a075023ce7b037d42d048b1904ba3d9a82b (patch)
tree2d01f3855234e6eb945b929e489232001c406592 /backend/CMlexer.mll
parent093e0ea167fde39429bf4bd3fc693a232af0d093 (diff)
parent1fdca8371317e656cb08eaec3adb4596d6447e9b (diff)
downloadcompcert-01e32a075023ce7b037d42d048b1904ba3d9a82b.tar.gz
compcert-01e32a075023ce7b037d42d048b1904ba3d9a82b.zip
Merge branch 'master' into cleanup
Diffstat (limited to 'backend/CMlexer.mll')
-rw-r--r--backend/CMlexer.mll5
1 files changed, 5 insertions, 0 deletions
diff --git a/backend/CMlexer.mll b/backend/CMlexer.mll
index 82769924..c82f5401 100644
--- a/backend/CMlexer.mll
+++ b/backend/CMlexer.mll
@@ -121,6 +121,7 @@ rule token = parse
| "-" { MINUS }
| "->" { MINUSGREATER }
| "-f" { MINUSF }
+ | "-s" { MINUSS }
| "-l" { MINUSL }
| "%" { PERCENT }
| "%l" { PERCENTL }
@@ -128,6 +129,7 @@ rule token = parse
| "%u" { PERCENTU }
| "+" { PLUS }
| "+f" { PLUSF }
+ | "+s" { PLUSS }
| "+l" { PLUSL }
| "}" { RBRACE }
| "}}" { RBRACERBRACE }
@@ -138,13 +140,16 @@ rule token = parse
| ";" { SEMICOLON }
| "/" { SLASH }
| "/f" { SLASHF }
+ | "/s" { SLASHS }
| "/l" { SLASHL }
| "/lu" { SLASHLU }
| "/u" { SLASHU }
| "single" { SINGLE }
+ | "singleofint" { SINGLEOFINT }
| "stack" { STACK }
| "*" { STAR }
| "*f" { STARF }
+ | "*s" { STARS }
| "*l" { STARL }
| "switch" { SWITCH }
| "switchl" { SWITCHL }