Plein de modifs

5 files changed, 308 insertions, 54 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 196d40a..09b12f8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 src/test.cc
+src/main.cc
 lib/FHeap.cc
 lib/BHeap.cc
 lib/BinHeap.cc
diff --git a/po/PriorityLists.pot b/po/PriorityLists.pot
index 81d06a9..32402f6 100644
--- a/po/PriorityLists.pot
+++ b/po/PriorityLists.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-05 02:26+0100\n"
+"POT-Creation-Date: 2001-03-05 14:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -125,6 +125,106 @@ msgid ""
 "All the tests were successfull\n"
 msgstr ""
 
+#: src/main.cc:34 src/main.cc:166
+msgid "Unknow priority list type: "
+msgstr ""
+
+#: src/main.cc:45 src/main.cc:71
+msgid "Error opening file ("
+msgstr ""
+
+#: src/main.cc:77
+msgid "Bad dictionnary structure. See doc/README.en (missing : separator)"
+msgstr ""
+
+#: src/main.cc:90
+msgid "Bad dictionnary structure. See doc/README.en (missing word)"
+msgstr ""
+
+#: src/main.cc:101
+msgid "Bad dictionnary structure. See doc/README.en (missing frequency)"
+msgstr ""
+
+#: src/main.cc:109
+msgid "Huffman [{-f|-i} file] {type}"
+msgstr ""
+
+#: src/main.cc:110
+msgid "Huffman -h"
+msgstr ""
+
+#: src/main.cc:111
+msgid "By Nicolas Noble (nicolas@nobis-crew.org)."
+msgstr ""
+
+#: src/main.cc:112
+msgid "This will encode the input file with the Huffman code"
+msgstr ""
+
+#: src/main.cc:113
+msgid "using the priority list defined by type."
+msgstr ""
+
+#: src/main.cc:114
+msgid "Type is a number taken from this list:"
+msgstr ""
+
+#: src/main.cc:115
+msgid "  0 : Binary Heap (default)"
+msgstr ""
+
+#: src/main.cc:116
+msgid "  1 : Binomial Heap"
+msgstr ""
+
+#: src/main.cc:117
+msgid "  2 : Fibbonacci Heap (bugged)"
+msgstr ""
+
+#: src/main.cc:118
+msgid "  3 : Sorted chained list"
+msgstr ""
+
+#: src/main.cc:119
+msgid "-f file means that you specify a dictionnary file which is"
+msgstr ""
+
+#: src/main.cc:120
+msgid "        structured as described into the README file."
+msgstr ""
+
+#: src/main.cc:121
+msgid "-i file means that you specify a file to encode. It will"
+msgstr ""
+
+#: src/main.cc:122
+msgid "        built a quiet dumb dictionnary."
+msgstr ""
+
+#: src/main.cc:123
+msgid "By default, a dictionnary will be built from stdin."
+msgstr ""
+
+#: src/main.cc:124
+msgid "-h prints this help and exit."
+msgstr ""
+
+#: src/main.cc:140
+msgid "Unknow option: "
+msgstr ""
+
+#: src/main.cc:149 src/main.cc:157
+msgid "-i and -f options are exclusive"
+msgstr ""
+
+#: src/main.cc:170
+msgid "Extra command: "
+msgstr ""
+
+#: src/main.cc:189
+msgid "Internal error."
+msgstr ""
+
 #: lib/FHeap.cc:80
 msgid " * Head cell. ("
 msgstr ""
@@ -147,11 +247,11 @@ msgid ""
 " |\n"
 msgstr ""
 
-#: lib/BinHeap.cc:121
+#: lib/BinHeap.cc:122
 msgid "Not enough memory"
 msgstr ""
 
-#: lib/BinHeap.cc:148
+#: lib/BinHeap.cc:149
 msgid "negative overflow"
 msgstr ""
 
@@ -161,38 +261,38 @@ msgid ""
 " |\n"
 msgstr ""
 
-#: lib/HTree.cc:57
+#: lib/HTree.cc:58
 msgid "Bitstream length           : "
 msgstr ""
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:58 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:64
 msgid " bits (= "
 msgstr ""
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:60 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:68
 msgid " bytes)\n"
 msgstr ""
 
