WIP draft

Author: jamesdbrock

spago.dhall

@@ -12,6 +12,7 @@
   , "math"
   , "maybe"
   , "newtype"
+  , "numbers"
   , "prelude"
   , "strings"
   , "tailrec"

src/Text/Parsing/Parser/Token.purs

@@ -37,6 +37,7 @@ import Data.List (List(..))
 import Data.List as List
 import Data.List.NonEmpty (NonEmptyList)
 import Data.Maybe (Maybe(..), maybe)
+import Data.Number (fromString)
 import Data.String (CodePoint, null, toLower)
 import Data.String.CodePoints (codePointFromChar)
 import Data.String.CodeUnits (singleton, toChar) as CodeUnits
@@ -48,6 +49,7 @@ import Text.Parsing.Parser (ParseState(..), ParserT, consume, fail)
 import Text.Parsing.Parser.Combinators (between, choice, notFollowedBy, option, sepBy, sepBy1, skipMany, skipMany1, try, tryRethrow, (<?>), (<??>))
 import Text.Parsing.Parser.Pos (Position)
 import Text.Parsing.Parser.String (char, noneOf, oneOf, satisfy, satisfyCodePoint, string)
+import Text.Parsing.Parser.String as Parser.String
 
 -- | A parser which returns the first token in the stream.
 token :: forall m a. Monad m => (a -> Position) -> ParserT (List a) m a
@@ -608,8 +610,14 @@ makeTokenParser (LanguageDef languageDef) =
   natural = lexeme nat <?> "natural"
 
   -- floats
+
   floating :: ParserT String m Number
-  floating = decimal >>= fractExponent
+  -- floating = decimal >>= fractExponent
+  floating = do
+    Tuple section _ <- Parser.String.match $ skipMany1 $ oneOf [ '-', '.', 'e', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' ]
+    case fromString section of
+      Nothing -> fail $ "Could not parse Number " <> section
+      Just x -> pure x
 
   natFloat :: ParserT String m (Either Int Number)
   natFloat = char '0' *> zeroNumFloat

test/Main.purs

@@ -365,8 +365,9 @@ tokenParserFloatTest = do
   -- parse float with exponent
   parseTest "100.5e1" 1005.0 testTokenParser.float
 
-  -- fail on nonfloat
-  parseErrorTestPosition testTokenParser.float "100.e1" $ mkPos 5
+  -- I don't agree that this is a non-float — jamesdbrock
+  -- -- fail on nonfloat
+  -- parseErrorTestPosition testTokenParser.float "100.e1" $ mkPos 5
 
   -- I think ideally the float parser should round-trip with show.
   -- test from issue #73
@@ -375,6 +376,9 @@ tokenParserFloatTest = do
   -- test from issue #115
   parseTest "-6.0" (-6.0) testTokenParser.float
 
+  parseErrorTestPosition testTokenParser.float "NaN" (mkPos 1)
+  parseErrorTestPosition testTokenParser.float "---" (mkPos 4)
+
 -- TODO
 tokenParserNaturalOrFloatTest :: TestM
 tokenParserNaturalOrFloatTest = do