Changeset 8722

Timestamp:

01/17/06 11:56:03 (3 years ago)

Author:

audreyt

Message:

* numbers.t: all underscore-related subtests now pass.

Files:

• ChangeLog (modified) (1 diff)
• src/Pugs/Lexer.hs (modified) (1 diff)
• src/Pugs/Parser/Number.hs (modified) (1 diff)
• t/syntax/parsing/numbers.t (modified) (1 diff)

ChangeLog

@@ -9 +9 @@
 
 == Feature Changes
+
+* 1__0 is now a parsefail.
 
 === Shared components

src/Pugs/Lexer.hs

@@ -151 +151 @@
     aheadSym x   '=' = not (x `elem` "!~+-*&/|.%^")
     aheadSym '?' y   = not (y `elem` "&|^?")
-    aheadSym '+' y   = not (y `elem` "&|^<>+")
-    aheadSym '~' y   = not (y `elem` "&|^<>~")
+    aheadSym '+' y   = not (y `elem` "&|^+")
+    aheadSym '~' y   = not (y `elem` "&|^~")
     aheadSym '^' y   = not (y `elem` "^.")
     aheadSym x   y   = y `elem` ";!" || x /= y

src/Pugs/Parser/Number.hs

@@ -91 +91 @@
     number base baseDigit = do
         d   <- baseDigit
-        ds  <- many (baseDigit <|> char '_')
+        ds  <- many (baseDigit <|> do { char '_'; lookAhead baseDigit; return '_' })
         let n = foldl (\x d -> base*x + toInteger (digitToInt d)) 0 digits
             digits = (d : filter (/= '_') ds)

t/syntax/parsing/numbers.t

@@ -24 +24 @@
 is 3.1_41, 3.141, "Underscores work with floating point after decimal";
 
-isnt 10_0.8, 100.8, "Underscores work with floating point before decimal";
+is 10_0.8, 100.8, "Underscores work with floating point before decimal";
 
 is 0xdead_beef, 0xdeadbeef, "Underscores work with hex";
 
-is 0b1101_1110_1010_1101_1011_1111_0110_1000, 0xdeadbeef, "Underscores work with binary";
+is 0b1101_1110_1010_1101_1011_1110_1110_1111, 0xdeadbeef, "Underscores work with binary";
 
 is 2e0_1, 20, "Underscores work in the argument for e";