-#: lib/HTree.cc:58
+#: lib/HTree.cc:61
 msgid "Real size input            : "
 msgstr ""
 
-#: lib/HTree.cc:59
+#: lib/HTree.cc:62
 msgid "Size squeezed by           : "
 msgstr ""
 
-#: lib/HTree.cc:59 lib/HTree.cc:62
+#: lib/HTree.cc:62 lib/HTree.cc:70
 msgid " percents\n"
 msgstr ""
 
-#: lib/HTree.cc:60
+#: lib/HTree.cc:63
 msgid "Dictionnary size           : "
 msgstr ""
 
-#: lib/HTree.cc:61
+#: lib/HTree.cc:64
 msgid "Total bitstream length     : "
 msgstr ""
 
-#: lib/HTree.cc:62
+#: lib/HTree.cc:69
 msgid "Real gain (4 bytes header) : "
 msgstr ""
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 831b93c..98417ba 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -47,27 +47,52 @@ Extracting datas...\n", 23},
 Ok.\n\
 \n\
 All the tests were successfull\n", 25},
-  {" * Head cell. (", 26},
-  {"Insert: not over Head.", 27},
-  {"Insert: No more memory.", 28},
-  {"Extract_Min: Priority List is empty.", 29},
+  {"Unknow priority list type: ", 26},
+  {"Error opening file (", 27},
+  {"Bad dictionnary structure. See doc/README.en (missing : separator)", 28},
+  {"Bad dictionnary structure. See doc/README.en (missing word)", 29},
+  {"Bad dictionnary structure. See doc/README.en (missing frequency)", 30},
+  {"Huffman [{-f|-i} file] {type}", 31},
+  {"Huffman -h", 32},
+  {"By Nicolas Noble (nicolas@nobis-crew.org).", 33},
+  {"This will encode the input file with the Huffman code", 34},
+  {"using the priority list defined by type.", 35},
+  {"Type is a number taken from this list:", 36},
+  {"  0 : Binary Heap (default)", 37},
+  {"  1 : Binomial Heap", 38},
+  {"  2 : Fibbonacci Heap (bugged)", 39},
+  {"  3 : Sorted chained list", 40},
+  {"-f file means that you specify a dictionnary file which is", 41},
+  {"        structured as described into the README file.", 42},
+  {"-i file means that you specify a file to encode. It will", 43},
+  {"        built a quiet dumb dictionnary.", 44},
+  {"By default, a dictionnary will be built from stdin.", 45},
+  {"-h prints this help and exit.", 46},
+  {"Unknow option: ", 47},
+  {"-i and -f options are exclusive", 48},
+  {"Extra command: ", 49},
+  {"Internal error.", 50},
+  {" * Head cell. (", 51},
+  {"Insert: not over Head.", 52},
+  {"Insert: No more memory.", 53},
+  {"Extract_Min: Priority List is empty.", 54},
   {"\
  * Head cell.\n\
- |\n", 30},
-  {"Not enough memory", 31},
-  {"negative overflow", 32},
+ |\n", 55},
+  {"Not enough memory", 56},
+  {"negative overflow", 57},
   {"\
  * Head cell\n\
- |\n", 33},
-  {"Bitstream length           : ", 34},
-  {" bits (= ", 35},
-  {" bytes)\n", 36},
-  {"Real size input            : ", 37},
-  {"Size squeezed by           : ", 38},
-  {" percents\n", 39},
-  {"Dictionnary size           : ", 40},
-  {"Total bitstream length     : ", 41},
-  {"Real gain (4 bytes header) : ", 42},
+ |\n", 58},
+  {"Bitstream length           : ", 59},
+  {" bits (= ", 60},
+  {" bytes)\n", 61},
+  {"Real size input            : ", 62},
+  {"Size squeezed by           : ", 63},
+  {" percents\n", 64},
+  {"Dictionnary size           : ", 65},
+  {"Total bitstream length     : ", 66},
+  {"Real gain (4 bytes header) : ", 67},
 };
 
