Merge pull request #56 from facebook/numbers

Clarify Number parsing, expand exponent grammar

Author: leebyron

Section 2 -- Language.md

@@ -222,12 +222,12 @@ contain variables.
 
 **Int**
 
-Int is a number specified without a decimal point (ex. `1`).
+Int is a number specified without a decimal point or exponent (ex. `1`).
 
 **Float**
 
-A Float numbers always includes a decimal point (ex. `1.0`) and may optionally
-also include an exponent (ex. `6.0221413e23`).
+A Float number includes either a decimal point (ex. `1.0`) or an exponent
+(ex. `1e50`) or both (ex. `6.0221413e23`).
 
 **Boolean**
 

Section 8 -- Grammar.md

@@ -158,24 +158,30 @@ Punctuator : one of ! $ ( ) ... : = @ [ ] { | }
 
 Name : /[_A-Za-z][_0-9A-Za-z]*/
 
-IntValue : Sign? IntegerPart
+IntValue : IntegerPart
 
-FloatValue : Sign? IntegerPart . Digit+ ExponentPart?
-
-Sign : -
+FloatValue :
+  - IntegerPart FractionalPart
+  - IntegerPart ExponentPart
+  - IntegerPart FractionalPart ExponentPart
 
 IntegerPart :
-  - 0
-  - NonZeroDigit
-  - NonZeroDigit Digit+
+  - NegativeSign? 0
+  - NegativeSign? NonZeroDigit Digit+?
+
+FractionalPart : . Digit+
+
+ExponentPart : ExponentIndicator Sign? Digit+
+
+Digit : one of 0 1 2 3 4 5 6 7 8 9
+
+NonZeroDigit : Digit but not `0`
 
-ExponentPart : e Sign? Digit+
+Sign : one of + -
 
-NonZeroDigit : one of 1 2 3 4 5 6 7 8 9
+NegativeSign : -
 
-Digit :
-  - 0
-  - NonZeroDigit
+ExponentIndicator : one of `e` `E`
 
 StringValue :
   - `""`