@@ -34,6 +34,12 @@ module Meta ( primitive 'nthParam' ) + // Returns the list of arguments defined with the provided function. Each element + // in the list is the name of the argument as a string. + def arguments fn ( + primitive 'arguments' + ) + // Creates an identifier from a string. def wyId str ( primitive 'wyId' @@ -158,8 +164,8 @@ module Foundation ( // Arithmetic operators macrop (`a = `b) 1 ( - if (applic? a && fnName a == "@") ( - ` ((@!) ($ (nthParam a 0)) ($ (nthParam a 1)) $b) + if (applic? a && fnName a == "at") ( + ` ((at!) ($ (nthParam a 0)) ($ (nthParam a 1)) $b) )( ` ((=) $a $b) ) @@ -184,12 +190,12 @@ module Foundation ( macro (`arr . `idx) ( if (applic? idx) ( if (empty? (params idx)) ( - ` ((@) $arr ($ (fnName idx))) + ` (at $arr ($ (fnName idx))) )( - ` ( ((@) $arr ($ (fnName(idx)))) ($^ (params idx)) ) + ` ( (at $arr ($ (fnName(idx)))) ($^ (params idx)) ) ) )( - ` ((@) $arr $idx) + ` (at $arr $idx) ) ) @@ -210,6 +216,8 @@ module Foundation ( ) ) + // Syntax sugar for opening and closing parentheses (when the closing occurs at + // then end of the statement) macro (`appl ^ `sub~) ( if (applic? appl) ( `( ($ (wyId (fnName appl))) ($^ (params appl << sub)) ) @@ -218,6 +226,12 @@ module Foundation ( ) ) + // Function composition + def compose f1 f2 x (f1 (f2 x)) + + // Operator for function composition + macrox (`fn1 @ `fn2) (compose $fn1 $fn2) + // Control structures // @@ -277,8 +291,8 @@ module Foundation ( primitive 'M' ) - def (@) list elmt ( - primitive '@' + def at list elmt ( + primitive 'at' ) def (<<) list elmt ( @@ -291,8 +305,8 @@ module Foundation ( ) macropx (`a >> `b) 1 ((>>) $a $b) - def (@!) ref pos val ( - primitive '@!' + def (at!) ref pos val ( + primitive 'at!' ) def push! list val ( @@ -348,8 +362,8 @@ module Foundation ( primitive 'load' ) - def arguments ( - primitive 'arguments' + def ARGS ( + primitive 'ARGS' ) def exit ( haskell/src/foundation.wy @@ -220,9 +220,9 @@ dataPrim f = onContainers ps wyLength wyLength (WyInt . toInteger . M.size) ) $ defp "reverse" (\ps -> onContainers ps (WyList . reverse) (WyString . reverse) (WyMap . id) ) $ - defp "@" (\ps -> + defp "at" (\ps -> evalAtParams ps >>= elemAt ) $ - defp "@!" (\ps -> do + defp "at!" (\ps -> do ref <- evalWy $ head ps oldVal <- liftIO $ readRef ref newVal <- evalWy $ last ps @@ -372,6 +372,13 @@ metaPrim f = (WyStmt [WyApplic _ ps _]) -> return $ ps !! fromInteger idx WyApplic _ ps _ -> return $ ps !! fromInteger idx x -> get >>= appErr1 (\e -> "Not a function application: " ++ e) x ) $ + + defp "arguments" (\ps -> do + fn <- eval $ head ps + case fn of + (WyLambda as _ _) -> return . WyList . map WyString $ as + (WyPrimitive _ as _) -> return . WyList . map WyString $ as + (WyCont _) -> return $ WyList [WyString "c"] ) $ defp "splitBlock" (\ps -> do block <- eval $ head ps @@ -402,7 +409,7 @@ stdIOPrim f = str <- concatWyStr eps liftIO $ putStrLn str return WyNull ) $ - defp "arguments" (\ps -> liftM (WyList . map WyString . safeTail) (liftIO getArgs) ) $ + defp "ARGS" (\ps -> liftM (WyList . map WyString . safeTail) (liftIO getArgs) ) $ defp "load" (\ps -> do fname <- eval (head ps) >>= stringOrShow fcnt <- liftIO $ readFile fname haskell/src/prim.hs @@ -1,4 +1,4 @@ -verbose = arguments().0 == "-v" +verbose = ARGS().0 == "-v" descriptions = [] macrox (describe `str `descBody) ( test/base.wy 82b3c514a751f5b1751c6ce82b21505ea5574df2 Matthieu Riou matthieu.riou@c3-carbon.com http://github.com/matthieu/witty/commit/df8eee072741180e70e4ea53a73950d3eba62789 df8eee072741180e70e4ea53a73950d3eba62789 2009-09-30T21:42:06-07:00 2009-09-30T21:42:06-07:00 Function composition with @ e71bff0651eb0cec62e5d1b7400c1ce1fb38a6cb Matthieu Riou matthieu.riou@c3-carbon.com