-int _msg_tbl_length = 42;
+int _msg_tbl_length = 67;
diff --git a/po/de.po b/po/de.po
index 81d06a9..c67b75a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-05 02:26+0100\n"
+"POT-Creation-Date: 2001-03-05 02:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -125,6 +125,70 @@ msgid ""
 "All the tests were successfull\n"
 msgstr ""
 
+#: src/main.cc:29
+msgid "Error opening file ("
+msgstr ""
+
+#: src/main.cc:44
+msgid "Huffman [{-f|-i} file] {type}"
+msgstr ""
+
+#: src/main.cc:45
+msgid "By Nicolas Noble (nicolas@nobis-crew.org)."
+msgstr ""
+
+#: src/main.cc:46
+msgid "This will encode the input file with the Huffman code"
+msgstr ""
+
+#: src/main.cc:47
+msgid "using the priority list defined by type."
+msgstr ""
+
+#: src/main.cc:48
+msgid "Type is a number taken from this list:"
+msgstr ""
+
+#: src/main.cc:49
+msgid "  0 : Binary Heap (default)"
+msgstr ""
+
+#: src/main.cc:50
+msgid "  1 : Binomial Heap"
+msgstr ""
+
+#: src/main.cc:51
+msgid "  2 : Fibbonacci Heap (bugged)"
+msgstr ""
+
+#: src/main.cc:52
+msgid "  3 : Sorted chained list"
+msgstr ""
+
+#: src/main.cc:53
+msgid "-f file means that you specify a dictionnary file which is"
+msgstr ""
+
+#: src/main.cc:54
+msgid "        structured as described into the README file."
+msgstr ""
+
+#: src/main.cc:55
+msgid "-i file means that you specify a file to encode. It will"
+msgstr ""
+
+#: src/main.cc:56
+msgid "        built a quiet dumb dictionnary."
+msgstr ""
+
+#: src/main.cc:57
+msgid "By default, a dictionnary will be built from stdin."
+msgstr ""
+
+#: src/main.cc:63
+msgid "Unknow option: "
+msgstr ""
+
 #: lib/FHeap.cc:80
 msgid " * Head cell. ("
 msgstr ""
@@ -147,11 +211,11 @@ msgid ""
 " |\n"
 msgstr ""
 
-#: lib/BinHeap.cc:121
+#: lib/BinHeap.cc:122
 msgid "Not enough memory"
 msgstr ""
 
-#: lib/BinHeap.cc:148
+#: lib/BinHeap.cc:149
 msgid "negative overflow"
 msgstr ""
 
@@ -161,38 +225,38 @@ msgid ""
 " |\n"
 msgstr ""
 
-#: lib/HTree.cc:57
+#: lib/HTree.cc:58
 msgid "Bitstream length           : "
 msgstr ""
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:58 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:64
 msgid " bits (= "
 msgstr ""
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:60 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:68
 msgid " bytes)\n"
 msgstr ""
 
-#: lib/HTree.cc:58
+#: lib/HTree.cc:61
 msgid "Real size input            : "
 msgstr ""
 
-#: lib/HTree.cc:59
+#: lib/HTree.cc:62
 msgid "Size squeezed by           : "
 msgstr ""
 
-#: lib/HTree.cc:59 lib/HTree.cc:62
+#: lib/HTree.cc:62 lib/HTree.cc:70
 msgid " percents\n"
 msgstr ""
 
-#: lib/HTree.cc:60
+#: lib/HTree.cc:63
 msgid "Dictionnary size           : "
 msgstr ""
 
-#: lib/HTree.cc:61
+#: lib/HTree.cc:64
 msgid "Total bitstream length     : "
 msgstr ""
 
-#: lib/HTree.cc:62
+#: lib/HTree.cc:69
 msgid "Real gain (4 bytes header) : "
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 43ffaaf..e34f6a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PriorityList-1.0.0\n"
-"POT-Creation-Date: 2001-03-05 02:26+0100\n"
+"POT-Creation-Date: 2001-03-05 02:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Nicolas Noble <pixel@nobis-crew.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -140,6 +140,70 @@ msgstr ""
 "\n"
 "Tous les tests se sont déroulés correctement\n"
 
