From 7c6b0cbff6694a2bd107d53e656527dd0b8f319d Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 13 Apr 2004 11:55:52 +0000 Subject: [PATCH] error msg for term input --- src/GF/Shell.hs | 6 ++++-- src/Today.hs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GF/Shell.hs b/src/GF/Shell.hs index 7574b86a6..4c2a067a4 100644 --- a/src/GF/Shell.hs +++ b/src/GF/Shell.hs @@ -293,8 +293,10 @@ opST2CommandArg f = err AError ATrms . f . prCommandArg opTS2CommandArg :: (Tree -> String) -> CommandArg -> CommandArg opTS2CommandArg f (ATrms ts) = AString $ unlines $ map f ts -opTS2CommandArg _ _ = AError ("expected term") +opTS2CommandArg _ (AError s) = AError ("expected term, but got error:" ++++ s) +opTS2CommandArg _ a = AError ("expected term, but got:" ++++ prCommandArg a) opTT2CommandArg :: (Tree -> [Tree]) -> CommandArg -> CommandArg opTT2CommandArg f (ATrms ts) = ATrms $ concat $ map f ts -opTT2CommandArg _ _ = AError ("expected term") +opTT2CommandArg _ (AError s) = AError ("expected term, but got error:" ++++ s) +opTT2CommandArg _ a = AError ("expected term, but got:" ++++ prCommandArg a) diff --git a/src/Today.hs b/src/Today.hs index 8e73014b1..1aa673d28 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Thu Apr 1 11:42:56 CEST 2004" +module Today where today = "Tue Apr 13 13:53:49 CEST 2004"