diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /backend/CMlexer.mll | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/CMlexer.mll')
| -rw-r--r-- | backend/CMlexer.mll | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/CMlexer.mll b/backend/CMlexer.mll index 7ed5b4ab..6695b6b7 100644 --- a/backend/CMlexer.mll +++ b/backend/CMlexer.mll @@ -21,8 +21,8 @@ exception Error of string } let blank = [' ' '\009' '\012' '\010' '\013'] -let floatlit = - ("-"? (['0'-'9'] ['0'-'9' '_']* +let floatlit = + ("-"? (['0'-'9'] ['0'-'9' '_']* ('.' ['0'-'9' '_']* )? (['e' 'E'] ['+' '-']? ['0'-'9'] ['0'-'9' '_']*)? )) | "inf" | "nan" let ident = ['A'-'Z' 'a'-'z' '_'] ['A'-'Z' 'a'-'z' '_' '$' '0'-'9']* @@ -69,7 +69,7 @@ rule token = parse | "floatofintu" { FLOATOFINTU } | "floatoflong" { FLOATOFLONG } | "floatoflongu" { FLOATOFLONGU } - | "goto" { GOTO } + | "goto" { GOTO } | ">" { GREATER } | ">f" { GREATERF } | ">l" { GREATERL } |