changeset 338:63c6afb915f7

- Made some corrections to the message catalogs. - Added functions for printing help messages.
author aziz
date Wed, 22 Aug 2007 15:53:04 +0000
parents de78b51fd727
children 9954367bcd4b
files trunk/src/lang_de.d trunk/src/lang_en.d trunk/src/lang_tr.d trunk/src/main.d
diffstat 4 files changed, 44 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/lang_de.d	Wed Aug 22 13:08:04 2007 +0000
+++ b/trunk/src/lang_de.d	Wed Aug 22 15:53:04 2007 +0000
@@ -58,23 +58,20 @@
 Copyright (c) 2007, Aziz Köksal. Lizensiert unter der GPL3.
 
 Befehle:
-  {2}
-
+{2}
 Geben Sie 'dil help <Befehl>' ein, um mehr Hilfe zu einem bestimmten Befehl zu
 erhalten.
 
-Kompiliert mit {3} v{4} am {5}.
-`,
+Kompiliert mit {3} v{4} am {5}.`,
   `Generiere ein XML- oder HTML-Dokument aus einer D-Quelltextdatei.
 Verwendung:
   dil gen datei.d [Optionen]
 
 Optionen:
-  --syntax         : generiere Elemente for die Syntax und Tokens
+  --syntax         : generiere Elemente für den Syntaxbaum
   --xml            : verwende XML-Format (voreingestellt)
   --html           : verwende HTML-Format
 
 Beispiel:
-  dil gen Parser.d --html --syntax > Parser.html
-`,
+  dil gen Parser.d --html --syntax > Parser.html`,
 ];
\ No newline at end of file
--- a/trunk/src/lang_en.d	Wed Aug 22 13:08:04 2007 +0000
+++ b/trunk/src/lang_en.d	Wed Aug 22 15:53:04 2007 +0000
@@ -58,22 +58,19 @@
 Copyright (c) 2007 by Aziz Köksal. Licensed under the GPL3.
 
 Subcommands:
-  {2}
-
+{2}
 Type 'dil help <subcommand>' for more help on a particular subcommand.
 
-Compiled with {3} v{4} on {5}.
-`,
+Compiled with {3} v{4} on {5}.`,
   `Generate an XML or HTML document from a D source file.
 Usage:
   dil gen file.d [Options]
 
 Options:
-  --syntax         : generate tags for syntax and tokens
-  --xml            : use XML format
+  --syntax         : generate tags for the syntax tree
+  --xml            : use XML format (default)
   --html           : use HTML format
 
 Example:
-  dil gen Parser.d --html --syntax > Parser.html
-`,
+  dil gen Parser.d --html --syntax > Parser.html`,
 ];
\ No newline at end of file
--- a/trunk/src/lang_tr.d	Wed Aug 22 13:08:04 2007 +0000
+++ b/trunk/src/lang_tr.d	Wed Aug 22 15:53:04 2007 +0000
@@ -58,22 +58,19 @@
 Copyright (c) 2007, Aziz Köksal. Lisans GPL3.
 
 Komutlar:
-  {2}
-
+{2}
 Bir belirli komut'a yardım edinmek için 'dil help <komut>' yazınız.
 
-Bu yazılım {3} v{4} ile {5} tarihinde derletilmiş.
-`,
+Bu yazılım {3} v{4} ile {5} tarihinde derletilmiş.`,
   `Bir D kaynak kodundan XML yada HTML dosyası oluştur.
 Kullanım:
   dil gen dosya.d [Seçenekler]
 
 Seçenekler:
-  --syntax         : söz dizimi için etiket yazdır
-  --xml            : XML biçimi kullan
+  --syntax         : söz dizimi için etiketler yazdır
+  --xml            : XML biçimi kullan (varsayılır)
   --html           : HTML biçimi kullan
 
 Örnek:
-  dil gen Parser.d --html --syntax > Parser.html
-`,
+  dil gen Parser.d --html --syntax > Parser.html`,
 ];
\ No newline at end of file
--- a/trunk/src/main.d	Wed Aug 22 13:08:04 2007 +0000
+++ b/trunk/src/main.d	Wed Aug 22 15:53:04 2007 +0000
@@ -17,7 +17,7 @@
   GlobalSettings.load();
 
   if (args.length <= 1)
-    return writefln(format(MID.HelpMain, VERSION, usageGenerate, COMPILED_WITH, COMPILED_VERSION, COMPILED_DATE));
+    return writefln(helpMain());
 
   string command = args[1];
   switch (command)
@@ -50,10 +50,39 @@
     if (args.length == 3)
       parse(args[2]);
     break;
+  case "?", "help":
+    if (args.length == 3)
+      printHelp(args[2]);
+    else
+      writefln(helpMain());
+    break;
   default:
   }
 }
 
+const char[] COMMANDS =
+  "  generate (gen)\n"
+  "  help (?)\n";
+
+char[] helpMain()
+{
+  return format(MID.HelpMain, VERSION, COMMANDS, COMPILED_WITH, COMPILED_VERSION, COMPILED_DATE);
+}
+
+void printHelp(char[] command)
+{
+  char[] msg;
+  switch (command)
+  {
+  case "gen", "generate":
+    msg = GetMsg(MID.HelpGenerate);
+    break;
+  default:
+    msg = helpMain();
+  }
+  writefln(msg);
+}
+
 enum DocOption
 {
   Tokens,