+#: src/main.cc:29
+msgid "Error opening file ("
+msgstr "Erreur à l'ouverture du fichier ("
+
+#: src/main.cc:44
+msgid "Huffman [{-f|-i} file] {type}"
+msgstr "Huffman [{-f|-i} file] {type}"
+
+#: src/main.cc:45
+msgid "By Nicolas Noble (nicolas@nobis-crew.org)."
+msgstr "Par Nicolas Noble {nicolas@nobis-crew.org)."
+
+#: src/main.cc:46
+msgid "This will encode the input file with the Huffman code"
+msgstr ""
+
+#: src/main.cc:47
+msgid "using the priority list defined by type."
+msgstr ""
+
+#: src/main.cc:48
+msgid "Type is a number taken from this list:"
+msgstr ""
+
+#: src/main.cc:49
+msgid "  0 : Binary Heap (default)"
+msgstr ""
+
+#: src/main.cc:50
+msgid "  1 : Binomial Heap"
+msgstr ""
+
+#: src/main.cc:51
+msgid "  2 : Fibbonacci Heap (bugged)"
+msgstr ""
+
+#: src/main.cc:52
+msgid "  3 : Sorted chained list"
+msgstr ""
+
+#: src/main.cc:53
+msgid "-f file means that you specify a dictionnary file which is"
+msgstr ""
+
+#: src/main.cc:54
+msgid "        structured as described into the README file."
+msgstr ""
+
+#: src/main.cc:55
+msgid "-i file means that you specify a file to encode. It will"
+msgstr ""
+
+#: src/main.cc:56
+msgid "        built a quiet dumb dictionnary."
+msgstr ""
+
+#: src/main.cc:57
+msgid "By default, a dictionnary will be built from stdin."
+msgstr ""
+
+#: src/main.cc:63
+msgid "Unknow option: "
+msgstr ""
+
 #: lib/FHeap.cc:80
 msgid " * Head cell. ("
 msgstr " * Cellule d'entête. ("
@@ -164,11 +228,11 @@ msgstr ""
 " * Cellule d'entête.\n"
 " |\n"
 
-#: lib/BinHeap.cc:121
+#: lib/BinHeap.cc:122
 msgid "Not enough memory"
 msgstr "Pas assez de mémoire"
 
-#: lib/BinHeap.cc:148
+#: lib/BinHeap.cc:149
 msgid "negative overflow"
 msgstr "Débordement négatif"
 
@@ -180,38 +244,38 @@ msgstr ""
 " * Cellule d'entête.\n"
 " |\n"
 
-#: lib/HTree.cc:57
+#: lib/HTree.cc:58
 msgid "Bitstream length           : "
 msgstr "Taille du flux de bits         : "
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:58 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:64
 msgid " bits (= "
 msgstr " bits (= "
 
-#: lib/HTree.cc:57 lib/HTree.cc:58 lib/HTree.cc:60 lib/HTree.cc:61
+#: lib/HTree.cc:60 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:68
 msgid " bytes)\n"
 msgstr " octets)\n"
 
-#: lib/HTree.cc:58
+#: lib/HTree.cc:61
 msgid "Real size input            : "
 msgstr "Taille réelle de l'entrée      : "
 
-#: lib/HTree.cc:59
+#: lib/HTree.cc:62
 msgid "Size squeezed by           : "
 msgstr "Taille réduite de              : "
 
-#: lib/HTree.cc:59 lib/HTree.cc:62
+#: lib/HTree.cc:62 lib/HTree.cc:70
 msgid " percents\n"
 msgstr " pourcents\n"
 
-#: lib/HTree.cc:60
+#: lib/HTree.cc:63
 msgid "Dictionnary size           : "
 msgstr "Taille du dictionnaire         : "
 
-#: lib/HTree.cc:61
+#: lib/HTree.cc:64
 msgid "Total bitstream length     : "
 msgstr "Taille totale du flux de bits  : "
 
-#: lib/HTree.cc:62
+#: lib/HTree.cc:69
 msgid "Real gain (4 bytes header) : "
 msgstr "Gain réel (entête de 4 octets) : "