Changeset 15262 for src/Pugs/Parser

Timestamp:

02/14/07 08:07:06 (22 months ago)

Author:

audreyt

Message:

* Chase S02/r13586 and change

q:t / q:to

to

q:to / q:heredoc

Also reflect this change in the tests and examples.

Files:

• src/Pugs/Parser/Literal.hs (modified) (3 diffs)

src/Pugs/Parser/Literal.hs

@@ -303 +303 @@
                             && (all isSpace (take (length line - length endMarker) line))
                 case break foundEndMarker restOfInput of
-                    (_, []) -> fail $ "Cannot find q:to END marker: " ++ show endMarker
+                    (_, []) -> fail $ "Cannot find heredoc END marker: " ++ show endMarker
                     (pre, (pivot:post)) -> do
                         let indent = indentLevelOf (take (length pivot - length endMarker) pivot)
@@ -315 +315 @@
                         return docExp
             others -> do
-                fail $ "Cannot handle q:to END marker: " ++ show others
+                fail $ "Cannot handle heredoc END marker: " ++ show others
 
 indentLevelOf :: String -> Int
@@ -479 +479 @@
           useflag "b" qf          = qf { qfInterpolateBackslash = QB_All }
           useflag "backslash" qf  = qf { qfInterpolateBackslash = QB_All }
-          useflag "t" qf          = qf { qfHereDoc = True }
           useflag "to" qf         = qf { qfHereDoc = True }
+          useflag "heredoc" qf    = qf { qfHereDoc = True }
 
         -- Zeroing flags