Changeset 14014 for src/Pugs/AST.hs

Timestamp:

10/07/06 15:25:27 (2 years ago)

Author:

audreyt

Message:

* Closure traits in bare-do-once blocks is now recognized:

use v6;
{

ENTER {...}
LEAVE {...}

}

Files:

• src/Pugs/AST.hs (modified) (3 diffs)

src/Pugs/AST.hs

@@ -206 +206 @@
 mergeStmts x y@(Ann ann (Syn syn _)) | isImplicitTopic syn =
     mergeStmts x (Ann ann (App (_Var "&infix:~~") Nothing [_Var "$_", y]))
-mergeStmts (Ann ann (Syn "sub" [Val (VCode sub)])) y | subType sub == SubBlock =
+mergeStmts x@(Ann _ (Syn "sub" [Val (VCode sub)])) y | subType sub == SubBlock =
     -- bare Block in statement level; annul all its parameters and run it!
-    mergeStmts (Ann ann $ subBody sub) y
-mergeStmts x (Ann ann (Syn "sub" [Val (VCode sub)])) | subType sub == SubBlock =
+    mergeStmts (Syn "block" [x]) y
+mergeStmts x y@(Ann _ (Syn "sub" [Val (VCode sub)])) | subType sub == SubBlock =
     -- bare Block in statement level; annul all its parameters and run it!
-    mergeStmts x (Ann ann $ subBody sub)
+    mergeStmts x (Syn "block" [y])
 mergeStmts x (Stmts y Noop) = mergeStmts x y
 mergeStmts x (Stmts Noop y) = mergeStmts x y
@@ -282 +282 @@
 typeMacro name exp = Syn "sub" . (:[]) . Val . VCode $ MkCode
     { isMulti       = True
-    , subName       = cast ("&term:" ++ name)
+    , subName       = cast name
     , subEnv        = Nothing
     , subType       = SubMacro
@@ -352 +352 @@
     "$*PROGRAM_NAME $*PID $*UID $*EUID $*GID $*EGID @*CHECK @*INIT $*IN " ++
     "$*OUT $*ERR $*ARGS $/ %*ENV $*CWD @=POD $=POD $?PUGS_VERSION " ++
-    "$*OS &?BLOCK_EXIT %?CONFIG $*_ $*AUTOLOAD $*PUGS_VERSION"
+    "$*OS %?CONFIG $*_ $*AUTOLOAD $*PUGS_VERSION"
 
 typeOfParam :: Param -> Type