Changeset 3701

Timestamp:

05/23/05 02:13:17 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5201

Message:

* Normalise all Shell commands to begin with : and

reorganise Help message for :h a bit.

Location:

src/Pugs

Files:

• Help.hs (modified) (1 diff)
• Shell.hs (modified) (1 diff)

src/Pugs/Help.hs

@@ -24 +24 @@
         putStrLn ":h              = show this help message"
         putStrLn ":q              = quit"
-        putStrLn ". <exp>         = show the syntax tree of an expression"
-        putStrLn "? <exp>         = evaluate an expression in small steps"
-        putStrLn "! <exp>         = same, but in the interactive environment"
-        putStrLn "<exp>           = run a command"
-        putStrLn ":i <exp>        = run a command, and ugly-print the result"
         putStrLn ":r              = reset the evaluation environment"
         putStrLn ":l <filename>   = load a pugs file"
+        putStrLn ":d <exp>        = show syntax tree of an expression"
+        putStrLn ":D <exp>        = show raw syntax tree of an expression"
+        putStrLn ":e <exp>        = run a command, and ugly-print the result"
+        putStrLn ":E <exp>        = same, but evaluate in small steps"
+        putStrLn "<exp>           = run a command"
 
 {- FIXME: Somebody with more UI skillz should make this nicer -}

src/Pugs/Shell.hs

@@ -49 +49 @@
 
 parseCommandLine :: String -> Command 
-parseCommandLine ('?':str)      = CmdRun (RunOpts True True  True) str
-parseCommandLine ('!':str)      = CmdRun (RunOpts True False True) str
-parseCommandLine ('.':'.':str)  = CmdParseRaw str
-parseCommandLine ('.':str)      = CmdParse str
+parseCommandLine (':':'e':str)  = CmdRun (RunOpts False True False) str
+parseCommandLine (':':'E':str)  = CmdRun (RunOpts True True False) str
+parseCommandLine (':':'d':str)  = CmdParse str
+parseCommandLine (':':'D':str)  = CmdParseRaw str
 parseCommandLine (':':'q':_)    = CmdQuit
 parseCommandLine (':':'h':_)    = CmdHelp
 parseCommandLine (':':'r':_)    = CmdReset
-parseCommandLine (':':'i':str)  = CmdRun (RunOpts False False False) str
 parseCommandLine (':':'l':str)  = CmdLoad $ unwords (words str)
 parseCommandLine str            = CmdRun (RunOpts False False True) str