about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2013-02-07 22:55:23 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2013-02-07 22:55:23 +1100
commit17a14fe0e9402cf0883f5957879646a9ef359769 (patch)
tree9cc140d6789c512931733b4f6d9ae8aee2f42496 /src/libsyntax/parse
parente4c7d8ec8764d1daf8b247c359d564daea1c113c (diff)
parentb3e182568f9f1fdbb598e8fcc95c64dd922d255e (diff)
downloadrust-17a14fe0e9402cf0883f5957879646a9ef359769.tar.gz
rust-17a14fe0e9402cf0883f5957879646a9ef359769.zip
Merge branch 'incoming' of https://github.com/mozilla/rust into incoming
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 381183e736c..0f672d1de81 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -431,6 +431,13 @@ fn scan_number(c: char, rdr: string_reader) -> token::Token {
         let dec_part = scan_digits(rdr, 10u);
         num_str += ~"." + dec_part;
     }
+    if is_float {
+        match base {
+          16u => rdr.fatal(~"hexadecimal float literal is not supported"),
+          2u => rdr.fatal(~"binary float literal is not supported"),
+          _ => ()
+        }
+    }
     match scan_exponent(rdr) {
       Some(ref s) => {
         is_float = true;