Changeset 200

Timestamp:

02/23/05 13:10:03 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

1041

Message:

* Decl for array operations; prim param parsing was in the wrong order, oops!

Location:

src

Files:

• Main.hs (modified) (1 diff)
• Parser.hs (modified) (1 diff)
• Prim.hs (modified) (3 diffs)

src/Main.hs

@@ -102 +102 @@
         , Symbol SGlobal "$*PROGNAME" (Val $ VStr name)
 --        , Symbol SGlobal "$*STDIN" (Val $ VStr str)
-        , Symbol SGlobal "$*END" (Val VUndef)
+        , Symbol SGlobal "@*END" (Val VUndef)
         , Symbol SGlobal "%*ENV" (Val . VHash . MkHash . listToFM $ [ (VStr k, VStr v) | (k, v) <- environ ])
         ]

src/Parser.hs

@@ -194 +194 @@
 
 ruleClosureTrait = rule "closure trait" $ do
-    name    <- tryChoice $ map symbol $ words "BEGIN CHECK INIT END"
+    name    <- tryChoice $ map symbol $ words " END "
     block   <- ruleBlock
-    -- let sym = Symbol SGlobal "$*END" block
-    -- updateState $ \e -> e{ envGlobal = (sym:envGlobal e) }
-    return $ Val VUndef -- XXX
+    let (fun, names) = extract (block, [])
+    -- Check for placeholder vs formal parameters
+    unless (null names) $
+        fail "Closure traits takes no formal parameters"
+    let sub = Sub { isMulti       = False
+                  , subName       = name
+                  , subPad        = []
+                  , subType       = SubBlock
+                  , subAssoc      = "pre"
+                  , subReturns    = "Any"
+                  , subParams     = []
+                  , subFun        = fun
+                  }
+    return $ App "&prefix:push" [Var "@*END"] [Syn "sub" [Val $ VSub sub]]
 
 rulePackageDeclaration = rule "package declaration" $ fail ""

src/Prim.hs

@@ -401 +401 @@
         other       -> (0, other, True)
         
-primDecl str = primOp sym assoc (reverse $ foldr foldParam [] prms) ret
+primDecl str = primOp sym assoc (foldr foldParam [] prms) ret
     where
     (ret:assoc:sym:prms') = words str
     takeWord = takeWhile isWord . dropWhile (not . isWord)
-    isWord = not . (`elem` "|(),")
+    isWord = not . (`elem` "|(),:")
     prms = map takeWord prms'
 
@@ -413 +413 @@
 
 foldParam :: String -> Params -> Params
-foldParam "List"    = doFoldParam "List" "*@?0"
+foldParam "List"    = doFoldParam "List" "*@?1"
+foldParam ('r':'w':'!':"List") = \ps -> ((buildParam "List" "" "@?0" (Val VUndef)) { isLValue = True }:ps)
 foldParam ('r':'w':'!':str) = \ps -> ((buildParam str "" "$?1" (Val VUndef)) { isLValue = True }:ps)
 foldParam ""        = id
@@ -446 +447 @@
 \\n   List      pre     map     (List: Code)\
 \\n   List      pre     grep    (List: Code)\
+\\n   Int       pre     push    (rw!Array: List)\
+\\n   Int       pre     unshift (rw!Array: List)\
+\\n   Scalar    pre     pop     (rw!Array)\
+\\n   Scalar    pre     shift   (rw!Array)\
 \\n   Str       pre     join    (List)\
 \\n   List      left    zip     (List)\